Mark type level analyzers as obsolete and add a convenience method fo… (#2506)

* Mark type level analyzers as obsolete and add a convenience method for setting an index-level default

* remove Default()

Author: gmarz

src/Nest/Mapping/TypeMapping.cs

@@ -20,9 +20,11 @@ public interface ITypeMapping
 		[JsonProperty("include_in_all")]
 		bool? IncludeInAll { 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; }
 
@@ -66,8 +68,6 @@ public class TypeMapping : ITypeMapping
 		/// <inheritdoc/>
 		public IAllField AllField { get; set; }
 		/// <inheritdoc/>
-		public string Analyzer { get; set; }
-		/// <inheritdoc/>
 		public bool? DateDetection { get; set; }
 		/// <inheritdoc/>
 		public bool? IncludeInAll { get; set; }
@@ -92,6 +92,10 @@ 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; }
@@ -105,7 +109,6 @@ public class TypeMappingDescriptor<T> : DescriptorBase<TypeMappingDescriptor<T>,
 		where T : class
 	{
 		IAllField ITypeMapping.AllField { get; set; }
-		string ITypeMapping.Analyzer { get; set; }
 		bool? ITypeMapping.DateDetection { get; set; }
 		bool? ITypeMapping.IncludeInAll { get; set; }
 		Union<bool, DynamicMapping> ITypeMapping.Dynamic { get; set; }
@@ -118,6 +121,9 @@ public class TypeMappingDescriptor<T> : DescriptorBase<TypeMappingDescriptor<T>,
 		IParentField ITypeMapping.ParentField { 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; }
@@ -150,9 +156,11 @@ public TypeMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int max
 		public TypeMappingDescriptor<T> Parent<TOther>() where TOther : class => Assign(a => a.ParentField = new ParentField { Type = typeof(TOther) });
 
 		/// <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/>

src/Tests/Analysis/Analyzers/AnalyzerUsageTests.cs

@@ -15,6 +15,10 @@ public class AnalyzerUsageTests : PromiseUsageTestBase<IIndexSettings, IndexSett
 			{
 				analyzer = new
 				{
+					@default = new
+					{
+						type = "keyword"
+					},
 					myCustom = new
 					{
 						type = "custom",
@@ -78,6 +82,7 @@ public class AnalyzerUsageTests : PromiseUsageTestBase<IIndexSettings, IndexSett
 		public static Func<IndexSettingsDescriptor, IPromise<IndexSettings>> FluentExample => s => s
 			.Analysis(analysis => analysis
 				.Analyzers(analyzers => analyzers
+					.Keyword("default")
 					.Custom("myCustom", a => a
 						.Filters("myAscii", "kstem")
 						.CharFilters("stripMe", "patterned")
@@ -111,6 +116,7 @@ public class AnalyzerUsageTests : PromiseUsageTestBase<IIndexSettings, IndexSett
 				{
 					Analyzers = new Nest.Analyzers
 					{
+						{ "default", new KeywordAnalyzer() },
 						{ "myCustom", new CustomAnalyzer
 						{
 							CharFilter = new [] { "stripMe", "patterned"},