es 9.1.0 support

Author: shi-yuan

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.ansj</groupId>
 	<artifactId>elasticsearch-analysis-ansj</artifactId>
-	<version>9.0.7.0</version>
+	<version>9.1.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>9.0.7</elasticsearch.version>
+		<elasticsearch.version>9.1.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.ansj.elasticsearch.plugin.AnalysisAnsjPlugin</elasticsearch.plugin.classname>
 	</properties>
 

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

@@ -27,7 +27,6 @@ public AnsjResponse(Map<String, ?> map) {
     }
 
     public AnsjResponse(StreamInput in) throws IOException {
-        super(in);
         map = in.readGenericMap();
     }
 

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

@@ -23,11 +23,13 @@
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.ProjectState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.routing.ShardsIterator;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -66,9 +68,10 @@ public class TransportAnsjAction extends TransportSingleShardAction<AnsjRequest,
     @Inject
     public TransportAnsjAction(ThreadPool threadPool, ClusterService clusterService,
                                TransportService transportService, ActionFilters actionFilters,
+                               ProjectResolver projectResolver,
                                IndexNameExpressionResolver indexNameExpressionResolver,
                                AnsjElasticConfigurator cfg) {
-        super(AnsjAction.NAME, threadPool, clusterService, transportService, actionFilters, indexNameExpressionResolver, AnsjRequest::new, threadPool.executor(ThreadPool.Names.GENERIC));
+        super(AnsjAction.NAME, threadPool, clusterService, transportService, actionFilters, projectResolver, indexNameExpressionResolver, AnsjRequest::new, threadPool.executor(ThreadPool.Names.GENERIC));
 
         this.cfg = cfg;
     }
@@ -400,13 +403,13 @@ protected boolean resolveIndex(AnsjRequest request) {
     }
 
     @Override
-    protected ShardsIterator shards(ClusterState clusterState, InternalRequest internalRequest) {
+    protected ShardsIterator shards(ProjectState state, InternalRequest request) {
         //just execute local
         return null;
     }
 
     @Override
-    protected ClusterBlockException checkRequestBlock(ClusterState state, InternalRequest request) {
+    protected ClusterBlockException checkRequestBlock(ProjectState state, InternalRequest request) {
         return null;
     }
 }

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

@@ -12,8 +12,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 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.io.stream.NamedWriteableRegistry;
@@ -80,8 +78,8 @@ public Map<String, AnalysisModule.AnalysisProvider<AnalyzerProvider<? extends An
     }
 
     @Override
-    public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
-        return Collections.singletonList(new ActionHandler<>(AnsjAction.INSTANCE, TransportAnsjAction.class));
+    public List<ActionHandler> getActions() {
+        return Collections.singletonList(new ActionHandler(AnsjAction.INSTANCE, TransportAnsjAction.class));
     }
 
     @Override