Merge pull request #2 from mnagaya/mnagaya/vespa7

Port kuromoji-linguistics to vespa7

README.md

@@ -13,14 +13,14 @@ For more details, please see official website of Kuromoji.
 
 ### Requirement
 
-JDK (>= 1.8) and maven are required to build package.
+JDK (>= 11) and maven are required to build package.
 
 ### Build
 
 Execute mvn command as below, and you can get package as target/kuromoji-linguistics-${VERSION}-deploy.jar
 
 ```
-$ mvn package -Dvespa.version='6.214.72'    # You can specify 6.214.72 or later.
+$ mvn package -Dvespa.version='7.7.18'     # You can specify 7.7.18 or later.
 ```
 
 ## Use Package

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>jp.co.yahoo.vespa</groupId>
   <artifactId>kuromoji-linguistics</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.2-SNAPSHOT</version>
   <packaging>container-plugin</packaging>
 
   <name>kuromoji-linguistics</name>
@@ -26,11 +26,11 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <source-jdk.version>1.8</source-jdk.version>
-    <target-jdk.version>1.8</target-jdk.version>
+    <source-jdk.version>11</source-jdk.version>
+    <target-jdk.version>11</target-jdk.version>
     <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
 
-    <vespa.version>6-SNAPSHOT</vespa.version>
+    <vespa.version>7-SNAPSHOT</vespa.version>
     <guice.version>3.0</guice.version>
 
     <kuromoji-ipadic.version>0.9.0</kuromoji-ipadic.version>

src/main/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguistics.java

@@ -6,7 +6,6 @@
 package jp.co.yahoo.vespa.language.lib.kuromoji;
 
 import com.google.inject.Inject;
-import com.yahoo.collections.Tuple2;
 import com.yahoo.component.Version;
 import com.yahoo.language.Linguistics;
 import com.yahoo.language.detect.Detector;
@@ -140,23 +139,4 @@ public GramSplitter getGramSplitter() {
   public CharacterClasses getCharacterClasses() {
     return simpleLinguistics.getCharacterClasses();
   }
-
-  @Override
-  public Tuple2<String, Version> getVersion(Component component) {
-    switch (component) {
-      case STEMMER:
-      case TOKENIZER:
-      case SEGMENTER:
-        return new Tuple2<String, Version>("kuromoji", context.getKuromojiVersion());
-      case NORMALIZER:
-      case TRANSFORMER:
-      case DETECTOR:
-      case GRAM_SPLITTER:
-      case CHARACTER_CLASSES:
-        return simpleLinguistics.getVersion(component);
-      default:
-        throw new IllegalArgumentException("unknown component type");
-    }
-  }
-
 }

src/test/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguisticsTest.java

@@ -14,7 +14,6 @@
 
 import org.junit.Test;
 
-import com.yahoo.collections.Tuple2;
 import com.yahoo.component.Version;
 import com.yahoo.language.Language;
 import com.yahoo.language.Linguistics;
@@ -167,16 +166,4 @@ public void testCharacterClasses() throws Exception {
         assertTrue(characterClasses.isDigit(Character.codePointAt(java.text.Normalizer.normalize("１２３", java.text.Normalizer.Form.NFKC), 0)));
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        Linguistics linguistics = KuromojiLinguistics.create(DEFAULT_KUROMOJI_CONFIG, DEFAULT_STOKEN_CONFIG).get();
-
-        Tuple2<String, Version> krmjVersion = linguistics.getVersion(Linguistics.Component.TOKENIZER);
-        assertEquals("kuromoji", krmjVersion.first);
-        assertEquals("0.9", krmjVersion.second.toString()); // XXX: change if you changed version!
-
-        Tuple2<String, Version> simpleVersion = linguistics.getVersion(Linguistics.Component.GRAM_SPLITTER);
-        assertEquals("yahoo", simpleVersion.first);
-        assertEquals("1", simpleVersion.second.toString()); // XXX: change if you changed version!
-    }
 }