-Added Path to JsonReader/JsonWriter/ErrorContext with the JSON path of the current position
-Changed collection type on JsonArrayContract to public -Changed dictionary key type and dictionary value type on JsonDictionaryContract to public -Fixed error handling when failing to parse array content -Fixed error handling when there are missing required properties
This commit is contained in:
@@ -272,75 +272,127 @@ namespace Newtonsoft.Json.Tests
|
|||||||
{
|
{
|
||||||
string input = @"{
|
string input = @"{
|
||||||
value:'Purple',
|
value:'Purple',
|
||||||
array:[1,2],
|
array:[1,2,new Date(1)],
|
||||||
subobject:{prop:1}
|
subobject:{prop:1,proparray:[1]}
|
||||||
}";
|
}";
|
||||||
|
|
||||||
StringReader sr = new StringReader(input);
|
StringReader sr = new StringReader(input);
|
||||||
|
|
||||||
using (JsonReader jsonReader = new JsonTextReader(sr))
|
using (JsonReader reader = new JsonTextReader(sr))
|
||||||
{
|
{
|
||||||
Assert.AreEqual(0, jsonReader.Depth);
|
Assert.AreEqual(0, reader.Depth);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.StartObject);
|
Assert.AreEqual(reader.TokenType, JsonToken.StartObject);
|
||||||
Assert.AreEqual(0, jsonReader.Depth);
|
Assert.AreEqual(0, reader.Depth);
|
||||||
|
Assert.AreEqual("", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||||
Assert.AreEqual(1, jsonReader.Depth);
|
Assert.AreEqual(1, reader.Depth);
|
||||||
|
Assert.AreEqual("value", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.String);
|
Assert.AreEqual(reader.TokenType, JsonToken.String);
|
||||||
Assert.AreEqual(jsonReader.Value, @"Purple");
|
Assert.AreEqual(reader.Value, @"Purple");
|
||||||
Assert.AreEqual(jsonReader.QuoteChar, '\'');
|
Assert.AreEqual(reader.QuoteChar, '\'');
|
||||||
Assert.AreEqual(1, jsonReader.Depth);
|
Assert.AreEqual(1, reader.Depth);
|
||||||
|
Assert.AreEqual("value", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||||
Assert.AreEqual(1, jsonReader.Depth);
|
Assert.AreEqual(1, reader.Depth);
|
||||||
|
Assert.AreEqual("array", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.StartArray);
|
Assert.AreEqual(reader.TokenType, JsonToken.StartArray);
|
||||||
Assert.AreEqual(1, jsonReader.Depth);
|
Assert.AreEqual(1, reader.Depth);
|
||||||
|
Assert.AreEqual("array", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.Integer);
|
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||||
Assert.AreEqual(1, jsonReader.Value);
|
Assert.AreEqual(1, reader.Value);
|
||||||
Assert.AreEqual(2, jsonReader.Depth);
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("array[0]", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.Integer);
|
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||||
Assert.AreEqual(2, jsonReader.Value);
|
Assert.AreEqual(2, reader.Value);
|
||||||
Assert.AreEqual(2, jsonReader.Depth);
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("array[1]", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.EndArray);
|
Assert.AreEqual(reader.TokenType, JsonToken.StartConstructor);
|
||||||
Assert.AreEqual(1, jsonReader.Depth);
|
Assert.AreEqual("Date", reader.Value);
|
||||||
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("array[2]", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||||
Assert.AreEqual(1, jsonReader.Depth);
|
Assert.AreEqual(1, reader.Value);
|
||||||
|
Assert.AreEqual(3, reader.Depth);
|
||||||
|
Assert.AreEqual("array[2][0]", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.StartObject);
|
Assert.AreEqual(reader.TokenType, JsonToken.EndConstructor);
|
||||||
Assert.AreEqual(1, jsonReader.Depth);
|
Assert.AreEqual(null, reader.Value);
|
||||||
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("array[2]", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
Assert.AreEqual(reader.TokenType, JsonToken.EndArray);
|
||||||
Assert.AreEqual(2, jsonReader.Depth);
|
Assert.AreEqual(1, reader.Depth);
|
||||||
|
Assert.AreEqual("array", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.Integer);
|
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||||
Assert.AreEqual(2, jsonReader.Depth);
|
Assert.AreEqual(1, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.EndObject);
|
Assert.AreEqual(reader.TokenType, JsonToken.StartObject);
|
||||||
Assert.AreEqual(1, jsonReader.Depth);
|
Assert.AreEqual(1, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject", reader.Path);
|
||||||
|
|
||||||
jsonReader.Read();
|
reader.Read();
|
||||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.EndObject);
|
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||||
Assert.AreEqual(0, jsonReader.Depth);
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject.prop", reader.Path);
|
||||||
|
|
||||||
|
reader.Read();
|
||||||
|
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||||
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject.prop", reader.Path);
|
||||||
|
|
||||||
|
reader.Read();
|
||||||
|
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||||
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject.proparray", reader.Path);
|
||||||
|
|
||||||
|
reader.Read();
|
||||||
|
Assert.AreEqual(reader.TokenType, JsonToken.StartArray);
|
||||||
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject.proparray", reader.Path);
|
||||||
|
|
||||||
|
reader.Read();
|
||||||
|
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||||
|
Assert.AreEqual(3, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject.proparray[0]", reader.Path);
|
||||||
|
|
||||||
|
reader.Read();
|
||||||
|
Assert.AreEqual(reader.TokenType, JsonToken.EndArray);
|
||||||
|
Assert.AreEqual(2, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject.proparray", reader.Path);
|
||||||
|
|
||||||
|
reader.Read();
|
||||||
|
Assert.AreEqual(reader.TokenType, JsonToken.EndObject);
|
||||||
|
Assert.AreEqual(1, reader.Depth);
|
||||||
|
Assert.AreEqual("subobject", reader.Path);
|
||||||
|
|
||||||
|
reader.Read();
|
||||||
|
Assert.AreEqual(reader.TokenType, JsonToken.EndObject);
|
||||||
|
Assert.AreEqual(0, reader.Depth);
|
||||||
|
Assert.AreEqual("", reader.Path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -199,6 +199,85 @@ namespace Newtonsoft.Json.Tests
|
|||||||
Assert.AreEqual(expected, result);
|
Assert.AreEqual(expected, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void WriteEnd()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
StringWriter sw = new StringWriter(sb);
|
||||||
|
|
||||||
|
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||||
|
{
|
||||||
|
jsonWriter.Formatting = Formatting.Indented;
|
||||||
|
|
||||||
|
jsonWriter.WriteStartObject();
|
||||||
|
jsonWriter.WritePropertyName("CPU");
|
||||||
|
jsonWriter.WriteValue("Intel");
|
||||||
|
jsonWriter.WritePropertyName("PSU");
|
||||||
|
jsonWriter.WriteValue("500W");
|
||||||
|
jsonWriter.WritePropertyName("Drives");
|
||||||
|
jsonWriter.WriteStartArray();
|
||||||
|
jsonWriter.WriteValue("DVD read/writer");
|
||||||
|
jsonWriter.WriteComment("(broken)");
|
||||||
|
jsonWriter.WriteValue("500 gigabyte hard drive");
|
||||||
|
jsonWriter.WriteValue("200 gigabype hard drive");
|
||||||
|
jsonWriter.WriteEndObject();
|
||||||
|
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||||
|
}
|
||||||
|
|
||||||
|
string expected = @"{
|
||||||
|
""CPU"": ""Intel"",
|
||||||
|
""PSU"": ""500W"",
|
||||||
|
""Drives"": [
|
||||||
|
""DVD read/writer""
|
||||||
|
/*(broken)*/,
|
||||||
|
""500 gigabyte hard drive"",
|
||||||
|
""200 gigabype hard drive""
|
||||||
|
]
|
||||||
|
}";
|
||||||
|
string result = sb.ToString();
|
||||||
|
|
||||||
|
Assert.AreEqual(expected, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void CloseWithRemainingContent()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
StringWriter sw = new StringWriter(sb);
|
||||||
|
|
||||||
|
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||||
|
{
|
||||||
|
jsonWriter.Formatting = Formatting.Indented;
|
||||||
|
|
||||||
|
jsonWriter.WriteStartObject();
|
||||||
|
jsonWriter.WritePropertyName("CPU");
|
||||||
|
jsonWriter.WriteValue("Intel");
|
||||||
|
jsonWriter.WritePropertyName("PSU");
|
||||||
|
jsonWriter.WriteValue("500W");
|
||||||
|
jsonWriter.WritePropertyName("Drives");
|
||||||
|
jsonWriter.WriteStartArray();
|
||||||
|
jsonWriter.WriteValue("DVD read/writer");
|
||||||
|
jsonWriter.WriteComment("(broken)");
|
||||||
|
jsonWriter.WriteValue("500 gigabyte hard drive");
|
||||||
|
jsonWriter.WriteValue("200 gigabype hard drive");
|
||||||
|
jsonWriter.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
string expected = @"{
|
||||||
|
""CPU"": ""Intel"",
|
||||||
|
""PSU"": ""500W"",
|
||||||
|
""Drives"": [
|
||||||
|
""DVD read/writer""
|
||||||
|
/*(broken)*/,
|
||||||
|
""500 gigabyte hard drive"",
|
||||||
|
""200 gigabype hard drive""
|
||||||
|
]
|
||||||
|
}";
|
||||||
|
string result = sb.ToString();
|
||||||
|
|
||||||
|
Assert.AreEqual(expected, result);
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Indenting()
|
public void Indenting()
|
||||||
{
|
{
|
||||||
@@ -222,6 +301,7 @@ namespace Newtonsoft.Json.Tests
|
|||||||
jsonWriter.WriteValue("200 gigabype hard drive");
|
jsonWriter.WriteValue("200 gigabype hard drive");
|
||||||
jsonWriter.WriteEnd();
|
jsonWriter.WriteEnd();
|
||||||
jsonWriter.WriteEndObject();
|
jsonWriter.WriteEndObject();
|
||||||
|
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||||
}
|
}
|
||||||
|
|
||||||
// {
|
// {
|
||||||
@@ -247,9 +327,6 @@ namespace Newtonsoft.Json.Tests
|
|||||||
}";
|
}";
|
||||||
string result = sb.ToString();
|
string result = sb.ToString();
|
||||||
|
|
||||||
Console.WriteLine("Indenting");
|
|
||||||
Console.WriteLine(result);
|
|
||||||
|
|
||||||
Assert.AreEqual(expected, result);
|
Assert.AreEqual(expected, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -265,27 +342,34 @@ namespace Newtonsoft.Json.Tests
|
|||||||
|
|
||||||
jsonWriter.WriteStartObject();
|
jsonWriter.WriteStartObject();
|
||||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||||
|
Assert.AreEqual("", jsonWriter.Path);
|
||||||
|
|
||||||
jsonWriter.WritePropertyName("CPU");
|
jsonWriter.WritePropertyName("CPU");
|
||||||
Assert.AreEqual(WriteState.Property, jsonWriter.WriteState);
|
Assert.AreEqual(WriteState.Property, jsonWriter.WriteState);
|
||||||
|
Assert.AreEqual("CPU", jsonWriter.Path);
|
||||||
|
|
||||||
jsonWriter.WriteValue("Intel");
|
jsonWriter.WriteValue("Intel");
|
||||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||||
|
Assert.AreEqual("CPU", jsonWriter.Path);
|
||||||
|
|
||||||
jsonWriter.WritePropertyName("Drives");
|
jsonWriter.WritePropertyName("Drives");
|
||||||
Assert.AreEqual(WriteState.Property, jsonWriter.WriteState);
|
Assert.AreEqual(WriteState.Property, jsonWriter.WriteState);
|
||||||
|
Assert.AreEqual("Drives", jsonWriter.Path);
|
||||||
|
|
||||||
jsonWriter.WriteStartArray();
|
jsonWriter.WriteStartArray();
|
||||||
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
||||||
|
|
||||||
jsonWriter.WriteValue("DVD read/writer");
|
jsonWriter.WriteValue("DVD read/writer");
|
||||||
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
||||||
|
Assert.AreEqual("Drives[0]", jsonWriter.Path);
|
||||||
|
|
||||||
jsonWriter.WriteEnd();
|
jsonWriter.WriteEnd();
|
||||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||||
|
Assert.AreEqual("Drives", jsonWriter.Path);
|
||||||
|
|
||||||
jsonWriter.WriteEndObject();
|
jsonWriter.WriteEndObject();
|
||||||
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||||
|
Assert.AreEqual("", jsonWriter.Path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -620,6 +704,79 @@ _____'propertyName': NaN
|
|||||||
Assert.AreEqual(expected, result);
|
Assert.AreEqual(expected, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Path()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
StringWriter sw = new StringWriter(sb);
|
||||||
|
|
||||||
|
string text = "Hello world.";
|
||||||
|
byte[] data = Encoding.UTF8.GetBytes(text);
|
||||||
|
|
||||||
|
using (JsonTextWriter writer = new JsonTextWriter(sw))
|
||||||
|
{
|
||||||
|
writer.Formatting = Formatting.Indented;
|
||||||
|
|
||||||
|
writer.WriteStartArray();
|
||||||
|
Assert.AreEqual("", writer.Path);
|
||||||
|
writer.WriteStartObject();
|
||||||
|
Assert.AreEqual("[0]", writer.Path);
|
||||||
|
writer.WritePropertyName("Property1");
|
||||||
|
Assert.AreEqual("[0].Property1", writer.Path);
|
||||||
|
writer.WriteStartArray();
|
||||||
|
Assert.AreEqual("[0].Property1", writer.Path);
|
||||||
|
writer.WriteValue(1);
|
||||||
|
Assert.AreEqual("[0].Property1[0]", writer.Path);
|
||||||
|
writer.WriteStartArray();
|
||||||
|
Assert.AreEqual("[0].Property1[1]", writer.Path);
|
||||||
|
writer.WriteStartArray();
|
||||||
|
Assert.AreEqual("[0].Property1[1][0]", writer.Path);
|
||||||
|
writer.WriteStartArray();
|
||||||
|
Assert.AreEqual("[0].Property1[1][0][0]", writer.Path);
|
||||||
|
writer.WriteEndObject();
|
||||||
|
Assert.AreEqual("[0]", writer.Path);
|
||||||
|
writer.WriteStartObject();
|
||||||
|
Assert.AreEqual("[1]", writer.Path);
|
||||||
|
writer.WritePropertyName("Property2");
|
||||||
|
Assert.AreEqual("[1].Property2", writer.Path);
|
||||||
|
writer.WriteStartConstructor("Constructor1");
|
||||||
|
Assert.AreEqual("[1].Property2", writer.Path);
|
||||||
|
writer.WriteNull();
|
||||||
|
Assert.AreEqual("[1].Property2[0]", writer.Path);
|
||||||
|
writer.WriteStartArray();
|
||||||
|
Assert.AreEqual("[1].Property2[1]", writer.Path);
|
||||||
|
writer.WriteValue(1);
|
||||||
|
Assert.AreEqual("[1].Property2[1][0]", writer.Path);
|
||||||
|
writer.WriteEnd();
|
||||||
|
Assert.AreEqual("[1].Property2[1]", writer.Path);
|
||||||
|
writer.WriteEndObject();
|
||||||
|
Assert.AreEqual("[1]", writer.Path);
|
||||||
|
writer.WriteEndArray();
|
||||||
|
Assert.AreEqual("", writer.Path);
|
||||||
|
}
|
||||||
|
|
||||||
|
Assert.AreEqual(@"[
|
||||||
|
{
|
||||||
|
""Property1"": [
|
||||||
|
1,
|
||||||
|
[
|
||||||
|
[
|
||||||
|
[]
|
||||||
|
]
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""Property2"": new Constructor1(
|
||||||
|
null,
|
||||||
|
[
|
||||||
|
1
|
||||||
|
]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
]", sb.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void BuildStateArray()
|
public void BuildStateArray()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -72,5 +72,5 @@ using System.Security;
|
|||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("4.0.8.0")]
|
[assembly: AssemblyVersion("4.0.8.0")]
|
||||||
#if !PocketPC
|
#if !PocketPC
|
||||||
[assembly: AssemblyFileVersion("4.0.8.14618")]
|
[assembly: AssemblyFileVersion("4.0.8.14623")]
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
VersionKeyedCollection c = JsonConvert.DeserializeObject<VersionKeyedCollection>(json);
|
VersionKeyedCollection c = JsonConvert.DeserializeObject<VersionKeyedCollection>(json);
|
||||||
Assert.AreEqual(1, c.Count);
|
Assert.AreEqual(1, c.Count);
|
||||||
Assert.AreEqual(1, c.Messages.Count);
|
Assert.AreEqual(1, c.Messages.Count);
|
||||||
Assert.AreEqual("Error message for member 1 = An item with the same key has already been added.", c.Messages[0]);
|
Assert.AreEqual("[1] - Error message for member 1 = An item with the same key has already been added.", c.Messages[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@@ -161,7 +161,8 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
{
|
{
|
||||||
List<string> errors = new List<string>();
|
List<string> errors = new List<string>();
|
||||||
|
|
||||||
List<DateTime> c = JsonConvert.DeserializeObject<List<DateTime>>(@"[
|
List<DateTime> c = JsonConvert.DeserializeObject<List<DateTime>>(
|
||||||
|
@"[
|
||||||
""2009-09-09T00:00:00Z"",
|
""2009-09-09T00:00:00Z"",
|
||||||
""I am not a date and will error!"",
|
""I am not a date and will error!"",
|
||||||
[
|
[
|
||||||
@@ -175,10 +176,10 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
{
|
{
|
||||||
Error = delegate(object sender, ErrorEventArgs args)
|
Error = delegate(object sender, ErrorEventArgs args)
|
||||||
{
|
{
|
||||||
errors.Add(args.ErrorContext.Error.Message);
|
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||||
args.ErrorContext.Handled = true;
|
args.ErrorContext.Handled = true;
|
||||||
},
|
},
|
||||||
Converters = { new IsoDateTimeConverter() }
|
Converters = {new IsoDateTimeConverter()}
|
||||||
});
|
});
|
||||||
|
|
||||||
// 2009-09-09T00:00:00Z
|
// 2009-09-09T00:00:00Z
|
||||||
@@ -196,12 +197,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
|
|
||||||
Assert.AreEqual(3, errors.Count);
|
Assert.AreEqual(3, errors.Count);
|
||||||
#if !(NET20 || NET35 || WINDOWS_PHONE)
|
#if !(NET20 || NET35 || WINDOWS_PHONE)
|
||||||
Assert.AreEqual("The string was not recognized as a valid DateTime. There is an unknown word starting at index 0.", errors[0]);
|
Assert.AreEqual("[1] - 1 - The string was not recognized as a valid DateTime. There is an unknown word starting at index 0.", errors[0]);
|
||||||
#else
|
#else
|
||||||
Assert.AreEqual("The string was not recognized as a valid DateTime. There is a unknown word starting at index 0.", errors[0]);
|
Assert.AreEqual("[1] - 1 - The string was not recognized as a valid DateTime. There is a unknown word starting at index 0.", errors[0]);
|
||||||
#endif
|
#endif
|
||||||
Assert.AreEqual("Unexpected token parsing date. Expected String, got StartArray.", errors[1]);
|
Assert.AreEqual("[2] - 2 - Unexpected token parsing date. Expected String, got StartArray.", errors[1]);
|
||||||
Assert.AreEqual("Cannot convert null value to System.DateTime.", errors[2]);
|
Assert.AreEqual("[4] - 4 - Cannot convert null value to System.DateTime.", errors[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@@ -209,7 +210,8 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
{
|
{
|
||||||
bool eventErrorHandlerCalled = false;
|
bool eventErrorHandlerCalled = false;
|
||||||
|
|
||||||
DateTimeErrorObjectCollection c = JsonConvert.DeserializeObject<DateTimeErrorObjectCollection>(@"[
|
DateTimeErrorObjectCollection c = JsonConvert.DeserializeObject<DateTimeErrorObjectCollection>(
|
||||||
|
@"[
|
||||||
""2009-09-09T00:00:00Z"",
|
""2009-09-09T00:00:00Z"",
|
||||||
""kjhkjhkjhkjh"",
|
""kjhkjhkjhkjh"",
|
||||||
[
|
[
|
||||||
@@ -270,6 +272,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
|
|
||||||
string json = @"[[""kjhkjhkjhkjh""]]";
|
string json = @"[[""kjhkjhkjhkjh""]]";
|
||||||
|
|
||||||
|
Exception e = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
JsonSerializer serializer = new JsonSerializer();
|
JsonSerializer serializer = new JsonSerializer();
|
||||||
@@ -277,18 +280,68 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
{
|
{
|
||||||
// only log an error once
|
// only log an error once
|
||||||
if (args.CurrentObject == args.ErrorContext.OriginalObject)
|
if (args.CurrentObject == args.ErrorContext.OriginalObject)
|
||||||
errors.Add(args.ErrorContext.Error.Message);
|
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||||
};
|
};
|
||||||
|
|
||||||
serializer.Deserialize(new StringReader(json), typeof(List<List<DateTime>>));
|
serializer.Deserialize(new StringReader(json), typeof(List<List<DateTime>>));
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine(ex.Message);
|
e = ex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Assert.AreEqual(@"Error converting value ""kjhkjhkjhkjh"" to type 'System.DateTime'. Line 1, position 16.", e.Message);
|
||||||
|
|
||||||
Assert.AreEqual(1, errors.Count);
|
Assert.AreEqual(1, errors.Count);
|
||||||
Assert.AreEqual(@"Error converting value ""kjhkjhkjhkjh"" to type 'System.DateTime'. Line 1, position 16.", errors[0]);
|
Assert.AreEqual(@"[0][0] - 0 - Error converting value ""kjhkjhkjhkjh"" to type 'System.DateTime'. Line 1, position 16.", errors[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void MultipleRequiredPropertyErrors()
|
||||||
|
{
|
||||||
|
string json = "{}";
|
||||||
|
List<string> errors = new List<string>();
|
||||||
|
JsonSerializer serializer = new JsonSerializer();
|
||||||
|
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
||||||
|
{
|
||||||
|
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||||
|
args.ErrorContext.Handled = true;
|
||||||
|
};
|
||||||
|
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof (MyTypeWithRequiredMembers));
|
||||||
|
|
||||||
|
Assert.AreEqual(2, errors.Count);
|
||||||
|
Assert.AreEqual(" - Required1 - Required property 'Required1' not found in JSON. Line 1, position 2.", errors[0]);
|
||||||
|
Assert.AreEqual(" - Required2 - Required property 'Required2' not found in JSON. Line 1, position 2.", errors[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void HandlingArrayErrors()
|
||||||
|
{
|
||||||
|
string json = "[\"a\",\"b\",\"45\",34]";
|
||||||
|
|
||||||
|
List<string> errors = new List<string>();
|
||||||
|
|
||||||
|
JsonSerializer serializer = new JsonSerializer();
|
||||||
|
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
||||||
|
{
|
||||||
|
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||||
|
args.ErrorContext.Handled = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof(int[]));
|
||||||
|
|
||||||
|
Assert.AreEqual(2, errors.Count);
|
||||||
|
Assert.AreEqual("[0] - 0 - Could not convert string to integer: a. Line 1, position 4.", errors[0]);
|
||||||
|
Assert.AreEqual("[1] - 1 - Could not convert string to integer: b. Line 1, position 8.", errors[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonObject]
|
||||||
|
public class MyTypeWithRequiredMembers
|
||||||
|
{
|
||||||
|
[JsonProperty(Required = Required.AllowNull)]
|
||||||
|
public string Required1;
|
||||||
|
[JsonProperty(Required = Required.AllowNull)]
|
||||||
|
public string Required2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,7 +50,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
|||||||
[OnError]
|
[OnError]
|
||||||
internal void OnErrorMethod(StreamingContext context, ErrorContext errorContext)
|
internal void OnErrorMethod(StreamingContext context, ErrorContext errorContext)
|
||||||
{
|
{
|
||||||
Messages.Add("Error message for member " + errorContext.Member + " = " + errorContext.Error.Message);
|
Messages.Add(errorContext.Path + " - Error message for member " + errorContext.Member + " = " + errorContext.Error.Message);
|
||||||
errorContext.Handled = true;
|
errorContext.Handled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,11 +27,78 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
using Newtonsoft.Json.Utilities;
|
using Newtonsoft.Json.Utilities;
|
||||||
|
|
||||||
namespace Newtonsoft.Json
|
namespace Newtonsoft.Json
|
||||||
{
|
{
|
||||||
|
internal enum JsonContainerType
|
||||||
|
{
|
||||||
|
None,
|
||||||
|
Object,
|
||||||
|
Array,
|
||||||
|
Constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
internal struct JsonPosition
|
||||||
|
{
|
||||||
|
internal JsonContainerType Type;
|
||||||
|
internal int? Position;
|
||||||
|
internal string PropertyName;
|
||||||
|
|
||||||
|
internal void WriteTo(StringBuilder sb)
|
||||||
|
{
|
||||||
|
switch (Type)
|
||||||
|
{
|
||||||
|
case JsonContainerType.Object:
|
||||||
|
if (PropertyName != null)
|
||||||
|
{
|
||||||
|
if (sb.Length > 0)
|
||||||
|
sb.Append(".");
|
||||||
|
sb.Append(PropertyName);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case JsonContainerType.Array:
|
||||||
|
case JsonContainerType.Constructor:
|
||||||
|
if (Position != null)
|
||||||
|
{
|
||||||
|
sb.Append("[");
|
||||||
|
sb.Append(Position);
|
||||||
|
sb.Append("]");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal bool InsideContainer()
|
||||||
|
{
|
||||||
|
switch (Type)
|
||||||
|
{
|
||||||
|
case JsonContainerType.Object:
|
||||||
|
return (PropertyName != null);
|
||||||
|
case JsonContainerType.Array:
|
||||||
|
case JsonContainerType.Constructor:
|
||||||
|
return (Position != null);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static string BuildPath(IEnumerable<JsonPosition> positions)
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
foreach (JsonPosition state in positions)
|
||||||
|
{
|
||||||
|
state.WriteTo(sb);
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a reader that provides fast, non-cached, forward-only access to serialized Json data.
|
/// Represents a reader that provides fast, non-cached, forward-only access to serialized Json data.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -101,7 +168,7 @@ namespace Newtonsoft.Json
|
|||||||
private object _value;
|
private object _value;
|
||||||
private char _quoteChar;
|
private char _quoteChar;
|
||||||
internal State _currentState;
|
internal State _currentState;
|
||||||
private JTokenType _currentTypeContext;
|
private JsonPosition _currentPosition;
|
||||||
private CultureInfo _culture;
|
private CultureInfo _culture;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -113,9 +180,7 @@ namespace Newtonsoft.Json
|
|||||||
get { return _currentState; }
|
get { return _currentState; }
|
||||||
}
|
}
|
||||||
|
|
||||||
private int _top;
|
private readonly List<JsonPosition> _stack;
|
||||||
|
|
||||||
private readonly List<JTokenType> _stack;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets a value indicating whether the underlying stream or
|
/// Gets or sets a value indicating whether the underlying stream or
|
||||||
@@ -137,7 +202,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the type of the current Json token.
|
/// Gets the type of the current JSON token.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual JsonToken TokenType
|
public virtual JsonToken TokenType
|
||||||
{
|
{
|
||||||
@@ -145,7 +210,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the text value of the current Json token.
|
/// Gets the text value of the current JSON token.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual object Value
|
public virtual object Value
|
||||||
{
|
{
|
||||||
@@ -153,7 +218,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets The Common Language Runtime (CLR) type for the current Json token.
|
/// Gets The Common Language Runtime (CLR) type for the current JSON token.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual Type ValueType
|
public virtual Type ValueType
|
||||||
{
|
{
|
||||||
@@ -168,11 +233,11 @@ namespace Newtonsoft.Json
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
int depth = _top - 1;
|
int depth = _stack.Count;
|
||||||
if (IsStartToken(TokenType))
|
if (IsStartToken(TokenType) || _currentPosition.Type == JsonContainerType.None)
|
||||||
return depth - 1;
|
|
||||||
else
|
|
||||||
return depth;
|
return depth;
|
||||||
|
else
|
||||||
|
return depth + 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,39 +250,71 @@ namespace Newtonsoft.Json
|
|||||||
set { _culture = value; }
|
set { _culture = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the path of the current JSON token.
|
||||||
|
/// </summary>
|
||||||
|
public string Path
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_currentPosition.Type == JsonContainerType.None)
|
||||||
|
return string.Empty;
|
||||||
|
|
||||||
|
return JsonPosition.BuildPath(_stack.Concat(new[] { _currentPosition }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="JsonReader"/> class with the specified <see cref="TextReader"/>.
|
/// Initializes a new instance of the <see cref="JsonReader"/> class with the specified <see cref="TextReader"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected JsonReader()
|
protected JsonReader()
|
||||||
{
|
{
|
||||||
_currentState = State.Start;
|
_currentState = State.Start;
|
||||||
_stack = new List<JTokenType>();
|
_stack = new List<JsonPosition>(4);
|
||||||
|
|
||||||
CloseInput = true;
|
CloseInput = true;
|
||||||
|
|
||||||
Push(JTokenType.None);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Push(JTokenType value)
|
private void Push(JsonContainerType value)
|
||||||
{
|
{
|
||||||
_stack.Add(value);
|
UpdateScopeWithFinishedValue();
|
||||||
_top++;
|
|
||||||
_currentTypeContext = value;
|
if (_currentPosition.Type == JsonContainerType.None)
|
||||||
|
{
|
||||||
|
_currentPosition.Type = value;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_stack.Add(_currentPosition);
|
||||||
|
var state = new JsonPosition
|
||||||
|
{
|
||||||
|
Type = value
|
||||||
|
};
|
||||||
|
_currentPosition = state;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private JTokenType Pop()
|
private JsonContainerType Pop()
|
||||||
{
|
{
|
||||||
JTokenType value = Peek();
|
JsonPosition oldPosition;
|
||||||
|
if (_stack.Count > 0)
|
||||||
|
{
|
||||||
|
oldPosition = _currentPosition;
|
||||||
|
_currentPosition = _stack[_stack.Count - 1];
|
||||||
_stack.RemoveAt(_stack.Count - 1);
|
_stack.RemoveAt(_stack.Count - 1);
|
||||||
_top--;
|
}
|
||||||
_currentTypeContext = _stack[_top - 1];
|
else
|
||||||
|
{
|
||||||
return value;
|
oldPosition = _currentPosition;
|
||||||
|
_currentPosition = new JsonPosition();
|
||||||
}
|
}
|
||||||
|
|
||||||
private JTokenType Peek()
|
return oldPosition.Type;
|
||||||
|
}
|
||||||
|
|
||||||
|
private JsonContainerType Peek()
|
||||||
{
|
{
|
||||||
return _currentTypeContext;
|
return _currentPosition.Type;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -292,15 +389,15 @@ namespace Newtonsoft.Json
|
|||||||
{
|
{
|
||||||
case JsonToken.StartObject:
|
case JsonToken.StartObject:
|
||||||
_currentState = State.ObjectStart;
|
_currentState = State.ObjectStart;
|
||||||
Push(JTokenType.Object);
|
Push(JsonContainerType.Object);
|
||||||
break;
|
break;
|
||||||
case JsonToken.StartArray:
|
case JsonToken.StartArray:
|
||||||
_currentState = State.ArrayStart;
|
_currentState = State.ArrayStart;
|
||||||
Push(JTokenType.Array);
|
Push(JsonContainerType.Array);
|
||||||
break;
|
break;
|
||||||
case JsonToken.StartConstructor:
|
case JsonToken.StartConstructor:
|
||||||
_currentState = State.ConstructorStart;
|
_currentState = State.ConstructorStart;
|
||||||
Push(JTokenType.Constructor);
|
Push(JsonContainerType.Constructor);
|
||||||
break;
|
break;
|
||||||
case JsonToken.EndObject:
|
case JsonToken.EndObject:
|
||||||
ValidateEnd(JsonToken.EndObject);
|
ValidateEnd(JsonToken.EndObject);
|
||||||
@@ -313,6 +410,8 @@ namespace Newtonsoft.Json
|
|||||||
break;
|
break;
|
||||||
case JsonToken.PropertyName:
|
case JsonToken.PropertyName:
|
||||||
_currentState = State.Property;
|
_currentState = State.Property;
|
||||||
|
|
||||||
|
_currentPosition.PropertyName = (string) value;
|
||||||
break;
|
break;
|
||||||
case JsonToken.Undefined:
|
case JsonToken.Undefined:
|
||||||
case JsonToken.Integer:
|
case JsonToken.Integer:
|
||||||
@@ -323,21 +422,35 @@ namespace Newtonsoft.Json
|
|||||||
case JsonToken.String:
|
case JsonToken.String:
|
||||||
case JsonToken.Raw:
|
case JsonToken.Raw:
|
||||||
case JsonToken.Bytes:
|
case JsonToken.Bytes:
|
||||||
_currentState = (Peek() != JTokenType.None) ? State.PostValue : State.Finished;
|
_currentState = (Peek() != JsonContainerType.None) ? State.PostValue : State.Finished;
|
||||||
|
|
||||||
|
UpdateScopeWithFinishedValue();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
_value = value;
|
_value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void UpdateScopeWithFinishedValue()
|
||||||
|
{
|
||||||
|
if (_currentPosition.Type == JsonContainerType.Array
|
||||||
|
|| _currentPosition.Type == JsonContainerType.Constructor)
|
||||||
|
{
|
||||||
|
if (_currentPosition.Position == null)
|
||||||
|
_currentPosition.Position = 0;
|
||||||
|
else
|
||||||
|
_currentPosition.Position++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void ValidateEnd(JsonToken endToken)
|
private void ValidateEnd(JsonToken endToken)
|
||||||
{
|
{
|
||||||
JTokenType currentObject = Pop();
|
JsonContainerType currentObject = Pop();
|
||||||
|
|
||||||
if (GetTypeForCloseToken(endToken) != currentObject)
|
if (GetTypeForCloseToken(endToken) != currentObject)
|
||||||
throw new JsonReaderException("JsonToken {0} is not valid for closing JsonType {1}.".FormatWith(CultureInfo.InvariantCulture, endToken, currentObject));
|
throw new JsonReaderException("JsonToken {0} is not valid for closing JsonType {1}.".FormatWith(CultureInfo.InvariantCulture, endToken, currentObject));
|
||||||
|
|
||||||
_currentState = (Peek() != JTokenType.None) ? State.PostValue : State.Finished;
|
_currentState = (Peek() != JsonContainerType.None) ? State.PostValue : State.Finished;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -345,20 +458,20 @@ namespace Newtonsoft.Json
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected void SetStateBasedOnCurrent()
|
protected void SetStateBasedOnCurrent()
|
||||||
{
|
{
|
||||||
JTokenType currentObject = Peek();
|
JsonContainerType currentObject = Peek();
|
||||||
|
|
||||||
switch (currentObject)
|
switch (currentObject)
|
||||||
{
|
{
|
||||||
case JTokenType.Object:
|
case JsonContainerType.Object:
|
||||||
_currentState = State.Object;
|
_currentState = State.Object;
|
||||||
break;
|
break;
|
||||||
case JTokenType.Array:
|
case JsonContainerType.Array:
|
||||||
_currentState = State.Array;
|
_currentState = State.Array;
|
||||||
break;
|
break;
|
||||||
case JTokenType.Constructor:
|
case JsonContainerType.Constructor:
|
||||||
_currentState = State.Constructor;
|
_currentState = State.Constructor;
|
||||||
break;
|
break;
|
||||||
case JTokenType.None:
|
case JsonContainerType.None:
|
||||||
_currentState = State.Finished;
|
_currentState = State.Finished;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -413,16 +526,16 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private JTokenType GetTypeForCloseToken(JsonToken token)
|
private JsonContainerType GetTypeForCloseToken(JsonToken token)
|
||||||
{
|
{
|
||||||
switch (token)
|
switch (token)
|
||||||
{
|
{
|
||||||
case JsonToken.EndObject:
|
case JsonToken.EndObject:
|
||||||
return JTokenType.Object;
|
return JsonContainerType.Object;
|
||||||
case JsonToken.EndArray:
|
case JsonToken.EndArray:
|
||||||
return JTokenType.Array;
|
return JsonContainerType.Array;
|
||||||
case JsonToken.EndConstructor:
|
case JsonToken.EndConstructor:
|
||||||
return JTokenType.Constructor;
|
return JsonContainerType.Constructor;
|
||||||
default:
|
default:
|
||||||
throw new JsonReaderException("Not a valid close JsonToken: {0}".FormatWith(CultureInfo.InvariantCulture, token));
|
throw new JsonReaderException("Not a valid close JsonToken: {0}".FormatWith(CultureInfo.InvariantCulture, token));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -160,9 +160,8 @@ namespace Newtonsoft.Json
|
|||||||
StateArray = BuildStateArray();
|
StateArray = BuildStateArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private int _top;
|
private readonly List<JsonPosition> _stack;
|
||||||
|
private JsonPosition _currentPosition;
|
||||||
private readonly List<JTokenType> _stack;
|
|
||||||
private State _currentState;
|
private State _currentState;
|
||||||
private Formatting _formatting;
|
private Formatting _formatting;
|
||||||
|
|
||||||
@@ -182,7 +181,29 @@ namespace Newtonsoft.Json
|
|||||||
/// <value>The top.</value>
|
/// <value>The top.</value>
|
||||||
protected internal int Top
|
protected internal int Top
|
||||||
{
|
{
|
||||||
get { return _top; }
|
get
|
||||||
|
{
|
||||||
|
int depth = _stack.Count;
|
||||||
|
if (Peek() != JsonContainerType.None)
|
||||||
|
depth++;
|
||||||
|
|
||||||
|
return depth;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal string ContainerPath
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_currentPosition.Type == JsonContainerType.None)
|
||||||
|
return string.Empty;
|
||||||
|
|
||||||
|
IEnumerable<JsonPosition> positions = (_currentPosition.InsideContainer())
|
||||||
|
? _stack
|
||||||
|
: _stack.Concat(new[] { _currentPosition });
|
||||||
|
|
||||||
|
return JsonPosition.BuildPath(positions);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -217,6 +238,20 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the path of the writer.
|
||||||
|
/// </summary>
|
||||||
|
public string Path
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_currentPosition.Type == JsonContainerType.None)
|
||||||
|
return string.Empty;
|
||||||
|
|
||||||
|
return JsonPosition.BuildPath(_stack.Concat(new[] { _currentPosition }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Indicates how the output is formatted.
|
/// Indicates how the output is formatted.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -231,34 +266,65 @@ namespace Newtonsoft.Json
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected JsonWriter()
|
protected JsonWriter()
|
||||||
{
|
{
|
||||||
_stack = new List<JTokenType>(8);
|
_stack = new List<JsonPosition>(4);
|
||||||
_stack.Add(JTokenType.None);
|
|
||||||
_currentState = State.Start;
|
_currentState = State.Start;
|
||||||
_formatting = Formatting.None;
|
_formatting = Formatting.None;
|
||||||
|
|
||||||
CloseOutput = true;
|
CloseOutput = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Push(JTokenType value)
|
private void UpdateScopeWithFinishedValue()
|
||||||
{
|
{
|
||||||
_top++;
|
if (_currentPosition.Type == JsonContainerType.Array
|
||||||
if (_stack.Count <= _top)
|
|| _currentPosition.Type == JsonContainerType.Constructor)
|
||||||
_stack.Add(value);
|
{
|
||||||
|
if (_currentPosition.Position == null)
|
||||||
|
_currentPosition.Position = 0;
|
||||||
else
|
else
|
||||||
_stack[_top] = value;
|
_currentPosition.Position++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private JTokenType Pop()
|
private void Push(JsonContainerType value)
|
||||||
{
|
{
|
||||||
JTokenType value = Peek();
|
UpdateScopeWithFinishedValue();
|
||||||
_top--;
|
|
||||||
|
|
||||||
return value;
|
if (_currentPosition.Type == JsonContainerType.None)
|
||||||
|
{
|
||||||
|
_currentPosition.Type = value;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_stack.Add(_currentPosition);
|
||||||
|
var state = new JsonPosition
|
||||||
|
{
|
||||||
|
Type = value
|
||||||
|
};
|
||||||
|
_currentPosition = state;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private JTokenType Peek()
|
private JsonContainerType Pop()
|
||||||
{
|
{
|
||||||
return _stack[_top];
|
JsonPosition oldPosition;
|
||||||
|
if (_stack.Count > 0)
|
||||||
|
{
|
||||||
|
oldPosition = _currentPosition;
|
||||||
|
_currentPosition = _stack[_stack.Count - 1];
|
||||||
|
_stack.RemoveAt(_stack.Count - 1);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
oldPosition = _currentPosition;
|
||||||
|
_currentPosition = new JsonPosition();
|
||||||
|
}
|
||||||
|
|
||||||
|
return oldPosition.Type;
|
||||||
|
}
|
||||||
|
|
||||||
|
private JsonContainerType Peek()
|
||||||
|
{
|
||||||
|
return _currentPosition.Type;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -280,7 +346,7 @@ namespace Newtonsoft.Json
|
|||||||
public virtual void WriteStartObject()
|
public virtual void WriteStartObject()
|
||||||
{
|
{
|
||||||
AutoComplete(JsonToken.StartObject);
|
AutoComplete(JsonToken.StartObject);
|
||||||
Push(JTokenType.Object);
|
Push(JsonContainerType.Object);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -297,7 +363,7 @@ namespace Newtonsoft.Json
|
|||||||
public virtual void WriteStartArray()
|
public virtual void WriteStartArray()
|
||||||
{
|
{
|
||||||
AutoComplete(JsonToken.StartArray);
|
AutoComplete(JsonToken.StartArray);
|
||||||
Push(JTokenType.Array);
|
Push(JsonContainerType.Array);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -315,7 +381,7 @@ namespace Newtonsoft.Json
|
|||||||
public virtual void WriteStartConstructor(string name)
|
public virtual void WriteStartConstructor(string name)
|
||||||
{
|
{
|
||||||
AutoComplete(JsonToken.StartConstructor);
|
AutoComplete(JsonToken.StartConstructor);
|
||||||
Push(JTokenType.Constructor);
|
Push(JsonContainerType.Constructor);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -332,6 +398,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <param name="name">The name of the property.</param>
|
/// <param name="name">The name of the property.</param>
|
||||||
public virtual void WritePropertyName(string name)
|
public virtual void WritePropertyName(string name)
|
||||||
{
|
{
|
||||||
|
_currentPosition.PropertyName = name;
|
||||||
AutoComplete(JsonToken.PropertyName);
|
AutoComplete(JsonToken.PropertyName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -482,17 +549,17 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void WriteEnd(JTokenType type)
|
private void WriteEnd(JsonContainerType type)
|
||||||
{
|
{
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case JTokenType.Object:
|
case JsonContainerType.Object:
|
||||||
WriteEndObject();
|
WriteEndObject();
|
||||||
break;
|
break;
|
||||||
case JTokenType.Array:
|
case JsonContainerType.Array:
|
||||||
WriteEndArray();
|
WriteEndArray();
|
||||||
break;
|
break;
|
||||||
case JTokenType.Constructor:
|
case JsonContainerType.Constructor:
|
||||||
WriteEndConstructor();
|
WriteEndConstructor();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -502,36 +569,36 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void AutoCompleteAll()
|
private void AutoCompleteAll()
|
||||||
{
|
{
|
||||||
while (_top > 0)
|
while (Top > 0)
|
||||||
{
|
{
|
||||||
WriteEnd();
|
WriteEnd();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private JTokenType GetTypeForCloseToken(JsonToken token)
|
private JsonContainerType GetTypeForCloseToken(JsonToken token)
|
||||||
{
|
{
|
||||||
switch (token)
|
switch (token)
|
||||||
{
|
{
|
||||||
case JsonToken.EndObject:
|
case JsonToken.EndObject:
|
||||||
return JTokenType.Object;
|
return JsonContainerType.Object;
|
||||||
case JsonToken.EndArray:
|
case JsonToken.EndArray:
|
||||||
return JTokenType.Array;
|
return JsonContainerType.Array;
|
||||||
case JsonToken.EndConstructor:
|
case JsonToken.EndConstructor:
|
||||||
return JTokenType.Constructor;
|
return JsonContainerType.Constructor;
|
||||||
default:
|
default:
|
||||||
throw new JsonWriterException("No type for token: " + token);
|
throw new JsonWriterException("No type for token: " + token);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private JsonToken GetCloseTokenForType(JTokenType type)
|
private JsonToken GetCloseTokenForType(JsonContainerType type)
|
||||||
{
|
{
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case JTokenType.Object:
|
case JsonContainerType.Object:
|
||||||
return JsonToken.EndObject;
|
return JsonToken.EndObject;
|
||||||
case JTokenType.Array:
|
case JsonContainerType.Array:
|
||||||
return JsonToken.EndArray;
|
return JsonToken.EndArray;
|
||||||
case JTokenType.Constructor:
|
case JsonContainerType.Constructor:
|
||||||
return JsonToken.EndConstructor;
|
return JsonToken.EndConstructor;
|
||||||
default:
|
default:
|
||||||
throw new JsonWriterException("No close token for type: " + type);
|
throw new JsonWriterException("No close token for type: " + type);
|
||||||
@@ -543,17 +610,26 @@ namespace Newtonsoft.Json
|
|||||||
// write closing symbol and calculate new state
|
// write closing symbol and calculate new state
|
||||||
|
|
||||||
int levelsToComplete = 0;
|
int levelsToComplete = 0;
|
||||||
|
JsonContainerType type = GetTypeForCloseToken(tokenBeingClosed);
|
||||||
|
|
||||||
for (int i = 0; i < _top; i++)
|
if (_currentPosition.Type == type)
|
||||||
{
|
{
|
||||||
int currentLevel = _top - i;
|
levelsToComplete = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int top = Top - 2;
|
||||||
|
for (int i = top; i >= 0; i--)
|
||||||
|
{
|
||||||
|
int currentLevel = top - i;
|
||||||
|
|
||||||
if (_stack[currentLevel] == GetTypeForCloseToken(tokenBeingClosed))
|
if (_stack[currentLevel].Type == type)
|
||||||
{
|
{
|
||||||
levelsToComplete = i + 1;
|
levelsToComplete = i + 2;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (levelsToComplete == 0)
|
if (levelsToComplete == 0)
|
||||||
throw new JsonWriterException("No token to close.");
|
throw new JsonWriterException("No token to close.");
|
||||||
@@ -569,28 +645,28 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
WriteEnd(token);
|
WriteEnd(token);
|
||||||
}
|
|
||||||
|
|
||||||
JTokenType currentLevelType = Peek();
|
JsonContainerType currentLevelType = Peek();
|
||||||
|
|
||||||
switch (currentLevelType)
|
switch (currentLevelType)
|
||||||
{
|
{
|
||||||
case JTokenType.Object:
|
case JsonContainerType.Object:
|
||||||
_currentState = State.Object;
|
_currentState = State.Object;
|
||||||
break;
|
break;
|
||||||
case JTokenType.Array:
|
case JsonContainerType.Array:
|
||||||
_currentState = State.Array;
|
_currentState = State.Array;
|
||||||
break;
|
break;
|
||||||
case JTokenType.Constructor:
|
case JsonContainerType.Constructor:
|
||||||
_currentState = State.Array;
|
_currentState = State.Array;
|
||||||
break;
|
break;
|
||||||
case JTokenType.None:
|
case JsonContainerType.None:
|
||||||
_currentState = State.Start;
|
_currentState = State.Start;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new JsonWriterException("Unknown JsonType: " + currentLevelType);
|
throw new JsonWriterException("Unknown JsonType: " + currentLevelType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Writes the specified end token.
|
/// Writes the specified end token.
|
||||||
@@ -623,11 +699,18 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
internal void AutoComplete(JsonToken tokenBeingWritten)
|
internal void AutoComplete(JsonToken tokenBeingWritten)
|
||||||
{
|
{
|
||||||
|
if (tokenBeingWritten != JsonToken.StartObject
|
||||||
|
&& tokenBeingWritten != JsonToken.StartArray
|
||||||
|
&& tokenBeingWritten != JsonToken.StartConstructor)
|
||||||
|
UpdateScopeWithFinishedValue();
|
||||||
|
|
||||||
// gets new state based on the current state and what is being written
|
// gets new state based on the current state and what is being written
|
||||||
State newState = StateArray[(int)tokenBeingWritten][(int)_currentState];
|
State newState = StateArray[(int)tokenBeingWritten][(int)_currentState];
|
||||||
|
|
||||||
if (newState == State.Error)
|
if (newState == State.Error)
|
||||||
|
{
|
||||||
throw new JsonWriterException("Token {0} in state {1} would result in an invalid JSON object.".FormatWith(CultureInfo.InvariantCulture, tokenBeingWritten.ToString(), _currentState.ToString()));
|
throw new JsonWriterException("Token {0} in state {1} would result in an invalid JSON object.".FormatWith(CultureInfo.InvariantCulture, tokenBeingWritten.ToString(), _currentState.ToString()));
|
||||||
|
}
|
||||||
|
|
||||||
if ((_currentState == State.Object || _currentState == State.Array || _currentState == State.Constructor) && tokenBeingWritten != JsonToken.Comment)
|
if ((_currentState == State.Object || _currentState == State.Array || _currentState == State.Constructor) && tokenBeingWritten != JsonToken.Comment)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ using System.Security;
|
|||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("4.0.8.0")]
|
[assembly: AssemblyVersion("4.0.8.0")]
|
||||||
#if !PocketPC
|
#if !PocketPC
|
||||||
[assembly: AssemblyFileVersion("4.0.8.14618")]
|
[assembly: AssemblyFileVersion("4.0.8.14623")]
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
[assembly: CLSCompliant(true)]
|
[assembly: CLSCompliant(true)]
|
||||||
|
|||||||
@@ -35,11 +35,12 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class ErrorContext
|
public class ErrorContext
|
||||||
{
|
{
|
||||||
internal ErrorContext(object originalObject, object member, Exception error)
|
internal ErrorContext(object originalObject, object member, string path, Exception error)
|
||||||
{
|
{
|
||||||
OriginalObject = originalObject;
|
OriginalObject = originalObject;
|
||||||
Member = member;
|
Member = member;
|
||||||
Error = error;
|
Error = error;
|
||||||
|
Path = path;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -58,6 +59,11 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
/// <value>The member that caused the error.</value>
|
/// <value>The member that caused the error.</value>
|
||||||
public object Member { get; private set; }
|
public object Member { get; private set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// Gets the path of the JSON location when the error occurred.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The path of the JSON location when the error occurred.</value>
|
||||||
|
public string Path { get; private set; }
|
||||||
|
/// <summary>
|
||||||
/// Gets or sets a value indicating whether this <see cref="ErrorContext"/> is handled.
|
/// Gets or sets a value indicating whether this <see cref="ErrorContext"/> is handled.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value><c>true</c> if handled; otherwise, <c>false</c>.</value>
|
/// <value><c>true</c> if handled; otherwise, <c>false</c>.</value>
|
||||||
|
|||||||
@@ -37,7 +37,12 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class JsonArrayContract : JsonContract
|
public class JsonArrayContract : JsonContract
|
||||||
{
|
{
|
||||||
internal Type CollectionItemType { get; private set; }
|
/// <summary>
|
||||||
|
/// Gets the <see cref="Type"/> of the collection items.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The <see cref="Type"/> of the collection items.</value>
|
||||||
|
public Type CollectionItemType { get; private set; }
|
||||||
|
|
||||||
internal JsonContract CollectionItemContract { get; set; }
|
internal JsonContract CollectionItemContract { get; set; }
|
||||||
|
|
||||||
private readonly bool _isCollectionItemTypeNullableType;
|
private readonly bool _isCollectionItemTypeNullableType;
|
||||||
|
|||||||
@@ -42,8 +42,16 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
/// <value>The property name resolver.</value>
|
/// <value>The property name resolver.</value>
|
||||||
public Func<string, string> PropertyNameResolver { get; set; }
|
public Func<string, string> PropertyNameResolver { get; set; }
|
||||||
|
|
||||||
internal Type DictionaryKeyType { get; private set; }
|
/// <summary>
|
||||||
internal Type DictionaryValueType { get; private set; }
|
/// Gets the <see cref="Type"/> of the dictionary keys.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The <see cref="Type"/> of the dictionary keys.</value>
|
||||||
|
public Type DictionaryKeyType { get; private set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the <see cref="Type"/> of the dictionary values.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The <see cref="Type"/> of the dictionary values.</value>
|
||||||
|
public Type DictionaryValueType { get; private set; }
|
||||||
|
|
||||||
internal JsonContract DictionaryKeyContract { get; set; }
|
internal JsonContract DictionaryKeyContract { get; set; }
|
||||||
internal JsonContract DictionaryValueContract { get; set; }
|
internal JsonContract DictionaryValueContract { get; set; }
|
||||||
|
|||||||
@@ -79,10 +79,10 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected ErrorContext GetErrorContext(object currentObject, object member, Exception error)
|
protected ErrorContext GetErrorContext(object currentObject, object member, string path, Exception error)
|
||||||
{
|
{
|
||||||
if (_currentErrorContext == null)
|
if (_currentErrorContext == null)
|
||||||
_currentErrorContext = new ErrorContext(currentObject, member, error);
|
_currentErrorContext = new ErrorContext(currentObject, member, path, error);
|
||||||
|
|
||||||
if (_currentErrorContext.Error != error)
|
if (_currentErrorContext.Error != error)
|
||||||
throw new InvalidOperationException("Current error context error is different to requested error.");
|
throw new InvalidOperationException("Current error context error is different to requested error.");
|
||||||
@@ -98,9 +98,9 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
_currentErrorContext = null;
|
_currentErrorContext = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected bool IsErrorHandled(object currentObject, JsonContract contract, object keyValue, Exception ex)
|
protected bool IsErrorHandled(object currentObject, JsonContract contract, object keyValue, string path, Exception ex)
|
||||||
{
|
{
|
||||||
ErrorContext errorContext = GetErrorContext(currentObject, keyValue, ex);
|
ErrorContext errorContext = GetErrorContext(currentObject, keyValue, path, ex);
|
||||||
contract.InvokeOnError(currentObject, Serializer.Context, errorContext);
|
contract.InvokeOnError(currentObject, Serializer.Context, errorContext);
|
||||||
|
|
||||||
if (!errorContext.Handled)
|
if (!errorContext.Handled)
|
||||||
|
|||||||
@@ -712,7 +712,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
if (IsErrorHandled(dictionary, contract, keyValue, ex))
|
if (IsErrorHandled(dictionary, contract, keyValue, reader.Path, ex))
|
||||||
HandleError(reader, initialDepth);
|
HandleError(reader, initialDepth);
|
||||||
else
|
else
|
||||||
throw;
|
throw;
|
||||||
@@ -767,11 +767,16 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
contract.InvokeOnDeserializing(list, Serializer.Context);
|
contract.InvokeOnDeserializing(list, Serializer.Context);
|
||||||
|
|
||||||
int initialDepth = reader.Depth;
|
int initialDepth = reader.Depth;
|
||||||
|
int index = 0;
|
||||||
|
|
||||||
JsonContract collectionItemContract = GetContractSafe(contract.CollectionItemType);
|
JsonContract collectionItemContract = GetContractSafe(contract.CollectionItemType);
|
||||||
JsonConverter collectionItemConverter = GetConverter(collectionItemContract, null);
|
JsonConverter collectionItemConverter = GetConverter(collectionItemContract, null);
|
||||||
|
|
||||||
while (ReadForType(reader, collectionItemContract, collectionItemConverter != null, true))
|
while (true)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (ReadForType(reader, collectionItemContract, collectionItemConverter != null, true))
|
||||||
{
|
{
|
||||||
switch (reader.TokenType)
|
switch (reader.TokenType)
|
||||||
{
|
{
|
||||||
@@ -782,24 +787,27 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
case JsonToken.Comment:
|
case JsonToken.Comment:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
try
|
|
||||||
{
|
|
||||||
object value = CreateValueNonProperty(reader, contract.CollectionItemType, collectionItemContract, collectionItemConverter);
|
object value = CreateValueNonProperty(reader, contract.CollectionItemType, collectionItemContract, collectionItemConverter);
|
||||||
|
|
||||||
wrappedList.Add(value);
|
wrappedList.Add(value);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
if (IsErrorHandled(list, contract, wrappedList.Count, ex))
|
|
||||||
{
|
|
||||||
HandleError(reader, initialDepth);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
if (IsErrorHandled(list, contract, index, reader.Path, ex))
|
||||||
|
HandleError(reader, initialDepth);
|
||||||
|
else
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
finally
|
||||||
break;
|
{
|
||||||
|
index++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -911,7 +919,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
if (IsErrorHandled(newObject, contract, memberName, ex))
|
if (IsErrorHandled(newObject, contract, memberName, reader.Path, ex))
|
||||||
HandleError(reader, initialDepth);
|
HandleError(reader, initialDepth);
|
||||||
else
|
else
|
||||||
throw;
|
throw;
|
||||||
@@ -1155,6 +1163,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
switch (reader.TokenType)
|
switch (reader.TokenType)
|
||||||
{
|
{
|
||||||
case JsonToken.PropertyName:
|
case JsonToken.PropertyName:
|
||||||
|
{
|
||||||
string memberName = reader.Value.ToString();
|
string memberName = reader.Value.ToString();
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -1186,18 +1195,24 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
if (IsErrorHandled(newObject, contract, memberName, ex))
|
if (IsErrorHandled(newObject, contract, memberName, reader.Path, ex))
|
||||||
HandleError(reader, initialDepth);
|
HandleError(reader, initialDepth);
|
||||||
else
|
else
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case JsonToken.EndObject:
|
case JsonToken.EndObject:
|
||||||
|
{
|
||||||
foreach (KeyValuePair<JsonProperty, PropertyPresence> propertyPresence in propertiesPresence)
|
foreach (KeyValuePair<JsonProperty, PropertyPresence> propertyPresence in propertiesPresence)
|
||||||
{
|
{
|
||||||
JsonProperty property = propertyPresence.Key;
|
JsonProperty property = propertyPresence.Key;
|
||||||
PropertyPresence presence = propertyPresence.Value;
|
PropertyPresence presence = propertyPresence.Value;
|
||||||
|
|
||||||
|
if (presence == PropertyPresence.None || presence == PropertyPresence.Null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
switch (presence)
|
switch (presence)
|
||||||
{
|
{
|
||||||
case PropertyPresence.None:
|
case PropertyPresence.None:
|
||||||
@@ -1217,9 +1232,19 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
if (IsErrorHandled(newObject, contract, property.PropertyName, reader.Path, ex))
|
||||||
|
HandleError(reader, initialDepth);
|
||||||
|
else
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
contract.InvokeOnDeserialized(newObject, Serializer.Context);
|
contract.InvokeOnDeserialized(newObject, Serializer.Context);
|
||||||
return newObject;
|
return newObject;
|
||||||
|
}
|
||||||
case JsonToken.Comment:
|
case JsonToken.Comment:
|
||||||
// ignore
|
// ignore
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -330,7 +330,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
if (IsErrorHandled(value, contract, property.PropertyName, ex))
|
if (IsErrorHandled(value, contract, property.PropertyName, writer.ContainerPath, ex))
|
||||||
HandleError(writer, initialDepth);
|
HandleError(writer, initialDepth);
|
||||||
else
|
else
|
||||||
throw;
|
throw;
|
||||||
@@ -439,7 +439,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
if (IsErrorHandled(values.UnderlyingCollection, contract, index, ex))
|
if (IsErrorHandled(values.UnderlyingCollection, contract, index, writer.ContainerPath, ex))
|
||||||
HandleError(writer, initialDepth);
|
HandleError(writer, initialDepth);
|
||||||
else
|
else
|
||||||
throw;
|
throw;
|
||||||
@@ -614,7 +614,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
if (IsErrorHandled(values.UnderlyingDictionary, contract, propertyName, ex))
|
if (IsErrorHandled(values.UnderlyingDictionary, contract, propertyName, writer.ContainerPath, ex))
|
||||||
HandleError(writer, initialDepth);
|
HandleError(writer, initialDepth);
|
||||||
else
|
else
|
||||||
throw;
|
throw;
|
||||||
|
|||||||
Reference in New Issue
Block a user