-Fixed serializing certain objects with events
This commit is contained in:
@@ -9199,6 +9199,41 @@ Path '', line 1, position 1.");
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeObjectWithEvent()
|
||||||
|
{
|
||||||
|
MyObservableObject o = new MyObservableObject
|
||||||
|
{
|
||||||
|
TestString = "Test string"
|
||||||
|
};
|
||||||
|
|
||||||
|
string json = JsonConvert.SerializeObject(o, Formatting.Indented);
|
||||||
|
StringAssert.AreEqual(@"{
|
||||||
|
""PropertyChanged"": null,
|
||||||
|
""TestString"": ""Test string""
|
||||||
|
}", json);
|
||||||
|
|
||||||
|
MyObservableObject o2 = JsonConvert.DeserializeObject<MyObservableObject>(json);
|
||||||
|
Assert.AreEqual("Test string", o2.TestString);
|
||||||
|
}
|
||||||
|
|
||||||
|
public class MyObservableObject : ObservableObject
|
||||||
|
{
|
||||||
|
public new string PropertyChanged;
|
||||||
|
|
||||||
|
public string TestString { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ObservableObject : INotifyPropertyChanged
|
||||||
|
{
|
||||||
|
public event PropertyChangedEventHandler PropertyChanged;
|
||||||
|
|
||||||
|
protected PropertyChangedEventHandler PropertyChangedHandler
|
||||||
|
{
|
||||||
|
get { return PropertyChanged; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void ParameterizedConstructorWithBasePrivateProperties()
|
public void ParameterizedConstructorWithBasePrivateProperties()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ using System.Reflection;
|
|||||||
using Newtonsoft.Json.Utilities.LinqBridge;
|
using Newtonsoft.Json.Utilities.LinqBridge;
|
||||||
#else
|
#else
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Utilities
|
namespace Newtonsoft.Json.Utilities
|
||||||
@@ -50,7 +49,9 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
MethodInfo getMethod = propertyInfo.GetMethod;
|
MethodInfo getMethod = propertyInfo.GetMethod;
|
||||||
if (getMethod != null && (getMethod.IsPublic || nonPublic))
|
if (getMethod != null && (getMethod.IsPublic || nonPublic))
|
||||||
|
{
|
||||||
return getMethod;
|
return getMethod;
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -64,7 +65,9 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
MethodInfo setMethod = propertyInfo.SetMethod;
|
MethodInfo setMethod = propertyInfo.SetMethod;
|
||||||
if (setMethod != null && (setMethod.IsPublic || nonPublic))
|
if (setMethod != null && (setMethod.IsPublic || nonPublic))
|
||||||
|
{
|
||||||
return setMethod;
|
return setMethod;
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -85,7 +88,9 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
public static bool IsInstanceOfType(this Type type, object o)
|
public static bool IsInstanceOfType(this Type type, object o)
|
||||||
{
|
{
|
||||||
if (o == null)
|
if (o == null)
|
||||||
|
{
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return type.IsAssignableFrom(o.GetType());
|
return type.IsAssignableFrom(o.GetType());
|
||||||
}
|
}
|
||||||
@@ -106,15 +111,25 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
return memberInfo.MemberType;
|
return memberInfo.MemberType;
|
||||||
#else
|
#else
|
||||||
if (memberInfo is PropertyInfo)
|
if (memberInfo is PropertyInfo)
|
||||||
|
{
|
||||||
return MemberTypes.Property;
|
return MemberTypes.Property;
|
||||||
|
}
|
||||||
else if (memberInfo is FieldInfo)
|
else if (memberInfo is FieldInfo)
|
||||||
|
{
|
||||||
return MemberTypes.Field;
|
return MemberTypes.Field;
|
||||||
|
}
|
||||||
else if (memberInfo is EventInfo)
|
else if (memberInfo is EventInfo)
|
||||||
|
{
|
||||||
return MemberTypes.Event;
|
return MemberTypes.Event;
|
||||||
|
}
|
||||||
else if (memberInfo is MethodInfo)
|
else if (memberInfo is MethodInfo)
|
||||||
|
{
|
||||||
return MemberTypes.Method;
|
return MemberTypes.Method;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
return MemberTypes.Other;
|
return MemberTypes.Other;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,13 +222,19 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
return propertyInfos.Where(p =>
|
return propertyInfos.Where(p =>
|
||||||
{
|
{
|
||||||
if (name != null && name != p.Name)
|
if (name != null && name != p.Name)
|
||||||
|
{
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
if (propertyType != null && propertyType != p.PropertyType)
|
if (propertyType != null && propertyType != p.PropertyType)
|
||||||
|
{
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
if (indexParameters != null)
|
if (indexParameters != null)
|
||||||
{
|
{
|
||||||
if (!p.GetIndexParameters().Select(ip => ip.ParameterType).SequenceEqual(indexParameters))
|
if (!p.GetIndexParameters().Select(ip => ip.ParameterType).SequenceEqual(indexParameters))
|
||||||
|
{
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -222,13 +243,19 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
public static IEnumerable<MemberInfo> GetMember(this Type type, string name, MemberTypes memberType, BindingFlags bindingFlags)
|
public static IEnumerable<MemberInfo> GetMember(this Type type, string name, MemberTypes memberType, BindingFlags bindingFlags)
|
||||||
{
|
{
|
||||||
|
#if PORTABLE
|
||||||
|
return type.GetMemberInternal(name, memberType, bindingFlags);
|
||||||
|
#else
|
||||||
return type.GetMember(name, bindingFlags).Where(m =>
|
return type.GetMember(name, bindingFlags).Where(m =>
|
||||||
{
|
{
|
||||||
if (m.MemberType() != memberType)
|
if (m.MemberType() != memberType)
|
||||||
|
{
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -268,16 +295,21 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
public static MethodInfo GetMethod(this Type type, string name, BindingFlags bindingFlags, object placeHolder1, IList<Type> parameterTypes, object placeHolder2)
|
public static MethodInfo GetMethod(this Type type, string name, BindingFlags bindingFlags, object placeHolder1, IList<Type> parameterTypes, object placeHolder2)
|
||||||
{
|
{
|
||||||
return type.GetTypeInfo().DeclaredMethods.Where(m =>
|
return type.GetTypeInfo().DeclaredMethods.Where(
|
||||||
{
|
m =>
|
||||||
if (name != null && m.Name != name)
|
{
|
||||||
return false;
|
if (name != null && m.Name != name)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (!TestAccessibility(m, bindingFlags))
|
if (!TestAccessibility(m, bindingFlags))
|
||||||
return false;
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return m.GetParameters().Select(p => p.ParameterType).SequenceEqual(parameterTypes);
|
return m.GetParameters().Select(p => p.ParameterType).SequenceEqual(parameterTypes);
|
||||||
}).SingleOrDefault();
|
}).SingleOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IEnumerable<ConstructorInfo> GetConstructors(this Type type)
|
public static IEnumerable<ConstructorInfo> GetConstructors(this Type type)
|
||||||
@@ -292,16 +324,21 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
private static IEnumerable<ConstructorInfo> GetConstructors(this Type type, BindingFlags bindingFlags, IList<Type> parameterTypes)
|
private static IEnumerable<ConstructorInfo> GetConstructors(this Type type, BindingFlags bindingFlags, IList<Type> parameterTypes)
|
||||||
{
|
{
|
||||||
return type.GetTypeInfo().DeclaredConstructors.Where(c =>
|
return type.GetTypeInfo().DeclaredConstructors.Where(
|
||||||
{
|
c =>
|
||||||
if (!TestAccessibility(c, bindingFlags))
|
{
|
||||||
return false;
|
if (!TestAccessibility(c, bindingFlags))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (parameterTypes != null && !c.GetParameters().Select(p => p.ParameterType).SequenceEqual(parameterTypes))
|
if (parameterTypes != null && !c.GetParameters().Select(p => p.ParameterType).SequenceEqual(parameterTypes))
|
||||||
return false;
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ConstructorInfo GetConstructor(this Type type, IList<Type> parameterTypes)
|
public static ConstructorInfo GetConstructor(this Type type, IList<Type> parameterTypes)
|
||||||
@@ -316,12 +353,21 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
public static MemberInfo[] GetMember(this Type type, string member)
|
public static MemberInfo[] GetMember(this Type type, string member)
|
||||||
{
|
{
|
||||||
return type.GetMember(member, DefaultFlags);
|
return type.GetMemberInternal(member, null, DefaultFlags);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static MemberInfo[] GetMember(this Type type, string member, BindingFlags bindingFlags)
|
public static MemberInfo[] GetMember(this Type type, string member, BindingFlags bindingFlags)
|
||||||
{
|
{
|
||||||
return type.GetTypeInfo().GetMembersRecursive().Where(m => m.Name == member && TestAccessibility(m, bindingFlags)).ToArray();
|
return type.GetMemberInternal(member, null, bindingFlags);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static MemberInfo[] GetMemberInternal(this Type type, string member, MemberTypes? memberType, BindingFlags bindingFlags)
|
||||||
|
{
|
||||||
|
return type.GetTypeInfo().GetMembersRecursive().Where(m =>
|
||||||
|
m.Name == member &&
|
||||||
|
// test type before accessibility - accessibility doesn't support some types
|
||||||
|
(memberType == null || m.MemberType() == memberType) &&
|
||||||
|
TestAccessibility(m, bindingFlags)).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static MemberInfo GetField(this Type type, string member)
|
public static MemberInfo GetField(this Type type, string member)
|
||||||
@@ -337,8 +383,8 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
public static IEnumerable<PropertyInfo> GetProperties(this Type type, BindingFlags bindingFlags)
|
public static IEnumerable<PropertyInfo> GetProperties(this Type type, BindingFlags bindingFlags)
|
||||||
{
|
{
|
||||||
IList<PropertyInfo> properties = (bindingFlags.HasFlag(BindingFlags.DeclaredOnly))
|
IList<PropertyInfo> properties = (bindingFlags.HasFlag(BindingFlags.DeclaredOnly))
|
||||||
? type.GetTypeInfo().DeclaredProperties.ToList()
|
? type.GetTypeInfo().DeclaredProperties.ToList()
|
||||||
: type.GetTypeInfo().GetPropertiesRecursive();
|
: type.GetTypeInfo().GetPropertiesRecursive();
|
||||||
|
|
||||||
return properties.Where(p => TestAccessibility(p, bindingFlags));
|
return properties.Where(p => TestAccessibility(p, bindingFlags));
|
||||||
}
|
}
|
||||||
@@ -349,10 +395,12 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
IList<MemberInfo> members = new List<MemberInfo>();
|
IList<MemberInfo> members = new List<MemberInfo>();
|
||||||
while (t != null)
|
while (t != null)
|
||||||
{
|
{
|
||||||
foreach (var member in t.DeclaredMembers)
|
foreach (MemberInfo member in t.DeclaredMembers)
|
||||||
{
|
{
|
||||||
if (!members.Any(p => p.Name == member.Name))
|
if (!members.Any(p => p.Name == member.Name))
|
||||||
|
{
|
||||||
members.Add(member);
|
members.Add(member);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
|
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
|
||||||
}
|
}
|
||||||
@@ -366,10 +414,12 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
IList<PropertyInfo> properties = new List<PropertyInfo>();
|
IList<PropertyInfo> properties = new List<PropertyInfo>();
|
||||||
while (t != null)
|
while (t != null)
|
||||||
{
|
{
|
||||||
foreach (var member in t.DeclaredProperties)
|
foreach (PropertyInfo member in t.DeclaredProperties)
|
||||||
{
|
{
|
||||||
if (!properties.Any(p => p.Name == member.Name))
|
if (!properties.Any(p => p.Name == member.Name))
|
||||||
|
{
|
||||||
properties.Add(member);
|
properties.Add(member);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
|
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
|
||||||
}
|
}
|
||||||
@@ -383,10 +433,12 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
IList<FieldInfo> fields = new List<FieldInfo>();
|
IList<FieldInfo> fields = new List<FieldInfo>();
|
||||||
while (t != null)
|
while (t != null)
|
||||||
{
|
{
|
||||||
foreach (var member in t.DeclaredFields)
|
foreach (FieldInfo member in t.DeclaredFields)
|
||||||
{
|
{
|
||||||
if (!fields.Any(p => p.Name == member.Name))
|
if (!fields.Any(p => p.Name == member.Name))
|
||||||
|
{
|
||||||
fields.Add(member);
|
fields.Add(member);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
|
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
|
||||||
}
|
}
|
||||||
@@ -417,8 +469,8 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
public static IEnumerable<FieldInfo> GetFields(this Type type, BindingFlags bindingFlags)
|
public static IEnumerable<FieldInfo> GetFields(this Type type, BindingFlags bindingFlags)
|
||||||
{
|
{
|
||||||
IList<FieldInfo> fields = (bindingFlags.HasFlag(BindingFlags.DeclaredOnly))
|
IList<FieldInfo> fields = (bindingFlags.HasFlag(BindingFlags.DeclaredOnly))
|
||||||
? type.GetTypeInfo().DeclaredFields.ToList()
|
? type.GetTypeInfo().DeclaredFields.ToList()
|
||||||
: type.GetTypeInfo().GetFieldsRecursive();
|
: type.GetTypeInfo().GetFieldsRecursive();
|
||||||
|
|
||||||
return fields.Where(f => TestAccessibility(f, bindingFlags)).ToList();
|
return fields.Where(f => TestAccessibility(f, bindingFlags)).ToList();
|
||||||
}
|
}
|
||||||
@@ -426,10 +478,14 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
private static bool TestAccessibility(PropertyInfo member, BindingFlags bindingFlags)
|
private static bool TestAccessibility(PropertyInfo member, BindingFlags bindingFlags)
|
||||||
{
|
{
|
||||||
if (member.GetMethod != null && TestAccessibility(member.GetMethod, bindingFlags))
|
if (member.GetMethod != null && TestAccessibility(member.GetMethod, bindingFlags))
|
||||||
|
{
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if (member.SetMethod != null && TestAccessibility(member.SetMethod, bindingFlags))
|
if (member.SetMethod != null && TestAccessibility(member.SetMethod, bindingFlags))
|
||||||
|
{
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user