-Added SpecialPropertiesHandling

This commit is contained in:
James Newton-King
2014-02-12 01:43:46 +13:00
parent 71a91bf34f
commit 0f77cd1b03
30 changed files with 659 additions and 128 deletions
@@ -44,6 +44,21 @@ namespace Newtonsoft.Json.Tests.Linq
[TestFixture] [TestFixture]
public class JTokenReaderTest : TestFixtureBase public class JTokenReaderTest : TestFixtureBase
{ {
[Test]
public void ErrorTokenIndex()
{
JObject json = JObject.Parse(@"{""IntList"":[1, ""two""]}");
ExceptionAssert.Throws<Exception>(
"Could not convert string to integer: two. Path 'IntList[1]', line 1, position 20.",
() =>
{
JsonSerializer serializer = new JsonSerializer();
serializer.Deserialize<TraceTestObject>(json.CreateReader());
});
}
#if !NET20 #if !NET20
[Test] [Test]
public void YahooFinance() public void YahooFinance()
@@ -49,6 +49,24 @@ namespace Newtonsoft.Json.Tests.Linq
[TestFixture] [TestFixture]
public class LinqToJsonTest : TestFixtureBase public class LinqToJsonTest : TestFixtureBase
{ {
[Test]
public void JPropertyPath()
{
JObject o = new JObject
{
{
"person",
new JObject
{
{ "$id", 1 }
}
}
};
JContainer idProperty = o["person"]["$id"].Parent;
Assert.AreEqual("person.$id", idProperty.Path);
}
[Test] [Test]
public void ForEach() public void ForEach()
{ {
@@ -102,6 +102,7 @@
<Compile Include="Serialization\JsonPropertyCollectionTests.cs" /> <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
<Compile Include="Serialization\NullValueHandlingTests.cs" /> <Compile Include="Serialization\NullValueHandlingTests.cs" />
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" /> <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
<Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
<Compile Include="Serialization\TraceWriterTests.cs" /> <Compile Include="Serialization\TraceWriterTests.cs" />
<Compile Include="Serialization\WebApiIntegrationTests.cs" /> <Compile Include="Serialization\WebApiIntegrationTests.cs" />
<Compile Include="TestObjects\Bar.cs" /> <Compile Include="TestObjects\Bar.cs" />
@@ -144,6 +144,7 @@
<Compile Include="Serialization\JsonPropertyCollectionTests.cs" /> <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
<Compile Include="Serialization\NullValueHandlingTests.cs" /> <Compile Include="Serialization\NullValueHandlingTests.cs" />
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" /> <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
<Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
<Compile Include="Serialization\TraceWriterTests.cs" /> <Compile Include="Serialization\TraceWriterTests.cs" />
<Compile Include="Serialization\WebApiIntegrationTests.cs" /> <Compile Include="Serialization\WebApiIntegrationTests.cs" />
<Compile Include="TestObjects\Bar.cs" /> <Compile Include="TestObjects\Bar.cs" />
@@ -260,6 +260,7 @@
<Compile Include="Serialization\DynamicTests.cs" /> <Compile Include="Serialization\DynamicTests.cs" />
<Compile Include="Serialization\ImmutableCollectionsTests.cs" /> <Compile Include="Serialization\ImmutableCollectionsTests.cs" />
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" /> <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
<Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
<Compile Include="Serialization\TraceWriterTests.cs" /> <Compile Include="Serialization\TraceWriterTests.cs" />
<Compile Include="Serialization\WebApiIntegrationTests.cs" /> <Compile Include="Serialization\WebApiIntegrationTests.cs" />
<Compile Include="Serialization\JsonPropertyCollectionTests.cs" /> <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
@@ -144,6 +144,7 @@
<Compile Include="Serialization\DynamicTests.cs" /> <Compile Include="Serialization\DynamicTests.cs" />
<Compile Include="Serialization\ImmutableCollectionsTests.cs" /> <Compile Include="Serialization\ImmutableCollectionsTests.cs" />
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" /> <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
<Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
<Compile Include="Serialization\TraceWriterTests.cs" /> <Compile Include="Serialization\TraceWriterTests.cs" />
<Compile Include="Serialization\WebApiIntegrationTests.cs" /> <Compile Include="Serialization\WebApiIntegrationTests.cs" />
<Compile Include="Serialization\JsonPropertyCollectionTests.cs" /> <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
@@ -139,6 +139,7 @@
<Compile Include="Serialization\DefaultValueHandlingTests.cs" /> <Compile Include="Serialization\DefaultValueHandlingTests.cs" />
<Compile Include="Serialization\DynamicTests.cs" /> <Compile Include="Serialization\DynamicTests.cs" />
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" /> <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
<Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
<Compile Include="Serialization\TraceWriterTests.cs" /> <Compile Include="Serialization\TraceWriterTests.cs" />
<Compile Include="Serialization\WebApiIntegrationTests.cs" /> <Compile Include="Serialization\WebApiIntegrationTests.cs" />
<Compile Include="Serialization\JsonPropertyCollectionTests.cs" /> <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
@@ -243,6 +243,7 @@
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" /> <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
<Compile Include="Serialization\SerializationErrorHandlingTests.cs" /> <Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
<Compile Include="Serialization\SerializationEventAttributeTests.cs" /> <Compile Include="Serialization\SerializationEventAttributeTests.cs" />
<Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
<Compile Include="Serialization\TraceWriterTests.cs" /> <Compile Include="Serialization\TraceWriterTests.cs" />
<Compile Include="Serialization\TypeNameHandlingTests.cs" /> <Compile Include="Serialization\TypeNameHandlingTests.cs" />
<Compile Include="Serialization\WebApiIntegrationTests.cs" /> <Compile Include="Serialization\WebApiIntegrationTests.cs" />
@@ -75,4 +75,4 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.1.16929")] [assembly: AssemblyFileVersion("6.0.1.17012")]
@@ -2345,19 +2345,22 @@ keyword such as type of business.""
[Test] [Test]
public void DeserializeRequiredMembersClassNullRequiredValueProperty() public void DeserializeRequiredMembersClassNullRequiredValueProperty()
{ {
ExceptionAssert.Throws<JsonSerializationException>( try
"Required property 'FirstName' expects a value but got null. Path '', line 6, position 2.", {
() => string json = @"{
{
string json = @"{
""FirstName"": null, ""FirstName"": null,
""MiddleName"": null, ""MiddleName"": null,
""LastName"": null, ""LastName"": null,
""BirthDate"": ""\/Date(977309755000)\/"" ""BirthDate"": ""\/Date(977309755000)\/""
}"; }";
JsonConvert.DeserializeObject<RequiredMembersClass>(json); JsonConvert.DeserializeObject<RequiredMembersClass>(json);
}); Assert.Fail();
}
catch (JsonSerializationException ex)
{
Assert.IsTrue(ex.Message.StartsWith("Required property 'FirstName' expects a value but got null. Path ''"));
}
} }
[Test] [Test]
@@ -2383,16 +2386,19 @@ keyword such as type of business.""
[Test] [Test]
public void RequiredMembersClassMissingRequiredProperty() public void RequiredMembersClassMissingRequiredProperty()
{ {
ExceptionAssert.Throws<JsonSerializationException>( try
"Required property 'LastName' not found in JSON. Path '', line 3, position 2.", {
() => string json = @"{
{
string json = @"{
""FirstName"": ""Bob"" ""FirstName"": ""Bob""
}"; }";
JsonConvert.DeserializeObject<RequiredMembersClass>(json); JsonConvert.DeserializeObject<RequiredMembersClass>(json);
}); Assert.Fail();
}
catch (JsonSerializationException ex)
{
Assert.IsTrue(ex.Message.StartsWith("Required property 'LastName' not found in JSON. Path ''"));
}
} }
[Test] [Test]
@@ -2631,10 +2637,17 @@ keyword such as type of business.""
[Test] [Test]
public void RequiredWhenUsingConstructor() public void RequiredWhenUsingConstructor()
{ {
string json = "{ 'testProperty1': 'value' }"; try
{
string json = "{ 'testProperty1': 'value' }";
JsonConvert.DeserializeObject<ConstructorAndRequiredTestClass>(json);
ExceptionAssert.Throws<JsonSerializationException>("Required property 'TestProperty2' not found in JSON. Path '', line 1, position 28.", Assert.Fail();
() => JsonConvert.DeserializeObject<ConstructorAndRequiredTestClass>(json)); }
catch (JsonSerializationException ex)
{
Assert.IsTrue(ex.Message.StartsWith("Required property 'TestProperty2' not found in JSON. Path ''"));
}
} }
[Test] [Test]
@@ -3351,11 +3364,17 @@ Path '', line 1, position 1.",
{ {
string json = @"{}"; string json = @"{}";
ExceptionAssert.Throws<JsonSerializationException>( try
@"Cannot deserialize the current JSON object (e.g. {""name"":""value""}) into type 'System.Collections.Generic.List`1[Newtonsoft.Json.Tests.TestObjects.Person]' because the type requires a JSON array (e.g. [1,2,3]) to deserialize correctly. {
JsonConvert.DeserializeObject<List<Person>>(json);
Assert.Fail();
}
catch (JsonSerializationException ex)
{
Assert.IsTrue(ex.Message.StartsWith(@"Cannot deserialize the current JSON object (e.g. {""name"":""value""}) into type 'System.Collections.Generic.List`1[Newtonsoft.Json.Tests.TestObjects.Person]' because the type requires a JSON array (e.g. [1,2,3]) to deserialize correctly.
To fix this error either change the JSON to a JSON array (e.g. [1,2,3]) or change the deserialized type so that it is a normal .NET type (e.g. not a primitive type like integer, not a collection type like an array or List<T>) that can be deserialized from a JSON object. JsonObjectAttribute can also be added to the type to force it to deserialize from a JSON object. To fix this error either change the JSON to a JSON array (e.g. [1,2,3]) or change the deserialized type so that it is a normal .NET type (e.g. not a primitive type like integer, not a collection type like an array or List<T>) that can be deserialized from a JSON object. JsonObjectAttribute can also be added to the type to force it to deserialize from a JSON object.
Path '', line 1, position 2.", Path ''"));
() => { JsonConvert.DeserializeObject<List<Person>>(json); }); }
} }
[Test] [Test]
@@ -3574,17 +3593,21 @@ Path '', line 1, position 2.",
[Test] [Test]
public void DeserializePersonKeyedDictionary() public void DeserializePersonKeyedDictionary()
{ {
ExceptionAssert.Throws<JsonSerializationException>("Could not convert string 'Newtonsoft.Json.Tests.TestObjects.Person' to dictionary key type 'Newtonsoft.Json.Tests.TestObjects.Person'. Create a TypeConverter to convert from the string to the key type object. Path 'Newtonsoft.Json.Tests.TestObjects.Person', line 2, position 46.", try
() => {
{ string json =
string json = @"{
@"{
""Newtonsoft.Json.Tests.TestObjects.Person"": 1, ""Newtonsoft.Json.Tests.TestObjects.Person"": 1,
""Newtonsoft.Json.Tests.TestObjects.Person"": 2 ""Newtonsoft.Json.Tests.TestObjects.Person"": 2
}"; }";
JsonConvert.DeserializeObject<Dictionary<Person, int>>(json); JsonConvert.DeserializeObject<Dictionary<Person, int>>(json);
}); Assert.Fail();
}
catch (JsonSerializationException ex)
{
Assert.IsTrue(ex.Message.StartsWith("Could not convert string 'Newtonsoft.Json.Tests.TestObjects.Person' to dictionary key type 'Newtonsoft.Json.Tests.TestObjects.Person'. Create a TypeConverter to convert from the string to the key type object. Path 'Newtonsoft.Json.Tests.TestObjects.Person'"));
}
} }
[Test] [Test]
@@ -5004,7 +5027,10 @@ To fix this error either change the environment to be fully trusted, change the
child.Add("Name", "Isabell"); child.Add("Name", "Isabell");
child.Add("Father", reference); child.Add("Father", reference);
var json = JsonConvert.SerializeObject(child); string json = JsonConvert.SerializeObject(child);
Console.WriteLine(json);
Dictionary<string, object> result = JsonConvert.DeserializeObject<Dictionary<string, object>>(json); Dictionary<string, object> result = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
Assert.AreEqual(3, result.Count); Assert.AreEqual(3, result.Count);
@@ -5447,7 +5473,14 @@ To fix this error either change the environment to be fully trusted, change the
}); });
Assert.AreEqual("{\"Offset\":\"2000-01-01T00:00:00+06:00\"}", serializeObject); Assert.AreEqual("{\"Offset\":\"2000-01-01T00:00:00+06:00\"}", serializeObject);
var deserializeObject = JsonConvert.DeserializeObject<TimeZoneOffsetObject>(serializeObject);
JsonTextReader reader = new JsonTextReader(new StringReader(serializeObject));
reader.DateParseHandling = DateParseHandling.None;
JsonSerializer serializer = new JsonSerializer();
var deserializeObject = serializer.Deserialize<TimeZoneOffsetObject>(reader);
Assert.AreEqual(TimeSpan.FromHours(6), deserializeObject.Offset.Offset); Assert.AreEqual(TimeSpan.FromHours(6), deserializeObject.Offset.Offset);
Assert.AreEqual(new DateTime(2000, 1, 1), deserializeObject.Offset.Date); Assert.AreEqual(new DateTime(2000, 1, 1), deserializeObject.Offset.Date);
} }
@@ -5468,7 +5501,13 @@ To fix this error either change the environment to be fully trusted, change the
}, Formatting.None, new JsonSerializerSettings { DateFormatHandling = DateFormatHandling.MicrosoftDateFormat }); }, Formatting.None, new JsonSerializerSettings { DateFormatHandling = DateFormatHandling.MicrosoftDateFormat });
Assert.AreEqual("{\"Offset\":\"\\/Date(946663200000+0600)\\/\"}", serializeObject); Assert.AreEqual("{\"Offset\":\"\\/Date(946663200000+0600)\\/\"}", serializeObject);
var deserializeObject = JsonConvert.DeserializeObject<TimeZoneOffsetObject>(serializeObject);
JsonTextReader reader = new JsonTextReader(new StringReader(serializeObject));
JsonSerializer serializer = new JsonSerializer();
var deserializeObject = serializer.Deserialize<TimeZoneOffsetObject>(reader);
Assert.AreEqual(TimeSpan.FromHours(6), deserializeObject.Offset.Offset); Assert.AreEqual(TimeSpan.FromHours(6), deserializeObject.Offset.Offset);
Assert.AreEqual(new DateTime(2000, 1, 1), deserializeObject.Offset.Date); Assert.AreEqual(new DateTime(2000, 1, 1), deserializeObject.Offset.Date);
} }
@@ -5563,7 +5602,12 @@ To fix this error either change the environment to be fully trusted, change the
public void DeserializeDecimalPropertyExact() public void DeserializeDecimalPropertyExact()
{ {
string json = "{Amount:123456789876543.21}"; string json = "{Amount:123456789876543.21}";
Invoice i = JsonConvert.DeserializeObject<Invoice>(json); JsonTextReader reader = new JsonTextReader(new StringReader(json));
reader.FloatParseHandling = FloatParseHandling.Decimal;
JsonSerializer serializer = new JsonSerializer();
Invoice i = serializer.Deserialize<Invoice>(reader);
Assert.AreEqual(123456789876543.21m, i.Amount); Assert.AreEqual(123456789876543.21m, i.Amount);
} }
@@ -5579,7 +5623,12 @@ To fix this error either change the environment to be fully trusted, change the
public void DeserializeDecimalDictionaryExact() public void DeserializeDecimalDictionaryExact()
{ {
string json = "{'Value':123456789876543.21}"; string json = "{'Value':123456789876543.21}";
IDictionary<string, decimal> d = JsonConvert.DeserializeObject<IDictionary<string, decimal>>(json); JsonTextReader reader = new JsonTextReader(new StringReader(json));
reader.FloatParseHandling = FloatParseHandling.Decimal;
JsonSerializer serializer = new JsonSerializer();
IDictionary<string, decimal> d = serializer.Deserialize<IDictionary<string, decimal>>(reader);
Assert.AreEqual(123456789876543.21m, d["Value"]); Assert.AreEqual(123456789876543.21m, d["Value"]);
} }
@@ -5794,7 +5843,7 @@ To fix this error either change the environment to be fully trusted, change the
} }
[Test] [Test]
public void OnError() public void DeserializeMinValueDecimal()
{ {
var data = new DecimalTest(decimal.MinValue); var data = new DecimalTest(decimal.MinValue);
var json = JsonConvert.SerializeObject(data); var json = JsonConvert.SerializeObject(data);
@@ -6957,8 +7006,8 @@ To fix this error either change the environment to be fully trusted, change the
[Test] [Test]
public void DeserializeUnexpectedEndInt() public void DeserializeUnexpectedEndInt()
{ {
ExceptionAssert.Throws<JsonSerializationException>( ExceptionAssert.Throws<JsonException>(
"Unexpected end when setting PreProperty's value. Path 'PreProperty', line 2, position 18.", null,
() => () =>
{ {
string json = @"{ string json = @"{
@@ -7395,10 +7444,10 @@ Parameter name: value",
Assert.IsNotNull(o); Assert.IsNotNull(o);
Assert.AreEqual(4, errors.Count); Assert.AreEqual(4, errors.Count);
Assert.AreEqual("Required property 'NonAttributeProperty' not found in JSON. Path '', line 1, position 2.", errors[0]); Assert.IsTrue(errors[0].StartsWith("Required property 'NonAttributeProperty' not found in JSON. Path ''"));
Assert.AreEqual("Required property 'UnsetProperty' not found in JSON. Path '', line 1, position 2.", errors[1]); Assert.IsTrue(errors[1].StartsWith("Required property 'UnsetProperty' not found in JSON. Path ''"));
Assert.AreEqual("Required property 'AllowNullProperty' not found in JSON. Path '', line 1, position 2.", errors[2]); Assert.IsTrue(errors[2].StartsWith("Required property 'AllowNullProperty' not found in JSON. Path ''"));
Assert.AreEqual("Required property 'AlwaysProperty' not found in JSON. Path '', line 1, position 2.", errors[3]); Assert.IsTrue(errors[3].StartsWith("Required property 'AlwaysProperty' not found in JSON. Path ''"));
} }
[Test] [Test]
@@ -7420,9 +7469,9 @@ Parameter name: value",
Assert.IsNotNull(o); Assert.IsNotNull(o);
Assert.AreEqual(3, errors.Count); Assert.AreEqual(3, errors.Count);
Assert.AreEqual("Required property 'NonAttributeProperty' expects a value but got null. Path '', line 1, position 97.", errors[0]); Assert.IsTrue(errors[0].StartsWith("Required property 'NonAttributeProperty' expects a value but got null. Path ''"));
Assert.AreEqual("Required property 'UnsetProperty' expects a value but got null. Path '', line 1, position 97.", errors[1]); Assert.IsTrue(errors[1].StartsWith("Required property 'UnsetProperty' expects a value but got null. Path ''"));
Assert.AreEqual("Required property 'AlwaysProperty' expects a value but got null. Path '', line 1, position 97.", errors[2]); Assert.IsTrue(errors[2].StartsWith("Required property 'AlwaysProperty' expects a value but got null. Path ''"));
} }
[Test] [Test]
@@ -8552,8 +8601,8 @@ Parameter name: value",
{ {
string json = @"{""Before"":""Before!"",""Coordinates"":[/*hi*/[/*hi*/[1/*hi*/,/*hi*/1/*hi*/,1]/*hi*/,/*hi*/[1,1"; string json = @"{""Before"":""Before!"",""Coordinates"":[/*hi*/[/*hi*/[1/*hi*/,/*hi*/1/*hi*/,1]/*hi*/,/*hi*/[1,1";
ExceptionAssert.Throws<JsonSerializationException>( ExceptionAssert.Throws<JsonException>(
"Unexpected end when deserializing array. Path 'Coordinates[0][1][1]', line 1, position 90.", null,
() => JsonConvert.DeserializeObject<Array3D>(json)); () => JsonConvert.DeserializeObject<Array3D>(json));
} }
@@ -8562,8 +8611,8 @@ Parameter name: value",
{ {
string json = @"{""Before"":""Before!"",""Coordinates"":[/*hi*/[/*hi*/"; string json = @"{""Before"":""Before!"",""Coordinates"":[/*hi*/[/*hi*/";
ExceptionAssert.Throws<JsonSerializationException>( ExceptionAssert.Throws<JsonException>(
"Unexpected end when deserializing array. Path 'Coordinates[0]', line 1, position 48.", null,
() => JsonConvert.DeserializeObject<Array3D>(json)); () => JsonConvert.DeserializeObject<Array3D>(json));
} }
@@ -415,8 +415,8 @@ namespace Newtonsoft.Json.Tests.Serialization
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof(MyTypeWithRequiredMembers)); serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof(MyTypeWithRequiredMembers));
Assert.AreEqual(2, errors.Count); Assert.AreEqual(2, errors.Count);
Assert.AreEqual(" - Required1 - Required property 'Required1' not found in JSON. Path '', line 1, position 2.", errors[0]); Assert.IsTrue(errors[0].StartsWith(" - Required1 - Required property 'Required1' not found in JSON. Path '', line 1, position 2."));
Assert.AreEqual(" - Required2 - Required property 'Required2' not found in JSON. Path '', line 1, position 2.", errors[1]); Assert.IsTrue(errors[1].StartsWith(" - Required2 - Required property 'Required2' not found in JSON. Path '', line 1, position 2."));
} }
[Test] [Test]
@@ -0,0 +1,209 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization.Formatters;
using System.Text;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Tests.TestObjects;
using Newtonsoft.Json.Utilities;
using NUnit.Framework;
namespace Newtonsoft.Json.Tests.Serialization
{
[TestFixture]
public class SpecialPropertyHandlingTests : TestFixtureBase
{
[Test]
public void DeserializeArraysWithPreserveObjectReferences()
{
string json = @"{
""$id"": ""1"",
""$values"": [
null,
{
""$id"": ""2"",
""$values"": [
null
]
},
{
""$id"": ""3"",
""$values"": [
{
""$id"": ""4"",
""$values"": [
{
""$ref"": ""1""
}
]
}
]
}
]
}";
ExceptionAssert.Throws<JsonSerializationException>(
@"Cannot preserve reference to array or readonly list, or list created from a non-default constructor: System.String[][]. Path '$values', line 3, position 15.",
() =>
{
JsonConvert.DeserializeObject<string[][]>(json,
new JsonSerializerSettings
{
PreserveReferencesHandling = PreserveReferencesHandling.All,
SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
});
});
}
[Test]
public void SerializeRefNull()
{
var reference = new Dictionary<string, object>();
reference.Add("blah", "blah!");
reference.Add("$ref", null);
reference.Add("$id", null);
var child = new Dictionary<string, object>();
child.Add("_id", 2);
child.Add("Name", "Isabell");
child.Add("Father", reference);
string json = JsonConvert.SerializeObject(child);
Console.WriteLine(json);
Dictionary<string, object> result = JsonConvert.DeserializeObject<Dictionary<string, object>>(json, new JsonSerializerSettings
{
SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
});
Assert.AreEqual(3, result.Count);
Assert.AreEqual(1, ((JObject)result["Father"]).Count);
Assert.AreEqual("blah!", (string)((JObject)result["Father"])["blah"]);
}
[Test]
public void DeserializeEmployeeReference()
{
string json = @"[
{
""Name"": ""Mike Manager"",
""$id"": ""1"",
""Manager"": null
},
{
""Name"": ""Joe User"",
""$id"": ""2"",
""Manager"": {
""$ref"": ""1""
}
}
]";
List<EmployeeReference> employees = JsonConvert.DeserializeObject<List<EmployeeReference>>(json, new JsonSerializerSettings
{
SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
});
Assert.AreEqual(2, employees.Count);
Assert.AreEqual("Mike Manager", employees[0].Name);
Assert.AreEqual("Joe User", employees[1].Name);
Assert.AreEqual(employees[0], employees[1].Manager);
}
#if !(PORTABLE || PORTABLE40)
[Test]
public void DeserializeGenericObjectListWithTypeName()
{
string employeeRef = typeof(EmployeeReference).AssemblyQualifiedName;
string personRef = typeof(Person).AssemblyQualifiedName;
string json = @"[
{
""Name"": ""Bob"",
""$id"": ""1"",
""$type"": """ + employeeRef + @""",
""Manager"": {
""$id"": ""2"",
""$type"": """ + employeeRef + @""",
""Name"": ""Frank"",
""Manager"": null
}
},
{
""Name"": null,
""$type"": """ + personRef + @""",
""BirthDate"": ""\/Date(978134400000)\/"",
""LastModified"": ""\/Date(978134400000)\/""
},
""String!"",
-2147483648
]";
List<object> values = (List<object>)JsonConvert.DeserializeObject(json, typeof(List<object>), new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.Objects,
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full,
SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
});
Assert.AreEqual(4, values.Count);
EmployeeReference e = (EmployeeReference)values[0];
Person p = (Person)values[1];
Assert.AreEqual("Bob", e.Name);
Assert.AreEqual("Frank", e.Manager.Name);
Assert.AreEqual(null, p.Name);
Assert.AreEqual(new DateTime(2000, 12, 30, 0, 0, 0, DateTimeKind.Utc), p.BirthDate);
Assert.AreEqual(new DateTime(2000, 12, 30, 0, 0, 0, DateTimeKind.Utc), p.LastModified);
Assert.AreEqual("String!", values[2]);
Assert.AreEqual((long)int.MinValue, values[3]);
}
[Test]
public void WriteListTypeNameForProperty()
{
string listRef = ReflectionUtils.GetTypeName(typeof(List<int>), FormatterAssemblyStyle.Simple, null);
TypeNameHandlingTests.TypeNameProperty typeNameProperty = new TypeNameHandlingTests.TypeNameProperty
{
Name = "Name!",
Value = new List<int> { 1, 2, 3, 4, 5 }
};
string json = JsonConvert.SerializeObject(typeNameProperty, Formatting.Indented);
Assert.AreEqual(@"{
""Name"": ""Name!"",
""Value"": {
""$type"": """ + listRef + @""",
""$values"": [
1,
2,
3,
4,
5
]
}
}", json);
TypeNameHandlingTests.TypeNameProperty deserialized = JsonConvert.DeserializeObject<TypeNameHandlingTests.TypeNameProperty>(json, new JsonSerializerSettings
{
SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
});
Assert.AreEqual("Name!", deserialized.Name);
CustomAssert.IsInstanceOfType(typeof(List<int>), deserialized.Value);
List<int> nested = (List<int>)deserialized.Value;
Assert.AreEqual(5, nested.Count);
Assert.AreEqual(1, nested[0]);
Assert.AreEqual(2, nested[1]);
Assert.AreEqual(3, nested[2]);
Assert.AreEqual(4, nested[3]);
Assert.AreEqual(5, nested[4]);
}
#endif
}
}
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using Newtonsoft.Json.Linq;
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) #if !(NET20 || NET35 || PORTABLE || PORTABLE40)
using System.Numerics; using System.Numerics;
#endif #endif
@@ -270,15 +271,15 @@ Newtonsoft.Json Error: 0 : Error!
Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path 'IntList', line 2, position 13.", traceWriter.TraceRecords[0].Message); Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path 'IntList', line 2, position 13.", traceWriter.TraceRecords[0].Message);
Assert.AreEqual("Started deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList', line 2, position 15.", traceWriter.TraceRecords[1].Message); Assert.AreEqual("Started deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList', line 2, position 15.", traceWriter.TraceRecords[1].Message);
Assert.AreEqual("Finished deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList', line 5, position 4.", traceWriter.TraceRecords[2].Message); Assert.IsTrue(traceWriter.TraceRecords[2].Message.StartsWith("Finished deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList'"));
Assert.AreEqual("Started deserializing System.String[]. Path 'StringArray', line 6, position 19.", traceWriter.TraceRecords[3].Message); Assert.AreEqual("Started deserializing System.String[]. Path 'StringArray', line 6, position 19.", traceWriter.TraceRecords[3].Message);
Assert.AreEqual("Finished deserializing System.String[]. Path 'StringArray', line 9, position 4.", traceWriter.TraceRecords[4].Message); Assert.IsTrue(traceWriter.TraceRecords[4].Message.StartsWith("Finished deserializing System.String[]. Path 'StringArray'"));
Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path 'Version.Major', line 11, position 13.", traceWriter.TraceRecords[5].Message); Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path 'Version.Major', line 11, position 13.", traceWriter.TraceRecords[5].Message);
Assert.AreEqual("Started deserializing System.Version. Path 'Version', line 17, position 4.", traceWriter.TraceRecords[6].Message); Assert.IsTrue(traceWriter.TraceRecords[6].Message.StartsWith("Started deserializing System.Version. Path 'Version'"));
Assert.AreEqual("Finished deserializing System.Version. Path 'Version', line 17, position 4.", traceWriter.TraceRecords[7].Message); Assert.IsTrue(traceWriter.TraceRecords[7].Message.StartsWith("Finished deserializing System.Version. Path 'Version'"));
Assert.AreEqual("Started deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary.1', line 19, position 9.", traceWriter.TraceRecords[8].Message); Assert.AreEqual("Started deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary.1', line 19, position 9.", traceWriter.TraceRecords[8].Message);
Assert.AreEqual("Finished deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary', line 22, position 4.", traceWriter.TraceRecords[9].Message); Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary'"));
Assert.AreEqual("Finished deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path '', line 23, position 2.", traceWriter.TraceRecords[10].Message); Assert.IsTrue(traceWriter.TraceRecords[10].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path ''"));
Assert.IsFalse(traceWriter.TraceRecords.Any(r => r.Level == TraceLevel.Verbose)); Assert.IsFalse(traceWriter.TraceRecords.Any(r => r.Level == TraceLevel.Verbose));
} }
@@ -402,7 +403,7 @@ Newtonsoft.Json Error: 0 : Error!
Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message == "Read object reference Id '1' for Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'other', line 3, position 11.")); Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message == "Read object reference Id '1' for Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'other', line 3, position 11."));
Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message == "Read object reference Id '2' for Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'other.blah', line 5, position 12.")); Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message == "Read object reference Id '2' for Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'other.blah', line 5, position 12."));
Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message == "Resolved object reference '1' to Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'self', line 9, position 4.")); Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message.StartsWith("Resolved object reference '1' to Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'self'")));
} }
[Test] [Test]
@@ -523,12 +524,12 @@ Newtonsoft.Json Error: 0 : Error!
Assert.AreEqual("Started deserializing System.Collections.Generic.List`1[System.Object]. Path '$values', line 3, position 15.", traceWriter.TraceRecords[1].Message); Assert.AreEqual("Started deserializing System.Collections.Generic.List`1[System.Object]. Path '$values', line 3, position 15.", traceWriter.TraceRecords[1].Message);
Assert.AreEqual("Resolved type 'System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String, mscorlib]], mscorlib' to System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0].$type', line 5, position 120.", traceWriter.TraceRecords[2].Message); Assert.AreEqual("Resolved type 'System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String, mscorlib]], mscorlib' to System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0].$type', line 5, position 120.", traceWriter.TraceRecords[2].Message);
Assert.AreEqual("Started deserializing System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0].key!', line 6, position 14.", traceWriter.TraceRecords[3].Message); Assert.AreEqual("Started deserializing System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0].key!', line 6, position 14.", traceWriter.TraceRecords[3].Message);
Assert.AreEqual("Finished deserializing System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0]', line 7, position 6.", traceWriter.TraceRecords[4].Message); Assert.IsTrue(traceWriter.TraceRecords[4].Message.StartsWith("Finished deserializing System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0]'"));
Assert.AreEqual("Resolved type 'System.Version, mscorlib' to System.Version. Path '$values[1].$type', line 9, position 42.", traceWriter.TraceRecords[5].Message); Assert.AreEqual("Resolved type 'System.Version, mscorlib' to System.Version. Path '$values[1].$type', line 9, position 42.", traceWriter.TraceRecords[5].Message);
Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path '$values[1].Major', line 10, position 15.", traceWriter.TraceRecords[6].Message); Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path '$values[1].Major', line 10, position 15.", traceWriter.TraceRecords[6].Message);
Assert.AreEqual("Started deserializing System.Version. Path '$values[1]', line 16, position 6.", traceWriter.TraceRecords[7].Message); Assert.IsTrue(traceWriter.TraceRecords[7].Message.StartsWith("Started deserializing System.Version. Path '$values[1]'"));
Assert.AreEqual("Finished deserializing System.Version. Path '$values[1]', line 16, position 6.", traceWriter.TraceRecords[8].Message); Assert.IsTrue(traceWriter.TraceRecords[8].Message.StartsWith("Finished deserializing System.Version. Path '$values[1]'"));
Assert.AreEqual("Finished deserializing System.Collections.Generic.List`1[System.Object]. Path '$values', line 17, position 4.", traceWriter.TraceRecords[9].Message); Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.List`1[System.Object]. Path '$values'"));
} }
#if !(NETFX_CORE || PORTABLE || PORTABLE40) #if !(NETFX_CORE || PORTABLE || PORTABLE40)
@@ -552,7 +553,7 @@ Newtonsoft.Json Error: 0 : Error!
}); });
}); });
Assert.AreEqual("Deserializing System.Exception using ISerializable constructor. Path '', line 1, position 2.", traceWriter.TraceRecords[0].Message); Assert.IsTrue(traceWriter.TraceRecords[0].Message.StartsWith("Deserializing System.Exception using ISerializable constructor. Path ''"));
Assert.AreEqual(TraceLevel.Info, traceWriter.TraceRecords[0].Level); Assert.AreEqual(TraceLevel.Info, traceWriter.TraceRecords[0].Level);
Assert.AreEqual("Error deserializing System.Exception. Member 'ClassName' was not found. Path '', line 1, position 2.", traceWriter.TraceRecords[1].Message); Assert.AreEqual("Error deserializing System.Exception. Member 'ClassName' was not found. Path '', line 1, position 2.", traceWriter.TraceRecords[1].Message);
Assert.AreEqual(TraceLevel.Error, traceWriter.TraceRecords[1].Level); Assert.AreEqual(TraceLevel.Error, traceWriter.TraceRecords[1].Level);
@@ -576,7 +577,7 @@ Newtonsoft.Json Error: 0 : Error!
Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.TestObjects.Person. Path 'MissingMemberProperty', line 1, position 25.", traceWriter.TraceRecords[0].Message); Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.TestObjects.Person. Path 'MissingMemberProperty', line 1, position 25.", traceWriter.TraceRecords[0].Message);
Assert.AreEqual("Could not find member 'MissingMemberProperty' on Newtonsoft.Json.Tests.TestObjects.Person. Path 'MissingMemberProperty', line 1, position 25.", traceWriter.TraceRecords[1].Message); Assert.AreEqual("Could not find member 'MissingMemberProperty' on Newtonsoft.Json.Tests.TestObjects.Person. Path 'MissingMemberProperty', line 1, position 25.", traceWriter.TraceRecords[1].Message);
Assert.AreEqual("Finished deserializing Newtonsoft.Json.Tests.TestObjects.Person. Path '', line 1, position 30.", traceWriter.TraceRecords[2].Message); Assert.IsTrue(traceWriter.TraceRecords[2].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.TestObjects.Person. Path ''"));
} }
[Test] [Test]
@@ -604,8 +605,8 @@ Newtonsoft.Json Error: 0 : Error!
Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path 'Major', line 2, position 11.", traceWriter.TraceRecords[0].Message); Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path 'Major', line 2, position 11.", traceWriter.TraceRecords[0].Message);
Assert.AreEqual("Could not find member 'MissingMemberProperty' on System.Version. Path 'MissingMemberProperty', line 8, position 32.", traceWriter.TraceRecords[1].Message); Assert.AreEqual("Could not find member 'MissingMemberProperty' on System.Version. Path 'MissingMemberProperty', line 8, position 32.", traceWriter.TraceRecords[1].Message);
Assert.AreEqual("Started deserializing System.Version. Path '', line 9, position 2.", traceWriter.TraceRecords[2].Message); Assert.IsTrue(traceWriter.TraceRecords[2].Message.StartsWith("Started deserializing System.Version. Path ''"));
Assert.AreEqual("Finished deserializing System.Version. Path '', line 9, position 2.", traceWriter.TraceRecords[3].Message); Assert.IsTrue(traceWriter.TraceRecords[3].Message.StartsWith("Finished deserializing System.Version. Path ''"));
} }
[Test] [Test]
@@ -673,7 +674,7 @@ Newtonsoft.Json Error: 0 : Error!
SpecifiedTestClass deserialized = JsonConvert.DeserializeObject<SpecifiedTestClass>(json, new JsonSerializerSettings { TraceWriter = traceWriter }); SpecifiedTestClass deserialized = JsonConvert.DeserializeObject<SpecifiedTestClass>(json, new JsonSerializerSettings { TraceWriter = traceWriter });
Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path 'Age', line 2, position 9.", traceWriter.TraceRecords[0].Message); Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path 'Age', line 2, position 9.", traceWriter.TraceRecords[0].Message);
Assert.AreEqual("Finished deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path '', line 3, position 2.", traceWriter.TraceRecords[1].Message); Assert.IsTrue(traceWriter.TraceRecords[1].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path ''"));
Assert.IsNull(deserialized.Name); Assert.IsNull(deserialized.Name);
Assert.IsFalse(deserialized.NameSpecified); Assert.IsFalse(deserialized.NameSpecified);
@@ -707,7 +708,7 @@ Newtonsoft.Json Error: 0 : Error!
Assert.AreEqual("IsSpecified for property 'Name' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Name', line 2, position 18.", traceWriter.TraceRecords[1].Message); Assert.AreEqual("IsSpecified for property 'Name' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Name', line 2, position 18.", traceWriter.TraceRecords[1].Message);
Assert.AreEqual("IsSpecified for property 'Weight' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Weight', line 4, position 14.", traceWriter.TraceRecords[2].Message); Assert.AreEqual("IsSpecified for property 'Weight' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Weight', line 4, position 14.", traceWriter.TraceRecords[2].Message);
Assert.AreEqual("IsSpecified for property 'Height' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Height', line 5, position 14.", traceWriter.TraceRecords[3].Message); Assert.AreEqual("IsSpecified for property 'Height' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Height', line 5, position 14.", traceWriter.TraceRecords[3].Message);
Assert.AreEqual("Finished deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path '', line 7, position 2.", traceWriter.TraceRecords[4].Message); Assert.IsTrue(traceWriter.TraceRecords[4].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path ''"));
Assert.AreEqual("James", deserialized.Name); Assert.AreEqual("James", deserialized.Name);
Assert.IsTrue(deserialized.NameSpecified); Assert.IsTrue(deserialized.NameSpecified);
@@ -1591,6 +1591,8 @@ namespace Newtonsoft.Json.Tests.Serialization
}; };
string serializedString = JsonConvert.SerializeObject(inputContext, jsonSerializerSettings); string serializedString = JsonConvert.SerializeObject(inputContext, jsonSerializerSettings);
Console.WriteLine(serializedString);
var deserializedObject = (Dictionary<string, Guid>)JsonConvert.DeserializeObject(serializedString, jsonSerializerSettings); var deserializedObject = (Dictionary<string, Guid>)JsonConvert.DeserializeObject(serializedString, jsonSerializerSettings);
Assert.AreEqual(someValue, deserializedObject[contextKey]); Assert.AreEqual(someValue, deserializedObject[contextKey]);
+19 -13
View File
@@ -420,7 +420,7 @@ namespace Newtonsoft.Json
if (t == JsonToken.Date) if (t == JsonToken.Date)
{ {
if (Value is DateTime) if (Value is DateTime)
SetToken(JsonToken.Date, new DateTimeOffset((DateTime)Value)); SetToken(JsonToken.Date, new DateTimeOffset((DateTime)Value), false);
return (DateTimeOffset)Value; return (DateTimeOffset)Value;
} }
@@ -440,7 +440,7 @@ namespace Newtonsoft.Json
if (DateTimeOffset.TryParse(s, Culture, DateTimeStyles.RoundtripKind, out dt)) if (DateTimeOffset.TryParse(s, Culture, DateTimeStyles.RoundtripKind, out dt))
{ {
SetToken(JsonToken.Date, dt); SetToken(JsonToken.Date, dt, false);
return dt; return dt;
} }
else else
@@ -479,7 +479,7 @@ namespace Newtonsoft.Json
{ {
byte[] data = ReadAsBytes(); byte[] data = ReadAsBytes();
ReadInternal(); ReadInternal();
SetToken(JsonToken.Bytes, data); SetToken(JsonToken.Bytes, data, false);
return data; return data;
} }
@@ -488,7 +488,7 @@ namespace Newtonsoft.Json
{ {
string s = (string)Value; string s = (string)Value;
byte[] data = (s.Length == 0) ? new byte[0] : Convert.FromBase64String(s); byte[] data = (s.Length == 0) ? new byte[0] : Convert.FromBase64String(s);
SetToken(JsonToken.Bytes, data); SetToken(JsonToken.Bytes, data, false);
return data; return data;
} }
@@ -512,7 +512,7 @@ namespace Newtonsoft.Json
break; break;
case JsonToken.EndArray: case JsonToken.EndArray:
byte[] d = data.ToArray(); byte[] d = data.ToArray();
SetToken(JsonToken.Bytes, d); SetToken(JsonToken.Bytes, d, false);
return d; return d;
case JsonToken.Comment: case JsonToken.Comment:
// skip // skip
@@ -553,7 +553,7 @@ namespace Newtonsoft.Json
if (t == JsonToken.Integer || t == JsonToken.Float) if (t == JsonToken.Integer || t == JsonToken.Float)
{ {
if (!(Value is decimal)) if (!(Value is decimal))
SetToken(JsonToken.Float, Convert.ToDecimal(Value, CultureInfo.InvariantCulture)); SetToken(JsonToken.Float, Convert.ToDecimal(Value, CultureInfo.InvariantCulture), false);
return (decimal)Value; return (decimal)Value;
} }
@@ -573,7 +573,7 @@ namespace Newtonsoft.Json
if (decimal.TryParse(s, NumberStyles.Number, Culture, out d)) if (decimal.TryParse(s, NumberStyles.Number, Culture, out d))
{ {
SetToken(JsonToken.Float, d); SetToken(JsonToken.Float, d, false);
return d; return d;
} }
else else
@@ -610,7 +610,7 @@ namespace Newtonsoft.Json
if (t == JsonToken.Integer || t == JsonToken.Float) if (t == JsonToken.Integer || t == JsonToken.Float)
{ {
if (!(Value is int)) if (!(Value is int))
SetToken(JsonToken.Integer, Convert.ToInt32(Value, CultureInfo.InvariantCulture)); SetToken(JsonToken.Integer, Convert.ToInt32(Value, CultureInfo.InvariantCulture), false);
return (int)Value; return (int)Value;
} }
@@ -630,7 +630,7 @@ namespace Newtonsoft.Json
if (int.TryParse(s, NumberStyles.Integer, Culture, out i)) if (int.TryParse(s, NumberStyles.Integer, Culture, out i))
{ {
SetToken(JsonToken.Integer, i); SetToken(JsonToken.Integer, i, false);
return i; return i;
} }
else else
@@ -680,7 +680,7 @@ namespace Newtonsoft.Json
else else
s = Value.ToString(); s = Value.ToString();
SetToken(JsonToken.String, s); SetToken(JsonToken.String, s, false);
return s; return s;
} }
} }
@@ -723,7 +723,7 @@ namespace Newtonsoft.Json
if (DateTime.TryParse(s, Culture, DateTimeStyles.RoundtripKind, out dt)) if (DateTime.TryParse(s, Culture, DateTimeStyles.RoundtripKind, out dt))
{ {
dt = DateTimeUtils.EnsureDateTime(dt, DateTimeZoneHandling); dt = DateTimeUtils.EnsureDateTime(dt, DateTimeZoneHandling);
SetToken(JsonToken.Date, dt); SetToken(JsonToken.Date, dt, false);
return dt; return dt;
} }
else else
@@ -790,7 +790,7 @@ namespace Newtonsoft.Json
/// <param name="newToken">The new token.</param> /// <param name="newToken">The new token.</param>
protected void SetToken(JsonToken newToken) protected void SetToken(JsonToken newToken)
{ {
SetToken(newToken, null); SetToken(newToken, null, true);
} }
/// <summary> /// <summary>
@@ -799,6 +799,11 @@ namespace Newtonsoft.Json
/// <param name="newToken">The new token.</param> /// <param name="newToken">The new token.</param>
/// <param name="value">The value.</param> /// <param name="value">The value.</param>
protected void SetToken(JsonToken newToken, object value) protected void SetToken(JsonToken newToken, object value)
{
SetToken(newToken, value, true);
}
internal void SetToken(JsonToken newToken, object value, bool updateIndex)
{ {
_tokenType = newToken; _tokenType = newToken;
_value = value; _value = value;
@@ -845,7 +850,8 @@ namespace Newtonsoft.Json
else else
SetFinished(); SetFinished();
UpdateScopeWithFinishedValue(); if (updateIndex)
UpdateScopeWithFinishedValue();
break; break;
} }
} }
+20
View File
@@ -53,6 +53,7 @@ namespace Newtonsoft.Json
internal NullValueHandling _nullValueHandling; internal NullValueHandling _nullValueHandling;
internal DefaultValueHandling _defaultValueHandling; internal DefaultValueHandling _defaultValueHandling;
internal ConstructorHandling _constructorHandling; internal ConstructorHandling _constructorHandling;
internal SpecialPropertyHandling _specialPropertyHandling;
internal JsonConverterCollection _converters; internal JsonConverterCollection _converters;
internal IContractResolver _contractResolver; internal IContractResolver _contractResolver;
internal ITraceWriter _traceWriter; internal ITraceWriter _traceWriter;
@@ -257,6 +258,22 @@ namespace Newtonsoft.Json
} }
} }
/// <summary>
/// Gets or sets how special properties are used during deserialization.
/// </summary>
/// <value>The special properties handling.</value>
public virtual SpecialPropertyHandling SpecialPropertyHandling
{
get { return _specialPropertyHandling; }
set
{
if (value < SpecialPropertyHandling.Default || value > SpecialPropertyHandling.ReadAhead)
throw new ArgumentOutOfRangeException("value");
_specialPropertyHandling = value;
}
}
/// <summary> /// <summary>
/// Gets a collection <see cref="JsonConverter"/> that will be used during serialization. /// Gets a collection <see cref="JsonConverter"/> that will be used during serialization.
/// </summary> /// </summary>
@@ -426,6 +443,7 @@ namespace Newtonsoft.Json
_preserveReferencesHandling = JsonSerializerSettings.DefaultPreserveReferencesHandling; _preserveReferencesHandling = JsonSerializerSettings.DefaultPreserveReferencesHandling;
_constructorHandling = JsonSerializerSettings.DefaultConstructorHandling; _constructorHandling = JsonSerializerSettings.DefaultConstructorHandling;
_typeNameHandling = JsonSerializerSettings.DefaultTypeNameHandling; _typeNameHandling = JsonSerializerSettings.DefaultTypeNameHandling;
_specialPropertyHandling = JsonSerializerSettings.DefaultSpecialPropertyHandling;
_context = JsonSerializerSettings.DefaultContext; _context = JsonSerializerSettings.DefaultContext;
_binder = DefaultSerializationBinder.Instance; _binder = DefaultSerializationBinder.Instance;
@@ -515,6 +533,8 @@ namespace Newtonsoft.Json
// serializer specific // serializer specific
if (settings._typeNameHandling != null) if (settings._typeNameHandling != null)
serializer.TypeNameHandling = settings.TypeNameHandling; serializer.TypeNameHandling = settings.TypeNameHandling;
if (settings._specialPropertyHandling != null)
serializer.SpecialPropertyHandling = settings.SpecialPropertyHandling;
if (settings._typeNameAssemblyFormat != null) if (settings._typeNameAssemblyFormat != null)
serializer.TypeNameAssemblyFormat = settings.TypeNameAssemblyFormat; serializer.TypeNameAssemblyFormat = settings.TypeNameAssemblyFormat;
if (settings._preserveReferencesHandling != null) if (settings._preserveReferencesHandling != null)
@@ -45,6 +45,7 @@ namespace Newtonsoft.Json
internal const PreserveReferencesHandling DefaultPreserveReferencesHandling = PreserveReferencesHandling.None; internal const PreserveReferencesHandling DefaultPreserveReferencesHandling = PreserveReferencesHandling.None;
internal const ConstructorHandling DefaultConstructorHandling = ConstructorHandling.Default; internal const ConstructorHandling DefaultConstructorHandling = ConstructorHandling.Default;
internal const TypeNameHandling DefaultTypeNameHandling = TypeNameHandling.None; internal const TypeNameHandling DefaultTypeNameHandling = TypeNameHandling.None;
internal const SpecialPropertyHandling DefaultSpecialPropertyHandling = SpecialPropertyHandling.Default;
internal const FormatterAssemblyStyle DefaultTypeNameAssemblyFormat = FormatterAssemblyStyle.Simple; internal const FormatterAssemblyStyle DefaultTypeNameAssemblyFormat = FormatterAssemblyStyle.Simple;
internal static readonly StreamingContext DefaultContext; internal static readonly StreamingContext DefaultContext;
@@ -83,6 +84,7 @@ namespace Newtonsoft.Json
internal StreamingContext? _context; internal StreamingContext? _context;
internal ConstructorHandling? _constructorHandling; internal ConstructorHandling? _constructorHandling;
internal TypeNameHandling? _typeNameHandling; internal TypeNameHandling? _typeNameHandling;
internal SpecialPropertyHandling? _specialPropertyHandling;
/// <summary> /// <summary>
/// Gets or sets how reference loops (e.g. a class referencing itself) is handled. /// Gets or sets how reference loops (e.g. a class referencing itself) is handled.
@@ -160,6 +162,16 @@ namespace Newtonsoft.Json
set { _typeNameHandling = value; } set { _typeNameHandling = value; }
} }
/// <summary>
/// Gets or sets how special properties are used during deserialization.
/// </summary>
/// <value>The special properties handling.</value>
public SpecialPropertyHandling SpecialPropertyHandling
{
get { return _specialPropertyHandling ?? DefaultSpecialPropertyHandling; }
set { _specialPropertyHandling = value; }
}
/// <summary> /// <summary>
/// Gets or sets how a type name assembly is written and resolved by the serializer. /// Gets or sets how a type name assembly is written and resolved by the serializer.
/// </summary> /// </summary>
+1 -1
View File
@@ -687,7 +687,7 @@ namespace Newtonsoft.Json.Linq
break; break;
case JsonToken.StartConstructor: case JsonToken.StartConstructor:
JConstructor constructor = new JConstructor(r.Value.ToString()); JConstructor constructor = new JConstructor(r.Value.ToString());
constructor.SetLineInfo(constructor); constructor.SetLineInfo(lineInfo);
parent.Add(constructor); parent.Add(constructor);
parent = constructor; parent = constructor;
break; break;
+6 -2
View File
@@ -190,7 +190,11 @@ namespace Newtonsoft.Json.Linq
for (int i = 0; i < ancestors.Count; i++) for (int i = 0; i < ancestors.Count; i++)
{ {
JToken current = ancestors[i]; JToken current = ancestors[i];
JToken next = (i + 1 < ancestors.Count) ? ancestors[i + 1] : null; JToken next = null;
if (i + 1 < ancestors.Count)
next = ancestors[i + 1];
else if (ancestors[i].Type == JTokenType.Property)
next = ancestors[i];
if (next != null) if (next != null)
{ {
@@ -1636,7 +1640,7 @@ namespace Newtonsoft.Json.Linq
/// <returns>An <see cref="JsonReader"/> that can be used to read this token and its descendants.</returns> /// <returns>An <see cref="JsonReader"/> that can be used to read this token and its descendants.</returns>
public JsonReader CreateReader() public JsonReader CreateReader()
{ {
return new JTokenReader(this); return new JTokenReader(this, Path);
} }
internal static JToken FromObjectInternal(object o, JsonSerializer jsonSerializer) internal static JToken FromObjectInternal(object o, JsonSerializer jsonSerializer)
+34 -2
View File
@@ -33,9 +33,10 @@ namespace Newtonsoft.Json.Linq
/// </summary> /// </summary>
public class JTokenReader : JsonReader, IJsonLineInfo public class JTokenReader : JsonReader, IJsonLineInfo
{ {
private readonly string _initialPath;
private readonly JToken _root; private readonly JToken _root;
private JToken _parent; private JToken _parent;
private JToken _current; internal JToken _current;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="JTokenReader"/> class. /// Initializes a new instance of the <see cref="JTokenReader"/> class.
@@ -49,6 +50,12 @@ namespace Newtonsoft.Json.Linq
_current = token; _current = token;
} }
internal JTokenReader(JToken token, string initialPath)
: this(token)
{
_initialPath = initialPath;
}
/// <summary> /// <summary>
/// Reads the next JSON token from the stream as a <see cref="T:Byte[]"/>. /// Reads the next JSON token from the stream as a <see cref="T:Byte[]"/>.
/// </summary> /// </summary>
@@ -227,7 +234,7 @@ namespace Newtonsoft.Json.Linq
SetToken(JsonToken.StartArray); SetToken(JsonToken.StartArray);
break; break;
case JTokenType.Constructor: case JTokenType.Constructor:
SetToken(JsonToken.StartConstructor); SetToken(JsonToken.StartConstructor, ((JConstructor)token).Name);
break; break;
case JTokenType.Property: case JTokenType.Property:
SetToken(JsonToken.PropertyName, ((JProperty)token).Name); SetToken(JsonToken.PropertyName, ((JProperty)token).Name);
@@ -319,5 +326,30 @@ namespace Newtonsoft.Json.Linq
return 0; return 0;
} }
} }
/// <summary>
/// Gets the path of the current JSON token.
/// </summary>
public override string Path
{
get
{
string path = base.Path;
if (!string.IsNullOrEmpty(_initialPath))
{
if (string.IsNullOrEmpty(path))
return _initialPath;
if (_initialPath.EndsWith("]", StringComparison.OrdinalIgnoreCase)
|| path.StartsWith("[", StringComparison.OrdinalIgnoreCase))
path = _initialPath + path;
else
path = _initialPath + "." + path;
}
return path;
}
}
} }
} }
@@ -126,6 +126,7 @@
<Compile Include="Serialization\MemoryTraceWriter.cs" /> <Compile Include="Serialization\MemoryTraceWriter.cs" />
<Compile Include="Serialization\TraceJsonReader.cs" /> <Compile Include="Serialization\TraceJsonReader.cs" />
<Compile Include="Serialization\TraceJsonWriter.cs" /> <Compile Include="Serialization\TraceJsonWriter.cs" />
<Compile Include="SpecialPropertyHandling.cs" />
<Compile Include="StringEscapeHandling.cs" /> <Compile Include="StringEscapeHandling.cs" />
<Compile Include="Utilities\DateTimeParser.cs" /> <Compile Include="Utilities\DateTimeParser.cs" />
<Compile Include="Utilities\DynamicProxy.cs" /> <Compile Include="Utilities\DynamicProxy.cs" />
@@ -137,6 +137,7 @@
<Compile Include="Serialization\MemoryTraceWriter.cs" /> <Compile Include="Serialization\MemoryTraceWriter.cs" />
<Compile Include="Serialization\TraceJsonReader.cs" /> <Compile Include="Serialization\TraceJsonReader.cs" />
<Compile Include="Serialization\TraceJsonWriter.cs" /> <Compile Include="Serialization\TraceJsonWriter.cs" />
<Compile Include="SpecialPropertyHandling.cs" />
<Compile Include="StringEscapeHandling.cs" /> <Compile Include="StringEscapeHandling.cs" />
<Compile Include="TraceLevel.cs" /> <Compile Include="TraceLevel.cs" />
<Compile Include="Utilities\DateTimeParser.cs" /> <Compile Include="Utilities\DateTimeParser.cs" />
@@ -137,6 +137,7 @@
<Compile Include="Serialization\MemoryTraceWriter.cs" /> <Compile Include="Serialization\MemoryTraceWriter.cs" />
<Compile Include="Serialization\TraceJsonReader.cs" /> <Compile Include="Serialization\TraceJsonReader.cs" />
<Compile Include="Serialization\TraceJsonWriter.cs" /> <Compile Include="Serialization\TraceJsonWriter.cs" />
<Compile Include="SpecialPropertyHandling.cs" />
<Compile Include="StringEscapeHandling.cs" /> <Compile Include="StringEscapeHandling.cs" />
<Compile Include="Utilities\DateTimeParser.cs" /> <Compile Include="Utilities\DateTimeParser.cs" />
<Compile Include="Utilities\DynamicProxy.cs" /> <Compile Include="Utilities\DynamicProxy.cs" />
@@ -192,6 +192,7 @@
<Compile Include="Serialization\ReflectionValueProvider.cs" /> <Compile Include="Serialization\ReflectionValueProvider.cs" />
<Compile Include="Serialization\TraceJsonReader.cs" /> <Compile Include="Serialization\TraceJsonReader.cs" />
<Compile Include="Serialization\TraceJsonWriter.cs" /> <Compile Include="Serialization\TraceJsonWriter.cs" />
<Compile Include="SpecialPropertyHandling.cs" />
<Compile Include="StringEscapeHandling.cs" /> <Compile Include="StringEscapeHandling.cs" />
<Compile Include="TraceLevel.cs" /> <Compile Include="TraceLevel.cs" />
<Compile Include="TypeNameHandling.cs" /> <Compile Include="TypeNameHandling.cs" />
@@ -197,6 +197,7 @@
<Compile Include="Serialization\ReflectionValueProvider.cs" /> <Compile Include="Serialization\ReflectionValueProvider.cs" />
<Compile Include="Serialization\TraceJsonReader.cs" /> <Compile Include="Serialization\TraceJsonReader.cs" />
<Compile Include="Serialization\TraceJsonWriter.cs" /> <Compile Include="Serialization\TraceJsonWriter.cs" />
<Compile Include="SpecialPropertyHandling.cs" />
<Compile Include="StringEscapeHandling.cs" /> <Compile Include="StringEscapeHandling.cs" />
<Compile Include="TraceLevel.cs" /> <Compile Include="TraceLevel.cs" />
<Compile Include="TypeNameHandling.cs" /> <Compile Include="TypeNameHandling.cs" />
@@ -136,6 +136,7 @@
<Compile Include="MissingMemberHandling.cs" /> <Compile Include="MissingMemberHandling.cs" />
<Compile Include="NullValueHandling.cs" /> <Compile Include="NullValueHandling.cs" />
<Compile Include="ObjectCreationHandling.cs" /> <Compile Include="ObjectCreationHandling.cs" />
<Compile Include="SpecialPropertyHandling.cs" />
<Compile Include="PreserveReferencesHandling.cs" /> <Compile Include="PreserveReferencesHandling.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReferenceLoopHandling.cs" /> <Compile Include="ReferenceLoopHandling.cs" />
@@ -91,5 +91,5 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.1.16929")] [assembly: AssemblyFileVersion("6.0.1.17012")]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]
@@ -359,12 +359,31 @@ namespace Newtonsoft.Json.Serialization
private object CreateObject(JsonReader reader, Type objectType, JsonContract contract, JsonProperty member, JsonContainerContract containerContract, JsonProperty containerMember, object existingValue) private object CreateObject(JsonReader reader, Type objectType, JsonContract contract, JsonProperty member, JsonContainerContract containerContract, JsonProperty containerMember, object existingValue)
{ {
CheckedRead(reader);
string id; string id;
object newValue; object newValue;
if (ReadSpecialProperties(reader, ref objectType, ref contract, member, containerContract, containerMember, existingValue, out newValue, out id))
return newValue; if (Serializer.SpecialPropertyHandling == SpecialPropertyHandling.ReadAhead)
{
var tokenReader = reader as JTokenReader;
if (tokenReader == null)
{
JToken t = JToken.ReadFrom(reader);
tokenReader = (JTokenReader)t.CreateReader();
reader = tokenReader;
// start
CheckedRead(reader);
}
if (ReadSpecialPropertiesToken(tokenReader, ref objectType, ref contract, member, containerContract, containerMember, existingValue, out newValue, out id))
return newValue;
}
else
{
CheckedRead(reader);
if (ReadSpecialProperties(reader, ref objectType, ref contract, member, containerContract, containerMember, existingValue, out newValue, out id))
return newValue;
}
if (HasNoDefinedType(contract)) if (HasNoDefinedType(contract))
return CreateJObject(reader); return CreateJObject(reader);
@@ -473,6 +492,80 @@ To fix this error either change the JSON to a {1} or change the deserialized typ
".FormatWith(CultureInfo.InvariantCulture, objectType, GetExpectedDescription(contract))); ".FormatWith(CultureInfo.InvariantCulture, objectType, GetExpectedDescription(contract)));
} }
private bool ReadSpecialPropertiesToken(JTokenReader reader, ref Type objectType, ref JsonContract contract, JsonProperty member, JsonContainerContract containerContract, JsonProperty containerMember, object existingValue, out object newValue, out string id)
{
id = null;
newValue = null;
if (reader.TokenType == JsonToken.StartObject)
{
JObject current = (JObject)reader._current;
JToken refToken = current[JsonTypeReflector.RefPropertyName];
if (refToken != null)
{
if (refToken.Type != JTokenType.String && refToken.Type != JTokenType.Null)
throw JsonSerializationException.Create(refToken, refToken.Path, "JSON reference {0} property must have a string or null value.".FormatWith(CultureInfo.InvariantCulture, JsonTypeReflector.RefPropertyName), null);
JToken property = refToken.Parent;
JToken additionalContent = null;
if (property.Next != null)
additionalContent = property.Next;
else if (property.Previous != null)
additionalContent = property.Previous;
string reference = (string)refToken;
refToken.Parent.Remove();
if (reference != null)
{
if (additionalContent != null)
throw JsonSerializationException.Create(additionalContent, additionalContent.Path, "Additional content found in JSON reference object. A JSON reference object should only have a {0} property.".FormatWith(CultureInfo.InvariantCulture, JsonTypeReflector.RefPropertyName), null);
newValue = Serializer.GetReferenceResolver().ResolveReference(this, reference);
if (TraceWriter != null && TraceWriter.LevelFilter >= TraceLevel.Info)
TraceWriter.Trace(TraceLevel.Info, JsonPosition.FormatMessage(reader as IJsonLineInfo, reader.Path, "Resolved object reference '{0}' to {1}.".FormatWith(CultureInfo.InvariantCulture, reference, newValue.GetType())), null);
CheckedRead(reader);
return true;
}
}
JToken typeToken = current[JsonTypeReflector.TypePropertyName];
if (typeToken != null)
{
string qualifiedTypeName = (string)typeToken;
JsonReader typeTokenReader = typeToken.CreateReader();
CheckedRead(typeTokenReader);
ResolveTypeName(typeTokenReader, ref objectType, ref contract, member, containerContract, containerMember, qualifiedTypeName);
typeToken.Parent.Remove();
}
JToken idToken = current[JsonTypeReflector.IdPropertyName];
if (idToken != null)
{
id = (string)idToken;
idToken.Parent.Remove();
}
JToken valuesToken = current[JsonTypeReflector.ArrayValuesPropertyName];
if (valuesToken != null)
{
JsonReader listReader = valuesToken.CreateReader();
CheckedRead(listReader);
newValue = CreateList(listReader, objectType, contract, member, existingValue, id);
valuesToken.Parent.Remove();
CheckedRead(reader);
return true;
}
}
CheckedRead(reader);
return false;
}
private bool ReadSpecialProperties(JsonReader reader, ref Type objectType, ref JsonContract contract, JsonProperty member, JsonContainerContract containerContract, JsonProperty containerMember, object existingValue, out object newValue, out string id) private bool ReadSpecialProperties(JsonReader reader, ref Type objectType, ref JsonContract contract, JsonProperty member, JsonContainerContract containerContract, JsonProperty containerMember, object existingValue, out object newValue, out string id)
{ {
id = null; id = null;
@@ -524,44 +617,7 @@ To fix this error either change the JSON to a {1} or change the deserialized typ
CheckedRead(reader); CheckedRead(reader);
string qualifiedTypeName = reader.Value.ToString(); string qualifiedTypeName = reader.Value.ToString();
TypeNameHandling resolvedTypeNameHandling = ResolveTypeName(reader, ref objectType, ref contract, member, containerContract, containerMember, qualifiedTypeName);
((member != null) ? member.TypeNameHandling : null)
?? ((containerContract != null) ? containerContract.ItemTypeNameHandling : null)
?? ((containerMember != null) ? containerMember.ItemTypeNameHandling : null)
?? Serializer._typeNameHandling;
if (resolvedTypeNameHandling != TypeNameHandling.None)
{
string typeName;
string assemblyName;
ReflectionUtils.SplitFullyQualifiedTypeName(qualifiedTypeName, out typeName, out assemblyName);
Type specifiedType;
try
{
specifiedType = Serializer._binder.BindToType(assemblyName, typeName);
}
catch (Exception ex)
{
throw JsonSerializationException.Create(reader, "Error resolving type specified in JSON '{0}'.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName), ex);
}
if (specifiedType == null)
throw JsonSerializationException.Create(reader, "Type specified in JSON '{0}' was not resolved.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName));
if (TraceWriter != null && TraceWriter.LevelFilter >= TraceLevel.Verbose)
TraceWriter.Trace(TraceLevel.Verbose, JsonPosition.FormatMessage(reader as IJsonLineInfo, reader.Path, "Resolved type '{0}' to {1}.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName, specifiedType)), null);
if (objectType != null
#if !(NET35 || NET20 || PORTABLE40)
&& objectType != typeof(IDynamicMetaObjectProvider)
#endif
&& !objectType.IsAssignableFrom(specifiedType))
throw JsonSerializationException.Create(reader, "Type specified in JSON '{0}' is not compatible with '{1}'.".FormatWith(CultureInfo.InvariantCulture, specifiedType.AssemblyQualifiedName, objectType.AssemblyQualifiedName));
objectType = specifiedType;
contract = GetContractSafe(specifiedType);
}
CheckedRead(reader); CheckedRead(reader);
@@ -595,6 +651,48 @@ To fix this error either change the JSON to a {1} or change the deserialized typ
return false; return false;
} }
private void ResolveTypeName(JsonReader reader, ref Type objectType, ref JsonContract contract, JsonProperty member, JsonContainerContract containerContract, JsonProperty containerMember, string qualifiedTypeName)
{
TypeNameHandling resolvedTypeNameHandling =
((member != null) ? member.TypeNameHandling : null)
?? ((containerContract != null) ? containerContract.ItemTypeNameHandling : null)
?? ((containerMember != null) ? containerMember.ItemTypeNameHandling : null)
?? Serializer._typeNameHandling;
if (resolvedTypeNameHandling != TypeNameHandling.None)
{
string typeName;
string assemblyName;
ReflectionUtils.SplitFullyQualifiedTypeName(qualifiedTypeName, out typeName, out assemblyName);
Type specifiedType;
try
{
specifiedType = Serializer._binder.BindToType(assemblyName, typeName);
}
catch (Exception ex)
{
throw JsonSerializationException.Create(reader, "Error resolving type specified in JSON '{0}'.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName), ex);
}
if (specifiedType == null)
throw JsonSerializationException.Create(reader, "Type specified in JSON '{0}' was not resolved.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName));
if (TraceWriter != null && TraceWriter.LevelFilter >= TraceLevel.Verbose)
TraceWriter.Trace(TraceLevel.Verbose, JsonPosition.FormatMessage(reader as IJsonLineInfo, reader.Path, "Resolved type '{0}' to {1}.".FormatWith(CultureInfo.InvariantCulture, qualifiedTypeName, specifiedType)), null);
if (objectType != null
#if !(NET35 || NET20 || PORTABLE40)
&& objectType != typeof(IDynamicMetaObjectProvider)
#endif
&& !objectType.IsAssignableFrom(specifiedType))
throw JsonSerializationException.Create(reader, "Type specified in JSON '{0}' is not compatible with '{1}'.".FormatWith(CultureInfo.InvariantCulture, specifiedType.AssemblyQualifiedName, objectType.AssemblyQualifiedName));
objectType = specifiedType;
contract = GetContractSafe(specifiedType);
}
}
private JsonArrayContract EnsureArrayContract(JsonReader reader, Type objectType, JsonContract contract) private JsonArrayContract EnsureArrayContract(JsonReader reader, Type objectType, JsonContract contract)
{ {
if (contract == null) if (contract == null)
@@ -108,6 +108,12 @@ namespace Newtonsoft.Json.Serialization
set { _serializer.TypeNameHandling = value; } set { _serializer.TypeNameHandling = value; }
} }
public override SpecialPropertyHandling SpecialPropertyHandling
{
get { return _serializer.SpecialPropertyHandling; }
set { _serializer.SpecialPropertyHandling = value; }
}
public override FormatterAssemblyStyle TypeNameAssemblyFormat public override FormatterAssemblyStyle TypeNameAssemblyFormat
{ {
get { return _serializer.TypeNameAssemblyFormat; } get { return _serializer.TypeNameAssemblyFormat; }
@@ -0,0 +1,47 @@
#region License
// Copyright (c) 2007 James Newton-King
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without
// restriction, including without limitation the rights to use,
// copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following
// conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
using System;
using System.Collections.Generic;
using System.Text;
namespace Newtonsoft.Json
{
/// <summary>
/// Specifies special property handling options for the <see cref="JsonSerializer"/>.
/// </summary>
public enum SpecialPropertyHandling
{
/// <summary>
/// Read special properties located at the start of a JSON object.
/// </summary>
Default = 0,
/// <summary>
/// Read special properties located anywhere in a JSON object. Note that this setting will impact performance.
/// </summary>
ReadAhead = 1,
}
}