Fix #1514: HasParentFilter missing Filter

Author: gmarz

Diff for: src/Nest/DSL/Filter/HasParentFilterDescriptor.cs

@@ -17,6 +17,10 @@ public interface IHasParentFilter : IFilter
 		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
 
+		[JsonProperty("filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterDescriptor<object>>, CustomJsonConverter>))]
+		IFilterContainer Filter { get; set; }
+
 		[JsonProperty("inner_hits")]
 		[JsonConverter(typeof(ReadAsTypeConverter<InnerHits>))]
 		IInnerHits InnerHits { get; set; }
@@ -32,6 +36,7 @@ protected internal override void WrapInContainer(IFilterContainer container)
 
 		public TypeNameMarker Type { get; set; }
 		public IQueryContainer Query { get; set; }
+		public IFilterContainer Filter { get; set; }
 		public IInnerHits InnerHits { get; set; }
 	}
 
@@ -43,15 +48,17 @@ public class HasParentFilterDescriptor<T> : FilterBase, IHasParentFilter where T
 
 		IQueryContainer IHasParentFilter.Query { get; set; }
 
+		IFilterContainer IHasParentFilter.Filter { get; set; }
+
 		IInnerHits IHasParentFilter.InnerHits { get; set; }
 
 		bool IFilter.IsConditionless
 		{
 			get
 			{
-				return Self.Query == null 
-					|| Self.Query.IsConditionless 
-					|| Self.Type.IsNullOrEmpty();
+				return Self.Type.IsNullOrEmpty()
+					|| ((Self.Query == null || Self.Query.IsConditionless)
+					&& (Self.Filter == null || Self.Filter.IsConditionless));
 			}
 		}
 
@@ -67,6 +74,13 @@ public HasParentFilterDescriptor<T> Query(Func<QueryDescriptor<T>, QueryContaine
 			return this;
 		}
 
+		public HasParentFilterDescriptor<T> Filter(Func<FilterDescriptor<T>, FilterContainer> filterSelector)
+		{
+			var f = new FilterDescriptor<T>();
+			Self.Filter = filterSelector(f);
+			return this;
+		}
+
 		public HasParentFilterDescriptor<T> Type(string type)
 		{
 			Self.Type = type;

Diff for: src/Tests/Nest.Tests.Unit/QueryParsers/Filter/HasParentFilterTests.cs

@@ -9,7 +9,7 @@ public class HasParentFilterTests : ParseFilterTestsBase
 	{
 		[Test]
 		[TestCase("cacheName", "cacheKey", true)]
-		public void HasParent_Deserializes(string cacheName, string cacheKey, bool cache)
+		public void HasParent_Query_Deserializes(string cacheName, string cacheKey, bool cache)
 		{
 			var hasParentFilter = this.SerializeThenDeserialize(cacheName, cacheKey, cache, 
 				f=>f.HasParent,
@@ -24,6 +24,23 @@ public void HasParent_Deserializes(string cacheName, string cacheKey, bool cache
 			query.Should().NotBeNull();
 			query.Term.Field.Should().Be("country");
 		}
-		
+
+		[Test]
+		[TestCase("cacheName", "cacheKey", true)]
+		public void HasParent_Filter_Deserializes(string cacheName, string cacheKey, bool cache)
+		{
+			var hasParentFilter = this.SerializeThenDeserialize(cacheName, cacheKey, cache, 
+				f=>f.HasParent,
+				f=>f.HasParent<ElasticsearchProject>(d=>d
+					.InnerHits()
+					.Filter(pf=>pf.Term(p=>p.Country,"value"))
+				)
+			);
+			hasParentFilter.InnerHits.Should().NotBeNull();
+
+			var filter = hasParentFilter.Filter;
+			filter.Should().NotBeNull();
+			filter.Term.Field.Should().Be("country");
+		}
 	}
 }