es 8.10.0 support

Author: shi-yuan

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.ansj</groupId>
 	<artifactId>elasticsearch-analysis-ansj</artifactId>
-	<version>8.9.2.0</version>
+	<version>8.10.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.9.2</elasticsearch.version>
+		<elasticsearch.version>8.10.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.ansj.elasticsearch.plugin.AnalysisAnsjPlugin</elasticsearch.plugin.classname>
 	</properties>
 

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

@@ -49,6 +49,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -271,8 +272,8 @@ public void handleException(TransportException exp) {
                 }
 
                 @Override
-                public String executor() {
-                    return ThreadPool.Names.SAME;
+                public Executor executor(ThreadPool threadPool) {
+                    return TransportResponseHandler.TRANSPORT_WORKER;
                 }
             };
 
@@ -340,8 +341,8 @@ public void handleException(TransportException exp) {
                 }
 
                 @Override
-                public String executor() {
-                    return ThreadPool.Names.SAME;
+                public Executor executor(ThreadPool threadPool) {
+                    return TransportResponseHandler.TRANSPORT_WORKER;
                 }
             });
         }

src/main/java/org/ansj/elasticsearch/index/config/AnsjElasticConfigurator.java

@@ -12,7 +12,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.SpecialPermission;
-import org.elasticsearch.common.collect.MapBuilder;
+import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.nlpcn.commons.lang.tire.domain.SmartForest;
@@ -280,22 +280,22 @@ public void reloadLibrary(String key) {
      * 默认配置
      */
     public static Map<String, String> getDefaults() {
-        return MapBuilder.<String, String>newMapBuilder()
+        return ImmutableOpenMap.<String, String>builder(10)
                 // 是否开启人名识别
-                .put("isNameRecognition", MyStaticValue.isNameRecognition.toString())
+                .fPut("isNameRecognition", MyStaticValue.isNameRecognition.toString())
                 // 是否开启数字识别
-                .put("isNumRecognition", MyStaticValue.isNumRecognition.toString())
+                .fPut("isNumRecognition", MyStaticValue.isNumRecognition.toString())
                 // 是否数字和量词合并
-                .put("isQuantifierRecognition", MyStaticValue.isQuantifierRecognition.toString())
+                .fPut("isQuantifierRecognition", MyStaticValue.isQuantifierRecognition.toString())
                 // 是否显示真实词语
-                .put("isRealName", MyStaticValue.isRealName.toString())
+                .fPut("isRealName", MyStaticValue.isRealName.toString())
                 // 是否用户词典不加载相同的词
-                .put("isSkipUserDefine", String.valueOf(MyStaticValue.isSkipUserDefine))
-                .put(CrfLibrary.DEFAULT, CrfLibrary.DEFAULT)
-                .put(DicLibrary.DEFAULT, DicLibrary.DEFAULT)
-                .put(StopLibrary.DEFAULT, StopLibrary.DEFAULT)
-                .put(SynonymsLibrary.DEFAULT, SynonymsLibrary.DEFAULT)
-                .put(AmbiguityLibrary.DEFAULT, AmbiguityLibrary.DEFAULT)
-                .immutableMap();
+                .fPut("isSkipUserDefine", String.valueOf(MyStaticValue.isSkipUserDefine))
+                .fPut(CrfLibrary.DEFAULT, CrfLibrary.DEFAULT)
+                .fPut(DicLibrary.DEFAULT, DicLibrary.DEFAULT)
+                .fPut(StopLibrary.DEFAULT, StopLibrary.DEFAULT)
+                .fPut(SynonymsLibrary.DEFAULT, SynonymsLibrary.DEFAULT)
+                .fPut(AmbiguityLibrary.DEFAULT, AmbiguityLibrary.DEFAULT)
+                .build();
     }
 }

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

@@ -28,6 +28,7 @@
 import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.index.analysis.AnalyzerProvider;
 import org.elasticsearch.index.analysis.TokenizerFactory;
+import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.analysis.AnalysisModule;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.AnalysisPlugin;
@@ -54,7 +55,7 @@ public class AnalysisAnsjPlugin extends Plugin implements AnalysisPlugin, Action
     private static final Logger LOG = LogManager.getLogger();
 
     @Override
-    public Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool, ResourceWatcherService resourceWatcherService, ScriptService scriptService, NamedXContentRegistry xContentRegistry, Environment environment, NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<RepositoriesService> repositoriesServiceSupplier, Tracer tracer, AllocationService allocationService) {
+    public Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool, ResourceWatcherService resourceWatcherService, ScriptService scriptService, NamedXContentRegistry xContentRegistry, Environment environment, NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<RepositoriesService> repositoriesServiceSupplier, Tracer tracer, AllocationService allocationService, IndicesService indicesService) {
         return Collections.singletonList(new AnsjElasticConfigurator(environment));
     }