diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/GetDataStreamOptionsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/GetDataStreamOptionsAction.java index 45bda1abd5c02..a946376a28cad 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/GetDataStreamOptionsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/GetDataStreamOptionsAction.java @@ -8,6 +8,7 @@ */ package org.elasticsearch.datastreams.options.action; +import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -54,7 +55,6 @@ public static class Request extends MasterNodeReadRequest implements In IndicesOptions.GatekeeperOptions.builder().allowAliasToMultipleIndices(false).allowClosedIndices(true).allowSelectors(false) ) .build(); - private boolean includeDefaults = false; public Request(TimeValue masterNodeTimeout, String[] names) { super(masterNodeTimeout); @@ -64,7 +64,6 @@ public Request(TimeValue masterNodeTimeout, String[] names) { public Request(TimeValue masterNodeTimeout, String[] names, boolean includeDefaults) { super(masterNodeTimeout); this.names = names; - this.includeDefaults = includeDefaults; } public String[] getNames() { @@ -80,7 +79,9 @@ public Request(StreamInput in) throws IOException { super(in); this.names = in.readOptionalStringArray(); this.indicesOptions = IndicesOptions.readIndicesOptions(in); - this.includeDefaults = in.readBoolean(); + if (in.getTransportVersion().before(TransportVersions.DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS_8_19)) { + in.readBoolean(); + } } @Override @@ -88,7 +89,9 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeOptionalStringArray(names); indicesOptions.writeIndicesOptions(out); - out.writeBoolean(includeDefaults); + if (out.getTransportVersion().before(TransportVersions.DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS_8_19)) { + out.writeBoolean(false); + } } @Override @@ -96,14 +99,12 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Request request = (Request) o; - return Arrays.equals(names, request.names) - && indicesOptions.equals(request.indicesOptions) - && includeDefaults == request.includeDefaults; + return Arrays.equals(names, request.names) && indicesOptions.equals(request.indicesOptions); } @Override public int hashCode() { - int result = Objects.hash(indicesOptions, includeDefaults); + int result = Objects.hash(indicesOptions); result = 31 * result + Arrays.hashCode(names); return result; } @@ -118,10 +119,6 @@ public IndicesOptions indicesOptions() { return indicesOptions; } - public boolean includeDefaults() { - return includeDefaults; - } - public Request indicesOptions(IndicesOptions indicesOptions) { this.indicesOptions = indicesOptions; return this; @@ -137,11 +134,6 @@ public IndicesRequest indices(String... indices) { this.names = indices; return this; } - - public Request includeDefaults(boolean includeDefaults) { - this.includeDefaults = includeDefaults; - return this; - } } public static class Response extends ActionResponse implements ChunkedToXContentObject { diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/rest/RestGetDataStreamOptionsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/rest/RestGetDataStreamOptionsAction.java index 9261d989ad1c7..67b1191e72064 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/rest/RestGetDataStreamOptionsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/rest/RestGetDataStreamOptionsAction.java @@ -46,7 +46,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli RestUtils.getMasterNodeTimeout(request), Strings.splitStringByCommaToArray(request.param("name")) ); - getDataStreamOptionsRequest.includeDefaults(request.paramAsBoolean("include_defaults", false)); getDataStreamOptionsRequest.indicesOptions(IndicesOptions.fromRequest(request, getDataStreamOptionsRequest.indicesOptions())); return channel -> client.execute( GetDataStreamOptionsAction.INSTANCE, diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_options.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_options.json index 3ab4daff4d786..c882dc7f7b0a9 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_options.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_options.json @@ -38,10 +38,6 @@ "default":"open", "description":"Whether wildcard expressions should get expanded to open or closed indices (default: open)" }, - "include_defaults":{ - "type":"boolean", - "description":"Return all relevant default configurations for the data stream (default: false)" - }, "master_timeout":{ "type":"time", "description":"Specify timeout for connection to master" diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index f299a906b571d..fa650e293d968 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -230,6 +230,7 @@ static TransportVersion def(int id) { public static final TransportVersion ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19 = def(8_841_0_38); public static final TransportVersion INFERENCE_CUSTOM_SERVICE_ADDED_8_19 = def(8_841_0_39); public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ADDED_8_19 = def(8_841_0_40); + public static final TransportVersion DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS_8_19 = def(8_841_0_41); /* * STOP! READ THIS FIRST! No, really, * ____ _____ ___ ____ _ ____ _____ _ ____ _____ _ _ ___ ____ _____ ___ ____ ____ _____ _