-Added ReflectionDelegateFactory, DynamicReflectionDelegateFactory and LateBoundDelegateFactory to support switching between dynamic and late bound reflection for medium trust environments

-Added WriteObjectId to BsonWriter
-Added BsonObjectId and BsonObjectIdConverter classes
-Added KeyValuePairConverter
-Added DynamicCodeGeneration flag to DefaultContractResolver
-Changed JsonConverter.ReadJson to add an extra parameter: currentValue
This commit is contained in:
JamesNK
2010-03-17 06:53:47 +00:00
parent 846b7d79f2
commit 6d67aefac7
52 changed files with 959 additions and 224 deletions
@@ -392,5 +392,56 @@ namespace Newtonsoft.Json.Tests.Bson
Assert.AreEqual(9.95m, deserializedProduct.Price);
Assert.AreEqual(3, deserializedProduct.Sizes.Length);
}
[Test]
public void WriteOid()
{
MemoryStream ms = new MemoryStream();
BsonWriter writer = new BsonWriter(ms);
byte[] oid = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
writer.WriteStartObject();
writer.WritePropertyName("_oid");
writer.WriteObjectId(oid);
writer.WriteEndObject();
string bson = MiscellaneousUtils.BytesToHex(ms.ToArray());
Assert.AreEqual("17-00-00-00-07-5F-6F-69-64-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-00", bson);
ms.Seek(0, SeekOrigin.Begin);
BsonReader reader = new BsonReader(ms);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
Assert.AreEqual(oid, reader.Value);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
}
[Test]
public void WriteOidPlusContent()
{
MemoryStream ms = new MemoryStream();
BsonWriter writer = new BsonWriter(ms);
writer.WriteStartObject();
writer.WritePropertyName("_id");
writer.WriteObjectId(MiscellaneousUtils.HexToBytes("4ABBED9D1D8B0F0218000001"));
writer.WritePropertyName("test");
writer.WriteValue("1234£56");
writer.WriteEndObject();
byte[] expected = MiscellaneousUtils.HexToBytes("29000000075F6964004ABBED9D1D8B0F02180000010274657374000900000031323334C2A335360000");
Assert.AreEqual(expected, ms.ToArray());
}
}
}
@@ -111,7 +111,7 @@ namespace Newtonsoft.Json.Tests.Converters
writer.WriteValue(d.TableName);
}
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
//reader.Read();
DataTable d = new DataTable((string)reader.Value);
@@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using Newtonsoft.Json.Bson;
using Newtonsoft.Json.Tests.TestObjects;
using Newtonsoft.Json.Utilities;
using NUnit.Framework;
namespace Newtonsoft.Json.Tests.Converters
{
public class ObjectIdConverterTests : TestFixtureBase
{
public class ObjectIdTestClass
{
[JsonProperty("_id")]
public BsonObjectId Id { get; set; }
[JsonProperty("test")]
public string Test { get; set; }
}
[Test]
public void Serialize()
{
ObjectIdTestClass c = new ObjectIdTestClass
{
Id = new BsonObjectId(MiscellaneousUtils.HexToBytes("4ABBED9D1D8B0F0218000001")),
Test = "1234£56"
};
MemoryStream ms = new MemoryStream();
JsonSerializer serializer = new JsonSerializer();
// serialize product to BSON
BsonWriter writer = new BsonWriter(ms);
serializer.Serialize(writer, c);
byte[] expected = MiscellaneousUtils.HexToBytes("29000000075F6964004ABBED9D1D8B0F02180000010274657374000900000031323334C2A335360000");
Assert.AreEqual(expected, ms.ToArray());
}
[Test]
public void Deserialize()
{
byte[] bson = MiscellaneousUtils.HexToBytes("29000000075F6964004ABBED9D1D8B0F02180000010274657374000900000031323334C2A335360000");
JsonSerializer serializer = new JsonSerializer();
BsonReader reader = new BsonReader(new MemoryStream(bson));
ObjectIdTestClass c = serializer.Deserialize<ObjectIdTestClass>(reader);
Assert.AreEqual(c.Id.Value, MiscellaneousUtils.HexToBytes("4ABBED9D1D8B0F0218000001"));
Assert.AreEqual(c.Test, "1234£56");
}
}
}
@@ -86,14 +86,14 @@ namespace Newtonsoft.Json.Tests.Converters
if (deserializeRootElementName != null)
converter.DeserializeRootElementName = deserializeRootElementName;
XmlNode node = (XmlNode)converter.ReadJson(reader, typeof (XmlDocument), new JsonSerializer());
XmlNode node = (XmlNode)converter.ReadJson(reader, typeof (XmlDocument), null, new JsonSerializer());
#if !NET20
string xmlText = node.OuterXml;
reader = new JsonTextReader(new StringReader(json));
reader.Read();
XDocument d = (XDocument) converter.ReadJson(reader, typeof (XDocument), new JsonSerializer());
XDocument d = (XDocument) converter.ReadJson(reader, typeof (XDocument), null, new JsonSerializer());
string linqXmlText = d.ToString(SaveOptions.DisableFormatting);
if (d.Declaration != null)
@@ -19,7 +19,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
o.WriteTo(writer);
}
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
JObject o = JObject.Load(reader);
@@ -13,7 +13,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
writer.WriteValue(Convert.ToBase64String(guid.ToByteArray()));
}
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
string encodedData = (string) reader.Value;
byte[] data = Convert.FromBase64String(encodedData);
@@ -198,7 +198,7 @@
<Compile Include="TestObjects\UserNullable.cs" />
<Compile Include="TestObjects\VersionKeyedCollection.cs" />
<Compile Include="TestObjects\WagePerson.cs" />
<Compile Include="Utilities\LateBoundDelegateFactoryTests.cs" />
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Compact.csproj">
@@ -204,7 +204,7 @@
<Compile Include="TestObjects\UserNullable.cs" />
<Compile Include="TestObjects\VersionKeyedCollection.cs" />
<Compile Include="TestObjects\WagePerson.cs" />
<Compile Include="Utilities\LateBoundDelegateFactoryTests.cs" />
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
</ItemGroup>
<ItemGroup>
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
@@ -209,7 +209,7 @@
<Compile Include="TestObjects\UserNullable.cs" />
<Compile Include="TestObjects\VersionKeyedCollection.cs" />
<Compile Include="TestObjects\WagePerson.cs" />
<Compile Include="Utilities\LateBoundDelegateFactoryTests.cs" />
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Silverlight.csproj">
@@ -91,6 +91,7 @@
<Compile Include="Converters\DataSetConverterTests.cs" />
<Compile Include="Converters\CustomCreationConverterTests.cs" />
<Compile Include="Converters\HtmlColorConverterTests.cs" />
<Compile Include="Converters\ObjectIdConverterTests.cs" />
<Compile Include="Converters\StringEnumConverterTests.cs" />
<Compile Include="FileSystemEntityModel.Designer.cs">
<AutoGen>True</AutoGen>
@@ -244,7 +245,7 @@
<Compile Include="TestObjects\TypeClass.cs" />
<Compile Include="TestObjects\TypedSubHashtable.cs" />
<Compile Include="TestObjects\UserNullable.cs" />
<Compile Include="Utilities\LateBoundDelegateFactoryTests.cs" />
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.csproj">
@@ -2983,7 +2983,7 @@ keyword such as type of business.""
writer.WriteNull();
}
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
throw new NotImplementedException();
}
@@ -3006,7 +3006,7 @@ keyword such as type of business.""
writer.WriteNull();
}
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
throw new NotImplementedException();
}
@@ -3056,5 +3056,158 @@ keyword such as type of business.""
Assert.AreEqual(2, newValue.GenericList.Count);
Assert.AreEqual(typeof(List<string>), newValue.GenericList.GetType());
}
[Test]
public void DeserializeSimpleKeyValuePair()
{
List<KeyValuePair<string, string>> list = new List<KeyValuePair<string, string>>();
list.Add(new KeyValuePair<string, string>("key1", "value1"));
list.Add(new KeyValuePair<string, string>("key2", "value2"));
string json = JsonConvert.SerializeObject(list);
Assert.AreEqual(@"[{""Key"":""key1"",""Value"":""value1""},{""Key"":""key2"",""Value"":""value2""}]", json);
List<KeyValuePair<string, string>> result = JsonConvert.DeserializeObject<List<KeyValuePair<string, string>>>(json);
Assert.AreEqual(2, result.Count);
Assert.AreEqual("key1", result[0].Key);
Assert.AreEqual("value1", result[0].Value);
Assert.AreEqual("key2", result[1].Key);
Assert.AreEqual("value2", result[1].Value);
}
[Test]
public void DeserializeComplexKeyValuePair()
{
DateTime dateTime = new DateTime(2000, 12, 1, 23, 1, 1, DateTimeKind.Utc);
List<KeyValuePair<string, WagePerson>> list = new List<KeyValuePair<string, WagePerson>>();
list.Add(new KeyValuePair<string, WagePerson>("key1", new WagePerson
{
BirthDate = dateTime,
Department = "Department1",
LastModified = dateTime,
HourlyWage = 1
}));
list.Add(new KeyValuePair<string, WagePerson>("key2", new WagePerson
{
BirthDate = dateTime,
Department = "Department2",
LastModified = dateTime,
HourlyWage = 2
}));
string json = JsonConvert.SerializeObject(list, Formatting.Indented);
Assert.AreEqual(@"[
{
""Key"": ""key1"",
""Value"": {
""HourlyWage"": 1.0,
""Name"": null,
""BirthDate"": ""\/Date(975711661000)\/"",
""LastModified"": ""\/Date(975711661000)\/""
}
},
{
""Key"": ""key2"",
""Value"": {
""HourlyWage"": 2.0,
""Name"": null,
""BirthDate"": ""\/Date(975711661000)\/"",
""LastModified"": ""\/Date(975711661000)\/""
}
}
]", json);
List<KeyValuePair<string, WagePerson>> result = JsonConvert.DeserializeObject<List<KeyValuePair<string, WagePerson>>>(json);
Assert.AreEqual(2, result.Count);
Assert.AreEqual("key1", result[0].Key);
Assert.AreEqual(1, result[0].Value.HourlyWage);
Assert.AreEqual("key2", result[1].Key);
Assert.AreEqual(2, result[1].Value.HourlyWage);
}
public class StringListAppenderConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
writer.WriteValue(value);
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
List<string> existingStrings = (List<string>)existingValue;
List<string> newStrings = new List<string>(existingStrings);
reader.Read();
while (reader.TokenType != JsonToken.EndArray)
{
string s = (string)reader.Value;
newStrings.Add(s);
reader.Read();
}
return newStrings;
}
public override bool CanConvert(Type objectType)
{
return (objectType == typeof (List<string>));
}
}
[Test]
public void StringListAppenderConverterTest()
{
Movie p = new Movie();
p.ReleaseCountries = new List<string> { "Existing" };
JsonConvert.PopulateObject("{'ReleaseCountries':['Appended']}", p, new JsonSerializerSettings
{
Converters = new List<JsonConverter> { new StringListAppenderConverter() }
});
Assert.AreEqual(2, p.ReleaseCountries.Count);
Assert.AreEqual("Existing", p.ReleaseCountries[0]);
Assert.AreEqual("Appended", p.ReleaseCountries[1]);
}
public class StringAppenderConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
writer.WriteValue(value);
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
string existingString = (string)existingValue;
string newString = existingString + (string)reader.Value;
return newString;
}
public override bool CanConvert(Type objectType)
{
return (objectType == typeof(string));
}
}
[Test]
public void StringAppenderConverterTest()
{
Movie p = new Movie();
p.Name = "Existing,";
JsonConvert.PopulateObject("{'Name':'Appended'}", p, new JsonSerializerSettings
{
Converters = new List<JsonConverter> { new StringAppenderConverter() }
});
Assert.AreEqual(p.Name, "Existing,Appended");
}
}
}
@@ -296,7 +296,7 @@ namespace Newtonsoft.Json.Tests.Serialization
me.WriteTo(writer);
}
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
JObject o = JObject.Load(reader);
string id = (string)o["$id"];
@@ -43,7 +43,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
j.WriteTo(writer);
}
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
JToken j = JArray.Load(reader);
@@ -42,7 +42,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
writer.WriteEndArray();
}
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
IList<T> list = new List<T>();
@@ -34,7 +34,7 @@ using Newtonsoft.Json.Tests.TestObjects;
namespace Newtonsoft.Json.Tests.Utilities
{
public class LateBoundDelegateFactoryTests : TestFixtureBase
public class DynamicReflectionDelegateFactoryTests : TestFixtureBase
{
[Test]
[ExpectedException(typeof(InvalidCastException), ExpectedMessage = "Unable to cast object of type 'Newtonsoft.Json.Tests.TestObjects.Person' to type 'Newtonsoft.Json.Tests.TestObjects.Movie'.")]
@@ -43,7 +43,7 @@ namespace Newtonsoft.Json.Tests.Utilities
Person p = new Person();
p.Name = "Hi";
Func<object, object> setter = LateBoundDelegateFactory.CreateGet<object>(typeof(Movie).GetProperty("Name"));
Func<object, object> setter = DynamicReflectionDelegateFactory.Instance.CreateGet<object>(typeof(Movie).GetProperty("Name"));
setter(p);
}
@@ -55,7 +55,7 @@ namespace Newtonsoft.Json.Tests.Utilities
Person p = new Person();
Movie m = new Movie();
Action<object, object> setter = LateBoundDelegateFactory.CreateSet<object>(typeof(Movie).GetProperty("Name"));
Action<object, object> setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(Movie).GetProperty("Name"));
setter(m, "Hi");
@@ -70,7 +70,7 @@ namespace Newtonsoft.Json.Tests.Utilities
{
object structTest = new StructTest();
Action<object, object> setter = LateBoundDelegateFactory.CreateSet<object>(typeof(StructTest).GetProperty("StringProperty"));
Action<object, object> setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(StructTest).GetProperty("StringProperty"));
setter(structTest, "Hi");
@@ -85,7 +85,7 @@ namespace Newtonsoft.Json.Tests.Utilities
{
Movie m = new Movie();
Action<object, object> setter = LateBoundDelegateFactory.CreateSet<object>(typeof(Movie).GetProperty("Name"));
Action<object, object> setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(Movie).GetProperty("Name"));
setter(m, new Version());
}