Skip to content

Commit 34f127b

Browse files
committed
CCR: Remove index name resolver from CCR actions
Relates #31002
1 parent efcb9a3 commit 34f127b

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.client.Client;
1717
import org.elasticsearch.cluster.ClusterState;
1818
import org.elasticsearch.cluster.metadata.IndexMetaData;
19-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2019
import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider;
2120
import org.elasticsearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider;
2221
import org.elasticsearch.cluster.service.ClusterService;
@@ -180,9 +179,9 @@ public static class TransportAction extends HandledTransportAction<Request, Resp
180179

181180
@Inject
182181
public TransportAction(Settings settings, ThreadPool threadPool, TransportService transportService, ActionFilters actionFilters,
183-
IndexNameExpressionResolver indexNameExpressionResolver, Client client, ClusterService clusterService,
184-
PersistentTasksService persistentTasksService, IndicesService indicesService) {
185-
super(settings, NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver, Request::new);
182+
Client client, ClusterService clusterService, PersistentTasksService persistentTasksService,
183+
IndicesService indicesService) {
184+
super(settings, NAME, threadPool, transportService, actionFilters, Request::new);
186185
this.client = client;
187186
this.clusterService = clusterService;
188187
this.remoteClusterService = transportService.getRemoteClusterService();

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.action.support.master.AcknowledgedResponse;
1616
import org.elasticsearch.client.Client;
1717
import org.elasticsearch.cluster.metadata.IndexMetaData;
18-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1918
import org.elasticsearch.common.inject.Inject;
2019
import org.elasticsearch.common.io.stream.StreamInput;
2120
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -89,10 +88,9 @@ public static class TransportAction extends HandledTransportAction<Request, Resp
8988
private final PersistentTasksService persistentTasksService;
9089

9190
@Inject
92-
public TransportAction(Settings settings, ThreadPool threadPool, TransportService transportService, ActionFilters actionFilters,
93-
IndexNameExpressionResolver indexNameExpressionResolver, Client client,
94-
PersistentTasksService persistentTasksService) {
95-
super(settings, NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver, Request::new);
91+
public TransportAction(Settings settings, ThreadPool threadPool, TransportService transportService,
92+
ActionFilters actionFilters, Client client, PersistentTasksService persistentTasksService) {
93+
super(settings, NAME, threadPool, transportService, actionFilters, Request::new);
9694
this.client = client;
9795
this.persistentTasksService = persistentTasksService;
9896
}

0 commit comments

Comments
 (0)