Fix indentation

This commit is contained in:
Zoltán Tamási
2018-01-15 13:13:28 +01:00
parent 9f74b979aa
commit 5f2f5fd7b0
+90 -90
View File
@@ -46,110 +46,110 @@ namespace Newtonsoft.Json.Tests.Issues
[Test] [Test]
public void Test() public void Test()
{ {
var settings = new JsonSerializerSettings() var settings = new JsonSerializerSettings()
{ {
ContractResolver = new CustomContractResolver() ContractResolver = new CustomContractResolver()
}; };
var result = JsonConvert.DeserializeObject<TestClass>("{ 'Items': '11' }", settings); var result = JsonConvert.DeserializeObject<TestClass>("{ 'Items': '11' }", settings);
Assert.IsNotNull(result); Assert.IsNotNull(result);
Assert.AreEqual(result.Items.Count, 1); Assert.AreEqual(result.Items.Count, 1);
Assert.AreEqual(result.Items[0], 11); Assert.AreEqual(result.Items[0], 11);
}
[Test]
public void Test2()
{
var settings = new JsonSerializerSettings()
{
Converters = new[] { new OneItemListJsonConverter() }
};
var result = JsonConvert.DeserializeObject<List<int>>("'11'", settings);
Assert.IsNotNull(result);
Assert.AreEqual(result.Count, 1);
Assert.AreEqual(result[0], 11);
}
public class TestClass
{
public List<int> Items { get; } = new List<int>();
} }
public class CustomContractResolver : DefaultContractResolver [Test]
{ public void Test2()
protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization) {
{ var settings = new JsonSerializerSettings()
var property = base.CreateProperty(member, memberSerialization); {
Converters = new[] { new OneItemListJsonConverter() }
};
if (member.Name == "Items") var result = JsonConvert.DeserializeObject<List<int>>("'11'", settings);
{
property.Converter = new OneItemListJsonConverter();
}
return property; Assert.IsNotNull(result);
} Assert.AreEqual(result.Count, 1);
} Assert.AreEqual(result[0], 11);
}
public class OneItemListJsonConverter : JsonConverter public class TestClass
{ {
public override bool CanWrite => false; public List<int> Items { get; } = new List<int>();
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) public class CustomContractResolver : DefaultContractResolver
{ {
throw new NotSupportedException(); protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
} {
var property = base.CreateProperty(member, memberSerialization);
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) if (member.Name == "Items")
{ {
var recursionBlocked = false; property.Converter = new OneItemListJsonConverter();
var converter = serializer.Converters.OfType<OneItemListJsonConverter>().FirstOrDefault(); }
if (converter != null)
{
serializer.Converters.Remove(converter);
recursionBlocked = true;
}
try return property;
{ }
var token = JToken.Load(reader); }
if (token.Type == JTokenType.Array)
{
return token.ToObject(objectType, serializer);
}
var array = new JArray(); public class OneItemListJsonConverter : JsonConverter
array.Add(token); {
public override bool CanWrite => false;
var list = array.ToObject(objectType, serializer) as IEnumerable; public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
var existing = existingValue as IList; {
throw new NotSupportedException();
}
if (list != null && existing != null) public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{ {
foreach (var item in list) var recursionBlocked = false;
{ var converter = serializer.Converters.OfType<OneItemListJsonConverter>().FirstOrDefault();
existing.Add(item); if (converter != null)
} {
} serializer.Converters.Remove(converter);
recursionBlocked = true;
}
return list; try
} {
finally var token = JToken.Load(reader);
{ if (token.Type == JTokenType.Array)
if (recursionBlocked) {
{ return token.ToObject(objectType, serializer);
serializer.Converters.Add(converter); }
}
}
}
public override bool CanConvert(Type objectType) var array = new JArray();
{ array.Add(token);
return typeof(IEnumerable).IsAssignableFrom(objectType) && objectType != typeof(string);
}
}
} var list = array.ToObject(objectType, serializer) as IEnumerable;
var existing = existingValue as IList;
if (list != null && existing != null)
{
foreach (var item in list)
{
existing.Add(item);
}
}
return list;
}
finally
{
if (recursionBlocked)
{
serializer.Converters.Add(converter);
}
}
}
public override bool CanConvert(Type objectType)
{
return typeof(IEnumerable).IsAssignableFrom(objectType) && objectType != typeof(string);
}
}
}
} }