Skip to content

Commit 409050e

Browse files
spinscalespinscale
authored
Refactor: Remove settings from transport action CTOR (#35208)
As settings are not used in the transport action constructor, this removes the passing of the settings in all the transport actions.
1 parent ddda2d4 commit 409050e

File tree

289 files changed

+760
-1106
lines changed

Some content is hidden

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

289 files changed

+760
-1106
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.action.support.HandledTransportAction;
2929
import org.elasticsearch.action.update.UpdateResponse;
3030
import org.elasticsearch.common.inject.Inject;
31-
import org.elasticsearch.common.settings.Settings;
3231
import org.elasticsearch.index.shard.ShardId;
3332
import org.elasticsearch.tasks.Task;
3433
import org.elasticsearch.transport.TransportService;
@@ -38,8 +37,8 @@ public class TransportNoopBulkAction extends HandledTransportAction<BulkRequest,
3837
new UpdateResponse(new ShardId("mock", "", 1), "mock_type", "1", 1L, DocWriteResponse.Result.CREATED));
3938

4039
@Inject
41-
public TransportNoopBulkAction(Settings settings, TransportService transportService, ActionFilters actionFilters) {
42-
super(settings, NoopBulkAction.NAME, transportService, actionFilters, BulkRequest::new);
40+
public TransportNoopBulkAction(TransportService transportService, ActionFilters actionFilters) {
41+
super(NoopBulkAction.NAME, transportService, actionFilters, BulkRequest::new);
4342
}
4443

4544
@Override

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.elasticsearch.action.support.HandledTransportAction;
2727
import org.elasticsearch.common.inject.Inject;
2828
import org.elasticsearch.common.io.stream.Writeable;
29-
import org.elasticsearch.common.settings.Settings;
3029
import org.elasticsearch.search.SearchHit;
3130
import org.elasticsearch.search.SearchHits;
3231
import org.elasticsearch.search.aggregations.InternalAggregations;
@@ -40,8 +39,8 @@
4039

4140
public class TransportNoopSearchAction extends HandledTransportAction<SearchRequest, SearchResponse> {
4241
@Inject
43-
public TransportNoopSearchAction(Settings settings, TransportService transportService, ActionFilters actionFilters) {
44-
super(settings, NoopSearchAction.NAME, transportService, actionFilters, (Writeable.Reader<SearchRequest>) SearchRequest::new);
42+
public TransportNoopSearchAction(TransportService transportService, ActionFilters actionFilters) {
43+
super(NoopSearchAction.NAME, transportService, actionFilters, (Writeable.Reader<SearchRequest>) SearchRequest::new);
4544
}
4645

4746
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ public void writeTo(StreamOutput out) throws IOException {
114114
public static class TransportAction extends HandledTransportAction<Request, Response> {
115115

116116
@Inject
117-
public TransportAction(Settings settings, TransportService transportService, ActionFilters actionFilters) {
118-
super(settings, NAME, transportService, actionFilters, Request::new);
117+
public TransportAction(TransportService transportService, ActionFilters actionFilters) {
118+
super(NAME, transportService, actionFilters, Request::new);
119119
}
120120

121121
@Override

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.action.support.HandledTransportAction;
2828
import org.elasticsearch.client.node.NodeClient;
2929
import org.elasticsearch.common.inject.Inject;
30-
import org.elasticsearch.common.settings.Settings;
3130
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
3231
import org.elasticsearch.script.ScriptService;
3332
import org.elasticsearch.tasks.Task;
@@ -45,10 +44,9 @@ public class TransportMultiSearchTemplateAction extends HandledTransportAction<M
4544
private final NodeClient client;
4645

4746
@Inject
48-
public TransportMultiSearchTemplateAction(Settings settings, TransportService transportService,
49-
ActionFilters actionFilters, ScriptService scriptService,
47+
public TransportMultiSearchTemplateAction(TransportService transportService, ActionFilters actionFilters, ScriptService scriptService,
5048
NamedXContentRegistry xContentRegistry, NodeClient client) {
51-
super(settings, MultiSearchTemplateAction.NAME, transportService, actionFilters, MultiSearchTemplateRequest::new);
49+
super(MultiSearchTemplateAction.NAME, transportService, actionFilters, MultiSearchTemplateRequest::new);
5250
this.scriptService = scriptService;
5351
this.xContentRegistry = xContentRegistry;
5452
this.client = client;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.client.node.NodeClient;
2828
import org.elasticsearch.common.bytes.BytesArray;
2929
import org.elasticsearch.common.inject.Inject;
30-
import org.elasticsearch.common.settings.Settings;
3130
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
3231
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
3332
import org.elasticsearch.common.xcontent.XContentFactory;
@@ -54,10 +53,9 @@ public class TransportSearchTemplateAction extends HandledTransportAction<Search
5453
private final NodeClient client;
5554

5655
@Inject
57-
public TransportSearchTemplateAction(Settings settings, TransportService transportService, ActionFilters actionFilters,
56+
public TransportSearchTemplateAction(TransportService transportService, ActionFilters actionFilters,
5857
ScriptService scriptService, NamedXContentRegistry xContentRegistry, NodeClient client) {
59-
super(settings, SearchTemplateAction.NAME, transportService, actionFilters,
60-
(Supplier<SearchTemplateRequest>) SearchTemplateRequest::new);
58+
super(SearchTemplateAction.NAME, transportService, actionFilters, (Supplier<SearchTemplateRequest>) SearchTemplateRequest::new);
6159
this.scriptService = scriptService;
6260
this.xContentRegistry = xContentRegistry;
6361
this.client = client;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,10 +464,10 @@ public static class TransportAction extends TransportSingleShardAction<Request,
464464
private final IndicesService indicesServices;
465465

466466
@Inject
467-
public TransportAction(Settings settings, ThreadPool threadPool, TransportService transportService,
467+
public TransportAction(ThreadPool threadPool, TransportService transportService,
468468
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
469469
ScriptService scriptService, ClusterService clusterService, IndicesService indicesServices) {
470-
super(settings, NAME, threadPool, clusterService, transportService, actionFilters, indexNameExpressionResolver,
470+
super(NAME, threadPool, clusterService, transportService, actionFilters, indexNameExpressionResolver,
471471
// Forking a thread here, because only light weight operations should happen on network thread and
472472
// Creating a in-memory index is not light weight
473473
// TODO: is MANAGEMENT TP the right TP? Right now this is an admin api (see action name).

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.elasticsearch.common.bytes.BytesArray;
3131
import org.elasticsearch.common.inject.Inject;
3232
import org.elasticsearch.common.io.stream.Writeable;
33-
import org.elasticsearch.common.settings.Settings;
3433
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
3534
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
3635
import org.elasticsearch.common.xcontent.XContentParser;
@@ -73,10 +72,9 @@ public class TransportRankEvalAction extends HandledTransportAction<RankEvalRequ
7372
private final NamedXContentRegistry namedXContentRegistry;
7473

7574
@Inject
76-
public TransportRankEvalAction(Settings settings, ActionFilters actionFilters, Client client,
77-
TransportService transportService, ScriptService scriptService,
78-
NamedXContentRegistry namedXContentRegistry) {
79-
super(settings, RankEvalAction.NAME, transportService, actionFilters,
75+
public TransportRankEvalAction(ActionFilters actionFilters, Client client, TransportService transportService,
76+
ScriptService scriptService, NamedXContentRegistry namedXContentRegistry) {
77+
super(RankEvalAction.NAME, transportService, actionFilters,
8078
(Writeable.Reader<RankEvalRequest>) RankEvalRequest::new);
8179
this.scriptService = scriptService;
8280
this.namedXContentRegistry = namedXContentRegistry;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.cluster.service.ClusterService;
2929
import org.elasticsearch.common.inject.Inject;
3030
import org.elasticsearch.common.io.stream.Writeable;
31-
import org.elasticsearch.common.settings.Settings;
3231
import org.elasticsearch.script.ScriptService;
3332
import org.elasticsearch.tasks.Task;
3433
import org.elasticsearch.threadpool.ThreadPool;
@@ -43,9 +42,9 @@ public class TransportDeleteByQueryAction extends HandledTransportAction<DeleteB
4342
private final ClusterService clusterService;
4443

4544
@Inject
46-
public TransportDeleteByQueryAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters, Client client,
45+
public TransportDeleteByQueryAction(ThreadPool threadPool, ActionFilters actionFilters, Client client,
4746
TransportService transportService, ScriptService scriptService, ClusterService clusterService) {
48-
super(settings, DeleteByQueryAction.NAME, transportService, actionFilters,
47+
super(DeleteByQueryAction.NAME, transportService, actionFilters,
4948
(Writeable.Reader<DeleteByQueryRequest>) DeleteByQueryRequest::new);
5049
this.threadPool = threadPool;
5150
this.client = client;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737
import org.elasticsearch.action.ActionRequestValidationException;
3838
import org.elasticsearch.action.bulk.BackoffPolicy;
3939
import org.elasticsearch.action.bulk.BulkItemResponse.Failure;
40-
import org.elasticsearch.client.RestClientBuilder;
41-
import org.elasticsearch.common.bytes.BytesReference;
42-
import org.elasticsearch.common.io.stream.Writeable;
43-
import org.elasticsearch.common.xcontent.DeprecationHandler;
44-
import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure;
4540
import org.elasticsearch.action.index.IndexRequest;
4641
import org.elasticsearch.action.search.SearchRequest;
4742
import org.elasticsearch.action.support.ActionFilters;
@@ -50,22 +45,27 @@
5045
import org.elasticsearch.client.Client;
5146
import org.elasticsearch.client.ParentTaskAssigningClient;
5247
import org.elasticsearch.client.RestClient;
48+
import org.elasticsearch.client.RestClientBuilder;
5349
import org.elasticsearch.cluster.ClusterState;
5450
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
5551
import org.elasticsearch.cluster.service.ClusterService;
5652
import org.elasticsearch.common.Strings;
53+
import org.elasticsearch.common.bytes.BytesReference;
5754
import org.elasticsearch.common.inject.Inject;
55+
import org.elasticsearch.common.io.stream.Writeable;
5856
import org.elasticsearch.common.lucene.uid.Versions;
5957
import org.elasticsearch.common.regex.Regex;
6058
import org.elasticsearch.common.settings.Setting;
6159
import org.elasticsearch.common.settings.Setting.Property;
6260
import org.elasticsearch.common.settings.Settings;
61+
import org.elasticsearch.common.xcontent.DeprecationHandler;
6362
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
6463
import org.elasticsearch.common.xcontent.XContentBuilder;
6564
import org.elasticsearch.common.xcontent.XContentParser;
6665
import org.elasticsearch.common.xcontent.XContentType;
6766
import org.elasticsearch.index.VersionType;
6867
import org.elasticsearch.index.mapper.VersionFieldMapper;
68+
import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure;
6969
import org.elasticsearch.index.reindex.remote.RemoteScrollableHitSource;
7070
import org.elasticsearch.script.Script;
7171
import org.elasticsearch.script.ScriptService;
@@ -105,7 +105,7 @@ public class TransportReindexAction extends HandledTransportAction<ReindexReques
105105
public TransportReindexAction(Settings settings, ThreadPool threadPool, ActionFilters actionFilters,
106106
IndexNameExpressionResolver indexNameExpressionResolver, ClusterService clusterService, ScriptService scriptService,
107107
AutoCreateIndex autoCreateIndex, Client client, TransportService transportService) {
108-
super(settings, ReindexAction.NAME, transportService, actionFilters, (Writeable.Reader<ReindexRequest>)ReindexRequest::new);
108+
super(ReindexAction.NAME, transportService, actionFilters, (Writeable.Reader<ReindexRequest>)ReindexRequest::new);
109109
this.threadPool = threadPool;
110110
this.clusterService = clusterService;
111111
this.scriptService = scriptService;

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.elasticsearch.cluster.service.ClusterService;
3131
import org.elasticsearch.common.inject.Inject;
3232
import org.elasticsearch.common.io.stream.StreamInput;
33-
import org.elasticsearch.common.settings.Settings;
3433
import org.elasticsearch.tasks.TaskId;
3534
import org.elasticsearch.tasks.TaskInfo;
3635
import org.elasticsearch.threadpool.ThreadPool;
@@ -43,9 +42,9 @@ public class TransportRethrottleAction extends TransportTasksAction<BulkByScroll
4342
private final Client client;
4443

4544
@Inject
46-
public TransportRethrottleAction(Settings settings, ClusterService clusterService,
47-
TransportService transportService, ActionFilters actionFilters, Client client) {
48-
super(settings, RethrottleAction.NAME, clusterService, transportService, actionFilters,
45+
public TransportRethrottleAction(ClusterService clusterService, TransportService transportService,
46+
ActionFilters actionFilters, Client client) {
47+
super(RethrottleAction.NAME, clusterService, transportService, actionFilters,
4948
RethrottleRequest::new, ListTasksResponse::new, ThreadPool.Names.MANAGEMENT);
5049
this.client = client;
5150
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.elasticsearch.cluster.service.ClusterService;
3131
import org.elasticsearch.common.inject.Inject;
3232
import org.elasticsearch.common.io.stream.Writeable;
33-
import org.elasticsearch.common.settings.Settings;
3433
import org.elasticsearch.index.VersionType;
3534
import org.elasticsearch.index.mapper.IdFieldMapper;
3635
import org.elasticsearch.index.mapper.IndexFieldMapper;
@@ -53,9 +52,9 @@ public class TransportUpdateByQueryAction extends HandledTransportAction<UpdateB
5352
private final ClusterService clusterService;
5453

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

‎server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,15 @@
3131
import org.elasticsearch.cluster.node.DiscoveryNode;
3232
import org.elasticsearch.cluster.routing.RoutingNodes;
3333
import org.elasticsearch.cluster.routing.ShardRouting;
34+
import org.elasticsearch.cluster.routing.allocation.AllocateUnassignedDecision;
3435
import org.elasticsearch.cluster.routing.allocation.MoveDecision;
3536
import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
36-
import org.elasticsearch.cluster.routing.allocation.AllocateUnassignedDecision;
3737
import org.elasticsearch.cluster.routing.allocation.RoutingAllocation.DebugMode;
3838
import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision;
3939
import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator;
4040
import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders;
4141
import org.elasticsearch.cluster.service.ClusterService;
4242
import org.elasticsearch.common.inject.Inject;
43-
import org.elasticsearch.common.settings.Settings;
4443
import org.elasticsearch.gateway.GatewayAllocator;
4544
import org.elasticsearch.threadpool.ThreadPool;
4645
import org.elasticsearch.transport.TransportService;
@@ -60,12 +59,12 @@ public class TransportClusterAllocationExplainAction
6059
private final GatewayAllocator gatewayAllocator;
6160

6261
@Inject
63-
public TransportClusterAllocationExplainAction(Settings settings, TransportService transportService, ClusterService clusterService,
62+
public TransportClusterAllocationExplainAction(TransportService transportService, ClusterService clusterService,
6463
ThreadPool threadPool, ActionFilters actionFilters,
6564
IndexNameExpressionResolver indexNameExpressionResolver,
6665
ClusterInfoService clusterInfoService, AllocationDeciders allocationDeciders,
6766
ShardsAllocator shardAllocator, GatewayAllocator gatewayAllocator) {
68-
super(settings, ClusterAllocationExplainAction.NAME, transportService, clusterService, threadPool, actionFilters,
67+
super(ClusterAllocationExplainAction.NAME, transportService, clusterService, threadPool, actionFilters,
6968
ClusterAllocationExplainRequest::new, indexNameExpressionResolver);
7069
this.clusterInfoService = clusterInfoService;
7170
this.allocationDeciders = allocationDeciders;

‎server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import org.elasticsearch.action.support.ActiveShardCount;
2626
import org.elasticsearch.action.support.IndicesOptions;
2727
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
28-
import org.elasticsearch.cluster.LocalClusterUpdateTask;
2928
import org.elasticsearch.cluster.ClusterState;
3029
import org.elasticsearch.cluster.ClusterStateObserver;
3130
import org.elasticsearch.cluster.ClusterStateUpdateTask;
31+
import org.elasticsearch.cluster.LocalClusterUpdateTask;
3232
import org.elasticsearch.cluster.NotMasterException;
3333
import org.elasticsearch.cluster.block.ClusterBlockException;
3434
import org.elasticsearch.cluster.health.ClusterHealthStatus;
@@ -37,7 +37,6 @@
3737
import org.elasticsearch.cluster.service.ClusterService;
3838
import org.elasticsearch.common.Strings;
3939
import org.elasticsearch.common.inject.Inject;
40-
import org.elasticsearch.common.settings.Settings;
4140
import org.elasticsearch.common.unit.TimeValue;
4241
import org.elasticsearch.gateway.GatewayAllocator;
4342
import org.elasticsearch.index.IndexNotFoundException;
@@ -53,10 +52,10 @@ public class TransportClusterHealthAction
5352
private final GatewayAllocator gatewayAllocator;
5453

5554
@Inject
56-
public TransportClusterHealthAction(Settings settings, TransportService transportService, ClusterService clusterService,
55+
public TransportClusterHealthAction(TransportService transportService, ClusterService clusterService,
5756
ThreadPool threadPool, ActionFilters actionFilters,
5857
IndexNameExpressionResolver indexNameExpressionResolver, GatewayAllocator gatewayAllocator) {
59-
super(settings, ClusterHealthAction.NAME, false, transportService, clusterService, threadPool, actionFilters,
58+
super(ClusterHealthAction.NAME, false, transportService, clusterService, threadPool, actionFilters,
6059
ClusterHealthRequest::new, indexNameExpressionResolver);
6160
this.gatewayAllocator = gatewayAllocator;
6261
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.common.inject.Inject;
2929
import org.elasticsearch.common.io.stream.StreamInput;
3030
import org.elasticsearch.common.io.stream.StreamOutput;
31-
import org.elasticsearch.common.settings.Settings;
3231
import org.elasticsearch.monitor.jvm.HotThreads;
3332
import org.elasticsearch.threadpool.ThreadPool;
3433
import org.elasticsearch.transport.TransportService;
@@ -42,9 +41,9 @@ public class TransportNodesHotThreadsAction extends TransportNodesAction<NodesHo
4241
NodeHotThreads> {
4342

4443
@Inject
45-
public TransportNodesHotThreadsAction(Settings settings, ThreadPool threadPool, ClusterService clusterService,
44+
public TransportNodesHotThreadsAction(ThreadPool threadPool, ClusterService clusterService,
4645
TransportService transportService, ActionFilters actionFilters) {
47-
super(settings, NodesHotThreadsAction.NAME, threadPool, clusterService, transportService, actionFilters,
46+
super(NodesHotThreadsAction.NAME, threadPool, clusterService, transportService, actionFilters,
4847
NodesHotThreadsRequest::new, NodeRequest::new, ThreadPool.Names.GENERIC, NodeHotThreads.class);
4948
}
5049

0 commit comments

Comments
 (0)