es 8.13.0 support

Author: shi-yuan

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.ansj</groupId>
 	<artifactId>elasticsearch-analysis-ansj</artifactId>
-	<version>8.12.2.0</version>
+	<version>8.13.0.0</version>
 	<description>elasticsearch analysis by ansj</description>
 	<name>elasticsearch-analysis-ansj</name>
 	<url>http://maven.nlpcn.org</url>
@@ -14,7 +14,7 @@
 		<runSuite>**/MainTestSuite.class</runSuite>
 		<elasticsearch.plugin.name>elasticsearch-analysis-ansj</elasticsearch.plugin.name>
 		<elasticsearch.plugin.java.version>17</elasticsearch.plugin.java.version>
-		<elasticsearch.version>8.12.2</elasticsearch.version>
+		<elasticsearch.version>8.13.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.ansj.elasticsearch.plugin.AnalysisAnsjPlugin</elasticsearch.plugin.classname>
 	</properties>
 

src/main/java/org/ansj/elasticsearch/action/AnsjAction.java

@@ -1,7 +1,6 @@
 package org.ansj.elasticsearch.action;
 
 import org.elasticsearch.action.ActionType;
-import org.elasticsearch.common.io.stream.Writeable;
 
 /**
  * Created by zhangqinghua on 16/2/2.
@@ -10,9 +9,9 @@ public class AnsjAction extends ActionType<AnsjResponse> {
 
     static final String NAME = "cluster:admin/ansj/analyze";
 
-    public static final AnsjAction INSTANCE = new AnsjAction(NAME, AnsjResponse::new);
+    public static final AnsjAction INSTANCE = new AnsjAction(NAME);
 
-    public AnsjAction(String name, Writeable.Reader<AnsjResponse> responseReader) {
-        super(name, responseReader);
+    public AnsjAction(String name) {
+        super(name);
     }
 }

src/main/java/org/ansj/elasticsearch/action/AnsjRequest.java

@@ -36,7 +36,7 @@ public AnsjRequest(String path) {
     public AnsjRequest(StreamInput in) throws IOException {
         super(in);
         path = in.readString();
-        args = in.readMap();
+        args = in.readGenericMap();
         source = in.readBytesReference();
     }
 

src/main/java/org/ansj/elasticsearch/action/AnsjResponse.java

@@ -28,7 +28,7 @@ public AnsjResponse(Map<String, ?> map) {
 
     public AnsjResponse(StreamInput in) throws IOException {
         super(in);
-        map = in.readMap();
+        map = in.readGenericMap();
     }
 
     public AnsjResponse put(String key, Object value) {

src/main/java/org/ansj/elasticsearch/action/TransportAnsjAction.java

@@ -272,7 +272,7 @@ public void handleException(TransportException exp) {
                 }
 
                 @Override
-                public Executor executor(ThreadPool threadPool) {
+                public Executor executor() {
                     return TransportResponseHandler.TRANSPORT_WORKER;
                 }
             };
@@ -341,7 +341,7 @@ public void handleException(TransportException exp) {
                 }
 
                 @Override
-                public Executor executor(ThreadPool threadPool) {
+                public Executor executor() {
                     return TransportResponseHandler.TRANSPORT_WORKER;
                 }
             });

src/main/java/org/ansj/elasticsearch/plugin/AnalysisAnsjPlugin.java

@@ -16,10 +16,12 @@
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 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.features.NodeFeature;
 import org.elasticsearch.index.analysis.AnalyzerProvider;
 import org.elasticsearch.index.analysis.TokenizerFactory;
 import org.elasticsearch.indices.analysis.AnalysisModule;
@@ -35,6 +37,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 public class AnalysisAnsjPlugin extends Plugin implements AnalysisPlugin, ActionPlugin {
@@ -82,7 +85,7 @@ public Map<String, AnalysisModule.AnalysisProvider<AnalyzerProvider<? extends An
     }
 
     @Override
-    public List<RestHandler> getRestHandlers(Settings settings, RestController restController, ClusterSettings clusterSettings, IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<DiscoveryNodes> nodesInCluster) {
+    public Collection<RestHandler> getRestHandlers(Settings settings, NamedWriteableRegistry namedWriteableRegistry, RestController restController, ClusterSettings clusterSettings, IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<DiscoveryNodes> nodesInCluster, Predicate<NodeFeature> clusterSupportsFeature) {
         return Arrays.asList(new RestAnsjAction(), new AnalyzerCatAction(), new AnsjCatAction());
     }
 }