Skip to content

Rename data stream transport actions #127222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2025
Merged

Rename data stream transport actions #127222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -224,13 +224,13 @@ public Collection<?> createComponents(PluginServices services) {
@Override
public List<ActionHandler> getActions() {
List<ActionHandler> 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));
Expand Down
4 changes: 2 additions & 2 deletions ...tion/CreateDataStreamTransportAction.java → ...tion/TransportCreateDataStreamAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

public class CreateDataStreamTransportAction extends AcknowledgedTransportMasterNodeAction<CreateDataStreamAction.Request> {
public class TransportCreateDataStreamAction extends AcknowledgedTransportMasterNodeAction<CreateDataStreamAction.Request> {

private final MetadataCreateDataStreamService metadataCreateDataStreamService;
private final SystemIndices systemIndices;
private final ProjectResolver projectResolver;

@Inject
public CreateDataStreamTransportAction(
public TransportCreateDataStreamAction(
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
Expand Down
4 changes: 2 additions & 2 deletions ...tion/DataStreamsStatsTransportAction.java → ...tion/TransportDataStreamsStatsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand All @@ -58,7 +58,7 @@ public class DataStreamsStatsTransportAction extends TransportBroadcastByNodeAct
private final ProjectResolver projectResolver;

@Inject
public DataStreamsStatsTransportAction(
public TransportDataStreamsStatsAction(
ClusterService clusterService,
TransportService transportService,
IndicesService indicesService,
Expand Down
6 changes: 3 additions & 3 deletions ...tion/DeleteDataStreamTransportAction.java → ...tion/TransportDeleteDataStreamAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@

import static org.elasticsearch.action.datastreams.DataStreamsActionUtil.getDataStreamNames;

public class DeleteDataStreamTransportAction extends AcknowledgedTransportMasterNodeAction<DeleteDataStreamAction.Request> {
public class TransportDeleteDataStreamAction extends AcknowledgedTransportMasterNodeAction<DeleteDataStreamAction.Request> {

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,
Expand Down
4 changes: 2 additions & 2 deletions ...n/MigrateToDataStreamTransportAction.java → ...n/TransportMigrateToDataStreamAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

public class MigrateToDataStreamTransportAction extends AcknowledgedTransportMasterNodeProjectAction<MigrateToDataStreamAction.Request> {
public class TransportMigrateToDataStreamAction extends AcknowledgedTransportMasterNodeProjectAction<MigrateToDataStreamAction.Request> {

private final MetadataMigrateToDataStreamService metadataMigrateToDataStreamService;

@Inject
public MigrateToDataStreamTransportAction(
public TransportMigrateToDataStreamAction(
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
Expand Down
4 changes: 2 additions & 2 deletions ...ion/ModifyDataStreamsTransportAction.java → ...ion/TransportModifyDataStreamsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

public class ModifyDataStreamsTransportAction extends AcknowledgedTransportMasterNodeProjectAction<ModifyDataStreamsAction.Request> {
public class TransportModifyDataStreamsAction extends AcknowledgedTransportMasterNodeProjectAction<ModifyDataStreamsAction.Request> {

private final IndexNameExpressionResolver indexNameExpressionResolver;
private final MetadataDataStreamsService metadataDataStreamsService;

@Inject
public ModifyDataStreamsTransportAction(
public TransportModifyDataStreamsAction(
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
Expand Down
6 changes: 3 additions & 3 deletions ...ion/PromoteDataStreamTransportAction.java → ...ion/TransportPromoteDataStreamAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@

import static org.elasticsearch.core.Strings.format;

public class PromoteDataStreamTransportAction extends AcknowledgedTransportMasterNodeAction<PromoteDataStreamAction.Request> {
public class TransportPromoteDataStreamAction extends AcknowledgedTransportMasterNodeAction<PromoteDataStreamAction.Request> {

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,
Expand Down
14 changes: 7 additions & 7 deletions ...DeleteDataStreamTransportActionTests.java → ...TransportDeleteDataStreamActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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 }),
Expand All @@ -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,
Expand Down