-Changed JSON Date constructors to automatically deserialize to a date
This commit is contained in:
@@ -1324,6 +1324,39 @@ keyword such as type of business.""
|
|||||||
Assert.AreEqual(@"{}", json);
|
Assert.AreEqual(@"{}", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class Invoice
|
||||||
|
{
|
||||||
|
public string Company { get; set; }
|
||||||
|
public decimal Amount { get; set; }
|
||||||
|
[DefaultValue(false)]
|
||||||
|
public bool Paid { get; set; }
|
||||||
|
[DefaultValue(null)]
|
||||||
|
public DateTime? PaidDate { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeInvoice()
|
||||||
|
{
|
||||||
|
Invoice invoice = new Invoice
|
||||||
|
{
|
||||||
|
Company = "Acme Ltd.",
|
||||||
|
Amount = 50.0m,
|
||||||
|
Paid = false
|
||||||
|
};
|
||||||
|
|
||||||
|
string json = JavaScriptConvert.SerializeObject(invoice);
|
||||||
|
|
||||||
|
Console.WriteLine(json);
|
||||||
|
// {"Company":"Acme Ltd.","Amount":50.0,"Paid":false,"PaidDate":null}
|
||||||
|
|
||||||
|
json = JavaScriptConvert.SerializeObject(invoice,
|
||||||
|
Formatting.None,
|
||||||
|
new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
|
||||||
|
|
||||||
|
Console.WriteLine(json);
|
||||||
|
// {"Company":"Acme Ltd.","Amount":50.0}
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void DeserializeNullable()
|
public void DeserializeNullable()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
|
using Newtonsoft.Json.Converters;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Linq
|
namespace Newtonsoft.Json.Tests.Linq
|
||||||
{
|
{
|
||||||
@@ -317,5 +319,16 @@ Parameter name: arrayIndex")]
|
|||||||
string json = @"[""prop""]";
|
string json = @"[""prop""]";
|
||||||
JObject.Parse(json);
|
JObject.Parse(json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void ParseJavaScriptDate()
|
||||||
|
{
|
||||||
|
string json = @"[new Date(1207285200000)]";
|
||||||
|
|
||||||
|
JArray a = (JArray)JavaScriptConvert.DeserializeObject(json, null);
|
||||||
|
JValue v = (JValue)a[0];
|
||||||
|
|
||||||
|
Assert.AreEqual(JavaScriptConvert.ConvertJavaScriptTicksToDateTime(1207285200000), (DateTime)v);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace Newtonsoft.Json.Tests
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class PerformanceTests : TestFixtureBase
|
public class PerformanceTests : TestFixtureBase
|
||||||
{
|
{
|
||||||
private int Iterations = 100;
|
private int Iterations = 5000;
|
||||||
|
|
||||||
public enum SerializeMethod
|
public enum SerializeMethod
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -333,7 +333,12 @@ namespace Newtonsoft.Json
|
|||||||
WriteStartArray();
|
WriteStartArray();
|
||||||
break;
|
break;
|
||||||
case JsonToken.StartConstructor:
|
case JsonToken.StartConstructor:
|
||||||
WriteStartConstructor(reader.Value.ToString());
|
string constructorName = reader.Value.ToString();
|
||||||
|
// write a JValue date when the constructor is for a date
|
||||||
|
if (string.Compare(constructorName, "Date", StringComparison.Ordinal) == 0)
|
||||||
|
WriteConstructorDate(reader);
|
||||||
|
else
|
||||||
|
WriteStartConstructor(reader.Value.ToString());
|
||||||
break;
|
break;
|
||||||
case JsonToken.PropertyName:
|
case JsonToken.PropertyName:
|
||||||
WritePropertyName(reader.Value.ToString());
|
WritePropertyName(reader.Value.ToString());
|
||||||
@@ -384,6 +389,24 @@ namespace Newtonsoft.Json
|
|||||||
&& reader.Read());
|
&& reader.Read());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void WriteConstructorDate(JsonReader reader)
|
||||||
|
{
|
||||||
|
if (!reader.Read())
|
||||||
|
throw new Exception("Unexpected end while reading date constructor.");
|
||||||
|
if (reader.TokenType != JsonToken.Integer)
|
||||||
|
throw new Exception("Unexpected token while reading date constructor. Expected Integer, got " + reader.TokenType);
|
||||||
|
|
||||||
|
long ticks = (long)reader.Value;
|
||||||
|
DateTime date = JavaScriptConvert.ConvertJavaScriptTicksToDateTime(ticks);
|
||||||
|
|
||||||
|
if (!reader.Read())
|
||||||
|
throw new Exception("Unexpected end while reading date constructor.");
|
||||||
|
if (reader.TokenType != JsonToken.EndConstructor)
|
||||||
|
throw new Exception("Unexpected token while reading date constructor. Expected EndConstructor, got " + reader.TokenType);
|
||||||
|
|
||||||
|
WriteValue(date);
|
||||||
|
}
|
||||||
|
|
||||||
private bool IsEndToken(JsonToken token)
|
private bool IsEndToken(JsonToken token)
|
||||||
{
|
{
|
||||||
switch (token)
|
switch (token)
|
||||||
|
|||||||
Reference in New Issue
Block a user