Drop name from all analysis component factories

modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ASCIIFoldingTokenFilterFactory.java

@@ -57,10 +57,6 @@ public Object getMultiTermComponent() {
         } else {
             // See https://issues.apache.org/jira/browse/LUCENE-7536 for the reasoning
             return new TokenFilterFactory() {
-                @Override
-                public String name() {
-                    return ASCIIFoldingTokenFilterFactory.this.name();
-                }
                 @Override
                 public TokenStream create(TokenStream tokenStream) {
                     return new ASCIIFoldingFilter(tokenStream, false);

modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonAnalysisPlugin.java

@@ -273,11 +273,6 @@ public List<PreConfiguredTokenizer> getPreConfiguredTokenizers() {
         List<PreConfiguredTokenizer> tokenizers = new ArrayList<>();
         tokenizers.add(PreConfiguredTokenizer.singleton("keyword", KeywordTokenizer::new, null));
         tokenizers.add(PreConfiguredTokenizer.singleton("lowercase", LowerCaseTokenizer::new, () -> new TokenFilterFactory() {
-            @Override
-            public String name() {
-                return "lowercase";
-            }
-
             @Override
             public TokenStream create(TokenStream tokenStream) {
                 return new LowerCaseFilter(tokenStream);

server/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java

@@ -23,17 +23,9 @@
 import org.elasticsearch.index.IndexSettings;
 
 public abstract class AbstractCharFilterFactory extends AbstractIndexComponent implements CharFilterFactory {
-
-    private final String name;
-
+    // TODO replace with AbstractIndexComponent
     public AbstractCharFilterFactory(IndexSettings indexSettings, String name) {
         super(indexSettings);
-        this.name = name;
-    }
-
-    @Override
-    public String name() {
-        return this.name;
     }
 }
 

server/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java

@@ -26,30 +26,19 @@
 import org.elasticsearch.index.IndexSettings;
 
 public abstract class AbstractIndexAnalyzerProvider<T extends Analyzer> extends AbstractIndexComponent implements AnalyzerProvider<T> {
-
-    private final String name;
-
     protected final Version version;
 
     /**
      * Constructs a new analyzer component, with the index name and its settings and the analyzer name.
      *
      * @param indexSettings the settings and the name of the index
-     * @param name          The analyzer name
      */
-    public AbstractIndexAnalyzerProvider(IndexSettings indexSettings, String name, Settings settings) {
+    // TODO drop ignored
+    public AbstractIndexAnalyzerProvider(IndexSettings indexSettings, String ignored, Settings settings) {
         super(indexSettings);
-        this.name = name;
         this.version = Analysis.parseAnalysisVersion(this.indexSettings.getSettings(), settings, logger);
     }
 
-    /**
-     * Returns the injected name of the analyzer.
-     */
-    @Override
-    public final String name() {
-        return this.name;
-    }
 
     @Override
     public final AnalyzerScope scope() {

server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java

@@ -36,11 +36,6 @@ public AbstractTokenFilterFactory(IndexSettings indexSettings, String name, Sett
         this.version = Analysis.parseAnalysisVersion(this.indexSettings.getSettings(), settings, logger);
     }
 
-    @Override
-    public String name() {
-        return this.name;
-    }
-
     public final Version version() {
         return version;
     }

server/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java

@@ -23,9 +23,6 @@
 import org.elasticsearch.common.inject.Provider;
 
 public interface AnalyzerProvider<T extends Analyzer> extends Provider<T> {
-
-    String name();
-
     AnalyzerScope scope();
 
     @Override

server/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java

@@ -21,9 +21,6 @@
 
 import java.io.Reader;
 
-public interface CharFilterFactory {
-
-    String name();
-
+public interface CharFilterFactory {   // TODO replace with Function<Reader, Reader>
     Reader create(Reader reader);
 }

server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java

@@ -30,23 +30,29 @@ public final class CustomAnalyzer extends Analyzer {
     private final String tokenizerName;
     private final TokenizerFactory tokenizerFactory;
 
+    private final String[] charFilterNames;
     private final CharFilterFactory[] charFilters;
 
+    private final String[] tokenFilterNames;
     private final TokenFilterFactory[] tokenFilters;
 
     private final int positionIncrementGap;
     private final int offsetGap;
 
-    public CustomAnalyzer(String tokenizerName, TokenizerFactory tokenizerFactory, CharFilterFactory[] charFilters,
-            TokenFilterFactory[] tokenFilters) {
-        this(tokenizerName, tokenizerFactory, charFilters, tokenFilters, 0, -1);
+    public CustomAnalyzer(String tokenizerName, TokenizerFactory tokenizerFactory,
+            String[] charFilterNames, CharFilterFactory[] charFilters,
+            String[] tokenFilterNames, TokenFilterFactory[] tokenFilters) {
+        this(tokenizerName, tokenizerFactory, charFilterNames, charFilters, tokenFilterNames, tokenFilters, 0, -1);
     }
 
-    public CustomAnalyzer(String tokenizerName, TokenizerFactory tokenizerFactory, CharFilterFactory[] charFilters,
-            TokenFilterFactory[] tokenFilters, int positionIncrementGap, int offsetGap) {
+    public CustomAnalyzer(String tokenizerName, TokenizerFactory tokenizerFactory,
+            String[] charFilterNames, CharFilterFactory[] charFilters,
+            String[] tokenFilterNames, TokenFilterFactory[] tokenFilters, int positionIncrementGap, int offsetGap) {
         this.tokenizerName = tokenizerName;
         this.tokenizerFactory = tokenizerFactory;
+        this.charFilterNames = charFilterNames;
         this.charFilters = charFilters;
+        this.tokenFilterNames = tokenFilterNames;
         this.tokenFilters = tokenFilters;
         this.positionIncrementGap = positionIncrementGap;
         this.offsetGap = offsetGap;
@@ -63,10 +69,24 @@ public TokenizerFactory tokenizerFactory() {
         return tokenizerFactory;
     }
 
+    /**
+     * Names of the token filters.
+     */
+    public String[] getTokenFilterNames() {
+        return tokenFilterNames;
+    }
+
     public TokenFilterFactory[] tokenFilters() {
         return tokenFilters;
     }
 
+    /**
+     * Names of the char filters.
+     */
+    public String[] getCharFilterNames() {
+        return charFilterNames;
+    }
+
     public CharFilterFactory[] charFilters() {
         return charFilters;
     }

server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java

@@ -29,14 +29,10 @@ public PreBuiltAnalyzerProvider(String name, AnalyzerScope scope, Analyzer analy
         // we create the named analyzer here so the resources associated with it will be shared
         // and we won't wrap a shared analyzer with named analyzer each time causing the resources
         // to not be shared...
+        // TODO why not pass a NamedAnalyzer into the method?
         this.analyzer = new NamedAnalyzer(name, scope, analyzer);
     }
 
-    @Override
-    public String name() {
-        return analyzer.name();
-    }
-
     @Override
     public AnalyzerScope scope() {
         return analyzer.scope();

server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java

@@ -80,11 +80,6 @@ private interface MultiTermAwareCharFilterFactory extends CharFilterFactory, Mul
     protected CharFilterFactory create(Version version) {
         if (useFilterForMultitermQueries) {
             return new MultiTermAwareCharFilterFactory() {
-                @Override
-                public String name() {
-                    return getName();
-                }
-
                 @Override
                 public Reader create(Reader reader) {
                     return create.apply(reader, version);
@@ -101,11 +96,6 @@ public Object getMultiTermComponent() {
             public Reader create(Reader reader) {
                 return create.apply(reader, version);
             }
-
-            @Override
-            public String name() {
-                return getName();
-            }
         };
     }
 

server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java

@@ -81,11 +81,6 @@ private interface MultiTermAwareTokenFilterFactory extends TokenFilterFactory, M
     protected TokenFilterFactory create(Version version) {
         if (useFilterForMultitermQueries) {
             return new MultiTermAwareTokenFilterFactory() {
-                @Override
-                public String name() {
-                    return getName();
-                }
-
                 @Override
                 public TokenStream create(TokenStream tokenStream) {
                     return create.apply(tokenStream, version);
@@ -98,11 +93,6 @@ public Object getMultiTermComponent() {
             };
         }
         return new TokenFilterFactory() {
-            @Override
-            public String name() {
-                return getName();
-            }
-
             @Override
             public TokenStream create(TokenStream tokenStream) {
                 return create.apply(tokenStream, version);

server/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java

@@ -24,8 +24,6 @@
 import org.elasticsearch.search.fetch.subphase.highlight.FastVectorHighlighter;
 
 public interface TokenFilterFactory {
-    String name();
-
     TokenStream create(TokenStream tokenStream);
 
     /**