Skip to content

Commit 401800d

Browse files
rjernstrjernst
authored
Core: Remove index name resolver from base TransportAction (#31002)
Most transport actions don't need to resolve index names. This commit removes the index name resolver as a super constructor parameter for TransportAction. The actions that do need the resolver then have a member added to keep the resolver from their own constructor.
1 parent 5971eb8 commit 401800d

File tree

156 files changed

+466
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+466
-689
lines changed

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/TransportNoopBulkAction.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.action.support.ActionFilters;
2828
import org.elasticsearch.action.support.HandledTransportAction;
2929
import org.elasticsearch.action.update.UpdateResponse;
30-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3130
import org.elasticsearch.common.inject.Inject;
3231
import org.elasticsearch.common.settings.Settings;
3332
import org.elasticsearch.index.shard.ShardId;
@@ -40,8 +39,8 @@ public class TransportNoopBulkAction extends HandledTransportAction<BulkRequest,
4039

4140
@Inject
4241
public TransportNoopBulkAction(Settings settings, ThreadPool threadPool, TransportService transportService,
43-
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
44-
super(settings, NoopBulkAction.NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver, BulkRequest::new);
42+
ActionFilters actionFilters) {
43+
super(settings, NoopBulkAction.NAME, threadPool, transportService, actionFilters, BulkRequest::new);
4544
}
4645

4746
@Override

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/TransportNoopSearchAction.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.elasticsearch.action.search.ShardSearchFailure;
2525
import org.elasticsearch.action.support.ActionFilters;
2626
import org.elasticsearch.action.support.HandledTransportAction;
27-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2827
import org.elasticsearch.common.inject.Inject;
28+
import org.elasticsearch.common.io.stream.Writeable;
2929
import org.elasticsearch.common.settings.Settings;
3030
import org.elasticsearch.search.aggregations.InternalAggregations;
3131
import org.elasticsearch.search.SearchHit;
@@ -40,10 +40,10 @@
4040

4141
public class TransportNoopSearchAction extends HandledTransportAction<SearchRequest, SearchResponse> {
4242
@Inject
43-
public TransportNoopSearchAction(Settings settings, ThreadPool threadPool, TransportService transportService, ActionFilters
44-
actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
45-
super(settings, NoopSearchAction.NAME, threadPool, transportService, actionFilters, SearchRequest::new,
46-
indexNameExpressionResolver);
43+
public TransportNoopSearchAction(Settings settings, ThreadPool threadPool, TransportService transportService,
44+
ActionFilters actionFilters) {
45+
super(settings, NoopSearchAction.NAME, threadPool, transportService, actionFilters,
46+
(Writeable.Reader<SearchRequest>) SearchRequest::new);
4747
}
4848

4949
@Override

‎modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.action.support.HandledTransportAction;
2929
import org.elasticsearch.client.ElasticsearchClient;
3030
import org.elasticsearch.client.node.NodeClient;
31-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3231
import org.elasticsearch.common.inject.Inject;
3332
import org.elasticsearch.common.io.stream.StreamInput;
3433
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -116,9 +115,8 @@ public static class TransportAction extends HandledTransportAction<Request, Resp
116115

117116
@Inject
118117
public TransportAction(Settings settings, ThreadPool threadPool, TransportService transportService,
119-
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
120-
super(settings, NAME, threadPool, transportService, actionFilters,
121-
indexNameExpressionResolver, Request::new);
118+
ActionFilters actionFilters) {
119+
super(settings, NAME, threadPool, transportService, actionFilters, Request::new);
122120
}
123121

124122
@Override

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportMultiSearchTemplateAction.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.elasticsearch.action.search.TransportMultiSearchAction;
2727
import org.elasticsearch.action.support.ActionFilters;
2828
import org.elasticsearch.action.support.HandledTransportAction;
29-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3029
import org.elasticsearch.common.inject.Inject;
3130
import org.elasticsearch.common.settings.Settings;
3231
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
@@ -47,11 +46,9 @@ public class TransportMultiSearchTemplateAction extends HandledTransportAction<M
4746

4847
@Inject
4948
public TransportMultiSearchTemplateAction(Settings settings, ThreadPool threadPool, TransportService transportService,
50-
ActionFilters actionFilters, IndexNameExpressionResolver resolver,
51-
ScriptService scriptService, NamedXContentRegistry xContentRegistry,
52-
TransportMultiSearchAction multiSearchAction) {
53-
super(settings, MultiSearchTemplateAction.NAME, threadPool, transportService, actionFilters, resolver,
54-
MultiSearchTemplateRequest::new);
49+
ActionFilters actionFilters, ScriptService scriptService,
50+
NamedXContentRegistry xContentRegistry, TransportMultiSearchAction multiSearchAction) {
51+
super(settings, MultiSearchTemplateAction.NAME, threadPool, transportService, actionFilters, MultiSearchTemplateRequest::new);
5552
this.scriptService = scriptService;
5653
this.xContentRegistry = xContentRegistry;
5754
this.multiSearchAction = multiSearchAction;

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.elasticsearch.action.search.TransportSearchAction;
2626
import org.elasticsearch.action.support.ActionFilters;
2727
import org.elasticsearch.action.support.HandledTransportAction;
28-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2928
import org.elasticsearch.common.bytes.BytesArray;
3029
import org.elasticsearch.common.inject.Inject;
3130
import org.elasticsearch.common.settings.Settings;
@@ -44,6 +43,7 @@
4443

4544
import java.io.IOException;
4645
import java.util.Collections;
46+
import java.util.function.Supplier;
4747

4848
public class TransportSearchTemplateAction extends HandledTransportAction<SearchTemplateRequest, SearchTemplateResponse> {
4949

@@ -55,11 +55,12 @@ public class TransportSearchTemplateAction extends HandledTransportAction<Search
5555

5656
@Inject
5757
public TransportSearchTemplateAction(Settings settings, ThreadPool threadPool, TransportService transportService,
58-
ActionFilters actionFilters, IndexNameExpressionResolver resolver,
58+
ActionFilters actionFilters,
5959
ScriptService scriptService,
6060
TransportSearchAction searchAction,
6161
NamedXContentRegistry xContentRegistry) {
62-
super(settings, SearchTemplateAction.NAME, threadPool, transportService, actionFilters, resolver, SearchTemplateRequest::new);
62+
super(settings, SearchTemplateAction.NAME, threadPool, transportService, actionFilters,
63+
(Supplier<SearchTemplateRequest>) SearchTemplateRequest::new);
6364
this.scriptService = scriptService;
6465
this.searchAction = searchAction;
6566
this.xContentRegistry = xContentRegistry;

‎modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.action.support.HandledTransportAction;
2929
import org.elasticsearch.client.ElasticsearchClient;
3030
import org.elasticsearch.client.node.NodeClient;
31-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3231
import org.elasticsearch.common.ParseField;
3332
import org.elasticsearch.common.inject.Inject;
3433
import org.elasticsearch.common.io.stream.StreamInput;
@@ -282,9 +281,8 @@ public static class TransportAction extends HandledTransportAction<Request, Resp
282281

283282
@Inject
284283
public TransportAction(Settings settings, ThreadPool threadPool, TransportService transportService,
285-
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
286-
ScriptService scriptService) {
287-
super(settings, NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver, Request::new);
284+
ActionFilters actionFilters, ScriptService scriptService) {
285+
super(settings, NAME, threadPool, transportService, actionFilters, Request::new);
288286
this.scriptService = scriptService;
289287
}
290288
@Override

‎modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/TransportRankEvalAction.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.elasticsearch.action.support.ActionFilters;
2828
import org.elasticsearch.action.support.HandledTransportAction;
2929
import org.elasticsearch.client.Client;
30-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3130
import org.elasticsearch.common.bytes.BytesArray;
3231
import org.elasticsearch.common.inject.Inject;
32+
import org.elasticsearch.common.io.stream.Writeable;
3333
import org.elasticsearch.common.settings.Settings;
3434
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
3535
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
@@ -73,11 +73,11 @@ public class TransportRankEvalAction extends HandledTransportAction<RankEvalRequ
7373
private final NamedXContentRegistry namedXContentRegistry;
7474

7575
@Inject
76-
public TransportRankEvalAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters,
77-
IndexNameExpressionResolver indexNameExpressionResolver, Client client, TransportService transportService,
78-
ScriptService scriptService, NamedXContentRegistry namedXContentRegistry) {
79-
super(settings, RankEvalAction.NAME, threadPool, transportService, actionFilters, RankEvalRequest::new,
80-
indexNameExpressionResolver);
76+
public TransportRankEvalAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters, Client client,
77+
TransportService transportService, ScriptService scriptService,
78+
NamedXContentRegistry namedXContentRegistry) {
79+
super(settings, RankEvalAction.NAME, threadPool, transportService, actionFilters,
80+
(Writeable.Reader<RankEvalRequest>) RankEvalRequest::new);
8181
this.scriptService = scriptService;
8282
this.namedXContentRegistry = namedXContentRegistry;
8383
this.client = client;

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportDeleteByQueryAction.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919

2020
package org.elasticsearch.index.reindex;
2121

22+
import java.util.function.Supplier;
23+
2224
import org.elasticsearch.action.ActionListener;
2325
import org.elasticsearch.action.support.ActionFilters;
2426
import org.elasticsearch.action.support.HandledTransportAction;
2527
import org.elasticsearch.client.Client;
2628
import org.elasticsearch.client.ParentTaskAssigningClient;
2729
import org.elasticsearch.cluster.ClusterState;
28-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2930
import org.elasticsearch.cluster.service.ClusterService;
3031
import org.elasticsearch.common.inject.Inject;
3132
import org.elasticsearch.common.settings.Settings;
@@ -40,10 +41,10 @@ public class TransportDeleteByQueryAction extends HandledTransportAction<DeleteB
4041
private final ClusterService clusterService;
4142

4243
@Inject
43-
public TransportDeleteByQueryAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters,
44-
IndexNameExpressionResolver resolver, Client client, TransportService transportService,
45-
ScriptService scriptService, ClusterService clusterService) {
46-
super(settings, DeleteByQueryAction.NAME, threadPool, transportService, actionFilters, resolver, DeleteByQueryRequest::new);
44+
public TransportDeleteByQueryAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters, Client client,
45+
TransportService transportService, ScriptService scriptService, ClusterService clusterService) {
46+
super(settings, DeleteByQueryAction.NAME, threadPool, transportService, actionFilters,
47+
(Supplier<DeleteByQueryRequest>) DeleteByQueryRequest::new);
4748
this.client = client;
4849
this.scriptService = scriptService;
4950
this.clusterService = clusterService;

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,20 @@ public class TransportReindexAction extends HandledTransportAction<ReindexReques
9797
private final AutoCreateIndex autoCreateIndex;
9898
private final Client client;
9999
private final CharacterRunAutomaton remoteWhitelist;
100+
private final IndexNameExpressionResolver indexNameExpressionResolver;
100101

101102
@Inject
102103
public TransportReindexAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters,
103104
IndexNameExpressionResolver indexNameExpressionResolver, ClusterService clusterService, ScriptService scriptService,
104105
AutoCreateIndex autoCreateIndex, Client client, TransportService transportService) {
105-
super(settings, ReindexAction.NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver,
106-
ReindexRequest::new);
106+
super(settings, ReindexAction.NAME, threadPool, transportService, actionFilters,
107+
ReindexRequest::new);
107108
this.clusterService = clusterService;
108109
this.scriptService = scriptService;
109110
this.autoCreateIndex = autoCreateIndex;
110111
this.client = client;
111112
remoteWhitelist = buildRemoteWhitelist(REMOTE_CLUSTER_WHITELIST.get(settings));
113+
this.indexNameExpressionResolver = indexNameExpressionResolver;
112114
}
113115

114116
@Override

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportRethrottleAction.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.action.support.ActionFilters;
2828
import org.elasticsearch.action.support.tasks.TransportTasksAction;
2929
import org.elasticsearch.client.Client;
30-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3130
import org.elasticsearch.cluster.service.ClusterService;
3231
import org.elasticsearch.common.inject.Inject;
3332
import org.elasticsearch.common.io.stream.StreamInput;
@@ -45,10 +44,9 @@ public class TransportRethrottleAction extends TransportTasksAction<BulkByScroll
4544

4645
@Inject
4746
public TransportRethrottleAction(Settings settings, ThreadPool threadPool, ClusterService clusterService,
48-
TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
49-
Client client) {
50-
super(settings, RethrottleAction.NAME, threadPool, clusterService, transportService, actionFilters, indexNameExpressionResolver,
51-
RethrottleRequest::new, ListTasksResponse::new, ThreadPool.Names.MANAGEMENT);
47+
TransportService transportService, ActionFilters actionFilters, Client client) {
48+
super(settings, RethrottleAction.NAME, threadPool, clusterService, transportService, actionFilters,
49+
RethrottleRequest::new, ListTasksResponse::new, ThreadPool.Names.MANAGEMENT);
5250
this.client = client;
5351
}
5452

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.client.Client;
2828
import org.elasticsearch.client.ParentTaskAssigningClient;
2929
import org.elasticsearch.cluster.ClusterState;
30-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3130
import org.elasticsearch.cluster.service.ClusterService;
3231
import org.elasticsearch.common.inject.Inject;
3332
import org.elasticsearch.common.settings.Settings;
@@ -44,18 +43,18 @@
4443

4544
import java.util.Map;
4645
import java.util.function.BiFunction;
46+
import java.util.function.Supplier;
4747

4848
public class TransportUpdateByQueryAction extends HandledTransportAction<UpdateByQueryRequest, BulkByScrollResponse> {
4949
private final Client client;
5050
private final ScriptService scriptService;
5151
private final ClusterService clusterService;
5252

5353
@Inject
54-
public TransportUpdateByQueryAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters,
55-
IndexNameExpressionResolver indexNameExpressionResolver, Client client, TransportService transportService,
56-
ScriptService scriptService, ClusterService clusterService) {
54+
public TransportUpdateByQueryAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters, Client client,
55+
TransportService transportService, ScriptService scriptService, ClusterService clusterService) {
5756
super(settings, UpdateByQueryAction.NAME, threadPool, transportService, actionFilters,
58-
indexNameExpressionResolver, UpdateByQueryRequest::new);
57+
(Supplier<UpdateByQueryRequest>) UpdateByQueryRequest::new);
5958
this.client = client;
6059
this.scriptService = scriptService;
6160
this.clusterService = clusterService;

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.elasticsearch.action.support.ActionFilters;
2525
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
2626
import org.elasticsearch.action.support.nodes.TransportNodesAction;
27-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2827
import org.elasticsearch.cluster.service.ClusterService;
2928
import org.elasticsearch.common.inject.Inject;
3029
import org.elasticsearch.common.io.stream.StreamInput;
@@ -43,11 +42,10 @@ public class TransportNodesHotThreadsAction extends TransportNodesAction<NodesHo
4342
NodeHotThreads> {
4443

4544
@Inject
46-
public TransportNodesHotThreadsAction(Settings settings, ThreadPool threadPool,
47-
ClusterService clusterService, TransportService transportService,
48-
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
45+
public TransportNodesHotThreadsAction(Settings settings, ThreadPool threadPool, ClusterService clusterService,
46+
TransportService transportService, ActionFilters actionFilters) {
4947
super(settings, NodesHotThreadsAction.NAME, threadPool, clusterService, transportService, actionFilters,
50-
indexNameExpressionResolver, NodesHotThreadsRequest::new, NodeRequest::new, ThreadPool.Names.GENERIC, NodeHotThreads.class);
48+
NodesHotThreadsRequest::new, NodeRequest::new, ThreadPool.Names.GENERIC, NodeHotThreads.class);
5149
}
5250

5351
@Override

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.action.support.ActionFilters;
2424
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
2525
import org.elasticsearch.action.support.nodes.TransportNodesAction;
26-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2726
import org.elasticsearch.cluster.service.ClusterService;
2827
import org.elasticsearch.common.inject.Inject;
2928
import org.elasticsearch.common.io.stream.StreamInput;
@@ -44,12 +43,10 @@ public class TransportNodesInfoAction extends TransportNodesAction<NodesInfoRequ
4443
private final NodeService nodeService;
4544

4645
@Inject
47-
public TransportNodesInfoAction(Settings settings, ThreadPool threadPool,
48-
ClusterService clusterService, TransportService transportService,
49-
NodeService nodeService, ActionFilters actionFilters,
50-
IndexNameExpressionResolver indexNameExpressionResolver) {
46+
public TransportNodesInfoAction(Settings settings, ThreadPool threadPool, ClusterService clusterService,
47+
TransportService transportService, NodeService nodeService, ActionFilters actionFilters) {
5148
super(settings, NodesInfoAction.NAME, threadPool, clusterService, transportService, actionFilters,
52-
indexNameExpressionResolver, NodesInfoRequest::new, NodeInfoRequest::new, ThreadPool.Names.MANAGEMENT, NodeInfo.class);
49+
NodesInfoRequest::new, NodeInfoRequest::new, ThreadPool.Names.MANAGEMENT, NodeInfo.class);
5350
this.nodeService = nodeService;
5451
}
5552

0 commit comments

Comments
 (0)