added boost to several queries blatently missing them

Author: Mpdreamz

src/Nest/DSL/Query/CustomScoreQueryDescriptor.cs

@@ -23,6 +23,7 @@ public interface ICustomScoreQuery : IQuery
 		[JsonProperty(PropertyName = "query")]
 		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
+
 	}
 
 	public class CustomScoreQuery : PlainQuery, ICustomScoreQuery
@@ -33,10 +34,15 @@ protected override void WrapInContainer(IQueryContainer container)
 		}
 
 		public string Name { get; set; }
+
 		bool IQuery.IsConditionless { get { return false; } }
+
 		public string Lang { get; set; }
+
 		public string Script { get; set; }
+
 		public Dictionary<string, object> Params { get; set; }
+
 		public IQueryContainer Query { get; set; }
 	}
 

src/Nest/DSL/Query/FilteredQueryDescriptor.cs

@@ -17,6 +17,9 @@ public interface IFilteredQuery : IQuery
 		[JsonProperty(PropertyName = "filter")]
 		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer Filter { get; set; }
+
+		[JsonProperty(PropertyName = "boost")]
+		double? Boost { get; set; }
 	}
 
 	public class FilteredQuery : PlainQuery, IFilteredQuery
@@ -30,6 +33,7 @@ protected override void WrapInContainer(IQueryContainer container)
 		bool IQuery.IsConditionless { get {return false;}}
 		public IQueryContainer Query { get; set; }
 		public IFilterContainer Filter { get; set; }
+		public double? Boost { get; set; }
 	}
 
 	public class FilteredQueryDescriptor<T> : IFilteredQuery where T : class
@@ -40,6 +44,8 @@ public class FilteredQueryDescriptor<T> : IFilteredQuery where T : class
 
 		IFilterContainer IFilteredQuery.Filter { get; set; }
 
+		double? IFilteredQuery.Boost { get; set; }
+
 		string IQuery.Name { get; set; }
 
 		bool IQuery.IsConditionless
@@ -61,6 +67,13 @@ public FilteredQueryDescriptor<T> Name(string name)
 			Self.Name = name;
 			return this;
 		}
+
+		public FilteredQueryDescriptor<T> Boost(double boost)
+		{
+			Self.Boost = boost;
+			return this;
+		}
+
 		public FilteredQueryDescriptor<T> Query(Func<QueryDescriptor<T>, QueryContainer> querySelector)
 		{
 			querySelector.ThrowIfNull("querySelector");

src/Nest/DSL/Query/FunctionScoreQueryDescriptor.cs

@@ -47,6 +47,10 @@ public interface IFunctionScoreQuery : IQuery
 
 		[JsonProperty(PropertyName = "min_score")]
 		float? MinScore { get; set; }
+
+		[JsonProperty(PropertyName = "boost")]
+		double? Boost { get; set; }
+
 	}
 
 	public class FunctionScoreQuery : PlainQuery, IFunctionScoreQuery
@@ -75,6 +79,7 @@ public long? Weight
 		}
 
 		public double? WeightAsDouble { get; set; }
+		public double? Boost { get; set; }
 		public float? MinScore { get; set; }
 	}
 
@@ -106,8 +111,11 @@ public class FunctionScoreQueryDescriptor<T> : IFunctionScoreQuery where T : cla
 
 		// TODO: Remove in 2.0 and change Weight to double
 		double? IFunctionScoreQuery.WeightAsDouble { get; set; }
+
 		float? IFunctionScoreQuery.MinScore { get; set; }
 
+		double? IFunctionScoreQuery.Boost { get; set; }
+
 		string IQuery.Name { get; set; }
 
 		private bool _forcedConditionless = false;
@@ -128,13 +136,18 @@ public FunctionScoreQueryDescriptor<T> ConditionlessWhen(bool isConditionless)
 			return this;
 		}
 
-
 		public FunctionScoreQueryDescriptor<T> Name(string name)
 		{
 			Self.Name = name;
 			return this;
 		}
 
+		public FunctionScoreQueryDescriptor<T> Boost(double boost)
+		{
+			Self.Boost = boost;
+			return this;
+		}
+
 		public FunctionScoreQueryDescriptor<T> Query(Func<QueryDescriptor<T>, QueryContainer> querySelector)
 		{
 			querySelector.ThrowIfNull("querySelector");

src/Nest/DSL/Query/GeoShapeCircleQueryDescriptor.cs

@@ -11,13 +11,17 @@ namespace Nest
 	public interface IGeoShapeQuery : IFieldNameQuery
 	{
 		PropertyPathMarker Field { get; set; }
+
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IGeoShapeCircleQuery : IGeoShapeQuery
 	{
 		[JsonProperty("shape")]
 		ICircleGeoShape Shape { get; set; }
+
+		[JsonProperty(PropertyName = "boost")]
+		double? Boost { get; set; }
 	}
 
 	public class GeoShapeCircleQuery : PlainQuery, IGeoShapeCircleQuery
@@ -42,6 +46,8 @@ void IFieldNameQuery.SetFieldName(string fieldName)
 
 		public PropertyPathMarker Field { get; set; }
 
+		public double? Boost { get; set; } 
+
 		public ICircleGeoShape Shape { get; set; }
 	}
 
@@ -64,10 +70,13 @@ bool IQuery.IsConditionless
 
 		string IQuery.Name { get; set; }
 
+		double? IGeoShapeCircleQuery.Boost { get; set; }
+
 		void IFieldNameQuery.SetFieldName(string fieldName)
 		{
 			((IGeoShapeQuery)this).Field = fieldName;
 		}
+
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
 		{
 			return ((IGeoShapeQuery)this).Field;
@@ -106,5 +115,12 @@ public GeoShapeCircleQueryDescriptor<T> Radius(string radius)
 			Self.Shape.Radius = radius;
 			return this;
 		}
+
+		public GeoShapeCircleQueryDescriptor<T> Boost(double boost)
+		{
+			Self.Boost = boost;
+			return this;
+		}
+
 	}
 }

src/Nest/DSL/Query/GeoShapeEnvelopeQueryDescriptor.cs

@@ -15,6 +15,9 @@ public interface IGeoShapeEnvelopeQuery : IGeoShapeQuery
 	{
 		[JsonProperty("shape")]
 		IEnvelopeGeoShape Shape { get; set; }
+
+		[JsonProperty(PropertyName = "boost")]
+		double? Boost { get; set; }
 	}
 
 	public class GeoShapeEnvelopeQuery : PlainQuery, IGeoShapeEnvelopeQuery
@@ -25,6 +28,9 @@ protected override void WrapInContainer(IQueryContainer container)
 		}
 
 		public string Name { get; set; }
+
+		public double? Boost { get; set; }
+
 		bool IQuery.IsConditionless { get { return false; } }
 
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
@@ -50,6 +56,8 @@ public class GeoShapeEnvelopeQueryDescriptor<T> : IGeoShapeEnvelopeQuery where T
 
 		IEnvelopeGeoShape IGeoShapeEnvelopeQuery.Shape { get; set; }
 
+		double? IGeoShapeEnvelopeQuery.Boost { get; set; }
+
 		bool IQuery.IsConditionless
 		{
 			get
@@ -64,6 +72,7 @@ void IFieldNameQuery.SetFieldName(string fieldName)
 		{
 			Self.Field = fieldName;
 		}
+
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
 		{
 			return Self.Field;
@@ -75,6 +84,12 @@ public GeoShapeEnvelopeQueryDescriptor<T> Name(string name)
 			return this;
 		}
 
+		public GeoShapeEnvelopeQueryDescriptor<T> Boost(double boost)
+		{
+			Self.Boost = boost;
+			return this;
+		}
+		
 		public GeoShapeEnvelopeQueryDescriptor<T> OnField(string field)
 		{
 			Self.Field = field;

src/Nest/DSL/Query/GeoShapeLineStringQueryDescriptor.cs

@@ -15,6 +15,9 @@ public interface IGeoShapeLineStringQuery : IGeoShapeQuery
 	{
 		[JsonProperty("shape")]
 		ILineStringGeoShape Shape { get; set; }
+
+		[JsonProperty(PropertyName = "boost")]
+		double? Boost { get; set; }
 	}
 
 	public class GeoShapeLineStringQuery : PlainQuery, IGeoShapeLineStringQuery
@@ -25,6 +28,9 @@ protected override void WrapInContainer(IQueryContainer container)
 		}
 
 		public string Name { get; set; }
+
+		public double? Boost { get; set; }
+
 		bool IQuery.IsConditionless { get { return false; } }
 
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
@@ -50,6 +56,8 @@ public class GeoShapeLineStringQueryDescriptor<T> : IGeoShapeLineStringQuery whe
 
 		ILineStringGeoShape IGeoShapeLineStringQuery.Shape { get; set; }
 
+		double? IGeoShapeLineStringQuery.Boost { get; set; }
+
 		bool IQuery.IsConditionless
 		{
 			get
@@ -64,6 +72,7 @@ void IFieldNameQuery.SetFieldName(string fieldName)
 		{
 			((IGeoShapeQuery)this).Field = fieldName;
 		}
+
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
 		{
 			return ((IGeoShapeQuery)this).Field;
@@ -74,6 +83,7 @@ public GeoShapeLineStringQueryDescriptor<T> OnField(string field)
 			((IGeoShapeQuery)this).Field = field;
 			return this;
 		}
+
 		public GeoShapeLineStringQueryDescriptor<T> OnField(Expression<Func<T, object>> objectPath)
 		{
 			((IGeoShapeQuery)this).Field = objectPath;
@@ -85,6 +95,13 @@ public GeoShapeLineStringQueryDescriptor<T> Name(string name)
 			Self.Name = name;
 			return this;
 		}
+
+		public GeoShapeLineStringQueryDescriptor<T> Boost(double boost)
+		{
+			Self.Boost = boost;
+			return this;
+		}
+
 		public GeoShapeLineStringQueryDescriptor<T> Coordinates(IEnumerable<IEnumerable<double>> coordinates)
 		{
 			if (Self.Shape == null)

src/Nest/DSL/Query/GeoShapeMultiLineStringQueryDescriptor.cs

@@ -15,6 +15,9 @@ public interface IGeoShapeMultiLineStringQuery : IGeoShapeQuery
 	{
 		[JsonProperty("shape")]
 		IMultiLineStringGeoShape Shape { get; set; }
+
+		[JsonProperty(PropertyName = "boost")]
+		double? Boost { get; set; }
 	}
 
 	public class GeoShapeMultiLineStringQuery : PlainQuery, IGeoShapeMultiLineStringQuery
@@ -25,6 +28,9 @@ protected override void WrapInContainer(IQueryContainer container)
 		}
 
 		public string Name { get; set; }
+
+		public double? Boost { get; set; }
+
 		bool IQuery.IsConditionless { get { return false; } }
 
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
@@ -50,6 +56,8 @@ public class GeoShapeMultiLineStringQueryDescriptor<T> : IGeoShapeMultiLineStrin
 
 		IMultiLineStringGeoShape IGeoShapeMultiLineStringQuery.Shape { get; set; }
 
+		double? IGeoShapeMultiLineStringQuery.Boost { get; set; }
+
 		bool IQuery.IsConditionless
 		{
 			get
@@ -64,6 +72,7 @@ void IFieldNameQuery.SetFieldName(string fieldName)
 		{
 			((IGeoShapeQuery)this).Field = fieldName;
 		}
+
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
 		{
 			return ((IGeoShapeQuery)this).Field;
@@ -75,11 +84,18 @@ public GeoShapeMultiLineStringQueryDescriptor<T> Name(string name)
 			return this;
 		}
 
+		public GeoShapeMultiLineStringQueryDescriptor<T> Boost(double boost)
+		{
+			Self.Boost = boost;
+			return this;
+		}
+		
 		public GeoShapeMultiLineStringQueryDescriptor<T> OnField(string field)
 		{
 			((IGeoShapeQuery)this).Field = field;
 			return this;
 		}
+
 		public GeoShapeMultiLineStringQueryDescriptor<T> OnField(Expression<Func<T, object>> objectPath)
 		{
 			((IGeoShapeQuery)this).Field = objectPath;

src/Nest/DSL/Query/GeoShapeMultiPointQueryDescriptor.cs

@@ -15,6 +15,9 @@ public interface IGeoShapeMultiPointQuery : IGeoShapeQuery
 	{
 		[JsonProperty("shape")]
 		IMultiPointGeoShape Shape { get; set; }
+
+		[JsonProperty(PropertyName = "boost")]
+		double? Boost { get; set; }
 	}
 
 	public class GeoShapeMultiPointQuery : PlainQuery, IGeoShapeMultiPointQuery
@@ -25,6 +28,9 @@ protected override void WrapInContainer(IQueryContainer container)
 		}
 
 		public string Name { get; set; }
+
+		public double? Boost { get; set; }
+
 		bool IQuery.IsConditionless { get { return false; } }
 
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
@@ -50,6 +56,8 @@ public class GeoShapeMultiPointQueryDescriptor<T> : IGeoShapeMultiPointQuery whe
 
 		IMultiPointGeoShape IGeoShapeMultiPointQuery.Shape { get; set; }
 
+		double? IGeoShapeMultiPointQuery.Boost { get; set; }
+			
 		string IQuery.Name { get; set; }
 
 		bool IQuery.IsConditionless
@@ -64,6 +72,7 @@ void IFieldNameQuery.SetFieldName(string fieldName)
 		{
 			((IGeoShapeQuery)this).Field = fieldName;
 		}
+
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
 		{
 			return ((IGeoShapeQuery)this).Field;
@@ -74,11 +83,19 @@ public GeoShapeMultiPointQueryDescriptor<T> Name(string name)
 			Self.Name = name;
 			return this;
 		}
+
+		public GeoShapeMultiPointQueryDescriptor<T> Boost(double boost)
+		{
+			Self.Boost = boost;
+			return this;
+		}
+
 		public GeoShapeMultiPointQueryDescriptor<T> OnField(string field)
 		{
 			((IGeoShapeQuery)this).Field = field;
 			return this;
 		}
+
 		public GeoShapeMultiPointQueryDescriptor<T> OnField(Expression<Func<T, object>> objectPath)
 		{
 			((IGeoShapeQuery)this).Field = objectPath;