From 9d71ac28fe40293dd70ea47222af24c104f7f9be Mon Sep 17 00:00:00 2001 From: Sam Xiao Date: Wed, 6 Aug 2025 13:47:53 -0400 Subject: [PATCH 1/5] rename ingest actions --- .../ingest/geoip/IngestGeoIpPlugin.java | 4 ++-- ...ction.java => TransportGeoIpStatsAction.java} | 4 ++-- .../org/elasticsearch/ingest/IngestClientIT.java | 4 ++-- .../ingest/IngestFileSettingsIT.java | 6 +++--- .../IngestProcessorNotInstalledOnAllNodesIT.java | 6 +++--- .../org/elasticsearch/action/ActionModule.java | 16 ++++++++-------- ...n.java => TransportDeletePipelineAction.java} | 4 ++-- ...tion.java => TransportGetPipelineAction.java} | 4 ++-- ...tion.java => TransportPutPipelineAction.java} | 4 ++-- ...java => TransportSimulatePipelineAction.java} | 6 +++--- .../common/settings/ClusterSettings.java | 4 ++-- .../action/ingest/RestDeletePipelineAction.java | 4 ++-- .../action/ingest/RestPutPipelineAction.java | 4 ++-- .../ingest/IngestPipelineTestUtils.java | 14 +++++++------- .../org/elasticsearch/test/ESIntegTestCase.java | 4 ++-- .../elasticsearch/test/ESSingleNodeTestCase.java | 4 ++-- .../apmdata/APMIndexTemplateRegistryTests.java | 4 ++-- .../core/template/IndexTemplateRegistry.java | 4 ++-- .../authz/store/ReservedRolesStoreTests.java | 16 ++++++++-------- .../template/IndexTemplateRegistryTests.java | 16 ++++++++-------- .../enrich/EnrichPolicyReindexPipeline.java | 4 ++-- .../AnalyticsTemplateRegistryTests.java | 10 +++++----- .../ConnectorTemplateRegistryTests.java | 10 +++++----- .../ReindexDatastreamIndexTransportActionIT.java | 4 ++-- .../xpack/stack/StackTemplateRegistryTests.java | 4 ++-- 25 files changed, 82 insertions(+), 82 deletions(-) rename modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/{GeoIpStatsTransportAction.java => TransportGeoIpStatsAction.java} (97%) rename server/src/main/java/org/elasticsearch/action/ingest/{DeletePipelineTransportAction.java => TransportDeletePipelineAction.java} (96%) rename server/src/main/java/org/elasticsearch/action/ingest/{GetPipelineTransportAction.java => TransportGetPipelineAction.java} (96%) rename server/src/main/java/org/elasticsearch/action/ingest/{PutPipelineTransportAction.java => TransportPutPipelineAction.java} (97%) rename server/src/main/java/org/elasticsearch/action/ingest/{SimulatePipelineTransportAction.java => TransportSimulatePipelineAction.java} (97%) diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java index 7996faa684862..314cfb081d882 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java @@ -41,7 +41,7 @@ import org.elasticsearch.ingest.geoip.direct.TransportPutDatabaseConfigurationAction; import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStats; import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction; -import org.elasticsearch.ingest.geoip.stats.GeoIpStatsTransportAction; +import org.elasticsearch.ingest.geoip.stats.TransportGeoIpStatsAction; import org.elasticsearch.ingest.geoip.stats.RestGeoIpStatsAction; import org.elasticsearch.persistent.PersistentTaskParams; import org.elasticsearch.persistent.PersistentTaskState; @@ -184,7 +184,7 @@ public List> getPersistentTasksExecutor( @Override public List getActions() { return List.of( - new ActionHandler(GeoIpStatsAction.INSTANCE, GeoIpStatsTransportAction.class), + new ActionHandler(GeoIpStatsAction.INSTANCE, TransportGeoIpStatsAction.class), new ActionHandler(GetDatabaseConfigurationAction.INSTANCE, TransportGetDatabaseConfigurationAction.class), new ActionHandler(DeleteDatabaseConfigurationAction.INSTANCE, TransportDeleteDatabaseConfigurationAction.class), new ActionHandler(PutDatabaseConfigurationAction.INSTANCE, TransportPutDatabaseConfigurationAction.class) diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsTransportAction.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/TransportGeoIpStatsAction.java similarity index 97% rename from modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsTransportAction.java rename to modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/TransportGeoIpStatsAction.java index 275c65521c14d..58afa78872610 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsTransportAction.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/TransportGeoIpStatsAction.java @@ -32,14 +32,14 @@ import java.io.IOException; import java.util.List; -public class GeoIpStatsTransportAction extends TransportNodesAction { +public class TransportGeoIpStatsAction extends TransportNodesAction { private final DatabaseNodeService registry; private final GeoIpDownloaderTaskExecutor geoIpDownloaderTaskExecutor; private final ProjectResolver projectResolver; @Inject - public GeoIpStatsTransportAction( + public TransportGeoIpStatsAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java index af82907ce5641..4086561b94201 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java @@ -19,7 +19,7 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.ingest.GetPipelineResponse; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.SimulateDocumentBaseResult; import org.elasticsearch.action.ingest.SimulatePipelineRequest; import org.elasticsearch.action.ingest.SimulatePipelineResponse; @@ -252,7 +252,7 @@ public void testPutWithPipelineFactoryError() throws Exception { PutPipelineRequest putPipelineRequest = putJsonPipelineRequest("_id2", source); Exception e = expectThrows( ElasticsearchParseException.class, - client().execute(PutPipelineTransportAction.TYPE, putPipelineRequest) + client().execute(TransportPutPipelineAction.TYPE, putPipelineRequest) ); assertThat(e.getMessage(), equalTo("processor [test] doesn't support one or more provided configuration parameters [unused]")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java index ef475b0d722e5..39a43d450b7fe 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java @@ -12,7 +12,7 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.ReservedPipelineAction; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterStateListener; @@ -179,7 +179,7 @@ private void assertPipelinesSaveOK(CountDownLatch savedClusterState, AtomicLong + "[[my_ingest_pipeline] set as read-only by [file_settings]]", expectThrows( IllegalArgumentException.class, - client().execute(PutPipelineTransportAction.TYPE, sampleRestRequest("my_ingest_pipeline")) + client().execute(TransportPutPipelineAction.TYPE, sampleRestRequest("my_ingest_pipeline")) ).getMessage() ); } @@ -223,7 +223,7 @@ private void assertPipelinesNotSaved(CountDownLatch savedClusterState, AtomicLon assertTrue(awaitSuccessful); // This should succeed, nothing was reserved - client().execute(PutPipelineTransportAction.TYPE, sampleRestRequest("my_ingest_pipeline_bad")).get(); + client().execute(TransportPutPipelineAction.TYPE, sampleRestRequest("my_ingest_pipeline_bad")).get(); } public void testErrorSaved() throws Exception { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java index 7f48e20522afe..f26039fb93306 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java @@ -10,7 +10,7 @@ package org.elasticsearch.ingest; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.cluster.metadata.Metadata; import org.elasticsearch.common.bytes.BytesReference; @@ -65,7 +65,7 @@ public void testFailPipelineCreation() { ElasticsearchParseException.class, AcknowledgedResponse.class, l -> client().execute( - PutPipelineTransportAction.TYPE, + TransportPutPipelineAction.TYPE, IngestPipelineTestUtils.putJsonPipelineRequest("id", pipelineSource), l ) @@ -84,7 +84,7 @@ public void testFailPipelineCreationProcessorNotInstalledOnMasterNode() throws E ElasticsearchParseException.class, AcknowledgedResponse.class, l -> client().execute( - PutPipelineTransportAction.TYPE, + TransportPutPipelineAction.TYPE, IngestPipelineTestUtils.putJsonPipelineRequest("id", pipelineSource), l ) diff --git a/server/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java index 51091c5f0d886..fca391c887b44 100644 --- a/server/src/main/java/org/elasticsearch/action/ActionModule.java +++ b/server/src/main/java/org/elasticsearch/action/ActionModule.java @@ -170,12 +170,12 @@ import org.elasticsearch.action.get.TransportMultiGetAction; import org.elasticsearch.action.get.TransportShardMultiGetAction; import org.elasticsearch.action.index.TransportIndexAction; -import org.elasticsearch.action.ingest.DeletePipelineTransportAction; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.GetPipelineAction; -import org.elasticsearch.action.ingest.GetPipelineTransportAction; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportGetPipelineAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.SimulatePipelineAction; -import org.elasticsearch.action.ingest.SimulatePipelineTransportAction; +import org.elasticsearch.action.ingest.TransportSimulatePipelineAction; import org.elasticsearch.action.search.RestClosePointInTimeAction; import org.elasticsearch.action.search.RestOpenPointInTimeAction; import org.elasticsearch.action.search.TransportClearScrollAction; @@ -757,10 +757,10 @@ public void reg actions.register(TransportFieldCapabilitiesAction.TYPE, TransportFieldCapabilitiesAction.class); - actions.register(PutPipelineTransportAction.TYPE, PutPipelineTransportAction.class); - actions.register(GetPipelineAction.INSTANCE, GetPipelineTransportAction.class); - actions.register(DeletePipelineTransportAction.TYPE, DeletePipelineTransportAction.class); - actions.register(SimulatePipelineAction.INSTANCE, SimulatePipelineTransportAction.class); + actions.register(TransportPutPipelineAction.TYPE, TransportPutPipelineAction.class); + actions.register(GetPipelineAction.INSTANCE, TransportGetPipelineAction.class); + actions.register(TransportDeletePipelineAction.TYPE, TransportDeletePipelineAction.class); + actions.register(SimulatePipelineAction.INSTANCE, TransportSimulatePipelineAction.class); actionPlugins.stream().flatMap(p -> p.getActions().stream()).forEach(actions::register); diff --git a/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/TransportDeletePipelineAction.java similarity index 96% rename from server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/TransportDeletePipelineAction.java index 644239d127450..1376102f6b8b5 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/TransportDeletePipelineAction.java @@ -28,14 +28,14 @@ import java.util.Optional; import java.util.Set; -public class DeletePipelineTransportAction extends AcknowledgedTransportMasterNodeAction { +public class TransportDeletePipelineAction extends AcknowledgedTransportMasterNodeAction { public static final ActionType TYPE = new ActionType<>("cluster:admin/ingest/pipeline/delete"); private final IngestService ingestService; private final ProjectResolver projectResolver; @Inject - public DeletePipelineTransportAction( + public TransportDeletePipelineAction( ThreadPool threadPool, IngestService ingestService, TransportService transportService, diff --git a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/TransportGetPipelineAction.java similarity index 96% rename from server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/TransportGetPipelineAction.java index dbfccab83bf2d..3e6714318b21a 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/TransportGetPipelineAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.tasks.Task; import org.elasticsearch.transport.TransportService; -public class GetPipelineTransportAction extends TransportLocalProjectMetadataAction { +public class TransportGetPipelineAction extends TransportLocalProjectMetadataAction { /** * NB prior to 9.0 this was a TransportMasterNodeReadAction so for BwC it must be registered with the TransportService until * we no longer need to support calling this action remotely. @@ -33,7 +33,7 @@ public class GetPipelineTransportAction extends TransportLocalProjectMetadataAct @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT) @SuppressWarnings("this-escape") @Inject - public GetPipelineTransportAction( + public TransportGetPipelineAction( ClusterService clusterService, TransportService transportService, ActionFilters actionFilters, diff --git a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/TransportPutPipelineAction.java similarity index 97% rename from server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/TransportPutPipelineAction.java index e6c1b00ccb815..814a02b2b005a 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/TransportPutPipelineAction.java @@ -34,14 +34,14 @@ import static org.elasticsearch.ingest.IngestService.INGEST_ORIGIN; -public class PutPipelineTransportAction extends AcknowledgedTransportMasterNodeAction { +public class TransportPutPipelineAction extends AcknowledgedTransportMasterNodeAction { public static final ActionType TYPE = new ActionType<>("cluster:admin/ingest/pipeline/put"); private final IngestService ingestService; private final OriginSettingClient client; private final ProjectResolver projectResolver; @Inject - public PutPipelineTransportAction( + public TransportPutPipelineAction( ThreadPool threadPool, TransportService transportService, ActionFilters actionFilters, diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/TransportSimulatePipelineAction.java similarity index 97% rename from server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/TransportSimulatePipelineAction.java index b9586571fa9c9..d3c550736c4f7 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/TransportSimulatePipelineAction.java @@ -37,8 +37,8 @@ import java.util.Map; import java.util.Random; -public class SimulatePipelineTransportAction extends HandledTransportAction { - private static final Logger logger = LogManager.getLogger(SimulatePipelineTransportAction.class); +public class TransportSimulatePipelineAction extends HandledTransportAction { + private static final Logger logger = LogManager.getLogger(TransportSimulatePipelineAction.class); /** * This is the amount of time given as the timeout for transport requests to the ingest node. */ @@ -60,7 +60,7 @@ public class SimulatePipelineTransportAction extends HandledTransportAction random = ThreadLocal.withInitial(Randomness::get); @Inject - public SimulatePipelineTransportAction( + public TransportSimulatePipelineAction( ThreadPool threadPool, TransportService transportService, ActionFilters actionFilters, diff --git a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java index 1fbc8993cc5aa..07298ff4b562e 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java +++ b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java @@ -15,7 +15,7 @@ import org.elasticsearch.action.bulk.IncrementalBulkService; import org.elasticsearch.action.bulk.WriteAckDelay; import org.elasticsearch.action.datastreams.autosharding.DataStreamAutoShardingService; -import org.elasticsearch.action.ingest.SimulatePipelineTransportAction; +import org.elasticsearch.action.ingest.TransportSimulatePipelineAction; import org.elasticsearch.action.search.TransportSearchAction; import org.elasticsearch.action.support.AutoCreateIndex; import org.elasticsearch.action.support.DestructiveOperations; @@ -602,7 +602,7 @@ public void apply(Settings value, Settings current, Settings previous) { HealthNodeTaskExecutor.ENABLED_SETTING, LocalHealthMonitor.POLL_INTERVAL_SETTING, TransportHealthNodeAction.HEALTH_NODE_TRANSPORT_ACTION_TIMEOUT, - SimulatePipelineTransportAction.INGEST_NODE_TRANSPORT_ACTION_TIMEOUT, + TransportSimulatePipelineAction.INGEST_NODE_TRANSPORT_ACTION_TIMEOUT, WriteAckDelay.WRITE_ACK_DELAY_INTERVAL, WriteAckDelay.WRITE_ACK_DELAY_RANDOMNESS_BOUND, RemoteClusterService.REMOTE_CLUSTER_CREDENTIALS, diff --git a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java index 170fb8c7506ef..990aa1cd57a9c 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java @@ -10,7 +10,7 @@ package org.elasticsearch.rest.action.ingest; import org.elasticsearch.action.ingest.DeletePipelineRequest; -import org.elasticsearch.action.ingest.DeletePipelineTransportAction; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.client.internal.node.NodeClient; import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestRequest; @@ -44,6 +44,6 @@ public RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient cl getAckTimeout(restRequest), restRequest.param("id") ); - return channel -> client.execute(DeletePipelineTransportAction.TYPE, request, new RestToXContentListener<>(channel)); + return channel -> client.execute(TransportDeletePipelineAction.TYPE, request, new RestToXContentListener<>(channel)); } } diff --git a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java index bb1ba0d4309ad..0d27cafd1d8be 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java @@ -11,7 +11,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.client.internal.node.NodeClient; import org.elasticsearch.common.bytes.ReleasableBytesReference; import org.elasticsearch.core.Tuple; @@ -69,7 +69,7 @@ public RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient cl ifVersion ); return channel -> client.execute( - PutPipelineTransportAction.TYPE, + TransportPutPipelineAction.TYPE, request, ActionListener.withRef(new RestToXContentListener<>(channel), content) ); diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java b/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java index 9888b1eb661ff..039b762fbd171 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java @@ -11,9 +11,9 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ingest.DeletePipelineRequest; -import org.elasticsearch.action.ingest.DeletePipelineTransportAction; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.SimulatePipelineRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.internal.ElasticsearchClient; @@ -64,18 +64,18 @@ public static PutPipelineRequest putJsonPipelineRequest(String id, String jsonSt /** * Create an ingest pipeline with the given ID and body, using the given {@link ElasticsearchClient}. * - * @param client The client to use to execute the {@link PutPipelineTransportAction}. + * @param client The client to use to execute the {@link TransportPutPipelineAction}. * @param id The pipeline id. * @param source The body of the {@link PutPipelineRequest} as a JSON-formatted {@link BytesReference}. */ public static void putJsonPipeline(ElasticsearchClient client, String id, BytesReference source) { - assertAcked(safeGet(client.execute(PutPipelineTransportAction.TYPE, putJsonPipelineRequest(id, source)))); + assertAcked(safeGet(client.execute(TransportPutPipelineAction.TYPE, putJsonPipelineRequest(id, source)))); } /** * Create an ingest pipeline with the given ID and body, using the given {@link ElasticsearchClient}. * - * @param client The client to use to execute the {@link PutPipelineTransportAction}. + * @param client The client to use to execute the {@link TransportPutPipelineAction}. * @param id The pipeline id. * @param jsonString The body of the {@link PutPipelineRequest} as a JSON-formatted {@link String}. */ @@ -86,7 +86,7 @@ public static void putJsonPipeline(ElasticsearchClient client, String id, String /** * Create an ingest pipeline with the given ID and body, using the given {@link ElasticsearchClient}. * - * @param client The client to use to execute the {@link PutPipelineTransportAction}. + * @param client The client to use to execute the {@link TransportPutPipelineAction}. * @param id The pipeline id. * @param toXContent The body of the {@link PutPipelineRequest} as a {@link ToXContentFragment}. */ @@ -107,7 +107,7 @@ public static void deletePipelinesIgnoringExceptions(ElasticsearchClient client, for (final var id : ids) { ESTestCase.safeAwait( l -> client.execute( - DeletePipelineTransportAction.TYPE, + TransportDeletePipelineAction.TYPE, new DeletePipelineRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, id), new ActionListener<>() { @Override diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 5c2f9646f03b3..a3dfa460df5aa 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -52,7 +52,7 @@ import org.elasticsearch.action.datastreams.GetDataStreamAction; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.ingest.DeletePipelineRequest; -import org.elasticsearch.action.ingest.DeletePipelineTransportAction; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.GetPipelineAction; import org.elasticsearch.action.ingest.GetPipelineRequest; import org.elasticsearch.action.ingest.GetPipelineResponse; @@ -2909,7 +2909,7 @@ protected static void deletePipeline(String id) { assertAcked( safeGet( client().execute( - DeletePipelineTransportAction.TYPE, + TransportDeletePipelineAction.TYPE, new DeletePipelineRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, id) ) ) diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java index 53214590e4a60..a3fada8792bb0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.datastreams.DeleteDataStreamAction; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.ingest.DeletePipelineRequest; -import org.elasticsearch.action.ingest.DeletePipelineTransportAction; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.PutPipelineRequest; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.action.support.IndicesOptions; @@ -530,7 +530,7 @@ protected final void deletePipeline(String id) { assertAcked( safeGet( client().execute( - DeletePipelineTransportAction.TYPE, + TransportDeletePipelineAction.TYPE, new DeletePipelineRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, id) ) ) diff --git a/x-pack/plugin/apm-data/src/test/java/org/elasticsearch/xpack/apmdata/APMIndexTemplateRegistryTests.java b/x-pack/plugin/apm-data/src/test/java/org/elasticsearch/xpack/apmdata/APMIndexTemplateRegistryTests.java index 80df895418efc..db0f53f4f41ca 100644 --- a/x-pack/plugin/apm-data/src/test/java/org/elasticsearch/xpack/apmdata/APMIndexTemplateRegistryTests.java +++ b/x-pack/plugin/apm-data/src/test/java/org/elasticsearch/xpack/apmdata/APMIndexTemplateRegistryTests.java @@ -14,7 +14,7 @@ import org.elasticsearch.action.admin.indices.template.put.PutComponentTemplateAction; import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterName; @@ -459,7 +459,7 @@ private ActionResponse verifyActions( assertThat(putRequest.indexTemplate().version(), equalTo((long) apmIndexTemplateRegistry.getVersion())); assertNotNull(listener); return AcknowledgedResponse.TRUE; - } else if (action == PutPipelineTransportAction.TYPE) { + } else if (action == TransportPutPipelineAction.TYPE) { ingestPipelinesCounter.incrementAndGet(); return AcknowledgedResponse.TRUE; } else if (action == ILMActions.PUT) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java index e48608995d9d4..b446fa3921bcd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java @@ -17,7 +17,7 @@ import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest; import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.GroupedActionListener; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.MasterNodeRequest; @@ -770,7 +770,7 @@ public void onFailure(Exception e) { onPutPipelineFailure(pipelineConfig.getId(), e); } }, - (req, listener) -> client.projectClient(projectId).execute(PutPipelineTransportAction.TYPE, req, listener) + (req, listener) -> client.projectClient(projectId).execute(TransportPutPipelineAction.TYPE, req, listener) ); }); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java index 21e3d3ad0cd6c..63203551652d8 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java @@ -50,9 +50,9 @@ import org.elasticsearch.action.fieldcaps.TransportFieldCapabilitiesAction; import org.elasticsearch.action.get.TransportGetAction; import org.elasticsearch.action.index.TransportIndexAction; -import org.elasticsearch.action.ingest.DeletePipelineTransportAction; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.GetPipelineAction; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.SimulatePipelineAction; import org.elasticsearch.action.search.TransportMultiSearchAction; import org.elasticsearch.action.search.TransportSearchAction; @@ -311,9 +311,9 @@ public void testSnapshotUserRole() { assertThat(snapshotUserRole.cluster().check(TransportPutRepositoryAction.TYPE.name(), request, authentication), is(false)); assertThat(snapshotUserRole.cluster().check(GetIndexTemplatesAction.NAME, request, authentication), is(false)); assertThat(snapshotUserRole.cluster().check(TransportDeleteIndexTemplateAction.TYPE.name(), request, authentication), is(false)); - assertThat(snapshotUserRole.cluster().check(PutPipelineTransportAction.TYPE.name(), request, authentication), is(false)); + assertThat(snapshotUserRole.cluster().check(TransportPutPipelineAction.TYPE.name(), request, authentication), is(false)); assertThat(snapshotUserRole.cluster().check(GetPipelineAction.NAME, request, authentication), is(false)); - assertThat(snapshotUserRole.cluster().check(DeletePipelineTransportAction.TYPE.name(), request, authentication), is(false)); + assertThat(snapshotUserRole.cluster().check(TransportDeletePipelineAction.TYPE.name(), request, authentication), is(false)); assertThat(snapshotUserRole.cluster().check(TransportClusterRerouteAction.TYPE.name(), request, authentication), is(false)); assertThat(snapshotUserRole.cluster().check(ClusterUpdateSettingsAction.NAME, request, authentication), is(false)); assertThat(snapshotUserRole.cluster().check(MonitoringBulkAction.NAME, request, authentication), is(false)); @@ -384,9 +384,9 @@ public void testIngestAdminRole() { assertThat(ingestAdminRole.cluster().check(TransportPutIndexTemplateAction.TYPE.name(), request, authentication), is(true)); assertThat(ingestAdminRole.cluster().check(GetIndexTemplatesAction.NAME, request, authentication), is(true)); assertThat(ingestAdminRole.cluster().check(TransportDeleteIndexTemplateAction.TYPE.name(), request, authentication), is(true)); - assertThat(ingestAdminRole.cluster().check(PutPipelineTransportAction.TYPE.name(), request, authentication), is(true)); + assertThat(ingestAdminRole.cluster().check(TransportPutPipelineAction.TYPE.name(), request, authentication), is(true)); assertThat(ingestAdminRole.cluster().check(GetPipelineAction.NAME, request, authentication), is(true)); - assertThat(ingestAdminRole.cluster().check(DeletePipelineTransportAction.TYPE.name(), request, authentication), is(true)); + assertThat(ingestAdminRole.cluster().check(TransportDeletePipelineAction.TYPE.name(), request, authentication), is(true)); assertThat(ingestAdminRole.cluster().check(TransportClusterRerouteAction.TYPE.name(), request, authentication), is(false)); assertThat(ingestAdminRole.cluster().check(ClusterUpdateSettingsAction.NAME, request, authentication), is(false)); assertThat(ingestAdminRole.cluster().check(MonitoringBulkAction.NAME, request, authentication), is(false)); @@ -1315,8 +1315,8 @@ public void testKibanaSystemRole() { // 1. Pipeline Arrays.asList( GetPipelineAction.NAME, - PutPipelineTransportAction.TYPE.name(), - DeletePipelineTransportAction.TYPE.name(), + TransportPutPipelineAction.TYPE.name(), + TransportDeletePipelineAction.TYPE.name(), SimulatePipelineAction.NAME, "cluster:admin/ingest/pipeline/" + randomAlphaOfLengthBetween(3, 8) ).forEach(action -> assertThat(kibanaRole.cluster().check(action, request, authentication), is(true))); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java index d088fa445f66a..08b53a77a9edb 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java @@ -16,7 +16,7 @@ import org.elasticsearch.action.admin.indices.template.put.PutComponentTemplateAction; import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterName; @@ -113,7 +113,7 @@ public void testThatIndependentPipelinesAreAddedImmediately() throws Exception { Map calledTimesMap = new ConcurrentHashMap<>(); client.setVerifier((projectId, action, request, listener) -> { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { final var calledTimes = calledTimesMap.computeIfAbsent(projectId, k -> new AtomicInteger(0)); assertPutPipelineAction(calledTimes, action, request, listener, "custom-plugin-final_pipeline"); return AcknowledgedResponse.TRUE; @@ -139,7 +139,7 @@ public void testThatDependentPipelinesAreAddedIfDependenciesExist() throws Excep Map calledTimesMap = new ConcurrentHashMap<>(); client.setVerifier((projectId, action, request, listener) -> { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { final var calledTimes = calledTimesMap.computeIfAbsent(projectId, k -> new AtomicInteger(0)); assertPutPipelineAction(calledTimes, action, request, listener, "custom-plugin-default_pipeline"); return AcknowledgedResponse.TRUE; @@ -200,7 +200,7 @@ public void testThatTemplateIsNotAddedIfNotAllDependenciesExist() throws Excepti Map calledTimesMap = new ConcurrentHashMap<>(); client.setVerifier((projectId, action, request, listener) -> { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { final var calledTimes = calledTimesMap.computeIfAbsent(projectId, k -> new AtomicInteger(0)); assertPutPipelineAction(calledTimes, action, request, listener, "custom-plugin-default_pipeline"); return AcknowledgedResponse.TRUE; @@ -237,7 +237,7 @@ public void testThatComposableTemplateIsAddedIfDependenciesExist() throws Except } else if (action == ILMActions.PUT) { // ignore lifecycle policies in this case return AcknowledgedResponse.TRUE; - } else if (action == PutPipelineTransportAction.TYPE) { + } else if (action == TransportPutPipelineAction.TYPE) { // ignore pipelines in this case return AcknowledgedResponse.TRUE; } else { @@ -268,7 +268,7 @@ public void testThatComposableTemplateIsAddedIfDependenciesHaveRightVersion() th } else if (action == ILMActions.PUT) { // ignore lifecycle policies in this case return AcknowledgedResponse.TRUE; - } else if (action == PutPipelineTransportAction.TYPE) { + } else if (action == TransportPutPipelineAction.TYPE) { // ignore pipelines in this case return AcknowledgedResponse.TRUE; } else { @@ -303,7 +303,7 @@ public void testThatTemplatesAreUpgradedWhenNeeded() throws Exception { Map calledTimesMap = new ConcurrentHashMap<>(); client.setVerifier((projectId, action, request, listener) -> { final var calledTimes = calledTimesMap.computeIfAbsent(projectId, k -> new AtomicInteger(0)); - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { assertPutPipelineAction( calledTimes, action, @@ -751,7 +751,7 @@ private static void assertPutPipelineAction( ActionListener listener, String... pipelineIds ) { - assertSame(PutPipelineTransportAction.TYPE, action); + assertSame(TransportPutPipelineAction.TYPE, action); assertThat(request, instanceOf(PutPipelineRequest.class)); final PutPipelineRequest putRequest = (PutPipelineRequest) request; assertThat(putRequest.getId(), oneOf(pipelineIds)); diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyReindexPipeline.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyReindexPipeline.java index 012c05afa44a1..0dcd118f98bdf 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyReindexPipeline.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyReindexPipeline.java @@ -9,7 +9,7 @@ import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.internal.Client; import org.elasticsearch.cluster.metadata.ProjectMetadata; @@ -71,7 +71,7 @@ static boolean exists(ProjectMetadata project) { public static void create(Client client, ActionListener listener) { final BytesReference pipeline = BytesReference.bytes(currentEnrichPipelineDefinition(XContentType.JSON)); client.execute( - PutPipelineTransportAction.TYPE, + TransportPutPipelineAction.TYPE, new PutPipelineRequest( ENRICH_MASTER_REQUEST_TIMEOUT, ENRICH_MASTER_REQUEST_TIMEOUT, diff --git a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/analytics/AnalyticsTemplateRegistryTests.java b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/analytics/AnalyticsTemplateRegistryTests.java index 88d07da753d47..0cad48069668b 100644 --- a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/analytics/AnalyticsTemplateRegistryTests.java +++ b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/analytics/AnalyticsTemplateRegistryTests.java @@ -13,7 +13,7 @@ import org.elasticsearch.action.ActionType; import org.elasticsearch.action.admin.indices.template.put.PutComponentTemplateAction; import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterName; @@ -195,7 +195,7 @@ public void testSameOrHigherVersionComponentTemplateNotUpgraded() { versions.put(AnalyticsTemplateRegistry.EVENT_DATA_STREAM_SETTINGS_COMPONENT_NAME, AnalyticsTemplateRegistry.REGISTRY_VERSION); ClusterChangedEvent sameVersionEvent = createClusterChangedEvent(Collections.emptyMap(), versions, nodes); client.setVerifier((action, request, listener) -> { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { // Ignore this, it's verified in another test return AcknowledgedResponse.TRUE; } @@ -251,7 +251,7 @@ public void testThatNonExistingPipelinesAreAddedImmediately() throws Exception { AtomicInteger calledTimes = new AtomicInteger(0); client.setVerifier((action, request, listener) -> { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { calledTimes.incrementAndGet(); return AcknowledgedResponse.TRUE; } @@ -316,7 +316,7 @@ private ActionResponse verifyComposableTemplateInstalled( ActionRequest request, ActionListener listener ) { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { // Ignore this, it's verified in another test return AcknowledgedResponse.TRUE; } @@ -350,7 +350,7 @@ private ActionResponse verifyComponentTemplateInstalled( ActionRequest request, ActionListener listener ) { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { return AcknowledgedResponse.TRUE; } if (action instanceof PutComponentTemplateAction) { diff --git a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/connector/ConnectorTemplateRegistryTests.java b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/connector/ConnectorTemplateRegistryTests.java index 6cb33c37ccfae..34dfba187360d 100644 --- a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/connector/ConnectorTemplateRegistryTests.java +++ b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/connector/ConnectorTemplateRegistryTests.java @@ -13,7 +13,7 @@ import org.elasticsearch.action.ActionType; import org.elasticsearch.action.admin.indices.template.put.PutComponentTemplateAction; import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterName; @@ -206,7 +206,7 @@ public void testSameOrHigherVersionComponentTemplateNotUpgraded() { versions.put(ConnectorTemplateRegistry.ACCESS_CONTROL_TEMPLATE_NAME, ConnectorTemplateRegistry.REGISTRY_VERSION); ClusterChangedEvent sameVersionEvent = createClusterChangedEvent(Collections.emptyMap(), versions, nodes); client.setVerifier((action, request, listener) -> { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { // Ignore this, it's verified in another test return AcknowledgedResponse.TRUE; } @@ -274,7 +274,7 @@ public void testThatNonExistingPipelinesAreAddedImmediately() throws Exception { AtomicInteger calledTimes = new AtomicInteger(0); client.setVerifier((action, request, listener) -> { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { calledTimes.incrementAndGet(); return AcknowledgedResponse.TRUE; } @@ -339,7 +339,7 @@ private ActionResponse verifyComposableTemplateInstalled( ActionRequest request, ActionListener listener ) { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { // Ignore this, it's verified in another test return AcknowledgedResponse.TRUE; } @@ -376,7 +376,7 @@ private ActionResponse verifyComponentTemplateInstalled( ActionRequest request, ActionListener listener ) { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { return AcknowledgedResponse.TRUE; } if (action instanceof PutComponentTemplateAction) { diff --git a/x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java b/x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java index d0ed7954d37f7..ca2d7aebee0ea 100644 --- a/x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java +++ b/x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.datastreams.GetDataStreamAction; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.metadata.ComposableIndexTemplate; import org.elasticsearch.cluster.metadata.IndexMetadata; @@ -208,7 +208,7 @@ public void testCustomReindexPipeline() { XContentType.JSON ); - safeGet(clusterAdmin().execute(PutPipelineTransportAction.TYPE, putRequest)); + safeGet(clusterAdmin().execute(TransportPutPipelineAction.TYPE, putRequest)); var sourceIndex = randomAlphaOfLength(20).toLowerCase(Locale.ROOT); safeGet(indicesAdmin().create(new CreateIndexRequest(sourceIndex))); diff --git a/x-pack/plugin/stack/src/test/java/org/elasticsearch/xpack/stack/StackTemplateRegistryTests.java b/x-pack/plugin/stack/src/test/java/org/elasticsearch/xpack/stack/StackTemplateRegistryTests.java index 970ba67e25667..b81c2ffa95829 100644 --- a/x-pack/plugin/stack/src/test/java/org/elasticsearch/xpack/stack/StackTemplateRegistryTests.java +++ b/x-pack/plugin/stack/src/test/java/org/elasticsearch/xpack/stack/StackTemplateRegistryTests.java @@ -13,7 +13,7 @@ import org.elasticsearch.action.ActionType; import org.elasticsearch.action.admin.indices.template.put.PutComponentTemplateAction; import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction; -import org.elasticsearch.action.ingest.PutPipelineTransportAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterName; @@ -237,7 +237,7 @@ public void testThatIndependentPipelinesAreAdded() throws Exception { AtomicInteger calledTimes = new AtomicInteger(0); client.setVerifier((action, request, listener) -> { - if (action == PutPipelineTransportAction.TYPE) { + if (action == TransportPutPipelineAction.TYPE) { calledTimes.incrementAndGet(); return AcknowledgedResponse.TRUE; } From bec57ff89c4c2f53c8ab4e5f782e4a63d124b3a3 Mon Sep 17 00:00:00 2001 From: Sam Xiao Date: Wed, 6 Aug 2025 16:39:25 -0400 Subject: [PATCH 2/5] rename analytics, ccr actions --- .../xpack/analytics/AnalyticsPlugin.java | 8 ++++---- ...tion.java => TransportAnalyticsInfoAction.java} | 4 ++-- ...ion.java => TransportAnalyticsUsageAction.java} | 4 ++-- ...java => TransportAnalyticsInfoActionTests.java} | 10 +++++----- .../main/java/org/elasticsearch/xpack/ccr/Ccr.java | 6 +++--- ...portAction.java => TransportCCRInfoAction.java} | 4 ++-- ...ortAction.java => TransportCCRUsageAction.java} | 6 +++--- .../xpack/ccr/CCRFeatureSetUsageTests.java | 12 ++++++------ ...Tests.java => TransportCCRInfoActionTests.java} | 14 +++++++------- ...ion.java => TransportHealthApiUsageAction.java} | 4 ++-- ...java => TransportRemoteClusterUsageAction.java} | 4 ++-- .../org/elasticsearch/xpack/core/XPackPlugin.java | 4 ++-- 12 files changed, 40 insertions(+), 40 deletions(-) rename x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/{AnalyticsInfoTransportAction.java => TransportAnalyticsInfoAction.java} (89%) rename x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/{AnalyticsUsageTransportAction.java => TransportAnalyticsUsageAction.java} (95%) rename x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/{AnalyticsInfoTransportActionTests.java => TransportAnalyticsInfoActionTests.java} (91%) rename x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/{CCRInfoTransportAction.java => TransportCCRInfoAction.java} (98%) rename x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/{CCRUsageTransportAction.java => TransportCCRUsageAction.java} (95%) rename x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/{CCRInfoTransportActionTests.java => TransportCCRInfoActionTests.java} (93%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{HealthApiUsageTransportAction.java => TransportHealthApiUsageAction.java} (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{RemoteClusterUsageTransportAction.java => TransportRemoteClusterUsageAction.java} (94%) diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/AnalyticsPlugin.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/AnalyticsPlugin.java index cb864379a1fc9..2cca7d848ce44 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/AnalyticsPlugin.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/AnalyticsPlugin.java @@ -14,8 +14,8 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.SearchPlugin; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; -import org.elasticsearch.xpack.analytics.action.AnalyticsInfoTransportAction; -import org.elasticsearch.xpack.analytics.action.AnalyticsUsageTransportAction; +import org.elasticsearch.xpack.analytics.action.TransportAnalyticsInfoAction; +import org.elasticsearch.xpack.analytics.action.TransportAnalyticsUsageAction; import org.elasticsearch.xpack.analytics.action.TransportAnalyticsStatsAction; import org.elasticsearch.xpack.analytics.aggregations.AnalyticsAggregatorFactory; import org.elasticsearch.xpack.analytics.boxplot.BoxplotAggregationBuilder; @@ -127,8 +127,8 @@ private AggregationSpec rateAggregation() { @Override public List getActions() { return List.of( - new ActionHandler(XPackUsageFeatureAction.ANALYTICS, AnalyticsUsageTransportAction.class), - new ActionHandler(XPackInfoFeatureAction.ANALYTICS, AnalyticsInfoTransportAction.class), + new ActionHandler(XPackUsageFeatureAction.ANALYTICS, TransportAnalyticsUsageAction.class), + new ActionHandler(XPackInfoFeatureAction.ANALYTICS, TransportAnalyticsInfoAction.class), new ActionHandler(AnalyticsStatsAction.INSTANCE, TransportAnalyticsStatsAction.class) ); } diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportAction.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/TransportAnalyticsInfoAction.java similarity index 89% rename from x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportAction.java rename to x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/TransportAnalyticsInfoAction.java index 4cf6c820d89dc..ed208042daf00 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportAction.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/TransportAnalyticsInfoAction.java @@ -13,10 +13,10 @@ import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction; import org.elasticsearch.xpack.core.action.XPackInfoFeatureTransportAction; -public class AnalyticsInfoTransportAction extends XPackInfoFeatureTransportAction { +public class TransportAnalyticsInfoAction extends XPackInfoFeatureTransportAction { @Inject - public AnalyticsInfoTransportAction(TransportService transportService, ActionFilters actionFilters) { + public TransportAnalyticsInfoAction(TransportService transportService, ActionFilters actionFilters) { super(XPackInfoFeatureAction.ANALYTICS.name(), transportService, actionFilters); } 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/TransportAnalyticsUsageAction.java similarity index 95% rename from x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java rename to x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/TransportAnalyticsUsageAction.java index 23628659ad232..4a533b4bb0d1b 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/TransportAnalyticsUsageAction.java @@ -22,11 +22,11 @@ import org.elasticsearch.xpack.core.analytics.AnalyticsFeatureSetUsage; import org.elasticsearch.xpack.core.analytics.action.AnalyticsStatsAction; -public class AnalyticsUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportAnalyticsUsageAction extends XPackUsageFeatureTransportAction { private final Client client; @Inject - public AnalyticsUsageTransportAction( + public TransportAnalyticsUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportActionTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/TransportAnalyticsInfoActionTests.java similarity index 91% rename from x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportActionTests.java rename to x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/TransportAnalyticsInfoActionTests.java index 46187c2287053..002ea5db04530 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportActionTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/TransportAnalyticsInfoActionTests.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -public class AnalyticsInfoTransportActionTests extends ESTestCase { +public class TransportAnalyticsInfoActionTests extends ESTestCase { private Task task; private ClusterService clusterService; @@ -62,10 +62,10 @@ public void init() { public void testAvailable() throws Exception { ThreadPool threadPool = mock(ThreadPool.class); TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool); - AnalyticsInfoTransportAction featureSet = new AnalyticsInfoTransportAction(transportService, mock(ActionFilters.class)); + TransportAnalyticsInfoAction featureSet = new TransportAnalyticsInfoAction(transportService, mock(ActionFilters.class)); assertThat(featureSet.available(), is(true)); Client client = mockClient(); - AnalyticsUsageTransportAction usageAction = new AnalyticsUsageTransportAction( + TransportAnalyticsUsageAction usageAction = new TransportAnalyticsUsageAction( transportService, clusterService, threadPool, @@ -88,11 +88,11 @@ public void testAvailable() throws Exception { public void testEnabled() throws Exception { ThreadPool threadPool = mock(ThreadPool.class); TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool); - AnalyticsInfoTransportAction featureSet = new AnalyticsInfoTransportAction(transportService, mock(ActionFilters.class)); + TransportAnalyticsInfoAction featureSet = new TransportAnalyticsInfoAction(transportService, mock(ActionFilters.class)); assertThat(featureSet.enabled(), is(true)); assertTrue(featureSet.enabled()); Client client = mockClient(); - AnalyticsUsageTransportAction usageAction = new AnalyticsUsageTransportAction( + TransportAnalyticsUsageAction usageAction = new TransportAnalyticsUsageAction( transportService, clusterService, threadPool, diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java index bfc85f3efb0fe..9203d8d67894a 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java @@ -210,8 +210,8 @@ public List> getPersistentTasksExecutor( } public List getActions() { - var usageAction = new ActionHandler(XPackUsageFeatureAction.CCR, CCRUsageTransportAction.class); - var infoAction = new ActionHandler(XPackInfoFeatureAction.CCR, CCRInfoTransportAction.class); + var usageAction = new ActionHandler(XPackUsageFeatureAction.CCR, TransportCCRUsageAction.class); + var infoAction = new ActionHandler(XPackInfoFeatureAction.CCR, TransportCCRInfoAction.class); if (enabled == false) { return Arrays.asList(usageAction, infoAction); } @@ -304,7 +304,7 @@ public List getNamedWriteables() { ), // usage api - new NamedWriteableRegistry.Entry(XPackFeatureUsage.class, XPackField.CCR, CCRInfoTransportAction.Usage::new) + new NamedWriteableRegistry.Entry(XPackFeatureUsage.class, XPackField.CCR, TransportCCRInfoAction.Usage::new) ); } diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRInfoTransportAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/TransportCCRInfoAction.java similarity index 98% rename from x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRInfoTransportAction.java rename to x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/TransportCCRInfoAction.java index 8cb98bb4458aa..fdd08509b03ca 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRInfoTransportAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/TransportCCRInfoAction.java @@ -26,13 +26,13 @@ import java.io.IOException; import java.util.Objects; -public class CCRInfoTransportAction extends XPackInfoFeatureTransportAction { +public class TransportCCRInfoAction extends XPackInfoFeatureTransportAction { private final boolean enabled; private final XPackLicenseState licenseState; @Inject - public CCRInfoTransportAction( + public TransportCCRInfoAction( TransportService transportService, ActionFilters actionFilters, Settings settings, 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/TransportCCRUsageAction.java similarity index 95% rename from x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java rename to x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/TransportCCRUsageAction.java index e8c25b2bfd0fc..a6dc6711c1faf 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/TransportCCRUsageAction.java @@ -28,14 +28,14 @@ import java.time.Instant; -public class CCRUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportCCRUsageAction extends XPackUsageFeatureTransportAction { private final Settings settings; private final XPackLicenseState licenseState; private final ProjectResolver projectResolver; @Inject - public CCRUsageTransportAction( + public TransportCCRUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, @@ -80,7 +80,7 @@ protected void localClusterStateOperation( lastFollowTimeInMillis = Math.max(0, Instant.now().toEpochMilli() - lastFollowerIndexCreationDate); } - CCRInfoTransportAction.Usage usage = new CCRInfoTransportAction.Usage( + TransportCCRInfoAction.Usage usage = new TransportCCRInfoAction.Usage( CcrConstants.CCR_FEATURE.checkWithoutTracking(licenseState), XPackSettings.CCR_ENABLED_SETTING.get(settings), numberOfFollowerIndices, diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRFeatureSetUsageTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRFeatureSetUsageTests.java index df2cdf75fbdc8..9cf102c1e3944 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRFeatureSetUsageTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRFeatureSetUsageTests.java @@ -10,11 +10,11 @@ import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractWireSerializingTestCase; -public class CCRFeatureSetUsageTests extends AbstractWireSerializingTestCase { +public class CCRFeatureSetUsageTests extends AbstractWireSerializingTestCase { @Override - protected CCRInfoTransportAction.Usage createTestInstance() { - return new CCRInfoTransportAction.Usage( + protected TransportCCRInfoAction.Usage createTestInstance() { + return new TransportCCRInfoAction.Usage( randomBoolean(), randomBoolean(), randomIntBetween(0, Integer.MAX_VALUE), @@ -24,12 +24,12 @@ protected CCRInfoTransportAction.Usage createTestInstance() { } @Override - protected CCRInfoTransportAction.Usage mutateInstance(CCRInfoTransportAction.Usage instance) { + protected TransportCCRInfoAction.Usage mutateInstance(TransportCCRInfoAction.Usage instance) { return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 } @Override - protected Writeable.Reader instanceReader() { - return CCRInfoTransportAction.Usage::new; + protected Writeable.Reader instanceReader() { + return TransportCCRInfoAction.Usage::new; } } diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRInfoTransportActionTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/TransportCCRInfoActionTests.java similarity index 93% rename from x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRInfoTransportActionTests.java rename to x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/TransportCCRInfoActionTests.java index 7a4dc1185227d..9da6538f161b7 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRInfoTransportActionTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/TransportCCRInfoActionTests.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class CCRInfoTransportActionTests extends ESTestCase { +public class TransportCCRInfoActionTests extends ESTestCase { private MockLicenseState licenseState; private ClusterService clusterService; @@ -51,7 +51,7 @@ public void init() { public void testAvailable() { TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(); - CCRInfoTransportAction featureSet = new CCRInfoTransportAction( + TransportCCRInfoAction featureSet = new TransportCCRInfoAction( transportService, mock(ActionFilters.class), Settings.EMPTY, @@ -68,7 +68,7 @@ public void testAvailable() { public void testEnabled() { Settings.Builder settings = Settings.builder().put("xpack.ccr.enabled", false); TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(); - CCRInfoTransportAction featureSet = new CCRInfoTransportAction( + TransportCCRInfoAction featureSet = new TransportCCRInfoAction( transportService, mock(ActionFilters.class), settings.build(), @@ -77,13 +77,13 @@ public void testEnabled() { assertThat(featureSet.enabled(), equalTo(false)); settings = Settings.builder().put("xpack.ccr.enabled", true); - featureSet = new CCRInfoTransportAction(transportService, mock(ActionFilters.class), settings.build(), licenseState); + featureSet = new TransportCCRInfoAction(transportService, mock(ActionFilters.class), settings.build(), licenseState); assertThat(featureSet.enabled(), equalTo(true)); } public void testName() { TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(); - CCRInfoTransportAction featureSet = new CCRInfoTransportAction( + TransportCCRInfoAction featureSet = new TransportCCRInfoAction( transportService, mock(ActionFilters.class), Settings.EMPTY, @@ -145,7 +145,7 @@ public void testUsageStats() throws Exception { ThreadPool threadPool = mock(ThreadPool.class); TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool); - var usageAction = new CCRUsageTransportAction( + var usageAction = new TransportCCRUsageAction( transportService, null, threadPool, @@ -156,7 +156,7 @@ public void testUsageStats() throws Exception { ); PlainActionFuture future = new PlainActionFuture<>(); usageAction.localClusterStateOperation(null, null, clusterState, future); - CCRInfoTransportAction.Usage ccrUsage = (CCRInfoTransportAction.Usage) future.get().getUsage(); + TransportCCRInfoAction.Usage ccrUsage = (TransportCCRInfoAction.Usage) future.get().getUsage(); assertThat(ccrUsage.enabled(), equalTo(true)); assertThat(ccrUsage.available(), equalTo(false)); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/TransportHealthApiUsageAction.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiUsageTransportAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/TransportHealthApiUsageAction.java index 4449bd4e1ca1b..fccef2d5c5761 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/TransportHealthApiUsageAction.java @@ -25,12 +25,12 @@ /** * This action provides telemetry of the cluster's health api usage. */ -public class HealthApiUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportHealthApiUsageAction extends XPackUsageFeatureTransportAction { private final Client client; @Inject - public HealthApiUsageTransportAction( + public TransportHealthApiUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/RemoteClusterUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/TransportRemoteClusterUsageAction.java similarity index 94% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/RemoteClusterUsageTransportAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/TransportRemoteClusterUsageAction.java index 970724a8d9acf..802787bab4dc7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/RemoteClusterUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/TransportRemoteClusterUsageAction.java @@ -21,12 +21,12 @@ import org.elasticsearch.xpack.core.action.XPackUsageFeatureResponse; import org.elasticsearch.xpack.core.action.XPackUsageFeatureTransportAction; -public class RemoteClusterUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportRemoteClusterUsageAction extends XPackUsageFeatureTransportAction { private TransportService transportService; @Inject - public RemoteClusterUsageTransportAction( + public TransportRemoteClusterUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java index 23ca86d48bd1e..1c3021df86aae 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java @@ -370,8 +370,8 @@ public List getActions() { actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAMS, DataStreamUsageTransportAction.class)); actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_STREAMS, DataStreamInfoTransportAction.class)); actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAM_LIFECYCLE, DataStreamLifecycleUsageTransportAction.class)); - actions.add(new ActionHandler(XPackUsageFeatureAction.HEALTH, HealthApiUsageTransportAction.class)); - actions.add(new ActionHandler(XPackUsageFeatureAction.REMOTE_CLUSTERS, RemoteClusterUsageTransportAction.class)); + actions.add(new ActionHandler(XPackUsageFeatureAction.HEALTH, TransportHealthApiUsageAction.class)); + actions.add(new ActionHandler(XPackUsageFeatureAction.REMOTE_CLUSTERS, TransportRemoteClusterUsageAction.class)); actions.add(new ActionHandler(NodesDataTiersUsageTransportAction.TYPE, NodesDataTiersUsageTransportAction.class)); return actions; } From 348e0409f01e3b51f8e7e15aed3aa2d10c96b27c Mon Sep 17 00:00:00 2001 From: Sam Xiao Date: Wed, 6 Aug 2025 16:57:44 -0400 Subject: [PATCH 3/5] spotless --- .../ingest/geoip/IngestGeoIpPlugin.java | 2 +- .../org/elasticsearch/ingest/IngestClientIT.java | 2 +- .../elasticsearch/ingest/IngestFileSettingsIT.java | 2 +- .../java/org/elasticsearch/action/ActionModule.java | 4 ++-- .../ingest/IngestPipelineTestUtils.java | 4 ++-- .../java/org/elasticsearch/test/ESIntegTestCase.java | 2 +- .../org/elasticsearch/test/ESSingleNodeTestCase.java | 2 +- .../xpack/analytics/AnalyticsPlugin.java | 2 +- ...> TransportDataStreamLifecycleUsageActionIT.java} | 4 ++-- ...IT.java => TransportDataStreamUsageActionIT.java} | 8 ++++---- .../org/elasticsearch/xpack/core/XPackPlugin.java | 12 ++++++------ ...ction.java => TransportDataStreamInfoAction.java} | 4 ++-- ... => TransportDataStreamLifecycleUsageAction.java} | 4 ++-- ...tion.java => TransportDataStreamUsageAction.java} | 4 ++-- .../DataStreamLifecycleFeatureSetUsageTests.java | 2 +- .../authz/store/ReservedRolesStoreTests.java | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) rename x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/{DataStreamLifecycleUsageTransportActionIT.java => TransportDataStreamLifecycleUsageActionIT.java} (99%) rename x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/{DataStreamUsageTransportActionIT.java => TransportDataStreamUsageActionIT.java} (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/{DataStreamInfoTransportAction.java => TransportDataStreamInfoAction.java} (87%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/{DataStreamLifecycleUsageTransportAction.java => TransportDataStreamLifecycleUsageAction.java} (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/{DataStreamUsageTransportAction.java => TransportDataStreamUsageAction.java} (98%) diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java index 314cfb081d882..f0aa29cd44f64 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java @@ -41,8 +41,8 @@ import org.elasticsearch.ingest.geoip.direct.TransportPutDatabaseConfigurationAction; import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStats; import org.elasticsearch.ingest.geoip.stats.GeoIpStatsAction; -import org.elasticsearch.ingest.geoip.stats.TransportGeoIpStatsAction; import org.elasticsearch.ingest.geoip.stats.RestGeoIpStatsAction; +import org.elasticsearch.ingest.geoip.stats.TransportGeoIpStatsAction; import org.elasticsearch.persistent.PersistentTaskParams; import org.elasticsearch.persistent.PersistentTaskState; import org.elasticsearch.persistent.PersistentTasksExecutor; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java index 4086561b94201..b89314e0ef0b7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java @@ -19,10 +19,10 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.ingest.GetPipelineResponse; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.SimulateDocumentBaseResult; import org.elasticsearch.action.ingest.SimulatePipelineRequest; import org.elasticsearch.action.ingest.SimulatePipelineResponse; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.client.internal.Requests; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java index 39a43d450b7fe..2efa4e8979f06 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java @@ -12,8 +12,8 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.ReservedPipelineAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterStateListener; import org.elasticsearch.cluster.metadata.ReservedStateErrorMetadata; diff --git a/server/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java index fca391c887b44..2979d1789ae1b 100644 --- a/server/src/main/java/org/elasticsearch/action/ActionModule.java +++ b/server/src/main/java/org/elasticsearch/action/ActionModule.java @@ -170,11 +170,11 @@ import org.elasticsearch.action.get.TransportMultiGetAction; import org.elasticsearch.action.get.TransportShardMultiGetAction; import org.elasticsearch.action.index.TransportIndexAction; -import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.GetPipelineAction; +import org.elasticsearch.action.ingest.SimulatePipelineAction; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.TransportGetPipelineAction; import org.elasticsearch.action.ingest.TransportPutPipelineAction; -import org.elasticsearch.action.ingest.SimulatePipelineAction; import org.elasticsearch.action.ingest.TransportSimulatePipelineAction; import org.elasticsearch.action.search.RestClosePointInTimeAction; import org.elasticsearch.action.search.RestOpenPointInTimeAction; diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java b/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java index 039b762fbd171..ee05656cd3260 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java @@ -11,10 +11,10 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ingest.DeletePipelineRequest; -import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.SimulatePipelineRequest; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.internal.ElasticsearchClient; import org.elasticsearch.common.Strings; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index a3dfa460df5aa..baac1ca9f42f7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -52,11 +52,11 @@ import org.elasticsearch.action.datastreams.GetDataStreamAction; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.ingest.DeletePipelineRequest; -import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.GetPipelineAction; import org.elasticsearch.action.ingest.GetPipelineRequest; import org.elasticsearch.action.ingest.GetPipelineResponse; import org.elasticsearch.action.ingest.PutPipelineRequest; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.search.ClearScrollResponse; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequestBuilder; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java index a3fada8792bb0..a3267668e9317 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java @@ -22,8 +22,8 @@ import org.elasticsearch.action.datastreams.DeleteDataStreamAction; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.ingest.DeletePipelineRequest; -import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.PutPipelineRequest; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.client.internal.AdminClient; diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/AnalyticsPlugin.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/AnalyticsPlugin.java index 2cca7d848ce44..1bfb932ceeea0 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/AnalyticsPlugin.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/AnalyticsPlugin.java @@ -15,8 +15,8 @@ import org.elasticsearch.plugins.SearchPlugin; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.elasticsearch.xpack.analytics.action.TransportAnalyticsInfoAction; -import org.elasticsearch.xpack.analytics.action.TransportAnalyticsUsageAction; import org.elasticsearch.xpack.analytics.action.TransportAnalyticsStatsAction; +import org.elasticsearch.xpack.analytics.action.TransportAnalyticsUsageAction; import org.elasticsearch.xpack.analytics.aggregations.AnalyticsAggregatorFactory; import org.elasticsearch.xpack.analytics.boxplot.BoxplotAggregationBuilder; import org.elasticsearch.xpack.analytics.boxplot.InternalBoxplot; diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportActionIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/TransportDataStreamLifecycleUsageActionIT.java similarity index 99% rename from x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportActionIT.java rename to x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/TransportDataStreamLifecycleUsageActionIT.java index ddcadeb6742e4..7ce34b2ab7b54 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportActionIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/TransportDataStreamLifecycleUsageActionIT.java @@ -48,7 +48,7 @@ import static org.elasticsearch.xpack.core.action.XPackUsageFeatureAction.DATA_STREAM_LIFECYCLE; import static org.hamcrest.Matchers.equalTo; -public class DataStreamLifecycleUsageTransportActionIT extends ESIntegTestCase { +public class TransportDataStreamLifecycleUsageActionIT extends ESIntegTestCase { /* * The DataLifecycleUsageTransportAction is not exposed in the xpack core plugin, so we have a special test plugin to do this */ @@ -289,7 +289,7 @@ public static final class TestDateLifecycleUsagePlugin extends XPackClientPlugin @Override public List getActions() { List actions = new ArrayList<>(); - actions.add(new ActionPlugin.ActionHandler(DATA_STREAM_LIFECYCLE, DataStreamLifecycleUsageTransportAction.class)); + actions.add(new ActionPlugin.ActionHandler(DATA_STREAM_LIFECYCLE, TransportDataStreamLifecycleUsageAction.class)); return actions; } } diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportActionIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/TransportDataStreamUsageActionIT.java similarity index 98% rename from x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportActionIT.java rename to x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/TransportDataStreamUsageActionIT.java index 0ccf2a2db8c8e..220f98fc41cfd 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportActionIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/TransportDataStreamUsageActionIT.java @@ -50,9 +50,9 @@ import static org.elasticsearch.xpack.core.action.XPackUsageFeatureAction.DATA_STREAMS; import static org.hamcrest.Matchers.equalTo; -public class DataStreamUsageTransportActionIT extends ESIntegTestCase { +public class TransportDataStreamUsageActionIT extends ESIntegTestCase { /* - * The DataStreamUsageTransportAction is not exposed in the xpack core plugin, so we have a special test plugin to do this + * The TransportDataStreamUsageAction is not exposed in the xpack core plugin, so we have a special test plugin to do this */ @Override protected Collection> nodePlugins() { @@ -315,13 +315,13 @@ public void clusterStateProcessed(ClusterState oldState, ClusterState newState) } /* - * This plugin exposes the DataStreamUsageTransportAction. + * This plugin exposes the TransportDataStreamUsageAction. */ public static final class TestDataStreamUsagePlugin extends XPackClientPlugin { @Override public List getActions() { List actions = new ArrayList<>(); - actions.add(new ActionPlugin.ActionHandler(DATA_STREAMS, DataStreamUsageTransportAction.class)); + actions.add(new ActionPlugin.ActionHandler(DATA_STREAMS, TransportDataStreamUsageAction.class)); return actions; } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java index 1c3021df86aae..bf0846b3605af 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java @@ -87,9 +87,9 @@ import org.elasticsearch.xcontent.NamedXContentRegistry; import org.elasticsearch.xpack.cluster.routing.allocation.DataTierAllocationDecider; import org.elasticsearch.xpack.cluster.routing.allocation.mapper.DataTierFieldMapper; -import org.elasticsearch.xpack.core.action.DataStreamInfoTransportAction; -import org.elasticsearch.xpack.core.action.DataStreamLifecycleUsageTransportAction; -import org.elasticsearch.xpack.core.action.DataStreamUsageTransportAction; +import org.elasticsearch.xpack.core.action.TransportDataStreamInfoAction; +import org.elasticsearch.xpack.core.action.TransportDataStreamLifecycleUsageAction; +import org.elasticsearch.xpack.core.action.TransportDataStreamUsageAction; import org.elasticsearch.xpack.core.action.TransportXPackInfoAction; import org.elasticsearch.xpack.core.action.TransportXPackUsageAction; import org.elasticsearch.xpack.core.action.XPackInfoAction; @@ -367,9 +367,9 @@ public List getActions() { actions.add(new ActionHandler(TransportDeleteAsyncResultAction.TYPE, TransportDeleteAsyncResultAction.class)); actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_TIERS, DataTiersInfoTransportAction.class)); actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_TIERS, DataTiersUsageTransportAction.class)); - actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAMS, DataStreamUsageTransportAction.class)); - actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_STREAMS, DataStreamInfoTransportAction.class)); - actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAM_LIFECYCLE, DataStreamLifecycleUsageTransportAction.class)); + actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAMS, TransportDataStreamUsageAction.class)); + actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_STREAMS, TransportDataStreamInfoAction.class)); + actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAM_LIFECYCLE, TransportDataStreamLifecycleUsageAction.class)); actions.add(new ActionHandler(XPackUsageFeatureAction.HEALTH, TransportHealthApiUsageAction.class)); actions.add(new ActionHandler(XPackUsageFeatureAction.REMOTE_CLUSTERS, TransportRemoteClusterUsageAction.class)); actions.add(new ActionHandler(NodesDataTiersUsageTransportAction.TYPE, NodesDataTiersUsageTransportAction.class)); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamInfoTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamInfoAction.java similarity index 87% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamInfoTransportAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamInfoAction.java index d05b6665b7c57..516dd5d80a3f4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamInfoTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamInfoAction.java @@ -12,10 +12,10 @@ import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.core.XPackField; -public class DataStreamInfoTransportAction extends XPackInfoFeatureTransportAction { +public class TransportDataStreamInfoAction extends XPackInfoFeatureTransportAction { @Inject - public DataStreamInfoTransportAction(TransportService transportService, ActionFilters actionFilters) { + public TransportDataStreamInfoAction(TransportService transportService, ActionFilters actionFilters) { super(XPackInfoFeatureAction.DATA_STREAMS.name(), transportService, actionFilters); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamLifecycleUsageAction.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamLifecycleUsageAction.java index 795b57501bdd6..ec892ab995fab 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamLifecycleUsageAction.java @@ -30,13 +30,13 @@ import java.util.LongSummaryStatistics; import java.util.Map; -public class DataStreamLifecycleUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportDataStreamLifecycleUsageAction extends XPackUsageFeatureTransportAction { private final DataStreamGlobalRetentionSettings globalRetentionSettings; private final ProjectResolver projectResolver; @Inject - public DataStreamLifecycleUsageTransportAction( + public TransportDataStreamLifecycleUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamUsageAction.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamUsageAction.java index 8c1f5825e633c..b06c713481e94 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportDataStreamUsageAction.java @@ -30,14 +30,14 @@ import java.util.LongSummaryStatistics; import java.util.Map; -public class DataStreamUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportDataStreamUsageAction extends XPackUsageFeatureTransportAction { private final DataStreamFailureStoreSettings dataStreamFailureStoreSettings; private final DataStreamGlobalRetentionSettings globalRetentionSettings; private final ProjectResolver projectResolver; @Inject - public DataStreamUsageTransportAction( + public TransportDataStreamUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsageTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsageTests.java index fa4e7ead7eaf9..12f7f0a8b2709 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsageTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsageTests.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.UUID; -import static org.elasticsearch.xpack.core.action.DataStreamLifecycleUsageTransportAction.calculateStats; +import static org.elasticsearch.xpack.core.action.TransportDataStreamLifecycleUsageAction.calculateStats; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java index 63203551652d8..800a2fba84dd5 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java @@ -50,10 +50,10 @@ import org.elasticsearch.action.fieldcaps.TransportFieldCapabilitiesAction; import org.elasticsearch.action.get.TransportGetAction; import org.elasticsearch.action.index.TransportIndexAction; -import org.elasticsearch.action.ingest.TransportDeletePipelineAction; import org.elasticsearch.action.ingest.GetPipelineAction; -import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.ingest.SimulatePipelineAction; +import org.elasticsearch.action.ingest.TransportDeletePipelineAction; +import org.elasticsearch.action.ingest.TransportPutPipelineAction; import org.elasticsearch.action.search.TransportMultiSearchAction; import org.elasticsearch.action.search.TransportSearchAction; import org.elasticsearch.action.search.TransportSearchShardsAction; From e863f7a3f3377a2b7eb41fd7fbc014f900b1f325 Mon Sep 17 00:00:00 2001 From: Sam Xiao Date: Wed, 6 Aug 2025 17:33:21 -0400 Subject: [PATCH 4/5] more xpack usage actions --- .../DataTiersUsageRestCancellationIT.java | 8 ++++---- .../elasticsearch/xpack/core/XPackPlugin.java | 12 +++++------ ...java => TransportDataTiersInfoAction.java} | 4 ++-- ...ava => TransportDataTiersUsageAction.java} | 14 ++++++------- ...> TransportNodesDataTiersUsageAction.java} | 10 +++++----- ...> TransportDataTiersUsageActionTests.java} | 20 +++++++++---------- ...nsportNodesDataTiersUsageActionTests.java} | 8 ++++---- .../xpack/enrich/EnrichPlugin.java | 8 ++++---- ...on.java => TransportEnrichInfoAction.java} | 4 ++-- ...n.java => TransportEnrichUsageAction.java} | 4 ++-- .../xpack/ilm/IndexLifecycle.java | 4 ++-- ...=> TransportIndexLifecycleInfoAction.java} | 4 ++-- ...> TransportIndexLifecycleUsageAction.java} | 4 ++-- ...ansportIndexLifecycleInfoActionTests.java} | 8 ++++---- .../xpack/slm/SnapshotLifecycle.java | 4 ++-- ...ction.java => TransportSLMInfoAction.java} | 4 ++-- ...tion.java => TransportSLMUsageAction.java} | 4 ++-- 17 files changed, 62 insertions(+), 62 deletions(-) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/{DataTiersInfoTransportAction.java => TransportDataTiersInfoAction.java} (89%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/{DataTiersUsageTransportAction.java => TransportDataTiersUsageAction.java} (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/{NodesDataTiersUsageTransportAction.java => TransportNodesDataTiersUsageAction.java} (96%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/{DataTiersUsageTransportActionTests.java => TransportDataTiersUsageActionTests.java} (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/{NodesDataTiersUsageTransportActionTests.java => TransportNodesDataTiersUsageActionTests.java} (97%) rename x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/{EnrichInfoTransportAction.java => TransportEnrichInfoAction.java} (89%) rename x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/{EnrichUsageTransportAction.java => TransportEnrichUsageAction.java} (94%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/{IndexLifecycleInfoTransportAction.java => TransportIndexLifecycleInfoAction.java} (89%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/{IndexLifecycleUsageTransportAction.java => TransportIndexLifecycleUsageAction.java} (98%) rename x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/{IndexLifecycleInfoTransportActionTests.java => TransportIndexLifecycleInfoActionTests.java} (94%) rename x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/{SLMInfoTransportAction.java => TransportSLMInfoAction.java} (89%) rename x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/{SLMUsageTransportAction.java => TransportSLMUsageAction.java} (95%) diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/DataTiersUsageRestCancellationIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/DataTiersUsageRestCancellationIT.java index fab7fbb317e69..e34d5f58b395e 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/DataTiersUsageRestCancellationIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/DataTiersUsageRestCancellationIT.java @@ -35,7 +35,7 @@ import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction; import org.elasticsearch.xpack.core.action.XPackUsageFeatureResponse; import org.elasticsearch.xpack.core.action.XPackUsageResponse; -import org.elasticsearch.xpack.core.datatiers.NodesDataTiersUsageTransportAction; +import org.elasticsearch.xpack.core.datatiers.TransportNodesDataTiersUsageAction; import java.nio.file.Path; import java.util.Arrays; @@ -77,7 +77,7 @@ public void testCancellation() throws Exception { final SubscribableListener nodeStatsRequestsReleaseListener = new SubscribableListener<>(); for (TransportService transportService : internalCluster().getInstances(TransportService.class)) { ((MockTransportService) transportService).addRequestHandlingBehavior( - NodesDataTiersUsageTransportAction.TYPE.name() + "[n]", + TransportNodesDataTiersUsageAction.TYPE.name() + "[n]", (handler, request, channel, task) -> { tasksBlockedLatch.countDown(); nodeStatsRequestsReleaseListener.addListener( @@ -95,13 +95,13 @@ public void testCancellation() throws Exception { safeAwait(tasksBlockedLatch); // must wait for the node-level tasks to start to avoid cancelling being handled earlier cancellable.cancel(); - assertAllCancellableTasksAreCancelled(NodesDataTiersUsageTransportAction.TYPE.name()); + assertAllCancellableTasksAreCancelled(TransportNodesDataTiersUsageAction.TYPE.name()); assertAllCancellableTasksAreCancelled(XPackUsageAction.NAME); nodeStatsRequestsReleaseListener.onResponse(null); expectThrows(CancellationException.class, future::actionGet); - assertAllTasksHaveFinished(NodesDataTiersUsageTransportAction.TYPE.name()); + assertAllTasksHaveFinished(TransportNodesDataTiersUsageAction.TYPE.name()); assertAllTasksHaveFinished(XPackUsageAction.NAME); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java index bf0846b3605af..4e55de6d54c1f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java @@ -98,9 +98,9 @@ import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction; import org.elasticsearch.xpack.core.action.XPackUsageResponse; import org.elasticsearch.xpack.core.async.TransportDeleteAsyncResultAction; -import org.elasticsearch.xpack.core.datatiers.DataTiersInfoTransportAction; -import org.elasticsearch.xpack.core.datatiers.DataTiersUsageTransportAction; -import org.elasticsearch.xpack.core.datatiers.NodesDataTiersUsageTransportAction; +import org.elasticsearch.xpack.core.datatiers.TransportDataTiersInfoAction; +import org.elasticsearch.xpack.core.datatiers.TransportDataTiersUsageAction; +import org.elasticsearch.xpack.core.datatiers.TransportNodesDataTiersUsageAction; import org.elasticsearch.xpack.core.ml.MlMetadata; import org.elasticsearch.xpack.core.rest.action.RestXPackInfoAction; import org.elasticsearch.xpack.core.rest.action.RestXPackUsageAction; @@ -365,14 +365,14 @@ public List getActions() { actions.add(new ActionHandler(TransportGetFeatureUsageAction.TYPE, TransportGetFeatureUsageAction.class)); actions.add(new ActionHandler(TermsEnumAction.INSTANCE, TransportTermsEnumAction.class)); actions.add(new ActionHandler(TransportDeleteAsyncResultAction.TYPE, TransportDeleteAsyncResultAction.class)); - actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_TIERS, DataTiersInfoTransportAction.class)); - actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_TIERS, DataTiersUsageTransportAction.class)); + actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_TIERS, TransportDataTiersInfoAction.class)); + actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_TIERS, TransportDataTiersUsageAction.class)); actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAMS, TransportDataStreamUsageAction.class)); actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_STREAMS, TransportDataStreamInfoAction.class)); actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAM_LIFECYCLE, TransportDataStreamLifecycleUsageAction.class)); actions.add(new ActionHandler(XPackUsageFeatureAction.HEALTH, TransportHealthApiUsageAction.class)); actions.add(new ActionHandler(XPackUsageFeatureAction.REMOTE_CLUSTERS, TransportRemoteClusterUsageAction.class)); - actions.add(new ActionHandler(NodesDataTiersUsageTransportAction.TYPE, NodesDataTiersUsageTransportAction.class)); + actions.add(new ActionHandler(TransportNodesDataTiersUsageAction.TYPE, TransportNodesDataTiersUsageAction.class)); return actions; } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersInfoTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersInfoAction.java similarity index 89% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersInfoTransportAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersInfoAction.java index 4754021fa6cfd..229aa81b13d02 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersInfoTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersInfoAction.java @@ -14,10 +14,10 @@ import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction; import org.elasticsearch.xpack.core.action.XPackInfoFeatureTransportAction; -public class DataTiersInfoTransportAction extends XPackInfoFeatureTransportAction { +public class TransportDataTiersInfoAction extends XPackInfoFeatureTransportAction { @Inject - public DataTiersInfoTransportAction(TransportService transportService, ActionFilters actionFilters) { + public TransportDataTiersInfoAction(TransportService transportService, ActionFilters actionFilters) { super(XPackInfoFeatureAction.DATA_TIERS.name(), transportService, actionFilters); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersUsageAction.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersUsageAction.java index 4b0fab8aeeac6..aad670bce8c99 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersUsageAction.java @@ -42,13 +42,13 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -public class DataTiersUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportDataTiersUsageAction extends XPackUsageFeatureTransportAction { private final Client client; private final ProjectResolver projectResolver; @Inject - public DataTiersUsageTransportAction( + public TransportDataTiersUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, @@ -71,8 +71,8 @@ protected void localClusterStateOperation( new ParentTaskAssigningClient(client, clusterService.localNode(), task).admin() .cluster() .execute( - NodesDataTiersUsageTransportAction.TYPE, - new NodesDataTiersUsageTransportAction.NodesRequest(), + TransportNodesDataTiersUsageAction.TYPE, + new TransportNodesDataTiersUsageAction.NodesRequest(), listener.delegateFailureAndWrap((delegate, response) -> { final var projectState = projectResolver.getProjectState(state); // Generate tier specific stats for the nodes and indices @@ -212,8 +212,8 @@ static long computeMedianAbsoluteDeviation(TDigestState valuesSketch) { } /** - * In this method we use {@link NodesDataTiersUsageTransportAction#aggregateStats(RoutingNode, Metadata, NodeIndicesStats)} - * to precalculate the stats we need from {@link NodeStats} just like we do in NodesDataTiersUsageTransportAction. + * In this method we use {@link TransportNodesDataTiersUsageAction#aggregateStats(RoutingNode, Metadata, NodeIndicesStats)} + * to precalculate the stats we need from {@link NodeStats} just like we do in TransportNodesDataTiersUsageAction. * This way we can be backwards compatible without duplicating the calculation. This is only meant to be used to be * backwards compatible and it should be removed afterwords. */ @@ -223,6 +223,6 @@ private static Map precalculateLocalStats return Map.of(); } - return NodesDataTiersUsageTransportAction.aggregateStats(routingNode, state.metadata(), nodeStats.getIndices()); + return TransportNodesDataTiersUsageAction.aggregateStats(routingNode, state.metadata(), nodeStats.getIndices()); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportNodesDataTiersUsageAction.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportNodesDataTiersUsageAction.java index 5fe31debec307..1ab2f55af70b6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportNodesDataTiersUsageAction.java @@ -49,10 +49,10 @@ /** * Sources locally data tier usage stats mainly indices and shard sizes grouped by preferred data tier. */ -public class NodesDataTiersUsageTransportAction extends TransportNodesAction< - NodesDataTiersUsageTransportAction.NodesRequest, - NodesDataTiersUsageTransportAction.NodesResponse, - NodesDataTiersUsageTransportAction.NodeRequest, +public class TransportNodesDataTiersUsageAction extends TransportNodesAction< + TransportNodesDataTiersUsageAction.NodesRequest, + TransportNodesDataTiersUsageAction.NodesResponse, + TransportNodesDataTiersUsageAction.NodeRequest, NodeDataTiersUsage, Void> { @@ -65,7 +65,7 @@ public class NodesDataTiersUsageTransportAction extends TransportNodesAction< private final IndicesService indicesService; @Inject - public NodesDataTiersUsageTransportAction( + public TransportNodesDataTiersUsageAction( ThreadPool threadPool, ClusterService clusterService, TransportService transportService, diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportActionTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersUsageActionTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportActionTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersUsageActionTests.java index a9cf2ae1d97ca..2cdbe3ead23fb 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportActionTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersUsageActionTests.java @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class DataTiersUsageTransportActionTests extends ESTestCase { +public class TransportDataTiersUsageActionTests extends ESTestCase { private long byteSize; private long docCount; @@ -78,7 +78,7 @@ public void testTierIndices() { .putProjectMetadata(projectBuilder) .putRoutingTable(projectBuilder.getId(), routingTableBuilder.build()) .build(); - Map> result = DataTiersUsageTransportAction.getIndicesGroupedByTier( + Map> result = TransportDataTiersUsageAction.getIndicesGroupedByTier( clusterState.projectState(projectBuilder.getId()), List.of(new NodeDataTiersUsage(dataNode, Map.of(DataTier.DATA_WARM, createStats(5, 5, 0, 10)))) ); @@ -90,7 +90,7 @@ public void testTierIndices() { public void testCalculateMAD() { assertThat( - DataTiersUsageTransportAction.computeMedianAbsoluteDeviation(TDigestState.createWithoutCircuitBreaking(10)), + TransportDataTiersUsageAction.computeMedianAbsoluteDeviation(TDigestState.createWithoutCircuitBreaking(10)), equalTo(0L) ); @@ -102,7 +102,7 @@ public void testCalculateMAD() { sketch.add(4); sketch.add(6); sketch.add(9); - assertThat(DataTiersUsageTransportAction.computeMedianAbsoluteDeviation(sketch), equalTo(1L)); + assertThat(TransportDataTiersUsageAction.computeMedianAbsoluteDeviation(sketch), equalTo(1L)); } public void testCalculateStatsNoTiers() { @@ -114,7 +114,7 @@ public void testCalculateStatsNoTiers() { new NodeDataTiersUsage(leader, Map.of()), new NodeDataTiersUsage(dataNode1, Map.of()) ); - Map tierSpecificStats = DataTiersUsageTransportAction.aggregateStats( + Map tierSpecificStats = TransportDataTiersUsageAction.aggregateStats( nodeDataTiersUsages, Map.of() ); @@ -141,7 +141,7 @@ public void testCalculateStatsTieredNodesOnly() { new NodeDataTiersUsage(frozenNode1, Map.of()) ); - Map tierSpecificStats = DataTiersUsageTransportAction.aggregateStats( + Map tierSpecificStats = TransportDataTiersUsageAction.aggregateStats( nodeDataTiersUsages, Map.of() ); @@ -254,7 +254,7 @@ public void testCalculateStatsTieredIndicesOnly() { ) ); // Calculate usage - Map tierSpecificStats = DataTiersUsageTransportAction.aggregateStats( + Map tierSpecificStats = TransportDataTiersUsageAction.aggregateStats( nodeDataTiersUsages, Map.of( DataTier.DATA_HOT, @@ -345,7 +345,7 @@ public void testCalculateStatsReasonableCase() { ); // Calculate usage - Map tierSpecificStats = DataTiersUsageTransportAction.aggregateStats( + Map tierSpecificStats = TransportDataTiersUsageAction.aggregateStats( nodeDataTiersUsages, Map.of( DataTier.DATA_HOT, @@ -428,7 +428,7 @@ public void testCalculateStatsMixedTiers() { ); // Calculate usage - Map tierSpecificStats = DataTiersUsageTransportAction.aggregateStats( + Map tierSpecificStats = TransportDataTiersUsageAction.aggregateStats( nodeDataTiersUsages, Map.of(DataTier.DATA_HOT, Set.of(hotIndex1), DataTier.DATA_WARM, Set.of(warmIndex1, warmIndex2)) ); @@ -487,7 +487,7 @@ public void testCalculateStatsStuckInWrongTier() { ); // Calculate usage - Map tierSpecificStats = DataTiersUsageTransportAction.aggregateStats( + Map tierSpecificStats = TransportDataTiersUsageAction.aggregateStats( nodeDataTiersUsages, Map.of(DataTier.DATA_HOT, Set.of(hotIndex1), DataTier.DATA_WARM, Set.of(warmIndex1)) ); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportActionTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/TransportNodesDataTiersUsageActionTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportActionTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/TransportNodesDataTiersUsageActionTests.java index fb4291530d037..9ba7855344883 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportActionTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/TransportNodesDataTiersUsageActionTests.java @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class NodesDataTiersUsageTransportActionTests extends ESTestCase { +public class TransportNodesDataTiersUsageActionTests extends ESTestCase { private long byteSize; private long docCount; @@ -76,7 +76,7 @@ public void testCalculateStatsNoTiers() { ); // Calculate usage - Map usageStats = NodesDataTiersUsageTransportAction.aggregateStats( + Map usageStats = TransportNodesDataTiersUsageAction.aggregateStats( clusterState.getRoutingNodes().node(dataNode1.getId()), clusterState.metadata(), nodeIndicesStats @@ -110,7 +110,7 @@ public void testCalculateStatsNoIndices() { ); // Calculate usage - Map usageStats = NodesDataTiersUsageTransportAction.aggregateStats( + Map usageStats = TransportNodesDataTiersUsageAction.aggregateStats( clusterState.getRoutingNodes().node(dataNode1.getId()), clusterState.metadata(), nodeIndicesStats @@ -181,7 +181,7 @@ public void testCalculateStatsTieredIndicesOnly() { ); // Calculate usage - Map usageStats = NodesDataTiersUsageTransportAction.aggregateStats( + Map usageStats = TransportNodesDataTiersUsageAction.aggregateStats( clusterState.getRoutingNodes().node(dataNode1.getId()), clusterState.metadata(), nodeIndicesStats diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java index 7aedf12730473..b0c3e134c609f 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java @@ -47,10 +47,10 @@ import org.elasticsearch.xpack.core.enrich.action.PutEnrichPolicyAction; import org.elasticsearch.xpack.enrich.action.EnrichCoordinatorProxyAction; import org.elasticsearch.xpack.enrich.action.EnrichCoordinatorStatsAction; -import org.elasticsearch.xpack.enrich.action.EnrichInfoTransportAction; +import org.elasticsearch.xpack.enrich.action.TransportEnrichInfoAction; import org.elasticsearch.xpack.enrich.action.EnrichReindexAction; import org.elasticsearch.xpack.enrich.action.EnrichShardMultiSearchAction; -import org.elasticsearch.xpack.enrich.action.EnrichUsageTransportAction; +import org.elasticsearch.xpack.enrich.action.TransportEnrichUsageAction; import org.elasticsearch.xpack.enrich.action.InternalExecutePolicyAction; import org.elasticsearch.xpack.enrich.action.TransportDeleteEnrichPolicyAction; import org.elasticsearch.xpack.enrich.action.TransportEnrichReindexAction; @@ -211,8 +211,8 @@ protected XPackLicenseState getLicenseState() { @Override public List getActions() { return List.of( - new ActionHandler(XPackInfoFeatureAction.ENRICH, EnrichInfoTransportAction.class), - new ActionHandler(XPackUsageFeatureAction.ENRICH, EnrichUsageTransportAction.class), + new ActionHandler(XPackInfoFeatureAction.ENRICH, TransportEnrichInfoAction.class), + new ActionHandler(XPackUsageFeatureAction.ENRICH, TransportEnrichUsageAction.class), new ActionHandler(GetEnrichPolicyAction.INSTANCE, TransportGetEnrichPolicyAction.class), new ActionHandler(DeleteEnrichPolicyAction.INSTANCE, TransportDeleteEnrichPolicyAction.class), new ActionHandler(PutEnrichPolicyAction.INSTANCE, TransportPutEnrichPolicyAction.class), diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichInfoTransportAction.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichInfoAction.java similarity index 89% rename from x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichInfoTransportAction.java rename to x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichInfoAction.java index d4850e3945f14..20f4fa6636fbf 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichInfoTransportAction.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichInfoAction.java @@ -13,10 +13,10 @@ import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction; import org.elasticsearch.xpack.core.action.XPackInfoFeatureTransportAction; -public class EnrichInfoTransportAction extends XPackInfoFeatureTransportAction { +public class TransportEnrichInfoAction extends XPackInfoFeatureTransportAction { @Inject - public EnrichInfoTransportAction(TransportService transportService, ActionFilters actionFilters) { + public TransportEnrichInfoAction(TransportService transportService, ActionFilters actionFilters) { super(XPackInfoFeatureAction.ENRICH.name(), transportService, actionFilters); } diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichUsageTransportAction.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichUsageAction.java similarity index 94% rename from x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichUsageTransportAction.java rename to x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichUsageAction.java index 6c00afcf9b659..a833b14179657 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichUsageTransportAction.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichUsageAction.java @@ -20,10 +20,10 @@ import org.elasticsearch.xpack.core.action.XPackUsageFeatureTransportAction; import org.elasticsearch.xpack.core.enrich.EnrichFeatureSetUsage; -public class EnrichUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportEnrichUsageAction extends XPackUsageFeatureTransportAction { @Inject - public EnrichUsageTransportAction( + public TransportEnrichUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycle.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycle.java index 14958dd971f38..aae4e2e3cbd08 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycle.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycle.java @@ -276,8 +276,8 @@ public List getRestHandlers( @Override public List getActions() { return List.of( - new ActionHandler(XPackUsageFeatureAction.INDEX_LIFECYCLE, IndexLifecycleUsageTransportAction.class), - new ActionHandler(XPackInfoFeatureAction.INDEX_LIFECYCLE, IndexLifecycleInfoTransportAction.class), + new ActionHandler(XPackUsageFeatureAction.INDEX_LIFECYCLE, TransportIndexLifecycleUsageAction.class), + new ActionHandler(XPackInfoFeatureAction.INDEX_LIFECYCLE, TransportIndexLifecycleInfoAction.class), new ActionHandler(MigrateToDataTiersAction.INSTANCE, TransportMigrateToDataTiersAction.class), new ActionHandler(ILMActions.PUT, TransportPutLifecycleAction.class), new ActionHandler(GetLifecycleAction.INSTANCE, TransportGetLifecycleAction.class), diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleInfoAction.java similarity index 89% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleInfoAction.java index d4d1147c635c0..a2c23715fd0e1 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleInfoAction.java @@ -13,10 +13,10 @@ import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction; import org.elasticsearch.xpack.core.action.XPackInfoFeatureTransportAction; -public class IndexLifecycleInfoTransportAction extends XPackInfoFeatureTransportAction { +public class TransportIndexLifecycleInfoAction extends XPackInfoFeatureTransportAction { @Inject - public IndexLifecycleInfoTransportAction(TransportService transportService, ActionFilters actionFilters) { + public TransportIndexLifecycleInfoAction(TransportService transportService, ActionFilters actionFilters) { super(XPackInfoFeatureAction.INDEX_LIFECYCLE.name(), transportService, actionFilters); } diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleUsageAction.java similarity index 98% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleUsageAction.java index 773582d227bbd..b173e2c9769a5 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleUsageAction.java @@ -40,12 +40,12 @@ import static org.elasticsearch.xpack.core.ilm.TimeseriesLifecycleType.shouldInjectMigrateStepForPhase; -public class IndexLifecycleUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportIndexLifecycleUsageAction extends XPackUsageFeatureTransportAction { private final ProjectResolver projectResolver; @Inject - public IndexLifecycleUsageTransportAction( + public TransportIndexLifecycleUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportActionTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleInfoActionTests.java similarity index 94% rename from x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportActionTests.java rename to x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleInfoActionTests.java index 22a3862d33b88..f1d8747a18099 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportActionTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/TransportIndexLifecycleInfoActionTests.java @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; -public class IndexLifecycleInfoTransportActionTests extends ESTestCase { +public class TransportIndexLifecycleInfoActionTests extends ESTestCase { private ClusterService clusterService; @@ -55,13 +55,13 @@ public void init() throws Exception { public void testAvailable() { TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(); - IndexLifecycleInfoTransportAction featureSet = new IndexLifecycleInfoTransportAction(transportService, mock(ActionFilters.class)); + TransportIndexLifecycleInfoAction featureSet = new TransportIndexLifecycleInfoAction(transportService, mock(ActionFilters.class)); assertThat(featureSet.available(), equalTo(true)); } public void testName() { TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(); - IndexLifecycleInfoTransportAction featureSet = new IndexLifecycleInfoTransportAction(transportService, mock(ActionFilters.class)); + TransportIndexLifecycleInfoAction featureSet = new TransportIndexLifecycleInfoAction(transportService, mock(ActionFilters.class)); assertThat(featureSet.name(), equalTo("ilm")); } @@ -95,7 +95,7 @@ public void testUsageStats() throws Exception { ThreadPool threadPool = mock(ThreadPool.class); TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool); - var usageAction = new IndexLifecycleUsageTransportAction( + var usageAction = new TransportIndexLifecycleUsageAction( transportService, null, threadPool, diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycle.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycle.java index 0e18d562cde70..742f6f449818f 100644 --- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycle.java +++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycle.java @@ -208,8 +208,8 @@ public List getRestHandlers( @Override public List getActions() { - var slmUsageAction = new ActionHandler(XPackUsageFeatureAction.SNAPSHOT_LIFECYCLE, SLMUsageTransportAction.class); - var slmInfoAction = new ActionHandler(XPackInfoFeatureAction.SNAPSHOT_LIFECYCLE, SLMInfoTransportAction.class); + var slmUsageAction = new ActionHandler(XPackUsageFeatureAction.SNAPSHOT_LIFECYCLE, TransportSLMUsageAction.class); + var slmInfoAction = new ActionHandler(XPackInfoFeatureAction.SNAPSHOT_LIFECYCLE, TransportSLMInfoAction.class); List actions = new ArrayList<>(); actions.add(slmUsageAction); actions.add(slmInfoAction); diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMInfoTransportAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMInfoAction.java similarity index 89% rename from x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMInfoTransportAction.java rename to x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMInfoAction.java index e9ca1e66021a4..c4a27678372dd 100644 --- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMInfoTransportAction.java +++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMInfoAction.java @@ -14,10 +14,10 @@ import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction; import org.elasticsearch.xpack.core.action.XPackInfoFeatureTransportAction; -public class SLMInfoTransportAction extends XPackInfoFeatureTransportAction { +public class TransportSLMInfoAction extends XPackInfoFeatureTransportAction { @Inject - public SLMInfoTransportAction(TransportService transportService, ActionFilters actionFilters) { + public TransportSLMInfoAction(TransportService transportService, ActionFilters actionFilters) { super(XPackInfoFeatureAction.SNAPSHOT_LIFECYCLE.name(), transportService, actionFilters); } diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMUsageAction.java similarity index 95% rename from x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java rename to x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMUsageAction.java index 7e1c6c7f174c8..bb3778f9eb1a2 100644 --- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java +++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMUsageAction.java @@ -23,12 +23,12 @@ import org.elasticsearch.xpack.core.slm.SLMFeatureSetUsage; import org.elasticsearch.xpack.core.slm.SnapshotLifecycleMetadata; -public class SLMUsageTransportAction extends XPackUsageFeatureTransportAction { +public class TransportSLMUsageAction extends XPackUsageFeatureTransportAction { private final ProjectResolver projectResolver; @Inject - public SLMUsageTransportAction( + public TransportSLMUsageAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, From 7061d912e3400afae13d61bdc616f994624c77e9 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Wed, 6 Aug 2025 21:44:47 +0000 Subject: [PATCH 5/5] [CI] Auto commit changes from spotless --- .../java/org/elasticsearch/xpack/enrich/EnrichPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java index b0c3e134c609f..e89f0ad60f55b 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java @@ -47,14 +47,14 @@ import org.elasticsearch.xpack.core.enrich.action.PutEnrichPolicyAction; import org.elasticsearch.xpack.enrich.action.EnrichCoordinatorProxyAction; import org.elasticsearch.xpack.enrich.action.EnrichCoordinatorStatsAction; -import org.elasticsearch.xpack.enrich.action.TransportEnrichInfoAction; import org.elasticsearch.xpack.enrich.action.EnrichReindexAction; import org.elasticsearch.xpack.enrich.action.EnrichShardMultiSearchAction; -import org.elasticsearch.xpack.enrich.action.TransportEnrichUsageAction; import org.elasticsearch.xpack.enrich.action.InternalExecutePolicyAction; import org.elasticsearch.xpack.enrich.action.TransportDeleteEnrichPolicyAction; +import org.elasticsearch.xpack.enrich.action.TransportEnrichInfoAction; import org.elasticsearch.xpack.enrich.action.TransportEnrichReindexAction; import org.elasticsearch.xpack.enrich.action.TransportEnrichStatsAction; +import org.elasticsearch.xpack.enrich.action.TransportEnrichUsageAction; import org.elasticsearch.xpack.enrich.action.TransportExecuteEnrichPolicyAction; import org.elasticsearch.xpack.enrich.action.TransportGetEnrichPolicyAction; import org.elasticsearch.xpack.enrich.action.TransportPutEnrichPolicyAction;