Rename some transport actions to be more consistent with others

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.GeoIpStatsTransportAction;
 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;
@@ -184,7 +184,7 @@ public List<PersistentTasksExecutor<?>> getPersistentTasksExecutor(
     @Override
     public List<ActionHandler> 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)

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsTransportAction.java → 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<Request, Response, NodeRequest, NodeResponse, Void> {
+public class TransportGeoIpStatsAction extends TransportNodesAction<Request, Response, NodeRequest, NodeResponse, Void> {
 
     private final DatabaseNodeService registry;
     private final GeoIpDownloaderTaskExecutor geoIpDownloaderTaskExecutor;
     private final ProjectResolver projectResolver;
 
     @Inject
-    public GeoIpStatsTransportAction(
+    public TransportGeoIpStatsAction(
         TransportService transportService,
         ClusterService clusterService,
         ThreadPool threadPool,

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.PutPipelineTransportAction;
 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;
@@ -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]"));
 

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.PutPipelineTransportAction;
 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;
@@ -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 {

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
                 )

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.GetPipelineAction;
-import org.elasticsearch.action.ingest.GetPipelineTransportAction;
-import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.action.ingest.SimulatePipelineAction;
-import org.elasticsearch.action.ingest.SimulatePipelineTransportAction;
+import org.elasticsearch.action.ingest.TransportDeletePipelineAction;
+import org.elasticsearch.action.ingest.TransportGetPipelineAction;
+import org.elasticsearch.action.ingest.TransportPutPipelineAction;
+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 <Request extends ActionRequest, Response extends ActionResponse> 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);
 

server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java → 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<DeletePipelineRequest> {
+public class TransportDeletePipelineAction extends AcknowledgedTransportMasterNodeAction<DeletePipelineRequest> {
 
     public static final ActionType<AcknowledgedResponse> 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,

server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java → server/src/main/java/org/elasticsearch/action/ingest/TransportGetPipelineAction.java

@@ -25,15 +25,15 @@
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.transport.TransportService;
 
-public class GetPipelineTransportAction extends TransportLocalProjectMetadataAction<GetPipelineRequest, GetPipelineResponse> {
+public class TransportGetPipelineAction extends TransportLocalProjectMetadataAction<GetPipelineRequest, GetPipelineResponse> {
     /**
      * 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.
      */
     @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT)
     @SuppressWarnings("this-escape")
     @Inject
-    public GetPipelineTransportAction(
+    public TransportGetPipelineAction(
         ClusterService clusterService,
         TransportService transportService,
         ActionFilters actionFilters,

server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java → 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<PutPipelineRequest> {
+public class TransportPutPipelineAction extends AcknowledgedTransportMasterNodeAction<PutPipelineRequest> {
     public static final ActionType<AcknowledgedResponse> 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,

server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java → 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<SimulatePipelineRequest, SimulatePipelineResponse> {
-    private static final Logger logger = LogManager.getLogger(SimulatePipelineTransportAction.class);
+public class TransportSimulatePipelineAction extends HandledTransportAction<SimulatePipelineRequest, SimulatePipelineResponse> {
+    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<Simu
     private final ThreadLocal<Random> random = ThreadLocal.withInitial(Randomness::get);
 
     @Inject
-    public SimulatePipelineTransportAction(
+    public TransportSimulatePipelineAction(
         ThreadPool threadPool,
         TransportService transportService,
         ActionFilters actionFilters,

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,

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));
     }
 }

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)
         );

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.DeletePipelineTransportAction;
 import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 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;
@@ -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

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.DeletePipelineTransportAction;
 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;
@@ -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)
                 )
             )

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.DeletePipelineTransportAction;
 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;
@@ -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)
                 )
             )