-ShouldDeserialize PR cleanup

This commit is contained in:
James Newton-King
2015-10-12 21:40:00 +13:00
parent 74af3a8ba9
commit 723704464f
3 changed files with 95 additions and 10 deletions
@@ -27,7 +27,14 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
#else
using System.Linq;
#endif
using System.Reflection;
using System.Text; using System.Text;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
#if NETFX_CORE #if NETFX_CORE
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
@@ -386,6 +393,45 @@ namespace Newtonsoft.Json.Tests.Serialization
}", json); }", json);
} }
[Test]
public void ShouldDeserialize_True()
{
string json = @"{'HasName':true,'Name':'Name!'}";
MemoryTraceWriter traceWriter = new MemoryTraceWriter();
ShouldDeserializeTestClass c = JsonConvert.DeserializeObject<ShouldDeserializeTestClass>(json, new JsonSerializerSettings
{
ContractResolver = ShouldDeserializeContractResolver.Instance,
TraceWriter = traceWriter
});
Assert.AreEqual(null, c.ExtensionData);
Assert.AreEqual(true, c.HasName);
Assert.AreEqual("Name!", c.Name);
Assert.IsTrue(traceWriter.GetTraceMessages().Any(m => m.EndsWith("Verbose ShouldDeserialize result for property 'Name' on Newtonsoft.Json.Tests.Serialization.ShouldDeserializeTestClass: True. Path 'Name'.")));
}
[Test]
public void ShouldDeserialize_False()
{
string json = @"{'HasName':false,'Name':'Name!'}";
MemoryTraceWriter traceWriter = new MemoryTraceWriter();
ShouldDeserializeTestClass c = JsonConvert.DeserializeObject<ShouldDeserializeTestClass>(json, new JsonSerializerSettings
{
ContractResolver = ShouldDeserializeContractResolver.Instance,
TraceWriter = traceWriter
});
Assert.AreEqual(1, c.ExtensionData.Count);
Assert.AreEqual("Name!", (string)c.ExtensionData["Name"]);
Assert.AreEqual(false, c.HasName);
Assert.AreEqual(null, c.Name);
Assert.IsTrue(traceWriter.GetTraceMessages().Any(m => m.EndsWith("Verbose ShouldDeserialize result for property 'Name' on Newtonsoft.Json.Tests.Serialization.ShouldDeserializeTestClass: False. Path 'Name'.")));
}
public class Employee public class Employee
{ {
public string Name { get; set; } public string Name { get; set; }
@@ -588,4 +634,39 @@ namespace Newtonsoft.Json.Tests.Serialization
return (name != null); return (name != null);
} }
} }
public class ShouldDeserializeContractResolver : DefaultContractResolver
{
public static new readonly ShouldDeserializeContractResolver Instance = new ShouldDeserializeContractResolver();
protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
{
JsonProperty property = base.CreateProperty(member, memberSerialization);
MethodInfo shouldDeserializeMethodInfo = member.DeclaringType.GetMethod("ShouldDeserialize" + member.Name);
if (shouldDeserializeMethodInfo != null)
{
property.ShouldDeserialize = o =>
{
return (bool)shouldDeserializeMethodInfo.Invoke(o, null);
};
}
return property;
}
}
public class ShouldDeserializeTestClass
{
[JsonExtensionData]
public IDictionary<string, JToken> ExtensionData { get; set; }
public bool HasName { get; set; }
public string Name { get; set; }
public bool ShouldDeserializeName()
{
return HasName;
}
}
} }
@@ -235,11 +235,12 @@ namespace Newtonsoft.Json.Serialization
/// </summary> /// </summary>
/// <value>A predicate used to determine whether the property should be serialize.</value> /// <value>A predicate used to determine whether the property should be serialize.</value>
public Predicate<object> ShouldSerialize { get; set; } public Predicate<object> ShouldSerialize { get; set; }
/// <summary> /// <summary>
/// Gets or sets a predicate used to determine whether the property should be de-serialized. /// Gets or sets a predicate used to determine whether the property should be deserialized.
/// </summary> /// </summary>
/// <value>A predicate used to determine whether the property should be de-serialized.</value> /// <value>A predicate used to determine whether the property should be deserialized.</value>
public Predicate<object> ShouldDeSerialize { get; set; } public Predicate<object> ShouldDeserialize { get; set; }
/// <summary> /// <summary>
/// Gets or sets a predicate used to determine whether the property should be serialized. /// Gets or sets a predicate used to determine whether the property should be serialized.
@@ -2051,7 +2051,7 @@ namespace Newtonsoft.Json.Serialization
continue; continue;
} }
if (!ShouldDeSerialize(reader, property, newObject)) if (!ShouldDeserialize(reader, property, newObject))
{ {
if (!reader.Read()) if (!reader.Read())
break; break;
@@ -2105,19 +2105,22 @@ namespace Newtonsoft.Json.Serialization
OnDeserialized(reader, contract, newObject); OnDeserialized(reader, contract, newObject);
return newObject; return newObject;
} }
//reader, contract, member, id
private bool ShouldDeSerialize(JsonReader reader, JsonProperty property, object target) private bool ShouldDeserialize(JsonReader reader, JsonProperty property, object target)
{ {
if (property.ShouldDeSerialize == null) if (property.ShouldDeserialize == null)
return true; return true;
bool shouldDeSerialize = property.ShouldDeSerialize(target); bool shouldDeserialize = property.ShouldDeserialize(target);
if (TraceWriter != null && TraceWriter.LevelFilter >= TraceLevel.Verbose) if (TraceWriter != null && TraceWriter.LevelFilter >= TraceLevel.Verbose)
TraceWriter.Trace(TraceLevel.Verbose, JsonPosition.FormatMessage(null, reader.Path, "ShouldDeSerialize result for property '{0}' on {1}: {2}".FormatWith(CultureInfo.InvariantCulture, property.PropertyName, property.DeclaringType, shouldDeSerialize)), null); {
TraceWriter.Trace(TraceLevel.Verbose, JsonPosition.FormatMessage(null, reader.Path, "ShouldDeserialize result for property '{0}' on {1}: {2}".FormatWith(CultureInfo.InvariantCulture, property.PropertyName, property.DeclaringType, shouldDeserialize)), null);
}
return shouldDeSerialize; return shouldDeserialize;
} }
private bool CheckPropertyName(JsonReader reader, string memberName) private bool CheckPropertyName(JsonReader reader, string memberName)
{ {
if (Serializer.MetadataPropertyHandling == MetadataPropertyHandling.ReadAhead) if (Serializer.MetadataPropertyHandling == MetadataPropertyHandling.ReadAhead)