Merge branch 'master' of https://github.com/danp60/elasticsearch-net into develop

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

Author: Mpdreamz

src/Elasticsearch.Net/IElasticsearchClient.Generated.cs

@@ -21227,6 +21227,5 @@ public partial interface IElasticsearchClient
 		///</returns>
 
 		Task<ElasticsearchResponse<DynamicDictionary>> UpdateAsync(string index, string type, string id, object body, Func<UpdateRequestParameters, UpdateRequestParameters> requestParameters = null);
-		
 	}
 }

src/Nest/DSL/Query/Functions/FieldValueFactorDescriptor.cs

@@ -37,6 +37,9 @@ public class FieldValueFactorDescriptor<T>
 		[JsonConverter(typeof(StringEnumConverter))]
 		internal FieldValueFactorModifier? _Modifier { get; set; }
 
+		[JsonProperty("missing")]
+		internal double? _Missing { get; set; }
+
 		public FieldValueFactorDescriptor<T> Field(Expression<Func<T, object>> field)
 		{
 			this._Field = field;
@@ -54,5 +57,11 @@ public FieldValueFactorDescriptor<T> Modifier(FieldValueFactorModifier modifier)
 			this._Modifier = modifier;
 			return this;
 		}
+
+		public FieldValueFactorDescriptor<T> Missing(double missing)
+		{
+			this._Missing = missing;
+			return this;
+		}
 	}
 }

src/Tests/Elasticsearch.Net.Tests.Unit/Elasticsearch.Net.Tests.Unit.csproj

@@ -47,8 +47,8 @@
     <Compile Include="Failover\Retries\ClientExceptionsUsingPoolingTests.cs" />
     <Compile Include="Failover\Retries\ClientExceptionsWithoutPoolingMaxRetriesTests.cs" />
     <Compile Include="Failover\Retries\ClientExceptionsWithoutPoolingTests.cs" />
-    <Compile Include="Failover\Timeout\DontRetryAfterMaxRetryTimeoutTests.cs" />
     <Compile Include="Failover\Timeout\DontRetryAfterDefaultTimeoutTests.cs" />
+    <Compile Include="Failover\Timeout\DontRetryAfterMaxRetryTimeoutTests.cs" />
     <Compile Include="Memory\Helpers\AsyncMemorySetup.cs" />
     <Compile Include="Memory\Helpers\IMemorySetup.cs" />
     <Compile Include="Memory\ResponseAsyncCodePathsMemoryTests.cs" />

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

@@ -20,7 +20,7 @@ public void FunctionScoreQuery()
 							f => f.Linear(x => x.FloatValue, d => d.Scale("0.3")),
 							f => f.Exp(x => x.DoubleValue, d => d.Scale("0.5")),
 							f => f.BoostFactor(2.0),
-							f => f.FieldValueFactor(op => op.Field(ff => ff.DoubleValue).Factor(2.5).Modifier(FieldValueFactorModifier.SquareRoot))
+							f => f.FieldValueFactor(op => op.Field(ff => ff.DoubleValue).Factor(2.5).Modifier(FieldValueFactorModifier.SquareRoot).Missing(1.0))
 						)
 						.ScoreMode(FunctionScoreMode.Sum)
 						.BoostMode(FunctionBoostMode.Replace)
@@ -40,7 +40,7 @@ public void FunctionScoreQuery()
                             {linear: { floatValue : { scale: '0.3'}}},
                             {exp:    { doubleValue: { scale: '0.5'}}}, 
                             {boost_factor: 2.0 },
-							{field_value_factor: { field: 'doubleValue', factor: 2.5, modifier: 'sqrt'}}
+							{field_value_factor: { field: 'doubleValue', factor: 2.5, modifier: 'sqrt', missing: 1.0}}
                         ],				
 						query : { match_all : {} },
                         score_mode: 'sum',
@@ -87,7 +87,7 @@ public void FunctionScoreQueryConditionless()
 							f => f.Linear(x => x.FloatValue, d => d.Scale("0.3")),
 							f => f.Exp(x => x.DoubleValue, d => d.Scale("0.5")),
 							f => f.BoostFactor(2),
-							f => f.FieldValueFactor(db => db.Field(fa => fa.DoubleValue).Factor(3.4).Modifier(FieldValueFactorModifier.Ln))
+							f => f.FieldValueFactor(db => db.Field(fa => fa.DoubleValue).Factor(3.4).Modifier(FieldValueFactorModifier.Ln).Missing(1.4))
 						)
 						.ScoreMode(FunctionScoreMode.Sum)
 						.BoostMode(FunctionBoostMode.Replace)
@@ -105,7 +105,7 @@ public void FunctionScoreQueryConditionless()
                             {linear: { floatValue : { scale: '0.3'}}},
                             {exp:    { doubleValue: { scale: '0.5'}}}, 
                             {boost_factor: 2.0 },
-							{field_value_factor: { field: 'doubleValue', factor: 3.4, modifier: 'ln'}}
+							{field_value_factor: { field: 'doubleValue', factor: 3.4, modifier: 'ln', missing: 1.4}}
                         ],				
                         score_mode: 'sum',
                         boost_mode: 'replace',