Remove redundant code for GA release (#3067)

Author: Stuart Cam

docs/query-dsl/full-text/query-string/query-string-usage.asciidoc

@@ -31,7 +31,6 @@ q
     .QuoteAnalyzer("quote-an")
     .AllowLeadingWildcard()
     .MaximumDeterminizedStates(2)
-    .EnablePositionIncrements()
     .Escape()
     .FuzzyPrefixLength(2)
     .FuzzyMaxExpansions(3)
@@ -43,7 +42,6 @@ q
     .MinimumShouldMatch(2)
     .QuoteFieldSuffix("'")
     .Lenient()
-    .Timezone("root")
 )
 ----
 
@@ -63,7 +61,6 @@ new QueryStringQuery
     QuoteAnalyzer = "quote-an",
     AllowLeadingWildcard = true,
     MaximumDeterminizedStates = 2,
-    EnablePositionIncrements = true,
     Escape = true,
     FuzzyPrefixLength = 2,
     FuzzyMaxExpansions = 3,
@@ -75,7 +72,6 @@ new QueryStringQuery
     MinimumShouldMatch = 2,
     QuoteFieldSuffix = "'",
     Lenient = true,
-    Timezone = "root"
 }
 ----
 
@@ -92,15 +88,13 @@ new QueryStringQuery
     "analyzer": "standard",
     "quote_analyzer": "quote-an",
     "allow_leading_wildcard": true,
-    "enable_position_increments": true,
     "fuzzy_max_expansions": 3,
     "fuzziness": "AUTO",
     "fuzzy_prefix_length": 2,
     "analyze_wildcard": true,
     "max_determinized_states": 2,
     "minimum_should_match": 2,
     "lenient": true,
-    "time_zone": "root",
     "fields": [
       "description",
       "myOtherField"

src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs

@@ -23,9 +23,8 @@ public interface IGeoDistanceAggregation : IBucketAggregation
 		GeoDistanceType? DistanceType { get; set; }
 
 		[JsonProperty("ranges")]
-#pragma warning disable 618
-		IEnumerable<IRange> Ranges { get; set; }
-#pragma warning restore 618
+		IEnumerable<IAggregationRange> Ranges { get; set; }
+
 	}
 
 	public class GeoDistanceAggregation : BucketAggregationBase, IGeoDistanceAggregation
@@ -38,9 +37,7 @@ public class GeoDistanceAggregation : BucketAggregationBase, IGeoDistanceAggrega
 
 		public GeoDistanceType? DistanceType { get; set; }
 
-#pragma warning disable 618
-		public IEnumerable<IRange> Ranges { get; set; }
-#pragma warning restore 618
+		public IEnumerable<IAggregationRange> Ranges { get; set; }
 
 		internal GeoDistanceAggregation() { }
 
@@ -62,9 +59,7 @@ public class GeoDistanceAggregationDescriptor<T> :
 
 		GeoDistanceType? IGeoDistanceAggregation.DistanceType { get; set; }
 
-#pragma warning disable 618
-		IEnumerable<IRange> IGeoDistanceAggregation.Ranges { get; set; }
-#pragma warning restore 618
+		IEnumerable<IAggregationRange> IGeoDistanceAggregation.Ranges { get; set; }
 
 		public GeoDistanceAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
@@ -78,9 +73,7 @@ public class GeoDistanceAggregationDescriptor<T> :
 
 		public GeoDistanceAggregationDescriptor<T> DistanceType(GeoDistanceType? geoDistance) => Assign(a => a.DistanceType = geoDistance);
 
-#pragma warning disable 618
-		public GeoDistanceAggregationDescriptor<T> Ranges(params Func<RangeDescriptor, IRange>[] ranges) =>
-			Assign(a => a.Ranges = ranges?.Select(r => r(new RangeDescriptor())));
-#pragma warning restore 618
+		public GeoDistanceAggregationDescriptor<T> Ranges(params Func<AggregationRangeDescriptor, IAggregationRange>[] ranges) =>
+			Assign(a => a.Ranges = ranges?.Select(r => r(new AggregationRangeDescriptor())));
 	}
 }

src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs

@@ -17,19 +17,14 @@ public interface IRangeAggregation : IBucketAggregation
 		IScript Script { get; set; }
 
 		[JsonProperty("ranges")]
-#pragma warning disable 618
-		IEnumerable<IRange> Ranges { get; set; }
-#pragma warning restore 618
+		IEnumerable<IAggregationRange> Ranges { get; set; }
 	}
 
 	public class RangeAggregation : BucketAggregationBase, IRangeAggregation
 	{
 		public Field Field { get; set; }
 		public IScript Script { get; set; }
-#pragma warning disable 618
-		public IEnumerable<IRange> Ranges { get; set; }
-#pragma warning restore 618
-
+		public IEnumerable<IAggregationRange> Ranges { get; set; }
 		internal RangeAggregation() { }
 
 		public RangeAggregation(string name) : base(name) { }
@@ -45,9 +40,7 @@ public class RangeAggregationDescriptor<T>
 
 		IScript IRangeAggregation.Script { get; set; }
 
-#pragma warning disable 618
-		IEnumerable<IRange> IRangeAggregation.Ranges { get; set; }
-#pragma warning restore 618
+		IEnumerable<IAggregationRange> IRangeAggregation.Ranges { get; set; }
 
 		public RangeAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
@@ -58,9 +51,7 @@ public class RangeAggregationDescriptor<T>
 		public RangeAggregationDescriptor<T> Script(Func<ScriptDescriptor, IScript> scriptSelector) =>
 			Assign(a => a.Script = scriptSelector?.Invoke(new ScriptDescriptor()));
 
-#pragma warning disable 618
-		public RangeAggregationDescriptor<T> Ranges(params Func<RangeDescriptor, IRange>[] ranges) =>
-			Assign(a => a.Ranges = ranges.Select(r => r(new RangeDescriptor())));
-#pragma warning restore 618
+		public RangeAggregationDescriptor<T> Ranges(params Func<AggregationRangeDescriptor, IAggregationRange>[] ranges) =>
+			Assign(a => a.Ranges = ranges.Select(r => r(new AggregationRangeDescriptor())));
 	}
 }

src/Nest/CommonAbstractions/SerializationBehavior/ElasticContractResolver.cs

@@ -230,9 +230,7 @@ protected bool ShouldSerializeRouting(object o, JsonProperty prop)
 		private static readonly StringEnumConverter StringEnumConverter = new StringEnumConverter();
 		private static readonly StringTimeSpanConverter StringTimeSpanConverter = new StringTimeSpanConverter();
 		private static readonly MachineLearningDateTimeConverter MachineLearningDateTimeConverter = new MachineLearningDateTimeConverter();
-#pragma warning disable 618
-		private static readonly Type[] StringSignalTypes = {typeof(KeywordAttribute), typeof(StringAttribute), typeof(TextAttribute)};
-#pragma warning restore 618
+		private static readonly Type[] StringSignalTypes = {typeof(KeywordAttribute), typeof(TextAttribute)};
 		private static void ApplyBuildInSerializers(MemberInfo member, JsonProperty property)
 		{
 			var attributes = member.GetCustomAttributes().ToList();

src/Nest/CommonOptions/Range/AggregationRange.cs

@@ -9,9 +9,8 @@ namespace Nest
 	/// part of your document please use explicit range class e.g DateRange, FloatRange etc
 	/// </summary>
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof(ReadAsTypeJsonConverter<Range>))]
-	[Obsolete("Renamed to IAggregationRange scheduled for removal in 6.0")]
-	public interface IRange
+	[JsonConverter(typeof(ReadAsTypeJsonConverter<AggregationRange>))]
+	public interface IAggregationRange
 	{
 		[JsonProperty("from")]
 		double? From { get; set; }
@@ -23,42 +22,23 @@ public interface IRange
 		string Key { get; set; }
 	}
 
-	/// <summary>
-	/// Range that defines a bucket for either the <see cref="RangeAggregation"/> or
-	/// <see cref="GeoDistanceAggregation"/>. If you are looking to store ranges as
-	/// part of your document please use explicit range class e.g DateRange, FloatRange etc
-	/// </summary>
-	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof(ReadAsTypeJsonConverter<AggregationRange>))]
-#pragma warning disable 618
-	public interface IAggregationRange : IRange {}
-
 	/// <inheritdoc/>
-	[Obsolete("Renamed to AggregationRange, scheduled for removal in 6.0")]
-	public class Range : IRange
+	public class AggregationRange : IAggregationRange
 	{
 		public double? From { get; set; }
 		public double? To { get; set; }
 		public string Key { get; set; }
 	}
 
 	/// <inheritdoc/>
-	public class AggregationRange : Range, IAggregationRange { }
-
-	/// <inheritdoc/>
-	[Obsolete("Renamed to AggregationRangeDescriptor, scheduled for removal in 6.0")]
-	public class RangeDescriptor : DescriptorBase<RangeDescriptor, IRange>, IRange
+	public class AggregationRangeDescriptor : DescriptorBase<AggregationRangeDescriptor, IAggregationRange>, IAggregationRange
 	{
-		double? IRange.From { get; set; }
-		string IRange.Key { get; set; }
-		double? IRange.To { get; set; }
+		double? IAggregationRange.From { get; set; }
+		string IAggregationRange.Key { get; set; }
+		double? IAggregationRange.To { get; set; }
 
-		public RangeDescriptor Key(string key) => Assign(a => a.Key = key);
-		public RangeDescriptor From(double? from) => Assign(a => a.From = from);
-		public RangeDescriptor To(double? to) => Assign(a => a.To = to);
+		public AggregationRangeDescriptor Key(string key) => Assign(a => a.Key = key);
+		public AggregationRangeDescriptor From(double? from) => Assign(a => a.From = from);
+		public AggregationRangeDescriptor To(double? to) => Assign(a => a.To = to);
 	}
-
-	/// <inheritdoc/>
-	public class AggregationRangeDescriptor : RangeDescriptor, IAggregationRange { }
-#pragma warning restore 618
 }

src/Nest/CommonOptions/Scripting/ScriptBase.cs

@@ -103,7 +103,7 @@ public class ScriptDescriptor : DescriptorBase<ScriptDescriptor, IDescriptor>
 	{
 		public IndexedScriptDescriptor Id(string id) => new IndexedScriptDescriptor(id);
 
-		[Obsolete("Use Id(). Indexed() sets a property named id, which is confusing. Will be removed in the next major version")]
+		[Obsolete("Use Id(). Indexed() sets a property named id, which is confusing. Will be removed in NEST 7.x")]
 		public IndexedScriptDescriptor Indexed(string id) => new IndexedScriptDescriptor(id);
 
 		[Obsolete("Use Source(). Inline() is deprecated and scheduled to be removed in Elasticsearch 7.0")]

src/Nest/Indices/MappingManagement/GetMapping/GetMappingResponse.cs

@@ -46,10 +46,9 @@ public class GetMappingResponse : DictionaryResponseBase<IndexName, IndexMapping
 		[Obsolete("Renamed to Indices, will be deleted from NEST 7.x")]
 		public IReadOnlyDictionary<IndexName, IndexMappings> Mappings => Indices;
 
-		[Obsolete("Use GetMappingFor explicitly instead this is a leaky abstraction that returns the mapping of the first index's first type on the response")]
+		[Obsolete("Recommended to use GetMappingFor, this is a leaky abstraction that returns the mapping of the first index's first type on the response")]
 		public ITypeMapping Mapping => this.Indices.FirstOrDefault().Value?.Mappings?.FirstOrDefault().Value;
 
-
 		public void Accept(IMappingVisitor visitor)
 		{
 			var walker = new MappingWalker(visitor);

src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs

@@ -27,10 +27,6 @@ internal PutMappingRequest() { }
 		/// <inheritdoc/>
 		public Union<bool, DynamicMapping> Dynamic { get; set; }
 		/// <inheritdoc/>
-		public string Analyzer { get; set; }
-		/// <inheritdoc/>
-		public string SearchAnalyzer { get; set; }
-		/// <inheritdoc/>
 		public IFieldNamesField FieldNamesField { get; set; }
 		/// <inheritdoc/>
 		public IIndexField IndexField { get; set; }
@@ -63,10 +59,6 @@ public PutMappingRequest() : this(typeof(T), typeof(T)) { }
 		/// <inheritdoc/>
 		public Union<bool, DynamicMapping> Dynamic { get; set; }
 		/// <inheritdoc/>
-		public string Analyzer { get; set; }
-		/// <inheritdoc/>
-		public string SearchAnalyzer { get; set; }
-		/// <inheritdoc/>
 		public IFieldNamesField FieldNamesField { get; set; }
 		/// <inheritdoc/>
 		public IIndexField IndexField { get; set; }
@@ -95,8 +87,6 @@ public PutMappingDescriptor(IndexName index, TypeName type) : base(r=>r.Required
 		IAllField ITypeMapping.AllField { get; set; }
 		bool? ITypeMapping.DateDetection { get; set; }
 		IEnumerable<string> ITypeMapping.DynamicDateFormats { get; set; }
-		string ITypeMapping.Analyzer { get; set; }
-		string ITypeMapping.SearchAnalyzer { get; set; }
 		IDynamicTemplateContainer ITypeMapping.DynamicTemplates { get; set; }
 		Union<bool, DynamicMapping> ITypeMapping.Dynamic { get; set; }
 		IFieldNamesField ITypeMapping.FieldNamesField { get; set; }
@@ -126,14 +116,6 @@ public PutMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int maxR
 		/// <inheritdoc/>
 		public PutMappingDescriptor<T> Dynamic(bool? dynamic = true) => Assign(a => a.Dynamic = dynamic);
 
-#pragma warning disable 618
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
-
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> SearchAnalyzer(string searchAnalyzer) => Assign(a => a.SearchAnalyzer = searchAnalyzer);
-#pragma warning restore 618
-
 		/// <inheritdoc/>
 		public PutMappingDescriptor<T> AllField(Func<AllFieldDescriptor, IAllField> allFieldSelector) => Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));
 

src/Nest/Mapping/DynamicTemplate/SingleMapping.cs

@@ -6,10 +6,6 @@ namespace Nest
 {
 	public class SingleMappingSelector<T> : SelectorBase<IProperty>, IPropertiesDescriptor<T, IProperty> where T : class
 	{
-		[Obsolete("Only valid for indices created before Elasticsearch 5.0 and will be removed in the next major version.  For newly created indices, use `text` or `keyword` instead.")]
-		public IProperty String(Func<StringPropertyDescriptor<T>, IStringProperty> selector) =>
-			selector?.Invoke(new StringPropertyDescriptor<T>());
-
 		public IProperty Text(Func<TextPropertyDescriptor<T>, ITextProperty> selector) =>
 			selector?.Invoke(new TextPropertyDescriptor<T>());
 

src/Nest/Mapping/TypeMapping.cs

@@ -17,14 +17,6 @@ public interface ITypeMapping
 		[JsonProperty("numeric_detection")]
 		bool? NumericDetection { get; set; }
 
-		[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level.  Use an index or field level analyzer instead.")]
-		[JsonProperty("analyzer")]
-		string Analyzer { get; set; }
-
-		[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level.  Use an index or field level analyzer instead.")]
-		[JsonProperty("search_analyzer")]
-		string SearchAnalyzer { get; set; }
-
 		[JsonProperty("_source")]
 		ISourceField SourceField { get; set; }
 
@@ -82,12 +74,6 @@ public class TypeMapping : ITypeMapping
 		/// <inheritdoc/>
 		public IRoutingField RoutingField { get; set; }
 		/// <inheritdoc/>
-		[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level.  Use an index or field level analyzer instead.")]
-		public string Analyzer { get; set; }
-		/// <inheritdoc/>
-		[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level.  Use an index or field level analyzer instead.")]
-		public string SearchAnalyzer { get; set; }
-		/// <inheritdoc/>
 		public ISizeField SizeField { get; set; }
 		/// <inheritdoc/>
 		public ISourceField SourceField { get; set; }
@@ -108,10 +94,6 @@ public class TypeMappingDescriptor<T> : DescriptorBase<TypeMappingDescriptor<T>,
 		bool? ITypeMapping.NumericDetection { get; set; }
 		IProperties ITypeMapping.Properties { get; set; }
 		IRoutingField ITypeMapping.RoutingField { get; set; }
-		[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level.  Use an index or field level analyzer instead.")]
-		string ITypeMapping.Analyzer { get; set; }
-		[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level.  Use an index or field level analyzer instead.")]
-		string ITypeMapping.SearchAnalyzer { get; set; }
 		ISizeField ITypeMapping.SizeField { get; set; }
 		ISourceField ITypeMapping.SourceField { get; set; }
 
@@ -144,14 +126,6 @@ public TypeMappingDescriptor<T> AutoMap<TDocument>(IPropertyVisitor visitor = nu
 		/// <inheritdoc/>
 		public TypeMappingDescriptor<T> Dynamic(bool dynamic = true) => Assign(a => a.Dynamic = dynamic);
 
-		/// <inheritdoc/>
-		[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level.  Use an index or field level analyzer instead.")]
-		public TypeMappingDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
-
-		/// <inheritdoc/>
-		[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level.  Use an index or field level analyzer instead.")]
-		public TypeMappingDescriptor<T> SearchAnalyzer(string searchAnalyzer)=> Assign(a => a.SearchAnalyzer = searchAnalyzer);
-
 		/// <inheritdoc/>
 		public TypeMappingDescriptor<T> AllField(Func<AllFieldDescriptor, IAllField> allFieldSelector) => Assign(a => a.AllField = allFieldSelector?.Invoke(new AllFieldDescriptor()));