IRawClient does not generate any duplicates

Author: Mpdreamz

src/Nest.Tests.Unit/Search/Query/Singles/BoolQueryJson.cs

@@ -6,6 +6,22 @@ namespace Nest.Tests.Unit.Search.Query.Singles
 	[TestFixture]
 	public class BoolQueryJson
 	{
+
+		[Test]
+		public void EmptyBoolQuery()
+		{
+			var s = new SearchDescriptor<ElasticSearchProject>()
+				.From(0)
+				.Size(10)
+				.Query(qd => null);
+
+			var json = TestElasticClient.Serialize(s);
+			var expected = @"{ from: 0, size: 10 }";
+			Assert.True(json.JsonEquals(expected), json);
+		}
+
+
+
 		[Test]
 		public void BoolQuery()
 		{

src/Nest/DSL/SearchDescriptor.cs

@@ -879,6 +879,8 @@ public SearchDescriptor<T> Query(Func<QueryDescriptor<T>, BaseQuery> query)
 			var q = new QueryDescriptor<T>().Strict(this._Strict);
 
 			var bq = query(q);
+			if (bq == null)
+				return this;
 			if (this._Strict && bq.IsConditionless)
 				throw new DslException("Query resulted in a conditionless query:\n{0}".F(JsonConvert.SerializeObject(bq, Formatting.Indented)));
 
@@ -893,7 +895,7 @@ public SearchDescriptor<T> Query(Func<QueryDescriptor<T>, BaseQuery> query)
 		public SearchDescriptor<T> Query(BaseQuery query)
 		{
 			query.ThrowIfNull("query");
-			if (query.IsConditionless)
+			if (query == null || query.IsConditionless)
 				return this;
 			this._Query = query;
 			return this;
@@ -933,6 +935,8 @@ public SearchDescriptor<T> Filter(Func<FilterDescriptor<T>, BaseFilter> filter)
 			var f = new FilterDescriptor<T>().Strict(this._Strict);
 
 			var bf = filter(f);
+			if (bf == null)
+				return this;
 			if (this._Strict && bf.IsConditionless)
 				throw new DslException("Filter resulted in a conditionless filter:\n{0}".F(JsonConvert.SerializeObject(bf, Formatting.Indented)));