Merge pull request #1710 from elastic/fix/eager-conditionless

fix #1709 did a pass over all conditionless checks and fixed those th…

Author: gmarz

Diff for: src/Nest/QueryDsl/Compound/Filtered/FilteredQuery.cs

@@ -32,7 +32,7 @@ internal static bool IsConditionless(IFilteredQuery q)
 				return q.Query.IsConditionless;
 			if (q.Filter != null && q.Query == null)
 				return q.Filter.IsConditionless;
-			return q.Query.IsConditionless && q.Filter.IsConditionless;
+			return q.Query.IsConditionless() && q.Filter.IsConditionless();
 		}
 	}
 

Diff for: src/Nest/QueryDsl/Compound/FunctionScore/FunctionScoreQuery.cs

@@ -39,10 +39,8 @@ public class FunctionScoreQuery : QueryBase, IFunctionScoreQuery
 
 		internal override void WrapInContainer(IQueryContainer c) => c.FunctionScore = this;
 
-		internal static bool IsConditionless(IFunctionScoreQuery q, bool force = false)
-		{
-			return force || !q.Functions.HasAny();
-		}
+		internal static bool IsConditionless(IFunctionScoreQuery q, bool force = false) => 
+			force || !q.Functions.HasAny();
 	}
 
 	public class FunctionScoreQueryDescriptor<T> 

Diff for: src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs

@@ -120,8 +120,7 @@ public class QueryStringQuery : QueryBase, IQueryStringQuery
 		public int? MaximumDeterminizedStates { get; set; }
 
 		internal override void WrapInContainer(IQueryContainer c) => c.QueryString = this;
-		internal static bool IsConditionless(IQueryStringQuery q) => 
-			(q.Fields == null && q.DefaultField == null) || q.Query.IsNullOrEmpty();
+		internal static bool IsConditionless(IQueryStringQuery q) => q.Query.IsNullOrEmpty();
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]

Diff for: src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs

@@ -53,8 +53,7 @@ public class SimpleQueryStringQuery : QueryBase, ISimpleQueryStringQuery
 		public MinimumShouldMatch MinimumShouldMatch { get; set; }
 
 		internal override void WrapInContainer(IQueryContainer c) => c.SimpleQueryString = this;
-		internal static bool IsConditionless(ISimpleQueryStringQuery q) => 
-			q.Fields == null || q.Query.IsNullOrEmpty();
+		internal static bool IsConditionless(ISimpleQueryStringQuery q) => q.Query.IsNullOrEmpty();
 	}
 
 	public class SimpleQueryStringQueryDescriptor<T> 

Diff for: src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs

@@ -43,7 +43,8 @@ public class GeoDistanceQuery : FieldNameQueryBase, IGeoDistanceQuery
 
 		internal override void WrapInContainer(IQueryContainer c) => c.GeoDistance = this;
 
-		internal static bool IsConditionless(IGeoDistanceQuery q) => q.Location == null || q.Distance == null || q.Field.IsConditionless();
+		internal static bool IsConditionless(IGeoDistanceQuery q) => 
+			q.Location == null || q.Distance == null || q.Field.IsConditionless();
 	}
 
 	public class GeoDistanceQueryDescriptor<T> 

Diff for: src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs

@@ -36,7 +36,8 @@ public class ScriptQuery : QueryBase, IScriptQuery
 		public string Lang { get; set; }
 
 		internal override void WrapInContainer(IQueryContainer c) => c.Script = this;
-		internal static bool IsConditionless(IScriptQuery q) => q.Inline.IsNullOrEmpty();
+		internal static bool IsConditionless(IScriptQuery q) => 
+			q.Inline.IsNullOrEmpty() && q.Id == null && q.File.IsNullOrEmpty();
 	}
 
 	public class ScriptQueryDescriptor<T> 

Diff for: src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryBase.cs

@@ -30,7 +30,7 @@ public interface IFuzzyQuery<TValue, TFuzziness> : IFuzzyQuery
 	internal static class FuzzyQueryBase
 	{
 		internal static bool IsConditionless<TValue, TFuzziness>(IFuzzyQuery<TValue, TFuzziness> fuzzy) => 
-			fuzzy == null || fuzzy.Value == null || fuzzy.Fuzziness == null || fuzzy.Field == null;
+			fuzzy == null || fuzzy.Value == null || fuzzy.Field == null;
 	}
 
 	public abstract class FuzzyQueryBase<TValue, TFuzziness> : FieldNameQueryBase, IFuzzyQuery<TValue, TFuzziness>

Diff for: src/Tests/QueryDsl/FullText/QueryString/QueryStringUsageTests.cs

@@ -109,10 +109,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 		{
 			q => q.Query = null,
 			q => q.Query = string.Empty,
-			q => {
-				q.Fields = null;
-				q.DefaultField = null;
-			}
 		};
 	}
 }

Diff for: src/Tests/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringUsageTests.cs

@@ -64,7 +64,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 		{
 			q => q.Query = null,
 			q => q.Query = string.Empty,
-			q =>  q.Fields = null
 		};
 	}
 }

Diff for: src/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyDateQueryUsageTests.cs

@@ -59,7 +59,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 		)
 		{
 			q => q.Field = null,
-			q => q.Fuzziness = null,
 			q => q.Value = null
 		};
 	}

Diff for: src/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyNumericQueryUsageTests.cs

@@ -58,7 +58,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 		)
 		{
 			q => q.Field = null,
-			q => q.Fuzziness = null,
 			q => q.Value = null
 		};
 	}

Diff for: src/Tests/QueryDsl/TermLevel/Fuzzy/FuzzyQueryUsageTests.cs

@@ -57,7 +57,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 		)
 		{
 			q => q.Field = null,
-			q => q.Fuzziness = null,
 			q => q.Value = null
 		};
 	}