Skip to content

Commit c74cd30

Browse files
committed
Remove request type parameter from CCR actions
Relates elastic#31405
1 parent ec04366 commit c74cd30

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CreateAndFollowIndexAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import java.util.Map;
4848
import java.util.Objects;
4949

50-
public class CreateAndFollowIndexAction extends Action<CreateAndFollowIndexAction.Request, CreateAndFollowIndexAction.Response> {
50+
public class CreateAndFollowIndexAction extends Action<CreateAndFollowIndexAction.Response> {
5151

5252
public static final CreateAndFollowIndexAction INSTANCE = new CreateAndFollowIndexAction();
5353
public static final String NAME = "cluster:admin/xpack/ccr/create_and_follow_index";

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/FollowIndexAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import java.util.concurrent.atomic.AtomicReferenceArray;
5454
import java.util.stream.Collectors;
5555

56-
public class FollowIndexAction extends Action<FollowIndexAction.Request, FollowIndexAction.Response> {
56+
public class FollowIndexAction extends Action<FollowIndexAction.Response> {
5757

5858
public static final FollowIndexAction INSTANCE = new FollowIndexAction();
5959
public static final String NAME = "cluster:admin/xpack/ccr/follow_index";

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardChangesAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
import static org.elasticsearch.action.ValidateActions.addValidationError;
3939

40-
public class ShardChangesAction extends Action<ShardChangesAction.Request, ShardChangesAction.Response> {
40+
public class ShardChangesAction extends Action<ShardChangesAction.Response> {
4141

4242
public static final ShardChangesAction INSTANCE = new ShardChangesAction();
4343
public static final String NAME = "indices:data/read/xpack/ccr/shard_changes";

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ static Client wrapClient(Client client, ShardFollowTask shardFollowTask) {
434434
Request extends ActionRequest,
435435
Response extends ActionResponse,
436436
RequestBuilder extends ActionRequestBuilder<Request, Response>>
437-
void doExecute(Action<Request, Response> action, Request request, ActionListener<Response> listener) {
437+
void doExecute(Action<Response> action, Request request, ActionListener<Response> listener) {
438438
final Supplier<ThreadContext.StoredContext> supplier = threadContext.newRestorableContext(false);
439439
try (ThreadContext.StoredContext ignore = stashWithHeaders(threadContext, filteredHeaders)) {
440440
super.doExecute(action, request, new ContextPreservingActionListener<>(supplier, listener));

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/UnfollowIndexAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.util.concurrent.atomic.AtomicInteger;
3030
import java.util.concurrent.atomic.AtomicReferenceArray;
3131

32-
public class UnfollowIndexAction extends Action<UnfollowIndexAction.Request, UnfollowIndexAction.Response> {
32+
public class UnfollowIndexAction extends Action<UnfollowIndexAction.Response> {
3333

3434
public static final UnfollowIndexAction INSTANCE = new UnfollowIndexAction();
3535
public static final String NAME = "cluster:admin/xpack/ccr/unfollow_index";

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/bulk/BulkShardOperationsAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
import org.elasticsearch.action.Action;
99

10-
public class BulkShardOperationsAction
11-
extends Action<BulkShardOperationsRequest, BulkShardOperationsResponse> {
10+
public class BulkShardOperationsAction extends Action<BulkShardOperationsResponse> {
1211

1312
public static final BulkShardOperationsAction INSTANCE = new BulkShardOperationsAction();
1413
public static final String NAME = "indices:data/write/bulk_shard_operations[s]";

0 commit comments

Comments
 (0)