Analysis: Use PreBuiltXXXFactory

Closes #34
elastic · Dec 7, 2014 · d01d7fa · d01d7fa
1 parent b1caeee
commit d01d7fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 120 deletions.
diff --git a/src/main/java/org/elasticsearch/indices/analysis/KuromojiIndicesAnalysis.java b/src/main/java/org/elasticsearch/indices/analysis/KuromojiIndicesAnalysis.java
@@ -46,7 +46,7 @@ public KuromojiIndicesAnalysis(Settings settings,
                         new JapaneseAnalyzer()));
 
         indicesAnalysisService.charFilterFactories().put("kuromoji_iteration_mark",
-                new KurumojiCharFilterFactoryFactory(new CharFilterFactory() {
+                new PreBuiltCharFilterFactoryFactory(new CharFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_iteration_mark";
@@ -61,7 +61,7 @@ public Reader create(Reader reader) {
                 }));
 
         indicesAnalysisService.tokenizerFactories().put("kuromoji_tokenizer",
-                new KurumojiTokenizerFactoryFactory(new TokenizerFactory() {
+                new PreBuiltTokenizerFactoryFactory(new TokenizerFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_tokenizer";
@@ -74,7 +74,7 @@ public Tokenizer create() {
                 }));
 
         indicesAnalysisService.tokenFilterFactories().put("kuromoji_baseform",
-                new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
+                new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_baseform";
@@ -88,7 +88,7 @@ public TokenStream create(TokenStream tokenStream) {
 
         indicesAnalysisService.tokenFilterFactories().put(
                 "kuromoji_part_of_speech",
-                new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
+                new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_part_of_speech";
@@ -103,7 +103,7 @@ public TokenStream create(TokenStream tokenStream) {
 
         indicesAnalysisService.tokenFilterFactories().put(
                 "kuromoji_readingform",
-                new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
+                new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_readingform";
@@ -116,7 +116,7 @@ public TokenStream create(TokenStream tokenStream) {
                 }));
 
         indicesAnalysisService.tokenFilterFactories().put("kuromoji_stemmer",
-                new KurumojiTokenFilterFactoryFactory(new TokenFilterFactory() {
+                new PreBuiltTokenFilterFactoryFactory(new TokenFilterFactory() {
                     @Override
                     public String name() {
                         return "kuromoji_stemmer";

diff --git a/src/main/java/org/elasticsearch/indices/analysis/KurumojiCharFilterFactoryFactory.java b/src/main/java/org/elasticsearch/indices/analysis/KurumojiCharFilterFactoryFactory.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenFilterFactoryFactory.java b/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenFilterFactoryFactory.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenizerFactoryFactory.java b/src/main/java/org/elasticsearch/indices/analysis/KurumojiTokenizerFactoryFactory.java