-Fixed using JArray with ImpromptuInterface by changing some members from explicit to public

-Fixed deserializing non-ISO date dictionary keys
-Fixed values not being set when deserializing with DefaultValueHandling.IgnoreAndPopulate
This commit is contained in:
James Newton-King
2013-05-01 19:33:39 +12:00
parent 6d00ff9b38
commit 2b9941fa74
6 changed files with 70 additions and 7 deletions
@@ -75,4 +75,4 @@ using System.Security;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")] [assembly: AssemblyVersion("4.5.0.0")]
[assembly: AssemblyFileVersion("5.0.4.16030")] [assembly: AssemblyFileVersion("5.0.4.16101")]
@@ -147,6 +147,33 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual("TestProperty1Value", c.TestProperty1); Assert.AreEqual("TestProperty1Value", c.TestProperty1);
} }
public class DefaultHandler
{
[DefaultValue(-1)]
public int field1;
[DefaultValue("default")]
public string field2;
}
[Test]
public void DeserializeIgnoreAndPopulate()
{
DefaultHandler c1 = JsonConvert.DeserializeObject<DefaultHandler>("{}", new JsonSerializerSettings
{
DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate
});
Assert.AreEqual(-1, c1.field1);
Assert.AreEqual("default", c1.field2);
DefaultHandler c2 = JsonConvert.DeserializeObject<DefaultHandler>("{'field1':-1,'field2':'default'}", new JsonSerializerSettings
{
DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate
});
Assert.AreEqual(-1, c2.field1);
Assert.AreEqual("default", c2.field2);
}
[JsonObject] [JsonObject]
public class NetworkUser public class NetworkUser
{ {
@@ -8687,6 +8687,17 @@ Parameter name: value",
Assert.AreEqual(2, list[1]); Assert.AreEqual(2, list[1]);
Assert.AreEqual(0, list[2]); Assert.AreEqual(0, list[2]);
} }
[Test]
public void DeserializeNonIsoDateDictionaryKey()
{
Dictionary<DateTime, string> d = JsonConvert.DeserializeObject<Dictionary<DateTime, string>>(@"{""04/28/2013 00:00:00"":""test""}");
Assert.AreEqual(1, d.Count);
DateTime key = DateTime.Parse("04/28/2013 00:00:00", CultureInfo.InvariantCulture);
Assert.AreEqual("test", d[key]);
}
} }
public enum Antworten public enum Antworten
+22 -2
View File
@@ -271,6 +271,17 @@ namespace Newtonsoft.Json.Linq
RemoveItemAt(index); RemoveItemAt(index);
} }
/// <summary>
/// Returns an enumerator that iterates through the collection.
/// </summary>
/// <returns>
/// A <see cref="T:System.Collections.Generic.IEnumerator`1" /> that can be used to iterate through the collection.
/// </returns>
public IEnumerator<JToken> GetEnumerator()
{
return Children().GetEnumerator();
}
#endregion #endregion
#region ICollection<JToken> Members #region ICollection<JToken> Members
@@ -306,12 +317,21 @@ namespace Newtonsoft.Json.Linq
return ContainsItem(item); return ContainsItem(item);
} }
void ICollection<JToken>.CopyTo(JToken[] array, int arrayIndex) /// <summary>
/// Copies to.
/// </summary>
/// <param name="array">The array.</param>
/// <param name="arrayIndex">Index of the array.</param>
public void CopyTo(JToken[] array, int arrayIndex)
{ {
CopyItemsTo(array, arrayIndex); CopyItemsTo(array, arrayIndex);
} }
bool ICollection<JToken>.IsReadOnly /// <summary>
/// Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1" /> is read-only.
/// </summary>
/// <returns>true if the <see cref="T:System.Collections.Generic.ICollection`1" /> is read-only; otherwise, false.</returns>
public bool IsReadOnly
{ {
get { return false; } get { return false; }
} }
@@ -92,6 +92,6 @@ using System.Security;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")] [assembly: AssemblyVersion("4.5.0.0")]
[assembly: AssemblyFileVersion("5.0.4.16030")] [assembly: AssemblyFileVersion("5.0.4.16101")]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]
@@ -808,6 +808,7 @@ To fix this error either change the JSON to a {1} or change the deserialized typ
// test tokentype here because default value might not be convertable to actual type, e.g. default of "" for DateTime // test tokentype here because default value might not be convertable to actual type, e.g. default of "" for DateTime
if (HasFlag(property.DefaultValueHandling.GetValueOrDefault(Serializer._defaultValueHandling), DefaultValueHandling.Ignore) if (HasFlag(property.DefaultValueHandling.GetValueOrDefault(Serializer._defaultValueHandling), DefaultValueHandling.Ignore)
&& !HasFlag(property.DefaultValueHandling.GetValueOrDefault(Serializer._defaultValueHandling), DefaultValueHandling.Populate)
&& JsonReader.IsPrimitiveToken(tokenType) && JsonReader.IsPrimitiveToken(tokenType)
&& MiscellaneousUtils.ValueEquals(reader.Value, property.GetResolvedDefaultValue())) && MiscellaneousUtils.ValueEquals(reader.Value, property.GetResolvedDefaultValue()))
return true; return true;
@@ -853,7 +854,8 @@ To fix this error either change the JSON to a {1} or change the deserialized typ
return false; return false;
if (HasFlag(property.DefaultValueHandling.GetValueOrDefault(Serializer._defaultValueHandling), DefaultValueHandling.Ignore) if (HasFlag(property.DefaultValueHandling.GetValueOrDefault(Serializer._defaultValueHandling), DefaultValueHandling.Ignore)
&& MiscellaneousUtils.ValueEquals(value, property.GetResolvedDefaultValue())) && !HasFlag(property.DefaultValueHandling.GetValueOrDefault(Serializer._defaultValueHandling), DefaultValueHandling.Populate)
&& MiscellaneousUtils.ValueEquals(value, property.GetResolvedDefaultValue()))
return false; return false;
if (!property.Writable) if (!property.Writable)
@@ -975,15 +977,18 @@ To fix this error either change the JSON to a {1} or change the deserialized typ
{ {
try try
{ {
object dt;
// this is for correctly reading ISO and MS formatted dictionary keys // this is for correctly reading ISO and MS formatted dictionary keys
if ((keyTypeCode == PrimitiveTypeCode.DateTime || keyTypeCode == PrimitiveTypeCode.DateTimeNullable) if ((keyTypeCode == PrimitiveTypeCode.DateTime || keyTypeCode == PrimitiveTypeCode.DateTimeNullable)
&& DateTimeUtils.TryParseDateTime(keyValue.ToString(), DateParseHandling.DateTime, reader.DateTimeZoneHandling, out keyValue)) && DateTimeUtils.TryParseDateTime(keyValue.ToString(), DateParseHandling.DateTime, reader.DateTimeZoneHandling, out dt))
{ {
keyValue = dt;
} }
#if !NET20 #if !NET20
else if ((keyTypeCode == PrimitiveTypeCode.DateTimeOffset || keyTypeCode == PrimitiveTypeCode.DateTimeOffsetNullable) else if ((keyTypeCode == PrimitiveTypeCode.DateTimeOffset || keyTypeCode == PrimitiveTypeCode.DateTimeOffsetNullable)
&& DateTimeUtils.TryParseDateTime(keyValue.ToString(), DateParseHandling.DateTimeOffset, reader.DateTimeZoneHandling, out keyValue)) && DateTimeUtils.TryParseDateTime(keyValue.ToString(), DateParseHandling.DateTimeOffset, reader.DateTimeZoneHandling, out dt))
{ {
keyValue = dt;
} }
#endif #endif
else else