Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json

This commit is contained in:
James Newton-King
2013-03-11 19:23:59 +13:00
8 changed files with 187 additions and 103 deletions
@@ -63,10 +63,13 @@ namespace Newtonsoft.Json.Tests.Serialization
Dictionary<string, object> values = new Dictionary<string, object>(); Dictionary<string, object> values = new Dictionary<string, object>();
IContractResolver c = DefaultContractResolver.Instance;
JsonDynamicContract dynamicContract = (JsonDynamicContract)c.ResolveContract(dynamicObject.GetType());
foreach (string memberName in dynamicObject.GetDynamicMemberNames()) foreach (string memberName in dynamicObject.GetDynamicMemberNames())
{ {
object value; object value;
dynamicObject.TryGetMember(memberName, out value); dynamicContract.TryGetMember(dynamicObject, memberName, out value);
values.Add(memberName, value); values.Add(memberName, value);
} }
@@ -6638,6 +6638,43 @@ Parameter name: value",
}", json); }", json);
} }
public class EnumerableClass<T> : IEnumerable<T>
{
private readonly IList<T> _values;
public EnumerableClass(IEnumerable<T> values)
{
_values = new List<T>(values);
}
public IEnumerator<T> GetEnumerator()
{
return _values.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
}
[Test]
public void DeserializeIEnumerableFromConstructor()
{
string json = @"[
""One"",
""II"",
""3""
]";
var result = JsonConvert.DeserializeObject<EnumerableClass<string>>(json);
Assert.AreEqual(3, result.Count());
Assert.AreEqual("One", result.ElementAt(0));
Assert.AreEqual("II", result.ElementAt(1));
Assert.AreEqual("3", result.ElementAt(2));
}
[JsonObject(MemberSerialization.Fields)] [JsonObject(MemberSerialization.Fields)]
public class MyTuple<T1> public class MyTuple<T1>
{ {
@@ -974,16 +974,14 @@ namespace Newtonsoft.Json.Converters
{ {
manager.PushScope(); manager.PushScope();
string namespacePrefix = null;
string namespaceUri = null;
foreach (IXmlNode attribute in node.Attributes) foreach (IXmlNode attribute in node.Attributes)
{ {
if (attribute.NamespaceUri == "http://www.w3.org/2000/xmlns/") if (attribute.NamespaceUri == "http://www.w3.org/2000/xmlns/")
{ {
namespacePrefix = (attribute.LocalName != "xmlns") string namespacePrefix = (attribute.LocalName != "xmlns")
? attribute.LocalName ? attribute.LocalName
: string.Empty; : string.Empty;
namespaceUri = attribute.Value; string namespaceUri = attribute.Value;
manager.AddNamespace(namespacePrefix, namespaceUri); manager.AddNamespace(namespacePrefix, namespaceUri);
} }
@@ -1017,9 +1015,6 @@ namespace Newtonsoft.Json.Converters
writer.WriteEndObject(); writer.WriteEndObject();
} }
if (namespacePrefix != null)
manager.RemoveNamespace(namespacePrefix, namespaceUri);
manager.PopScope(); manager.PopScope();
} }
@@ -26,7 +26,9 @@
#if !(NET35 || NET20 || WINDOWS_PHONE) #if !(NET35 || NET20 || WINDOWS_PHONE)
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Dynamic;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
using System.Collections; using System.Collections;
@@ -49,6 +51,26 @@ namespace Newtonsoft.Json.Serialization
/// <value>The property name resolver.</value> /// <value>The property name resolver.</value>
public Func<string, string> PropertyNameResolver { get; set; } public Func<string, string> PropertyNameResolver { get; set; }
private readonly ThreadSafeStore<string, CallSite<Func<CallSite, object, object>>> _callSiteGetters =
new ThreadSafeStore<string, CallSite<Func<CallSite, object, object>>>(CreateCallSiteGetter);
private readonly ThreadSafeStore<string, CallSite<Func<CallSite, object, object, object>>> _callSiteSetters =
new ThreadSafeStore<string, CallSite<Func<CallSite, object, object, object>>>(CreateCallSiteSetter);
private static CallSite<Func<CallSite, object, object>> CreateCallSiteGetter(string name)
{
GetMemberBinder getMemberBinder = (GetMemberBinder)DynamicUtils.BinderWrapper.GetMember(name, typeof(DynamicUtils));
return CallSite<Func<CallSite, object, object>>.Create(new NoThrowGetBinderMember(getMemberBinder));
}
private static CallSite<Func<CallSite, object, object, object>> CreateCallSiteSetter(string name)
{
SetMemberBinder binder = (SetMemberBinder)DynamicUtils.BinderWrapper.SetMember(name, typeof(DynamicUtils));
return CallSite<Func<CallSite, object, object, object>>.Create(new NoThrowSetBinderMember(binder));
}
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="JsonDynamicContract"/> class. /// Initializes a new instance of the <see cref="JsonDynamicContract"/> class.
/// </summary> /// </summary>
@@ -60,6 +82,37 @@ namespace Newtonsoft.Json.Serialization
Properties = new JsonPropertyCollection(UnderlyingType); Properties = new JsonPropertyCollection(UnderlyingType);
} }
internal bool TryGetMember(IDynamicMetaObjectProvider dynamicProvider, string name, out object value)
{
ValidationUtils.ArgumentNotNull(dynamicProvider, "dynamicProvider");
CallSite<Func<CallSite, object, object>> callSite = _callSiteGetters.Get(name);
object result = callSite.Target(callSite, dynamicProvider);
if (!ReferenceEquals(result, NoThrowExpressionVisitor.ErrorResult))
{
value = result;
return true;
}
else
{
value = null;
return false;
}
}
internal bool TrySetMember(IDynamicMetaObjectProvider dynamicProvider, string name, object value)
{
ValidationUtils.ArgumentNotNull(dynamicProvider, "dynamicProvider");
CallSite<Func<CallSite, object, object, object>> callSite = _callSiteSetters.Get(name);
object result = callSite.Target(callSite, dynamicProvider, value);
return !ReferenceEquals(result, NoThrowExpressionVisitor.ErrorResult);
}
} }
} }
#endif #endif
@@ -593,6 +593,10 @@ To fix this error either change the JSON to a {1} or change the deserialized typ
{ {
list = (IList) ReflectionUtils.CreateInstance(contract.CreatedType, list); list = (IList) ReflectionUtils.CreateInstance(contract.CreatedType, list);
} }
else
{
return ReflectionUtils.CreateInstance(contract.CreatedType, list);
}
} }
else if (list is IWrappedCollection) else if (list is IWrappedCollection)
{ {
@@ -610,6 +614,7 @@ To fix this error either change the JSON to a {1} or change the deserialized typ
{ {
value = CreateJToken(reader, contract); value = CreateJToken(reader, contract);
} }
return value; return value;
} }
@@ -1274,7 +1279,7 @@ To fix this error either change the environment to be fully trusted, change the
else else
value = CreateValueInternal(reader, t, dynamicMemberContract, null, null, member, null); value = CreateValueInternal(reader, t, dynamicMemberContract, null, null, member, null);
newObject.TrySetMember(memberName, value); contract.TrySetMember(newObject, memberName, value);
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -750,7 +750,7 @@ To fix this error either change the environment to be fully trusted, change the
foreach (string memberName in value.GetDynamicMemberNames()) foreach (string memberName in value.GetDynamicMemberNames())
{ {
object memberValue; object memberValue;
if (value.TryGetMember(memberName, out memberValue)) if (contract.TryGetMember(value, memberName, out memberValue))
{ {
try try
{ {
@@ -226,6 +226,32 @@ namespace Newtonsoft.Json.Utilities
else else
list = null; list = null;
} }
else if (ReflectionUtils.ImplementsGenericDefinition(listType, typeof (IEnumerable<>), out collectionType))
{
bool suitableConstructor = false;
foreach (ConstructorInfo constructor in listType.GetConstructors())
{
IList<ParameterInfo> parameters = constructor.GetParameters();
if (parameters.Count == 1)
{
if (collectionType.IsAssignableFrom(parameters[0].ParameterType))
{
suitableConstructor = true;
break;
}
}
}
if (!suitableConstructor)
throw new Exception("{0} does not have a public constructor that takes a type that implements {1}.".FormatWith(CultureInfo.InvariantCulture, listType, collectionType));
Type collectionContentsType = collectionType.GetGenericArguments()[0];
list = CreateGenericList(collectionContentsType);
isReadOnlyOrFixedSize = true;
}
else else
{ {
list = null; list = null;
+2 -37
View File
@@ -121,46 +121,12 @@ namespace Newtonsoft.Json.Utilities
} }
} }
public static bool TryGetMember(this IDynamicMetaObjectProvider dynamicProvider, string name, out object value)
{
ValidationUtils.ArgumentNotNull(dynamicProvider, "dynamicProvider");
GetMemberBinder getMemberBinder = (GetMemberBinder) BinderWrapper.GetMember(name, typeof (DynamicUtils));
CallSite<Func<CallSite, object, object>> callSite = CallSite<Func<CallSite, object, object>>.Create(new NoThrowGetBinderMember(getMemberBinder));
object result = callSite.Target(callSite, dynamicProvider);
if (!ReferenceEquals(result, NoThrowExpressionVisitor.ErrorResult))
{
value = result;
return true;
}
else
{
value = null;
return false;
}
}
public static bool TrySetMember(this IDynamicMetaObjectProvider dynamicProvider, string name, object value)
{
ValidationUtils.ArgumentNotNull(dynamicProvider, "dynamicProvider");
SetMemberBinder binder = (SetMemberBinder)BinderWrapper.SetMember(name, typeof(DynamicUtils));
var setterSite = CallSite<Func<CallSite, object, object, object>>.Create(new NoThrowSetBinderMember(binder));
object result = setterSite.Target(setterSite, dynamicProvider, value);
return !ReferenceEquals(result, NoThrowExpressionVisitor.ErrorResult);
}
public static IEnumerable<string> GetDynamicMemberNames(this IDynamicMetaObjectProvider dynamicProvider) public static IEnumerable<string> GetDynamicMemberNames(this IDynamicMetaObjectProvider dynamicProvider)
{ {
DynamicMetaObject metaObject = dynamicProvider.GetMetaObject(Expression.Constant(dynamicProvider)); DynamicMetaObject metaObject = dynamicProvider.GetMetaObject(Expression.Constant(dynamicProvider));
return metaObject.GetDynamicMemberNames(); return metaObject.GetDynamicMemberNames();
} }
}
internal class NoThrowGetBinderMember : GetMemberBinder internal class NoThrowGetBinderMember : GetMemberBinder
{ {
@@ -206,7 +172,6 @@ namespace Newtonsoft.Json.Utilities
} }
} }
internal class NoThrowExpressionVisitor : ExpressionVisitor internal class NoThrowExpressionVisitor : ExpressionVisitor
{ {
internal static readonly object ErrorResult = new object(); internal static readonly object ErrorResult = new object();
@@ -220,6 +185,6 @@ namespace Newtonsoft.Json.Utilities
return base.VisitConditional(node); return base.VisitConditional(node);
} }
} }
}
} }
#endif #endif