Changes to queries for 5.0

See https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking_50_search_changes.html#_changes_to_queries for details.
Remove NestedScoreMode.Total and add NestedScoreMode.Min and NestedScoreMode.Sum
Mark CollectPayloads as deprecated
Remove MinimumShouldMatch and DisableCoord from TermsQuery

Fixes #1997

Author: russcam

Diff for: src/Nest/Document/Single/TermVectors/TermVectorsRequest.cs

@@ -9,7 +9,7 @@ public partial interface ITermVectorsRequest<TDocument>
 		where TDocument : class
 	{
 		/// <summary>
-		/// An optional document to get termvectors for instead of using an already indexed document
+		/// An optional document to get term vectors for instead of using an already indexed document
 		/// </summary>
 		[JsonProperty("doc")]
 		TDocument Document { get; set; }
@@ -26,6 +26,9 @@ public partial class TermVectorsRequest<TDocument>
 	{
 		HttpMethod IRequest.HttpMethod => (this.Document != null || this.Filter != null) ? HttpMethod.POST : HttpMethod.GET;
 
+		/// <summary>
+		/// An optional document to get term vectors for instead of using an already indexed document
+		/// </summary>
 		public TDocument Document { get; set; }
 
 		public IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
@@ -45,12 +48,18 @@ public partial class TermVectorsDescriptor<TDocument> where TDocument : class
 	{
 		HttpMethod IRequest.HttpMethod => (Self.Document != null || Self.Filter != null) ? HttpMethod.POST : HttpMethod.GET;
 
+		/// <summary>
+		/// An optional document to get term vectors for instead of using an already indexed document
+		/// </summary>
 		TDocument ITermVectorsRequest<TDocument>.Document { get; set; }
 
 		IPerFieldAnalyzer ITermVectorsRequest<TDocument>.PerFieldAnalyzer { get; set; }
 
 		ITermVectorFilter ITermVectorsRequest<TDocument>.Filter { get; set; }
 
+		/// <summary>
+		/// An optional document to get term vectors for instead of using an already indexed document
+		/// </summary>
 		public TermVectorsDescriptor<TDocument> Document(TDocument document) => Assign(a => a.Document = document);
 
 		public TermVectorsDescriptor<TDocument> PerFieldAnalyzer(Func<PerFieldAnalyzerDescriptor<TDocument>, IPromise<IPerFieldAnalyzer>> analyzerSelector) =>

Diff for: src/Nest/QueryDsl/Joining/HasChild/HasChildQuery.cs

@@ -16,6 +16,9 @@ public interface IHasChildQuery : IQuery
 		[JsonProperty("min_children")]
 		int? MinChildren { get; set; }
 
+		/// <summary>
+		/// Specify how many child documents are allowed to match.
+		/// </summary>
 		[JsonProperty("max_children")]
 		int? MaxChildren { get; set; }
 
@@ -25,13 +28,17 @@ public interface IHasChildQuery : IQuery
 		[JsonProperty("inner_hits")]
 		IInnerHits InnerHits { get; set; }
 	}
-	
+
 	public class HasChildQuery : QueryBase, IHasChildQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public TypeName Type { get; set; }
 		public ChildScoreMode? ScoreMode { get; set; }
 		public int? MinChildren { get; set; }
+
+		/// <summary>
+		/// Specify how many child documents are allowed to match.
+		/// </summary>
 		public int? MaxChildren { get; set; }
 		public QueryContainer Query { get; set; }
 		public IInnerHits InnerHits { get; set; }
@@ -40,14 +47,18 @@ public class HasChildQuery : QueryBase, IHasChildQuery
 		internal static bool IsConditionless(IHasChildQuery q) => q.Query == null || q.Query.IsConditionless || q.Type == null;
 	}
 
-	public class HasChildQueryDescriptor<T> 
+	public class HasChildQueryDescriptor<T>
 		: QueryDescriptorBase<HasChildQueryDescriptor<T>, IHasChildQuery>
 		, IHasChildQuery where T : class
 	{
 		protected override bool Conditionless => HasChildQuery.IsConditionless(this);
 		TypeName IHasChildQuery.Type { get; set; }
 		ChildScoreMode? IHasChildQuery.ScoreMode { get; set; }
 		int? IHasChildQuery.MinChildren { get; set; }
+
+		/// <summary>
+		/// Specify how many child documents are allowed to match.
+		/// </summary>
 		int? IHasChildQuery.MaxChildren { get; set; }
 		QueryContainer IHasChildQuery.Query { get; set; }
 		IInnerHits IHasChildQuery.InnerHits { get; set; }
@@ -57,7 +68,7 @@ public HasChildQueryDescriptor()
 			((IHasChildQuery)this).Type = TypeName.Create<T>();
 		}
 
-		public HasChildQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> selector) => 
+		public HasChildQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> selector) =>
 			Assign(a => a.Query = selector?.InvokeQuery(new QueryContainerDescriptor<T>()));
 
 		public HasChildQueryDescriptor<T> Type(string type) => Assign(a => a.Type = type);
@@ -66,6 +77,9 @@ public HasChildQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryC
 
 		public HasChildQueryDescriptor<T> MinChildren(int? minChildren) => Assign(a => a.MinChildren = minChildren);
 
+		/// <summary>
+		/// Specify how many child documents are allowed to match.
+		/// </summary>
 		public HasChildQueryDescriptor<T> MaxChildren(int? maxChildren) => Assign(a => a.MaxChildren = maxChildren);
 
 		public HasChildQueryDescriptor<T> InnerHits(Func<InnerHitsDescriptor<T>, IInnerHits> selector = null) =>

Diff for: src/Nest/QueryDsl/Joining/Nested/NestedScoreMode.cs

@@ -9,8 +9,10 @@ public enum NestedScoreMode
 	{
 		[EnumMember(Value = "avg")]
 		Average,
-		[EnumMember(Value = "total")]
-		Total,
+		[EnumMember(Value = "sum")]
+		Sum,
+		[EnumMember(Value = "min")]
+		Min,
 		[EnumMember(Value = "max")]
 		Max,
 		[EnumMember(Value = "none")]

Diff for: src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs

@@ -18,8 +18,11 @@ public interface ISpanNearQuery : ISpanSubQuery
 		[JsonProperty(PropertyName = "in_order")]
 		bool? InOrder { get; set; }
 
+#pragma warning disable 618
 		[JsonProperty(PropertyName = "collect_payloads")]
+		[Obsolete("Payloads will be loaded when needed")]
 		bool? CollectPayloads { get; set; }
+#pragma warning restore 618
 	}
 
 	public class SpanNearQuery : QueryBase, ISpanNearQuery
@@ -28,21 +31,29 @@ public class SpanNearQuery : QueryBase, ISpanNearQuery
 		public IEnumerable<ISpanQuery> Clauses { get; set; }
 		public int? Slop { get; set; }
 		public bool? InOrder { get; set; }
+
+#pragma warning disable 618
+		[Obsolete("Payloads will be loaded when needed")]
 		public bool? CollectPayloads { get; set; }
+#pragma warning restore 618
 
 		internal override void WrapInContainer(IQueryContainer c) => c.SpanNear = this;
 		internal static bool IsConditionless(ISpanNearQuery q) => !q.Clauses.HasAny() || q.Clauses.Cast<IQuery>().All(qq => qq.Conditionless);
 	}
 
-	public class SpanNearQueryDescriptor<T> 
+	public class SpanNearQueryDescriptor<T>
 		: QueryDescriptorBase<SpanNearQueryDescriptor<T>, ISpanNearQuery>
 		, ISpanNearQuery where T : class
 	{
 		protected override bool Conditionless => SpanNearQuery.IsConditionless(this);
 		IEnumerable<ISpanQuery> ISpanNearQuery.Clauses { get; set; }
 		int? ISpanNearQuery.Slop { get; set; }
 		bool? ISpanNearQuery.InOrder { get; set; }
+
+#pragma warning disable 618
+		[Obsolete("Payloads will be loaded when needed")]
 		bool? ISpanNearQuery.CollectPayloads { get; set; }
+#pragma warning restore 618
 
 		public SpanNearQueryDescriptor<T> Clauses(params Func<SpanQueryDescriptor<T>, SpanQueryDescriptor<T>>[] selectors) => Clauses(selectors.ToList());
 
@@ -56,6 +67,9 @@ public SpanNearQueryDescriptor<T> Clauses(IEnumerable<Func<SpanQueryDescriptor<T
 
 		public SpanNearQueryDescriptor<T> InOrder(bool? inOrder) => Assign(a => a.InOrder = inOrder);
 
+#pragma warning disable 618
+		[Obsolete("Payloads will be loaded when needed")]
 		public SpanNearQueryDescriptor<T> CollectPayloads(bool? collectPayloads) => Assign(a => a.CollectPayloads = collectPayloads);
+#pragma warning restore 618
 	}
 }

Diff for: src/Nest/QueryDsl/TermLevel/Terms/TermsQuery.cs

@@ -10,17 +10,13 @@ namespace Nest
 	[JsonConverter(typeof(TermsQueryJsonConverter))]
 	public interface ITermsQuery : IFieldNameQuery
 	{
-		MinimumShouldMatch MinimumShouldMatch { get; set; }
-		bool? DisableCoord { get; set; }
 		IEnumerable<object> Terms { get; set; }
 		IFieldLookup TermsLookup { get; set; }
 	}
 
 	public class TermsQuery : FieldNameQueryBase, ITermsQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
-		public MinimumShouldMatch MinimumShouldMatch { get; set; }
-		public bool? DisableCoord { get; set; }
 		public IEnumerable<object> Terms { get; set; }
 		public IFieldLookup TermsLookup { get; set; }
 
@@ -54,18 +50,12 @@ public class TermsQueryDescriptor<T>
 		, ITermsQuery where T : class
 	{
 		protected override bool Conditionless => TermsQuery.IsConditionless(this);
-		MinimumShouldMatch ITermsQuery.MinimumShouldMatch { get; set; }
-		bool? ITermsQuery.DisableCoord { get; set; }
 		IEnumerable<object> ITermsQuery.Terms { get; set; }
 		IFieldLookup ITermsQuery.TermsLookup { get; set; }
 
 		public TermsQueryDescriptor<T> TermsLookup<TOther>(Func<FieldLookupDescriptor<TOther>, IFieldLookup> selector)
 			where TOther : class => Assign(a => a.TermsLookup = selector(new FieldLookupDescriptor<TOther>()));
 
-		public TermsQueryDescriptor<T> MinimumShouldMatch(MinimumShouldMatch minMatch) => Assign(a => a.MinimumShouldMatch = minMatch);
-
-		public TermsQueryDescriptor<T> DisableCoord(bool? disable = true) => Assign(a => a.DisableCoord = disable);
-
 		public TermsQueryDescriptor<T> Terms<TValue>(IEnumerable<TValue> terms) => Assign(a => a.Terms = terms?.Cast<object>());
 
 		public TermsQueryDescriptor<T> Terms<TValue>(params TValue[] terms) => Assign(a => {

Diff for: src/Nest/QueryDsl/TermLevel/Terms/TermsQueryJsonConverter.cs

@@ -32,16 +32,6 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 					writer.WritePropertyName(field);
 					serializer.Serialize(writer, t.TermsLookup);
 				}
-				if (t.DisableCoord.HasValue)
-				{
-					writer.WritePropertyName("disable_coord");
-					writer.WriteValue(t.DisableCoord.Value);
-				}
-				if (t.MinimumShouldMatch != null)
-				{
-					writer.WritePropertyName("minimum_should_match");
-					serializer.Serialize(writer, t.MinimumShouldMatch);
-				}
 				if (t.Boost.HasValue)
 				{
 					writer.WritePropertyName("boost");
@@ -68,15 +58,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				var property = reader.Value as string;
 				switch (property)
 				{
-					case "disable_coord":
-						reader.Read();
-						f.DisableCoord = reader.Value as bool?;
-						break;
-					case "minimum_should_match":
-						reader.Read();
-						var min = serializer.Deserialize<MinimumShouldMatch>(reader);
-						f.MinimumShouldMatch = min;
-						break;
 					case "boost":
 						reader.Read();
 						f.Boost = reader.Value as double?;

Diff for: src/Nest/Search/Search/InnerHits/InnerHits.cs

@@ -93,19 +93,19 @@ public InnerHitsDescriptor<T> FielddataFields(params Expression<Func<T, object>>
 
 		public InnerHitsDescriptor<T> Version(bool? version = true) => Assign(a => a.Version = version);
 
-		public InnerHitsDescriptor<T> Sort(Func<SortDescriptor<T>, IPromise<IList<ISort>>> sortSelector) => Assign(a => a.Sort = sortSelector?.Invoke(new SortDescriptor<T>())?.Value);
+		public InnerHitsDescriptor<T> Sort(Func<SortDescriptor<T>, IPromise<IList<ISort>>> selector) => Assign(a => a.Sort = selector?.Invoke(new SortDescriptor<T>())?.Value);
 
 		/// <summary>
 		/// Allow to highlight search results on one or more fields. The implementation uses the either lucene fast-vector-highlighter or highlighter.
 		/// </summary>
-		public InnerHitsDescriptor<T> Highlight(Func<HighlightDescriptor<T>, IHighlight> highlightSelector) =>
-			Assign(a => a.Highlight = highlightSelector?.Invoke(new HighlightDescriptor<T>()));
+		public InnerHitsDescriptor<T> Highlight(Func<HighlightDescriptor<T>, IHighlight> selector) =>
+			Assign(a => a.Highlight = selector?.Invoke(new HighlightDescriptor<T>()));
 
 		//TODO map source of union bool/SourceFileter
 		public InnerHitsDescriptor<T> Source(bool include = true) => Assign(a => a.Source = !include ? SourceFilter.ExcludeAll : null);
 
-		public InnerHitsDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter> sourceSelector) =>
-			Assign(a => a.Source = sourceSelector?.Invoke(new SourceFilterDescriptor<T>()));
+		public InnerHitsDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISourceFilter> selector) =>
+			Assign(a => a.Source = selector?.Invoke(new SourceFilterDescriptor<T>()));
 
 		public InnerHitsDescriptor<T> ScriptFields(Func<ScriptFieldsDescriptor, IPromise<IScriptFields>> selector) =>
 			Assign(a => a.ScriptFields = selector?.Invoke(new ScriptFieldsDescriptor())?.Value);

Diff for: src/Tests/QueryDsl/TermLevel/Terms/TermsListQueryUsageTests.cs

@@ -19,9 +19,7 @@ public TermsListQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 			{
 				_name = "named_query",
 				boost = 1.1,
-				description = new[] { "term1", "term2" },
-				disable_coord = true,
-				minimum_should_match = 2
+				description = new[] { "term1", "term2" }
 			}
 		};
 
@@ -30,18 +28,14 @@ public TermsListQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) :
 			Name = "named_query",
 			Boost = 1.1,
 			Field = "description",
-			Terms = new List<string> { "term1", "term2" },
-			DisableCoord = true,
-			MinimumShouldMatch = 2
+			Terms = new List<string> { "term1", "term2" }
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Field(p => p.Description)
-				.DisableCoord()
-				.MinimumShouldMatch(MinimumShouldMatch.Fixed(2))
 				.Terms(new List<string> { "term1", "term2" })
 			);
 	}
@@ -59,7 +53,6 @@ public TermsListOfListIntegrationTests(ReadOnlyCluster cluster, EndpointUsage us
 				_name = "named_query",
 				boost = 1.1,
 				description = new[] { new [] { "term1", "term2" } },
-				disable_coord = true,
 			}
 		};
 
@@ -68,16 +61,14 @@ public TermsListOfListIntegrationTests(ReadOnlyCluster cluster, EndpointUsage us
 			Name = "named_query",
 			Boost = 1.1,
 			Field = "description",
-			Terms = _terms,
-			DisableCoord = true,
+			Terms = _terms
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Field(p => p.Description)
-				.DisableCoord()
 				.Terms(_terms)
 			);
 
@@ -99,8 +90,7 @@ public TermsListOfListStringAgainstNumericFieldIntegrationTests(ReadOnlyCluster
 			{
 				_name = "named_query",
 				boost = 1.1,
-				numberOfCommits = new[] { new [] { "term1", "term2" } },
-				disable_coord = true,
+				numberOfCommits = new[] { new [] { "term1", "term2" } }
 			}
 		};
 
@@ -110,15 +100,13 @@ public TermsListOfListStringAgainstNumericFieldIntegrationTests(ReadOnlyCluster
 			Boost = 1.1,
 			Field = "numberOfCommits",
 			Terms = _terms,
-			DisableCoord = true,
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Terms(c => c
 				.Name("named_query")
 				.Boost(1.1)
 				.Field(p => p.NumberOfCommits)
-				.DisableCoord()
 				.Terms(_terms)
 			);