Fix/obsolete and removed (elastic#3044)

* remove unused enum FinalDecision, removed obsolete in 5.x properties from simple query string

* remove indices query

* remove template query

* Span near removed properties

* remove throttle time from store stats

Author: Mpdreamz

src/Nest/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs

@@ -201,20 +201,6 @@ public enum Decision
 		No
 	}
 
-	[JsonConverter(typeof(StringEnumConverter))]
-	[Obsolete("Removed in Elasticsearch 5.2")]
-	public enum FinalDecision
-	{
-		[EnumMember(Value = "YES")]
-		Yes,
-
-		[EnumMember(Value = "NO")]
-		No,
-
-		[EnumMember(Value = "ALREADY_ASSIGNED")]
-		AlreadyAssigned
-	}
-
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum StoreCopy
 	{

src/Nest/CommonAbstractions/SerializationBehavior/ElasticContractResolver.cs

@@ -164,9 +164,7 @@ protected static bool ShouldSerializeQueryContainer(object o, JsonProperty prop)
 		{
 			if (o == null) return false;
 			if (!(prop.ValueProvider.GetValue(o) is QueryContainer q)) return false;
-			if (q.IsWritable) return true;
-			var nq = q as NoMatchQueryContainer;
-			return nq?.Shortcut != null;
+			return q.IsWritable;
 		}
 
 		protected static bool ShouldSerializeQueryContainers(object o, JsonProperty prop)

src/Nest/CommonOptions/Stats/StoreStats.cs

@@ -11,8 +11,6 @@ public class StoreStats
 		[JsonProperty("size_in_bytes")]
 		public double SizeInBytes { get; set; }
 
-		[JsonProperty("throttle_time_in_millis")]
-		public long ThrottleTimeInMilliseconds { get; set; }
 	}
 
 }

src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs

@@ -130,18 +130,9 @@ public interface IQueryContainer
 		[JsonProperty("nested")]
 		INestedQuery Nested { get; set; }
 
-		[Obsolete("Deprecated. You can specify _index on the query to target specific indices")]
-		[JsonProperty("indices")]
-		IIndicesQuery Indices { get; set; }
-
 		[JsonProperty("function_score")]
 		IFunctionScoreQuery FunctionScore { get; set; }
 
-#pragma warning disable 618
-		[JsonProperty("template")]
-		ITemplateQuery Template { get; set; }
-#pragma warning restore 618
-
 		[JsonProperty("geo_bounding_box")]
 		IGeoBoundingBoxQuery GeoBoundingBox { get; set; }
 

src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs

@@ -42,13 +42,7 @@ public partial class QueryContainer : IQueryContainer, IDescriptor
 		private ISpanFieldMaskingQuery _spanFieldMasking;
 		private INestedQuery _nested;
 
-#pragma warning disable 618
-		private IIndicesQuery _indices;
-#pragma warning restore 618
 		private IFunctionScoreQuery _functionScore;
-#pragma warning disable 618
-		private ITemplateQuery _template;
-#pragma warning restore 618
 		private IGeoBoundingBoxQuery _geoBoundingBox;
 		private IGeoDistanceQuery _geoDistance;
 		private IGeoPolygonQuery _geoPolygon;
@@ -108,13 +102,7 @@ private T Set<T>(T value) where T : IQuery
 		ISpanMultiTermQuery IQueryContainer.SpanMultiTerm { get { return _spanMultiTerm; } set { _spanMultiTerm = Set(value); } }
 		ISpanFieldMaskingQuery IQueryContainer.SpanFieldMasking { get { return _spanFieldMasking; } set { _spanFieldMasking = Set(value); } }
 		INestedQuery IQueryContainer.Nested { get { return _nested; } set { _nested = Set(value); } }
-#pragma warning disable 618
-		IIndicesQuery IQueryContainer.Indices { get { return _indices; } set { _indices = Set(value); } }
-#pragma warning restore 618
 		IFunctionScoreQuery IQueryContainer.FunctionScore { get { return _functionScore; } set { _functionScore = Set(value); } }
-#pragma warning disable 618
-		ITemplateQuery IQueryContainer.Template { get { return _template; } set { _template = Set(value); } }
-#pragma warning restore 618
 		IGeoBoundingBoxQuery IQueryContainer.GeoBoundingBox { get { return _geoBoundingBox; } set { _geoBoundingBox = Set(value); } }
 		IGeoDistanceQuery IQueryContainer.GeoDistance { get { return _geoDistance; } set { _geoDistance = Set(value); } }
 		IGeoPolygonQuery IQueryContainer.GeoPolygon { get { return _geoPolygon; } set { _geoPolygon = Set(value); } }

src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs

@@ -129,15 +129,6 @@ public QueryContainer Conditionless(Func<ConditionlessQueryDescriptor<T>, ICondi
 			return query?.Query ?? query?.Fallback;
 		}
 
-		/// <summary>
-		/// The indices query can be used when executed across multiple indices, allowing to have a query that executes
-		/// only when executed on an index that matches a specific list of indices, and another query that executes
-		/// when it is executed on an index that does not match the listed indices.
-		/// </summary>
-		[Obsolete("Deprecated. You can specify _index on the query to target specific indices")]
-		public QueryContainer Indices(Func<IndicesQueryDescriptor<T>, IIndicesQuery> selector) =>
-			WrapInContainer(selector, (query, container) => container.Indices = query);
-
 		/// <summary>
 		/// Matches documents with fields that have terms within a certain numeric range.
 		/// </summary>
@@ -491,14 +482,6 @@ public QueryContainer Regexp(Func<RegexpQueryDescriptor<T>, IRegexpQuery> select
 		public QueryContainer FunctionScore(Func<FunctionScoreQueryDescriptor<T>, IFunctionScoreQuery> selector) =>
 			WrapInContainer(selector, (query, container) => container.FunctionScore = query);
 
-		/// <summary>
-		/// A query that accepts a query template and a map of key/value pairs to fill in template parameters.
-		/// Templating is based on Mustache.
-		/// </summary>
-		[Obsolete("Deprecated in 5.0.0. Use Search Template API instead")]
-		public QueryContainer Template(Func<TemplateQueryDescriptor<T>, ITemplateQuery> selector) =>
-			WrapInContainer(selector, (query, container) => container.Template = query);
-
 		public QueryContainer Script(Func<ScriptQueryDescriptor<T>, IScriptQuery> selector) =>
 			WrapInContainer(selector, (query, container) => container.Script = query);
 

src/Nest/QueryDsl/Compound/Indices/IndicesQuery.cs

@@ -22,14 +22,6 @@ public interface ISimpleQueryStringQuery : IQuery
 		[JsonProperty("flags")]
 		SimpleQueryStringFlags? Flags { get; set; }
 
-		[JsonProperty("locale")]
-		[Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")]
-		string Locale { get; set; }
-
-		[JsonProperty("lowercase_expanded_terms")]
-		[Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")]
-		bool? LowercaseExpandedTerms { get; set; }
-
 		[JsonProperty("lenient")]
 		bool? Lenient { get; set; }
 
@@ -51,10 +43,6 @@ public class SimpleQueryStringQuery : QueryBase, ISimpleQueryStringQuery
 		public string Analyzer { get; set; }
 		public Operator? DefaultOperator { get; set; }
 		public SimpleQueryStringFlags? Flags { get; set; }
-		[Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")]
-		public string Locale { get; set; }
-		[Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")]
-		public bool? LowercaseExpandedTerms { get; set; }
 		public bool? Lenient { get; set; }
 		public bool? AnalyzeWildcard { get; set; }
 		public MinimumShouldMatch MinimumShouldMatch { get; set; }
@@ -74,10 +62,6 @@ public class SimpleQueryStringQueryDescriptor<T>
 		string ISimpleQueryStringQuery.Analyzer { get; set; }
 		Operator? ISimpleQueryStringQuery.DefaultOperator { get; set; }
 		SimpleQueryStringFlags? ISimpleQueryStringQuery.Flags { get; set; }
-		[Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")]
-		string ISimpleQueryStringQuery.Locale { get; set; }
-		[Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")]
-		bool? ISimpleQueryStringQuery.LowercaseExpandedTerms { get; set; }
 		bool? ISimpleQueryStringQuery.AnalyzeWildcard { get; set; }
 		bool? ISimpleQueryStringQuery.Lenient { get; set; }
 		MinimumShouldMatch ISimpleQueryStringQuery.MinimumShouldMatch { get; set; }
@@ -96,13 +80,6 @@ public SimpleQueryStringQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPro
 
 		public SimpleQueryStringQueryDescriptor<T> Flags(SimpleQueryStringFlags? flags) => Assign(a => a.Flags = flags);
 
-		[Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")]
-		public SimpleQueryStringQueryDescriptor<T> Locale(string locale) => Assign(a => a.Locale = locale);
-
-		[Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")]
-		public SimpleQueryStringQueryDescriptor<T> LowercaseExpandedTerms(bool? lowercaseExpandedTerms = true) =>
-			Assign(a => a.LowercaseExpandedTerms = lowercaseExpandedTerms);
-
 		public SimpleQueryStringQueryDescriptor<T> AnalyzeWildcard(bool? analyzeWildcard = true) =>
 			Assign(a => a.AnalyzeWildcard = analyzeWildcard);