No longer FluentDict but dedicated descriptor with .Rename and .Ignore

Author: Mpdreamz

src/Nest/Domain/Connection/ConnectionSettings.cs

@@ -205,12 +205,12 @@ public T MapDefaultTypeNames(Action<FluentDictionary<Type, string>> mappingSelec
 			return (T)this;
 		}
 
-		public T MapPropertiesFor<TDocument>(Action<FluentDictionary<Expression<Func<TDocument, object>>, PropertyMapping>> propertiesSelector)
+		public T MapPropertiesFor<TDocument>(Action<PropertyMappingDescriptor<TDocument>> propertiesSelector)
 		{
 			propertiesSelector.ThrowIfNull("propertiesSelector");
-			var properties = new FluentDictionary<Expression<Func<TDocument, object>>, PropertyMapping>();
-			propertiesSelector(properties);
-			foreach (var p in properties)
+			var mapper = new PropertyMappingDescriptor<TDocument>();
+			propertiesSelector(mapper);
+			foreach (var p in mapper.Mappings)
 			{
 				var e = p.Key;
 				var memberInfoResolver = new MemberInfoResolver(this, e);

src/Nest/Domain/Mapping/PropertyMapping.cs

@@ -1,5 +1,39 @@
-namespace Nest
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Reflection.Emit;
+using Nest.Resolvers;
+
+namespace Nest
 {
+	
+	public class PropertyMappingDescriptor<TDocument>
+	{
+		
+		private readonly IList<KeyValuePair<Expression<Func<TDocument, object>>, PropertyMapping>> _mappings = new List<KeyValuePair<Expression<Func<TDocument, object>>, PropertyMapping>>();
+		
+		internal IList<KeyValuePair<Expression<Func<TDocument, object>>, PropertyMapping>> Mappings { get { return _mappings; } }
+
+		public PropertyMappingDescriptor<TDocument> Rename(Expression<Func<TDocument, object>> property, string propertyName)
+		{
+			property.ThrowIfNull("property");
+			propertyName.ThrowIfNullOrEmpty("propertyName");
+			this._mappings.Add(new KeyValuePair<Expression<Func<TDocument, object>>, PropertyMapping>(property, propertyName));
+			return this;
+		}
+
+		public PropertyMappingDescriptor<TDocument> Ignore(Expression<Func<TDocument, object>> property)
+		{
+			property.ThrowIfNull("property");
+			this._mappings.Add(new KeyValuePair<Expression<Func<TDocument, object>>, PropertyMapping>(property, PropertyMapping.Ignored));
+			return this;
+		}
+	}
+
+
+
+
 	/// <summary>
 	/// This class allows you to map aspects of a Type's property
 	/// that influences how NEST treats it. 

src/Tests/Nest.Tests.Unit/Internals/Inferno/MapPropertyIgnoreTests.cs

@@ -87,7 +87,7 @@ public ElasticClient ConfigureClient(Action<ConnectionSettings> settingsSelector
 			return client;
 		}
 
-		public IElasticClient ClientWithPropertiesFor<T>(Action<FluentDictionary<Expression<Func<T, object>>, PropertyMapping>> propertiesSelector)
+		public IElasticClient ClientWithPropertiesFor<T>(Action<PropertyMappingDescriptor<T>> propertiesSelector)
 		{
 			return this.ConfigureClient(c=>c.MapPropertiesFor<T>(propertiesSelector));
 		}
@@ -96,7 +96,7 @@ public IElasticClient ClientWithPropertiesFor<T>(Action<FluentDictionary<Express
 		public void Global_Ignore_Should_Be_Adhered()
 		{
 			var client = this.ClientWithPropertiesFor<MyCustomClass>(props => props
-				.Add(p=>p.MyProperty, PropertyMapping.Ignored)
+				.Ignore(p=>p.MyProperty)
 			);
 			var json = client.Serializer.Serialize(new MyCustomClass
 			{
@@ -111,8 +111,8 @@ public void CanIgnoreTwice_ExceptionMessageMakesSense()
 			var e = Assert.Throws<ArgumentException>(() =>
 			{
 				this.ClientWithPropertiesFor<MyCustomClass>(props => props
-					.Add(p => p.MyProperty, PropertyMapping.Ignored)
-					.Add(p => p.MyProperty, PropertyMapping.Ignored)
+					.Ignore(p => p.MyProperty)
+					.Ignore(p => p.MyProperty)
 				);
 			});
 			e.Message.Should()
@@ -126,8 +126,8 @@ public void CanNotMapTwiceDifferently_ExceptionMessageMakesSense()
 			var e = Assert.Throws<ArgumentException>(() =>
 			{
 				this.ClientWithPropertiesFor<MyCustomClass>(props => props
-					.Add(p => p.MyProperty, PropertyMapping.Ignored)
-					.Add(p => p.MyProperty, "mahProperty4")
+					.Ignore(p => p.MyProperty)
+					.Rename(p => p.MyProperty, "mahProperty4")
 				);
 			});
 			e.Message.Should()
@@ -141,8 +141,8 @@ public void CanNotMapTwiceDifferently_ExceptionMessageMakesSense_AlternativeOrde
 			var e = Assert.Throws<ArgumentException>(() =>
 			{
 				this.ClientWithPropertiesFor<MyCustomClass>(props => props
-					.Add(p => p.MyProperty, "mahProperty4")
-					.Add(p => p.MyProperty, PropertyMapping.Ignored)
+					.Rename(p => p.MyProperty, "mahProperty4")
+					.Ignore(p => p.MyProperty)
 				);
 			});
 			e.Message.Should()

src/Tests/Nest.Tests.Unit/Internals/Inferno/MapPropertyNamesForTests.cs

@@ -87,7 +87,7 @@ public ElasticClient ConfigureClient(Action<ConnectionSettings> settingsSelector
 			return client;
 		}
 
-		public IElasticClient ClientWithPropertiesFor<T>(Action<FluentDictionary<Expression<Func<T, object>>, PropertyMapping>> propertiesSelector)
+		public IElasticClient ClientWithPropertiesFor<T>(Action<PropertyMappingDescriptor<T>> propertiesSelector)
 		{
 			return this.ConfigureClient(c=>c.MapPropertiesFor<T>(propertiesSelector));
 		}
@@ -96,7 +96,7 @@ public IElasticClient ClientWithPropertiesFor<T>(Action<FluentDictionary<Express
 		public void SettingsTakePrecedenceOverAttributes()
 		{
 			var client = this.ClientWithPropertiesFor<MyCustomClass>(props => props
-				.Add(p=>p.MyProperty, "mahPropertah")
+				.Rename(p=>p.MyProperty, "mahPropertah")
 			);
 			Expression<Func<SomeClass, object>> exp = (m) => m.MyCustomClass.MyProperty;
 			client.Infer.PropertyPath(exp).Should().Be("myCustomClass.mahPropertah");
@@ -107,7 +107,7 @@ public void CanNotMapAnyDepth()
 		{
 			var e = Assert.Throws<ArgumentException>(()=>
 				this.ClientWithPropertiesFor<SomeClass>(props => props
-					.Add(p=>p.MyCustomClass.MyProperty, "mahPropertah")
+					.Rename(p=>p.MyCustomClass.MyProperty, "mahPropertah")
 				)
 			);
 			e.Message.Should().Contain("can only map direct properties");
@@ -118,8 +118,8 @@ public void CanNotMapSamePropertyTwice()
 		{
 			var e = Assert.Throws<ArgumentException>(()=>
 				this.ClientWithPropertiesFor<MyCustomClass>(props => props
-					.Add(p=>p.MyProperty, "mahPropertah")
-					.Add(p=>p.MyProperty, "mahPropertah2")
+					.Rename(p=>p.MyProperty, "mahPropertah")
+					.Rename(p=>p.MyProperty, "mahPropertah2")
 				)
 			);
 			e.Message.Should()
@@ -134,10 +134,10 @@ public void CanNotMapSamePropertyTwice_SubClasses()
 			var e = Assert.Throws<ArgumentException>(()=>
 				this.ConfigureClient(c=>c
 					.MapPropertiesFor<B>(props => props
-						.Add(p=>p.X, "bX")
+						.Rename(p=>p.X, "bX")
 					)
 					.MapPropertiesFor<C>(props => props
-						.Add(p=>p.X, "cX")
+						.Rename(p=>p.X, "cX")
 					)
 				)
 			);
@@ -152,10 +152,10 @@ public void ResolverShouldResolveAllNestedMembers()
 		{
 			var client = this.ConfigureClient(c=>c
 				.MapPropertiesFor<SomeClass>(props => props
-					.Add(p=>p.MyCustomClass, "customClazz")
+					.Rename(p=>p.MyCustomClass, "customClazz")
 				)
 				.MapPropertiesFor<MyCustomClass>(props => props
-					.Add(p=>p.MyProperty, "mahPropertah")
+					.Rename(p=>p.MyProperty, "mahPropertah")
 				)
 			);
 			Expression<Func<SomeClass, object>> exp = (m) => m.MyCustomClass.MyProperty;
@@ -167,10 +167,10 @@ public void ResolverShouldResolveAllNestedMembers_Dictionary()
 		{
 			var client = this.ConfigureClient(c=>c
 				.MapPropertiesFor<SomeClass>(props => props
-					.Add(p=>p.StringDict, "map")
+					.Rename(p=>p.StringDict, "map")
 				)
 				.MapPropertiesFor<SomeOtherClass>(props => props
-					.Add(p=>p.CreateDate, "d0b")
+					.Rename(p=>p.CreateDate, "d0b")
 				)
 			);
 			Expression<Func<SomeClass, object>> exp = (m) => m.StringDict["path"].CreateDate;
@@ -182,7 +182,7 @@ public void PropertiesOn_CInstanceTakeNamesFrom_B()
 		{
 			var client = this.ConfigureClient(c=>c
 				.MapPropertiesFor<B>(props => props
-					.Add(p=>p.X, "Xavier")
+					.Rename(p=>p.X, "Xavier")
 				)
 			);
 			Expression<Func<SomeClass, object>> exp = (m) => m.CInstance.X;
@@ -194,7 +194,7 @@ public void PropertiesOn_BInstanceTakeNamesFrom_C()
 		{
 			var client = this.ConfigureClient(c=>c
 				.MapPropertiesFor<C>(props => props
-					.Add(p=>p.X, "Xavier")
+					.Rename(p=>p.X, "Xavier")
 				)
 			);
 			Expression<Func<SomeClass, object>> exp = (m) => m.BInstance.X;
@@ -206,7 +206,7 @@ public void PropertiesOnCollectionExpressionsResolve()
 		{
 			var client = this.ConfigureClient(c=>c
 				.MapPropertiesFor<MyCustomClass>(props => props
-					.Add(p=>p.MyProperty, "myProp")
+					.Rename(p=>p.MyProperty, "myProp")
 				)
 			);
 			Expression<Func<SomeClass, object>> exp = (m) => m.ListOfCustomClasses.First().MyProperty;