removed unused FST test

renamed uppercase misspelled file name readded REST action _langdetect
jprante · Mar 2, 2016 · 71e17be · 71e17be
1 parent 6ff3a41
commit 71e17be
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 338 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 
 def xbibGroup = 'org.xbib.elasticsearch.plugin'
-def xbibVersion = '2.2.0.1'
+def xbibVersion = '2.2.0.2'
 
 group = xbibGroup
 version = xbibVersion

diff --git a/pom.xml b/pom.xml
diff --git a/...lysis/icu/ICUNumberFormatTokenFilter.java → ...lysis/icu/IcuNumberFormatTokenFilter.java b/...lysis/icu/ICUNumberFormatTokenFilter.java → ...lysis/icu/IcuNumberFormatTokenFilter.java
diff --git a/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java b/src/main/java/org/xbib/elasticsearch/plugin/bundle/BundlePlugin.java
@@ -29,6 +29,7 @@
 import org.elasticsearch.index.analysis.AnalysisModule;
 import org.elasticsearch.indices.IndicesModule;
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.rest.RestModule;
 import org.xbib.elasticsearch.index.analysis.baseform.BaseformAnalysisBinderProcessor;
 import org.xbib.elasticsearch.index.analysis.concat.ConcatAnalysisBinderProcessor;
 import org.xbib.elasticsearch.index.analysis.decompound.DecompoundAnalysisBinderProcessor;
@@ -53,6 +54,7 @@
 import org.xbib.elasticsearch.index.mapper.standardnumber.StandardnumberMapperTypeParser;
 import org.xbib.elasticsearch.module.langdetect.LangdetectService;
 import org.xbib.elasticsearch.index.mapper.standardnumber.StandardnumberService;
+import org.xbib.elasticsearch.rest.action.langdetect.RestLangdetectAction;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -181,4 +183,10 @@ public void onModule(IndicesModule indicesModule) {
         }
     }
 
+    public void onModule(RestModule module) {
+        if ("node".equals(settings.get("client.type")) && settings.getAsBoolean("plugins.langdetect.enabled", true)) {
+            module.addRestAction(RestLangdetectAction.class);
+        }
+    }
+
 }
diff --git a/src/test/java/org/xbib/elasticsearch/index/analysis/decompound/fst/CreateFST.java b/src/test/java/org/xbib/elasticsearch/index/analysis/decompound/fst/CreateFST.java
@@ -21,9 +21,8 @@
 
 public class CreateFST {
 
-    @Test
     public void createMorphy() throws IOException {
-        final HashSet<BytesRef> words = new HashSet<BytesRef>();
+        final HashSet<BytesRef> words = new HashSet<>();
         String[] inputs = new String[]{
                 "morphy.txt.gz",
                 "morphy-unknown.txt.gz"
@@ -32,7 +31,7 @@ public void createMorphy() throws IOException {
             BufferedReader reader = new BufferedReader(new InputStreamReader(
                     new GZIPInputStream(getClass().getResourceAsStream(input)), "UTF-8"));
             Pattern pattern = Pattern.compile("\\s+");
-            String line = null;
+            String line;
             String last = null;
             StringBuilder buffer = new StringBuilder();
             while ((line = reader.readLine()) != null) {