Skip to content

Refactor PUT DLM lifecycle API parsing #138789

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
nielsbauman merged 2 commits into from
Dec 3, 2025
Merged

Refactor PUT DLM lifecycle API parsing #138789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f4d54b
Refactor PUT DLM lifecycle API parsing
nielsbauman Nov 29, 2025
5da69ae
Merge branch 'main' into put-dlm-lifecycle-parsing
masseyke Dec 1, 2025
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
18 changes: 7 additions & 11 deletions ...n/java/org/elasticsearch/datastreams/lifecycle/rest/RestPutDataStreamLifecycleAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.elasticsearch.action.datastreams.lifecycle.PutDataStreamLifecycleAction;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
import org.elasticsearch.common.Strings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
Expand Down Expand Up @@ -46,17 +47,12 @@ public List<Route> routes() {
@Override
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
try (XContentParser parser = request.contentParser()) {
PutDataStreamLifecycleAction.Request putLifecycleRequest = PutDataStreamLifecycleAction.Request.parseRequest(
parser,
(dataRetention, enabled, downsamplingRounds, downsamplingMethod) -> new PutDataStreamLifecycleAction.Request(
getMasterNodeTimeout(request),
getAckTimeout(request),
Strings.splitStringByCommaToArray(request.param("name")),
dataRetention,
enabled,
downsamplingRounds,
downsamplingMethod
)
final var lifecycle = DataStreamLifecycle.dataLifecycleFromXContent(parser);
PutDataStreamLifecycleAction.Request putLifecycleRequest = new PutDataStreamLifecycleAction.Request(
getMasterNodeTimeout(request),
getAckTimeout(request),
Strings.splitStringByCommaToArray(request.param("name")),
lifecycle
);
putLifecycleRequest.indicesOptions(IndicesOptions.fromRequest(request, putLifecycleRequest.indicesOptions()));
return channel -> client.execute(
Expand Down
84 changes: 6 additions & 78 deletions ...ain/java/org/elasticsearch/action/datastreams/lifecycle/PutDataStreamLifecycleAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.IndicesRequest;
import org.elasticsearch.action.downsample.DownsampleConfig;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
Expand All @@ -20,23 +19,13 @@
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.xcontent.AbstractObjectParser;
import org.elasticsearch.xcontent.ConstructingObjectParser;
import org.elasticsearch.xcontent.ObjectParser;
import org.elasticsearch.xcontent.ToXContentObject;
import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xcontent.XContentParser;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;

import static org.elasticsearch.cluster.metadata.DataStreamLifecycle.DATA_RETENTION_FIELD;
import static org.elasticsearch.cluster.metadata.DataStreamLifecycle.DOWNSAMPLING_FIELD;
import static org.elasticsearch.cluster.metadata.DataStreamLifecycle.DOWNSAMPLING_METHOD_FIELD;
import static org.elasticsearch.cluster.metadata.DataStreamLifecycle.ENABLED_FIELD;

/**
* Sets the data stream lifecycle that was provided in the request to the requested data streams.
*/
Expand All @@ -48,53 +37,6 @@ private PutDataStreamLifecycleAction() {/* no instances */}

public static final class Request extends AcknowledgedRequest<Request> implements IndicesRequest.Replaceable, ToXContentObject {

public interface Factory {
Request create(
@Nullable TimeValue dataRetention,
@Nullable Boolean enabled,
@Nullable List<DataStreamLifecycle.DownsamplingRound> downsampling,
@Nullable DownsampleConfig.SamplingMethod downsamplingMethod
);
}

@SuppressWarnings("unchecked")
public static final ConstructingObjectParser<Request, Factory> PARSER = new ConstructingObjectParser<>(
"put_data_stream_lifecycle_request",
false,
(args, factory) -> factory.create(
(TimeValue) args[0],
(Boolean) args[1],
(List<DataStreamLifecycle.DownsamplingRound>) args[2],
(DownsampleConfig.SamplingMethod) args[3]
)
);

static {
PARSER.declareField(
ConstructingObjectParser.optionalConstructorArg(),
(p, c) -> TimeValue.parseTimeValue(p.text(), DATA_RETENTION_FIELD.getPreferredName()),
DATA_RETENTION_FIELD,
ObjectParser.ValueType.STRING
);
PARSER.declareBoolean(ConstructingObjectParser.optionalConstructorArg(), ENABLED_FIELD);
PARSER.declareField(
ConstructingObjectParser.optionalConstructorArg(),
(p, c) -> AbstractObjectParser.parseArray(p, null, DataStreamLifecycle.DownsamplingRound::fromXContent),
DOWNSAMPLING_FIELD,
ObjectParser.ValueType.OBJECT_ARRAY
);
PARSER.declareField(
ConstructingObjectParser.optionalConstructorArg(),
(p, c) -> DownsampleConfig.SamplingMethod.fromString(p.text()),
DOWNSAMPLING_METHOD_FIELD,
ObjectParser.ValueType.STRING
);
}

public static Request parseRequest(XContentParser parser, Factory factory) {
return PARSER.apply(parser, factory);
}

private String[] names;
private IndicesOptions indicesOptions = IndicesOptions.builder()
.concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
Expand Down Expand Up @@ -150,26 +92,12 @@ public Request(
@Nullable TimeValue dataRetention,
@Nullable Boolean enabled
) {
this(masterNodeTimeout, ackTimeout, names, dataRetention, enabled, null, null);
}

public Request(
TimeValue masterNodeTimeout,
TimeValue ackTimeout,
String[] names,
@Nullable TimeValue dataRetention,
@Nullable Boolean enabled,
@Nullable List<DataStreamLifecycle.DownsamplingRound> downsamplingRounds,
@Nullable DownsampleConfig.SamplingMethod downsamplingMethod
) {
super(masterNodeTimeout, ackTimeout);
this.names = names;
this.lifecycle = DataStreamLifecycle.dataLifecycleBuilder()
.dataRetention(dataRetention)
.enabled(enabled == null || enabled)
.downsamplingRounds(downsamplingRounds)
.downsamplingMethod(downsamplingMethod)
.build();
this(
masterNodeTimeout,
ackTimeout,
names,
DataStreamLifecycle.dataLifecycleBuilder().enabled(enabled == null || enabled).dataRetention(dataRetention).build()
);
}

public String[] getNames() {
Expand Down