From 80bf48cd704bd96473360679f6c243d73eca3f07 Mon Sep 17 00:00:00 2001 From: Niels Bauman Date: Wed, 23 Apr 2025 11:34:14 +0200 Subject: [PATCH] Rename data stream transport actions The new action names are more consistent with the rest of the codebase. --- .../datastreams/DataStreamsPlugin.java | 24 +++++++++---------- ...a => TransportCreateDataStreamAction.java} | 4 ++-- ...a => TransportDataStreamsStatsAction.java} | 4 ++-- ...a => TransportDeleteDataStreamAction.java} | 6 ++--- ...> TransportMigrateToDataStreamAction.java} | 4 ++-- ... => TransportModifyDataStreamsAction.java} | 4 ++-- ... => TransportPromoteDataStreamAction.java} | 6 ++--- ...TransportDeleteDataStreamActionTests.java} | 14 +++++------ 8 files changed, 33 insertions(+), 33 deletions(-) rename modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/{CreateDataStreamTransportAction.java => TransportCreateDataStreamAction.java} (97%) rename modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/{DataStreamsStatsTransportAction.java => TransportDataStreamsStatsAction.java} (99%) rename modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/{DeleteDataStreamTransportAction.java => TransportDeleteDataStreamAction.java} (97%) rename modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/{MigrateToDataStreamTransportAction.java => TransportMigrateToDataStreamAction.java} (96%) rename modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/{ModifyDataStreamsTransportAction.java => TransportModifyDataStreamsAction.java} (96%) rename modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/{PromoteDataStreamTransportAction.java => TransportPromoteDataStreamAction.java} (96%) rename modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/{DeleteDataStreamTransportActionTests.java => TransportDeleteDataStreamActionTests.java} (95%) diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamsPlugin.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamsPlugin.java index d0d651145737d..7a9b23b5095b3 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamsPlugin.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamsPlugin.java @@ -31,13 +31,13 @@ import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.core.IOUtils; import org.elasticsearch.core.TimeValue; -import org.elasticsearch.datastreams.action.CreateDataStreamTransportAction; -import org.elasticsearch.datastreams.action.DataStreamsStatsTransportAction; -import org.elasticsearch.datastreams.action.DeleteDataStreamTransportAction; -import org.elasticsearch.datastreams.action.MigrateToDataStreamTransportAction; -import org.elasticsearch.datastreams.action.ModifyDataStreamsTransportAction; -import org.elasticsearch.datastreams.action.PromoteDataStreamTransportAction; +import org.elasticsearch.datastreams.action.TransportCreateDataStreamAction; +import org.elasticsearch.datastreams.action.TransportDataStreamsStatsAction; +import org.elasticsearch.datastreams.action.TransportDeleteDataStreamAction; import org.elasticsearch.datastreams.action.TransportGetDataStreamsAction; +import org.elasticsearch.datastreams.action.TransportMigrateToDataStreamAction; +import org.elasticsearch.datastreams.action.TransportModifyDataStreamsAction; +import org.elasticsearch.datastreams.action.TransportPromoteDataStreamAction; import org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleErrorStore; import org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleService; import org.elasticsearch.datastreams.lifecycle.action.DeleteDataStreamLifecycleAction; @@ -224,13 +224,13 @@ public Collection createComponents(PluginServices services) { @Override public List getActions() { List actions = new ArrayList<>(); - actions.add(new ActionHandler(CreateDataStreamAction.INSTANCE, CreateDataStreamTransportAction.class)); - actions.add(new ActionHandler(DeleteDataStreamAction.INSTANCE, DeleteDataStreamTransportAction.class)); + actions.add(new ActionHandler(CreateDataStreamAction.INSTANCE, TransportCreateDataStreamAction.class)); + actions.add(new ActionHandler(DeleteDataStreamAction.INSTANCE, TransportDeleteDataStreamAction.class)); actions.add(new ActionHandler(GetDataStreamAction.INSTANCE, TransportGetDataStreamsAction.class)); - actions.add(new ActionHandler(DataStreamsStatsAction.INSTANCE, DataStreamsStatsTransportAction.class)); - actions.add(new ActionHandler(MigrateToDataStreamAction.INSTANCE, MigrateToDataStreamTransportAction.class)); - actions.add(new ActionHandler(PromoteDataStreamAction.INSTANCE, PromoteDataStreamTransportAction.class)); - actions.add(new ActionHandler(ModifyDataStreamsAction.INSTANCE, ModifyDataStreamsTransportAction.class)); + actions.add(new ActionHandler(DataStreamsStatsAction.INSTANCE, TransportDataStreamsStatsAction.class)); + actions.add(new ActionHandler(MigrateToDataStreamAction.INSTANCE, TransportMigrateToDataStreamAction.class)); + actions.add(new ActionHandler(PromoteDataStreamAction.INSTANCE, TransportPromoteDataStreamAction.class)); + actions.add(new ActionHandler(ModifyDataStreamsAction.INSTANCE, TransportModifyDataStreamsAction.class)); actions.add(new ActionHandler(PutDataStreamLifecycleAction.INSTANCE, TransportPutDataStreamLifecycleAction.class)); actions.add(new ActionHandler(GetDataStreamLifecycleAction.INSTANCE, TransportGetDataStreamLifecycleAction.class)); actions.add(new ActionHandler(DeleteDataStreamLifecycleAction.INSTANCE, TransportDeleteDataStreamLifecycleAction.class)); diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/CreateDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportCreateDataStreamAction.java similarity index 97% rename from modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/CreateDataStreamTransportAction.java rename to modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportCreateDataStreamAction.java index af166893660e4..2c8212ab5e36d 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/CreateDataStreamTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportCreateDataStreamAction.java @@ -27,14 +27,14 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public class CreateDataStreamTransportAction extends AcknowledgedTransportMasterNodeAction { +public class TransportCreateDataStreamAction extends AcknowledgedTransportMasterNodeAction { private final MetadataCreateDataStreamService metadataCreateDataStreamService; private final SystemIndices systemIndices; private final ProjectResolver projectResolver; @Inject - public CreateDataStreamTransportAction( + public TransportCreateDataStreamAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DataStreamsStatsTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportDataStreamsStatsAction.java similarity index 99% rename from modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DataStreamsStatsTransportAction.java rename to modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportDataStreamsStatsAction.java index e52c181cddad9..adcd597324d2a 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DataStreamsStatsTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportDataStreamsStatsAction.java @@ -49,7 +49,7 @@ import java.util.Set; import java.util.SortedMap; -public class DataStreamsStatsTransportAction extends TransportBroadcastByNodeAction< +public class TransportDataStreamsStatsAction extends TransportBroadcastByNodeAction< DataStreamsStatsAction.Request, DataStreamsStatsAction.Response, DataStreamsStatsAction.DataStreamShardStats> { @@ -58,7 +58,7 @@ public class DataStreamsStatsTransportAction extends TransportBroadcastByNodeAct private final ProjectResolver projectResolver; @Inject - public DataStreamsStatsTransportAction( + public TransportDataStreamsStatsAction( ClusterService clusterService, TransportService transportService, IndicesService indicesService, diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportDeleteDataStreamAction.java similarity index 97% rename from modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportAction.java rename to modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportDeleteDataStreamAction.java index 798cb456fd42e..1df182b33649c 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportDeleteDataStreamAction.java @@ -46,16 +46,16 @@ import static org.elasticsearch.action.datastreams.DataStreamsActionUtil.getDataStreamNames; -public class DeleteDataStreamTransportAction extends AcknowledgedTransportMasterNodeAction { +public class TransportDeleteDataStreamAction extends AcknowledgedTransportMasterNodeAction { - private static final Logger LOGGER = LogManager.getLogger(DeleteDataStreamTransportAction.class); + private static final Logger LOGGER = LogManager.getLogger(TransportDeleteDataStreamAction.class); private final IndexNameExpressionResolver indexNameExpressionResolver; private final SystemIndices systemIndices; private final ProjectResolver projectResolver; @Inject - public DeleteDataStreamTransportAction( + public TransportDeleteDataStreamAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/MigrateToDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportMigrateToDataStreamAction.java similarity index 96% rename from modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/MigrateToDataStreamTransportAction.java rename to modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportMigrateToDataStreamAction.java index 62d434a34c807..7090fbf595053 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/MigrateToDataStreamTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportMigrateToDataStreamAction.java @@ -27,12 +27,12 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public class MigrateToDataStreamTransportAction extends AcknowledgedTransportMasterNodeProjectAction { +public class TransportMigrateToDataStreamAction extends AcknowledgedTransportMasterNodeProjectAction { private final MetadataMigrateToDataStreamService metadataMigrateToDataStreamService; @Inject - public MigrateToDataStreamTransportAction( + public TransportMigrateToDataStreamAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/ModifyDataStreamsTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportModifyDataStreamsAction.java similarity index 96% rename from modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/ModifyDataStreamsTransportAction.java rename to modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportModifyDataStreamsAction.java index 1e69efd645413..1be4dce84284e 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/ModifyDataStreamsTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportModifyDataStreamsAction.java @@ -26,13 +26,13 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public class ModifyDataStreamsTransportAction extends AcknowledgedTransportMasterNodeProjectAction { +public class TransportModifyDataStreamsAction extends AcknowledgedTransportMasterNodeProjectAction { private final IndexNameExpressionResolver indexNameExpressionResolver; private final MetadataDataStreamsService metadataDataStreamsService; @Inject - public ModifyDataStreamsTransportAction( + public TransportModifyDataStreamsAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportPromoteDataStreamAction.java similarity index 96% rename from modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java rename to modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportPromoteDataStreamAction.java index 1d65cb30c133b..ae0bfc49c5e70 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportPromoteDataStreamAction.java @@ -36,14 +36,14 @@ import static org.elasticsearch.core.Strings.format; -public class PromoteDataStreamTransportAction extends AcknowledgedTransportMasterNodeAction { +public class TransportPromoteDataStreamAction extends AcknowledgedTransportMasterNodeAction { - private static final Logger logger = LogManager.getLogger(PromoteDataStreamTransportAction.class); + private static final Logger logger = LogManager.getLogger(TransportPromoteDataStreamAction.class); private final SystemIndices systemIndices; @Inject - public PromoteDataStreamTransportAction( + public TransportPromoteDataStreamAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportActionTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/TransportDeleteDataStreamActionTests.java similarity index 95% rename from modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportActionTests.java rename to modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/TransportDeleteDataStreamActionTests.java index 63d672fd640c7..35623e8c1a216 100644 --- a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/DeleteDataStreamTransportActionTests.java +++ b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/TransportDeleteDataStreamActionTests.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; -public class DeleteDataStreamTransportActionTests extends ESTestCase { +public class TransportDeleteDataStreamActionTests extends ESTestCase { private final IndexNameExpressionResolver iner = TestIndexNameExpressionResolver.newInstance(); private final ThreadContext threadContext = new ThreadContext(Settings.EMPTY); @@ -53,7 +53,7 @@ public void testDeleteDataStream() { otherIndices ); DeleteDataStreamAction.Request req = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName }); - ClusterState newState = DeleteDataStreamTransportAction.removeDataStream( + ClusterState newState = TransportDeleteDataStreamAction.removeDataStream( iner, cs.projectState(projectId), req, @@ -82,7 +82,7 @@ public void testDeleteDataStreamWithFailureStore() { false ); DeleteDataStreamAction.Request req = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName }); - ClusterState newState = DeleteDataStreamTransportAction.removeDataStream( + ClusterState newState = TransportDeleteDataStreamAction.removeDataStream( iner, cs.projectState(projectId), req, @@ -111,7 +111,7 @@ public void testDeleteMultipleDataStreams() { ); DeleteDataStreamAction.Request req = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { "ba*", "eggplant" }); - ClusterState newState = DeleteDataStreamTransportAction.removeDataStream( + ClusterState newState = TransportDeleteDataStreamAction.removeDataStream( iner, cs.projectState(projectId), req, @@ -145,7 +145,7 @@ public void testDeleteSnapshottingDataStream() { DeleteDataStreamAction.Request req = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName }); SnapshotInProgressException e = expectThrows( SnapshotInProgressException.class, - () -> DeleteDataStreamTransportAction.removeDataStream(iner, snapshotCs.projectState(projectId), req, validator, Settings.EMPTY) + () -> TransportDeleteDataStreamAction.removeDataStream(iner, snapshotCs.projectState(projectId), req, validator, Settings.EMPTY) ); assertThat( @@ -192,7 +192,7 @@ public void testDeleteNonexistentDataStream() { expectThrows( ResourceNotFoundException.class, - () -> DeleteDataStreamTransportAction.removeDataStream( + () -> TransportDeleteDataStreamAction.removeDataStream( iner, cs.projectState(projectId), new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName }), @@ -205,7 +205,7 @@ public void testDeleteNonexistentDataStream() { TEST_REQUEST_TIMEOUT, new String[] { dataStreamName + "*" } ); - ClusterState newState = DeleteDataStreamTransportAction.removeDataStream( + ClusterState newState = TransportDeleteDataStreamAction.removeDataStream( iner, cs.projectState(projectId), req,