Merge pull request #1112 from vovikdrg/develop

Missing and Replaced  properties

Author: Mpdreamz

src/Nest/DSL/Search/SortFieldDescriptor.cs

@@ -125,12 +125,16 @@ public interface IFieldSort : ISort
 
 		[JsonProperty("ignore_unmapped")]
 		bool? IgnoreUnmappedFields { get; set; }
+
+        [JsonProperty("unmapped_type")]
+        FieldType? UnmappedType { get; set; }
 	}
 
 	public class Sort : SortBase, IFieldSort
 	{
 		public PropertyPathMarker Field { get; set; }
 		public bool? IgnoreUnmappedFields { get; set; }
+	    public FieldType? UnmappedType { get; set; }
 	}
 
 	public class SortFieldDescriptor<T> : SortDescriptorBase<T, SortFieldDescriptor<T>>, IFieldSort where T : class
@@ -140,8 +144,9 @@ public class SortFieldDescriptor<T> : SortDescriptorBase<T, SortFieldDescriptor<
 		PropertyPathMarker IFieldSort.Field { get; set; }
 
 		bool? IFieldSort.IgnoreUnmappedFields { get; set; }
+        FieldType? IFieldSort.UnmappedType { get; set; }
 
-		public virtual SortFieldDescriptor<T> OnField(string field)
+	    public virtual SortFieldDescriptor<T> OnField(string field)
 		{
 			Self.Field = field;
 			return this;
@@ -170,7 +175,13 @@ public virtual SortFieldDescriptor<T> MissingValue(string value)
 			Self.Missing = value;
 			return this;
 		}
+        public virtual SortFieldDescriptor<T> UnmappedType(FieldType type)
+        {
+            Self.UnmappedType = type;
+            return this;
+        }
 
+        [Obsolete("Deprecated in 1.4.0 use UnmappedType")]
 		public virtual SortFieldDescriptor<T> IgnoreUnmappedFields(bool ignore = true)
 		{
 			Self.IgnoreUnmappedFields = ignore;

src/Nest/Domain/Analysis/TokenFilter/ShingleTokenFilter.cs

@@ -43,5 +43,11 @@ public ShingleTokenFilter() : base("shingle")
 		/// </summary>
 		[JsonProperty("token_separator")]
 		public string TokenSeparator { get; set; }
+
+          /// <summary>
+        /// The string to use as a replacement for each position at which there is no actual token in the stream. For instance this string is used if the position increment is greater than one when a stop filter is used together with the shingle filter. Defaults to "_"
+        /// </summary>
+        [JsonProperty("filler_token")]
+        public string FillerToken { get; set; }
     }
 }

src/Tests/Nest.Tests.Unit/Search/Sorting/SortTests.cs

@@ -37,6 +37,30 @@ public void TestSort()
 			Assert.True(json.JsonEquals(expected), json);
 		}
 
+	    [Test]
+	    public void TestSortWithUnmappedType()
+	    {
+            var s = new SearchDescriptor<ElasticsearchProject>()
+                .From(0)
+                .Size(10)
+                .Sort(sort => sort
+                    .OnField(e => e.DoubleValue)
+                    .UnmappedType(FieldType.Long)
+                );
+            var expected = @"
+                {
+                  from: 0,
+                  size: 10,
+                  sort: [
+                    {
+                        doubleValue : { unmapped_type : ""long"" } 
+                    }
+                  ]
+                }";
+            var json = TestElasticClient.Serialize(s);
+            Assert.True(json.JsonEquals(expected), json);
+	    }
+
 		[Test]
 		public void TestSortOnSortField()
 		{