Refactor property and attribute mapping tests

Our property mapping tests weren't sufficient as they
only tested serilization of fluent syntax and attribute
types.

This commit adds new tests that test both the fluent and
initializer types, and run them as integration tests as well
so we can validate our properties against ES.

Also tackled #2322 as part of this, as I did a full pass over
all of our datatype mappings.

Code review changes and rename of base test classes

Change DynamicMapping to Union<bool, DynamicMapping>

Author: gmarz

src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs

@@ -25,7 +25,7 @@ internal PutMappingRequest() { }
 		/// <inheritdoc/>
 		public IDynamicTemplateContainer DynamicTemplates { get; set; }
 		/// <inheritdoc/>
-		public DynamicMapping? Dynamic { get; set; }
+		public Union<bool, DynamicMapping> Dynamic { get; set; }
 		/// <inheritdoc/>
 		public string Analyzer { get; set; }
 		/// <inheritdoc/>
@@ -63,7 +63,7 @@ public PutMappingRequest() : this(typeof(T), typeof(T)) { }
 		/// <inheritdoc/>
 		public IDynamicTemplateContainer DynamicTemplates { get; set; }
 		/// <inheritdoc/>
-		public DynamicMapping? Dynamic { get; set; }
+		public Union<bool, DynamicMapping> Dynamic { get; set; }
 		/// <inheritdoc/>
 		public string Analyzer { get; set; }
 		/// <inheritdoc/>
@@ -102,7 +102,7 @@ public PutMappingDescriptor(IndexName index, TypeName type) : base(r=>r.Required
 		string ITypeMapping.Analyzer { get; set; }
 		string ITypeMapping.SearchAnalyzer { get; set; }
 		IDynamicTemplateContainer ITypeMapping.DynamicTemplates { get; set; }
-		DynamicMapping? ITypeMapping.Dynamic { get; set; }
+		Union<bool, DynamicMapping> ITypeMapping.Dynamic { get; set; }
 		IFieldNamesField ITypeMapping.FieldNamesField { get; set; }
 		IIndexField ITypeMapping.IndexField { get; set; }
 		FluentDictionary<string, object> ITypeMapping.Meta { get; set; }
@@ -126,10 +126,7 @@ public PutMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int maxR
 		public PutMappingDescriptor<T> AutoMap(int maxRecursion) => AutoMap(null, maxRecursion);
 
 		/// <inheritdoc/>
-		public PutMappingDescriptor<T> Dynamic(DynamicMapping dynamic) => Assign(a => a.Dynamic = dynamic);
-
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> Dynamic(bool dynamic = true) => this.Dynamic(dynamic ? DynamicMapping.Allow : DynamicMapping.Ignore);
+		public PutMappingDescriptor<T> Dynamic(Union<bool, DynamicMapping> dynamic) => Assign(a => a.Dynamic = dynamic);
 
 		/// <inheritdoc/>
 		public PutMappingDescriptor<T> Parent(TypeName parentType) => Assign(a => a.ParentField = new ParentField { Type = parentType });

src/Nest/Mapping/DynamicMapping.cs

@@ -1,74 +1,17 @@
 using System;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
-	/// <summary>
-	/// Controls how elasticsearch handles dynamic mapping changes when a new document present new fields
-	/// </summary>
-	[JsonConverter(typeof(DynamicMappingJsonConverter))]
+	[JsonConverter(typeof(StringEnumConverter))]
 	public enum DynamicMapping
 	{
-		/// <summary>
-		/// Default value, allows unmapped fields to be cause a mapping update 
-		/// </summary>
-		[EnumMember(Value = "allow")]
-		Allow,
-		/// <summary>
-		/// New unmapped fields will be silently ignored
-		/// </summary>
-		[EnumMember(Value = "ignore")]
-		Ignore,
 		/// <summary>
 		/// If new unmapped fields are passed, the whole document WON'T be added/updated
 		/// </summary>
 		[EnumMember(Value = "strict")]
 		Strict
 	}
-
-	internal class DynamicMappingJsonConverter : JsonConverter
-	{
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			var v = value as DynamicMapping?;
-			if (!v.HasValue)
-			{
-				writer.WriteValue(true);
-				return;
-			}
-			switch (v.Value)
-			{
-				case DynamicMapping.Strict:
-					writer.WriteValue("strict");
-					break;
-				case DynamicMapping.Ignore:
-					writer.WriteValue(false);
-					break;
-				default:
-					writer.WriteValue(true);
-					break;
-			}
-		}
-
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
-			var v = reader.Value;
-			if (v == null)
-				return null;
-
-			var sv = v.ToString().ToLowerInvariant();
-			switch (sv)
-			{
-				case "false":
-					return DynamicMapping.Ignore;
-				case "strict":
-					return DynamicMapping.Strict;
-				default:
-					return DynamicMapping.Allow;
-			}
-		}
-
-		public override bool CanConvert(Type objectType) => objectType == typeof(DynamicMapping?);
-	}
 }

src/Nest/Mapping/TypeMapping.cs

@@ -54,7 +54,7 @@ public interface ITypeMapping
 		IDynamicTemplateContainer DynamicTemplates { get; set; }
 
 		[JsonProperty("dynamic")]
-		DynamicMapping? Dynamic { get; set; }
+		Union<bool, DynamicMapping> Dynamic { get; set; }
 
 		[JsonProperty("properties", TypeNameHandling = TypeNameHandling.None)]
 		IProperties Properties { get; set; }
@@ -69,7 +69,7 @@ public class TypeMapping : ITypeMapping
 		/// <inheritdoc/>
 		public bool? DateDetection { get; set; }
 		/// <inheritdoc/>
-		public DynamicMapping? Dynamic { get; set; }
+		public Union<bool, DynamicMapping> Dynamic { get; set; }
 		/// <inheritdoc/>
 		public IEnumerable<string> DynamicDateFormats { get; set; }
 		/// <inheritdoc/>
@@ -104,7 +104,7 @@ public class TypeMappingDescriptor<T> : DescriptorBase<TypeMappingDescriptor<T>,
 		IAllField ITypeMapping.AllField { get; set; }
 		string ITypeMapping.Analyzer { get; set; }
 		bool? ITypeMapping.DateDetection { get; set; }
-		DynamicMapping? ITypeMapping.Dynamic { get; set; }
+		Union<bool, DynamicMapping> ITypeMapping.Dynamic { get; set; }
 		IEnumerable<string> ITypeMapping.DynamicDateFormats { get; set; }
 		IDynamicTemplateContainer ITypeMapping.DynamicTemplates { get; set; }
 		IFieldNamesField ITypeMapping.FieldNamesField { get; set; }
@@ -131,10 +131,7 @@ public TypeMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int max
 		public TypeMappingDescriptor<T> AutoMap(int maxRecursion) => AutoMap(null, maxRecursion);
 
 		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> Dynamic(DynamicMapping dynamic) => Assign(a => a.Dynamic = dynamic);
-
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> Dynamic(bool dynamic = true) => this.Dynamic(dynamic ? DynamicMapping.Allow : DynamicMapping.Ignore);
+		public TypeMappingDescriptor<T> Dynamic(Union<bool, DynamicMapping> dynamic) => Assign(a => a.Dynamic = dynamic);
 
 		/// <inheritdoc/>
 		public TypeMappingDescriptor<T> Parent(TypeName parentType) => Assign(a => a.ParentField = new ParentField { Type = parentType });

src/Nest/Mapping/Types/Complex/Nested/NestedProperty.cs

@@ -37,4 +37,4 @@ public NestedPropertyDescriptor<TParent, TChild> IncludeInParent(bool includeInP
 		public NestedPropertyDescriptor<TParent, TChild> IncludeInRoot(bool includeInRoot = true) =>
 			Assign(a => a.IncludeInRoot = includeInRoot);
 	}
-}
+}

src/Nest/Mapping/Types/Complex/Object/ObjectAttribute.cs

@@ -6,16 +6,13 @@ public class ObjectAttribute : ElasticsearchCorePropertyAttributeBase, IObjectPr
 	{
 		IObjectProperty Self => this;
 
-		DynamicMapping? IObjectProperty.Dynamic { get; set; }
+		Union<bool, DynamicMapping> IObjectProperty.Dynamic { get; set; }
 		bool? IObjectProperty.Enabled { get; set; }
 		bool? IObjectProperty.IncludeInAll { get; set; }
-		string IObjectProperty.Path { get; set; }
 		IProperties IObjectProperty.Properties { get; set; }
 
-		public DynamicMapping Dynamic { get { return Self.Dynamic.GetValueOrDefault(); } set { Self.Dynamic = value; } }
 		public bool Enabled { get { return Self.Enabled.GetValueOrDefault(); } set { Self.Enabled = value; } }
 		public bool IncludeInAll { get { return Self.IncludeInAll.GetValueOrDefault(); } set { Self.IncludeInAll = value; } }
-		public string Path { get { return Self.Path; } set { Self.Path = value; } }
 
 		public ObjectAttribute() : base("object") { }
 		protected ObjectAttribute(string typeName) : base(typeName) { }

src/Nest/Mapping/Types/Complex/Object/ObjectProperty.cs

@@ -8,17 +8,14 @@ namespace Nest
 	public interface IObjectProperty : ICoreProperty
 	{
 		[JsonProperty("dynamic")]
-		DynamicMapping? Dynamic { get; set; }
+		Union<bool, DynamicMapping> Dynamic { get; set; }
 
 		[JsonProperty("enabled")]
 		bool? Enabled { get; set; }
 
 		[JsonProperty("include_in_all")]
 		bool? IncludeInAll { get; set; }
 
-		[JsonProperty("path")]
-		string Path { get; set; }
-
 		[JsonProperty("properties", TypeNameHandling = TypeNameHandling.None)]
 		IProperties Properties { get; set; }
 	}
@@ -29,10 +26,9 @@ public ObjectProperty() : base("object") { }
 
 		protected ObjectProperty(string type) : base(type) { }
 
-		public DynamicMapping? Dynamic { get; set; }
+		public Union<bool, DynamicMapping> Dynamic { get; set; }
 		public bool? Enabled { get; set; }
 		public bool? IncludeInAll { get; set; }
-		public string Path { get; set; }
 		public IProperties Properties { get; set; }
 	}
 
@@ -52,10 +48,9 @@ public abstract class ObjectPropertyDescriptorBase<TDescriptor, TInterface, TPar
 	{
 		internal TypeName _TypeName { get; set; }
 
-		DynamicMapping? IObjectProperty.Dynamic { get; set; }
+		Union<bool, DynamicMapping> IObjectProperty.Dynamic { get; set; }
 		bool? IObjectProperty.Enabled { get; set; }
 		bool? IObjectProperty.IncludeInAll { get; set; }
-		string IObjectProperty.Path { get; set; }
 		IProperties IObjectProperty.Properties { get; set; }
 
 		protected ObjectPropertyDescriptorBase() : this("object") { }
@@ -65,21 +60,15 @@ protected ObjectPropertyDescriptorBase(string type) : base(type)
 			_TypeName = TypeName.Create<TChild>();
 		}
 
-		public TDescriptor Dynamic(DynamicMapping dynamic) =>
+		public TDescriptor Dynamic(Union<bool, DynamicMapping> dynamic) =>
 			Assign(a => a.Dynamic = dynamic);
 
-		public TDescriptor Dynamic(bool dynamic = true) =>
-			Dynamic(dynamic ? DynamicMapping.Allow : DynamicMapping.Ignore);
-
 		public TDescriptor Enabled(bool enabled = true) =>
 			Assign(a => a.Enabled = enabled);
 
 		public TDescriptor IncludeInAll(bool includeInAll = true) =>
 			Assign(a => a.IncludeInAll = includeInAll);
 
-		public TDescriptor Path(string path) =>
-			Assign(a => a.Path = path);
-
 		public TDescriptor Properties(Func<PropertiesDescriptor<TChild>, IPromise<IProperties>> selector) =>
 			Assign(a => a.Properties = selector?.Invoke(new PropertiesDescriptor<TChild>(a.Properties))?.Value);
 

src/Nest/Mapping/Types/Core/Date/DateAttribute.cs

@@ -10,20 +10,16 @@ public class DateAttribute : ElasticsearchDocValuesPropertyAttributeBase, IDateP
 		double? IDateProperty.Boost { get; set; }
 		DateTime? IDateProperty.NullValue { get; set; }
 		bool? IDateProperty.IncludeInAll { get; set; }
-		int? IDateProperty.PrecisionStep { get; set; }
 		bool? IDateProperty.IgnoreMalformed { get; set; }
 		string IDateProperty.Format { get; set; }
-		NumericResolutionUnit? IDateProperty.NumericResolution { get; set; }
 		INumericFielddata IDateProperty.Fielddata { get; set; }
 
 		public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
 		public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
 		public DateTime NullValue { get { return Self.NullValue.GetValueOrDefault(); } set { Self.NullValue = value; } }
 		public bool IncludeInAll { get { return Self.IncludeInAll.GetValueOrDefault(); } set { Self.IncludeInAll = value; } }
-		public int PrecisionStep { get { return Self.PrecisionStep.GetValueOrDefault(); } set { Self.PrecisionStep = value; } }
 		public bool IgnoreMalformed { get { return Self.IgnoreMalformed.GetValueOrDefault(); } set { Self.IgnoreMalformed = value; } }
 		public string Format { get { return Self.Format; } set { Self.Format = value; } }
-		public NumericResolutionUnit NumericResolution { get { return Self.NumericResolution.GetValueOrDefault(); } set { Self.NumericResolution = value; } }
 
 		public DateAttribute() : base("date") { }
 	}

src/Nest/Mapping/Types/Core/Date/DateProperty.cs

@@ -18,18 +18,12 @@ public interface IDateProperty : IDocValuesProperty
 		[JsonProperty("include_in_all")]
 		bool? IncludeInAll { get; set; }
 
-		[JsonProperty("precision_step")]
-		int? PrecisionStep { get; set; }
-
 		[JsonProperty("ignore_malformed")]
 		bool? IgnoreMalformed { get; set; }
 
 		[JsonProperty("format")]
 		string Format { get; set; }
 
-		[JsonProperty("numeric_resolution")]
-        NumericResolutionUnit? NumericResolution { get; set; }
-
 		[JsonProperty("fielddata")]
 		INumericFielddata Fielddata { get; set; }
 	}
@@ -45,7 +39,6 @@ public DateProperty() : base("date") { }
 		public int? PrecisionStep { get; set; }
 		public bool? IgnoreMalformed { get; set; }
 		public string Format { get; set; }
-		public NumericResolutionUnit? NumericResolution { get; set; }
 		public INumericFielddata Fielddata { get; set; }
 	}
 
@@ -57,10 +50,8 @@ public class DatePropertyDescriptor<T>
 		double? IDateProperty.Boost { get; set; }
 		DateTime? IDateProperty.NullValue { get; set; }
 		bool? IDateProperty.IncludeInAll { get; set; }
-		int? IDateProperty.PrecisionStep { get; set; }
 		bool? IDateProperty.IgnoreMalformed { get; set; }
 		string IDateProperty.Format { get; set; }
-		NumericResolutionUnit? IDateProperty.NumericResolution { get; set; }
 		INumericFielddata IDateProperty.Fielddata { get; set; }
 
 		public DatePropertyDescriptor() : base("date") { }
@@ -69,10 +60,8 @@ public DatePropertyDescriptor() : base("date") { }
 		public DatePropertyDescriptor<T> Boost(double boost) => Assign(a => a.Boost = boost);
 		public DatePropertyDescriptor<T> NullValue(DateTime nullValue) => Assign(a => a.NullValue = nullValue);
 		public DatePropertyDescriptor<T> IncludeInAll(bool includeInAll = true) => Assign(a => a.IncludeInAll = includeInAll);
-		public DatePropertyDescriptor<T> PrecisionStep(int precisionStep) => Assign(a => a.PrecisionStep = precisionStep);
 		public DatePropertyDescriptor<T> IgnoreMalformed(bool ignoreMalformed = true) => Assign(a => a.IgnoreMalformed = ignoreMalformed);
 		public DatePropertyDescriptor<T> Format(string format) => Assign(a => a.Format = format);
-		public DatePropertyDescriptor<T> NumericResolution(NumericResolutionUnit unit) => Assign(a => a.NumericResolution = unit);
 		public DatePropertyDescriptor<T> Fielddata(Func<NumericFielddataDescriptor, INumericFielddata> selector) =>
 			Assign(a => a.Fielddata = selector(new NumericFielddataDescriptor()));
 	}

src/Nest/Mapping/Types/Core/Date/NumericResolutionUnit.cs

@@ -18,7 +18,6 @@ public class KeywordAttribute : ElasticsearchDocValuesPropertyAttributeBase, IKe
 		IndexOptions? IKeywordProperty.IndexOptions { get; set; }
 		bool? IKeywordProperty.Norms { get; set; }
 		string IKeywordProperty.NullValue { get; set; }
-		string IKeywordProperty.SearchAnalyzer { get; set; }
 
 		public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
 		public bool EagerGlobalOrdinals { get { return Self.EagerGlobalOrdinals.GetValueOrDefault(); } set { Self.EagerGlobalOrdinals = value; } }
@@ -27,7 +26,6 @@ public class KeywordAttribute : ElasticsearchDocValuesPropertyAttributeBase, IKe
 		public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
 		public IndexOptions IndexOptions { get { return Self.IndexOptions.GetValueOrDefault(); } set { Self.IndexOptions = value; } }
 		public string NullValue { get { return Self.NullValue; } set { Self.NullValue = value; } }
-		public string SearchAnalyzer { get { return Self.SearchAnalyzer; } set { Self.SearchAnalyzer = value; } }
 		public bool Norms { get { return Self.Norms.GetValueOrDefault(true); } set { Self.Norms = value; } }
 
 		public KeywordAttribute() : base("keyword") { }