github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 23:27:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove IndexNameExpressionResolver from base classes that don't use it (#120531)

Browse source
This commit is contained in:
Simon Cooper 2025-01-22 10:17:07 +00:00 • committed by GitHub
parent 13c75c02f0
commit 39601ed683
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
229 changed files with 124 additions and 534 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/CreateDataStreamTransportAction.java
View file

@ -16,7 +16,6 @@ import org.elasticsearch.action.support.master.AcknowledgedTransportMasterNodeAc
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.MetadataCreateDataStreamService;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@ -38,7 +37,6 @@ public class CreateDataStreamTransportAction extends AcknowledgedTransportMaster
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver,
MetadataCreateDataStreamService metadataCreateDataStreamService,
SystemIndices systemIndices
) {
@ -49,7 +47,6 @@ public class CreateDataStreamTransportAction extends AcknowledgedTransportMaster
threadPool,
actionFilters,
CreateDataStreamAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.metadataCreateDataStreamService = metadataCreateDataStreamService;

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportAction.java
View file

@ -51,6 +51,7 @@ public class DeleteDataStreamTransportAction extends AcknowledgedTransportMaster
private static final Logger LOGGER = LogManager.getLogger(DeleteDataStreamTransportAction.class);
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final SystemIndices systemIndices;
@Inject
@ -69,9 +70,9 @@ public class DeleteDataStreamTransportAction extends AcknowledgedTransportMaster
threadPool,
actionFilters,
DeleteDataStreamAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.systemIndices = systemIndices;
}

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

@ -48,7 +48,6 @@ public class MigrateToDataStreamTransportAction extends AcknowledgedTransportMas
threadPool,
actionFilters,
MigrateToDataStreamAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.metadataMigrateToDataStreamService = new MetadataMigrateToDataStreamService(

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/ModifyDataStreamsTransportAction.java
View file

@ -27,6 +27,7 @@ import org.elasticsearch.transport.TransportService;
public class ModifyDataStreamsTransportAction extends AcknowledgedTransportMasterNodeAction<ModifyDataStreamsAction.Request> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final MetadataDataStreamsService metadataDataStreamsService;
@Inject
@ -45,9 +46,9 @@ public class ModifyDataStreamsTransportAction extends AcknowledgedTransportMaste
threadPool,
actionFilters,
ModifyDataStreamsAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.metadataDataStreamsService = metadataDataStreamsService;
}

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

@ -59,7 +59,6 @@ public class PromoteDataStreamTransportAction extends AcknowledgedTransportMaste
threadPool,
actionFilters,
PromoteDataStreamAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.systemIndices = systemIndices;

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsAction.java
View file

@ -62,6 +62,7 @@ public class TransportGetDataStreamsAction extends TransportMasterNodeReadAction
GetDataStreamAction.Response> {
private static final Logger LOGGER = LogManager.getLogger(TransportGetDataStreamsAction.class);
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final SystemIndices systemIndices;
private final ClusterSettings clusterSettings;
private final DataStreamGlobalRetentionSettings globalRetentionSettings;
@ -87,10 +88,10 @@ public class TransportGetDataStreamsAction extends TransportMasterNodeReadAction
threadPool,
actionFilters,
GetDataStreamAction.Request::new,
indexNameExpressionResolver,
GetDataStreamAction.Response::new,
transportService.getThreadPool().executor(ThreadPool.Names.MANAGEMENT)
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.systemIndices = systemIndices;
this.globalRetentionSettings = globalRetentionSettings;
clusterSettings = clusterService.getClusterSettings();

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportDeleteDataStreamLifecycleAction.java
View file

@ -34,6 +34,7 @@ import java.util.List;
public class TransportDeleteDataStreamLifecycleAction extends AcknowledgedTransportMasterNodeAction<
DeleteDataStreamLifecycleAction.Request> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final MetadataDataStreamsService metadataDataStreamsService;
private final SystemIndices systemIndices;
@ -54,9 +55,9 @@ public class TransportDeleteDataStreamLifecycleAction extends AcknowledgedTransp
threadPool,
actionFilters,
DeleteDataStreamLifecycleAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.metadataDataStreamsService = metadataDataStreamsService;
this.systemIndices = systemIndices;
}

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportExplainDataStreamLifecycleAction.java
View file

@ -44,6 +44,7 @@ public class TransportExplainDataStreamLifecycleAction extends TransportMasterNo
ExplainDataStreamLifecycleAction.Request,
ExplainDataStreamLifecycleAction.Response> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final DataStreamLifecycleErrorStore errorStore;
private final DataStreamGlobalRetentionSettings globalRetentionSettings;
@ -64,10 +65,10 @@ public class TransportExplainDataStreamLifecycleAction extends TransportMasterNo
threadPool,
actionFilters,
ExplainDataStreamLifecycleAction.Request::new,
indexNameExpressionResolver,
ExplainDataStreamLifecycleAction.Response::new,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.errorStore = dataLifecycleServiceErrorStore;
this.globalRetentionSettings = globalRetentionSettings;
}

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleAction.java
View file

@ -41,6 +41,7 @@ public class TransportGetDataStreamLifecycleAction extends TransportMasterNodeRe
GetDataStreamLifecycleAction.Request,
GetDataStreamLifecycleAction.Response> {
private final ClusterSettings clusterSettings;
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final DataStreamGlobalRetentionSettings globalRetentionSettings;
@Inject
@ -59,11 +60,11 @@ public class TransportGetDataStreamLifecycleAction extends TransportMasterNodeRe
threadPool,
actionFilters,
GetDataStreamLifecycleAction.Request::new,
indexNameExpressionResolver,
GetDataStreamLifecycleAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
clusterSettings = clusterService.getClusterSettings();
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.globalRetentionSettings = globalRetentionSettings;
}

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

@ -56,7 +56,6 @@ public class TransportGetDataStreamLifecycleStatsAction extends TransportMasterN
threadPool,
actionFilters,
GetDataStreamLifecycleStatsAction.Request::new,
indexNameExpressionResolver,
GetDataStreamLifecycleStatsAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportPutDataStreamLifecycleAction.java
View file

@ -34,6 +34,7 @@ import java.util.List;
*/
public class TransportPutDataStreamLifecycleAction extends AcknowledgedTransportMasterNodeAction<PutDataStreamLifecycleAction.Request> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final MetadataDataStreamsService metadataDataStreamsService;
private final SystemIndices systemIndices;
@ -54,9 +55,9 @@ public class TransportPutDataStreamLifecycleAction extends AcknowledgedTransport
threadPool,
actionFilters,
PutDataStreamLifecycleAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.metadataDataStreamsService = metadataDataStreamsService;
this.systemIndices = systemIndices;
}

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportDeleteDataStreamOptionsAction.java
View file

@ -33,6 +33,7 @@ import java.util.List;
*/
public class TransportDeleteDataStreamOptionsAction extends AcknowledgedTransportMasterNodeAction<DeleteDataStreamOptionsAction.Request> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final MetadataDataStreamsService metadataDataStreamsService;
private final SystemIndices systemIndices;
@ -53,9 +54,9 @@ public class TransportDeleteDataStreamOptionsAction extends AcknowledgedTranspor
threadPool,
actionFilters,
DeleteDataStreamOptionsAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.metadataDataStreamsService = metadataDataStreamsService;
this.systemIndices = systemIndices;
}

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportGetDataStreamOptionsAction.java
View file

@ -38,6 +38,7 @@ public class TransportGetDataStreamOptionsAction extends TransportMasterNodeRead
GetDataStreamOptionsAction.Request,
GetDataStreamOptionsAction.Response> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final SystemIndices systemIndices;
@Inject
@ -56,10 +57,10 @@ public class TransportGetDataStreamOptionsAction extends TransportMasterNodeRead
threadPool,
actionFilters,
GetDataStreamOptionsAction.Request::new,
indexNameExpressionResolver,
GetDataStreamOptionsAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.systemIndices = systemIndices;
}

3
modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportPutDataStreamOptionsAction.java
View file

@ -33,6 +33,7 @@ import java.util.List;
*/
public class TransportPutDataStreamOptionsAction extends AcknowledgedTransportMasterNodeAction<PutDataStreamOptionsAction.Request> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final MetadataDataStreamsService metadataDataStreamsService;
private final SystemIndices systemIndices;
@ -53,9 +54,9 @@ public class TransportPutDataStreamOptionsAction extends AcknowledgedTransportMa
threadPool,
actionFilters,
PutDataStreamOptionsAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.metadataDataStreamsService = metadataDataStreamsService;
this.systemIndices = systemIndices;
}

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

@ -73,7 +73,6 @@ public class TransportDeleteDatabaseConfigurationAction extends TransportMasterN
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
AcknowledgedResponse::readFrom,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

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

@ -75,7 +75,6 @@ public class TransportPutDatabaseConfigurationAction extends TransportMasterNode
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
AcknowledgedResponse::readFrom,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java
View file

@ -267,7 +267,6 @@ public class TransportMasterNodeActionIT extends ESIntegTestCase {
threadPool,
actionFilters,
TestRequest::new,
indexNameExpressionResolver,
in -> ActionResponse.Empty.INSTANCE,
threadPool.generic()
);

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

@ -75,7 +75,6 @@ public class TransportClusterAllocationExplainAction extends TransportMasterNode
threadPool,
actionFilters,
ClusterAllocationExplainRequest::new,
indexNameExpressionResolver,
ClusterAllocationExplainResponse::new,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);

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

@ -57,7 +57,6 @@ public class TransportDeleteDesiredBalanceAction extends TransportMasterNodeActi
threadPool,
actionFilters,
DesiredBalanceRequest::new,
indexNameExpressionResolver,
in -> ActionResponse.Empty.INSTANCE,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);

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

@ -65,7 +65,6 @@ public class TransportGetAllocationStatsAction extends TransportMasterNodeReadAc
threadPool,
actionFilters,
TransportGetAllocationStatsAction.Request::new,
indexNameExpressionResolver,
TransportGetAllocationStatsAction.Response::new,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);

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

@ -68,7 +68,6 @@ public class TransportGetDesiredBalanceAction extends TransportMasterNodeReadAct
threadPool,
actionFilters,
DesiredBalanceRequest::new,
indexNameExpressionResolver,
DesiredBalanceResponse::from,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java
View file

@ -83,7 +83,6 @@ public class TransportAddVotingConfigExclusionsAction extends TransportMasterNod
threadPool,
actionFilters,
AddVotingConfigExclusionsRequest::new,
indexNameExpressionResolver,
in -> ActionResponse.Empty.INSTANCE,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java
View file

@ -65,7 +65,6 @@ public class TransportClearVotingConfigExclusionsAction extends TransportMasterN
threadPool,
actionFilters,
ClearVotingConfigExclusionsRequest::new,
indexNameExpressionResolver,
in -> ActionResponse.Empty.INSTANCE,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java
View file

@ -56,7 +56,6 @@ public class TransportDeleteDesiredNodesAction extends TransportMasterNodeAction
threadPool,
actionFilters,
AcknowledgedRequest.Plain::new,
indexNameExpressionResolver,
in -> ActionResponse.Empty.INSTANCE,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportGetDesiredNodesAction.java
View file

@ -43,7 +43,6 @@ public class TransportGetDesiredNodesAction extends TransportMasterNodeReadActio
threadPool,
actionFilters,
GetDesiredNodesAction.Request::new,
indexNameExpressionResolver,
GetDesiredNodesAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java
View file

@ -64,7 +64,6 @@ public class TransportUpdateDesiredNodesAction extends TransportMasterNodeAction
threadPool,
actionFilters,
UpdateDesiredNodesRequest::new,
indexNameExpressionResolver,
UpdateDesiredNodesResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

3
server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
View file

@ -53,6 +53,7 @@ public class TransportClusterHealthAction extends TransportMasterNodeReadAction<
public static final ActionType<ClusterHealthResponse> TYPE = new ActionType<ClusterHealthResponse>(NAME);
private static final Logger logger = LogManager.getLogger(TransportClusterHealthAction.class);
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final AllocationService allocationService;
@Inject
@ -72,11 +73,11 @@ public class TransportClusterHealthAction extends TransportMasterNodeReadAction<
threadPool,
actionFilters,
ClusterHealthRequest::new,
indexNameExpressionResolver,
ClusterHealthResponse::new,
// fork to management since the health computation can become expensive for large cluster states.
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.allocationService = allocationService;
}

1
server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportGetFeatureUpgradeStatusAction.java
View file

@ -78,7 +78,6 @@ public class TransportGetFeatureUpgradeStatusAction extends TransportMasterNodeA
threadPool,
actionFilters,
GetFeatureUpgradeStatusRequest::new,
indexNameExpressionResolver,
GetFeatureUpgradeStatusResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java
View file

@ -63,7 +63,6 @@ public class TransportPostFeatureUpgradeAction extends TransportMasterNodeAction
threadPool,
actionFilters,
PostFeatureUpgradeRequest::new,
indexNameExpressionResolver,
PostFeatureUpgradeResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java
View file

@ -73,7 +73,6 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe
threadPool,
actionFilters,
PrevalidateNodeRemovalRequest::new,
indexNameExpressionResolver,
PrevalidateNodeRemovalResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java
View file

@ -82,7 +82,6 @@ public final class TransportCleanupRepositoryAction extends TransportMasterNodeA
threadPool,
actionFilters,
CleanupRepositoryRequest::readFrom,
indexNameExpressionResolver,
CleanupRepositoryResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
View file

@ -54,7 +54,6 @@ public class TransportDeleteRepositoryAction extends AcknowledgedTransportMaster
threadPool,
actionFilters,
DeleteRepositoryRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.repositoriesService = repositoriesService;

1
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java
View file

@ -46,7 +46,6 @@ public class TransportGetRepositoriesAction extends TransportMasterNodeReadActio
threadPool,
actionFilters,
GetRepositoriesRequest::new,
indexNameExpressionResolver,
GetRepositoriesResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
View file

@ -54,7 +54,6 @@ public class TransportPutRepositoryAction extends AcknowledgedTransportMasterNod
threadPool,
actionFilters,
PutRepositoryRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.repositoriesService = repositoriesService;

1
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
View file

@ -48,7 +48,6 @@ public class TransportVerifyRepositoryAction extends TransportMasterNodeAction<V
threadPool,
actionFilters,
VerifyRepositoryRequest::new,
indexNameExpressionResolver,
VerifyRepositoryResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
View file

@ -74,7 +74,6 @@ public class TransportClusterRerouteAction extends TransportMasterNodeAction<Clu
threadPool,
actionFilters,
ClusterRerouteRequest::new,
indexNameExpressionResolver,
ClusterRerouteResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
View file

@ -71,7 +71,6 @@ public class TransportClusterUpdateSettingsAction extends TransportMasterNodeAct
threadPool,
actionFilters,
ClusterUpdateSettingsRequest::new,
indexNameExpressionResolver,
ClusterUpdateSettingsResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

3
server/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
View file

@ -44,6 +44,7 @@ public class TransportClusterSearchShardsAction extends TransportMasterNodeReadA
public static final ActionType<ClusterSearchShardsResponse> TYPE = new ActionType<>("indices:admin/shards/search_shards");
private final IndicesService indicesService;
private final IndexNameExpressionResolver indexNameExpressionResolver;
@Inject
public TransportClusterSearchShardsAction(
@ -61,11 +62,11 @@ public class TransportClusterSearchShardsAction extends TransportMasterNodeReadA
threadPool,
actionFilters,
ClusterSearchShardsRequest::new,
indexNameExpressionResolver,
ClusterSearchShardsResponse::new,
threadPool.executor(ThreadPool.Names.SEARCH_COORDINATION)
);
this.indicesService = indicesService;
this.indexNameExpressionResolver = indexNameExpressionResolver;
}
@Override

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/clone/TransportCloneSnapshotAction.java
View file

@ -50,7 +50,6 @@ public final class TransportCloneSnapshotAction extends AcknowledgedTransportMas
threadPool,
actionFilters,
CloneSnapshotRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.snapshotsService = snapshotsService;

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java
View file

@ -49,7 +49,6 @@ public class TransportCreateSnapshotAction extends TransportMasterNodeAction<Cre
threadPool,
actionFilters,
CreateSnapshotRequest::new,
indexNameExpressionResolver,
CreateSnapshotResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java
View file

@ -50,7 +50,6 @@ public class TransportDeleteSnapshotAction extends AcknowledgedTransportMasterNo
threadPool,
actionFilters,
DeleteSnapshotRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.snapshotsService = snapshotsService;

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/features/TransportResetFeatureStateAction.java
View file

@ -54,7 +54,6 @@ public class TransportResetFeatureStateAction extends TransportMasterNodeAction<
threadPool,
actionFilters,
ResetFeatureStateRequest::fromStream,
indexNameExpressionResolver,
ResetFeatureStateResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/features/TransportSnapshottableFeaturesAction.java
View file

@ -46,7 +46,6 @@ public class TransportSnapshottableFeaturesAction extends TransportMasterNodeAct
threadPool,
actionFilters,
GetSnapshottableFeaturesRequest::new,
indexNameExpressionResolver,
GetSnapshottableFeaturesResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
View file

@ -123,7 +123,6 @@ public class TransportGetSnapshotsAction extends TransportMasterNodeAction<GetSn
threadPool,
actionFilters,
GetSnapshotsRequest::new,
indexNameExpressionResolver,
GetSnapshotsResponse::new,
threadPool.executor(ThreadPool.Names.MANAGEMENT) // see [NOTE ON THREADING]
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/shard/TransportGetShardSnapshotAction.java
View file

@ -60,7 +60,6 @@ public class TransportGetShardSnapshotAction extends TransportMasterNodeAction<G
threadPool,
actionFilters,
GetShardSnapshotRequest::new,
indexNameExpressionResolver,
GetShardSnapshotResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java
View file

@ -47,7 +47,6 @@ public class TransportRestoreSnapshotAction extends TransportMasterNodeAction<Re
threadPool,
actionFilters,
RestoreSnapshotRequest::new,
indexNameExpressionResolver,
RestoreSnapshotResponse::new,
threadPool.executor(ThreadPool.Names.SNAPSHOT_META)
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
View file

@ -91,7 +91,6 @@ public class TransportSnapshotsStatusAction extends TransportMasterNodeAction<Sn
threadPool,
actionFilters,
SnapshotsStatusRequest::new,
indexNameExpressionResolver,
SnapshotsStatusResponse::new,
// building the response is somewhat expensive for large snapshots, so we fork.
threadPool.executor(ThreadPool.Names.SNAPSHOT_META)

4
server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
View file

@ -49,6 +49,8 @@ public class TransportClusterStateAction extends TransportMasterNodeReadAction<C
private static final Logger logger = LogManager.getLogger(TransportClusterStateAction.class);
private final IndexNameExpressionResolver indexNameExpressionResolver;
@Inject
public TransportClusterStateAction(
TransportService transportService,
@ -65,10 +67,10 @@ public class TransportClusterStateAction extends TransportMasterNodeReadAction<C
threadPool,
actionFilters,
ClusterStateRequest::new,
indexNameExpressionResolver,
ClusterStateResponse::new,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
}
@Override

1
server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java
View file

@ -45,7 +45,6 @@ public class TransportDeleteStoredScriptAction extends AcknowledgedTransportMast
threadPool,
actionFilters,
DeleteStoredScriptRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
}

1
server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java
View file

@ -41,7 +41,6 @@ public class TransportGetStoredScriptAction extends TransportMasterNodeReadActio
threadPool,
actionFilters,
GetStoredScriptRequest::new,
indexNameExpressionResolver,
GetStoredScriptResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java
View file

@ -47,7 +47,6 @@ public class TransportPutStoredScriptAction extends AcknowledgedTransportMasterN
threadPool,
actionFilters,
PutStoredScriptRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.scriptService = scriptService;

1
server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java
View file

@ -50,7 +50,6 @@ public class TransportPendingClusterTasksAction extends TransportMasterNodeReadA
threadPool,
actionFilters,
PendingClusterTasksRequest::new,
indexNameExpressionResolver,
PendingClusterTasksResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

3
server/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
View file

@ -64,6 +64,7 @@ public class TransportIndicesAliasesAction extends TransportMasterNodeAction<Ind
private static final Logger logger = LogManager.getLogger(TransportIndicesAliasesAction.class);
private final MetadataIndexAliasesService indexAliasesService;
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final RequestValidators<IndicesAliasesRequest> requestValidators;
private final SystemIndices systemIndices;
@ -85,11 +86,11 @@ public class TransportIndicesAliasesAction extends TransportMasterNodeAction<Ind
threadPool,
actionFilters,
IndicesAliasesRequest::new,
indexNameExpressionResolver,
IndicesAliasesResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexAliasesService = indexAliasesService;
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.requestValidators = Objects.requireNonNull(requestValidators);
this.systemIndices = systemIndices;
}

3
server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
View file

@ -46,6 +46,7 @@ public class TransportCloseIndexAction extends TransportMasterNodeAction<CloseIn
private static final Logger logger = LogManager.getLogger(TransportCloseIndexAction.class);
private final MetadataIndexStateService indexStateService;
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final DestructiveOperations destructiveOperations;
private volatile boolean closeIndexEnabled;
public static final Setting<Boolean> CLUSTER_INDICES_CLOSE_ENABLE_SETTING = Setting.boolSetting(
@ -74,11 +75,11 @@ public class TransportCloseIndexAction extends TransportMasterNodeAction<CloseIn
threadPool,
actionFilters,
CloseIndexRequest::new,
indexNameExpressionResolver,
CloseIndexResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexStateService = indexStateService;
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.destructiveOperations = destructiveOperations;
this.closeIndexEnabled = CLUSTER_INDICES_CLOSE_ENABLE_SETTING.get(settings);
clusterSettings.addSettingsUpdateConsumer(CLUSTER_INDICES_CLOSE_ENABLE_SETTING, this::setCloseIndexEnabled);

1
server/src/main/java/org/elasticsearch/action/admin/indices/create/AutoCreateAction.java
View file

@ -102,7 +102,6 @@ public final class AutoCreateAction extends ActionType<CreateIndexResponse> {
threadPool,
actionFilters,
CreateIndexRequest::new,
indexNameExpressionResolver,
CreateIndexResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java
View file

@ -68,7 +68,6 @@ public class TransportCreateIndexAction extends TransportMasterNodeAction<Create
threadPool,
actionFilters,
CreateIndexRequest::new,
indexNameExpressionResolver,
CreateIndexResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/main/java/org/elasticsearch/action/admin/indices/dangling/delete/TransportDeleteDanglingIndexAction.java
View file

@ -73,7 +73,6 @@ public class TransportDeleteDanglingIndexAction extends AcknowledgedTransportMas
threadPool,
actionFilters,
DeleteDanglingIndexRequest::new,
indexNameExpressionResolver,
threadPool.executor(ThreadPool.Names.GENERIC)
);
this.settings = settings;

3
server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
View file

@ -42,6 +42,7 @@ public class TransportDeleteIndexAction extends AcknowledgedTransportMasterNodeA
private static final Logger logger = LogManager.getLogger(TransportDeleteIndexAction.class);
private final MetadataDeleteIndexService deleteIndexService;
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final DestructiveOperations destructiveOperations;
@Inject
@ -61,10 +62,10 @@ public class TransportDeleteIndexAction extends AcknowledgedTransportMasterNodeA
threadPool,
actionFilters,
DeleteIndexRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.deleteIndexService = deleteIndexService;
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.destructiveOperations = destructiveOperations;
}

3
server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportAutoPutMappingAction.java
View file

@ -18,7 +18,6 @@ import org.elasticsearch.action.support.master.AcknowledgedTransportMasterNodeAc
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.MetadataMappingService;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@ -46,7 +45,6 @@ public class TransportAutoPutMappingAction extends AcknowledgedTransportMasterNo
final ThreadPool threadPool,
final MetadataMappingService metadataMappingService,
final ActionFilters actionFilters,
final IndexNameExpressionResolver indexNameExpressionResolver,
final SystemIndices systemIndices
) {
super(
@ -56,7 +54,6 @@ public class TransportAutoPutMappingAction extends AcknowledgedTransportMasterNo
threadPool,
actionFilters,
PutMappingRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.metadataMappingService = metadataMappingService;

3
server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
View file

@ -53,6 +53,7 @@ public class TransportPutMappingAction extends AcknowledgedTransportMasterNodeAc
private static final Logger logger = LogManager.getLogger(TransportPutMappingAction.class);
private final MetadataMappingService metadataMappingService;
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final RequestValidators<PutMappingRequest> requestValidators;
private final SystemIndices systemIndices;
@ -74,10 +75,10 @@ public class TransportPutMappingAction extends AcknowledgedTransportMasterNodeAc
threadPool,
actionFilters,
PutMappingRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.metadataMappingService = metadataMappingService;
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.requestValidators = Objects.requireNonNull(requestValidators);
this.systemIndices = systemIndices;
}

3
server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
View file

@ -39,6 +39,7 @@ public class TransportOpenIndexAction extends TransportMasterNodeAction<OpenInde
private static final Logger logger = LogManager.getLogger(TransportOpenIndexAction.class);
private final MetadataIndexStateService indexStateService;
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final DestructiveOperations destructiveOperations;
@Inject
@ -58,11 +59,11 @@ public class TransportOpenIndexAction extends TransportMasterNodeAction<OpenInde
threadPool,
actionFilters,
OpenIndexRequest::new,
indexNameExpressionResolver,
OpenIndexResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexStateService = indexStateService;
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.destructiveOperations = destructiveOperations;
}

3
server/src/main/java/org/elasticsearch/action/admin/indices/readonly/TransportAddIndexBlockAction.java
View file

@ -46,6 +46,7 @@ public class TransportAddIndexBlockAction extends TransportMasterNodeAction<AddI
private static final Logger logger = LogManager.getLogger(TransportAddIndexBlockAction.class);
private final MetadataIndexStateService indexStateService;
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final DestructiveOperations destructiveOperations;
@Inject
@ -65,11 +66,11 @@ public class TransportAddIndexBlockAction extends TransportMasterNodeAction<AddI
threadPool,
actionFilters,
AddIndexBlockRequest::new,
indexNameExpressionResolver,
AddIndexBlockResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexStateService = indexStateService;
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.destructiveOperations = destructiveOperations;
}

3
server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java
View file

@ -76,6 +76,7 @@ public class TransportRolloverAction extends TransportMasterNodeAction<RolloverR
private static final Logger logger = LogManager.getLogger(TransportRolloverAction.class);
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final Client client;
private final MasterServiceTaskQueue<RolloverTask> rolloverTaskQueue;
private final MetadataDataStreamsService metadataDataStreamsService;
@ -129,10 +130,10 @@ public class TransportRolloverAction extends TransportMasterNodeAction<RolloverR
threadPool,
actionFilters,
RolloverRequest::new,
indexNameExpressionResolver,
RolloverResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.client = client;
this.rolloverTaskQueue = clusterService.createTaskQueue(
"rollover",

3
server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java
View file

@ -39,6 +39,7 @@ public class TransportGetSettingsAction extends TransportMasterNodeReadAction<Ge
private final SettingsFilter settingsFilter;
private final IndexScopedSettings indexScopedSettings;
private final IndexNameExpressionResolver indexNameExpressionResolver;
@Inject
public TransportGetSettingsAction(
@ -57,12 +58,12 @@ public class TransportGetSettingsAction extends TransportMasterNodeReadAction<Ge
threadPool,
actionFilters,
GetSettingsRequest::new,
indexNameExpressionResolver,
GetSettingsResponse::new,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);
this.settingsFilter = settingsFilter;
this.indexScopedSettings = indexedScopedSettings;
this.indexNameExpressionResolver = indexNameExpressionResolver;
}
@Override

3
server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
View file

@ -50,6 +50,7 @@ public class TransportUpdateSettingsAction extends AcknowledgedTransportMasterNo
private static final Logger logger = LogManager.getLogger(TransportUpdateSettingsAction.class);
private final MetadataUpdateSettingsService updateSettingsService;
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final SystemIndices systemIndices;
@Inject
@ -69,10 +70,10 @@ public class TransportUpdateSettingsAction extends AcknowledgedTransportMasterNo
threadPool,
actionFilters,
UpdateSettingsRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.updateSettingsService = updateSettingsService;
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.systemIndices = systemIndices;
}

3
server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java
View file

@ -68,6 +68,7 @@ public class TransportIndicesShardStoresAction extends TransportMasterNodeReadAc
private static final Logger logger = LogManager.getLogger(TransportIndicesShardStoresAction.class);
private final IndexNameExpressionResolver indexNameExpressionResolver;
private final NodeClient client;
@Inject
@ -86,10 +87,10 @@ public class TransportIndicesShardStoresAction extends TransportMasterNodeReadAc
threadPool,
actionFilters,
IndicesShardStoresRequest::new,
indexNameExpressionResolver,
IndicesShardStoresResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.client = client;
}

1
server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java
View file

@ -87,7 +87,6 @@ public class TransportResizeAction extends TransportMasterNodeAction<ResizeReque
threadPool,
actionFilters,
ResizeRequest::new,
indexNameExpressionResolver,
CreateIndexResponse::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

11
server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteComponentTemplateAction.java
View file

@ -57,16 +57,7 @@ public class TransportDeleteComponentTemplateAction extends AcknowledgedTranspor
ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver
) {
super(
TYPE.name(),
transportService,
clusterService,
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(TYPE.name(), transportService, clusterService, threadPool, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.indexTemplateService = indexTemplateService;
}

11
server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteComposableIndexTemplateAction.java
View file

@ -56,16 +56,7 @@ public class TransportDeleteComposableIndexTemplateAction extends AcknowledgedTr
ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver
) {
super(
TYPE.name(),
transportService,
clusterService,
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(TYPE.name(), transportService, clusterService, threadPool, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.indexTemplateService = indexTemplateService;
}

1
server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
View file

@ -53,7 +53,6 @@ public class TransportDeleteIndexTemplateAction extends AcknowledgedTransportMas
threadPool,
actionFilters,
DeleteIndexTemplateRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexTemplateService = indexTemplateService;

1
server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComponentTemplateAction.java
View file

@ -56,7 +56,6 @@ public class TransportPutComponentTemplateAction extends AcknowledgedTransportMa
threadPool,
actionFilters,
PutComponentTemplateAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexTemplateService = indexTemplateService;

11
server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComposableIndexTemplateAction.java
View file

@ -65,16 +65,7 @@ public class TransportPutComposableIndexTemplateAction extends AcknowledgedTrans
ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver
) {
super(
TYPE.name(),
transportService,
clusterService,
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(TYPE.name(), transportService, clusterService, threadPool, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.indexTemplateService = indexTemplateService;
}

1
server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
View file

@ -61,7 +61,6 @@ public class TransportPutIndexTemplateAction extends AcknowledgedTransportMaster
threadPool,
actionFilters,
PutIndexTemplateRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexTemplateService = indexTemplateService;

1
server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java
View file

@ -48,7 +48,6 @@ public class DeletePipelineTransportAction extends AcknowledgedTransportMasterNo
threadPool,
actionFilters,
DeletePipelineRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.ingestService = ingestService;

3
server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java
View file

@ -21,7 +21,6 @@ import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.ingest.IngestService;
import org.elasticsearch.injection.guice.Inject;
@ -44,7 +43,6 @@ public class PutPipelineTransportAction extends AcknowledgedTransportMasterNodeA
ThreadPool threadPool,
TransportService transportService,
ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver,
IngestService ingestService,
NodeClient client
) {
@ -55,7 +53,6 @@ public class PutPipelineTransportAction extends AcknowledgedTransportMasterNodeA
threadPool,
actionFilters,
PutPipelineRequest::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
// This client is only used to perform an internal implementation detail,

16
server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedTransportMasterNodeAction.java
View file

@ -10,7 +10,6 @@
package org.elasticsearch.action.support.master;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.threadpool.ThreadPool;
@ -32,20 +31,9 @@ public abstract class AcknowledgedTransportMasterNodeAction<Request extends Mast
ThreadPool threadPool,
ActionFilters actionFilters,
Writeable.Reader<Request> request,
IndexNameExpressionResolver indexNameExpressionResolver,
Executor executor
) {
super(
actionName,
transportService,
clusterService,
threadPool,
actionFilters,
request,
indexNameExpressionResolver,
AcknowledgedResponse::readFrom,
executor
);
super(actionName, transportService, clusterService, threadPool, actionFilters, request, AcknowledgedResponse::readFrom, executor);
}
protected AcknowledgedTransportMasterNodeAction(
@ -56,7 +44,6 @@ public abstract class AcknowledgedTransportMasterNodeAction<Request extends Mast
ThreadPool threadPool,
ActionFilters actionFilters,
Writeable.Reader<Request> request,
IndexNameExpressionResolver indexNameExpressionResolver,
Executor executor
) {
super(
@ -67,7 +54,6 @@ public abstract class AcknowledgedTransportMasterNodeAction<Request extends Mast
threadPool,
actionFilters,
request,
indexNameExpressionResolver,
AcknowledgedResponse::readFrom,
executor
);

18
server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
View file

@ -22,7 +22,6 @@ import org.elasticsearch.cluster.ClusterStateObserver;
import org.elasticsearch.cluster.block.ClusterBlock;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.cluster.service.ClusterService;
@ -64,7 +63,6 @@ public abstract class TransportMasterNodeAction<Request extends MasterNodeReques
protected final ThreadPool threadPool;
protected final TransportService transportService;
protected final ClusterService clusterService;
protected final IndexNameExpressionResolver indexNameExpressionResolver;
private final Writeable.Reader<Response> responseReader;
@ -77,22 +75,10 @@ public abstract class TransportMasterNodeAction<Request extends MasterNodeReques
ThreadPool threadPool,
ActionFilters actionFilters,
Writeable.Reader<Request> request,
IndexNameExpressionResolver indexNameExpressionResolver,
Writeable.Reader<Response> response,
Executor executor
) {
this(
actionName,
true,
transportService,
clusterService,
threadPool,
actionFilters,
request,
indexNameExpressionResolver,
response,
executor
);
this(actionName, true, transportService, clusterService, threadPool, actionFilters, request, response, executor);
}
protected TransportMasterNodeAction(
@ -103,7 +89,6 @@ public abstract class TransportMasterNodeAction<Request extends MasterNodeReques
ThreadPool threadPool,
ActionFilters actionFilters,
Writeable.Reader<Request> request,
IndexNameExpressionResolver indexNameExpressionResolver,
Writeable.Reader<Response> response,
Executor executor
) {
@ -111,7 +96,6 @@ public abstract class TransportMasterNodeAction<Request extends MasterNodeReques
this.transportService = transportService;
this.clusterService = clusterService;
this.threadPool = threadPool;
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.executor = executor;
this.responseReader = response;
}

29
server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java
View file

@ -11,7 +11,6 @@ package org.elasticsearch.action.support.master;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.threadpool.ThreadPool;
@ -33,22 +32,10 @@ public abstract class TransportMasterNodeReadAction<Request extends MasterNodeRe
ThreadPool threadPool,
ActionFilters actionFilters,
Writeable.Reader<Request> request,
IndexNameExpressionResolver indexNameExpressionResolver,
Writeable.Reader<Response> response,
Executor executor
) {
this(
actionName,
true,
transportService,
clusterService,
threadPool,
actionFilters,
request,
indexNameExpressionResolver,
response,
executor
);
this(actionName, true, transportService, clusterService, threadPool, actionFilters, request, response, executor);
}
protected TransportMasterNodeReadAction(
@ -59,22 +46,10 @@ public abstract class TransportMasterNodeReadAction<Request extends MasterNodeRe
ThreadPool threadPool,
ActionFilters actionFilters,
Writeable.Reader<Request> request,
IndexNameExpressionResolver indexNameExpressionResolver,
Writeable.Reader<Response> response,
Executor executor
) {
super(
actionName,
canTripCircuitBreaker,
transportService,
clusterService,
threadPool,
actionFilters,
request,
indexNameExpressionResolver,
response,
executor
);
super(actionName, canTripCircuitBreaker, transportService, clusterService, threadPool, actionFilters, request, response, executor);
}
@Override

4
server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java
View file

@ -25,6 +25,8 @@ import org.elasticsearch.transport.TransportService;
public abstract class TransportClusterInfoAction<Request extends ClusterInfoRequest<Request>, Response extends ActionResponse> extends
TransportMasterNodeReadAction<Request, Response> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
public TransportClusterInfoAction(
String actionName,
TransportService transportService,
@ -42,10 +44,10 @@ public abstract class TransportClusterInfoAction<Request extends ClusterInfoRequ
threadPool,
actionFilters,
request,
indexNameExpressionResolver,
response,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
}
@Override

1
server/src/main/java/org/elasticsearch/persistent/CompletionPersistentTaskAction.java
View file

@ -125,7 +125,6 @@ public class CompletionPersistentTaskAction {
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
PersistentTaskResponse::new,
threadPool.executor(ThreadPool.Names.GENERIC)
);

1
server/src/main/java/org/elasticsearch/persistent/RemovePersistentTaskAction.java
View file

@ -94,7 +94,6 @@ public class RemovePersistentTaskAction {
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
PersistentTaskResponse::new,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);

1
server/src/main/java/org/elasticsearch/persistent/StartPersistentTaskAction.java
View file

@ -137,7 +137,6 @@ public class StartPersistentTaskAction {
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
PersistentTaskResponse::new,
threadPool.executor(ThreadPool.Names.GENERIC)
);

1
server/src/main/java/org/elasticsearch/persistent/UpdatePersistentTaskStatusAction.java
View file

@ -124,7 +124,6 @@ public class UpdatePersistentTaskStatusAction {
threadPool,
actionFilters,
Request::new,
indexNameExpressionResolver,
PersistentTaskResponse::new,
threadPool.executor(ThreadPool.Names.MANAGEMENT)
);

1
server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
View file

@ -3669,7 +3669,6 @@ public final class SnapshotsService extends AbstractLifecycleComponent implement
threadPool,
actionFilters,
UpdateIndexShardSnapshotStatusRequest::new,
indexNameExpressionResolver,
in -> ActionResponse.Empty.INSTANCE,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

2
server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java
View file

@ -257,7 +257,6 @@ public class TransportMasterNodeActionTests extends ESTestCase {
threadPool,
new ActionFilters(new HashSet<>()),
Request::new,
TestIndexNameExpressionResolver.newInstance(),
Response::new,
executor
);
@ -300,7 +299,6 @@ public class TransportMasterNodeActionTests extends ESTestCase {
threadPool,
new ActionFilters(new HashSet<>()),
ClusterUpdateSettingsRequest::new,
TestIndexNameExpressionResolver.newInstance(),
Response::new,
executor
);

1
server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java
View file

@ -133,7 +133,6 @@ public class InternalOrPrivateSettingsPlugin extends Plugin implements ActionPlu
threadPool,
actionFilters,
UpdateInternalOrPrivateAction.Request::new,
indexNameExpressionResolver,
UpdateInternalOrPrivateAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
View file

@ -2464,7 +2464,6 @@ public class SnapshotResiliencyTests extends ESTestCase {
threadPool,
metadataMappingService,
actionFilters,
indexNameExpressionResolver,
EmptySystemIndices.INSTANCE
)
);

9
x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java
View file

@ -35,14 +35,7 @@ public class AnalyticsUsageTransportAction extends XPackUsageFeatureTransportAct
IndexNameExpressionResolver indexNameExpressionResolver,
Client client
) {
super(
XPackUsageFeatureAction.ANALYTICS.name(),
transportService,
clusterService,
threadPool,
actionFilters,
indexNameExpressionResolver
);
super(XPackUsageFeatureAction.ANALYTICS.name(), transportService, clusterService, threadPool, actionFilters);
this.client = client;
}

1
x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyAction.java
View file

@ -56,7 +56,6 @@ public class TransportDeleteAutoscalingPolicyAction extends AcknowledgedTranspor
threadPool,
actionFilters,
DeleteAutoscalingPolicyAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
}

1
x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityAction.java
View file

@ -67,7 +67,6 @@ public class TransportGetAutoscalingCapacityAction extends TransportMasterNodeAc
threadPool,
actionFilters,
GetAutoscalingCapacityAction.Request::new,
indexNameExpressionResolver,
GetAutoscalingCapacityAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingPolicyAction.java
View file

@ -50,7 +50,6 @@ public class TransportGetAutoscalingPolicyAction extends TransportMasterNodeActi
threadPool,
actionFilters,
GetAutoscalingPolicyAction.Request::new,
indexNameExpressionResolver,
GetAutoscalingPolicyAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyAction.java
View file

@ -84,7 +84,6 @@ public class TransportPutAutoscalingPolicyAction extends AcknowledgedTransportMa
threadPool,
actionFilters,
PutAutoscalingPolicyAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.policyValidator = policyValidator;

2
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java
View file

@ -44,7 +44,7 @@ public class CCRUsageTransportAction extends XPackUsageFeatureTransportAction {
Settings settings,
XPackLicenseState licenseState
) {
super(XPackUsageFeatureAction.CCR.name(), transportService, clusterService, threadPool, actionFilters, indexNameExpressionResolver);
super(XPackUsageFeatureAction.CCR.name(), transportService, clusterService, threadPool, actionFilters);
this.settings = settings;
this.licenseState = licenseState;
}

1
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportActivateAutoFollowPatternAction.java
View file

@ -48,7 +48,6 @@ public class TransportActivateAutoFollowPatternAction extends AcknowledgedTransp
threadPool,
actionFilters,
Request::new,
resolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
}

1
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportCcrStatsAction.java
View file

@ -53,7 +53,6 @@ public class TransportCcrStatsAction extends TransportMasterNodeAction<CcrStatsA
threadPool,
actionFilters,
CcrStatsAction.Request::new,
indexNameExpressionResolver,
CcrStatsAction.Response::new,
threadPool.executor(Ccr.CCR_THREAD_POOL_NAME)
);

1
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportDeleteAutoFollowPatternAction.java
View file

@ -45,7 +45,6 @@ public class TransportDeleteAutoFollowPatternAction extends AcknowledgedTranspor
threadPool,
actionFilters,
DeleteAutoFollowPatternAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
}

4
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportFollowInfoAction.java
View file

@ -38,6 +38,8 @@ import java.util.Optional;
public class TransportFollowInfoAction extends TransportMasterNodeReadAction<FollowInfoAction.Request, FollowInfoAction.Response> {
private final IndexNameExpressionResolver indexNameExpressionResolver;
@Inject
public TransportFollowInfoAction(
TransportService transportService,
@ -53,10 +55,10 @@ public class TransportFollowInfoAction extends TransportMasterNodeReadAction<Fol
threadPool,
actionFilters,
FollowInfoAction.Request::new,
indexNameExpressionResolver,
FollowInfoAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
}
@Override

1
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportGetAutoFollowPatternAction.java
View file

@ -48,7 +48,6 @@ public class TransportGetAutoFollowPatternAction extends TransportMasterNodeRead
threadPool,
actionFilters,
GetAutoFollowPatternAction.Request::new,
indexNameExpressionResolver,
GetAutoFollowPatternAction.Response::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);

1
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPauseFollowAction.java
View file

@ -51,7 +51,6 @@ public class TransportPauseFollowAction extends AcknowledgedTransportMasterNodeA
threadPool,
actionFilters,
PauseFollowAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.persistentTasksService = persistentTasksService;

1
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java
View file

@ -71,7 +71,6 @@ public class TransportPutAutoFollowPatternAction extends AcknowledgedTransportMa
threadPool,
actionFilters,
PutAutoFollowPatternAction.Request::new,
indexNameExpressionResolver,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.client = client;

Some files were not shown because too many files have changed in this diff Show more