Merge pull request #1298 from danielsilva/develop

Prevent conditionless query of being serialized as empty json object whe...

Author: gmarz

src/Nest/DSL/Query/DismaxQueryDescriptor.cs

@@ -2,12 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using Nest.Resolvers.Converters.Queries;
 
 namespace Nest
 {
-	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof(ReadAsTypeConverter<DisMaxQueryDescriptor<object>>))]
+	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+	[JsonConverter(typeof(DismaxQueryJsonConverter))]
 	public interface IDisMaxQuery : IQuery
 	{
 		[JsonProperty(PropertyName = "tie_breaker")]