elasticsearch 8.13.2

codelibs · Apr 15, 2024 · 4219add · 4219add
1 parent a501325
commit 4219add
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codelibs</groupId>
 	<artifactId>elasticsearch-configsync</artifactId>
-	<version>8.12.2.1-SNAPSHOT</version>
+	<version>8.13.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<description>This plugin provides a feature to analyze texts.</description>
 	<inceptionYear>2011</inceptionYear>
@@ -27,7 +27,7 @@
 		<version>9</version>
 	</parent>
 	<properties>
-		<elasticsearch.version>8.12.2</elasticsearch.version>
+		<elasticsearch.version>8.13.2</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.codelibs.elasticsearch.configsync.ConfigSyncPlugin</elasticsearch.plugin.classname>
 		<log4j.version>2.19.0</log4j.version>
 		<maven.compiler.release>17</maven.compiler.release>

diff --git a/src/main/java/org/codelibs/elasticsearch/configsync/ConfigSyncPlugin.java b/src/main/java/org/codelibs/elasticsearch/configsync/ConfigSyncPlugin.java
@@ -19,6 +19,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.codelibs.elasticsearch.configsync.action.FileFlushAction;
@@ -34,11 +35,13 @@
 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.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestController;
@@ -56,9 +59,10 @@ public class ConfigSyncPlugin extends Plugin implements ActionPlugin {
     }
 
     @Override
-    public List<RestHandler> getRestHandlers(final Settings settings, final RestController restController,
-            final ClusterSettings clusterSettings, final IndexScopedSettings indexScopedSettings, final SettingsFilter settingsFilter,
-            final IndexNameExpressionResolver indexNameExpressionResolver, final Supplier<DiscoveryNodes> nodesInCluster) {
+    public List<RestHandler> getRestHandlers(final Settings settings, final NamedWriteableRegistry namedWriteableRegistry,
+            final RestController restController, final ClusterSettings clusterSettings, final IndexScopedSettings indexScopedSettings,
+            final SettingsFilter settingsFilter, final IndexNameExpressionResolver indexNameExpressionResolver,
+            final Supplier<DiscoveryNodes> nodesInCluster, final Predicate<NodeFeature> clusterSupportsFeature) {
         return Arrays.asList(//
                 new RestConfigSyncFileAction(settings, restController, service), //
                 new RestConfigSyncResetAction(settings, restController, service), //
@@ -67,7 +71,7 @@ public List<RestHandler> getRestHandlers(final Settings settings, final RestCont
     }
 
     @Override
-    public Collection<?> createComponents(PluginServices services) {
+    public Collection<?> createComponents(final PluginServices services) {
         final Collection<Object> components = new ArrayList<>();
         service = new ConfigSyncService(services.client(), services.clusterService(), services.environment(), services.threadPool());
         components.add(service);

diff --git a/src/main/java/org/codelibs/elasticsearch/configsync/action/FileFlushAction.java b/src/main/java/org/codelibs/elasticsearch/configsync/action/FileFlushAction.java
@@ -22,6 +22,6 @@ public class FileFlushAction extends ActionType<FileFlushResponse> {
     public static final String NAME = "cluster:admin/configsync/flush";
 
     private FileFlushAction() {
-        super(NAME, FileFlushResponse::new);
+        super(NAME);
     }
 }
diff --git a/src/main/java/org/codelibs/elasticsearch/configsync/action/ResetSyncAction.java b/src/main/java/org/codelibs/elasticsearch/configsync/action/ResetSyncAction.java
@@ -22,6 +22,6 @@ public class ResetSyncAction extends ActionType<ResetSyncResponse> {
     public static final String NAME = "cluster:admin/configsync/reset_sync";
 
     private ResetSyncAction() {
-        super(NAME, ResetSyncResponse::new);
+        super(NAME);
     }
 }
diff --git a/src/main/java/org/codelibs/elasticsearch/configsync/action/TransportFileFlushAction.java b/src/main/java/org/codelibs/elasticsearch/configsync/action/TransportFileFlushAction.java
@@ -30,7 +30,6 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.tasks.Task;
-import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportException;
 import org.elasticsearch.transport.TransportResponseHandler;
 import org.elasticsearch.transport.TransportService;
@@ -79,8 +78,8 @@ public void handleException(final TransportException exp) {
             }
 
             @Override
-            public Executor executor(final ThreadPool threadPool) {
-                return threadPool.generic();
+            public Executor executor() {
+                return TRANSPORT_WORKER;
             }
         });
     }

diff --git a/src/main/java/org/codelibs/elasticsearch/configsync/action/TransportResetSyncAction.java b/src/main/java/org/codelibs/elasticsearch/configsync/action/TransportResetSyncAction.java
@@ -30,7 +30,6 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.tasks.Task;
-import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportException;
 import org.elasticsearch.transport.TransportResponseHandler;
 import org.elasticsearch.transport.TransportService;
@@ -79,8 +78,8 @@ public void handleException(final TransportException exp) {
             }
 
             @Override
-            public Executor executor(final ThreadPool threadPool) {
-                return threadPool.generic();
+            public Executor executor() {
+                return TRANSPORT_WORKER;
             }
         });
     }