-Fixed serializer handling of comments in JSON
This commit is contained in:
@@ -2549,5 +2549,29 @@ keyword such as type of business.""
|
|||||||
TypeNameHandling = TypeNameHandling.Objects
|
TypeNameHandling = TypeNameHandling.Objects
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TypedObjectDeserializationWithComments()
|
||||||
|
{
|
||||||
|
string json = @"/*comment*/ { /*comment*/
|
||||||
|
""Name"": /*comment*/ ""Apple"" /*comment*/, /*comment*/
|
||||||
|
""ExpiryDate"": ""\/Date(1230375600000+1300)\/"",
|
||||||
|
""Price"": 3.99,
|
||||||
|
""Sizes"": /*comment*/ [ /*comment*/
|
||||||
|
""Small"", /*comment*/
|
||||||
|
""Medium"" /*comment*/,
|
||||||
|
/*comment*/ ""Large""
|
||||||
|
/*comment*/ ] /*comment*/
|
||||||
|
} /*comment*/";
|
||||||
|
|
||||||
|
Product deserializedProduct = (Product)JsonConvert.DeserializeObject(json, typeof(Product));
|
||||||
|
|
||||||
|
Assert.AreEqual("Apple", deserializedProduct.Name);
|
||||||
|
Assert.AreEqual(new DateTime(2008, 12, 28), deserializedProduct.ExpiryDate);
|
||||||
|
Assert.AreEqual(3.99, deserializedProduct.Price);
|
||||||
|
Assert.AreEqual("Small", deserializedProduct.Sizes[0]);
|
||||||
|
Assert.AreEqual("Medium", deserializedProduct.Sizes[1]);
|
||||||
|
Assert.AreEqual("Large", deserializedProduct.Sizes[2]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -426,5 +426,33 @@ Parameter name: arrayIndex")]
|
|||||||
""title"": null
|
""title"": null
|
||||||
}", output);
|
}", output);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Example()
|
||||||
|
{
|
||||||
|
string json = @"{
|
||||||
|
""Name"": ""Apple"",
|
||||||
|
""Expiry"": new Date(1230422400000),
|
||||||
|
""Price"": 3.99,
|
||||||
|
""Sizes"": [
|
||||||
|
""Small"",
|
||||||
|
""Medium"",
|
||||||
|
""Large""
|
||||||
|
]
|
||||||
|
}";
|
||||||
|
|
||||||
|
JObject o = JObject.Parse(json);
|
||||||
|
|
||||||
|
string name = (string)o["Name"];
|
||||||
|
// Apple
|
||||||
|
|
||||||
|
JArray sizes = (JArray)o["Sizes"];
|
||||||
|
|
||||||
|
string smallest = (string)sizes[0];
|
||||||
|
// Small
|
||||||
|
|
||||||
|
Console.WriteLine(name);
|
||||||
|
Console.WriteLine(smallest);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -624,7 +624,7 @@ namespace Newtonsoft.Json
|
|||||||
{
|
{
|
||||||
deserializedValue = jsonSerializer.Deserialize(jsonReader, type);
|
deserializedValue = jsonSerializer.Deserialize(jsonReader, type);
|
||||||
|
|
||||||
if (jsonReader.Read())
|
if (jsonReader.Read() && jsonReader.TokenType != JsonToken.Comment)
|
||||||
throw new JsonSerializationException("Additional text found in JSON string after finishing deserializing object.");
|
throw new JsonSerializationException("Additional text found in JSON string after finishing deserializing object.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -136,7 +136,6 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
|
|
||||||
private object CreateValue(JsonReader reader, Type objectType, object existingValue, JsonConverter memberConverter)
|
private object CreateValue(JsonReader reader, Type objectType, object existingValue, JsonConverter memberConverter)
|
||||||
{
|
{
|
||||||
object value;
|
|
||||||
JsonConverter converter;
|
JsonConverter converter;
|
||||||
|
|
||||||
if (memberConverter != null)
|
if (memberConverter != null)
|
||||||
@@ -157,148 +156,154 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
switch (reader.TokenType)
|
do
|
||||||
{
|
{
|
||||||
// populate a typed object or generic dictionary/array
|
switch (reader.TokenType)
|
||||||
// depending upon whether an objectType was supplied
|
{
|
||||||
case JsonToken.StartObject:
|
// populate a typed object or generic dictionary/array
|
||||||
CheckedRead(reader);
|
// depending upon whether an objectType was supplied
|
||||||
|
case JsonToken.StartObject:
|
||||||
|
CheckedRead(reader);
|
||||||
|
|
||||||
string id = null;
|
string id = null;
|
||||||
|
|
||||||
if (reader.TokenType == JsonToken.PropertyName)
|
if (reader.TokenType == JsonToken.PropertyName)
|
||||||
{
|
|
||||||
bool specialProperty;
|
|
||||||
|
|
||||||
do
|
|
||||||
{
|
{
|
||||||
string propertyName = reader.Value.ToString();
|
bool specialProperty;
|
||||||
|
|
||||||
if (string.Equals(propertyName, JsonTypeReflector.RefPropertyName, StringComparison.Ordinal))
|
do
|
||||||
{
|
{
|
||||||
CheckedRead(reader);
|
string propertyName = reader.Value.ToString();
|
||||||
string reference = reader.Value.ToString();
|
|
||||||
|
|
||||||
CheckedRead(reader);
|
if (string.Equals(propertyName, JsonTypeReflector.RefPropertyName, StringComparison.Ordinal))
|
||||||
return _serializer.ReferenceResolver.ResolveReference(reference);
|
|
||||||
}
|
|
||||||
else if (string.Equals(propertyName, JsonTypeReflector.TypePropertyName, StringComparison.Ordinal))
|
|
||||||
{
|
|
||||||
CheckedRead(reader);
|
|
||||||
string qualifiedTypeName = reader.Value.ToString();
|
|
||||||
|
|
||||||
CheckedRead(reader);
|
|
||||||
|
|
||||||
if (_serializer.TypeNameHandling != TypeNameHandling.None)
|
|
||||||
{
|
{
|
||||||
int delimiterIndex = qualifiedTypeName.IndexOf(',');
|
CheckedRead(reader);
|
||||||
string typeName;
|
string reference = reader.Value.ToString();
|
||||||
string assemblyName;
|
|
||||||
if (delimiterIndex != -1)
|
|
||||||
{
|
|
||||||
typeName = qualifiedTypeName.Substring(0, delimiterIndex).Trim();
|
|
||||||
assemblyName = qualifiedTypeName.Substring(delimiterIndex + 1, qualifiedTypeName.Length - delimiterIndex - 1).Trim();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
typeName = qualifiedTypeName;
|
|
||||||
assemblyName = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Type specifiedType;
|
CheckedRead(reader);
|
||||||
try
|
return _serializer.ReferenceResolver.ResolveReference(reference);
|
||||||
{
|
|
||||||
specifiedType = _serializer.Binder.BindToType(assemblyName, typeName);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
throw new JsonSerializationException("Error resolving type specified in JSON '{0}'.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName), ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (specifiedType == null)
|
|
||||||
throw new JsonSerializationException("Type specified in JSON '{0}' was not resolved.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName));
|
|
||||||
|
|
||||||
if (objectType != null && !objectType.IsAssignableFrom(specifiedType))
|
|
||||||
throw new JsonSerializationException("Type specified in JSON '{0}' is not compatible with '{1}'.".FormatWith(CultureInfo.InvariantCulture, specifiedType.AssemblyQualifiedName, objectType.AssemblyQualifiedName));
|
|
||||||
|
|
||||||
objectType = specifiedType;
|
|
||||||
}
|
}
|
||||||
specialProperty = true;
|
else if (string.Equals(propertyName, JsonTypeReflector.TypePropertyName, StringComparison.Ordinal))
|
||||||
}
|
{
|
||||||
else if (string.Equals(propertyName, JsonTypeReflector.IdPropertyName, StringComparison.Ordinal))
|
CheckedRead(reader);
|
||||||
{
|
string qualifiedTypeName = reader.Value.ToString();
|
||||||
CheckedRead(reader);
|
|
||||||
|
|
||||||
id = reader.Value.ToString();
|
CheckedRead(reader);
|
||||||
CheckedRead(reader);
|
|
||||||
specialProperty = true;
|
|
||||||
}
|
|
||||||
else if (string.Equals(propertyName, JsonTypeReflector.ArrayValuesPropertyName, StringComparison.Ordinal))
|
|
||||||
{
|
|
||||||
CheckedRead(reader);
|
|
||||||
object list = CreateList(reader, objectType, existingValue, id);
|
|
||||||
CheckedRead(reader);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
specialProperty = false;
|
|
||||||
}
|
|
||||||
} while (specialProperty
|
|
||||||
&& reader.TokenType == JsonToken.PropertyName);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (objectType == null)
|
if (_serializer.TypeNameHandling != TypeNameHandling.None)
|
||||||
{
|
{
|
||||||
value = CreateJObject(reader);
|
int delimiterIndex = qualifiedTypeName.IndexOf(',');
|
||||||
}
|
string typeName;
|
||||||
else
|
string assemblyName;
|
||||||
{
|
if (delimiterIndex != -1)
|
||||||
if (CollectionUtils.IsDictionaryType(objectType))
|
{
|
||||||
|
typeName = qualifiedTypeName.Substring(0, delimiterIndex).Trim();
|
||||||
|
assemblyName = qualifiedTypeName.Substring(delimiterIndex + 1, qualifiedTypeName.Length - delimiterIndex - 1).Trim();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
typeName = qualifiedTypeName;
|
||||||
|
assemblyName = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Type specifiedType;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
specifiedType = _serializer.Binder.BindToType(assemblyName, typeName);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new JsonSerializationException("Error resolving type specified in JSON '{0}'.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName), ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (specifiedType == null)
|
||||||
|
throw new JsonSerializationException("Type specified in JSON '{0}' was not resolved.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName));
|
||||||
|
|
||||||
|
if (objectType != null && !objectType.IsAssignableFrom(specifiedType))
|
||||||
|
throw new JsonSerializationException("Type specified in JSON '{0}' is not compatible with '{1}'.".FormatWith(CultureInfo.InvariantCulture, specifiedType.AssemblyQualifiedName, objectType.AssemblyQualifiedName));
|
||||||
|
|
||||||
|
objectType = specifiedType;
|
||||||
|
}
|
||||||
|
specialProperty = true;
|
||||||
|
}
|
||||||
|
else if (string.Equals(propertyName, JsonTypeReflector.IdPropertyName, StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
CheckedRead(reader);
|
||||||
|
|
||||||
|
id = reader.Value.ToString();
|
||||||
|
CheckedRead(reader);
|
||||||
|
specialProperty = true;
|
||||||
|
}
|
||||||
|
else if (string.Equals(propertyName, JsonTypeReflector.ArrayValuesPropertyName, StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
CheckedRead(reader);
|
||||||
|
object list = CreateList(reader, objectType, existingValue, id);
|
||||||
|
CheckedRead(reader);
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
specialProperty = false;
|
||||||
|
}
|
||||||
|
} while (specialProperty
|
||||||
|
&& reader.TokenType == JsonToken.PropertyName);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (objectType == null)
|
||||||
{
|
{
|
||||||
if (existingValue == null)
|
return CreateJObject(reader);
|
||||||
value = CreateAndPopulateDictionary(reader, objectType, id);
|
|
||||||
else
|
|
||||||
value = PopulateDictionary(CollectionUtils.CreateDictionaryWrapper(existingValue), reader, id);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (existingValue == null)
|
if (CollectionUtils.IsDictionaryType(objectType))
|
||||||
value = CreateAndPopulateObject(reader, objectType, id);
|
{
|
||||||
|
if (existingValue == null)
|
||||||
|
return CreateAndPopulateDictionary(reader, objectType, id);
|
||||||
|
else
|
||||||
|
return PopulateDictionary(CollectionUtils.CreateDictionaryWrapper(existingValue), reader, id);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
value = PopulateObject(existingValue, reader, objectType, id);
|
{
|
||||||
|
if (existingValue == null)
|
||||||
|
return CreateAndPopulateObject(reader, objectType, id);
|
||||||
|
else
|
||||||
|
return PopulateObject(existingValue, reader, objectType, id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
break;
|
||||||
break;
|
case JsonToken.StartArray:
|
||||||
case JsonToken.StartArray:
|
return CreateList(reader, objectType, existingValue, null);
|
||||||
value = CreateList(reader, objectType, existingValue, null);
|
break;
|
||||||
break;
|
case JsonToken.Integer:
|
||||||
case JsonToken.Integer:
|
case JsonToken.Float:
|
||||||
case JsonToken.Float:
|
case JsonToken.String:
|
||||||
case JsonToken.String:
|
case JsonToken.Boolean:
|
||||||
case JsonToken.Boolean:
|
case JsonToken.Date:
|
||||||
case JsonToken.Date:
|
return EnsureType(reader.Value, objectType);
|
||||||
value = EnsureType(reader.Value, objectType);
|
break;
|
||||||
break;
|
case JsonToken.StartConstructor:
|
||||||
case JsonToken.StartConstructor:
|
case JsonToken.EndConstructor:
|
||||||
case JsonToken.EndConstructor:
|
string constructorName = reader.Value.ToString();
|
||||||
string constructorName = reader.Value.ToString();
|
|
||||||
|
|
||||||
value = constructorName;
|
return constructorName;
|
||||||
break;
|
break;
|
||||||
case JsonToken.Null:
|
case JsonToken.Null:
|
||||||
case JsonToken.Undefined:
|
case JsonToken.Undefined:
|
||||||
if (objectType == typeof(DBNull))
|
if (objectType == typeof(DBNull))
|
||||||
value = DBNull.Value;
|
return DBNull.Value;
|
||||||
else
|
else
|
||||||
value = null;
|
return null;
|
||||||
break;
|
break;
|
||||||
default:
|
case JsonToken.Comment:
|
||||||
throw new JsonSerializationException("Unexpected token while deserializing object: " + reader.TokenType);
|
// ignore
|
||||||
}
|
break;
|
||||||
|
default:
|
||||||
|
throw new JsonSerializationException("Unexpected token while deserializing object: " + reader.TokenType);
|
||||||
|
}
|
||||||
|
} while (reader.Read());
|
||||||
|
|
||||||
|
throw new JsonSerializationException("Unexpected end when deserializing object.");
|
||||||
}
|
}
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CheckedRead(JsonReader reader)
|
private void CheckedRead(JsonReader reader)
|
||||||
@@ -646,6 +651,9 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
throw new JsonSerializationException("Required property '{0}' not found in JSON.".FormatWith(CultureInfo.InvariantCulture, requiredMapping.Key));
|
throw new JsonSerializationException("Required property '{0}' not found in JSON.".FormatWith(CultureInfo.InvariantCulture, requiredMapping.Key));
|
||||||
}
|
}
|
||||||
return newObject;
|
return newObject;
|
||||||
|
case JsonToken.Comment:
|
||||||
|
// ignore
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new JsonSerializationException("Unexpected token when deserializing object: " + reader.TokenType);
|
throw new JsonSerializationException("Unexpected token when deserializing object: " + reader.TokenType);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user