-Add support for using implicit/explicit casts when converting a JSON property name to a dictionary value

-Fix DynamicReflectionDelegateFactory erroring when calling static methods
-Fix CustomCreationConverter to return null when converting a null JSON value

3 files changed, 136 insertions, 1 deletions

diff --git a/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs
index f50f085..43a1502 100644
--- a/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs
@@ -145,5 +145,86 @@ namespace Newtonsoft.Json.Tests.Converters
       const string expected = @"{""Value"":""Foo"",""Thing"":{""Number"":456}}";

       Assert.AreEqual(expected, json);

     }

+

+    internal interface IRange<T>

+    {

+      T First { get; }

+      T Last { get; }

+    }

+

+    internal class Range<T> : IRange<T>

+    {

+      public T First { get; set; }

+      public T Last { get; set; }

+    }

+

+    internal class NullInterfaceTestClass

+    {

+      public virtual Guid Id { get; set; }

+      public virtual int? Year { get; set; }

+      public virtual string Company { get; set; }

+      public virtual IRange<decimal> DecimalRange { get; set; }

+      public virtual IRange<int> IntRange { get; set; }

+      public virtual IRange<decimal> NullDecimalRange { get; set; }

+    }

+

+    internal class DecimalRangeConverter : CustomCreationConverter<IRange<decimal>>

+    {

+      public override IRange<decimal> Create(Type objectType)

+      {

+        return new Range<decimal>();

+      }

+    }

+

+    internal class IntRangeConverter : CustomCreationConverter<IRange<int>>

+    {

+      public override IRange<int> Create(Type objectType)

+      {

+        return new Range<int>();

+      }

+    }

+

+    [Test]

+    public void DeserializeAndConvertNullValue()

+    {

+      NullInterfaceTestClass initial = new NullInterfaceTestClass

+      {

+        Company = "Company!",

+        DecimalRange = new Range<decimal> { First = 0, Last = 1 },

+        Id = new Guid(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11),

+        IntRange = new Range<int> { First = int.MinValue, Last = int.MaxValue },

+        Year = 2010,

+        NullDecimalRange = null

+      };

+

+      string json = JsonConvert.SerializeObject(initial, Formatting.Indented);

+

+      Assert.AreEqual(@"{

+  ""Id"": ""00000001-0002-0003-0405-060708090a0b"",

+  ""Year"": 2010,

+  ""Company"": ""Company!"",

+  ""DecimalRange"": {

+    ""First"": 0.0,

+    ""Last"": 1.0

+  },

+  ""IntRange"": {

+    ""First"": -2147483648,

+    ""Last"": 2147483647

+  },

+  ""NullDecimalRange"": null

+}", json);

+

+      NullInterfaceTestClass deserialized = JsonConvert.DeserializeObject<NullInterfaceTestClass>(

+        json, new IntRangeConverter(), new DecimalRangeConverter());

+

+      Assert.AreEqual("Company!", deserialized.Company);

+      Assert.AreEqual(new Guid(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11), deserialized.Id);

+      Assert.AreEqual(0, deserialized.DecimalRange.First);

+      Assert.AreEqual(1, deserialized.DecimalRange.Last);

+      Assert.AreEqual(int.MinValue, deserialized.IntRange.First);

+      Assert.AreEqual(int.MaxValue, deserialized.IntRange.Last);

+      Assert.AreEqual(null, deserialized.NullDecimalRange);

+      Assert.AreEqual(2010, deserialized.Year);

+    }

   }

 }
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
index a2362ab..0ace842 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
@@ -2000,7 +2000,7 @@ keyword such as type of business.""
     }

 

     [Test]

-    [ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "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.")]

+    [ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "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.")]

     public void DeserializePersonKeyedDictionary()

     {

       string json =

@@ -3316,5 +3316,41 @@ keyword such as type of business.""
       Assert.AreEqual("James", deserialized.Name);

       Assert.AreEqual(27, deserialized.Age);

     }

+

+    public class DictionaryKey

+    {

+      public string Value { get; set; }

+

+      public override string ToString()

+      {

+        return Value;

+      }

+

+      public static implicit operator DictionaryKey(string value)

+      {

+        return new DictionaryKey() {Value = value};

+      }

+    }

+

+    [Test]

+    public void SerializeDeserializeDictionaryKey()

+    {

+      Dictionary<DictionaryKey, string> dictionary = new Dictionary<DictionaryKey, string>();

+

+      dictionary.Add(new DictionaryKey() { Value = "First!" }, "First");

+      dictionary.Add(new DictionaryKey() { Value = "Second!" }, "Second");

+

+      string json = JsonConvert.SerializeObject(dictionary, Formatting.Indented);

+

+      Assert.AreEqual(@"{

+  ""First!"": ""First"",

+  ""Second!"": ""Second""

+}", json);

+

+      Dictionary<DictionaryKey, string> newDictionary =

+        JsonConvert.DeserializeObject<Dictionary<DictionaryKey, string>>(json);

+

+      Assert.AreEqual(2, newDictionary.Count);

+    }

   }

 }
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs
index bbe80e0..c8123fe 100644
--- a/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs
@@ -27,10 +27,12 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

+using System.Reflection;

 using System.Text;

 using NUnit.Framework;

 using Newtonsoft.Json.Utilities;

 using Newtonsoft.Json.Tests.TestObjects;

+using Newtonsoft.Json.Tests.Serialization;

 

 namespace Newtonsoft.Json.Tests.Utilities

 {

@@ -89,6 +91,22 @@ namespace Newtonsoft.Json.Tests.Utilities
 

       setter(m, new Version());

     }

+

+    [Test]

+    public void CreateStaticMethodCall()

+    {

+      MethodInfo castMethodInfo = typeof(JsonSerializerTest.DictionaryKey).GetMethod("op_Implicit", new[] { typeof(string) });

+

+      Assert.IsNotNull(castMethodInfo);

+

+      MethodCall<object, object> call = DynamicReflectionDelegateFactory.Instance.CreateMethodCall<object>(castMethodInfo);

+

+      object result = call(null, "First!");

+      Assert.IsNotNull(result);

+

+      JsonSerializerTest.DictionaryKey key = (JsonSerializerTest.DictionaryKey) result;

+      Assert.AreEqual("First!", key.Value);

+    }

   }

 }

 #endif
\ No newline at end of file