Merge pull request #541 from azubanov/NEST_patch_FunctionScoreQueryDescriptor

FunctionScoreQueryDescriptor boost_mode support

Author: Mpdreamz

src/Nest/DSL/Query/FunctionScoreQueryDescriptor.cs

@@ -25,6 +25,10 @@ public class FunctionScoreQueryDescriptor<T> : IQuery where T : class
         [JsonConverter(typeof(StringEnumConverter))]
         FunctionScoreMode? _ScoreMode { get; set; }
 
+        [JsonProperty(PropertyName = "boost_mode")]
+        [JsonConverter(typeof(StringEnumConverter))]
+        FunctionBoostMode? _BoostMode { get; set; }
+
         [JsonProperty(PropertyName = "random_score")]
         RandomScoreFunction _RandomScore { get; set; }
 
@@ -69,6 +73,12 @@ public FunctionScoreQueryDescriptor<T> ScoreMode(FunctionScoreMode mode)
             return this;
         }
 
+        public FunctionScoreQueryDescriptor<T> BoostMode(FunctionBoostMode mode)
+        {
+            this._BoostMode = mode;
+            return this;
+        }
+
         public FunctionScoreQueryDescriptor<T> RandomScore(int? seed=null)
         {
             this._RandomScore = new RandomScoreFunction();
@@ -101,6 +111,16 @@ public enum FunctionScoreMode
         min
     }
 
+    public enum FunctionBoostMode
+    {
+        multiply,
+        replace,
+        sum,
+        avg,
+        max,
+        min
+    }
+
     public class FunctionScoreFunctionsDescriptor<T> : IEnumerable<FunctionScoreFunction<T>> where T : class
     {
         internal List<FunctionScoreFunction<T>> _Functions { get; set; }

src/Tests/Nest.Tests.Unit/Search/Query/Singles/FunctionScoreQueryJson.cs

@@ -21,6 +21,7 @@ public void FunctionScoreQuery()
 							f => f.BoostFactor(2)
 						)
 						.ScoreMode(FunctionScoreMode.sum)
+                        .BoostMode(FunctionBoostMode.replace)
 					)
 				).Fields(x => x.Content);
 
@@ -36,7 +37,8 @@ public void FunctionScoreQuery()
                             {boost_factor: 2.0 }
                         ],				
 						query : { match_all : {} },
-                        score_mode: 'sum'
+                        score_mode: 'sum',
+                        boost_mode: 'replace',
 					}
 				},
                 fields: [""content""]