Use MultiFieldMapper as base for the core-mappers

docs/contents/nest/indices/put-mapping.markdown

@@ -61,41 +61,37 @@ You can persist this mapping by simpling calling
 
 You can also create mappings on the fly:
 
-	var typeMapping = new TypeMapping(Guid.NewGuid().ToString("n"));
-	var property = new TypeMappingProperty
+	var indexDefinition = new RootObjectMapping
 	{
-		Type = "multi_field"
+		Properties = new Dictionary<PropertyNameMarker, IElasticType>(),
+		Name = indexName
 	};
 
-	var primaryField = new TypeMappingProperty
+	var property = new StringMapping
 	{
-		Type = "string", 
 		Index = "not_analyzed"
 	};
 
-	var analyzedField = new TypeMappingProperty
+	var analyzedField = new StringMapping
 	{
-		Type = "string", 
 		Index = "analyzed"
 	};
 
-	property.Fields = new Dictionary<string, TypeMappingProperty>();
-	property.Fields.Add("name", primaryField);
 	property.Fields.Add("name_analyzed", analyzedField);
+	indexDefinition.Properties.Add("name", property);
+	this.ConnectedClient.Map<object>(x => x.InitializeUsing(indexDefinition));
 
-	typeMapping.Properties.Add("name", property);
-	this.ConnectedClient.Map(typeMapping);
 
 ## Multifield Mapping
 To create multifield type you can use following example. 
 
 	var result = this._client.Map<ElasticsearchProject>(m => m
 		.Properties(props => props
-		.MultiField(s => s
+		.String(s => s
 		.Name(p => p.Name)
 		.Path(MultiFieldMappingPath.Full)
+		.Index(FieldIndexOption.not_analyzed)
 		.Fields(pprops => pprops
-			.String(ps => ps.Name(p => p.Name).Index(FieldIndexOption.not_analyzed))
 			.String(ps => ps.Name(p => p.Name.Suffix("searchable")).Index(FieldIndexOption.analyzed))
 		)
 		))

src/Nest/Domain/Mapping/Descriptors/AttachmentMappingDescriptor.cs

@@ -3,7 +3,7 @@
 
 namespace Nest
 {
-	public class AttachmentMappingDescriptor<T>
+	public class AttachmentMappingDescriptor<T> where T : class
 	{
 		internal AttachmentMapping _Mapping = new AttachmentMapping();
 

src/Nest/Domain/Mapping/Descriptors/BooleanMappingDescriptor.cs

@@ -4,7 +4,7 @@
 
 namespace Nest
 {
-	public class BooleanMappingDescriptor<T>
+	public class BooleanMappingDescriptor<T> where T : class
 	{
 		internal BooleanMapping _Mapping = new BooleanMapping();
 
@@ -63,5 +63,26 @@ public BooleanMappingDescriptor<T> CopyTo(params Expression<Func<T, object>>[] o
 			this._Mapping.CopyTo = objectPaths.Select(e => (PropertyPathMarker)e);
 			return this;
 		}
+
+		public BooleanMappingDescriptor<T> Path(MultiFieldMappingPath path)
+		{
+			this._Mapping.Path = path.Value;
+			return this;
+		}
+
+		public BooleanMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CorePropertiesDescriptor<T>> fieldSelector)
+		{
+			fieldSelector.ThrowIfNull("fieldSelector");
+			var properties = fieldSelector(new CorePropertiesDescriptor<T>());
+			foreach (var p in properties.Properties)
+			{
+				var value = p.Value as IElasticCoreType;
+				if (value == null)
+					continue;
+
+				_Mapping.Fields[p.Key] = value;
+			}
+			return this;
+		}
 	}
 }

src/Nest/Domain/Mapping/Descriptors/DateMappingDescriptor.cs

@@ -3,7 +3,7 @@
 
 namespace Nest
 {
-	public class DateMappingDescriptor<T>
+	public class DateMappingDescriptor<T> where T : class
 	{
 		internal DateMapping _Mapping = new DateMapping();
 
@@ -68,5 +68,25 @@ public DateMappingDescriptor<T> IgnoreMalformed(bool ignoreMalformed = true)
 			return this;
 		}
 
+		public DateMappingDescriptor<T> Path(MultiFieldMappingPath path)
+		{
+			this._Mapping.Path = path.Value;
+			return this;
+		}
+
+		public DateMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CorePropertiesDescriptor<T>> fieldSelector)
+		{
+			fieldSelector.ThrowIfNull("fieldSelector");
+			var properties = fieldSelector(new CorePropertiesDescriptor<T>());
+			foreach (var p in properties.Properties)
+			{
+				var value = p.Value as IElasticCoreType;
+				if (value == null)
+					continue;
+
+				_Mapping.Fields[p.Key] = value;
+			}
+			return this;
+		}
 	}
 }

src/Nest/Domain/Mapping/Descriptors/GenericMappingDescriptor.cs

@@ -3,7 +3,7 @@
 
 namespace Nest
 {
-	public class GenericMappingDescriptor<T>
+	public class GenericMappingDescriptor<T> where T : class
 	{
 		internal GenericMapping _Mapping = new GenericMapping();
 
@@ -75,5 +75,26 @@ public GenericMappingDescriptor<T> IncludeInAll(bool includeInAll = true)
 			this._Mapping.IncludeInAll = includeInAll;
 			return this;
 		}
+
+		public GenericMappingDescriptor<T> Path(MultiFieldMappingPath path)
+		{
+			this._Mapping.Path = path.Value;
+			return this;
+		}
+
+		public GenericMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CorePropertiesDescriptor<T>> fieldSelector)
+		{
+			fieldSelector.ThrowIfNull("fieldSelector");
+			var properties = fieldSelector(new CorePropertiesDescriptor<T>());
+			foreach (var p in properties.Properties)
+			{
+				var value = p.Value as IElasticCoreType;
+				if (value == null)
+					continue;
+
+				_Mapping.Fields[p.Key] = value;
+			}
+			return this;
+		}
 	}
 }

src/Nest/Domain/Mapping/Descriptors/NumberMappingDescriptor.cs

@@ -2,8 +2,8 @@
 using System.Linq.Expressions;
 
 namespace Nest
-{
-	public class NumberMappingDescriptor<T>
+{
+	public class NumberMappingDescriptor<T> where T : class
 	{
 		internal NumberMapping _Mapping = new NumberMapping();
 
@@ -79,7 +79,27 @@ public NumberMappingDescriptor<T> Coerce(bool coerce = true)
 		{
 			this._Mapping.Coerce = coerce;
 			return this;
+		}
+
+		public NumberMappingDescriptor<T> Path(MultiFieldMappingPath path)
+		{
+			this._Mapping.Path = path.Value;
+			return this;
+		}
+
+		public NumberMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CorePropertiesDescriptor<T>> fieldSelector)
+		{
+			fieldSelector.ThrowIfNull("fieldSelector");
+			var properties = fieldSelector(new CorePropertiesDescriptor<T>());
+			foreach (var p in properties.Properties)
+			{
+				var value = p.Value as IElasticCoreType;
+				if (value == null)
+					continue;
+
+				_Mapping.Fields[p.Key] = value;
+			}
+			return this;
 		}
-
 	}
 }

src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs

@@ -3,8 +3,8 @@
 using System.Linq.Expressions;
 
 namespace Nest
-{
-	public class StringMappingDescriptor<T>
+{
+	public class StringMappingDescriptor<T> where T : class
 	{
 		internal StringMapping _Mapping = new StringMapping();
 
@@ -118,6 +118,27 @@ public StringMappingDescriptor<T> CopyTo(params Expression<Func<T, object>>[] ob
 		{
 			this._Mapping.CopyTo = objectPaths.Select(e => (PropertyPathMarker)e);
 			return this;
+		}
+
+		public StringMappingDescriptor<T> Path(MultiFieldMappingPath path)
+		{
+			this._Mapping.Path = path.Value;
+			return this;
+		}
+
+		public StringMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CorePropertiesDescriptor<T>> fieldSelector)
+		{
+			fieldSelector.ThrowIfNull("fieldSelector");
+			var properties = fieldSelector(new CorePropertiesDescriptor<T>());
+			foreach (var p in properties.Properties)
+			{
+				var value = p.Value as IElasticCoreType;
+				if (value == null)
+					continue;
+
+				_Mapping.Fields[p.Key] = value;
+			}
+			return this;
 		}
 	}
 }

src/Nest/Domain/Mapping/Types/BooleanMapping.cs

@@ -6,16 +6,11 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
-	public class BooleanMapping : IElasticType, IElasticCoreType
+	public class BooleanMapping : MultiFieldMapping, IElasticType, IElasticCoreType
 	{
-
-		public PropertyNameMarker Name { get; set; }
-
-		[JsonProperty("type")]
-		public virtual TypeNameMarker Type { get { return new TypeNameMarker { Name = "boolean" }; } }
-
-		[JsonProperty("similarity")]
-		public string Similarity { get; set; }
+		public BooleanMapping():base("boolean")
+		{
+		}
 
 		/// <summary>
 		/// The name of the field that will be stored in the index. Defaults to the property/field name.
@@ -35,9 +30,6 @@ public class BooleanMapping : IElasticType, IElasticCoreType
 		[JsonProperty("null_value")]
 		public bool? NullValue { get; set; }
 
-		[JsonProperty("include_in_all")]
-		public bool? IncludeInAll { get; set; }
-
 		[JsonProperty("copy_to")]
 		public IEnumerable<PropertyPathMarker> CopyTo { get; set; }
 	}

src/Nest/Domain/Mapping/Types/DateMapping.cs

@@ -6,15 +6,11 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
-	public class DateMapping : IElasticType, IElasticCoreType
+	public class DateMapping : MultiFieldMapping, IElasticType, IElasticCoreType
 	{
-		public PropertyNameMarker Name { get; set; }
-
-		[JsonProperty("type")]
-		public virtual TypeNameMarker Type { get { return new TypeNameMarker { Name = "date" }; } }
-
-		[JsonProperty("similarity")]
-		public string Similarity { get; set; }
+		public DateMapping():base("date")
+		{
+		}
 
 		/// <summary>
 		/// The name of the field that will be stored in the index. Defaults to the property/field name.
@@ -40,9 +36,6 @@ public class DateMapping : IElasticType, IElasticCoreType
 		[JsonProperty("null_value")]
 		public DateTime? NullValue { get; set; }
 
-		[JsonProperty("include_in_all")]
-		public bool? IncludeInAll { get; set; }
-
 		[JsonProperty("ignore_malformed")]
 		public bool? IgnoreMalformed { get; set; }
 

src/Nest/Domain/Mapping/Types/GenericMapping.cs

@@ -10,16 +10,11 @@ namespace Nest
 	/// in order to specify "{dynamic_template}" the type, or if you have some plugin that exposes a new type.
 	/// </summary>
 	[JsonObject(MemberSerialization.OptIn)]
-	public class GenericMapping : IElasticType, IElasticCoreType
+	public class GenericMapping : MultiFieldMapping, IElasticType, IElasticCoreType
 	{
-
-		public PropertyNameMarker Name { get; set; }
-
-		[JsonProperty("type")]
-		public TypeNameMarker Type { get; set; }
-
-		[JsonProperty("similarity")]
-		public string Similarity { get; set; }
+		public GenericMapping():base(null)
+		{
+		}
 
 		/// <summary>
 		/// The name of the field that will be stored in the index. Defaults to the property/field name.
@@ -39,9 +34,6 @@ public class GenericMapping : IElasticType, IElasticCoreType
 		[JsonProperty("boost")]
 		public double? Boost { get; set; }
 
-		[JsonProperty("include_in_all")]
-		public bool? IncludeInAll { get; set; }
-
 		[JsonProperty("term_vector")]
 		public string TermVector { get; set; }
 

src/Nest/Domain/Mapping/Types/MultiFieldMapping.cs

@@ -8,14 +8,27 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public class MultiFieldMapping : IElasticType
 	{
+		private readonly TypeNameMarker _defaultType;
+
+		public MultiFieldMapping()
+			: this("multi_field")
+		{
+			this.Fields = new Dictionary<PropertyNameMarker, IElasticCoreType>();
+		}
+
+		protected MultiFieldMapping(TypeNameMarker defaultType)
+		{
+			_defaultType = defaultType;
+		}
+
 		public PropertyNameMarker Name { get; set; }
 
 		private TypeNameMarker _typeOverride;
 
 		[JsonProperty("type")]
 		public virtual TypeNameMarker Type
 		{
-			get { return _typeOverride ?? new TypeNameMarker { Name = "multi_field" }; }
+			get { return _typeOverride ?? _defaultType; }
 			set { _typeOverride = value; }
 		}
 
@@ -28,14 +41,8 @@ public virtual TypeNameMarker Type
 		[JsonProperty("include_in_all")]
 		public bool? IncludeInAll { get; set; }
 
-		[JsonProperty("fields"), JsonConverter(typeof(ElasticCoreTypeConverter))]
+		[JsonProperty("fields", DefaultValueHandling = DefaultValueHandling.Ignore), JsonConverter(typeof(ElasticCoreTypeConverter))]
 		public IDictionary<PropertyNameMarker, IElasticCoreType> Fields { get; set; }
-
-
-		public MultiFieldMapping()
-		{
-			this.Fields = new Dictionary<PropertyNameMarker, IElasticCoreType>();
-		}
 	}
 
     public class MultiFieldMappingPath