Skip to content

Commit 2103c8f

Browse files
committed
Remove ElasticsearchIllegalArgumentException and ElasticsearchIllegalStateException in favor of the JDK one
Related to #10794 Closes #41.
1 parent 616c64d commit 2103c8f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/main/java/org/elasticsearch/index/analysis/PhoneticTokenFilterFactory.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.lucene.analysis.phonetic.BeiderMorseFilter;
3030
import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter;
3131
import org.apache.lucene.analysis.phonetic.PhoneticFilter;
32-
import org.elasticsearch.ElasticsearchIllegalArgumentException;
3332
import org.elasticsearch.common.inject.Inject;
3433
import org.elasticsearch.common.inject.assistedinject.Assisted;
3534
import org.elasticsearch.common.settings.Settings;
@@ -90,7 +89,7 @@ public PhoneticTokenFilterFactory(Index index, @IndexSettings Settings indexSett
9089
} else if ("exact".equalsIgnoreCase(ruleType)) {
9190
ruletype = RuleType.EXACT;
9291
} else {
93-
throw new ElasticsearchIllegalArgumentException("No matching rule type [" + ruleType + "] for beider morse encoder");
92+
throw new IllegalArgumentException("No matching rule type [" + ruleType + "] for beider morse encoder");
9493
}
9594
String nameType = settings.get("name_type", "generic");
9695
if ("GENERIC".equalsIgnoreCase(nameType)) {
@@ -107,7 +106,7 @@ public PhoneticTokenFilterFactory(Index index, @IndexSettings Settings indexSett
107106
} else if ("nysiis".equalsIgnoreCase(encodername)) {
108107
this.encoder = new Nysiis();
109108
} else {
110-
throw new ElasticsearchIllegalArgumentException("unknown encoder [" + encodername + "] for phonetic token filter");
109+
throw new IllegalArgumentException("unknown encoder [" + encodername + "] for phonetic token filter");
111110
}
112111
}
113112

@@ -127,6 +126,6 @@ public TokenStream create(TokenStream tokenStream) {
127126
} else {
128127
return new PhoneticFilter(tokenStream, encoder, !replace);
129128
}
130-
throw new ElasticsearchIllegalArgumentException("encoder error");
129+
throw new IllegalArgumentException("encoder error");
131130
}
132131
}

0 commit comments

Comments
 (0)