Remove request type parameter from CCR actions

Relates #31405
elastic · Jun 19, 2018 · c74cd30 · c74cd30
1 parent ec04366
commit c74cd30
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/...ugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CreateAndFollowIndexAction.java b/...ugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CreateAndFollowIndexAction.java
@@ -47,7 +47,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-public class CreateAndFollowIndexAction extends Action<CreateAndFollowIndexAction.Request, CreateAndFollowIndexAction.Response> {
+public class CreateAndFollowIndexAction extends Action<CreateAndFollowIndexAction.Response> {
 
     public static final CreateAndFollowIndexAction INSTANCE = new CreateAndFollowIndexAction();
     public static final String NAME = "cluster:admin/xpack/ccr/create_and_follow_index";

diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/FollowIndexAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/FollowIndexAction.java
@@ -53,7 +53,7 @@
 import java.util.concurrent.atomic.AtomicReferenceArray;
 import java.util.stream.Collectors;
 
-public class FollowIndexAction extends Action<FollowIndexAction.Request, FollowIndexAction.Response> {
+public class FollowIndexAction extends Action<FollowIndexAction.Response> {
 
     public static final FollowIndexAction INSTANCE = new FollowIndexAction();
     public static final String NAME = "cluster:admin/xpack/ccr/follow_index";

diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardChangesAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardChangesAction.java
@@ -37,7 +37,7 @@
 
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 
-public class ShardChangesAction extends Action<ShardChangesAction.Request, ShardChangesAction.Response> {
+public class ShardChangesAction extends Action<ShardChangesAction.Response> {
 
     public static final ShardChangesAction INSTANCE = new ShardChangesAction();
     public static final String NAME = "indices:data/read/xpack/ccr/shard_changes";

diff --git a/...plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java b/...plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java
@@ -434,7 +434,7 @@ static Client wrapClient(Client client, ShardFollowTask shardFollowTask) {
                     Request extends ActionRequest,
                     Response extends ActionResponse,
                     RequestBuilder extends ActionRequestBuilder<Request, Response>>
-                void doExecute(Action<Request, Response> action, Request request, ActionListener<Response> listener) {
+                void doExecute(Action<Response> action, Request request, ActionListener<Response> listener) {
                     final Supplier<ThreadContext.StoredContext> supplier = threadContext.newRestorableContext(false);
                     try (ThreadContext.StoredContext ignore = stashWithHeaders(threadContext, filteredHeaders)) {
                         super.doExecute(action, request, new ContextPreservingActionListener<>(supplier, listener));

diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/UnfollowIndexAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/UnfollowIndexAction.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-public class UnfollowIndexAction extends Action<UnfollowIndexAction.Request, UnfollowIndexAction.Response> {
+public class UnfollowIndexAction extends Action<UnfollowIndexAction.Response> {
 
     public static final UnfollowIndexAction INSTANCE = new UnfollowIndexAction();
     public static final String NAME = "cluster:admin/xpack/ccr/unfollow_index";

diff --git a/.../ccr/src/main/java/org/elasticsearch/xpack/ccr/action/bulk/BulkShardOperationsAction.java b/.../ccr/src/main/java/org/elasticsearch/xpack/ccr/action/bulk/BulkShardOperationsAction.java
@@ -7,8 +7,7 @@
 
 import org.elasticsearch.action.Action;
 
-public class BulkShardOperationsAction
-        extends Action<BulkShardOperationsRequest, BulkShardOperationsResponse> {
+public class BulkShardOperationsAction extends Action<BulkShardOperationsResponse> {
 
     public static final BulkShardOperationsAction INSTANCE = new BulkShardOperationsAction();
     public static final String NAME = "indices:data/write/bulk_shard_operations[s]";