Skip to content

Commit d614804

Browse files
authored
Remove analyzer version deprecation check (#118167)
Version has been deprecated since v7: #74073 Removing checking for the version setting. It has been ignored and does nothing for the entirety of 8 and for the last minors of v7.
1 parent eb59b98 commit d614804

File tree

174 files changed

+182
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+182
-230
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class ASCIIFoldingTokenFilterFactory extends AbstractTokenFilterFactory i
3030
private final boolean preserveOriginal;
3131

3232
public ASCIIFoldingTokenFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
33-
super(name, settings);
33+
super(name);
3434
preserveOriginal = settings.getAsBoolean(PRESERVE_ORIGINAL.getPreferredName(), DEFAULT_PRESERVE_ORIGINAL);
3535
}
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public abstract class AbstractCompoundWordTokenFilterFactory extends AbstractTok
3030
protected final CharArraySet wordList;
3131

3232
protected AbstractCompoundWordTokenFilterFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) {
33-
super(name, settings);
33+
super(name);
3434

3535
minWordSize = settings.getAsInt("min_word_size", CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE);
3636
minSubwordSize = settings.getAsInt("min_subword_size", CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
public class ApostropheFilterFactory extends AbstractTokenFilterFactory {
2222

2323
ApostropheFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
24-
super(name, settings);
24+
super(name);
2525
}
2626

2727
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ArabicAnalyzerProvider extends AbstractIndexAnalyzerProvider<Arabic
2222
private final ArabicAnalyzer arabicAnalyzer;
2323

2424
ArabicAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
25-
super(name, settings);
25+
super(name);
2626
arabicAnalyzer = new ArabicAnalyzer(
2727
Analysis.parseStopWords(env, settings, ArabicAnalyzer.getDefaultStopSet()),
2828
Analysis.parseStemExclusion(settings, CharArraySet.EMPTY_SET)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class ArabicNormalizationFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory {
2020

2121
ArabicNormalizationFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
22-
super(name, settings);
22+
super(name);
2323
}
2424

2525
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class ArabicStemTokenFilterFactory extends AbstractTokenFilterFactory {
2020

2121
ArabicStemTokenFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
22-
super(name, settings);
22+
super(name);
2323
}
2424

2525
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ArmenianAnalyzerProvider extends AbstractIndexAnalyzerProvider<Arme
2222
private final ArmenianAnalyzer analyzer;
2323

2424
ArmenianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
25-
super(name, settings);
25+
super(name);
2626
analyzer = new ArmenianAnalyzer(
2727
Analysis.parseStopWords(env, settings, ArmenianAnalyzer.getDefaultStopSet()),
2828
Analysis.parseStemExclusion(settings, CharArraySet.EMPTY_SET)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class BasqueAnalyzerProvider extends AbstractIndexAnalyzerProvider<Basque
2222
private final BasqueAnalyzer analyzer;
2323

2424
BasqueAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
25-
super(name, settings);
25+
super(name);
2626
analyzer = new BasqueAnalyzer(
2727
Analysis.parseStopWords(env, settings, BasqueAnalyzer.getDefaultStopSet()),
2828
Analysis.parseStemExclusion(settings, CharArraySet.EMPTY_SET)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class BengaliAnalyzerProvider extends AbstractIndexAnalyzerProvider<Benga
2222
private final BengaliAnalyzer analyzer;
2323

2424
BengaliAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
25-
super(name, settings);
25+
super(name);
2626
analyzer = new BengaliAnalyzer(
2727
Analysis.parseStopWords(env, settings, BengaliAnalyzer.getDefaultStopSet()),
2828
Analysis.parseStemExclusion(settings, CharArraySet.EMPTY_SET)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
public class BengaliNormalizationFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory {
2323

2424
BengaliNormalizationFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
25-
super(name, settings);
25+
super(name);
2626
}
2727

2828
@Override

0 commit comments

Comments
 (0)