-Fix occasional error when converting non-long integer properties to XML
-Fix boolean values sometimes being capitalized when converting to XML -Fix error when deserializing ConcurrentDictionary -Fix serializing some Uris -Change KeyValurPairConverter to not rely on the order of the key and value properties
This commit is contained in:
@@ -42,19 +42,50 @@ namespace Newtonsoft.Json.Converters
|
||||
/// <returns>The object value.</returns>
|
||||
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
||||
{
|
||||
IList<Type> genericArguments = objectType.GetGenericArguments();
|
||||
bool isNullable = ReflectionUtils.IsNullableType(objectType);
|
||||
|
||||
if (reader.TokenType == JsonToken.Null)
|
||||
{
|
||||
if (!isNullable)
|
||||
throw new Exception("Could not deserialize Null to KeyValuePair.");
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
Type t = (isNullable)
|
||||
? Nullable.GetUnderlyingType(objectType)
|
||||
: objectType;
|
||||
|
||||
IList<Type> genericArguments = t.GetGenericArguments();
|
||||
Type keyType = genericArguments[0];
|
||||
Type valueType = genericArguments[1];
|
||||
|
||||
reader.Read();
|
||||
reader.Read();
|
||||
object key = serializer.Deserialize(reader, keyType);
|
||||
reader.Read();
|
||||
reader.Read();
|
||||
object value = serializer.Deserialize(reader, valueType);
|
||||
object key = null;
|
||||
object value = null;
|
||||
|
||||
reader.Read();
|
||||
|
||||
return ReflectionUtils.CreateInstance(objectType, key, value);
|
||||
while (reader.TokenType == JsonToken.PropertyName)
|
||||
{
|
||||
switch (reader.Value.ToString())
|
||||
{
|
||||
case "Key":
|
||||
reader.Read();
|
||||
key = serializer.Deserialize(reader, keyType);
|
||||
break;
|
||||
case "Value":
|
||||
reader.Read();
|
||||
value = serializer.Deserialize(reader, valueType);
|
||||
break;
|
||||
default:
|
||||
reader.Skip();
|
||||
break;
|
||||
}
|
||||
|
||||
reader.Read();
|
||||
}
|
||||
|
||||
return ReflectionUtils.CreateInstance(t, key, value);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -66,8 +97,12 @@ namespace Newtonsoft.Json.Converters
|
||||
/// </returns>
|
||||
public override bool CanConvert(Type objectType)
|
||||
{
|
||||
if (objectType.IsValueType && objectType.IsGenericType)
|
||||
return (objectType.GetGenericTypeDefinition() == typeof (KeyValuePair<,>));
|
||||
Type t = (ReflectionUtils.IsNullableType(objectType))
|
||||
? Nullable.GetUnderlyingType(objectType)
|
||||
: objectType;
|
||||
|
||||
if (t.IsValueType && t.IsGenericType)
|
||||
return (t.GetGenericTypeDefinition() == typeof(KeyValuePair<,>));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
#if !SILVERLIGHT || WINDOWS_PHONE
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Xml;
|
||||
#if !NET20
|
||||
using System.Xml.Linq;
|
||||
@@ -1194,26 +1195,13 @@ namespace Newtonsoft.Json.Converters
|
||||
element.SetAttributeNode(attribute);
|
||||
}
|
||||
|
||||
if (reader.TokenType == JsonToken.String)
|
||||
if (reader.TokenType == JsonToken.String
|
||||
|| reader.TokenType == JsonToken.Integer
|
||||
|| reader.TokenType == JsonToken.Float
|
||||
|| reader.TokenType == JsonToken.Boolean
|
||||
|| reader.TokenType == JsonToken.Date)
|
||||
{
|
||||
element.AppendChild(document.CreateTextNode(reader.Value.ToString()));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Integer)
|
||||
{
|
||||
element.AppendChild(document.CreateTextNode(XmlConvert.ToString((long)reader.Value)));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Float)
|
||||
{
|
||||
element.AppendChild(document.CreateTextNode(XmlConvert.ToString((double)reader.Value)));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Boolean)
|
||||
{
|
||||
element.AppendChild(document.CreateTextNode(XmlConvert.ToString((bool)reader.Value)));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Date)
|
||||
{
|
||||
DateTime d = (DateTime)reader.Value;
|
||||
element.AppendChild(document.CreateTextNode(XmlConvert.ToString(d, DateTimeUtils.ToSerializationMode(d.Kind))));
|
||||
element.AppendChild(document.CreateTextNode(ConvertTokenToXmlValue(reader)));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Null)
|
||||
{
|
||||
@@ -1233,6 +1221,39 @@ namespace Newtonsoft.Json.Converters
|
||||
}
|
||||
}
|
||||
|
||||
private string ConvertTokenToXmlValue(JsonReader reader)
|
||||
{
|
||||
if (reader.TokenType == JsonToken.String)
|
||||
{
|
||||
return reader.Value.ToString();
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Integer)
|
||||
{
|
||||
return XmlConvert.ToString(Convert.ToInt64(reader.Value, CultureInfo.InvariantCulture));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Float)
|
||||
{
|
||||
return XmlConvert.ToString(Convert.ToDouble(reader.Value, CultureInfo.InvariantCulture));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Boolean)
|
||||
{
|
||||
return XmlConvert.ToString(Convert.ToBoolean(reader.Value, CultureInfo.InvariantCulture));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Date)
|
||||
{
|
||||
DateTime d = Convert.ToDateTime(reader.Value, CultureInfo.InvariantCulture);
|
||||
return XmlConvert.ToString(d, DateTimeUtils.ToSerializationMode(d.Kind));
|
||||
}
|
||||
else if (reader.TokenType == JsonToken.Null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("Cannot get an XML string value from token type '{0}'.".FormatWith(CultureInfo.InvariantCulture, reader.TokenType));
|
||||
}
|
||||
}
|
||||
|
||||
private void ReadArrayElements(JsonReader reader, IXmlDocument document, string propertyName, IXmlNode currentNode, XmlNamespaceManager manager)
|
||||
{
|
||||
string elementPrefix = MiscellaneousUtils.GetPrefix(propertyName);
|
||||
@@ -1309,7 +1330,7 @@ namespace Newtonsoft.Json.Converters
|
||||
case '@':
|
||||
attributeName = attributeName.Substring(1);
|
||||
reader.Read();
|
||||
attributeValue = reader.Value.ToString();
|
||||
attributeValue = ConvertTokenToXmlValue(reader);
|
||||
attributeNameValues.Add(attributeName, attributeValue);
|
||||
|
||||
string namespacePrefix;
|
||||
|
||||
Reference in New Issue
Block a user