update version to support es 5.3.0

NLPchina · Apr 8, 2017 · 01f27fa · 01f27fa
1 parent 2a1e219
commit 01f27fa
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.ansj</groupId>
 	<artifactId>elasticsearch-analysis-ansj</artifactId>
-	<version>5.2.2.0</version>
+	<version>5.3.0.0</version>
 	<description>elasticsearch analysis by ansj</description>
 	<name>elasticsearch-analysis-ansj</name>
 	<url>http://maven.nlpcn.org</url>
@@ -23,7 +23,7 @@
 		<elasticsearch.plugin.site>true</elasticsearch.plugin.site>
 		<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
         <elasticsearch.plugin.java.version>1.8</elasticsearch.plugin.java.version>
-		<elasticsearch.version>5.2.2</elasticsearch.version>
+		<elasticsearch.version>5.3.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.ansj.elasticsearch.plugin.AnalysisAnsjPlugin</elasticsearch.plugin.classname>
 	</properties>
 

diff --git a/src/main/java/org/ansj/elasticsearch/action/AnsjResponse.java b/src/main/java/org/ansj/elasticsearch/action/AnsjResponse.java
@@ -3,7 +3,7 @@
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -13,7 +13,7 @@
 /**
  * Created by zhangqinghua on 16/2/2.
  */
-public class AnsjResponse extends ActionResponse implements ToXContent {
+public class AnsjResponse extends ActionResponse implements ToXContentObject {
 
     private Map<String, Object> map;
 

diff --git a/src/main/java/org/ansj/elasticsearch/cat/AnalyzerCatAction.java b/src/main/java/org/ansj/elasticsearch/cat/AnalyzerCatAction.java
@@ -5,7 +5,6 @@
 import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.Table;
-import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestRequest;
@@ -24,7 +23,6 @@
  */
 public class AnalyzerCatAction extends AbstractCatAction {
 
-    @Inject
     public AnalyzerCatAction(Settings settings, RestController controller) {
         super(settings);
         controller.registerHandler(RestRequest.Method.GET, "/_cat/analyze", this);

diff --git a/src/main/java/org/ansj/elasticsearch/cat/AnsjCatAction.java b/src/main/java/org/ansj/elasticsearch/cat/AnsjCatAction.java
@@ -6,7 +6,6 @@
 import org.ansj.library.*;
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.Table;
-import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestRequest;
@@ -23,7 +22,6 @@
  */
 public class AnsjCatAction extends AbstractCatAction {
 
-    @Inject
     public AnsjCatAction(Settings settings, RestController controller) {
         super(settings);
         controller.registerHandler(RestRequest.Method.GET, "/_cat/ansj", this);

diff --git a/src/main/java/org/ansj/elasticsearch/plugin/AnalysisAnsjPlugin.java b/src/main/java/org/ansj/elasticsearch/plugin/AnalysisAnsjPlugin.java
@@ -13,20 +13,26 @@
 import org.apache.lucene.analysis.Analyzer;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
+import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.inject.Module;
-import org.elasticsearch.common.inject.multibindings.Multibinder;
 import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.settings.ClusterSettings;
+import org.elasticsearch.common.settings.IndexScopedSettings;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.index.analysis.AnalyzerProvider;
 import org.elasticsearch.index.analysis.TokenizerFactory;
 import org.elasticsearch.indices.analysis.AnalysisModule;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.AnalysisPlugin;
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestHandler;
-import org.elasticsearch.rest.action.cat.AbstractCatAction;
 
 import java.util.*;
+import java.util.function.Supplier;
 
 public class AnalysisAnsjPlugin extends Plugin implements AnalysisPlugin, ActionPlugin {
 
@@ -75,17 +81,17 @@ public Map<String, AnalysisModule.AnalysisProvider<AnalyzerProvider<? extends An
     }
 
     @Override
-    public List<Class<? extends RestHandler>> getRestHandlers() {
-        return Collections.singletonList(RestAnsjAction.class);
+    public List<RestHandler> getRestHandlers(Settings settings, RestController restController, ClusterSettings clusterSettings, IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<DiscoveryNodes> nodesInCluster) {
+        return Arrays.asList(
+                new RestAnsjAction(settings, restController),
+                new AnalyzerCatAction(settings, restController),
+                new AnsjCatAction(settings, restController));
     }
 
     private class AnsjModule extends AbstractModule {
         @Override
         protected void configure() {
             bind(AnsjElasticConfigurator.class).asEagerSingleton();
-            Multibinder<AbstractCatAction> catActionMultibinder = Multibinder.newSetBinder(binder(), AbstractCatAction.class);
-            catActionMultibinder.addBinding().to(AnalyzerCatAction.class).asEagerSingleton();
-            catActionMultibinder.addBinding().to(AnsjCatAction.class).asEagerSingleton();
         }
     }
 }
diff --git a/src/main/java/org/ansj/elasticsearch/rest/RestAnsjAction.java b/src/main/java/org/ansj/elasticsearch/rest/RestAnsjAction.java
@@ -3,7 +3,6 @@
 import org.ansj.elasticsearch.action.AnsjAction;
 import org.ansj.elasticsearch.action.AnsjRequest;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestController;
@@ -19,7 +18,6 @@
  */
 public class RestAnsjAction extends BaseRestHandler {
 
-    @Inject
     public RestAnsjAction(Settings settings, RestController controller) {
         super(settings);
         controller.registerHandler(GET, "/_ansj", this);