Merge branch 'fix/mappings'

Author: gmarz

build/scripts/Building.fsx

@@ -58,6 +58,7 @@ type Build() =
                 | "Nest" 
                 | "Elasticsearch.Net" ->
                     gitLink (Paths.Net45BinFolder projectName) projectName
+                    gitLink (Paths.Net46BinFolder projectName) projectName
                     gitLink (Paths.DotNet51BinFolder projectName) projectName
                 | _  -> ()
             CopyDir outputFolder binFolder allFiles

build/scripts/Paths.fsx

@@ -48,6 +48,10 @@ module Paths =
         let binFolder = BinFolder projectName
         sprintf "%s/net45" binFolder
 
+    let Net46BinFolder(projectName) =
+        let binFolder = BinFolder projectName
+        sprintf "%s/net46" binFolder
+
     let DotNet51BinFolder(projectName) =
         let binFolder = BinFolder(projectName)
         sprintf "%s/dotnet5.1" binFolder

src/Nest/Mapping/Types/Specialized/Attachment/AttachmentProperty.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -22,7 +22,7 @@ public class AttachmentProperty : PropertyBase, IAttachmentProperty
 	{
 		public AttachmentProperty() : base("attachment") { }
 
-		private IDictionary Dictionary => this.Fields;
+		private IDictionary<PropertyName, IProperty> Dictionary => this.Fields ?? (this.Fields = new Properties());
 
 		public IStringProperty AuthorField
 		{
@@ -50,8 +50,8 @@ public IDateProperty DateField
 
 		public IStringProperty FileField
 		{
-			get { return Dictionary["file"] as IStringProperty; }
-			set { Dictionary["file"] = value; }
+			get { return Dictionary["content"] as IStringProperty; }
+			set { Dictionary["content"] = value; }
 		}
 
 		public IStringProperty KeywordsField
@@ -93,7 +93,7 @@ public class AttachmentPropertyDescriptor<T>
 		INumberProperty IAttachmentProperty.ContentLengthField { get; set; }
 		IStringProperty IAttachmentProperty.LanguageField { get; set; }
 
-		private IDictionary Dictionary => Self.Fields;
+		private IDictionary<PropertyName, IProperty> Dictionary => Self.Fields ?? (Self.Fields = new Properties());
 
 		public AttachmentPropertyDescriptor() : base("attachment") { }
 
@@ -117,7 +117,7 @@ public AttachmentPropertyDescriptor<T> NameField(Func<StringPropertyDescriptor<T
 			SetMetadataField(selector, "name");
 
 		public AttachmentPropertyDescriptor<T> FileField(Func<StringPropertyDescriptor<T>, IStringProperty> selector) =>
-			SetMetadataField(selector, "file");
+			SetMetadataField(selector, "content");
 
 		public AttachmentPropertyDescriptor<T> AuthorField(Func<StringPropertyDescriptor<T>, IStringProperty> selector) =>
 			SetMetadataField(selector, "author");
@@ -128,10 +128,18 @@ public AttachmentPropertyDescriptor<T> KeywordsField(Func<StringPropertyDescript
 		public AttachmentPropertyDescriptor<T> ContentTypeField(Func<StringPropertyDescriptor<T>, IStringProperty> selector) =>
 			SetMetadataField(selector, "content_type");
 
+		[Obsolete("Use ContentLengthField(Func<NumberPropertyDescriptor<T>, INumberProperty> selector)")]
 		public AttachmentPropertyDescriptor<T> ContentLengthField(Func<StringPropertyDescriptor<T>, IStringProperty> selector) =>
 			SetMetadataField(selector, "content_length");
 
+		public AttachmentPropertyDescriptor<T> ContentLengthField(Func<NumberPropertyDescriptor<T>, INumberProperty> selector) =>
+			SetMetadataField(selector, "content_length");
+
+		[Obsolete("Use LanguageField(Func<StringPropertyDescriptor<T>, IStringProperty> selector)")]
 		public AttachmentPropertyDescriptor<T> LanguageField(Func<NumberPropertyDescriptor<T>, INumberProperty> selector) =>
 			SetMetadataField(selector, "language");
+
+		public AttachmentPropertyDescriptor<T> LanguageField(Func<StringPropertyDescriptor<T>, IStringProperty> selector) =>
+			SetMetadataField(selector, "language");
 	}
 }

src/Nest/Mapping/Visitor/IMappingVisitor.cs

@@ -1,10 +1,13 @@
-namespace Nest
+using System;
+
+namespace Nest
 {
 	public interface IMappingVisitor
 	{
 		int Depth { get; set; }
 		void Visit(TypeMapping mapping);
 		void Visit(StringProperty mapping);
+		[Obsolete("Use Visit(NumberProperty mapping) for number mappings")]
 		void Visit(NumberType mapping);
 		void Visit(DateProperty mapping);
 		void Visit(BooleanProperty mapping);
@@ -16,5 +19,78 @@ public interface IMappingVisitor
 		void Visit(GeoShapeProperty mapping);
 		void Visit(AttachmentProperty mapping);
 		void Visit(NumberProperty mapping);
+		void Visit(CompletionProperty mapping);
+		void Visit(Murmur3HashProperty mapping);
+		void Visit(TokenCountProperty mapping);
+	}
+
+	public class NoopMappingVisitor : IMappingVisitor
+	{
+		public virtual int Depth { get; set; }
+
+		public virtual void Visit(TypeMapping mapping)
+		{
+		}
+
+		public virtual void Visit(StringProperty mapping)
+		{
+		}
+
+		[Obsolete("Use Visit(NumberProperty mapping) for number mappings")]
+		public virtual void Visit(NumberType mapping)
+		{
+		}
+
+		public virtual void Visit(DateProperty mapping)
+		{
+		}
+
+		public virtual void Visit(BooleanProperty mapping)
+		{
+		}
+
+		public virtual void Visit(BinaryProperty mapping)
+		{
+		}
+
+		public virtual void Visit(ObjectProperty mapping)
+		{
+		}
+
+		public virtual void Visit(NestedProperty mapping)
+		{
+		}
+
+		public virtual void Visit(IpProperty mapping)
+		{
+		}
+
+		public virtual void Visit(GeoPointProperty mapping)
+		{
+		}
+
+		public virtual void Visit(GeoShapeProperty mapping)
+		{
+		}
+
+		public virtual void Visit(AttachmentProperty mapping)
+		{
+		}
+
+		public virtual void Visit(NumberProperty mapping)
+		{
+		}
+
+		public virtual void Visit(CompletionProperty mapping)
+		{
+		}
+
+		public virtual void Visit(Murmur3HashProperty mapping)
+		{
+		}
+
+		public virtual void Visit(TokenCountProperty mapping)
+		{
+		}
 	}
 }

src/Nest/Mapping/Visitor/MappingWalker.cs

@@ -90,24 +90,45 @@ public void Accept(IProperties properties)
 						var i = field as IpProperty;
 						if (i == null) continue;
 						this._visitor.Visit(i);
+						this.Accept(i.Fields);
 						break;
 					case "geo_point":
 						var gp = field as GeoPointProperty;
 						if (gp == null) continue;
 						this._visitor.Visit(gp);
+						this.Accept(gp.Fields);
 						break;
 					case "geo_shape":
 						var gs = field as GeoShapeProperty;
 						if (gs == null) continue;
 						this._visitor.Visit(gs);
+						this.Accept(gs.Fields);
 						break;
 					case "attachment":
 						var a = field as AttachmentProperty;
 						if (a == null) continue;
 						this._visitor.Visit(a);
+						this.Accept(a.Fields);
+						break;
+					case "completion":
+						var c = field as CompletionProperty;
+						if (c == null) continue;
+						this._visitor.Visit(c);
+						this.Accept(c.Fields);
+						break;
+					case "murmur3":
+						var mm = field as Murmur3HashProperty;
+						if (mm == null) continue;
+						this._visitor.Visit(mm);
+						this.Accept(mm.Fields);
+						break;
+					case "token_count":
+						var tc = field as TokenCountProperty;
+						if (tc == null) continue;
+						this._visitor.Visit(tc);
+						this.Accept(tc.Fields);
 						break;
 				}
-
 			}
 		}
 	}

src/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs

@@ -13,9 +13,9 @@ namespace Tests.Aggregations.Bucket.DateHistogram
 	 * From a functionality perspective, this histogram supports the same features as the normal histogram. 
 	 * The main difference is that the interval can be specified by date/time expressions.
 	 *
-	 * When specifying a format and extended_bounds, in order for Elasticsearch to be able to parse
-	 * the serialized DateTimes of extended_bounds correctly, the date_optional_time format is included
-	 * as part of the format value.
+	 * When both format and extended_bounds are specified, the `date_optional_time` format is included
+	 * as part of the format value so that Elasticsearch to be able to parse
+	 * the serialized DateTimes of extended_bounds correctly.
 	 *
 	 * Be sure to read the elasticsearch documentation {ref}/search-aggregations-bucket-datehistogram-aggregation.html[on this subject here]
 	*/

src/Tests/Aggregations/Bucket/Filters/FiltersAggregationUsageTests.cs

@@ -9,15 +9,14 @@
 
 namespace Tests.Aggregations.Bucket.Filters
 {
-	/**
+	/** == Named filters
+	 *
 	 * Defines a multi bucket aggregations where each bucket is associated with a filter. 
 	 * Each bucket will collect all documents that match its associated filter. For documents
 	 * that do not match any filter, these will be collected in the other bucket.
 	 *
 	 * Be sure to read the elasticsearch documentation {ref}/search-aggregations-bucket-filters-aggregation.html[on this subject here]
 	*/
-
-	/** == Named filters **/
 	public class FiltersAggregationUsageTests : AggregationUsageTestBase
 	{
 		public FiltersAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
@@ -111,7 +110,6 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 	}
 
 	/** == Anonymous filters **/
-
 	public class AnonymousUsage : AggregationUsageTestBase
 	{
 		public AnonymousUsage(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }

src/Tests/ClientConcepts/LowLevel/PostData.doc.cs

@@ -13,7 +13,7 @@ namespace Tests.ClientConcepts.LowLevel
 {
 	public class PostingData
 	{
-		/** # Post data
+		/** ## Post data
 		 * The low level allows you to post a string, byte[] array directly. On top of this if you pass a list of strings or objects
 		 * they will be serialized in Elasticsearch's special bulk/multi format.
 		 */