Merge pull request #964 from edwinf/add-string-double-fd-multimatch

Add string/double Fluent Dictionary Option to MultiMatchQuery

Author: gmarz

src/Nest/DSL/Query/MultiMatchQueryDescriptor.cs

@@ -140,6 +140,13 @@ public MultiMatchQueryDescriptor<T> OnFieldsWithBoost(Action<FluentDictionary<Ex
 			((IMultiMatchQuery)this).Fields = d.Select(o => PropertyPathMarker.Create(o.Key, o.Value));
 			return this;
 		}
+		public MultiMatchQueryDescriptor<T> OnFieldsWithBoost(Action<FluentDictionary<string, double?>> boostableSelector)
+		{
+			var d = new FluentDictionary<string, double?>();
+			boostableSelector(d);
+			((IMultiMatchQuery)this).Fields = d.Select(o => PropertyPathMarker.Create(o.Key, o.Value));
+			return this;
+		}
 
 		public MultiMatchQueryDescriptor<T> Query(string query)
 		{

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -886,6 +886,9 @@
     <None Include="Search\Query\Singles\GeoShape\GeoShapePolygon.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Search\Query\Singles\MultiMatch\TestMultiMatchOnFieldsWithBoost.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Search\Query\Singles\MultiMatch\TestMultiMatchJson.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/Tests/Nest.Tests.Unit/Search/Query/Singles/MultiMatch/MultiMatchJson.cs

@@ -26,5 +26,20 @@ public void TestMultiMatchJson()
 				);
 			this.JsonEquals(s, MethodInfo.GetCurrentMethod());
 		}
+
+		[Test]
+		public void TestMultiMatchOnFieldsWithBoost()
+		{
+			var s = new SearchDescriptor<ElasticsearchProject>()
+				.From(0)
+				.Size(10)
+				.Query(q => q
+					.MultiMatch(m => m
+						.OnFieldsWithBoost(f=>f.Add("field1", 1.2).Add("field2",.9))
+						.Query("this is a query")
+					)
+				);
+			this.JsonEquals(s, MethodInfo.GetCurrentMethod());
+		}
 	}
 }

src/Tests/Nest.Tests.Unit/Search/Query/Singles/MultiMatch/TestMultiMatchOnFieldsWithBoost.json

@@ -0,0 +1,13 @@
+  {
+  "from": 0,
+  "size": 10,
+  "query": {
+    "multi_match": {
+      "query": "this is a query",
+      "fields": [
+        "field1^1.2",
+        "field2^0.9"
+      ]
+    }
+  }
+}