Merge branch 'develop' of github.com:elastic/elasticsearch-net into develop

Author: Mpdreamz

src/Nest/DSL/Filter/HasChildFilterDescriptor.cs

@@ -13,6 +13,12 @@ public interface IHasChildFilter : IFilter
 		[JsonProperty("type")]
 		TypeNameMarker Type { get; set; }
 
+		[JsonProperty("min_children")]
+		int? MinChildren { get; set; }
+
+		[JsonProperty("max_children")]
+		int? MaxChildren { get; set; }
+
 		[JsonProperty("query")]
 		IQueryContainer Query { get; set; }
 
@@ -25,7 +31,7 @@ public interface IHasChildFilter : IFilter
 		IInnerHits InnerHits { get; set; }
 
 	}
-	
+
 	public class HasChildFilter : PlainFilter, IHasChildFilter
 	{
 		protected internal override void WrapInContainer(IFilterContainer container)
@@ -34,6 +40,8 @@ protected internal override void WrapInContainer(IFilterContainer container)
 		}
 
 		public TypeNameMarker Type { get; set; }
+		public int? MinChildren { get; set; }
+		public int? MaxChildren { get; set; }
 		public IQueryContainer Query { get; set; }
 		public IFilterContainer Filter { get; set; }
 		public IInnerHits InnerHits { get; set; }
@@ -57,6 +65,10 @@ bool IFilter.IsConditionless
 
 		TypeNameMarker IHasChildFilter.Type { get; set; }
 
+		int? IHasChildFilter.MinChildren { get; set; }
+
+		int? IHasChildFilter.MaxChildren { get; set; }
+
 		IQueryContainer IHasChildFilter.Query { get; set; }
 
 		IFilterContainer IHasChildFilter.Filter { get; set; }
@@ -88,6 +100,18 @@ public HasChildFilterDescriptor<T> Type(string type)
 			return this;
 		}
 
+		public HasChildFilterDescriptor<T> MinChildren(int minChildren)
+		{
+			Self.MinChildren = minChildren;
+			return this;
+		}
+
+		public HasChildFilterDescriptor<T> MaxChildren(int maxChildren)
+		{
+			Self.MaxChildren = maxChildren;
+			return this;
+		}
+
 		public HasChildFilterDescriptor<T> InnerHits()
 		{
 			Self.InnerHits = new InnerHits();

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

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using System;
 
 namespace Nest
 {
@@ -47,9 +48,12 @@ public WordDelimiterTokenFilter()
         [JsonProperty("protected_words_path ")]
         public string ProtectedWordsPath { get; set; }
 
-        [JsonProperty("type_table")]
+        [Obsolete("Please switch to TypeTableList property", true)]
         public string TypeTable { get; set; }
 
+        [JsonProperty("type_table")]
+        public List<string> TypeTableList { get; set; }
+
         [JsonProperty("type_table_path")]
         public string TypeTablePath { get; set; }
     }

src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -181,6 +181,7 @@
     <Compile Include="Reproduce\Reproduce1403Tests.cs" />
     <Compile Include="Reproduce\Reproduce1457Tests.cs" />
     <Compile Include="Reproduce\Reproduce1474Tests.cs" />
+    <Compile Include="Reproduce\Reproduce1515Tests.cs" />
     <Compile Include="Reproduce\Reproduce769Tests.cs" />
     <Compile Include="Reproduce\Reproduce945Tests.cs" />
     <Compile Include="Reproduce\Reproduce953Tests.cs" />

src/Tests/Nest.Tests.Integration/Reproduce/Reproduce1515Tests.cs

@@ -0,0 +1,37 @@
+using Elasticsearch.Net;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+
+namespace Nest.Tests.Integration.Reproduce
+{
+	[TestFixture]
+	public class Reproduce1515Tests : IntegrationTests
+	{
+		[Test]
+		public void Test()
+		{
+			var result = Client.Search<ElasticsearchProject>(s => s
+				.SearchType(SearchType.Count)
+				.Aggregations(ag => ag
+					.Terms("countries", st => st
+						.Field("country")
+						.Size(10)
+						.Aggregations(aa => aa
+							.Terms("names", t => t
+								.Field(f => f.Name)
+							)
+						)
+					)
+				)
+			);
+
+			result.IsValid.Should().BeTrue();
+		}
+	}
+}