- The KuromojiIndicesAnalysis class get loaded during plugin loading.

- TokenFilters and Tokenizers are now loaded via a binding processor.

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

@@ -0,0 +1,44 @@
+/*
+ * Licensed to ElasticSearch and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. ElasticSearch licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.index.analysis;
+
+/**
+ */
+public class KuromojiAnalysisBinderProcessor extends AnalysisModule.AnalysisBinderProcessor {
+
+    @Override
+    public void processAnalyzers(AnalyzersBindings analyzersBindings) {
+        analyzersBindings.processAnalyzer("kuromoji", KuromojiAnalyzerProvider.class);
+    }
+
+    @Override
+    public void processTokenizers(TokenizersBindings tokenizersBindings) {
+        tokenizersBindings.processTokenizer("kuromoji_tokenizer", KuromojiTokenizerFactory.class);
+    }
+
+    @Override
+    public void processTokenFilters(TokenFiltersBindings tokenFiltersBindings) {
+        tokenFiltersBindings.processTokenFilter("kuromoji_baseform", KuromojiBaseFormFilterFactory.class);
+        tokenFiltersBindings.processTokenFilter("kuromoji_part_of_speech", KuromojiPartOfSpeechFilterFactory.class);
+        tokenFiltersBindings.processTokenFilter("kuromoji_readingform", KuromojiReadingFormFilterFactory.class);
+        tokenFiltersBindings.processTokenFilter("kuromoji_stemmer", KuromojiKatakanaStemmerFactory.class);
+    }
+
+}

src/main/java/org/elasticsearch/plugin/analysis/kuromoji/AnalysisKuromojiPlugin.java

@@ -19,9 +19,14 @@
 
 package org.elasticsearch.plugin.analysis.kuromoji;
 
+import org.elasticsearch.common.collect.ImmutableList;
+import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.index.analysis.*;
+import org.elasticsearch.indices.analysis.KuromojiIndicesAnalysisModule;
 import org.elasticsearch.plugins.AbstractPlugin;
 
+import java.util.Collection;
+
 /**
  *
  */
@@ -37,12 +42,12 @@ public class AnalysisKuromojiPlugin extends AbstractPlugin {
         return "Kuromoji analysis support";
     }
 
+    @Override
+    public Collection<Class<? extends Module>> modules() {
+        return ImmutableList.<Class<? extends Module>>of(KuromojiIndicesAnalysisModule.class);
+    }
+
     public void onModule(AnalysisModule module) {
-        module.addAnalyzer("kuromoji", KuromojiAnalyzerProvider.class);
-        module.addTokenizer("kuromoji_tokenizer", KuromojiTokenizerFactory.class);
-        module.addTokenFilter("kuromoji_baseform", KuromojiBaseFormFilterFactory.class);
-        module.addTokenFilter("kuromoji_part_of_speech", KuromojiPartOfSpeechFilterFactory.class);
-        module.addTokenFilter("kuromoji_readingform", KuromojiReadingFormFilterFactory.class);
-        module.addTokenFilter("kuromoji_stemmer", KuromojiKatakanaStemmerFactory.class);
+        module.addProcessor(new KuromojiAnalysisBinderProcessor());
     }
 }

src/test/java/org/elasticsearch/index/analysis/KuromojiAnalysisTests.java

@@ -71,6 +71,10 @@ public class KuromojiAnalysisTests {
 
         NamedAnalyzer analyzer = analysisService.analyzer("kuromoji");
         assertThat(analyzer.analyzer(), instanceOf(JapaneseAnalyzer.class));
+
+        analyzer = analysisService.analyzer("my_analyzer");
+        assertThat(analyzer.analyzer(), instanceOf(CustomAnalyzer.class));
+        assertThat(analyzer.analyzer().tokenStream(null, null), instanceOf(JapaneseTokenizer.class));
     }
 
     @Test

src/test/java/org/elasticsearch/index/analysis/kuromoji_analysis.json

@@ -24,6 +24,12 @@
                    "type":"kuromoji_tokenizer"
                 }
             
+            },
+            "analyzer" : {
+                "my_analyzer" : {
+                    "type" : "custom",
+                    "tokenizer" : "kuromoji_tokenizer"
+                }
             }
             
         }