simplified Inferrer

Author: Mpdreamz

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

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -18,12 +19,33 @@ public class FieldResolver : ExpressionVisitor
 
 		public FieldResolver(IConnectionSettingsValues settings)
 		{
-			if (settings == null)
-				throw new ArgumentNullException("settings");
-			_settings = settings;
+			settings.ThrowIfNull(nameof(settings));
+			this._settings = settings;
 		}
 
-		public string Resolve(MemberInfo info)
+		public string Resolve(Field field) =>
+			field.IsConditionless() ? null : Resolve(field.Name, field.Expression, field.Property);
+
+		internal string Resolve(PropertyName property) => 
+			property.IsConditionless() ? null : Resolve(property.Name, property.Expression, property.Property);
+
+		private string Resolve(string verbatim, Expression expression, MemberInfo member)
+		{
+			var name = !verbatim.IsNullOrEmpty()
+				? verbatim
+				: expression != null
+					? this.ResolveExpression(expression)
+					: member != null
+						? this.ResolveMemberInfo(member)
+						: null;
+
+			if (name == null)
+				throw new ArgumentException("Could not resolve a property name");
+
+			return name;
+		}
+
+		private string ResolveMemberInfo(MemberInfo info)
 		{
 			if (info == null)
 				return null;
@@ -37,7 +59,7 @@ public string Resolve(MemberInfo info)
 			return _settings.Serializer?.CreatePropertyName(info) ?? _settings.DefaultFieldNameInferrer(name);
 		}
 
-		public string Resolve(Expression expression)
+		private string ResolveExpression(Expression expression)
 		{
 			var stack = new Stack<string>();
 			var properties = new Stack<ElasticsearchPropertyAttribute>();
@@ -52,11 +74,9 @@ public string Resolve(Expression expression)
 
 		protected override Expression VisitMemberAccess(MemberExpression expression, Stack<string> stack, Stack<ElasticsearchPropertyAttribute> properties)
 		{
-			if (stack != null)
-			{
-				var resolvedName = this.Resolve(expression.Member);
-				stack.Push(resolvedName);
-			}
+			if (stack == null) return base.VisitMemberAccess(expression, stack, properties);
+			var resolvedName = this.ResolveMemberInfo(expression.Member);
+			stack.Push(resolvedName);
 			return base.VisitMemberAccess(expression, stack, properties);
 		}
 

src/Nest/CommonAbstractions/Infer/Id/IdResolver.cs

@@ -21,7 +21,7 @@ public IdResolver(IConnectionSettingsValues connectionSettings)
 
 		internal Func<T, string> CreateIdSelector<T>() where T : class
 		{
-			Func<T, string> idSelector = this.GetIdFor;
+			Func<T, string> idSelector = this.Resolve;
 			return idSelector;
 		}
 
@@ -31,8 +31,12 @@ internal static Func<object, object> MakeDelegate<T, U>(MethodInfo @get)
 			return t => f((T)t);
 		}
 
-		public string GetIdFor(Type type, object @object)
+		public string Resolve<T>(T @object) => @object == null ? null : Resolve(@object.GetType(), @object);
+
+		public string Resolve(Type type, object @object)
 		{
+			if (type == null || @object == null) return null;
+
 			Func<object, string> cachedLookup;
 			string field;
 
@@ -64,14 +68,6 @@ public string GetIdFor(Type type, object @object)
 			return cachedLookup(@object);
 		}
 
-		public string GetIdFor<T>(T @object)
-		{
-			if (@object == null)
-				return null;
-
-			//var type = typeof(T);
-			return GetIdFor(@object.GetType(), @object);
-		}
 
 		private PropertyInfo GetInferredId(Type type)
 		{

src/Nest/CommonAbstractions/Infer/IndexName/IndexNameExtensions.cs

@@ -11,7 +11,7 @@ public static string Resolve(this IndexName marker, IConnectionSettingsValues co
 
 			if (marker.Type == null)
 				return marker.Name;
-			return new IndexNameResolver(connectionSettings).GetIndexForType(marker.Type);
+			return new IndexNameResolver(connectionSettings).Resolve(marker.Type);
 		}
 	}
 }

src/Nest/CommonAbstractions/Infer/IndexName/IndexNameResolver.cs

@@ -11,8 +11,15 @@ public IndexNameResolver(IConnectionSettingsValues connectionSettings)
 			connectionSettings.ThrowIfNull(nameof(connectionSettings));
 			this._connectionSettings = connectionSettings;
 		}
+		public string Resolve<T>() where T : class => this.Resolve(typeof(T));
 
-		public string GetIndexForType(Type type)
+		public string Resolve(IndexName i)
+		{
+			if (i == null) return this.Resolve((Type)null);
+			return i.Name ?? this.Resolve(i.Type);
+		}
+
+		public string Resolve(Type type)
 		{
 			var defaultIndices = this._connectionSettings.DefaultIndices;
 
@@ -29,11 +36,5 @@ public string GetIndexForType(Type type)
 		}
 
 
-		internal string GetIndexForType(IndexName i)
-		{
-			if (i == null) return this.GetIndexForType((Type)null);
-
-			return i.Name ?? this.GetIndexForType(i.Type);
-		}
 	}
 }

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

@@ -12,12 +12,11 @@ public TypeNameResolver(IConnectionSettingsValues connectionSettings)
 			this._connectionSettings = connectionSettings;
 		}
 
-		public string GetTypeNameFor<T>()
-		{
-			return this.GetTypeNameFor(typeof(T));
-		}
+		public string Resolve<T>() where T : class => this.Resolve(typeof(T));
 
-		public string GetTypeNameFor(Type type)
+		public string Resolve(TypeName t) => t?.Name ?? this.ResolveType(t?.Type);
+
+		private string ResolveType(Type type)
 		{
 			if (type == null) return null;
 			string typeName;
@@ -33,12 +32,5 @@ public string GetTypeNameFor(Type type)
 			return typeName;
 		}
 
-
-		internal string GetTypeNameFor(TypeName t)
-		{
-			if (t == null) return null;
-
-			return t.Name ?? this.GetTypeNameFor(t.Type);
-		}
 	}
 }

src/Nest/Nest.csproj

@@ -877,7 +877,7 @@
     <Compile Include="Mapping\DynamicMapping.cs" />
     <Compile Include="Search\Suggesters\CompletionSuggester\CompletionSuggester.cs" />
     <Compile Include="QueryDsl\Compound\FunctionScore\FunctionScoreQuery.cs" />
-    <Compile Include="CommonAbstractions\Infer\ElasticInferrer.cs" />
+    <Compile Include="CommonAbstractions\Infer\Inferrer.cs" />
     <Compile Include="Document\Multiple\Reindex\IReindexResponse.cs" />
     <Compile Include="Search\Suggesters\Suggest.cs" />
     <Compile Include="Search\Suggesters\SuggestOption.cs" />