From 39601ed68361f18f264497c07429d1c43b073bfb Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Wed, 22 Jan 2025 10:17:07 +0000 Subject: [PATCH] Remove IndexNameExpressionResolver from base classes that don't use it (#120531) --- .../CreateDataStreamTransportAction.java | 3 -- .../DeleteDataStreamTransportAction.java | 3 +- .../MigrateToDataStreamTransportAction.java | 1 - .../ModifyDataStreamsTransportAction.java | 3 +- .../PromoteDataStreamTransportAction.java | 1 - .../action/TransportGetDataStreamsAction.java | 3 +- ...nsportDeleteDataStreamLifecycleAction.java | 3 +- ...sportExplainDataStreamLifecycleAction.java | 3 +- ...TransportGetDataStreamLifecycleAction.java | 3 +- ...portGetDataStreamLifecycleStatsAction.java | 1 - ...TransportPutDataStreamLifecycleAction.java | 3 +- ...ransportDeleteDataStreamOptionsAction.java | 3 +- .../TransportGetDataStreamOptionsAction.java | 3 +- .../TransportPutDataStreamOptionsAction.java | 3 +- ...portDeleteDatabaseConfigurationAction.java | 1 - ...ansportPutDatabaseConfigurationAction.java | 1 - .../master/TransportMasterNodeActionIT.java | 1 - ...ansportClusterAllocationExplainAction.java | 1 - .../TransportDeleteDesiredBalanceAction.java | 1 - .../TransportGetAllocationStatsAction.java | 1 - .../TransportGetDesiredBalanceAction.java | 1 - ...nsportAddVotingConfigExclusionsAction.java | 1 - ...portClearVotingConfigExclusionsAction.java | 1 - .../TransportDeleteDesiredNodesAction.java | 1 - .../TransportGetDesiredNodesAction.java | 1 - .../TransportUpdateDesiredNodesAction.java | 1 - .../health/TransportClusterHealthAction.java | 3 +- ...ransportGetFeatureUpgradeStatusAction.java | 1 - .../TransportPostFeatureUpgradeAction.java | 1 - ...TransportPrevalidateNodeRemovalAction.java | 1 - .../TransportCleanupRepositoryAction.java | 1 - .../TransportDeleteRepositoryAction.java | 1 - .../get/TransportGetRepositoriesAction.java | 1 - .../put/TransportPutRepositoryAction.java | 1 - .../TransportVerifyRepositoryAction.java | 1 - .../TransportClusterRerouteAction.java | 1 - .../TransportClusterUpdateSettingsAction.java | 1 - .../TransportClusterSearchShardsAction.java | 3 +- .../clone/TransportCloneSnapshotAction.java | 1 - .../create/TransportCreateSnapshotAction.java | 1 - .../delete/TransportDeleteSnapshotAction.java | 1 - .../TransportResetFeatureStateAction.java | 1 - .../TransportSnapshottableFeaturesAction.java | 1 - .../get/TransportGetSnapshotsAction.java | 1 - .../TransportGetShardSnapshotAction.java | 1 - .../TransportRestoreSnapshotAction.java | 1 - .../TransportSnapshotsStatusAction.java | 1 - .../state/TransportClusterStateAction.java | 4 ++- .../TransportDeleteStoredScriptAction.java | 1 - .../TransportGetStoredScriptAction.java | 1 - .../TransportPutStoredScriptAction.java | 1 - .../TransportPendingClusterTasksAction.java | 1 - .../alias/TransportIndicesAliasesAction.java | 3 +- .../close/TransportCloseIndexAction.java | 3 +- .../indices/create/AutoCreateAction.java | 1 - .../create/TransportCreateIndexAction.java | 1 - .../TransportDeleteDanglingIndexAction.java | 1 - .../delete/TransportDeleteIndexAction.java | 3 +- .../put/TransportAutoPutMappingAction.java | 3 -- .../put/TransportPutMappingAction.java | 3 +- .../open/TransportOpenIndexAction.java | 3 +- .../TransportAddIndexBlockAction.java | 3 +- .../rollover/TransportRolloverAction.java | 3 +- .../get/TransportGetSettingsAction.java | 3 +- .../put/TransportUpdateSettingsAction.java | 3 +- .../TransportIndicesShardStoresAction.java | 3 +- .../indices/shrink/TransportResizeAction.java | 1 - ...ransportDeleteComponentTemplateAction.java | 11 +------ ...rtDeleteComposableIndexTemplateAction.java | 11 +------ .../TransportDeleteIndexTemplateAction.java | 1 - .../TransportPutComponentTemplateAction.java | 1 - ...sportPutComposableIndexTemplateAction.java | 11 +------ .../put/TransportPutIndexTemplateAction.java | 1 - .../ingest/DeletePipelineTransportAction.java | 1 - .../ingest/PutPipelineTransportAction.java | 3 -- ...AcknowledgedTransportMasterNodeAction.java | 16 +--------- .../master/TransportMasterNodeAction.java | 18 +----------- .../master/TransportMasterNodeReadAction.java | 29 ++----------------- .../info/TransportClusterInfoAction.java | 4 ++- .../CompletionPersistentTaskAction.java | 1 - .../RemovePersistentTaskAction.java | 1 - .../persistent/StartPersistentTaskAction.java | 1 - .../UpdatePersistentTaskStatusAction.java | 1 - .../snapshots/SnapshotsService.java | 1 - .../TransportMasterNodeActionTests.java | 2 -- .../InternalOrPrivateSettingsPlugin.java | 1 - .../snapshots/SnapshotResiliencyTests.java | 1 - .../action/AnalyticsUsageTransportAction.java | 9 +----- ...ransportDeleteAutoscalingPolicyAction.java | 1 - ...TransportGetAutoscalingCapacityAction.java | 1 - .../TransportGetAutoscalingPolicyAction.java | 1 - .../TransportPutAutoscalingPolicyAction.java | 1 - .../xpack/ccr/CCRUsageTransportAction.java | 2 +- ...nsportActivateAutoFollowPatternAction.java | 1 - .../ccr/action/TransportCcrStatsAction.java | 1 - ...ransportDeleteAutoFollowPatternAction.java | 1 - .../ccr/action/TransportFollowInfoAction.java | 4 ++- .../TransportGetAutoFollowPatternAction.java | 1 - .../action/TransportPauseFollowAction.java | 1 - .../TransportPutAutoFollowPatternAction.java | 1 - .../ccr/action/TransportPutFollowAction.java | 1 - .../action/TransportResumeFollowAction.java | 1 - .../ccr/action/TransportUnfollowAction.java | 1 - .../action/XPackUsageRestCancellationIT.java | 12 ++------ .../license/TransportDeleteLicenseAction.java | 1 - .../TransportGetBasicStatusAction.java | 1 - .../license/TransportGetLicenseAction.java | 1 - .../TransportGetTrialStatusAction.java | 1 - .../TransportPostStartBasicAction.java | 1 - .../TransportPostStartTrialAction.java | 1 - .../license/TransportPutLicenseAction.java | 1 - .../core/HealthApiUsageTransportAction.java | 9 +----- .../RemoteClusterUsageTransportAction.java | 9 +----- .../AbstractTransportSetResetModeAction.java | 1 - ...AbstractTransportSetUpgradeModeAction.java | 1 - ...taStreamLifecycleUsageTransportAction.java | 9 +----- .../DataStreamUsageTransportAction.java | 9 +----- .../action/TransportXPackUsageAction.java | 1 - .../XPackUsageFeatureTransportAction.java | 5 +--- .../DataTiersUsageTransportAction.java | 9 +----- .../UpdateIndexMigrationVersionAction.java | 1 - .../TransportDeprecationInfoAction.java | 1 - .../downsample/TransportDownsampleAction.java | 1 - .../action/EnrichUsageTransportAction.java | 9 +----- .../TransportDeleteEnrichPolicyAction.java | 3 +- .../action/TransportEnrichStatsAction.java | 1 - .../TransportExecuteEnrichPolicyAction.java | 1 - .../TransportGetEnrichPolicyAction.java | 1 - .../TransportPutEnrichPolicyAction.java | 3 +- .../EnterpriseSearchUsageTransportAction.java | 9 +----- ...nsportDeleteAnalyticsCollectionAction.java | 1 - ...TransportGetAnalyticsCollectionAction.java | 1 - ...TransportPutAnalyticsCollectionAction.java | 1 - .../xpack/eql/EqlUsageTransportAction.java | 2 +- .../xpack/esql/EsqlUsageTransportAction.java | 9 +----- .../FrozenIndicesUsageTransportAction.java | 9 +----- .../action/TransportFreezeIndexAction.java | 5 ++-- .../graph/GraphUsageTransportAction.java | 9 +----- .../IndexLifecycleUsageTransportAction.java | 9 +----- .../TransportDeleteLifecycleAction.java | 1 - .../action/TransportGetLifecycleAction.java | 4 ++- .../ilm/action/TransportGetStatusAction.java | 1 - .../TransportMigrateToDataTiersAction.java | 1 - .../ilm/action/TransportMoveToStepAction.java | 1 - .../action/TransportPutLifecycleAction.java | 1 - ...sportRemoveIndexLifecyclePolicyAction.java | 4 ++- .../ilm/action/TransportRetryAction.java | 1 - .../ilm/action/TransportStartILMAction.java | 5 +--- .../ilm/action/TransportStopILMAction.java | 1 - ...ransportDeleteInferenceEndpointAction.java | 1 - .../action/TransportInferenceUsageAction.java | 9 +----- .../TransportPutInferenceModelAction.java | 1 - .../TransportUpdateInferenceModelAction.java | 1 - .../logsdb/LogsDBUsageTransportAction.java | 9 +----- .../LogstashUsageTransportAction.java | 9 +----- .../AggregateMetricUsageTransportAction.java | 13 ++------- ...ortGetTrainedModelPackageConfigAction.java | 1 - .../TransportLoadTrainedModelPackage.java | 1 - .../MachineLearningUsageTransportAction.java | 9 +----- ...ortCreateTrainedModelAssignmentAction.java | 1 - ...ansportDeleteDataFrameAnalyticsAction.java | 1 - .../action/TransportDeleteDatafeedAction.java | 1 - .../ml/action/TransportDeleteJobAction.java | 1 - .../TransportDeleteTrainedModelAction.java | 1 - ...ransportDeleteTrainedModelAliasAction.java | 1 - ...ortDeleteTrainedModelAssignmentAction.java | 1 - .../TransportFinalizeJobExecutionAction.java | 1 - ...TransportFlushTrainedModelCacheAction.java | 1 - .../action/TransportGetDatafeedsAction.java | 1 - ...etJobModelSnapshotsUpgradeStatsAction.java | 1 - .../ml/action/TransportGetJobsAction.java | 1 - .../TransportGetMlAutoscalingStats.java | 1 - .../ml/action/TransportMlMemoryAction.java | 1 - .../ml/action/TransportOpenJobAction.java | 1 - .../TransportPutDataFrameAnalyticsAction.java | 1 - .../ml/action/TransportPutDatafeedAction.java | 1 - .../ml/action/TransportPutJobAction.java | 1 - .../TransportPutTrainedModelAction.java | 1 - .../TransportPutTrainedModelAliasAction.java | 1 - ...nsportPutTrainedModelVocabularyAction.java | 1 - .../ml/action/TransportResetJobAction.java | 3 +- .../TransportRevertModelSnapshotAction.java | 3 +- ...ransportStartDataFrameAnalyticsAction.java | 1 - .../action/TransportStartDatafeedAction.java | 1 - ...portStartTrainedModelDeploymentAction.java | 1 - ...ansportUpdateDataFrameAnalyticsAction.java | 1 - .../action/TransportUpdateDatafeedAction.java | 1 - .../ml/action/TransportUpdateJobAction.java | 1 - ...dateTrainedModelAssignmentStateAction.java | 1 - ...ortUpdateTrainedModelDeploymentAction.java | 1 - ...ransportUpgradeJobModelSnapshotAction.java | 1 - .../MonitoringUsageTransportAction.java | 9 +----- ...ransportMonitoringMigrateAlertsAction.java | 1 - .../bwc/ArchiveUsageTransportAction.java | 9 +----- .../action/ProfilingUsageTransportAction.java | 9 +----- .../action/TransportGetStatusAction.java | 1 - .../action/RollupUsageTransportAction.java | 9 +----- .../action/TransportPutRollupJobAction.java | 1 - ...archableSnapshotsUsageTransportAction.java | 9 +----- ...ransportMountSearchableSnapshotAction.java | 1 - .../SecurityUsageTransportAction.java | 9 +----- .../TransportGetSecuritySettingsAction.java | 1 - ...TransportUpdateSecuritySettingsAction.java | 1 - .../TransportDeleteShutdownNodeAction.java | 1 - .../TransportGetShutdownStatusAction.java | 1 - .../TransportPutShutdownNodeAction.java | 1 - .../xpack/slm/SLMUsageTransportAction.java | 9 +----- ...ransportDeleteSnapshotLifecycleAction.java | 1 - ...ansportExecuteSnapshotLifecycleAction.java | 1 - ...ansportExecuteSnapshotRetentionAction.java | 1 - .../action/TransportGetSLMStatusAction.java | 1 - .../TransportGetSnapshotLifecycleAction.java | 1 - ...nsportGetSnapshotLifecycleStatsAction.java | 1 - .../TransportPutSnapshotLifecycleAction.java | 1 - .../slm/action/TransportStartSLMAction.java | 1 - .../slm/action/TransportStopSLMAction.java | 1 - .../action/SpatialUsageTransportAction.java | 9 +----- .../xpack/sql/SqlUsageTransportAction.java | 2 +- .../TransformUsageTransportAction.java | 9 +----- .../TransportDeleteTransformAction.java | 1 - .../action/TransportPutTransformAction.java | 3 +- .../action/TransportResetTransformAction.java | 3 +- .../action/TransportStartTransformAction.java | 3 +- .../TransportUpgradeTransformsAction.java | 1 - .../VotingOnlyUsageTransportAction.java | 9 +----- .../watcher/WatcherUsageTransportAction.java | 9 +----- .../TransportGetWatcherSettingsAction.java | 4 ++- .../TransportUpdateWatcherSettingsAction.java | 3 +- .../TransportWatcherServiceAction.java | 1 - 229 files changed, 124 insertions(+), 534 deletions(-) diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/CreateDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/CreateDataStreamTransportAction.java index 560e4972b384..ee6762eb85db 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/CreateDataStreamTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/CreateDataStreamTransportAction.java @@ -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; diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportAction.java index 769e4db41960..262bc0b07960 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportAction.java @@ -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; } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/MigrateToDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/MigrateToDataStreamTransportAction.java index 7333cc039bef..1c1edc694bef 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/MigrateToDataStreamTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/MigrateToDataStreamTransportAction.java @@ -48,7 +48,6 @@ public class MigrateToDataStreamTransportAction extends AcknowledgedTransportMas threadPool, actionFilters, MigrateToDataStreamAction.Request::new, - indexNameExpressionResolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); this.metadataMigrateToDataStreamService = new MetadataMigrateToDataStreamService( diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/ModifyDataStreamsTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/ModifyDataStreamsTransportAction.java index dd232eefc5ac..8f4e52f301aa 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/ModifyDataStreamsTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/ModifyDataStreamsTransportAction.java @@ -27,6 +27,7 @@ import org.elasticsearch.transport.TransportService; public class ModifyDataStreamsTransportAction extends AcknowledgedTransportMasterNodeAction { + 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; } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java index edc17433ab74..574e4c532750 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java @@ -59,7 +59,6 @@ public class PromoteDataStreamTransportAction extends AcknowledgedTransportMaste threadPool, actionFilters, PromoteDataStreamAction.Request::new, - indexNameExpressionResolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); this.systemIndices = systemIndices; diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsAction.java index 25d679f91b83..611cb02351e0 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsAction.java @@ -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(); diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportDeleteDataStreamLifecycleAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportDeleteDataStreamLifecycleAction.java index ace74c58d73b..76717c8e8817 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportDeleteDataStreamLifecycleAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportDeleteDataStreamLifecycleAction.java @@ -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; } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportExplainDataStreamLifecycleAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportExplainDataStreamLifecycleAction.java index 7c3c80ff70de..84fc4ba29c9f 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportExplainDataStreamLifecycleAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportExplainDataStreamLifecycleAction.java @@ -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; } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleAction.java index 1a2907240b3b..dab43f00b910 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleAction.java @@ -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; } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java index 6bbf2a6e01d0..5b973737e575 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java @@ -56,7 +56,6 @@ public class TransportGetDataStreamLifecycleStatsAction extends TransportMasterN threadPool, actionFilters, GetDataStreamLifecycleStatsAction.Request::new, - indexNameExpressionResolver, GetDataStreamLifecycleStatsAction.Response::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportPutDataStreamLifecycleAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportPutDataStreamLifecycleAction.java index 44baa6bffedf..f23af9566504 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportPutDataStreamLifecycleAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportPutDataStreamLifecycleAction.java @@ -34,6 +34,7 @@ import java.util.List; */ public class TransportPutDataStreamLifecycleAction extends AcknowledgedTransportMasterNodeAction { + 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; } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportDeleteDataStreamOptionsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportDeleteDataStreamOptionsAction.java index ead23ed78222..bf4c898c1464 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportDeleteDataStreamOptionsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportDeleteDataStreamOptionsAction.java @@ -33,6 +33,7 @@ import java.util.List; */ public class TransportDeleteDataStreamOptionsAction extends AcknowledgedTransportMasterNodeAction { + 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; } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportGetDataStreamOptionsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportGetDataStreamOptionsAction.java index b032b35c943c..d91cc7d1bc65 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportGetDataStreamOptionsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportGetDataStreamOptionsAction.java @@ -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; } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportPutDataStreamOptionsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportPutDataStreamOptionsAction.java index b1386232c44f..b480f1ac18b9 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportPutDataStreamOptionsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportPutDataStreamOptionsAction.java @@ -33,6 +33,7 @@ import java.util.List; */ public class TransportPutDataStreamOptionsAction extends AcknowledgedTransportMasterNodeAction { + 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; } diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportDeleteDatabaseConfigurationAction.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportDeleteDatabaseConfigurationAction.java index b73b2fd4beb0..41bd29b87602 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportDeleteDatabaseConfigurationAction.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportDeleteDatabaseConfigurationAction.java @@ -73,7 +73,6 @@ public class TransportDeleteDatabaseConfigurationAction extends TransportMasterN threadPool, actionFilters, Request::new, - indexNameExpressionResolver, AcknowledgedResponse::readFrom, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportPutDatabaseConfigurationAction.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportPutDatabaseConfigurationAction.java index e68bb9d82e91..605cd40ddea6 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportPutDatabaseConfigurationAction.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportPutDatabaseConfigurationAction.java @@ -75,7 +75,6 @@ public class TransportPutDatabaseConfigurationAction extends TransportMasterNode threadPool, actionFilters, Request::new, - indexNameExpressionResolver, AcknowledgedResponse::readFrom, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java index 3875e0dd1d73..d391bace5648 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java @@ -267,7 +267,6 @@ public class TransportMasterNodeActionIT extends ESIntegTestCase { threadPool, actionFilters, TestRequest::new, - indexNameExpressionResolver, in -> ActionResponse.Empty.INSTANCE, threadPool.generic() ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java index 186c9f4b8654..b183b5497f1b 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java @@ -75,7 +75,6 @@ public class TransportClusterAllocationExplainAction extends TransportMasterNode threadPool, actionFilters, ClusterAllocationExplainRequest::new, - indexNameExpressionResolver, ClusterAllocationExplainResponse::new, threadPool.executor(ThreadPool.Names.MANAGEMENT) ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportDeleteDesiredBalanceAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportDeleteDesiredBalanceAction.java index 6b490f52df46..b1393e3bf597 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportDeleteDesiredBalanceAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportDeleteDesiredBalanceAction.java @@ -57,7 +57,6 @@ public class TransportDeleteDesiredBalanceAction extends TransportMasterNodeActi threadPool, actionFilters, DesiredBalanceRequest::new, - indexNameExpressionResolver, in -> ActionResponse.Empty.INSTANCE, threadPool.executor(ThreadPool.Names.MANAGEMENT) ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java index 23bf22e08985..15c1456f98ea 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java @@ -65,7 +65,6 @@ public class TransportGetAllocationStatsAction extends TransportMasterNodeReadAc threadPool, actionFilters, TransportGetAllocationStatsAction.Request::new, - indexNameExpressionResolver, TransportGetAllocationStatsAction.Response::new, threadPool.executor(ThreadPool.Names.MANAGEMENT) ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetDesiredBalanceAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetDesiredBalanceAction.java index 3731ca7de28e..0d06da7f3348 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetDesiredBalanceAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetDesiredBalanceAction.java @@ -68,7 +68,6 @@ public class TransportGetDesiredBalanceAction extends TransportMasterNodeReadAct threadPool, actionFilters, DesiredBalanceRequest::new, - indexNameExpressionResolver, DesiredBalanceResponse::from, threadPool.executor(ThreadPool.Names.MANAGEMENT) ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java index 3528b7af38a5..8b2bad08b192 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java @@ -83,7 +83,6 @@ public class TransportAddVotingConfigExclusionsAction extends TransportMasterNod threadPool, actionFilters, AddVotingConfigExclusionsRequest::new, - indexNameExpressionResolver, in -> ActionResponse.Empty.INSTANCE, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java index a688b8105009..4b11fd326cc3 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java @@ -65,7 +65,6 @@ public class TransportClearVotingConfigExclusionsAction extends TransportMasterN threadPool, actionFilters, ClearVotingConfigExclusionsRequest::new, - indexNameExpressionResolver, in -> ActionResponse.Empty.INSTANCE, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java index dbd0250844fc..4d13b9dc68a1 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java @@ -56,7 +56,6 @@ public class TransportDeleteDesiredNodesAction extends TransportMasterNodeAction threadPool, actionFilters, AcknowledgedRequest.Plain::new, - indexNameExpressionResolver, in -> ActionResponse.Empty.INSTANCE, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportGetDesiredNodesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportGetDesiredNodesAction.java index d8460c3aabbc..6d59c35c8a11 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportGetDesiredNodesAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportGetDesiredNodesAction.java @@ -43,7 +43,6 @@ public class TransportGetDesiredNodesAction extends TransportMasterNodeReadActio threadPool, actionFilters, GetDesiredNodesAction.Request::new, - indexNameExpressionResolver, GetDesiredNodesAction.Response::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java index a0948af88e2f..86b476f84ecf 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesAction.java @@ -64,7 +64,6 @@ public class TransportUpdateDesiredNodesAction extends TransportMasterNodeAction threadPool, actionFilters, UpdateDesiredNodesRequest::new, - indexNameExpressionResolver, UpdateDesiredNodesResponse::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java index fc541fe7108c..dc516c14767a 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java @@ -53,6 +53,7 @@ public class TransportClusterHealthAction extends TransportMasterNodeReadAction< public static final ActionType TYPE = new ActionType(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; } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportGetFeatureUpgradeStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportGetFeatureUpgradeStatusAction.java index 6f3e27981adf..7378cad0ed29 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportGetFeatureUpgradeStatusAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportGetFeatureUpgradeStatusAction.java @@ -78,7 +78,6 @@ public class TransportGetFeatureUpgradeStatusAction extends TransportMasterNodeA threadPool, actionFilters, GetFeatureUpgradeStatusRequest::new, - indexNameExpressionResolver, GetFeatureUpgradeStatusResponse::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java index cc5d2e95fc2e..57ebe8ef626f 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java @@ -63,7 +63,6 @@ public class TransportPostFeatureUpgradeAction extends TransportMasterNodeAction threadPool, actionFilters, PostFeatureUpgradeRequest::new, - indexNameExpressionResolver, PostFeatureUpgradeResponse::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java index f6885f993fb1..c8d7341263ab 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java @@ -73,7 +73,6 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe threadPool, actionFilters, PrevalidateNodeRemovalRequest::new, - indexNameExpressionResolver, PrevalidateNodeRemovalResponse::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java index 891ebaa1ff7a..c3c9ee4c2a64 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java @@ -82,7 +82,6 @@ public final class TransportCleanupRepositoryAction extends TransportMasterNodeA threadPool, actionFilters, CleanupRepositoryRequest::readFrom, - indexNameExpressionResolver, CleanupRepositoryResponse::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java index 104111e38645..6d63a39e811a 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java @@ -54,7 +54,6 @@ public class TransportDeleteRepositoryAction extends AcknowledgedTransportMaster threadPool, actionFilters, DeleteRepositoryRequest::new, - indexNameExpressionResolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); this.repositoriesService = repositoriesService; diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java index 447908bec84c..ed1f1cdcc20a 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java @@ -46,7 +46,6 @@ public class TransportGetRepositoriesAction extends TransportMasterNodeReadActio threadPool, actionFilters, GetRepositoriesRequest::new, - indexNameExpressionResolver, GetRepositoriesResponse::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java index 2992a017f817..83221f9bdbfb 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java @@ -54,7 +54,6 @@ public class TransportPutRepositoryAction extends AcknowledgedTransportMasterNod threadPool, actionFilters, PutRepositoryRequest::new, - indexNameExpressionResolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); this.repositoriesService = repositoriesService; diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java index f2e0f8e41607..f3ea83d0def0 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java @@ -48,7 +48,6 @@ public class TransportVerifyRepositoryAction extends TransportMasterNodeAction 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 diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/clone/TransportCloneSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/clone/TransportCloneSnapshotAction.java index e01e9f4b90c6..6c8d98443f08 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/clone/TransportCloneSnapshotAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/clone/TransportCloneSnapshotAction.java @@ -50,7 +50,6 @@ public final class TransportCloneSnapshotAction extends AcknowledgedTransportMas threadPool, actionFilters, CloneSnapshotRequest::new, - indexNameExpressionResolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); this.snapshotsService = snapshotsService; diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java index 437dce47a576..9bbe0eef3deb 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java @@ -49,7 +49,6 @@ public class TransportCreateSnapshotAction extends TransportMasterNodeAction requestValidators; private final SystemIndices systemIndices; @@ -85,11 +86,11 @@ public class TransportIndicesAliasesAction extends TransportMasterNodeAction CLUSTER_INDICES_CLOSE_ENABLE_SETTING = Setting.boolSetting( @@ -74,11 +75,11 @@ public class TransportCloseIndexAction extends TransportMasterNodeAction { threadPool, actionFilters, CreateIndexRequest::new, - indexNameExpressionResolver, CreateIndexResponse::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java index 73f35e283f7d..423dffc6f403 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java @@ -68,7 +68,6 @@ public class TransportCreateIndexAction extends TransportMasterNodeAction 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; } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java index ffaa50f7c0f2..a4b745e57d06 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java @@ -39,6 +39,7 @@ public class TransportOpenIndexAction extends TransportMasterNodeAction rolloverTaskQueue; private final MetadataDataStreamsService metadataDataStreamsService; @@ -129,10 +130,10 @@ public class TransportRolloverAction extends TransportMasterNodeAction 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, - IndexNameExpressionResolver indexNameExpressionResolver, Executor executor ) { super( @@ -67,7 +54,6 @@ public abstract class AcknowledgedTransportMasterNodeAction responseReader; @@ -77,22 +75,10 @@ public abstract class TransportMasterNodeAction request, - IndexNameExpressionResolver indexNameExpressionResolver, Writeable.Reader 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, - IndexNameExpressionResolver indexNameExpressionResolver, Writeable.Reader response, Executor executor ) { @@ -111,7 +96,6 @@ public abstract class TransportMasterNodeAction request, - IndexNameExpressionResolver indexNameExpressionResolver, Writeable.Reader 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, - IndexNameExpressionResolver indexNameExpressionResolver, Writeable.Reader 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 diff --git a/server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java b/server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java index d521cf9e23b6..8f1e8ed40420 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java @@ -25,6 +25,8 @@ import org.elasticsearch.transport.TransportService; public abstract class TransportClusterInfoAction, Response extends ActionResponse> extends TransportMasterNodeReadAction { + private final IndexNameExpressionResolver indexNameExpressionResolver; + public TransportClusterInfoAction( String actionName, TransportService transportService, @@ -42,10 +44,10 @@ public abstract class TransportClusterInfoAction ActionResponse.Empty.INSTANCE, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java index e11b0749dad4..aa298e119f53 100644 --- a/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java @@ -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 ); diff --git a/server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java b/server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java index bc7133c99a50..9f840ab18196 100644 --- a/server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java +++ b/server/src/test/java/org/elasticsearch/indices/settings/InternalOrPrivateSettingsPlugin.java @@ -133,7 +133,6 @@ public class InternalOrPrivateSettingsPlugin extends Plugin implements ActionPlu threadPool, actionFilters, UpdateInternalOrPrivateAction.Request::new, - indexNameExpressionResolver, UpdateInternalOrPrivateAction.Response::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java index 0fe886f37aa4..061151a24c45 100644 --- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java @@ -2464,7 +2464,6 @@ public class SnapshotResiliencyTests extends ESTestCase { threadPool, metadataMappingService, actionFilters, - indexNameExpressionResolver, EmptySystemIndices.INSTANCE ) ); diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java index 7d22ea0b0298..8ec1f61084b5 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java @@ -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; } diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyAction.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyAction.java index 70a5da97aa32..7fa7c58ab67d 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyAction.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyAction.java @@ -56,7 +56,6 @@ public class TransportDeleteAutoscalingPolicyAction extends AcknowledgedTranspor threadPool, actionFilters, DeleteAutoscalingPolicyAction.Request::new, - indexNameExpressionResolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); } diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityAction.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityAction.java index 97da6a98bc38..6fd42aee5fec 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityAction.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityAction.java @@ -67,7 +67,6 @@ public class TransportGetAutoscalingCapacityAction extends TransportMasterNodeAc threadPool, actionFilters, GetAutoscalingCapacityAction.Request::new, - indexNameExpressionResolver, GetAutoscalingCapacityAction.Response::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingPolicyAction.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingPolicyAction.java index 1e8a5d36d690..0c20d551b5c3 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingPolicyAction.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingPolicyAction.java @@ -50,7 +50,6 @@ public class TransportGetAutoscalingPolicyAction extends TransportMasterNodeActi threadPool, actionFilters, GetAutoscalingPolicyAction.Request::new, - indexNameExpressionResolver, GetAutoscalingPolicyAction.Response::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyAction.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyAction.java index b07eabf2ed0c..06c0010cd09f 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyAction.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyAction.java @@ -84,7 +84,6 @@ public class TransportPutAutoscalingPolicyAction extends AcknowledgedTransportMa threadPool, actionFilters, PutAutoscalingPolicyAction.Request::new, - indexNameExpressionResolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); this.policyValidator = policyValidator; diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java index 9f3b9a3bf16d..8f4d247f171f 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java @@ -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; } diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportActivateAutoFollowPatternAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportActivateAutoFollowPatternAction.java index eef4ffa9f249..81ac8893f6c3 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportActivateAutoFollowPatternAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportActivateAutoFollowPatternAction.java @@ -48,7 +48,6 @@ public class TransportActivateAutoFollowPatternAction extends AcknowledgedTransp threadPool, actionFilters, Request::new, - resolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); } diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportCcrStatsAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportCcrStatsAction.java index dfc0b0dd37ac..66afc9cb0c99 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportCcrStatsAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportCcrStatsAction.java @@ -53,7 +53,6 @@ public class TransportCcrStatsAction extends TransportMasterNodeAction { + private final IndexNameExpressionResolver indexNameExpressionResolver; + @Inject public TransportFollowInfoAction( TransportService transportService, @@ -53,10 +55,10 @@ public class TransportFollowInfoAction extends TransportMasterNodeReadAction { + private final IndexNameExpressionResolver indexNameExpressionResolver; private final EnrichPolicyLocks enrichPolicyLocks; private final IngestService ingestService; private final Client client; @@ -70,9 +71,9 @@ public class TransportDeleteEnrichPolicyAction extends AcknowledgedTransportMast threadPool, actionFilters, DeleteEnrichPolicyAction.Request::new, - indexNameExpressionResolver, EsExecutors.DIRECT_EXECUTOR_SERVICE ); + this.indexNameExpressionResolver = indexNameExpressionResolver; this.client = client; this.enrichPolicyLocks = enrichPolicyLocks; this.ingestService = ingestService; diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichStatsAction.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichStatsAction.java index b6128491d591..b78aaa28428c 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichStatsAction.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichStatsAction.java @@ -51,7 +51,6 @@ public class TransportEnrichStatsAction extends TransportMasterNodeAction { + private final IndexNameExpressionResolver indexNameExpressionResolver; + @Inject public TransportGetLifecycleAction( TransportService transportService, @@ -53,10 +55,10 @@ public class TransportGetLifecycleAction extends TransportMasterNodeAction { + private final IndexNameExpressionResolver indexNameExpressionResolver; + @Inject public TransportRemoveIndexLifecyclePolicyAction( TransportService transportService, @@ -48,10 +50,10 @@ public class TransportRemoveIndexLifecyclePolicyAction extends TransportMasterNo threadPool, actionFilters, Request::new, - indexNameExpressionResolver, Response::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); + this.indexNameExpressionResolver = indexNameExpressionResolver; } @Override diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java index 83f26d1ec73f..38ed32a8aea8 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java @@ -65,7 +65,6 @@ public class TransportRetryAction extends TransportMasterNodeAction { private static final Logger logger = LogManager.getLogger(TransportStartTransformAction.class); + private final IndexNameExpressionResolver indexNameExpressionResolver; private final TransformConfigManager transformConfigManager; private final PersistentTasksService persistentTasksService; private final Client client; @@ -117,10 +118,10 @@ public class TransportStartTransformAction extends TransportMasterNodeAction { + private final IndexNameExpressionResolver indexNameExpressionResolver; + @Inject public TransportGetWatcherSettingsAction( TransportService transportService, @@ -49,10 +51,10 @@ public class TransportGetWatcherSettingsAction extends TransportMasterNodeAction threadPool, actionFilters, GetWatcherSettingsAction.Request::readFrom, - indexNameExpressionResolver, GetWatcherSettingsAction.Response::new, EsExecutors.DIRECT_EXECUTOR_SERVICE ); + this.indexNameExpressionResolver = indexNameExpressionResolver; } @Override diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportUpdateWatcherSettingsAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportUpdateWatcherSettingsAction.java index f2c43a91bce7..2c0fb32d05b8 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportUpdateWatcherSettingsAction.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportUpdateWatcherSettingsAction.java @@ -52,6 +52,7 @@ public class TransportUpdateWatcherSettingsAction extends TransportMasterNodeAct private static final Logger logger = LogManager.getLogger(TransportUpdateWatcherSettingsAction.class); private final MetadataUpdateSettingsService updateSettingsService; + private final IndexNameExpressionResolver indexNameExpressionResolver; @Inject public TransportUpdateWatcherSettingsAction( @@ -69,11 +70,11 @@ public class TransportUpdateWatcherSettingsAction extends TransportMasterNodeAct threadPool, actionFilters, UpdateWatcherSettingsAction.Request::new, - indexNameExpressionResolver, AcknowledgedResponse::readFrom, EsExecutors.DIRECT_EXECUTOR_SERVICE ); this.updateSettingsService = updateSettingsService; + this.indexNameExpressionResolver = indexNameExpressionResolver; } @Override diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportWatcherServiceAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportWatcherServiceAction.java index 5e6363b993ce..0abb3159864d 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportWatcherServiceAction.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportWatcherServiceAction.java @@ -52,7 +52,6 @@ public class TransportWatcherServiceAction extends AcknowledgedTransportMasterNo threadPool, actionFilters, WatcherServiceRequest::new, - indexNameExpressionResolver, threadPool.executor(ThreadPool.Names.MANAGEMENT) ); }