-Fixed serializing generated types with duplicate property names

This commit is contained in:
James Newton-King
2018-02-22 15:15:55 +13:00
parent d50b912e99
commit f2b6ea4966
6 changed files with 153 additions and 10 deletions
@@ -652,7 +652,7 @@ namespace Newtonsoft.Json.Utilities
}
else
{
IList<MemberInfo> resolvedMembers = new List<MemberInfo>();
List<MemberInfo> resolvedMembers = new List<MemberInfo>();
foreach (MemberInfo memberInfo in groupedMember)
{
// this is a bit hacky
@@ -664,6 +664,13 @@ namespace Newtonsoft.Json.Utilities
}
else if (!IsOverridenGenericMember(memberInfo, bindingAttr) || memberInfo.Name == "Item")
{
// two members with the same name were declared on a type
// this can be done via IL emit, e.g. Moq
if (resolvedMembers.Any(m => m.DeclaringType == memberInfo.DeclaringType))
{
continue;
}
resolvedMembers.Add(memberInfo);
}
}
@@ -363,20 +363,33 @@ namespace Newtonsoft.Json.Utilities
return properties.Where(p => TestAccessibility(p, bindingFlags));
}
private static bool ContainsMemberName(IEnumerable<MemberInfo> members, string name)
{
foreach (MemberInfo memberInfo in members)
{
if (memberInfo.Name == name)
{
return true;
}
}
return false;
}
private static IList<MemberInfo> GetMembersRecursive(this TypeInfo type)
{
TypeInfo t = type;
IList<MemberInfo> members = new List<MemberInfo>();
List<MemberInfo> members = new List<MemberInfo>();
while (t != null)
{
foreach (MemberInfo member in t.DeclaredMembers)
{
if (!members.Any(p => p.Name == member.Name))
if (!ContainsMemberName(members, member.Name))
{
members.Add(member);
}
}
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
t = t.BaseType?.GetTypeInfo();
}
return members;
@@ -385,17 +398,17 @@ namespace Newtonsoft.Json.Utilities
private static IList<PropertyInfo> GetPropertiesRecursive(this TypeInfo type)
{
TypeInfo t = type;
IList<PropertyInfo> properties = new List<PropertyInfo>();
List<PropertyInfo> properties = new List<PropertyInfo>();
while (t != null)
{
foreach (PropertyInfo member in t.DeclaredProperties)
{
if (!properties.Any(p => p.Name == member.Name))
if (!ContainsMemberName(properties, member.Name))
{
properties.Add(member);
}
}
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
t = t.BaseType?.GetTypeInfo();
}
return properties;
@@ -404,17 +417,17 @@ namespace Newtonsoft.Json.Utilities
private static IList<FieldInfo> GetFieldsRecursive(this TypeInfo type)
{
TypeInfo t = type;
IList<FieldInfo> fields = new List<FieldInfo>();
List<FieldInfo> fields = new List<FieldInfo>();
while (t != null)
{
foreach (FieldInfo member in t.DeclaredFields)
{
if (!fields.Any(p => p.Name == member.Name))
if (!ContainsMemberName(fields, member.Name))
{
fields.Add(member);
}
}
t = (t.BaseType != null) ? t.BaseType.GetTypeInfo() : null;
t = t.BaseType?.GetTypeInfo();
}
return fields;