Fluent support for configuring similarity modules

src/Nest/DSL/CreateIndexDescriptor.cs

@@ -185,7 +185,14 @@ public CreateIndexDescriptor Analysis(Func<AnalysisDescriptor, AnalysisDescripto
 			this._IndexSettings.Analysis = analysis == null ? null : analysis._AnalysisSettings;
 			return this;
 		}
-
+
+		public CreateIndexDescriptor Similarity(Func<SimilarityDescriptor, SimilarityDescriptor> similaritySelector)
+		{
+			similaritySelector.ThrowIfNull("similaritySelector");
+			var similarity = similaritySelector(new SimilarityDescriptor(this._IndexSettings.Similarity));
+			this._IndexSettings.Similarity = similarity == null ? null : similarity._SimilaritySettings;
+			return this;
+		}
 
 		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<CreateIndexRequestParameters> pathInfo)
 		{

src/Nest/DSL/SimilarityDescriptor.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class SimilarityDescriptor
+	{
+		internal readonly SimilaritySettings _SimilaritySettings;
+
+		public SimilarityDescriptor()
+		{
+			this._SimilaritySettings = new SimilaritySettings();
+		}
+
+		public SimilarityDescriptor(SimilaritySettings settings)
+		{
+			this._SimilaritySettings = settings;
+		}
+
+		public SimilarityDescriptor CustomSimilarities(
+			Func<FluentDictionary<string, SimilarityBase>, FluentDictionary<string, SimilarityBase>> similaritySelector)
+		{
+			similaritySelector.ThrowIfNull("similaritySelector");
+			var similarities = new FluentDictionary<string, SimilarityBase>(this._SimilaritySettings.CustomSimilarities);
+			var newSimilarities = similaritySelector(similarities);
+			this._SimilaritySettings.CustomSimilarities = newSimilarities;
+			return this;
+		}
+
+		public SimilarityDescriptor Default(string defaultSimilarity)
+		{
+			this._SimilaritySettings.Default = defaultSimilarity;
+			return this;
+		}
+	}
+}

src/Nest/Domain/Settings/IndexSettings.cs

@@ -16,6 +16,7 @@ public class IndexSettings
 		public IndexSettings()
 		{
 			this.Analysis = new AnalysisSettings();
+			this.Similarity = new SimilaritySettings();
 			this.Mappings = new List<RootObjectMapping>();
 			this.Warmers = new Dictionary<string, WarmerMapping>();
 			this.Settings = new Dictionary<string, object>();
@@ -59,7 +60,7 @@ public int? NumberOfShards
 		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
 		public Dictionary<string, WarmerMapping> Warmers { get; internal set; }
 
-		public SimilaritySettings Similarity { get; set; }
+		public SimilaritySettings Similarity { get; internal set; }
 
 
 	}

src/Nest/Domain/Similarity/BM25Similarity.cs

@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class BM25Similarity : SimilarityBase
+	{
+		public BM25Similarity()
+		{
+			this.Type = "BM25";
+		}
+
+		[JsonProperty("k1")]
+		public double K1 { get; set; }
+
+		[JsonProperty("b")]
+		public double B { get; set; }
+
+		[JsonProperty("discount_overlaps")]
+		public bool DiscountOverlaps { get; set; }
+	}
+}

src/Nest/Domain/Similarity/DFRSimilarity.cs

@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class DFRSimilarity : SimilarityBase
+	{
+		public DFRSimilarity()
+		{
+			this.Type = "DFR";
+		}
+
+		[JsonProperty("basic_model")]
+		public string BasicModel { get; set; }
+
+		[JsonProperty("after_effect")]
+		public string AfterEffect { get; set; }
+	}
+}

src/Nest/Domain/Similarity/DefaultSimilarity.cs

@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class DefaultSimilarity : SimilarityBase
+	{
+		public DefaultSimilarity()
+		{
+			this.Type = "default";
+		}
+
+		[JsonProperty("discount_overlaps")]
+		public bool DiscountOverlaps { get; set; }
+	}
+}

src/Nest/Domain/Similarity/IBSimilarity.cs

@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class IBSimilarity : SimilarityBase
+	{
+		public IBSimilarity()
+		{
+			this.Type = "IB";
+		}
+
+		[JsonProperty("distribution")]
+		public string Distribution { get; set; }
+
+		[JsonProperty("lambda")]
+		public string Lambda { get; set; }
+	}
+}

src/Nest/Domain/Similarity/LMDirichletSimilarity.cs

@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class LMDirichletSimilarity : SimilarityBase
+	{
+		public LMDirichletSimilarity()
+		{
+			this.Type = "LMDirichlet";
+		}
+
+		[JsonProperty("mu")]
+		public int Mu { get; set; }
+	}
+}

src/Nest/Domain/Similarity/LMJelinekSimilarity.cs

@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class LMJelinekSimilarity : SimilarityBase
+	{
+		public LMJelinekSimilarity()
+		{
+			this.Type = "LMJelinekMercer";
+		}
+
+		[JsonProperty("lambda")]
+		public double Lambda { get; set; }
+	}
+}

src/Nest/Domain/Similarity/SimilarityBase.cs

@@ -0,0 +1,29 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class SimilarityBase
+	{
+		[JsonProperty("type")]
+		public string Type { get; protected set; }
+
+		[JsonProperty("normalization")]
+		public string Normalization { get; set; }
+
+		[JsonProperty("normalization.h1.c")]
+		public string NormalizationH1C { get; set; }
+
+		[JsonProperty("normalization.h2.c")]
+		public string NormalizationH2C { get; set; }
+
+		[JsonProperty("normalization.h3.c")]
+		public string NormalizationH3C { get; set; }
+
+		[JsonProperty("normalization.z.z")]
+		public string NormalizationZZ { get; set; }
+	}
+}

src/Nest/Domain/Similarity/SimilaritySettings.cs

@@ -0,0 +1,22 @@
+
+using Nest.Resolvers.Converters;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+namespace Nest
+{
+	[JsonConverter(typeof(SimilaritySettingsConverter))]
+	public class SimilaritySettings
+	{
+		public SimilaritySettings()
+		{
+			this.CustomSimilarities = new Dictionary<string, SimilarityBase>();
+		}
+
+		public string Default { get; set; }
+
+		[JsonConverter(typeof(SimilarityCollectionConverter))]
+		public IDictionary<string, SimilarityBase> CustomSimilarities { get; set; }
+	}
+}

src/Nest/Nest.csproj

@@ -152,6 +152,13 @@
     <Compile Include="Domain\Responses\RestoreResponse.cs" />
     <Compile Include="Domain\Responses\SnapshotResponse.cs" />
     <Compile Include="Domain\Aggregations\TermsIncludeExclude.cs" />
+    <Compile Include="Domain\Similarity\BM25Similarity.cs" />
+    <Compile Include="Domain\Similarity\DefaultSimilarity.cs" />
+    <Compile Include="Domain\Similarity\DFRSimilarity.cs" />
+    <Compile Include="Domain\Similarity\IBSimilarity.cs" />
+    <Compile Include="Domain\Similarity\LMDirichletSimilarity.cs" />
+    <Compile Include="Domain\Similarity\LMJelinekSimilarity.cs" />
+    <Compile Include="Domain\Similarity\SimilarityBase.cs" />
     <Compile Include="DSL\ClusterGetSettingsDescriptor.cs" />
     <Compile Include="DSL\ClusterSettingsDescriptor.cs" />
     <Compile Include="DSL\DeleteSnapshotDescriptor.cs" />
@@ -168,6 +175,7 @@
     <Compile Include="DSL\Query\PlainQuery.cs" />
     <Compile Include="DSL\Query\QueryContainer.cs" />
     <Compile Include="DSL\Rescore\RescoreQueryDescriptor.cs" />
+    <Compile Include="DSL\SimilarityDescriptor.cs" />
     <Compile Include="DSL\Suggest\Fuzziness.cs" />
     <Compile Include="DSL\Suggest\IFuzziness.cs" />
     <Compile Include="DSL\Visitor\DslPrettyPrintVisitor.cs" />
@@ -405,7 +413,6 @@
     <Compile Include="Domain\Responses\WarmerResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Domain\Settings\CustomSimilaritySettings.cs" />
     <Compile Include="DSL\Rescore\RescoreDescriptor.cs" />
     <Compile Include="DSL\Termplates\CreateWarmerDescriptor.cs" />
     <Compile Include="DSL\PutWarmerDescriptor.cs" />
@@ -422,7 +429,7 @@
     <Compile Include="Domain\Responses\BulkOperationResponseItem.cs" />
     <Compile Include="Domain\Responses\MultiSearchResponse.cs" />
     <Compile Include="Domain\Responses\IBulkResponse.cs" />
-    <Compile Include="Domain\Settings\SimilaritySettings.cs" />
+    <Compile Include="Domain\Similarity\SimilaritySettings.cs" />
     <Compile Include="ElasticClient-MultiSearch.cs" />
     <Compile Include="Domain\Mapping\Types\TemplateMapping.cs" />
     <Compile Include="Domain\Responses\TemplateResponse.cs" />
@@ -637,6 +644,7 @@
     <Compile Include="DSL\Filter\LimitFilterDescriptor.cs" />
     <Compile Include="DSL\Filter\IdsFilterDescriptor.cs" />
     <Compile Include="DSL\Filter\ExistsFilterDescriptor.cs" />
+    <Compile Include="Resolvers\Converters\SimilarityCollectionConverter.cs" />
     <Compile Include="Resolvers\Converters\FuzzinessConverter.cs" />
     <Compile Include="Resolvers\Converters\Filters\RangeFilterJsonReader.cs" />
     <Compile Include="Resolvers\Converters\Filters\RegexpFilterJsonReader.cs" />
@@ -745,6 +753,7 @@
     <Compile Include="Resolvers\Converters\FieldNameFilterConverter.cs" />
     <Compile Include="Resolvers\Converters\FieldNameQueryConverter.cs" />
     <Compile Include="Resolvers\Converters\IndexSettingsResponseConverter.cs" />
+    <Compile Include="Resolvers\Converters\SimilaritySettingsConverter.cs" />
     <Compile Include="Resolvers\Converters\SuggestResponseConverter.cs" />
     <Compile Include="Resolvers\Converters\PropertyPathMarkerConverter.cs" />
     <Compile Include="Resolvers\Converters\DynamicMappingOptionConverter.cs" />