From c74cd30ac6fb354534fbba3cd2ddd76f43e13910 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Tue, 19 Jun 2018 10:49:05 -0400 Subject: [PATCH] Remove request type parameter from CCR actions Relates #31405 --- .../xpack/ccr/action/CreateAndFollowIndexAction.java | 2 +- .../org/elasticsearch/xpack/ccr/action/FollowIndexAction.java | 2 +- .../org/elasticsearch/xpack/ccr/action/ShardChangesAction.java | 2 +- .../xpack/ccr/action/ShardFollowTasksExecutor.java | 2 +- .../elasticsearch/xpack/ccr/action/UnfollowIndexAction.java | 2 +- .../xpack/ccr/action/bulk/BulkShardOperationsAction.java | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CreateAndFollowIndexAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CreateAndFollowIndexAction.java index a71ed64ac33e0..78d6175f39efb 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CreateAndFollowIndexAction.java +++ b/x-pack/plugin/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 { +public class CreateAndFollowIndexAction extends Action { 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 index 8c58407123c8e..aa0e773e7bd27 100644 --- 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 { +public class FollowIndexAction extends Action { 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 index 1352c2cbe59c2..c72b13a701f41 100644 --- 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 { +public class ShardChangesAction extends Action { public static final ShardChangesAction INSTANCE = new ShardChangesAction(); public static final String NAME = "indices:data/read/xpack/ccr/shard_changes"; diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java index 3509149346171..1715f8cd723c5 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java +++ b/x-pack/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> - void doExecute(Action action, Request request, ActionListener listener) { + void doExecute(Action action, Request request, ActionListener listener) { final Supplier 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 index 767eba998dca2..7817841bafdb2 100644 --- 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 { +public class UnfollowIndexAction extends Action { public static final UnfollowIndexAction INSTANCE = new UnfollowIndexAction(); public static final String NAME = "cluster:admin/xpack/ccr/unfollow_index"; diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/bulk/BulkShardOperationsAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/bulk/BulkShardOperationsAction.java index ce28c2aa786cb..a85e5c50e840d 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/bulk/BulkShardOperationsAction.java +++ b/x-pack/plugin/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 { +public class BulkShardOperationsAction extends Action { public static final BulkShardOperationsAction INSTANCE = new BulkShardOperationsAction(); public static final String NAME = "indices:data/write/bulk_shard_operations[s]";