Normalized inference further and added caching of the resolved values (this is per connectionsettings and added a test to confirm this

Author: Mpdreamz

src/Nest/CommonAbstractions/Infer/Field/Field.cs

@@ -13,7 +13,7 @@ public class Field : IEquatable<Field>, IUrlParameter
 		public PropertyInfo Property { get; set; }
 		public double? Boost { get; set; }
 
-		private string ComparisonValue { get; set; }
+		private object ComparisonValue { get; set; }
 
 		public Fields And<T>(Expression<Func<T, object>> field) where T : class =>
 			new Fields(new [] { this, field });
@@ -57,15 +57,15 @@ public static implicit operator Field(Expression expression)
 			if (memberExpression == null)
 				return new Field { Expression = expression, ComparisonValue = expression.ToString() }; 
 
-			return new Field { Expression = expression, ComparisonValue = memberExpression.Member.Name}; 
+			return new Field { Expression = expression, ComparisonValue = memberExpression}; 
 		}
 
 		public static implicit operator Field(PropertyInfo property)
 		{
 			return property == null ? null : new Field
 			{
 				Property = property,
-				ComparisonValue = property.Name
+				ComparisonValue = property
 			};
 		}
 

src/Nest/CommonAbstractions/Infer/Field/FieldResolver.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
@@ -17,27 +18,48 @@ public class FieldResolver : ExpressionVisitor
 	{
 		private readonly IConnectionSettingsValues _settings;
 
+		private readonly ConcurrentDictionary<Field, string> Fields = new ConcurrentDictionary<Field, string>();
+		private readonly ConcurrentDictionary<PropertyName, string> Properties = new ConcurrentDictionary<PropertyName, string>();
+
 		public FieldResolver(IConnectionSettingsValues settings)
 		{
 			settings.ThrowIfNull(nameof(settings));
 			this._settings = settings;
 		}
 
-		public string Resolve(Field field) =>
-			field.IsConditionless() ? null : Resolve(field.Name, field.Expression, field.Property);
+		public string Resolve(Field field)
+		{
+			if (field.IsConditionless()) return null;
+			if (!field.Name.IsNullOrEmpty()) return field.Name;
+			string f;
+			if (this.Fields.TryGetValue(field, out f))
+				return f;
+			f = this.Resolve(field.Expression, field.Property);
+			this.Fields.TryAdd(field, f);
+			return f;
+		}
 
-		internal string Resolve(PropertyName property) => 
-			property.IsConditionless() ? null : Resolve(property.Name, property.Expression, property.Property);
+		internal string Resolve(PropertyName property)
+		{
 
-		private string Resolve(string verbatim, Expression expression, MemberInfo member)
+			if (property.IsConditionless()) return null;
+			if (!property.Name.IsNullOrEmpty())
+				return property.Name;
+			string f;
+			if (this.Properties.TryGetValue(property, out f))
+				return f;
+			f = this.Resolve(property.Expression, property.Property);
+			this.Properties.TryAdd(property, f);
+			return f;
+		}
+
+		private string Resolve(Expression expression, MemberInfo member)
 		{
-			var name = !verbatim.IsNullOrEmpty()
-				? verbatim
-				: expression != null
-					? this.ResolveExpression(expression)
-					: member != null
-						? this.ResolveMemberInfo(member)
-						: null;
+			var name = expression != null
+				? this.ResolveExpression(expression)
+				: member != null
+					? this.ResolveMemberInfo(member)
+					: null;
 
 			if (name == null)
 				throw new ArgumentException("Could not resolve a property name");
@@ -52,6 +74,10 @@ private string ResolveMemberInfo(MemberInfo info)
 
 			var name = info.Name;
 
+			IPropertyMapping propertyMapping = null;
+			if (this._settings.PropertyMappings.TryGetValue(info, out propertyMapping))
+				return propertyMapping.Name;
+
 			var att = ElasticsearchPropertyAttribute.From(info);
 			if (att != null && !att.Name.IsNullOrEmpty())
 				return att.Name;

src/Nest/CommonAbstractions/Infer/PropertyName/PropertyName.cs

@@ -12,19 +12,7 @@ public class PropertyName : IEquatable<PropertyName>, IUrlParameter
 		public Expression Expression { get; set; }
 		public PropertyInfo Property { get; set; }
 
-		private string ComparisonValue;
-
-		public static PropertyName Create(string name, double? boost = null)
-		{
-			PropertyName propertyName = name;
-			return propertyName;
-		}
-
-		public static PropertyName Create(Expression expression, double? boost = null)
-		{
-			PropertyName propertyName = expression;
-			return propertyName;
-		}
+		private object ComparisonValue;
 
 		public static implicit operator PropertyName(string name)
 		{
@@ -49,7 +37,7 @@ public static implicit operator PropertyName(PropertyInfo property)
 			return property == null ? null : new PropertyName
 			{
 				Property = property,
-				ComparisonValue = property.Name
+				ComparisonValue = property
 			};
 		}
 

src/Nest/CommonAbstractions/Infer/TypeName/TypeNameResolver.cs

@@ -1,10 +1,12 @@
 using System;
+using System.Collections.Concurrent;
 
 namespace Nest
 {
 	public class TypeNameResolver
 	{
 		private readonly IConnectionSettingsValues _connectionSettings;
+		private readonly ConcurrentDictionary<Type, string> TypeNames = new ConcurrentDictionary<Type, string>();
 
 		public TypeNameResolver(IConnectionSettingsValues connectionSettings)
 		{
@@ -21,14 +23,21 @@ private string ResolveType(Type type)
 			if (type == null) return null;
 			string typeName;
 
+			if (TypeNames.TryGetValue(type, out typeName))
+				return typeName;
+
 			if (_connectionSettings.DefaultTypeNames.TryGetValue(type, out typeName))
+			{
+				TypeNames.TryAdd(type, typeName);
 				return typeName;
+			}
 
 			var att = ElasticsearchTypeAttribute.From(type);
 			if (att != null && !att.Name.IsNullOrEmpty())
 				typeName = att.Name;
 			else
 				typeName = _connectionSettings.DefaultTypeNameInferrer(type);
+			TypeNames.TryAdd(type, typeName);
 			return typeName;
 		}