Update mappings to allow inheritance for multifieldmap

Author: Tasteful

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

@@ -6,16 +6,12 @@
 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()
+		{
+			Type = "boolean";
+		}
 
 		/// <summary>
 		/// The name of the field that will be stored in the index. Defaults to the property/field name.
@@ -35,9 +31,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,12 @@
 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()
+		{
+			Type = "date";
+		}
 
 		/// <summary>
 		/// The name of the field that will be stored in the index. Defaults to the property/field name.
@@ -40,9 +37,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/MultiFieldMapping.cs

@@ -28,7 +28,7 @@ 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; }
 
 

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

@@ -5,17 +5,13 @@
 
 namespace Nest
 {
-	[JsonObject(MemberSerialization.OptIn)]
-	public class NumberMapping : IElasticType, IElasticCoreType
-	{
-		public PropertyNameMarker Name { get; set; }
-
-		private TypeNameMarker __type;
-		[JsonProperty("type")]
-		public virtual TypeNameMarker Type { get { return (TypeNameMarker)(__type ?? "double"); } set { __type = value; } }
-
-		[JsonProperty("similarity")]
-		public string Similarity { get; set; }
+	[JsonObject(MemberSerialization.OptIn)]
+	public class NumberMapping : MultiFieldMapping, IElasticType, IElasticCoreType
+	{
+		public NumberMapping()
+		{
+			Type = "double";
+		}
 
 		/// <summary>
 		/// The name of the field that will be stored in the index. Defaults to the property/field name.
@@ -41,9 +37,6 @@ public class NumberMapping : IElasticType, IElasticCoreType
 		[JsonProperty("doc_values")]
 		public bool? DocValues { get; set; }
 
-		[JsonProperty("include_in_all")]
-		public bool? IncludeInAll { get; set; }
-
 		[JsonProperty("ignore_malformed")]
 		public bool? IgnoreMalformed { get; set; }
 

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

@@ -6,16 +6,12 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
-	public class StringMapping : IElasticType, IElasticCoreType
-	{
-		[JsonProperty("type")]
-		public virtual TypeNameMarker Type { get { return new TypeNameMarker { Name = "string" }; } }
-
-		//[JsonProperty(PropertyName = "name")]
-		public PropertyNameMarker Name { get; set; }
-
-		[JsonProperty("similarity")]
-		public string Similarity { get; set; }
+	public class StringMapping : MultiFieldMapping, IElasticType, IElasticCoreType
+	{
+		public StringMapping()
+		{
+			Type = "string";
+		}
 
 		/// <summary>
 		/// The name of the field that will be stored in the index. Defaults to the property/field name.
@@ -62,9 +58,6 @@ public class StringMapping : IElasticType, IElasticCoreType
 		[JsonProperty("doc_values")]
 		public bool? DocValues { get; set; }
 
-		[JsonProperty("include_in_all")]
-		public bool? IncludeInAll { get; set; }
-
 		[JsonProperty("position_offset_gap")]
 		public int? PositionOffsetGap { get; set; }
 

src/Nest/Resolvers/Converters/ElasticTypeConverter.cs

@@ -22,7 +22,6 @@ private IElasticType GetTypeFromJObject(JObject po, JsonSerializer serializer)
 		{
 			JToken typeToken;
 			JToken propertiesToken;
-			JToken fieldsToken;
 			var type = string.Empty;
 
 			var hasType = po.TryGetValue("type", out typeToken);
@@ -31,11 +30,6 @@ private IElasticType GetTypeFromJObject(JObject po, JsonSerializer serializer)
 			else if (po.TryGetValue("properties", out propertiesToken))
 				type = "object";
 
-			var originalType = type;
-			var hasFields = po.TryGetValue("fields", out fieldsToken);
-			if (hasFields)
-				type = "multi_field";
-
 			serializer.TypeNameHandling = TypeNameHandling.None;
 
 			switch (type)
@@ -60,9 +54,7 @@ private IElasticType GetTypeFromJObject(JObject po, JsonSerializer serializer)
 				case "nested":
 					return serializer.Deserialize(po.CreateReader(), typeof(NestedObjectMapping)) as NestedObjectMapping;
 				case "multi_field":
-					var m =serializer.Deserialize(po.CreateReader(), typeof(MultiFieldMapping)) as MultiFieldMapping;
-					m.Type = originalType;
-					return m;
+					return serializer.Deserialize(po.CreateReader(), typeof(MultiFieldMapping)) as MultiFieldMapping;
 				case "ip":
 					return serializer.Deserialize(po.CreateReader(), typeof(IPMapping)) as IPMapping;
 				case "geo_point":