rename ingest actions

Author: samxbr

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<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 renamed to 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,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]"));
 

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 {

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.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 <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 renamed to 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 renamed to 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 renamed to 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 renamed to 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,