-Improved support for deserializing objects using non-default constructors

-JsonConverterAttribute now allowed on constructor parameters
-JsonPropertyAttribute now allowed on constructor parameters
This commit is contained in:
JamesNK
2011-05-02 10:52:01 +00:00
parent 21a2a7e4f7
commit 045a1ec334
19 changed files with 467 additions and 111 deletions
@@ -126,6 +126,10 @@
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PropertyCase.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
<Compile Include="TestObjects\RequestOnly.cs" />
<Compile Include="TestObjects\RoleTransfer.cs" />
<Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
@@ -149,6 +149,8 @@
<Compile Include="TestObjects\HolderClass.cs" />
<Compile Include="TestObjects\ListOfIds.cs" />
<Compile Include="TestObjects\Movie.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PersonError.cs" />
<Compile Include="TestObjects\PersonPropertyClass.cs" />
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
@@ -177,6 +179,8 @@
<Compile Include="TestObjects\LogEntry.cs" />
<Compile Include="TestObjects\NonRequest.cs" />
<Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
<Compile Include="TestObjects\SearchResult.cs" />
<Compile Include="TestObjects\StructTest.cs" />
<Compile Include="TestObjects\WagePerson.cs" />
@@ -192,6 +192,10 @@
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PrivateMembersClass.cs" />
<Compile Include="TestObjects\PropertyCase.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
<Compile Include="TestObjects\RequestOnly.cs" />
<Compile Include="TestObjects\RequiredMembersClass.cs" />
<Compile Include="TestObjects\RoleTransfer.cs" />
@@ -154,6 +154,10 @@
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PrivateMembersClass.cs" />
<Compile Include="TestObjects\PropertyCase.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
<Compile Include="TestObjects\RequestOnly.cs" />
<Compile Include="TestObjects\RequiredMembersClass.cs" />
<Compile Include="TestObjects\RoleTransfer.cs" />
@@ -183,6 +183,10 @@
<Compile Include="TestObjects\LogEntry.cs" />
<Compile Include="TestObjects\NonRequest.cs" />
<Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
<Compile Include="TestObjects\SearchResult.cs" />
<Compile Include="TestObjects\StructTest.cs" />
<Compile Include="TestObjects\WagePerson.cs" />
@@ -41,5 +41,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
[assembly: AssemblyVersion("4.0.2.0")]
#if !PocketPC
[assembly: AssemblyFileVersion("4.0.2.13622")]
[assembly: AssemblyFileVersion("4.0.2.13702")]
#endif
@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Reflection;
using Newtonsoft.Json.Tests.TestObjects;
using NUnit.Framework;
@@ -55,5 +52,75 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual("Name!", c.Name);
Assert.AreEqual(1, c.Age);
}
[Test]
public void SuccessWithPublicParametizedConstructor()
{
string json = @"{Name:""Name!""}";
var c = JsonConvert.DeserializeObject<PublicParametizedConstructorTestClass>(json);
Assert.IsNotNull(c);
Assert.AreEqual("Name!", c.Name);
}
[Test]
public void SuccessWithPublicParametizedConstructorWhenParamaterIsNotAProperty()
{
string json = @"{nameParameter:""Name!""}";
PublicParametizedConstructorWithNonPropertyParameterTestClass c = JsonConvert.DeserializeObject<PublicParametizedConstructorWithNonPropertyParameterTestClass>(json);
Assert.IsNotNull(c);
Assert.AreEqual("Name!", c.Name);
}
[Test]
public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverter()
{
string json = @"{nameParameter:""Name!""}";
PublicParametizedConstructorRequiringConverterTestClass c = JsonConvert.DeserializeObject<PublicParametizedConstructorRequiringConverterTestClass>(json, new NameContainerConverter());
Assert.IsNotNull(c);
Assert.AreEqual("Name!", c.Name.Value);
}
[Test]
public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverterWithParameterAttribute()
{
string json = @"{nameParameter:""Name!""}";
PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass c = JsonConvert.DeserializeObject<PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass>(json);
Assert.IsNotNull(c);
Assert.AreEqual("Name!", c.Name.Value);
}
[Test]
public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverterWithPropertyAttribute()
{
string json = @"{name:""Name!""}";
PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass c = JsonConvert.DeserializeObject<PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass>(json);
Assert.IsNotNull(c);
Assert.AreEqual("Name!", c.Name.Value);
}
[Test]
public void SuccessWithPublicParametizedConstructorWhenParamaterNameConflictsWithPropertyName()
{
string json = @"{name:""1""}";
PublicParametizedConstructorWithPropertyNameConflict c = JsonConvert.DeserializeObject<PublicParametizedConstructorWithPropertyNameConflict>(json);
Assert.IsNotNull(c);
Assert.AreEqual(1, c.Name);
}
[Test]
public void PublicParametizedConstructorWithPropertyNameConflictWithAttribute()
{
string json = @"{name:""1""}";
PublicParametizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject<PublicParametizedConstructorWithPropertyNameConflictWithAttribute>(json);
Assert.IsNotNull(c);
Assert.AreEqual(1, c.Name);
}
}
}
}
@@ -0,0 +1,84 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Newtonsoft.Json.Tests.TestObjects
{
public class NameContainer
{
public string Value { get; set; }
}
public class NameContainerConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
NameContainer nameContainer = value as NameContainer;
if (nameContainer != null)
writer.WriteValue(nameContainer.Value);
else
writer.WriteNull();
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
NameContainer nameContainer = new NameContainer();
nameContainer.Value = (string)reader.Value;
return nameContainer;
}
public override bool CanConvert(Type objectType)
{
return objectType == typeof(NameContainer);
}
}
public class PublicParametizedConstructorRequiringConverterTestClass
{
private readonly NameContainer _nameContainer;
public PublicParametizedConstructorRequiringConverterTestClass(NameContainer nameParameter)
{
_nameContainer = nameParameter;
}
public NameContainer Name
{
get { return _nameContainer; }
}
}
public class PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass
{
private readonly NameContainer _nameContainer;
public PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass([JsonConverter(typeof(NameContainerConverter))] NameContainer nameParameter)
{
_nameContainer = nameParameter;
}
public NameContainer Name
{
get { return _nameContainer; }
}
}
public class PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass
{
private readonly NameContainer _nameContainer;
public PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass(NameContainer name)
{
_nameContainer = name;
}
[JsonConverter(typeof(NameContainerConverter))]
public NameContainer Name
{
get { return _nameContainer; }
}
}
}
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Newtonsoft.Json.Tests.TestObjects
{
public class PublicParametizedConstructorTestClass
{
private readonly string _name;
public PublicParametizedConstructorTestClass(string name)
{
_name = name;
}
public string Name
{
get { return _name; }
}
}
}
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Newtonsoft.Json.Tests.TestObjects
{
public class PublicParametizedConstructorWithNonPropertyParameterTestClass
{
private readonly string _name;
public PublicParametizedConstructorWithNonPropertyParameterTestClass(string nameParameter)
{
_name = nameParameter;
}
public string Name
{
get { return _name; }
}
}
}
@@ -0,0 +1,37 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Newtonsoft.Json.Tests.TestObjects
{
public class PublicParametizedConstructorWithPropertyNameConflict
{
private readonly int _value;
public PublicParametizedConstructorWithPropertyNameConflict(string name)
{
_value = Convert.ToInt32(name);
}
public int Name
{
get { return _value; }
}
}
public class PublicParametizedConstructorWithPropertyNameConflictWithAttribute
{
private readonly int _value;
public PublicParametizedConstructorWithPropertyNameConflictWithAttribute([JsonProperty("name")]string nameParameter)
{
_value = Convert.ToInt32(nameParameter);
}
public int Name
{
get { return _value; }
}
}
}