Skip to content

Commit f24508e

Browse files
committed
Remove redundant IndexNameExpressionResolver params (#123258)
Follow-up to #120531 to remove all the now-redundant constructor parameters.
1 parent e9a6b8d commit f24508e

File tree

223 files changed

+118
-668
lines changed

Some content is hidden

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

223 files changed

+118
-668
lines changed

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/MigrateToDataStreamTransportAction.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.cluster.ClusterState;
1717
import org.elasticsearch.cluster.block.ClusterBlockException;
1818
import org.elasticsearch.cluster.block.ClusterBlockLevel;
19-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2019
import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
2120
import org.elasticsearch.cluster.metadata.MetadataMigrateToDataStreamService;
2221
import org.elasticsearch.cluster.service.ClusterService;
@@ -37,7 +36,6 @@ public MigrateToDataStreamTransportAction(
3736
ClusterService clusterService,
3837
ThreadPool threadPool,
3938
ActionFilters actionFilters,
40-
IndexNameExpressionResolver indexNameExpressionResolver,
4139
IndicesService indicesService,
4240
MetadataCreateIndexService metadataCreateIndexService
4341
) {

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.elasticsearch.cluster.block.ClusterBlockException;
2222
import org.elasticsearch.cluster.block.ClusterBlockLevel;
2323
import org.elasticsearch.cluster.metadata.DataStream;
24-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2524
import org.elasticsearch.cluster.metadata.Metadata;
2625
import org.elasticsearch.cluster.service.ClusterService;
2726
import org.elasticsearch.common.Priority;
@@ -49,7 +48,6 @@ public PromoteDataStreamTransportAction(
4948
ClusterService clusterService,
5049
ThreadPool threadPool,
5150
ActionFilters actionFilters,
52-
IndexNameExpressionResolver indexNameExpressionResolver,
5351
SystemIndices systemIndices
5452
) {
5553
super(

modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.cluster.block.ClusterBlockException;
1616
import org.elasticsearch.cluster.block.ClusterBlockLevel;
1717
import org.elasticsearch.cluster.metadata.DataStream;
18-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1918
import org.elasticsearch.cluster.metadata.Metadata;
2019
import org.elasticsearch.cluster.service.ClusterService;
2120
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -46,7 +45,6 @@ public TransportGetDataStreamLifecycleStatsAction(
4645
ClusterService clusterService,
4746
ThreadPool threadPool,
4847
ActionFilters actionFilters,
49-
IndexNameExpressionResolver indexNameExpressionResolver,
5048
DataStreamLifecycleService lifecycleService
5149
) {
5250
super(

modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsActionTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.elasticsearch.cluster.metadata.DataStream;
1818
import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
1919
import org.elasticsearch.cluster.metadata.IndexMetadata;
20-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2120
import org.elasticsearch.cluster.metadata.Metadata;
2221
import org.elasticsearch.cluster.service.ClusterService;
2322
import org.elasticsearch.common.settings.Settings;
@@ -52,7 +51,6 @@ public class TransportGetDataStreamLifecycleStatsActionTests extends ESTestCase
5251
mock(ClusterService.class),
5352
mock(ThreadPool.class),
5453
mock(ActionFilters.class),
55-
mock(IndexNameExpressionResolver.class),
5654
dataStreamLifecycleService
5755
);
5856
private Long lastRunDuration;

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportDeleteDatabaseConfigurationAction.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.elasticsearch.cluster.SimpleBatchedExecutor;
2222
import org.elasticsearch.cluster.block.ClusterBlockException;
2323
import org.elasticsearch.cluster.block.ClusterBlockLevel;
24-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2524
import org.elasticsearch.cluster.metadata.Metadata;
2625
import org.elasticsearch.cluster.service.ClusterService;
2726
import org.elasticsearch.cluster.service.MasterServiceTaskQueue;
@@ -63,8 +62,7 @@ public TransportDeleteDatabaseConfigurationAction(
6362
TransportService transportService,
6463
ClusterService clusterService,
6564
ThreadPool threadPool,
66-
ActionFilters actionFilters,
67-
IndexNameExpressionResolver indexNameExpressionResolver
65+
ActionFilters actionFilters
6866
) {
6967
super(
7068
DeleteDatabaseConfigurationAction.NAME,

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportPutDatabaseConfigurationAction.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.elasticsearch.cluster.SimpleBatchedExecutor;
2121
import org.elasticsearch.cluster.block.ClusterBlockException;
2222
import org.elasticsearch.cluster.block.ClusterBlockLevel;
23-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2423
import org.elasticsearch.cluster.metadata.Metadata;
2524
import org.elasticsearch.cluster.service.ClusterService;
2625
import org.elasticsearch.cluster.service.MasterServiceTaskQueue;
@@ -65,8 +64,7 @@ public TransportPutDatabaseConfigurationAction(
6564
TransportService transportService,
6665
ClusterService clusterService,
6766
ThreadPool threadPool,
68-
ActionFilters actionFilters,
69-
IndexNameExpressionResolver indexNameExpressionResolver
67+
ActionFilters actionFilters
7068
) {
7169
super(
7270
PutDatabaseConfigurationAction.NAME,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.elasticsearch.cluster.ClusterState;
2121
import org.elasticsearch.cluster.block.ClusterBlockException;
2222
import org.elasticsearch.cluster.block.ClusterBlockLevel;
23-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2423
import org.elasticsearch.cluster.node.DiscoveryNode;
2524
import org.elasticsearch.cluster.routing.ShardRouting;
2625
import org.elasticsearch.cluster.routing.allocation.AllocationService;
@@ -61,7 +60,6 @@ public TransportClusterAllocationExplainAction(
6160
ClusterService clusterService,
6261
ThreadPool threadPool,
6362
ActionFilters actionFilters,
64-
IndexNameExpressionResolver indexNameExpressionResolver,
6563
ClusterInfoService clusterInfoService,
6664
SnapshotsInfoService snapshotsInfoService,
6765
AllocationDeciders allocationDeciders,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.elasticsearch.cluster.ClusterStateTaskListener;
2121
import org.elasticsearch.cluster.block.ClusterBlockException;
2222
import org.elasticsearch.cluster.block.ClusterBlockLevel;
23-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2423
import org.elasticsearch.cluster.routing.allocation.AllocationService;
2524
import org.elasticsearch.cluster.routing.allocation.allocator.AllocationActionMultiListener;
2625
import org.elasticsearch.cluster.routing.allocation.allocator.DesiredBalanceShardsAllocator;
@@ -46,7 +45,6 @@ public TransportDeleteDesiredBalanceAction(
4645
ClusterService clusterService,
4746
ThreadPool threadPool,
4847
ActionFilters actionFilters,
49-
IndexNameExpressionResolver indexNameExpressionResolver,
5048
AllocationService allocationService,
5149
ShardsAllocator shardsAllocator
5250
) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.elasticsearch.cluster.ClusterState;
2525
import org.elasticsearch.cluster.block.ClusterBlockException;
2626
import org.elasticsearch.cluster.block.ClusterBlockLevel;
27-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2827
import org.elasticsearch.cluster.routing.allocation.AllocationStatsService;
2928
import org.elasticsearch.cluster.routing.allocation.DiskThresholdSettings;
3029
import org.elasticsearch.cluster.routing.allocation.NodeAllocationStats;
@@ -59,7 +58,6 @@ public TransportGetAllocationStatsAction(
5958
ClusterService clusterService,
6059
ThreadPool threadPool,
6160
ActionFilters actionFilters,
62-
IndexNameExpressionResolver indexNameExpressionResolver,
6361
AllocationStatsService allocationStatsService
6462
) {
6563
super(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.elasticsearch.cluster.block.ClusterBlockException;
1919
import org.elasticsearch.cluster.block.ClusterBlockLevel;
2020
import org.elasticsearch.cluster.metadata.IndexMetadata;
21-
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2221
import org.elasticsearch.cluster.routing.IndexRoutingTable;
2322
import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
2423
import org.elasticsearch.cluster.routing.ShardRouting;
@@ -56,7 +55,6 @@ public TransportGetDesiredBalanceAction(
5655
ClusterService clusterService,
5756
ThreadPool threadPool,
5857
ActionFilters actionFilters,
59-
IndexNameExpressionResolver indexNameExpressionResolver,
6058
ShardsAllocator shardsAllocator,
6159
ClusterInfoService clusterInfoService,
6260
WriteLoadForecaster writeLoadForecaster

0 commit comments

Comments
 (0)