added name to all the queries

Author: Mpdreamz

src/Nest/DSL/Filter/RawFilter.cs

@@ -8,10 +8,13 @@ namespace Nest
 {
 	[JsonConverter(typeof(CustomJsonConverter))]
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+	[Obsolete("Never used and scheduled to be removed in 2.0")]
 	public class RawFilter : IQuery, ICustomJson
 	{
 		internal object Json { get; set; }
 		bool IQuery.IsConditionless { get { return this.Json == null || this.Json.ToString().IsNullOrEmpty(); } }
+		
+		string IQuery.Name { get; set;  }
 
 		object ICustomJson.GetCustomJson()
 		{

src/Nest/DSL/Query/BoolQueryDescriptor.cs

@@ -40,6 +40,8 @@ protected override void WrapInContainer(IQueryContainer container)
 			container.Bool = this;
 		}
 
+		public string Name { get; set; }
+
 		bool IQuery.IsConditionless { get { return false; } }
 
 		public IEnumerable<IQueryContainer> Must { get; set; }
@@ -70,7 +72,10 @@ public class BoolBaseQueryDescriptor : IBoolQuery
 
 		[JsonProperty("boost")]
 		double? IBoolQuery.Boost { get; set; }
-		
+
+		[JsonProperty("_name")]
+		string IQuery.Name { get; set; }
+
 		bool IQuery.IsConditionless
 		{
 			get

src/Nest/DSL/Query/BoostingQueryDescriptor.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
@@ -27,6 +28,7 @@ protected override void WrapInContainer(IQueryContainer container)
 			container.Boosting = this;
 		}
 
+		public string Name { get; set; }
 		bool IQuery.IsConditionless { get { return false; } }
 		public QueryContainer PositiveQuery { get; set; }
 		public QueryContainer NegativeQuery { get; set; }
@@ -35,6 +37,8 @@ protected override void WrapInContainer(IQueryContainer container)
 
 	public class BoostingQueryDescriptor<T> : IBoostingQuery where T : class
 	{
+		private IBoostingQuery Self { get { return this; } }
+
 		QueryContainer IBoostingQuery.PositiveQuery { get; set; }
 
 		QueryContainer IBoostingQuery.NegativeQuery { get; set; }
@@ -45,31 +49,39 @@ bool IQuery.IsConditionless
 		{
 			get
 			{
-				if (((IBoostingQuery)this).NegativeQuery == null && ((IBoostingQuery)this).PositiveQuery == null)
+				if (Self.NegativeQuery == null && Self.PositiveQuery == null)
 					return true;
-				return ((IBoostingQuery)this).PositiveQuery == null && ((IBoostingQuery)this).NegativeQuery.IsConditionless
-					|| ((IBoostingQuery)this).NegativeQuery == null && ((IBoostingQuery)this).PositiveQuery.IsConditionless;
+				return (Self.PositiveQuery == null || Self.NegativeQuery.IsConditionless)
+					|| (Self.NegativeQuery == null || Self.PositiveQuery.IsConditionless);
 			}
 		}
 
+		string IQuery.Name { get; set; }
+
+		public BoostingQueryDescriptor<T> Name(string name)
+		{
+			Self.Name = name;
+			return this;
+		}
+
 		public BoostingQueryDescriptor<T> NegativeBoost(double boost)
 		{
-			((IBoostingQuery)this).NegativeBoost = boost;
+			Self.NegativeBoost = boost;
 			return this;
 		}
 
 		public BoostingQueryDescriptor<T> Positive(Func<QueryDescriptor<T>, QueryContainer> selector)
 		{
 			var query = new QueryDescriptor<T>();
 			var q = selector(query);
-			((IBoostingQuery)this).PositiveQuery = q;
+			Self.PositiveQuery = q;
 			return this;
 		}
 		public BoostingQueryDescriptor<T> Negative(Func<QueryDescriptor<T>, QueryContainer> selector)
 		{
 			var query = new QueryDescriptor<T>();
 			var q = selector(query);
-			((IBoostingQuery)this).NegativeQuery = q;
+			Self.NegativeQuery = q;
 			return this;
 		}
 	}

src/Nest/DSL/Query/CommonTermsQueryDescriptor.cs

@@ -47,8 +47,8 @@ protected override void WrapInContainer(IQueryContainer container)
 		{
 			container.CommonTerms = this;
 		}
-
 		bool IQuery.IsConditionless { get { return false; } }
+
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
 		{
 			return this.Field;
@@ -59,6 +59,7 @@ void IFieldNameQuery.SetFieldName(string fieldName)
 			this.Field = fieldName;
 		}
 
+		public string Name { get; set; }
 		public string Query { get; set; }
 		public PropertyPathMarker Field { get; set; }
 		public double? CutoffFrequency { get; set; }
@@ -72,6 +73,8 @@ void IFieldNameQuery.SetFieldName(string fieldName)
 
 	public class CommonTermsQueryDescriptor<T> : ICommonTermsQuery where T : class
 	{
+		private ICommonTermsQuery Self { get { return this; }}
+
 		string ICommonTermsQuery.Query { get; set; }
 
 		PropertyPathMarker ICommonTermsQuery.Field { get; set; }
@@ -90,77 +93,85 @@ public class CommonTermsQueryDescriptor<T> : ICommonTermsQuery where T : class
 
 		bool? ICommonTermsQuery.DisableCoord { get; set; }
 
+		string IQuery.Name { get; set; }
+
 		bool IQuery.IsConditionless
 		{
 			get
 			{
-				return ((ICommonTermsQuery)this).Field.IsConditionless() || ((ICommonTermsQuery)this).Query.IsNullOrEmpty();
+				return Self.Field.IsConditionless() || Self.Query.IsNullOrEmpty();
 			}
 		}
 		void IFieldNameQuery.SetFieldName(string fieldName)
 		{
-			((ICommonTermsQuery)this).Field = fieldName;
+			Self.Field = fieldName;
 		}
 		PropertyPathMarker IFieldNameQuery.GetFieldName()
 		{
-			return ((ICommonTermsQuery)this).Field;
+			return Self.Field;
+		}
+
+		public CommonTermsQueryDescriptor<T> Name(string name)
+		{
+			Self.Name = name;
+			return this;
 		}
 
 		public CommonTermsQueryDescriptor<T> OnField(string field)
 		{
-			((ICommonTermsQuery)this).Field = field;
+			Self.Field = field;
 			return this;
 		}
 		public CommonTermsQueryDescriptor<T> OnField(Expression<Func<T, object>> objectPath)
 		{
-			((ICommonTermsQuery)this).Field = objectPath;
+			Self.Field = objectPath;
 			return this;
 		}
 
 		public CommonTermsQueryDescriptor<T> Query(string query)
 		{
-			((ICommonTermsQuery)this).Query = query;
+			Self.Query = query;
 			return this;
 		}
 		public CommonTermsQueryDescriptor<T> LowFrequencyOperator(Operator op)
 		{
-			((ICommonTermsQuery)this).LowFrequencyOperator = op;
+			Self.LowFrequencyOperator = op;
 			return this;
 		}
 		public CommonTermsQueryDescriptor<T> HighFrequencyOperator(Operator op)
 		{
-			((ICommonTermsQuery)this).HighFrequencyOperator = op;
+			Self.HighFrequencyOperator = op;
 			return this;
 		}
 		public CommonTermsQueryDescriptor<T> Analyzer(string analyzer)
 		{
-			((ICommonTermsQuery)this).Analyzer = analyzer;
+			Self.Analyzer = analyzer;
 			return this;
 		}
 
 		public CommonTermsQueryDescriptor<T> CutoffFrequency(double cutOffFrequency)
 		{
-			((ICommonTermsQuery)this).CutoffFrequency = cutOffFrequency;
+			Self.CutoffFrequency = cutOffFrequency;
 			return this;
 		}
 		public CommonTermsQueryDescriptor<T> MinimumShouldMatch(string minimumShouldMatch)
 		{
-			((ICommonTermsQuery)this).MinimumShouldMatch = minimumShouldMatch;
+			Self.MinimumShouldMatch = minimumShouldMatch;
 			return this;
 		}
 		public CommonTermsQueryDescriptor<T> MinimumShouldMatch(int minimumShouldMatch)
 		{
-			((ICommonTermsQuery)this).MinimumShouldMatch = minimumShouldMatch.ToString(CultureInfo.InvariantCulture);
+			Self.MinimumShouldMatch = minimumShouldMatch.ToString(CultureInfo.InvariantCulture);
 			return this;
 		}
 		public CommonTermsQueryDescriptor<T> Boost(double boost)
 		{
-			((ICommonTermsQuery)this).Boost = boost;
+			Self.Boost = boost;
 			return this;
 		}
 		public CommonTermsQueryDescriptor<T> DisableCoord(bool disable = true)
 		{
-			((ICommonTermsQuery)this).DisableCoord = disable;
+			Self.DisableCoord = disable;
 			return this;
 		}
 

src/Nest/DSL/Query/ConditionlessQueryDescriptor.cs

@@ -21,6 +21,8 @@ bool IQuery.IsConditionless
 			}
 		}
 
+		string IQuery.Name { get; set; }
+
 		public ConditionlessQueryDescriptor<T> Query(Func<QueryDescriptor<T>, QueryContainer> querySelector)
 		{
 			querySelector.ThrowIfNull("querySelector");

src/Nest/DSL/Query/ConstantScoreQueryDescriptor.cs

@@ -29,6 +29,8 @@ protected override void WrapInContainer(IQueryContainer container)
 			container.ConstantScore = this;
 		}
 
+		public string Name { get; set; }
+		//TODO 2.0 change to explicit IQuery implementation
 		public bool IsConditionless { get { return false; } }
 		public string Lang { get; set; }
 		public string Script { get; set; }
@@ -40,51 +42,61 @@ protected override void WrapInContainer(IQueryContainer container)
 
 	public class ConstantScoreQueryDescriptor<T> : IConstantScoreQuery where T : class
 	{
+		private IConstantScoreQuery Self { get { return this; }}
+
 		IQueryContainer IConstantScoreQuery.Query { get; set; }
 
 		IFilterContainer IConstantScoreQuery.Filter { get; set; }
 
 		double? IConstantScoreQuery.Boost { get; set; }
+		
+		string IQuery.Name { get; set; }
 
 		bool IQuery.IsConditionless
 		{
 			get
 			{
-				if (((IConstantScoreQuery)this).Query == null && ((IConstantScoreQuery)this).Filter == null)
+				if (Self.Query == null && Self.Filter == null)
 					return true;
-				if (((IConstantScoreQuery)this).Filter == null && ((IConstantScoreQuery)this).Query != null)
-					return ((IConstantScoreQuery)this).Query.IsConditionless;
-				if (((IConstantScoreQuery)this).Filter != null && ((IConstantScoreQuery)this).Query == null)
-					return ((IConstantScoreQuery)this).Filter.IsConditionless;
+				if (Self.Filter == null && Self.Query != null)
+					return Self.Query.IsConditionless;
+				if (Self.Filter != null && Self.Query == null)
+					return Self.Filter.IsConditionless;
 				return false;
 			}
 		}
 
+		public ConstantScoreQueryDescriptor<T> Name(string name)
+		{
+			Self.Name = name;
+			return this;
+		}
+
 		public ConstantScoreQueryDescriptor<T> Query(Func<QueryDescriptor<T>, QueryContainer> querySelector)
 		{
 			querySelector.ThrowIfNull("querySelector");
-			((IConstantScoreQuery)this).Filter = null;
+			Self.Filter = null;
 			var query = new QueryDescriptor<T>();
 			var q = querySelector(query);
 
-			((IConstantScoreQuery)this).Query = q;
+			Self.Query = q;
 			return this;
 		}
 
 		public ConstantScoreQueryDescriptor<T> Filter(Func<FilterDescriptor<T>, FilterContainer> filterSelector)
 		{
 			filterSelector.ThrowIfNull("filterSelector");
-			((IConstantScoreQuery)this).Query = null;
+			Self.Query = null;
 			var filter = new FilterDescriptor<T>();
 			var f = filterSelector(filter);
 
-			((IConstantScoreQuery)this).Filter = f;
+			Self.Filter = f;
 			return this;
 		}
 
 		public ConstantScoreQueryDescriptor<T> Boost(double boost)
 		{
-			((IConstantScoreQuery)this).Boost = boost;
+			Self.Boost = boost;
 			return this;
 		}
 	}

src/Nest/DSL/Query/CustomBoostFactorQueryDescriptor.cs

@@ -25,39 +25,50 @@ protected override void WrapInContainer(IQueryContainer container)
 			container.CustomBoostFactor = this;
 		}
 
+		public string Name { get; set; }
+
 		bool IQuery.IsConditionless { get { return false; } }
 		public IQueryContainer Query { get; set; }
 		public double? BoostFactor { get; set; }
 	}
 
 	public class CustomBoostFactorQueryDescriptor<T> : ICustomBoostFactorQuery where T : class
 	{
+		private ICustomBoostFactorQuery Self  { get { return this; }}
+
 		IQueryContainer ICustomBoostFactorQuery.Query { get; set; }
 
 		double? ICustomBoostFactorQuery.BoostFactor { get; set; }
 
+		string IQuery.Name { get; set; }
+
 		bool IQuery.IsConditionless
 		{
 			get
 			{
-				return ((ICustomBoostFactorQuery)this).Query == null || ((ICustomBoostFactorQuery)this).Query.IsConditionless;
+				return Self.Query == null || Self.Query.IsConditionless;
 			}
 		}
 
+		public CustomBoostFactorQueryDescriptor<T> Name(string name)
+		{
+			Self.Name = name;
+			return this;
+		}
 
 		public CustomBoostFactorQueryDescriptor<T> Query(Func<QueryDescriptor<T>, QueryContainer> querySelector)
 		{
 			querySelector.ThrowIfNull("querySelector");
 			var query = new QueryDescriptor<T>();
 			var q = querySelector(query);
 
-			((ICustomBoostFactorQuery)this).Query = q;
+			Self.Query = q;
 			return this;
 		}
 
 		public CustomBoostFactorQueryDescriptor<T> BoostFactor(double boostFactor)
 		{
-			((ICustomBoostFactorQuery)this).BoostFactor = boostFactor;
+			Self.BoostFactor = boostFactor;
 			return this;
 		}
 	}