Merge pull request #1062 from elasticsearch/feature/property-name-mapping-in-code

Property names can now also be configured in code on ConnectionSettings

Author: gmarz

src/Nest/Domain/Connection/ConnectionSettings.cs

@@ -2,6 +2,8 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.ConnectionPool;
 using Nest.Resolvers;
@@ -25,7 +27,7 @@ public class ConnectionSettings : ConnectionSettings<ConnectionSettings>
 		/// <para>You can also specify specific default index/alias names for types using .SetDefaultTypeIndices(</para>
 		/// <para>If you do not specify this, NEST might throw a runtime exception if an explicit indexname was not provided for a call</para>
 		/// </param>
-		public ConnectionSettings(Uri uri = null, string defaultIndex = null) 
+		public ConnectionSettings(Uri uri = null, string defaultIndex = null)
 			: base(uri, defaultIndex)
 		{
 		}
@@ -39,18 +41,19 @@ public ConnectionSettings(Uri uri = null, string defaultIndex = null)
 		/// <para>You can also specify specific default index/alias names for types using .SetDefaultTypeIndices(</para>
 		/// <para>If you do not specify this, NEST might throw a runtime exception if an explicit indexname was not provided for a call</para>
 		/// </param>
-		public ConnectionSettings(IConnectionPool connectionPool, string defaultIndex = null) : base(connectionPool, defaultIndex)
+		public ConnectionSettings(IConnectionPool connectionPool, string defaultIndex = null)
+			: base(connectionPool, defaultIndex)
 		{
-			
+
 		}
 	}
 	/// <summary>
 	/// Control how NEST's behaviour.
 	/// </summary>
 	[Browsable(false)]
 	[EditorBrowsable(EditorBrowsableState.Never)]
-	public class ConnectionSettings<T> : ConnectionConfiguration<T> , IConnectionSettingsValues 
-		where T : ConnectionSettings<T> 
+	public class ConnectionSettings<T> : ConnectionConfiguration<T>, IConnectionSettingsValues
+		where T : ConnectionSettings<T>
 	{
 		private string _defaultIndex;
 		string IConnectionSettingsValues.DefaultIndex
@@ -87,24 +90,28 @@ string IConnectionSettingsValues.DefaultIndex
 		private ReadOnlyCollection<Func<Type, JsonConverter>> _contractConverters;
 		ReadOnlyCollection<Func<Type, JsonConverter>> IConnectionSettingsValues.ContractConverters { get { return _contractConverters; } }
 
-		public ConnectionSettings(IConnectionPool connectionPool, string defaultIndex) : base(connectionPool)
+		private FluentDictionary<MemberInfo, string> _propertyNames = new FluentDictionary<MemberInfo, string>();
+		FluentDictionary<MemberInfo, string> IConnectionSettingsValues.PropertyNames { get { return _propertyNames; } }
+
+		public ConnectionSettings(IConnectionPool connectionPool, string defaultIndex)
+			: base(connectionPool)
 		{
 			if (!defaultIndex.IsNullOrEmpty())
 				this.SetDefaultIndex(defaultIndex);
-			
-			this._defaultTypeNameInferrer = (t => t.Name.ToLowerInvariant()); 
-			this._defaultPropertyNameInferrer = (p => p.ToCamelCase()); 
+
+			this._defaultTypeNameInferrer = (t => t.Name.ToLowerInvariant());
+			this._defaultPropertyNameInferrer = (p => p.ToCamelCase());
 			this._defaultIndices = new FluentDictionary<Type, string>();
 			this._defaultTypeNames = new FluentDictionary<Type, string>();
 
 			this._modifyJsonSerializerSettings = (j) => { };
 			this._contractConverters = Enumerable.Empty<Func<Type, JsonConverter>>().ToList().AsReadOnly();
 			this._inferrer = new ElasticInferrer(this);
 		}
-		public ConnectionSettings(Uri uri, string defaultIndex) 
+		public ConnectionSettings(Uri uri, string defaultIndex)
 			: this(new SingleNodeConnectionPool(uri ?? new Uri("http://localhost:9200")), defaultIndex)
 		{
-			
+
 		}
 
 		/// <summary>
@@ -197,5 +204,34 @@ public T MapDefaultTypeNames(Action<FluentDictionary<Type, string>> mappingSelec
 			mappingSelector(this._defaultTypeNames);
 			return (T)this;
 		}
+
+		public T MapPropertyNamesFor<TDocument>(Action<FluentDictionary<Expression<Func<TDocument, object>>, string>> propertiesSelector)
+		{
+			propertiesSelector.ThrowIfNull("propertiesSelector");
+			var properties = new FluentDictionary<Expression<Func<TDocument, object>>, string>();
+			propertiesSelector(properties);
+			foreach (var p in properties)
+			{
+				var e = p.Key;
+				var memberInfoResolver = new MemberInfoResolver(this, e);
+				if (memberInfoResolver.Members.Count > 1)
+					throw new ArgumentException("MapPropertyNameFor can only map direct properties");
+
+				if (memberInfoResolver.Members.Count < 1)
+					throw new ArgumentException("Expression {0} does contain any member access".F(e));
+
+				var memberInfo = memberInfoResolver.Members.Last();
+				if (_propertyNames.ContainsKey(memberInfo))
+				{
+					var mappedAs = _propertyNames[memberInfo];
+					var typeName = typeof (TDocument).Name;
+					throw new ArgumentException("Property mapping '{0}' on type {3} can not be mapped to '{1}' already mapped as '{2}'"
+						.F(e, p.Value, mappedAs, typeName));
+				}
+				_propertyNames.Add(memberInfo, p.Value);
+
+			}
+			return (T) this;
+		}
 	}
 }

src/Nest/Domain/Connection/IConnectionSettingsValues.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Reflection;
 using Elasticsearch.Net.Connection;
 using Newtonsoft.Json;
 
@@ -10,6 +11,7 @@ public interface IConnectionSettingsValues : IConnectionConfigurationValues
 		ElasticInferrer Inferrer { get; }
 		FluentDictionary<Type, string> DefaultIndices { get; }
 		FluentDictionary<Type, string> DefaultTypeNames { get; }
+		FluentDictionary<MemberInfo, string> PropertyNames { get; }
 		string DefaultIndex { get; }
 		Func<string, string> DefaultPropertyNameInferrer { get; }
 		Func<Type, string> DefaultTypeNameInferrer { get; }

src/Nest/Resolvers/PropertyNameResolver.cs

@@ -59,14 +59,17 @@ public string Resolve(MemberInfo info)
 		{
 			if (info == null)
 				return null;
-
+			
 			var name = info.Name;
-			var resolvedName = _settings.DefaultPropertyNameInferrer(name);
+			string resolvedName = null;
+			if (_settings.PropertyNames.TryGetValue(info, out resolvedName))
+				return resolvedName;
+
 			var att = ElasticAttributes.Property(info);
 			if (att != null && !att.Name.IsNullOrEmpty())
-				resolvedName = att.Name;
+				return att.Name;
 
-			return resolvedName;
+			return _settings.DefaultPropertyNameInferrer(name);
 		}
 
 		public string ResolveToLastToken(MemberInfo info)
@@ -110,19 +113,7 @@ protected override Expression VisitMemberAccess(MemberExpression expression, Sta
 		{
 			if (stack != null)
 			{
-				var name = expression.Member.Name;
-				var resolvedName = this._settings.DefaultPropertyNameInferrer(name);
-
-				var att = ElasticAttributes.Property(expression.Member);
-				if (att != null)
-				{
-					properties.Push(att);
-				}
-				if (att != null && !att.Name.IsNullOrEmpty())
-				{
-
-					resolvedName = att.Name;
-				}
+				var resolvedName = this.Resolve(expression.Member);
 				stack.Push(resolvedName);
 			}
 			return base.VisitMemberAccess(expression, stack, properties);
@@ -162,11 +153,35 @@ protected override Expression VisitMethodCall(MethodCallExpression m, Stack<stri
 			}
 			return base.VisitMethodCall(m, stack, properties);
 		}
+		
 		private static bool IsLinqOperator(MethodInfo method)
 		{
 			if (method.DeclaringType != typeof(Queryable) && method.DeclaringType != typeof(Enumerable))
 				return false;
 			return Attribute.GetCustomAttribute(method, typeof(ExtensionAttribute)) != null;
 		}
 	}
+	
+
+	/// <summary>
+	/// Resolves member infos in an expression, instance may NOT be shared.
+	/// </summary>
+	public class MemberInfoResolver : PropertyNameResolver
+	{
+		private readonly IList<MemberInfo> _members = new List<MemberInfo>();
+		public IList<MemberInfo> Members { get { return _members; } } 
+
+		public MemberInfoResolver(IConnectionSettingsValues settings, Expression expression) : base(settings)
+		{
+			var stack = new Stack<string>();
+			var properties = new Stack<IElasticPropertyAttribute>();
+			base.Visit(expression, stack, properties);
+		}
+
+		protected override Expression VisitMemberAccess(MemberExpression expression, Stack<string> stack, Stack<IElasticPropertyAttribute> properties)
+		{
+			this._members.Add(expression.Member);
+			return base.VisitMemberAccess(expression, stack, properties);
+		}
+	}
 }