Merge pull request #22 from masaruh/2.1.0_upgrade

Upgrade to 2.1.0

Author: masaruh

pom.xml

@@ -6,14 +6,16 @@
 
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-japanese-suggester</artifactId>
-    <version>0.20.2</version>
+    <version>0.21.0</version>
 
 
     <packaging>jar</packaging>
 
     <properties>
-        <elasticsearch.version>2.0.2</elasticsearch.version>
-        <lucene.version>5.2.1</lucene.version>
+        <elasticsearch.version>2.1.0</elasticsearch.version>
+        <lucene.version>5.3.1</lucene.version>
+        <jackson.version>2.6.2</jackson.version>
+        <testframework.version>2.1.16</testframework.version>
     </properties>
 
     <dependencies>
@@ -41,7 +43,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.5.3</version>
+            <version>${jackson.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -70,7 +72,7 @@
         <dependency>
             <groupId>com.carrotsearch.randomizedtesting</groupId>
             <artifactId>randomizedtesting-runner</artifactId>
-            <version>2.1.10</version>
+            <version>${testframework.version}</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/org/elasticsearch/analysis/KuromojiSuggestTokenizerFactory.java

@@ -7,16 +7,16 @@
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.analysis.AbstractTokenizerFactory;
-import org.elasticsearch.index.settings.IndexSettings;
+import org.elasticsearch.index.settings.IndexSettingsService;
 
 public class KuromojiSuggestTokenizerFactory extends AbstractTokenizerFactory {
     private final boolean expand;
     private final int maxExpansions;
     private final boolean edgeNGram;
 
     @Inject
-    public KuromojiSuggestTokenizerFactory(Index index, @IndexSettings Settings indexSettings, Environment env, @Assisted String name, @Assisted Settings settings) {
-        super(index, indexSettings, name, settings);
+    public KuromojiSuggestTokenizerFactory(Index index, IndexSettingsService indexSettingsService, Environment env, @Assisted String name, @Assisted Settings settings) {
+        super(index, indexSettingsService.getSettings(), name, settings);
 
         this.expand = settings.getAsBoolean("expand", false);
         this.maxExpansions = settings.getAsInt("max_expansions", 512);

src/test/java/org/elasticsearch/search/suggest/completion/JapaneseCompletionSuggesterTest.java

@@ -5,26 +5,28 @@
 import com.google.common.collect.Lists;
 import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.action.suggest.SuggestResponse;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugin.JapaneseSuggesterPlugin;
+import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.search.suggest.Suggest;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
 @LuceneTestCase.SuppressCodecs("*")
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE)
 public class JapaneseCompletionSuggesterTest extends ESIntegTestCase {
 
     @Override
-    protected Settings nodeSettings(int nodeOrdinal) {
-        return Settings.settingsBuilder().put(super.nodeSettings(nodeOrdinal)).put("plugin.types", JapaneseSuggesterPlugin.class.getName()).build();
+    protected Collection<Class<? extends Plugin>> nodePlugins() {
+        return pluginList(JapaneseSuggesterPlugin.class);
     }
 
     @Override
@@ -47,14 +49,14 @@ public void testJapaneseCompletion() throws Exception {
 
         feedDocument(index, type, field, "東京");
         feedDocument(index, type, field, "豆腐");
-        optimize();
-
-//        assertSuggestResult(index, field, "とう", "東京", "豆腐");
-//        assertSuggestResult(index, field, "tou", "東京", "豆腐");
-//        assertSuggestResult(index, field, "とうf", "豆腐");
-//        assertSuggestResult(index, field, "とうk", "東京");
-//        assertSuggestResult(index, field, "東", "東京");
-//        assertSuggestResult(index, field, "豆", "豆腐");
+        forceMerge();
+
+        assertSuggestResult(index, field, "とう", "東京", "豆腐");
+        assertSuggestResult(index, field, "tou", "東京", "豆腐");
+        assertSuggestResult(index, field, "とうf", "豆腐");
+        assertSuggestResult(index, field, "とうk", "東京");
+        assertSuggestResult(index, field, "東", "東京");
+        assertSuggestResult(index, field, "豆", "豆腐");
         assertSuggestResult(index, field, "党", null);
     }
 
@@ -72,7 +74,7 @@ public void testPrefixFiltering() throws IOException {
         for (; i < 10; i++) {
             feedDocument(index, type, field, "省エネ" + i, i + 1);
         }
-        optimize();
+        forceMerge();
         assertSuggestResult(index, field, "小", 1, "小学校");
 
         // Add another document.