Skip to content

Commit f4d0d27

Browse files
committed
Remove deprecated smartcn_word and smartcn_sentence
were deprecated in 2.2.0 by #22. Closes #24. (cherry picked from commit 2bab6e0)
1 parent 26c1f4c commit f4d0d27

File tree

4 files changed

+5
-130
lines changed

4 files changed

+5
-130
lines changed

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

-8
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ public void processAnalyzers(AnalyzersBindings analyzersBindings) {
3030

3131
@Override
3232
public void processTokenizers(TokenizersBindings tokenizersBindings) {
33-
// TODO Remove it in 2.3.0 (was deprecated: see https://github.com/elasticsearch/elasticsearch-analysis-smartcn/issues/22)
34-
tokenizersBindings.processTokenizer("smartcn_sentence", SmartChineseSentenceTokenizerFactory.class);
3533
tokenizersBindings.processTokenizer("smartcn_tokenizer", SmartChineseTokenizerTokenizerFactory.class);
3634
}
37-
38-
@Override
39-
public void processTokenFilters(TokenFiltersBindings tokenFiltersBindings) {
40-
// TODO Remove it in 2.3.0 (was deprecated: see https://github.com/elasticsearch/elasticsearch-analysis-smartcn/issues/22)
41-
tokenFiltersBindings.processTokenFilter("smartcn_word", SmartChineseWordTokenFilterFactory.class);
42-
}
4335
}

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

-47
This file was deleted.

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

-45
This file was deleted.

src/main/java/org/elasticsearch/indices/analysis/smartcn/SmartChineseIndicesAnalysis.java

+5-30
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919

2020
package org.elasticsearch.indices.analysis.smartcn;
2121

22-
import org.apache.lucene.analysis.TokenStream;
2322
import org.apache.lucene.analysis.Tokenizer;
2423
import org.apache.lucene.analysis.cn.smart.HMMChineseTokenizer;
25-
import org.apache.lucene.analysis.cn.smart.SentenceTokenizer;
2624
import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer;
27-
import org.apache.lucene.analysis.cn.smart.WordTokenFilter;
2825
import org.elasticsearch.common.component.AbstractComponent;
2926
import org.elasticsearch.common.inject.Inject;
3027
import org.elasticsearch.common.lucene.Lucene;
3128
import org.elasticsearch.common.settings.Settings;
32-
import org.elasticsearch.index.analysis.*;
29+
import org.elasticsearch.index.analysis.AnalyzerScope;
30+
import org.elasticsearch.index.analysis.PreBuiltAnalyzerProviderFactory;
31+
import org.elasticsearch.index.analysis.PreBuiltTokenizerFactoryFactory;
32+
import org.elasticsearch.index.analysis.TokenizerFactory;
3333
import org.elasticsearch.indices.analysis.IndicesAnalysisService;
3434

3535
import java.io.Reader;
@@ -47,32 +47,7 @@ public SmartChineseIndicesAnalysis(Settings settings, IndicesAnalysisService ind
4747
// Register smartcn analyzer
4848
indicesAnalysisService.analyzerProviderFactories().put("smartcn", new PreBuiltAnalyzerProviderFactory("smartcn", AnalyzerScope.INDICES, new SmartChineseAnalyzer(Lucene.ANALYZER_VERSION)));
4949

50-
// Register smartcn_word token filter
51-
// TODO Remove it in 2.3.0 (was deprecated: see https://github.com/elasticsearch/elasticsearch-analysis-smartcn/issues/22)
52-
indicesAnalysisService.tokenFilterFactories().put("smartcn_word", new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
53-
@Override public String name() {
54-
return "smartcn_word";
55-
}
56-
57-
@Override public TokenStream create(TokenStream tokenStream) {
58-
return new WordTokenFilter(tokenStream);
59-
}
60-
}));
61-
62-
// Register smartcn_sentence tokenizer
63-
indicesAnalysisService.tokenizerFactories().put("smartcn_sentence", new PreBuiltTokenizerFactoryFactory(new TokenizerFactory() {
64-
@Override
65-
public String name() {
66-
return "smartcn_sentence";
67-
}
68-
69-
@Override
70-
public Tokenizer create(Reader reader) {
71-
return new SentenceTokenizer(reader);
72-
}
73-
}));
74-
75-
// Register smartcn_sentence tokenizer
50+
// Register smartcn_tokenizer tokenizer
7651
indicesAnalysisService.tokenizerFactories().put("smartcn_tokenizer", new PreBuiltTokenizerFactoryFactory(new TokenizerFactory() {
7752
@Override
7853
public String name() {

0 commit comments

Comments
 (0)