Move FieldValueFactor out of FunctionScoreFunctionsDescriptor to its own file

Author: gmarz

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

@@ -0,0 +1,58 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+	public class FieldValueFactor<T> : FunctionScoreFunction<T> where T : class
+	{
+		[JsonProperty(PropertyName = "field_value_factor")]
+		internal FieldValueFactorDescriptor<T> _FieldValueFactor { get; set; }
+
+		public FieldValueFactor(Action<FieldValueFactorDescriptor<T>> descriptorBuilder)
+		{
+			var descriptor = new FieldValueFactorDescriptor<T>();
+			descriptorBuilder(descriptor);
+			if (descriptor._Field.IsConditionless())
+				throw new DslException("Field name not set for field value factor function");
+
+			this._FieldValueFactor = descriptor;
+		}
+	}
+
+	public class FieldValueFactorDescriptor<T>
+	{
+		[JsonProperty("field")]
+		internal PropertyPathMarker _Field { get; set; }
+
+		[JsonProperty("factor")]
+		internal double? _Factor { get; set; }
+
+		[JsonProperty("modifier")]
+		[JsonConverter(typeof(StringEnumConverter))]
+		internal FieldValueFactorModifier? _Modifier { get; set; }
+
+		public FieldValueFactorDescriptor<T> Field(Expression<Func<T, object>> field)
+		{
+			this._Field = field;
+			return this;
+		}
+
+		public FieldValueFactorDescriptor<T> Factor(double factor)
+		{
+			this._Factor = factor;
+			return this;
+		}
+
+		public FieldValueFactorDescriptor<T> Modifier(FieldValueFactorModifier modifier)
+		{
+			this._Modifier = modifier;
+			return this;
+		}
+	}
+}

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

@@ -67,53 +67,4 @@ IEnumerator IEnumerable.GetEnumerator()
 			return _Functions.GetEnumerator();
 		}
 	}
-
-
-	public class FieldValueFactorDescriptor<T>
-	{
-		[JsonProperty("field")]
-		internal PropertyPathMarker _Field { get; set; }
-
-		[JsonProperty("factor")]
-		internal double? _Factor { get; set; }
-
-		[JsonProperty("modifier")]
-		[JsonConverter(typeof (StringEnumConverter))]
-		internal FieldValueFactorModifier? _Modifier { get; set; }
-
-		public FieldValueFactorDescriptor<T> Field(Expression<Func<T, object>> field)
-		{
-			this._Field = field;
-			return this;
-		}
-
-		public FieldValueFactorDescriptor<T> Factor(double factor)
-		{
-			this._Factor = factor;
-			return this;
-		}
-
-		public FieldValueFactorDescriptor<T> Modifier(FieldValueFactorModifier modifier)
-		{
-			this._Modifier = modifier;
-			return this;
-		}
-	}
-	
-	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	public class FieldValueFactor<T> : FunctionScoreFunction<T> where T : class
-	{
-		[JsonProperty(PropertyName = "field_value_factor")]
-		internal FieldValueFactorDescriptor<T> _FieldValueFactor { get; set; }
-
-		public FieldValueFactor(Action<FieldValueFactorDescriptor<T>> descriptorBuilder)
-		{
-			var descriptor = new FieldValueFactorDescriptor<T>();
-			descriptorBuilder(descriptor);
-			if (descriptor._Field.IsConditionless())
-				throw new DslException("Field name not set for field value factor function");
-
-			this._FieldValueFactor = descriptor;
-		}
-	}
 }

src/Nest/Nest.csproj

@@ -156,6 +156,7 @@
     <Compile Include="DSL\Filter\GeoShapePolygonFilterDescriptor.cs" />
     <Compile Include="DSL\Filter\GeoShapePointFilterDescriptor.cs" />
     <Compile Include="DSL\GetAliasDescriptor.cs" />
+    <Compile Include="DSL\Query\Functions\FieldValueFactorDescriptor.cs" />
     <Compile Include="DSL\Query\GeoShapeMultiPointQueryDescriptor.cs" />
     <Compile Include="DSL\Query\GeoShapeMultiPolygonQueryDescriptor.cs" />
     <Compile Include="DSL\Query\GeoShapePolygonQueryDescriptor.cs" />