LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #380 from tamizhvendan/master

Browse Source 
Removing the redundant requirement of having "fields property with empty array"
This commit is contained in:
James Newton-King
2014-09-25 21:09:00 +12:00
parent 6a22345e28 8eea549b0a
commit fc5134fbcc
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs
+3 -9
View File
@@ -42,7 +42,7 @@ namespace Newtonsoft.Json.Tests.Converters
{
string json = JsonConvert.SerializeObject(Currency.AUD);
Assert.AreEqual(@"{""Case"":""AUD"",""Fields"":[]}", json);
Assert.AreEqual(@"{""Case"":""AUD""}", json);
}
[Test]
@@ -56,10 +56,10 @@ namespace Newtonsoft.Json.Tests.Converters
[Test]
public void DeserializeBasicUnion()
{
Currency c = JsonConvert.DeserializeObject<Currency>(@"{""Case"":""AUD"",""Fields"":[]}");
Currency c = JsonConvert.DeserializeObject<Currency>(@"{""Case"":""AUD""}");
Assert.AreEqual(Currency.AUD, c);
c = JsonConvert.DeserializeObject<Currency>(@"{""Fields"":[],""Case"":""EUR""}");
c = JsonConvert.DeserializeObject<Currency>(@"{""Case"":""EUR""}");
Assert.AreEqual(Currency.EUR, c);
c = JsonConvert.DeserializeObject<Currency>(@"null");
@@ -96,12 +96,6 @@ namespace Newtonsoft.Json.Tests.Converters
ExceptionAssert.Throws<JsonSerializationException>(() => JsonConvert.DeserializeObject<Currency>(@"{""Fields"":[1]}"), "No 'Case' property with union name found. Path '', line 1, position 14.");
}
[Test]
public void DeserializeBasicUnion_NoFields()
{
ExceptionAssert.Throws<JsonSerializationException>(() => JsonConvert.DeserializeObject<Currency>(@"{""Case"":""AUD""}"), "No 'Fields' property with union fields found. Path '', line 1, position 14.");
}
[Test]
public void DeserializeBasicUnion_UnexpectedEnd()
{
Src/Newtonsoft.Json/Converters/DiscriminatedUnionConverter.cs
+22 -13
View File
@@ -65,12 +65,16 @@ namespace Newtonsoft.Json.Converters
object info = FSharpUtils.GetUnionCaseInfo(result);
object fields = FSharpUtils.GetUnionCaseFields(result);
object caseName = FSharpUtils.GetUnionCaseInfoName(info);
object[] fieldsAsArray = fields as object[];
writer.WriteStartObject();
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(CasePropertyName) : CasePropertyName);
writer.WriteValue((string)caseName);
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(FieldsPropertyName) : FieldsPropertyName);
serializer.Serialize(writer, fields);
if (fieldsAsArray != null && fieldsAsArray.Length > 0)
{
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(FieldsPropertyName) : FieldsPropertyName);
serializer.Serialize(writer, fields);
}
writer.WriteEndObject();
}
@@ -135,21 +139,26 @@ namespace Newtonsoft.Json.Converters
if (matchingCaseInfo == null)
throw JsonSerializationException.Create(reader, "No '{0}' property with union name found.".FormatWith(CultureInfo.InvariantCulture, CasePropertyName));
if (fields == null)
PropertyInfo[] fieldProperties = (PropertyInfo[])FSharpUtils.GetUnionCaseInfoFields(matchingCaseInfo);
object[] typedFieldValues = new object[fieldProperties.Length];
if (fieldProperties.Length > 0 && fields == null)
throw JsonSerializationException.Create(reader, "No '{0}' property with union fields found.".FormatWith(CultureInfo.InvariantCulture, FieldsPropertyName));
PropertyInfo[] fieldProperties = (PropertyInfo[])FSharpUtils.GetUnionCaseInfoFields(matchingCaseInfo);
if (fieldProperties.Length != fields.Count)
throw JsonSerializationException.Create(reader, "The number of field values does not match the number of properties definied by union '{0}'.".FormatWith(CultureInfo.InvariantCulture, caseName));
object[] typedFieldValues = new object[fieldProperties.Length];
for (int i = 0; i < fields.Count; i++)
if (fields != null)
{
JToken t = fields[i];
PropertyInfo fieldProperty = fieldProperties[i];
if (fieldProperties.Length != fields.Count)
throw JsonSerializationException.Create(reader, "The number of field values does not match the number of properties definied by union '{0}'.".FormatWith(CultureInfo.InvariantCulture, caseName));
typedFieldValues[i] = t.ToObject(fieldProperty.PropertyType);
for (int i = 0; i < fields.Count; i++)
{
JToken t = fields[i];
PropertyInfo fieldProperty = fieldProperties[i];
typedFieldValues[i] = t.ToObject(fieldProperty.PropertyType);
}
}
return FSharpUtils.MakeUnion(null, matchingCaseInfo, typedFieldValues, null);