added exists and better fuzzy query constructs

Author: Mpdreamz

src/CodeGeneration/CodeGeneration.LowLevelClient/App.config

@@ -3,4 +3,4 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
-</configuration>
+<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" /></runtime></configuration>

src/CodeGeneration/Nest.Litterateur/App.config

@@ -5,4 +5,4 @@
     </startup>
 
 <runtime>
-</runtime></configuration>
+<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" /></runtime></configuration>

src/Nest/Nest.csproj

@@ -378,6 +378,7 @@
     <Compile Include="Analysis\Tokenizers\UaxEmailUrlTokenizer.cs" />
     <Compile Include="Analysis\Tokenizers\WhitespaceTokenizer.cs" />
     <Compile Include="CommonOptions\Failures\ShardsFailure.cs" />
+    <Compile Include="QueryDsl\TermLevel\Fuzzy\FuzzyQueries.cs" />
     <Compile Include="QueryDsl\VariableFieldNameQueryJsonConverter.cs" />
     <Compile Include="Search\CovariantSearch.cs" />
     <Compile Include="Search\MultiSearch\MultiSearchResponsJsonConverter.cs" />
@@ -936,7 +937,7 @@
     <Compile Include="QueryDsl\Span\SpanQuery.cs" />
     <Compile Include="QueryDsl\Span\Term\SpanTermQuery.cs" />
     <Compile Include="QueryDsl\Specialized\MoreLikeThis\MoreLikeThisQuery.cs" />
-    <Compile Include="QueryDsl\TermLevel\Fuzzy\FuzzyQuery.cs" />
+    <Compile Include="QueryDsl\TermLevel\Fuzzy\FuzzyQueryBase.cs" />
     <Compile Include="QueryDsl\Joining\HasChild\HasChildQuery.cs" />
     <Compile Include="QueryDsl\TermLevel\Range\RangeQuery.cs" />
     <Compile Include="QueryDsl\Compound\Dismax\DismaxQuery.cs" />
@@ -1102,7 +1103,6 @@
   <ItemGroup>
     <None Include="paket.references" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/Nest/QueryDsl/QueryContainerDescriptor.cs

@@ -117,6 +117,12 @@ public QueryContainer Terms<K>(Func<TermsQueryDescriptor<T, K>, ITermsQuery> sel
 		public QueryContainer Fuzzy(Func<FuzzyQueryDescriptor<T>, IFuzzyQuery> selector) =>
 			this._assignSelector(selector, (query, container) => container.Fuzzy = query);
 
+		public QueryContainer FuzzyNumeric(Func<FuzzyNumericQueryDescriptor<T>, IFuzzyQuery> selector) =>
+			this._assignSelector(selector, (query, container) => container.Fuzzy = query);
+
+		public QueryContainer FuzzyDate(Func<FuzzyDateQueryDescriptor<T>, IFuzzyQuery> selector) =>
+			this._assignSelector(selector, (query, container) => container.Fuzzy = query);
+
 		/// <summary>
 		/// The default text query is of type boolean. It means that the text provided is analyzed and the analysis 
 		/// process constructs a boolean query from the provided text.
@@ -595,5 +601,8 @@ public QueryContainer Template(Func<TemplateQueryDescriptor<T>, ITemplateQuery>
 		public QueryContainer Script(Func<ScriptQueryDescriptor<T>, IScriptQuery> selector) =>
 			this._assignSelector(selector, (query, container) => container.Script = query);
 
+		public QueryContainer Exists(Func<ExistsQueryDescriptor<T>, IExistsQuery> selector) =>
+			this._assignSelector(selector, (query, container) => container.Exists = query);
+
 	}
 }

src/Nest/QueryDsl/TermLevel/Exists/ExistsQuery.cs

@@ -6,24 +6,33 @@
 
 namespace Nest
 {
-	[JsonConverter(typeof(ReadAsTypeJsonConverter<ExistsQuery>))]
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	public interface IExistsQuery : IFieldNameQuery
+	[JsonConverter(typeof(ReadAsTypeJsonConverter<ExistsQuery>))]
+	public interface IExistsQuery : IQuery
 	{
+		[JsonProperty("field")]
+		Field Field { get; set; }
 	}
 
-	public class ExistsQuery : FieldNameQueryBase, IExistsQuery
+	public class ExistsQuery : QueryBase, IExistsQuery
 	{
+		public Field Field { get; set; }
 		bool IQuery.Conditionless => IsConditionless(this);
 
 		protected override void WrapInContainer(IQueryContainer c) => c.Exists = this;
 		internal static bool IsConditionless(IExistsQuery q) => q.Field.IsConditionless();
 	}
 
 	public class ExistsQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<ExistsQueryDescriptor<T>, IExistsQuery, T>
+		: QueryDescriptorBase<ExistsQueryDescriptor<T>, IExistsQuery>
 		, IExistsQuery where T : class
 	{
 		bool IQuery.Conditionless => ExistsQuery.IsConditionless(this);
+
+		Field IExistsQuery.Field { get; set; }
+
+		public ExistsQueryDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
+		public ExistsQueryDescriptor<T> Field(Expression<Func<T, object>> objectPath) => Assign(a => a.Field = objectPath);
+
 	}
 }

src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueries.cs

@@ -0,0 +1,46 @@
+using System;
+using Newtonsoft.Json;
+using System.Linq.Expressions;
+using System.Globalization;
+
+namespace Nest
+{
+	public class FuzzyQuery : FuzzyQueryBase<string, Fuzziness>  
+	{
+	}
+
+	public class FuzzyQueryDescriptor<T> 
+		: FuzzyQueryDescriptorBase<FuzzyQueryDescriptor<T>, T, string, Fuzziness>
+		, IFuzzyQuery where T : class
+	{
+		public FuzzyQueryDescriptor<T> Fuzziness(Fuzziness fuzziness) => Assign(a => this._Fuzziness = fuzziness);
+
+		public FuzzyQueryDescriptor<T> Value(string value) => Assign(a => this._Value = value);
+	}
+
+	public class FuzzyNumericQuery : FuzzyQueryBase<double?, double?>  
+	{
+	}
+
+	public class FuzzyNumericQueryDescriptor<T> 
+		: FuzzyQueryDescriptorBase<FuzzyNumericQueryDescriptor<T>, T, double?, double?>
+		, IFuzzyQuery where T : class
+	{
+		public FuzzyNumericQueryDescriptor<T> Fuzziness(double? fuzziness) => Assign(a => this._Fuzziness = fuzziness);
+
+		public FuzzyNumericQueryDescriptor<T> Value(double? value) => Assign(a => this._Value = value);
+	}
+
+	public class FuzzyDateQuery : FuzzyQueryBase<DateTime?, TimeUnitExpression>  
+	{
+	}
+
+	public class FuzzyDateQueryDescriptor<T> 
+		: FuzzyQueryDescriptorBase<FuzzyDateQueryDescriptor<T>, T, DateTime?, TimeUnitExpression>
+		, IFuzzyQuery where T : class
+	{
+		public FuzzyDateQueryDescriptor<T> Fuzziness(TimeUnitExpression fuzziness) => Assign(a => this._Fuzziness = fuzziness);
+
+		public FuzzyDateQueryDescriptor<T> Value(DateTime? value) => Assign(a => this._Value = value);
+	}
+}

src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQuery.cs

@@ -0,0 +1,72 @@
+using System;
+using Newtonsoft.Json;
+using System.Linq.Expressions;
+using System.Globalization;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+	[JsonConverter(typeof(FuzzyQueryJsonConverter))]
+	public interface IFuzzyQuery : IFieldNameQuery
+	{
+		[JsonProperty(PropertyName = "prefix_length")]
+		int? PrefixLength { get; set; }
+		
+		[JsonProperty(PropertyName = "rewrite")]
+		RewriteMultiTerm? Rewrite { get; set; }
+
+		[JsonProperty(PropertyName = "max_expansions")]
+		int? MaxExpansions { get; set; }
+
+		[JsonProperty(PropertyName = "transpositions")]
+		bool? Transpositions { get; set; }
+	}
+	public abstract class FuzzyQueryBase<TValue, TFuzziness> : FieldNameQueryBase, IFuzzyQuery
+	{
+		[JsonProperty(PropertyName = "prefix_length")]
+		public int? PrefixLength { get; set; }
+		
+		[JsonProperty(PropertyName = "value")]
+		public TValue Value { get; set; }
+
+		[JsonProperty(PropertyName = "fuzziness")]
+		public TFuzziness Fuzziness { get; set; }
+
+		[JsonProperty(PropertyName = "rewrite")]
+		public RewriteMultiTerm? Rewrite { get; set; }
+
+		[JsonProperty(PropertyName = "max_expansions")]
+		public int? MaxExpansions { get; set; }
+
+		[JsonProperty(PropertyName = "transpositions")]
+		public bool? Transpositions { get; set; }
+
+		protected override void WrapInContainer(IQueryContainer c) => c.Fuzzy = this;
+	}
+
+	public class FuzzyQueryDescriptorBase<TDescriptor, T, TValue, TFuzziness> 
+		: FieldNameQueryDescriptorBase<TDescriptor, IFuzzyQuery, T> , IFuzzyQuery 
+		where T : class
+		where TDescriptor : FieldNameQueryDescriptorBase<TDescriptor, IFuzzyQuery, T>, IFuzzyQuery
+	{
+		int? IFuzzyQuery.PrefixLength { get; set; }
+		int? IFuzzyQuery.MaxExpansions { get; set; }
+		bool? IFuzzyQuery.Transpositions { get; set; }
+		RewriteMultiTerm? IFuzzyQuery.Rewrite { get; set; }
+
+		[JsonProperty(PropertyName = "fuzziness")]
+		internal TFuzziness _Fuzziness { get; set; }
+
+		[JsonProperty(PropertyName = "value")]
+		internal TValue _Value { get; set; }
+
+		public TDescriptor MaxExpansions(int? maxExpansions) => Assign(a => a.MaxExpansions = maxExpansions);
+
+		public TDescriptor PrefixLength(int? prefixLength) => Assign(a => a.PrefixLength = prefixLength);
+
+		public TDescriptor Transpositions(bool? enable = true) => Assign(a => a.Transpositions = enable);
+
+		public TDescriptor Rewrite(RewriteMultiTerm? rewrite) => Assign(a => a.Rewrite = rewrite);
+
+	}
+}