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 cb7445705537a..3e92f2c41ab4a 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 @@ -34,13 +34,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; @@ -227,13 +227,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 ee6762eb85dba..1117b37c1ee36 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 @@ -26,13 +26,13 @@ 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; @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 3e207ab30ed69..7428a8e758f5d 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 @@ -48,7 +48,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> { @@ -56,7 +56,7 @@ public class DataStreamsStatsTransportAction extends TransportBroadcastByNodeAct private final IndicesService indicesService; @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 96% 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 b5c031dfd75c9..b3f4a4648c23c 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 @@ -43,15 +43,15 @@ 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; @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 c8b9a381c1255..8c8615d8d0800 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 @@ -26,12 +26,12 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public class MigrateToDataStreamTransportAction extends AcknowledgedTransportMasterNodeAction { +public class TransportMigrateToDataStreamAction extends AcknowledgedTransportMasterNodeAction { 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 8f4e52f301aa0..d7dde316e85c0 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 @@ -25,13 +25,13 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public class ModifyDataStreamsTransportAction extends AcknowledgedTransportMasterNodeAction { +public class TransportModifyDataStreamsAction extends AcknowledgedTransportMasterNodeAction { 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 97% 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 a6c03e55af109..44118224432ce 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 @@ -30,12 +30,12 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public class PromoteDataStreamTransportAction extends AcknowledgedTransportMasterNodeAction { +public class TransportPromoteDataStreamAction extends AcknowledgedTransportMasterNodeAction { 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 6d008b80a40a2..76bd417dcabd1 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 @@ -37,7 +37,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); @@ -49,7 +49,7 @@ public void testDeleteDataStream() { ClusterState cs = DataStreamTestHelper.getClusterStateWithDataStreams(List.of(new Tuple<>(dataStreamName, 2)), otherIndices); DeleteDataStreamAction.Request req = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName }); - ClusterState newState = DeleteDataStreamTransportAction.removeDataStream(iner, cs, req, validator, Settings.EMPTY); + ClusterState newState = TransportDeleteDataStreamAction.removeDataStream(iner, cs, req, validator, Settings.EMPTY); assertThat(newState.metadata().dataStreams().size(), equalTo(0)); assertThat(newState.metadata().indices().size(), equalTo(otherIndices.size())); for (String indexName : otherIndices) { @@ -73,7 +73,7 @@ public void testDeleteDataStreamWithFailureStore() { true ); DeleteDataStreamAction.Request req = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName }); - ClusterState newState = DeleteDataStreamTransportAction.removeDataStream(iner, cs, req, validator, Settings.EMPTY); + ClusterState newState = TransportDeleteDataStreamAction.removeDataStream(iner, cs, req, validator, Settings.EMPTY); assertThat(newState.metadata().dataStreams().size(), equalTo(0)); assertThat(newState.metadata().indices().size(), equalTo(otherIndices.size())); for (String indexName : otherIndices) { @@ -94,7 +94,7 @@ public void testDeleteMultipleDataStreams() { ); DeleteDataStreamAction.Request req = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { "ba*", "eggplant" }); - ClusterState newState = DeleteDataStreamTransportAction.removeDataStream(iner, cs, req, validator, Settings.EMPTY); + ClusterState newState = TransportDeleteDataStreamAction.removeDataStream(iner, cs, req, validator, Settings.EMPTY); assertThat(newState.metadata().dataStreams().size(), equalTo(1)); DataStream remainingDataStream = newState.metadata().dataStreams().get(dataStreamNames[0]); assertNotNull(remainingDataStream); @@ -120,7 +120,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, req, validator, Settings.EMPTY) + () -> TransportDeleteDataStreamAction.removeDataStream(iner, snapshotCs, req, validator, Settings.EMPTY) ); assertThat( @@ -165,7 +165,7 @@ public void testDeleteNonexistentDataStream() { expectThrows( ResourceNotFoundException.class, - () -> DeleteDataStreamTransportAction.removeDataStream( + () -> TransportDeleteDataStreamAction.removeDataStream( iner, cs, new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName }), @@ -178,7 +178,7 @@ public void testDeleteNonexistentDataStream() { TEST_REQUEST_TIMEOUT, new String[] { dataStreamName + "*" } ); - ClusterState newState = DeleteDataStreamTransportAction.removeDataStream(iner, cs, req, validator, Settings.EMPTY); + ClusterState newState = TransportDeleteDataStreamAction.removeDataStream(iner, cs, req, validator, Settings.EMPTY); assertThat(newState, sameInstance(cs)); assertThat(newState.metadata().dataStreams().size(), equalTo(cs.metadata().dataStreams().size())); assertThat(