-Fix JTokenReader.ReadAsBytes to read strings as base64 data

This commit is contained in:
JamesNK
2010-04-17 07:54:07 +00:00
parent 873a23a0f8
commit 2f11d3f970
3 changed files with 58 additions and 0 deletions
@@ -7,8 +7,17 @@ using System.Reflection;
namespace Newtonsoft.Json.Converters
{
/// <summary>
/// Converts a <see cref="KeyValuePair{TKey,TValue}"/> to and from JSON.
/// </summary>
public class KeyValuePairConverter : JsonConverter
{
/// <summary>
/// Writes the JSON representation of the object.
/// </summary>
/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
/// <param name="value">The value.</param>
/// <param name="serializer">The calling serializer.</param>
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
Type t = value.GetType();
@@ -23,6 +32,14 @@ namespace Newtonsoft.Json.Converters
writer.WriteEndObject();
}
/// <summary>
/// Reads the JSON representation of the object.
/// </summary>
/// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
/// <param name="objectType">Type of the object.</param>
/// <param name="existingValue">The existing value of object being read.</param>
/// <param name="serializer">The calling serializer.</param>
/// <returns>The object value.</returns>
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
IList<Type> genericArguments = objectType.GetGenericArguments();
@@ -40,6 +57,13 @@ namespace Newtonsoft.Json.Converters
return ReflectionUtils.CreateInstance(objectType, key, value);
}
/// <summary>
/// Determines whether this instance can convert the specified object type.
/// </summary>
/// <param name="objectType">Type of the object.</param>
/// <returns>
/// <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
/// </returns>
public override bool CanConvert(Type objectType)
{
if (objectType.IsValueType && objectType.IsGenericType)
+8
View File
@@ -37,6 +37,14 @@ namespace Newtonsoft.Json.Linq
public override byte[] ReadAsBytes()
{
Read();
// attempt to convert possible base 64 string to bytes
if (TokenType == JsonToken.String)
{
byte[] data = Convert.FromBase64String((string)Value);
SetToken(JsonToken.Bytes, data);
}
if (TokenType != JsonToken.Bytes)
throw new JsonReaderException("Error reading bytes. Expected bytes but got {0}.".FormatWith(CultureInfo.InvariantCulture, TokenType));