post merge touchups of the function_score PR #387

Author: Mpdreamz

Diff for: src/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -112,7 +112,6 @@
     <Compile Include="Search\Filter\BoolFilterMerges\BoolFilterMergesTests.cs" />
     <Compile Include="Search\Filter\Singles\HasParentFilterJson.cs" />
     <Compile Include="Search\Query\Singles\RegexpQueryJson.cs" />
-    <Compile Include="Search\Query\Singles\FunctionScoreQueryJson.cs" />
     <Compile Include="Search\Query\Singles\HasParentQueryJson.cs" />
     <Compile Include="Search\Query\Singles\MultiMatch\MultiMatchJson.cs" />
     <Compile Include="Search\Query\Singles\Term\TermToStringJson.cs" />
@@ -367,6 +366,12 @@
     <None Include="Search\Filter\BoolFilterMerges\ShouldNotJoinTermIntoMustStrictFilter.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Search\Filter\FilterCalls\CacheSettingsDoNotSurviceBoolOp.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Search\Filter\FilterCalls\CacheSettingsDoNotSurviceBoolOpNew.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Search\Query\BoolQueryMerges\ShouldNotJoinMustNotIntoMustStrictQueryInverse.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

Diff for: src/Nest/DSL/Query/FunctionScoreQueryDescriptor.cs

@@ -8,7 +8,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace Nest.DSL.Query
+namespace Nest
 {
     [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
     public class FunctionScoreQueryDescriptor<T> : IQuery where T : class

Diff for: src/Nest/DSL/QueryDescriptor.cs

@@ -99,6 +99,9 @@ public QueryDescriptor()
 		[JsonProperty(PropertyName = "indices")]
 		internal IndicesQueryDescriptor<T> IndicesQueryDescriptor { get; set; }
 
+		[JsonProperty(PropertyName = "function_score")]
+		internal FunctionScoreQueryDescriptor<T> FunctionScoreQueryDescriptor { get; set; }
+
 		public QueryDescriptor<T> Strict(bool strict = true)
 		{
 			return new QueryDescriptor<T> { IsStrict = strict };