-Added DefaultValueHandling to JsonSerializer. Option to not write default values when serializing object

-Added JsonSerializerSettings and overloads to JavaScriptConvert.SerializeObject and JavaScriptConvert.DeserializeObject
-Performance improvements
This commit is contained in:
JamesNK
2008-09-14 10:30:38 +00:00
parent b991969d65
commit e8654d8c03
13 changed files with 442 additions and 117 deletions
@@ -39,6 +39,7 @@ using Newtonsoft.Json.Converters;
using System.Runtime.Serialization.Json;
using Newtonsoft.Json.Utilities;
using System.Globalization;
using System.ComponentModel;
namespace Newtonsoft.Json.Tests
{
@@ -1289,5 +1290,34 @@ keyword such as type of business.""
string json = JavaScriptConvert.SerializeObject(new GenericImpl());
Assert.AreEqual(@"{""Id"":0}", json);
}
public class DefaultValueAttributeTestClass
{
[DefaultValue("TestProperty1Value")]
public string TestProperty1 { get; set; }
[DefaultValue(21)]
public int TestField1;
}
[Test]
public void DefaultValueAttributeTest()
{
string json = JavaScriptConvert.SerializeObject(new DefaultValueAttributeTestClass(),
new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
Assert.AreEqual(@"{""TestField1"":0,""TestProperty1"":null}", json);
json = JavaScriptConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = int.MinValue, TestProperty1 = "NotDefault" },
new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
Assert.AreEqual(@"{""TestField1"":-2147483648,""TestProperty1"":""NotDefault""}", json);
json = JavaScriptConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = 21, TestProperty1 = "NotDefault" },
new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
Assert.AreEqual(@"{""TestProperty1"":""NotDefault""}", json);
json = JavaScriptConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = 21, TestProperty1 = "TestProperty1Value" },
new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
Assert.AreEqual(@"{}", json);
}
}
}
@@ -130,6 +130,7 @@
<Compile Include="Linq\JTokenTests.cs" />
<Compile Include="Linq\JValueTests.cs" />
<Compile Include="Linq\LinqToJsonTest.cs" />
<Compile Include="PerformanceTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SilverlightTests.cs" />
<Compile Include="TestFixtureBase.cs" />
+131 -37
View File
@@ -1,13 +1,17 @@
using System;
#if !SILVERLIGHT
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Data;
using System.Diagnostics;
using Newtonsoft.Json;
using System.IO;
using System.Web.Script.Serialization;
using NUnit.Framework;
using System.Runtime.Serialization.Json;
using System.Text;
namespace Newtonsoft.Json.Tests
{
@@ -16,9 +20,16 @@ namespace Newtonsoft.Json.Tests
/// </summary>
public class PerformanceTests : TestFixtureBase
{
private DateTime BaseDate = DateTime.Parse("01/01/2000");
private int Iterations = 100;
//JSONSerializer ser = null;
public enum SerializeMethod
{
JsonNet,
JavaScriptSerializer,
DataContractJsonSerializer
}
private DateTime BaseDate = DateTime.Parse("01/01/2000");
public string SerializeJsonNet(object value)
{
@@ -36,10 +47,7 @@ namespace Newtonsoft.Json.Tests
StringWriter sw = new StringWriter();
Newtonsoft.Json.JsonTextWriter writer = new JsonTextWriter(sw);
if (true)
writer.Formatting = Formatting.Indented;
else
writer.Formatting = Formatting.None;
writer.Formatting = Formatting.None;
writer.QuoteChar = '"';
json.Serialize(writer, value);
@@ -50,15 +58,120 @@ namespace Newtonsoft.Json.Tests
return output;
}
public object DeserializeJsonNet<T>(string json)
{
Type type = typeof(T);
JsonSerializer serializer = new JsonSerializer();
serializer.NullValueHandling = NullValueHandling.Ignore;
serializer.ObjectCreationHandling = Newtonsoft.Json.ObjectCreationHandling.Replace;
serializer.MissingMemberHandling = Newtonsoft.Json.MissingMemberHandling.Ignore;
serializer.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
return serializer.Deserialize(new StringReader(json), type);
}
public string SerializeWebExtensions(object value)
{
JavaScriptSerializer ser = new JavaScriptSerializer();
List<JavaScriptConverter> converters = new List<JavaScriptConverter>();
return ser.Serialize(value);
}
public object DeserializeWebExtensions<T>(string json)
{
JavaScriptSerializer ser = new JavaScriptSerializer();
return ser.Deserialize<T>(json);
}
public string SerializeDataContract(object value)
{
DataContractJsonSerializer dataContractSerializer
= new DataContractJsonSerializer(value.GetType());
MemoryStream ms = new MemoryStream();
dataContractSerializer.WriteObject(ms, value);
ms.Seek(0, SeekOrigin.Begin);
using (StreamReader sr = new StreamReader(ms))
{
return sr.ReadToEnd();
}
}
public object DeserializeDataContract<T>(string json)
{
DataContractJsonSerializer dataContractSerializer
= new DataContractJsonSerializer(typeof(T));
MemoryStream ms = new MemoryStream(Encoding.UTF8.GetBytes(json));
return dataContractSerializer.ReadObject(ms);
}
public void BenchmarkSerializeMethod(SerializeMethod method, object value)
{
Stopwatch timed = new Stopwatch();
timed.Start();
string json = null;
for (int x = 0; x < Iterations; x++)
{
switch (method)
{
case SerializeMethod.JsonNet:
json = JavaScriptConvert.SerializeObject(value);
break;
case SerializeMethod.JavaScriptSerializer:
json = SerializeWebExtensions(value);
break;
case SerializeMethod.DataContractJsonSerializer:
json = SerializeDataContract(value);
break;
}
}
timed.Stop();
Console.WriteLine("Serialize method: {0}", method);
Console.WriteLine("{0} ms", timed.ElapsedMilliseconds);
Console.WriteLine(json);
Console.WriteLine();
}
public void BenchmarkDeserializeMethod<T>(SerializeMethod method, string json)
{
Stopwatch timed = new Stopwatch();
timed.Start();
object value = null;
for (int x = 0; x < Iterations; x++)
{
switch (method)
{
case SerializeMethod.JsonNet:
value = DeserializeJsonNet<T>(json);
break;
case SerializeMethod.JavaScriptSerializer:
value = DeserializeWebExtensions<T>(json);
break;
case SerializeMethod.DataContractJsonSerializer:
value = DeserializeDataContract<T>(json);
break;
}
}
timed.Stop();
Console.WriteLine("Serialize method: {0}", method);
Console.WriteLine("{0} ms", timed.ElapsedMilliseconds);
Console.WriteLine(value);
Console.WriteLine();
}
[Test]
public void Serialize()
@@ -83,19 +196,9 @@ namespace Newtonsoft.Json.Tests
address.Address = "array 2 address";
test.Addresses.Add(address);
Stopwatch timed = new Stopwatch();
timed.Start();
string json = null;
for (int x = 0; x < 10000; x++)
{
json = this.SerializeJsonNet(test);
//json = this.SerializeWebExtensions(test);
}
timed.Stop();
Console.WriteLine("{0}", timed.ElapsedMilliseconds + " ms");
Console.WriteLine("{0}", json);
BenchmarkSerializeMethod(SerializeMethod.JsonNet, test);
BenchmarkSerializeMethod(SerializeMethod.JavaScriptSerializer, test);
BenchmarkSerializeMethod(SerializeMethod.DataContractJsonSerializer, test);
}
[Test]
@@ -134,19 +237,9 @@ namespace Newtonsoft.Json.Tests
]
}";
for (int x = 0; x < 10000; x++)
{
Newtonsoft.Json.JsonSerializer serializer = new Newtonsoft.Json.JsonSerializer();
serializer.NullValueHandling = NullValueHandling.Ignore;
serializer.ObjectCreationHandling = Newtonsoft.Json.ObjectCreationHandling.Replace;
serializer.MissingMemberHandling = Newtonsoft.Json.MissingMemberHandling.Ignore;
serializer.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
TestClass test = (TestClass)serializer.Deserialize(new StringReader(json), typeof(TestClass));
}
BenchmarkDeserializeMethod<TestClass>(SerializeMethod.JsonNet, json);
BenchmarkDeserializeMethod<TestClass>(SerializeMethod.JavaScriptSerializer, json);
BenchmarkDeserializeMethod<TestClass>(SerializeMethod.DataContractJsonSerializer, json);
}
}
@@ -229,4 +322,5 @@ namespace Newtonsoft.Json.Tests
private DateTime _Entered = DateTime.Parse("01/01/2007", CultureInfo.CurrentCulture.DateTimeFormat);
}
}
}
#endif