Port #2632 AutoMap() is now aware of overridden properties in derived types

Author: gmarz

src/Nest/CommonAbstractions/Extensions/TypeExtensions.cs

@@ -178,20 +178,53 @@ internal static IList<PropertyInfo> AllPropertiesCached(this Type t)
 		}
 
 		/// <summary> Returns inherited properties with reflectedType set to base type</summary>
+		/// <summary>
+		/// Returns inherited properties with reflectedType set to base type
+		/// </summary>
 		private static IEnumerable<PropertyInfo> AllPropertiesNotCached(this Type type)
 		{
+			var propertiesByName = new Dictionary<string, PropertyInfo>();
 			do
 			{
 				foreach (var propertyInfo in type.GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
-					yield return propertyInfo;
+				{
+					if (propertiesByName.ContainsKey(propertyInfo.Name))
+					{
+						if (IsHidingMember(propertyInfo))
+						{
+							propertiesByName[propertyInfo.Name] = propertyInfo;
+						}
+					}
+					else
+					{
+						propertiesByName.Add(propertyInfo.Name, propertyInfo);
+					}
+				}
 #if DOTNETCORE
 				type = type.GetTypeInfo()?.BaseType;
 			} while (type?.GetTypeInfo()?.BaseType != null);
 #else
 				type = type.BaseType;
 			} while (type?.BaseType != null);
 #endif
+			return propertiesByName.Values;
+		}
 
+		/// <summary>
+		/// Determines if a property is overriding an inherited property of its base class
+		/// </summary>
+		private static bool IsHidingMember(PropertyInfo propertyInfo)
+		{
+#if DOTNETCORE
+			var baseType = propertyInfo.DeclaringType?.GetTypeInfo()?.BaseType;
+#else
+			var baseType = propertyInfo.DeclaringType?.BaseType;
+#endif
+			var baseProperty = baseType?.GetProperty(propertyInfo.Name);
+			if (baseProperty == null) return false;
+			var derivedGetMethod = propertyInfo.GetGetMethod().GetBaseDefinition();
+			return derivedGetMethod?.ReturnType != propertyInfo.PropertyType;
 		}
 	}
 }
+

src/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs

@@ -682,6 +682,49 @@ public void OverridingAutoMappedAttributes()
 			Expect(expected).WhenSerializing((ICreateIndexRequest)descriptor);
 		}
 
+		public class ParentWithStringId : Parent
+		{
+			public new string Id { get; set; }
+		}
+
+		[U]
+		public void OverridingInheritedProperties()
+		{
+			var descriptor = new CreateIndexDescriptor("myindex")
+				.Mappings(ms => ms
+					.Map<ParentWithStringId>(m => m
+						.AutoMap()
+					)
+				);
+
+			var expected = new
+			{
+				mappings = new
+				{
+					parent = new
+					{
+						properties = new
+						{
+							id = new
+							{
+								type = "string",
+							}
+						}
+					}
+				}
+			};
+
+			var settings = WithConnectionSettings(s => s
+				.InferMappingFor<ParentWithStringId>(m => m
+					.TypeName("parent")
+					.Ignore(p => p.Description)
+					.Ignore(p => p.IgnoreMe)
+				)
+			);
+
+			settings.Expect(expected).WhenSerializing((ICreateIndexRequest) descriptor);
+		}
+
 		/**[float]
 		* == Ignoring Properties
 		* Properties on a POCO can be ignored in a few ways: