diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java index cbd7f3d583a0e..412cb4317a1c6 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java @@ -206,11 +206,7 @@ public InternalAutoDateHistogram(StreamInput in) throws IOException { format = in.readNamedWriteable(DocValueFormat.class); buckets = in.readCollectionAsList(stream -> Bucket.readFrom(stream, format)); this.targetBuckets = in.readVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - bucketInnerInterval = in.readVLong(); - } else { - bucketInnerInterval = 1; // Calculated on merge. - } + bucketInnerInterval = in.readVLong(); // we changed the order format in 8.13 for partial reduce, therefore we need to order them to perform merge sort if (in.getTransportVersion().between(TransportVersions.V_8_13_0, TransportVersions.V_8_14_0)) { // list is mutable by #readCollectionAsList contract @@ -224,9 +220,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeNamedWriteable(format); out.writeCollection(buckets); out.writeVInt(targetBuckets); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - out.writeVLong(bucketInnerInterval); - } + out.writeVLong(bucketInnerInterval); } long getBucketInnerInterval() { diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/DatabaseConfiguration.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/DatabaseConfiguration.java index 08efe87e6fde5..d11a7f8d3273d 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/DatabaseConfiguration.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/DatabaseConfiguration.java @@ -9,7 +9,6 @@ package org.elasticsearch.ingest.geoip.direct; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.cluster.metadata.MetadataCreateIndexService; import org.elasticsearch.common.Strings; @@ -138,12 +137,7 @@ public DatabaseConfiguration(StreamInput in) throws IOException { } private static Provider readProvider(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - return in.readNamedWriteable(Provider.class); - } else { - // prior to the above version, everything was always a maxmind, so this half of the if is logical - return new Maxmind(in.readString()); - } + return in.readNamedWriteable(Provider.class); } public static DatabaseConfiguration parse(XContentParser parser, String id) { @@ -154,15 +148,7 @@ public static DatabaseConfiguration parse(XContentParser parser, String id) { public void writeTo(StreamOutput out) throws IOException { out.writeString(id); out.writeString(name); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeNamedWriteable(provider); - } else { - if (provider instanceof Maxmind maxmind) { - out.writeString(maxmind.accountId); - } else { - assert false : "non-maxmind DatabaseConfiguration.Provider [" + provider.getWriteableName() + "]"; - } - } + out.writeNamedWriteable(provider); } @Override diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java index 3b2d7f829f152..61e0ce423ce3a 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java @@ -9,7 +9,6 @@ package org.elasticsearch.ingest.geoip.stats; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.FailedNodeException; import org.elasticsearch.action.support.nodes.BaseNodeResponse; @@ -167,11 +166,7 @@ public static class NodeResponse extends BaseNodeResponse { protected NodeResponse(StreamInput in) throws IOException { super(in); downloaderStats = in.readBoolean() ? new GeoIpDownloaderStats(in) : null; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - cacheStats = in.readBoolean() ? new CacheStats(in) : null; - } else { - cacheStats = null; - } + cacheStats = in.readBoolean() ? new CacheStats(in) : null; databases = in.readCollectionAsImmutableSet(StreamInput::readString); filesInTemp = in.readCollectionAsImmutableSet(StreamInput::readString); configDatabases = in.readCollectionAsImmutableSet(StreamInput::readString); @@ -216,11 +211,9 @@ public void writeTo(StreamOutput out) throws IOException { if (downloaderStats != null) { downloaderStats.writeTo(out); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeBoolean(cacheStats != null); - if (cacheStats != null) { - cacheStats.writeTo(out); - } + out.writeBoolean(cacheStats != null); + if (cacheStats != null) { + cacheStats.writeTo(out); } out.writeStringCollection(databases); out.writeStringCollection(filesInTemp); diff --git a/server/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/elasticsearch/Build.java index feccfa489d76f..cae669665e24f 100644 --- a/server/src/main/java/org/elasticsearch/Build.java +++ b/server/src/main/java/org/elasticsearch/Build.java @@ -220,21 +220,9 @@ public static Build readBuild(StreamInput in) throws IOException { final String minWireVersion; final String minIndexVersion; final String displayString; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - version = in.readString(); - qualifier = in.readOptionalString(); - snapshot = in.readBoolean(); - } else { - snapshot = in.readBoolean(); - String rawVersion = in.readString(); - // need to separate out qualifiers from older nodes - var versionMatcher = qualfiedVersionRegex.matcher(rawVersion); - if (versionMatcher.matches() == false) { - throw new IllegalStateException(String.format(Locale.ROOT, "Malformed elasticsearch compile version: %s", rawVersion)); - } - version = versionMatcher.group(1); - qualifier = versionMatcher.group(2); - } + version = in.readString(); + qualifier = in.readOptionalString(); + snapshot = in.readBoolean(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) { minWireVersion = in.readString(); minIndexVersion = in.readString(); @@ -258,14 +246,9 @@ public static void writeBuild(Build build, StreamOutput out) throws IOException out.writeString(build.type().displayName()); out.writeString(build.hash()); out.writeString(build.date()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeString(build.version()); - out.writeOptionalString(build.qualifier()); - out.writeBoolean(build.isSnapshot()); - } else { - out.writeBoolean(build.isSnapshot()); - out.writeString(build.qualifiedVersion()); - } + out.writeString(build.version()); + out.writeOptionalString(build.qualifier()); + out.writeBoolean(build.isSnapshot()); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) { out.writeString(build.minWireCompatVersion()); out.writeString(build.minIndexCompatVersion()); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java index e46762c9e97ab..4901a17ec7152 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java @@ -93,11 +93,6 @@ public TransportGetAllocationStatsAction( @Override protected void doExecute(Task task, Request request, ActionListener listener) { - if (clusterService.state().getMinTransportVersion().before(TransportVersions.V_8_14_0)) { - // The action is not available before ALLOCATION_STATS - listener.onResponse(new Response(Map.of(), null)); - return; - } super.doExecute(task, request, listener); } @@ -144,9 +139,7 @@ public Request(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { assert out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0); super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeEnumSet(metrics); - } + out.writeEnumSet(metrics); } public EnumSet metrics() { @@ -177,21 +170,13 @@ public Response(Map nodeAllocationStats, DiskThresh public Response(StreamInput in) throws IOException { this.nodeAllocationStats = in.readImmutableMap(StreamInput::readString, NodeAllocationStats::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.diskThresholdSettings = in.readOptionalWriteable(DiskThresholdSettings::readFrom); - } else { - this.diskThresholdSettings = null; - } + this.diskThresholdSettings = in.readOptionalWriteable(DiskThresholdSettings::readFrom); } @Override public void writeTo(StreamOutput out) throws IOException { out.writeMap(nodeAllocationStats, StreamOutput::writeString, StreamOutput::writeWriteable); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalWriteable(diskThresholdSettings); - } else { - assert diskThresholdSettings == null; - } + out.writeOptionalWriteable(diskThresholdSettings); } public Map getNodeAllocationStats() { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java index de7ec27bb8821..40226529b0fa0 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java @@ -9,10 +9,8 @@ package org.elasticsearch.action.admin.cluster.node.hotthreads; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.ReleasableBytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,11 +26,7 @@ public class NodeHotThreads extends BaseNodeResponse { NodeHotThreads(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - bytes = in.readReleasableBytesReference(); - } else { - bytes = ReleasableBytesReference.wrap(new BytesArray(in.readString().getBytes(StandardCharsets.UTF_8))); - } + bytes = in.readReleasableBytesReference(); } public NodeHotThreads(DiscoveryNode node, ReleasableBytesReference hotThreadsUtf8Bytes) { @@ -57,11 +51,7 @@ public java.io.Reader getHotThreadsReader() { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBytesReference(bytes); - } else { - out.writeString(bytes.utf8ToString()); - } + out.writeBytesReference(bytes); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java index e52b29438999d..e628c000178bb 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java @@ -12,7 +12,6 @@ import org.elasticsearch.Build; import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersions; -import org.elasticsearch.Version; import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.version.CompatibilityVersions; @@ -64,33 +63,14 @@ public class NodeInfo extends BaseNodeResponse { public NodeInfo(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - version = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) { - compatibilityVersions = CompatibilityVersions.readVersion(in); - } else { - compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions - } - indexVersion = IndexVersion.readVersion(in); + version = in.readString(); + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) { + compatibilityVersions = CompatibilityVersions.readVersion(in); } else { - Version legacyVersion = Version.readVersion(in); - version = legacyVersion.toString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions - } else { - compatibilityVersions = new CompatibilityVersions(TransportVersion.fromId(legacyVersion.id), Map.of()); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - indexVersion = IndexVersion.readVersion(in); - } else { - indexVersion = IndexVersion.fromId(legacyVersion.id); - } - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - componentVersions = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt); - } else { - componentVersions = Map.of(); + compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions } + indexVersion = IndexVersion.readVersion(in); + componentVersions = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt); build = Build.readBuild(in); if (in.readBoolean()) { totalIndexingBuffer = ByteSizeValue.ofBytes(in.readLong()); @@ -111,9 +91,7 @@ public NodeInfo(StreamInput in) throws IOException { addInfoIfNonNull(PluginsAndModules.class, in.readOptionalWriteable(PluginsAndModules::new)); addInfoIfNonNull(IngestInfo.class, in.readOptionalWriteable(IngestInfo::new)); addInfoIfNonNull(AggregationInfo.class, in.readOptionalWriteable(AggregationInfo::new)); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - addInfoIfNonNull(RemoteClusterServerInfo.class, in.readOptionalWriteable(RemoteClusterServerInfo::new)); - } + addInfoIfNonNull(RemoteClusterServerInfo.class, in.readOptionalWriteable(RemoteClusterServerInfo::new)); } public NodeInfo( @@ -246,20 +224,10 @@ private void addInfoIfNonNull(Class clazz, @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeString(version); - } else { - Version.writeVersion(Version.fromString(version), out); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) { - compatibilityVersions.writeTo(out); - } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - IndexVersion.writeVersion(indexVersion, out); - out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt); - } + out.writeString(version); + compatibilityVersions.writeTo(out); + IndexVersion.writeVersion(indexVersion, out); + out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt); Build.writeBuild(build, out); if (totalIndexingBuffer == null) { out.writeBoolean(false); @@ -282,8 +250,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(getInfo(PluginsAndModules.class)); out.writeOptionalWriteable(getInfo(IngestInfo.class)); out.writeOptionalWriteable(getInfo(AggregationInfo.class)); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalWriteable(getInfo(RemoteClusterServerInfo.class)); - } + out.writeOptionalWriteable(getInfo(RemoteClusterServerInfo.class)); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java index 99b8dd85425b3..f92d58e061cdb 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.cluster.node.info; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.node.ReportingService; @@ -42,11 +41,7 @@ public PluginsAndModules(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - out.writeCollection(plugins); - } else { - out.writeCollection(plugins.stream().map(PluginRuntimeInfo::descriptor).toList()); - } + out.writeCollection(plugins); out.writeCollection(modules); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java index 26f1a00784394..bba6faf1f585f 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java @@ -9,10 +9,7 @@ package org.elasticsearch.action.admin.cluster.node.reload; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.support.nodes.BaseNodesRequest; -import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -23,7 +20,6 @@ import org.elasticsearch.core.Nullable; import org.elasticsearch.core.RefCounted; import org.elasticsearch.core.Releasables; -import org.elasticsearch.tasks.TaskId; import org.elasticsearch.transport.AbstractTransportRequest; import org.elasticsearch.transport.LeakTracker; @@ -92,13 +88,6 @@ public static class NodeRequest extends AbstractTransportRequest { NodeRequest(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().before(TransportVersions.V_8_13_0)) { - TaskId.readFromStream(in); - in.readStringArray(); - in.readOptionalArray(DiscoveryNode::new, DiscoveryNode[]::new); - in.readOptionalTimeValue(); - } - final BytesReference bytesRef = in.readOptionalBytesReference(); if (bytesRef != null) { byte[] bytes = BytesReference.toBytes(bytesRef); @@ -126,13 +115,6 @@ public void writeTo(StreamOutput out) throws IOException { assert hasReferences(); super.writeTo(out); - if (out.getTransportVersion().before(TransportVersions.V_8_13_0)) { - TaskId.EMPTY_TASK_ID.writeTo(out); - out.writeStringArray(Strings.EMPTY_ARRAY); - out.writeOptionalArray(StreamOutput::writeWriteable, null); - out.writeOptionalTimeValue(null); - } - if (this.secureSettingsPassword == null) { out.writeOptionalBytesReference(null); } else { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java index 0e93b8006cbc1..c37e47909676a 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java @@ -156,9 +156,6 @@ public void writeTo(StreamOutput out) throws IOException { } public static Result readFrom(final StreamInput in) throws IOException { - if (in.getTransportVersion().before(TransportVersions.V_8_7_0)) { - return new Result(in.readBoolean(), null, in.readString()); - } return new Result(in.readBoolean(), Reason.readFrom(in), in.readString()); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java index 541ed3a78f8f6..188b97b962998 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java @@ -339,12 +339,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(ingestStats); out.writeOptionalWriteable(adaptiveSelectionStats); out.writeOptionalWriteable(indexingPressureStats); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeOptionalWriteable(repositoriesStats); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalWriteable(nodeAllocationStats); - } + out.writeOptionalWriteable(repositoriesStats); + out.writeOptionalWriteable(nodeAllocationStats); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParameters.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParameters.java index c5e8f37ed3a96..fa9c23fb1c829 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParameters.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParameters.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.cluster.node.stats; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -39,20 +38,14 @@ public NodesStatsRequestParameters() { public NodesStatsRequestParameters(StreamInput in) throws IOException { indices = new CommonStatsFlags(in); requestedMetrics = Metric.readSetFrom(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - includeShardsStats = in.readBoolean(); - } else { - includeShardsStats = true; - } + includeShardsStats = in.readBoolean(); } @Override public void writeTo(StreamOutput out) throws IOException { indices.writeTo(out); Metric.writeSetTo(out, requestedMetrics); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeBoolean(includeShardsStats); - } + out.writeBoolean(includeShardsStats); } public CommonStatsFlags indices() { @@ -117,23 +110,11 @@ public static Metric get(String name) { } public static void writeSetTo(StreamOutput out, EnumSet metrics) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeEnumSet(metrics); - } else { - out.writeCollection(metrics, (output, metric) -> output.writeString(metric.metricName)); - } + out.writeEnumSet(metrics); } public static EnumSet readSetFrom(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - return in.readEnumSet(Metric.class); - } else { - return in.readCollection((i) -> EnumSet.noneOf(Metric.class), (is, out) -> { - var name = is.readString(); - var metric = Metric.get(name); - out.add(metric); - }); - } + return in.readEnumSet(Metric.class); } public String metricName() { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java index cdcf4bdad7b1a..55fa3d089f73d 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequest.java @@ -8,7 +8,6 @@ */ package org.elasticsearch.action.admin.cluster.repositories.cleanup; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -29,11 +28,7 @@ public CleanupRepositoryRequest(TimeValue masterNodeTimeout, TimeValue ackTimeou } public static CleanupRepositoryRequest readFrom(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - return new CleanupRepositoryRequest(in); - } else { - return new CleanupRepositoryRequest(TimeValue.THIRTY_SECONDS, TimeValue.THIRTY_SECONDS, in); - } + return new CleanupRepositoryRequest(in); } private CleanupRepositoryRequest(StreamInput in) throws IOException { @@ -48,9 +43,7 @@ public CleanupRepositoryRequest(TimeValue masterNodeTimeout, TimeValue ackTimeou @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - super.writeTo(out); - } + super.writeTo(out); out.writeString(repository); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java index 134d120187c3c..13215eb6dcf3a 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java @@ -122,9 +122,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(waitForCompletion); out.writeBoolean(partial); out.writeGenericMap(userMetadata); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalString(uuid); - } + out.writeOptionalString(uuid); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java index ab073f83e14da..916dbb57a2a29 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.delete; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.Strings; @@ -51,9 +50,7 @@ public DeleteSnapshotRequest(StreamInput in) throws IOException { super(in); repository = in.readString(); snapshots = in.readStringArray(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - waitForCompletion = in.readBoolean(); - } + waitForCompletion = in.readBoolean(); } @Override @@ -61,11 +58,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(repository); out.writeStringArray(snapshots); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(waitForCompletion); - } else { - assert waitForCompletion : "Using wait_for_completion parameter when it should have been disallowed"; - } + out.writeBoolean(waitForCompletion); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java index 48b4e967742cd..5728e65408341 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java @@ -40,18 +40,9 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException { this.nodeInfo = new NodeInfo(in); this.nodeStats = new NodeStats(in); this.shardsStats = in.readArray(ShardStats::new, ShardStats[]::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - searchUsageStats = new SearchUsageStats(in); - } else { - searchUsageStats = new SearchUsageStats(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - repositoryUsageStats = RepositoryUsageStats.readFrom(in); - searchCcsMetrics = new CCSTelemetrySnapshot(in); - } else { - repositoryUsageStats = RepositoryUsageStats.EMPTY; - searchCcsMetrics = new CCSTelemetrySnapshot(); - } + searchUsageStats = new SearchUsageStats(in); + repositoryUsageStats = RepositoryUsageStats.readFrom(in); + searchCcsMetrics = new CCSTelemetrySnapshot(in); if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_TELEMETRY_STATS)) { esqlCcsMetrics = new CCSTelemetrySnapshot(in); } else { @@ -124,13 +115,9 @@ public void writeTo(StreamOutput out) throws IOException { nodeInfo.writeTo(out); nodeStats.writeTo(out); out.writeArray(shardsStats); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - searchUsageStats.writeTo(out); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - repositoryUsageStats.writeTo(out); - searchCcsMetrics.writeTo(out); - } // else just drop these stats, ok for bwc + searchUsageStats.writeTo(out); + repositoryUsageStats.writeTo(out); + searchCcsMetrics.writeTo(out); if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_TELEMETRY_STATS)) { esqlCcsMetrics.writeTo(out); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java index 686d432b01a20..9474a25f1766a 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java @@ -258,15 +258,9 @@ private static int countOccurrences(String script, Pattern pattern) { } MappingStats(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - totalFieldCount = in.readOptionalVLong(); - totalDeduplicatedFieldCount = in.readOptionalVLong(); - totalMappingSizeBytes = in.readOptionalVLong(); - } else { - totalFieldCount = null; - totalDeduplicatedFieldCount = null; - totalMappingSizeBytes = null; - } + totalFieldCount = in.readOptionalVLong(); + totalDeduplicatedFieldCount = in.readOptionalVLong(); + totalMappingSizeBytes = in.readOptionalVLong(); fieldTypeStats = in.readCollectionAsImmutableList(FieldStats::new); runtimeFieldStats = in.readCollectionAsImmutableList(RuntimeFieldStats::new); var transportVersion = in.getTransportVersion(); @@ -277,11 +271,9 @@ private static int countOccurrences(String script, Pattern pattern) { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalVLong(totalFieldCount); - out.writeOptionalVLong(totalDeduplicatedFieldCount); - out.writeOptionalVLong(totalMappingSizeBytes); - } + out.writeOptionalVLong(totalFieldCount); + out.writeOptionalVLong(totalDeduplicatedFieldCount); + out.writeOptionalVLong(totalMappingSizeBytes); out.writeCollection(fieldTypeStats); out.writeCollection(runtimeFieldStats); var transportVersion = out.getTransportVersion(); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java index 8b1c0f3314970..d2534bef9f2e6 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java @@ -38,9 +38,6 @@ public ActionRequestValidationException validate() { public void writeTo(StreamOutput out) throws IOException { assert out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0) : "RemoteClusterStatsRequest is not supported by the remote cluster"; - if (out.getTransportVersion().before(TransportVersions.V_8_16_0)) { - throw new UnsupportedOperationException("RemoteClusterStatsRequest is not supported by the remote cluster"); - } super.writeTo(out); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java index 97e97bef17902..314c796e7b717 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java @@ -12,7 +12,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.ActionType; @@ -462,13 +461,7 @@ protected void sendItemRequest(String clusterAlias, ActionListener { - if (connection.getTransportVersion().before(TransportVersions.V_8_16_0)) { - responseListener.onResponse(null); - } else { - remoteClusterClient.execute(connection, TransportRemoteClusterStatsAction.REMOTE_TYPE, remoteRequest, responseListener); - } - })); + remoteClusterClient.getConnection(remoteRequest, listener.delegateFailureAndWrap((responseListener, connection) -> {})); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java index 071e9b42752c0..329e3fcafe7fe 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java @@ -10,7 +10,6 @@ package org.elasticsearch.action.admin.indices.alias; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; @@ -49,13 +48,8 @@ public class IndicesAliasesResponse extends AcknowledgedResponse { protected IndicesAliasesResponse(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - this.errors = in.readBoolean(); - this.actionResults = in.readCollectionAsImmutableList(AliasActionResult::new); - } else { - this.errors = false; - this.actionResults = List.of(); - } + this.errors = in.readBoolean(); + this.actionResults = in.readCollectionAsImmutableList(AliasActionResult::new); } /** @@ -103,10 +97,8 @@ public static IndicesAliasesResponse build(final List actionR @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeBoolean(errors); - out.writeCollection(actionResults); - } + out.writeBoolean(errors); + out.writeCollection(actionResults); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index 813a42b9d6730..91c79b44e6b2c 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchGenerationException; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.admin.indices.alias.Alias; @@ -94,16 +93,8 @@ public CreateIndexRequest(StreamInput in) throws IOException { } waitForActiveShards = ActiveShardCount.readFrom(in); origin = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - requireDataStream = in.readBoolean(); - } else { - requireDataStream = false; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - initializeFailureStore = in.readBoolean(); - } else { - initializeFailureStore = true; - } + requireDataStream = in.readBoolean(); + initializeFailureStore = in.readBoolean(); } public CreateIndexRequest() { @@ -502,12 +493,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeCollection(aliases); waitForActiveShards.writeTo(out); out.writeString(origin); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(this.requireDataStream); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(this.initializeFailureStore); - } + out.writeBoolean(this.requireDataStream); + out.writeBoolean(this.initializeFailureStore); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/UnpromotableShardRefreshRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/UnpromotableShardRefreshRequest.java index af6aac3c7fa53..7bf279fd39941 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/UnpromotableShardRefreshRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/UnpromotableShardRefreshRequest.java @@ -75,9 +75,7 @@ public ActionRequestValidationException validate() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeVLong(segmentGeneration); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeVLong(primaryTerm); - } + out.writeVLong(primaryTerm); } public long getSegmentGeneration() { diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java index 6e42eddd80216..d5ab92a467635 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java @@ -78,9 +78,6 @@ public ResolveClusterActionRequest(String[] names, IndicesOptions indicesOptions @SuppressWarnings("this-escape") public ResolveClusterActionRequest(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().before(TransportVersions.V_8_13_0)) { - throw new UnsupportedOperationException(createVersionErrorMessage(in.getTransportVersion())); - } this.names = in.readStringArray(); this.indicesOptions = IndicesOptions.readIndicesOptions(in); this.localIndicesRequested = localIndicesPresent(names); @@ -99,9 +96,6 @@ public ResolveClusterActionRequest(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().before(TransportVersions.V_8_13_0)) { - throw new UnsupportedOperationException(createVersionErrorMessage(out.getTransportVersion())); - } out.writeStringArray(names); indicesOptions.writeIndicesOptions(out); if (out.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_CLUSTER_NO_INDEX_EXPRESSION)) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionResponse.java index 58d32ccc5c89c..3e17f21c0a256 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionResponse.java @@ -10,7 +10,6 @@ package org.elasticsearch.action.admin.indices.resolve; import org.elasticsearch.Build; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.io.stream.StreamInput; @@ -44,14 +43,6 @@ public ResolveClusterActionResponse(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_13_0)) { - throw new UnsupportedOperationException( - "ResolveClusterAction requires at least version " - + TransportVersions.V_8_13_0.toReleaseVersion() - + " but was " - + out.getTransportVersion().toReleaseVersion() - ); - } out.writeMap(infoMap, StreamOutput::writeWriteable); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterInfo.java b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterInfo.java index 5c4a9c75f26d2..f56e0835118b4 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterInfo.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterInfo.java @@ -10,7 +10,6 @@ package org.elasticsearch.action.admin.indices.resolve; import org.elasticsearch.Build; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -71,9 +70,6 @@ public ResolveClusterInfo(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_13_0)) { - throw new UnsupportedOperationException(ResolveClusterActionRequest.createVersionErrorMessage(out.getTransportVersion())); - } out.writeBoolean(connected); out.writeOptionalBoolean(skipUnavailable); out.writeOptionalBoolean(matchingIndices); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java index cb46d039c5b3b..f360555b0f5a6 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java @@ -8,7 +8,6 @@ */ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; @@ -90,14 +89,8 @@ public RolloverRequest(StreamInput in) throws IOException { dryRun = in.readBoolean(); conditions = new RolloverConditions(in); createIndexRequest = new CreateIndexRequest(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - lazy = in.readBoolean(); - } else { - lazy = false; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - indicesOptions = IndicesOptions.readIndicesOptions(in); - } + lazy = in.readBoolean(); + indicesOptions = IndicesOptions.readIndicesOptions(in); } RolloverRequest() { @@ -145,12 +138,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(dryRun); conditions.writeTo(out); createIndexRequest.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(lazy); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - indicesOptions.writeIndicesOptions(out); - } + out.writeBoolean(lazy); + indicesOptions.writeIndicesOptions(out); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java index 72c568a3995ab..08131834e3662 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.indices.rollover; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.support.master.ShardsAcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -59,11 +58,7 @@ public final class RolloverResponse extends ShardsAcknowledgedResponse implement dryRun = in.readBoolean(); rolledOver = in.readBoolean(); shardsAcknowledged = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - lazy = in.readBoolean(); - } else { - lazy = false; - } + lazy = in.readBoolean(); } public RolloverResponse( @@ -142,9 +137,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(dryRun); out.writeBoolean(rolledOver); out.writeBoolean(shardsAcknowledged); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(lazy); - } + out.writeBoolean(lazy); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java index fe5d688378bfe..82782e08d3120 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java @@ -10,7 +10,6 @@ package org.elasticsearch.action.admin.indices.settings.put; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -57,9 +56,7 @@ public UpdateSettingsRequest(StreamInput in) throws IOException { settings = readSettingsFromStream(in); preserveExisting = in.readBoolean(); origin = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - reopen = in.readBoolean(); - } + reopen = in.readBoolean(); } public UpdateSettingsRequest() { @@ -204,9 +201,7 @@ public void writeTo(StreamOutput out) throws IOException { settings.writeTo(out); out.writeBoolean(preserveExisting); out.writeString(origin); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeBoolean(reopen); - } + out.writeBoolean(reopen); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java index 3ab427dbecdf7..ab98fc3f0d3bf 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java @@ -8,7 +8,6 @@ */ package org.elasticsearch.action.admin.indices.shards; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -58,12 +57,7 @@ public IndicesShardStoresRequest(StreamInput in) throws IOException { statuses.add(ClusterHealthStatus.readFrom(in)); } indicesOptions = IndicesOptions.readIndicesOptions(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - maxConcurrentShardRequests = in.readVInt(); - } else { - // earlier versions had unlimited concurrency - maxConcurrentShardRequests = Integer.MAX_VALUE; - } + maxConcurrentShardRequests = in.readVInt(); } @Override @@ -72,17 +66,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeStringArrayNullable(indices); out.writeCollection(statuses, (o, v) -> o.writeByte(v.value())); indicesOptions.writeIndicesOptions(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeVInt(maxConcurrentShardRequests); - } else if (maxConcurrentShardRequests != DEFAULT_MAX_CONCURRENT_SHARD_REQUESTS) { - throw new IllegalArgumentException( - "support for maxConcurrentShardRequests=[" - + maxConcurrentShardRequests - + "] was added in version [8.8.0], cannot send this request using transport version [" - + out.getTransportVersion().toReleaseVersion() - + "]" - ); - } // else just drop the value and use the default behaviour + out.writeVInt(maxConcurrentShardRequests); } /** diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java index cfaea3e5e47b4..a7ced043dd720 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.indices.stats; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ClusterStatsLevel; import org.elasticsearch.action.admin.indices.stats.IndexStats.IndexStatsBuilder; import org.elasticsearch.action.support.DefaultShardOperationFailedException; @@ -56,15 +55,10 @@ public class IndicesStatsResponse extends ChunkedBroadcastResponse { IndicesStatsResponse(StreamInput in) throws IOException { super(in); shards = in.readArray(ShardStats::new, ShardStats[]::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - // Between 8.1 and INDEX_STATS_ADDITIONAL_FIELDS, we had a different format for the response - // where we only had health and state available. - indexHealthMap = in.readMap(ClusterHealthStatus::readFrom); - indexStateMap = in.readMap(IndexMetadata.State::readFrom); - } else { - indexHealthMap = Map.of(); - indexStateMap = Map.of(); - } + // Between 8.1 and INDEX_STATS_ADDITIONAL_FIELDS, we had a different format for the response + // where we only had health and state available. + indexHealthMap = in.readMap(ClusterHealthStatus::readFrom); + indexStateMap = in.readMap(IndexMetadata.State::readFrom); } @FixForMultiProject(description = "we can pass ProjectMetadata here") @@ -179,10 +173,8 @@ public CommonStats getPrimaries() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeArray(shards); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeMap(indexHealthMap, StreamOutput::writeWriteable); - out.writeMap(indexStateMap, StreamOutput::writeWriteable); - } + out.writeMap(indexHealthMap, StreamOutput::writeWriteable); + out.writeMap(indexStateMap, StreamOutput::writeWriteable); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java index dab46df50abc5..b3eca4851cb57 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java @@ -62,13 +62,8 @@ public ShardStats(StreamInput in) throws IOException { isCustomDataPath = in.readBoolean(); seqNoStats = in.readOptionalWriteable(SeqNoStats::new); retentionLeaseStats = in.readOptionalWriteable(RetentionLeaseStats::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - isSearchIdle = in.readBoolean(); - searchIdleTime = in.readVLong(); - } else { - isSearchIdle = false; - searchIdleTime = 0; - } + isSearchIdle = in.readBoolean(); + searchIdleTime = in.readVLong(); } public ShardStats( @@ -216,10 +211,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(isCustomDataPath); out.writeOptionalWriteable(seqNoStats); out.writeOptionalWriteable(retentionLeaseStats); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeBoolean(isSearchIdle); - out.writeVLong(searchIdleTime); - } + out.writeBoolean(isSearchIdle); + out.writeVLong(searchIdleTime); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComponentTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComponentTemplateAction.java index 4f61b89aeaf5e..5e45589f49130 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComponentTemplateAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComponentTemplateAction.java @@ -68,11 +68,7 @@ public Request(TimeValue masterTimeout, String name) { public Request(StreamInput in) throws IOException { super(in); name = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - includeDefaults = in.readBoolean(); - } else { - includeDefaults = false; - } + includeDefaults = in.readBoolean(); } @Override @@ -180,9 +176,7 @@ public DataStreamGlobalRetention getGlobalRetention() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeMap(componentTemplates, StreamOutput::writeWriteable); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeOptionalWriteable(rolloverConfiguration); - } + out.writeOptionalWriteable(rolloverConfiguration); if (out.getTransportVersion().between(TransportVersions.V_8_14_0, TransportVersions.V_8_16_0)) { out.writeOptionalWriteable(null); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java index 5d322bba17c5e..1f0ef45b0b147 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java @@ -72,11 +72,7 @@ public Request(TimeValue masterTimeout, @Nullable String name) { public Request(StreamInput in) throws IOException { super(in); name = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - includeDefaults = in.readBoolean(); - } else { - includeDefaults = false; - } + includeDefaults = in.readBoolean(); } public void includeDefaults(boolean includeDefaults) { @@ -186,9 +182,7 @@ public RolloverConfiguration getRolloverConfiguration() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeMap(indexTemplates, StreamOutput::writeWriteable); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeOptionalWriteable(rolloverConfiguration); - } + out.writeOptionalWriteable(rolloverConfiguration); if (out.getTransportVersion().between(TransportVersions.V_8_14_0, TransportVersions.V_8_16_0)) { out.writeOptionalWriteable(null); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java index 1a04b6e4d7633..1d6f055169e2c 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java @@ -83,9 +83,7 @@ public void writeTo(StreamOutput out) throws IOException { } else { out.writeBoolean(false); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeOptionalWriteable(rolloverConfiguration); - } + out.writeOptionalWriteable(rolloverConfiguration); if (out.getTransportVersion().between(TransportVersions.V_8_14_0, TransportVersions.V_8_16_0)) { out.writeOptionalWriteable(null); } diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java index 68677bbfd10e4..f1802ca22c192 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.DocWriteRequest.OpType; import org.elasticsearch.action.DocWriteResponse; import org.elasticsearch.action.delete.DeleteResponse; @@ -194,11 +193,7 @@ public Failure(StreamInput in) throws IOException { seqNo = in.readZLong(); term = in.readVLong(); aborted = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - failureStoreStatus = IndexDocFailureStoreStatus.read(in); - } else { - failureStoreStatus = IndexDocFailureStoreStatus.NOT_APPLICABLE_OR_UNKNOWN; - } + failureStoreStatus = IndexDocFailureStoreStatus.read(in); } @Override @@ -209,9 +204,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeZLong(seqNo); out.writeVLong(term); out.writeBoolean(aborted); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - failureStoreStatus.writeTo(out); - } + failureStoreStatus.writeTo(out); } /** diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java index 98c3eaad11dce..28ac80debf03e 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java @@ -107,11 +107,7 @@ public BulkRequest(StreamInput in) throws IOException { for (DocWriteRequest request : requests) { indices.add(Objects.requireNonNull(request.index(), "request index must not be null")); } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - incrementalState = new BulkRequest.IncrementalState(in); - } else { - incrementalState = BulkRequest.IncrementalState.EMPTY; - } + incrementalState = new BulkRequest.IncrementalState(in); if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) { includeSourceOnError = in.readBoolean(); } // else default value is true @@ -478,9 +474,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeCollection(requests, DocWriteRequest::writeDocumentRequest); refreshPolicy.writeTo(out); out.writeTimeValue(timeout); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - incrementalState.writeTo(out); - } + incrementalState.writeTo(out); if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) { out.writeBoolean(includeSourceOnError); } diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java index 97236b47e53aa..a7d61deb4e7b6 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.bulk; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.collect.Iterators; import org.elasticsearch.common.io.stream.StreamInput; @@ -45,11 +44,7 @@ public BulkResponse(StreamInput in) throws IOException { responses = in.readArray(BulkItemResponse::new, BulkItemResponse[]::new); tookInMillis = in.readVLong(); ingestTookInMillis = in.readZLong(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - incrementalState = new BulkRequest.IncrementalState(in); - } else { - incrementalState = BulkRequest.IncrementalState.EMPTY; - } + incrementalState = new BulkRequest.IncrementalState(in); } public BulkResponse(BulkItemResponse[] responses, long tookInMillis) { @@ -150,9 +145,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeArray(responses); out.writeVLong(tookInMillis); out.writeZLong(ingestTookInMillis); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - incrementalState.writeTo(out); - } + incrementalState.writeTo(out); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java index 1ab570d7ffed6..25fe73276e3b9 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java @@ -11,7 +11,6 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.support.replication.ReplicatedWriteRequest; @@ -44,11 +43,7 @@ public final class BulkShardRequest extends ReplicatedWriteRequest i.readOptionalWriteable(inpt -> new BulkItemRequest(shardId, inpt)), BulkItemRequest[]::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - isSimulated = in.readBoolean(); - } else { - isSimulated = false; - } + isSimulated = in.readBoolean(); } public BulkShardRequest( @@ -166,9 +161,7 @@ public void writeTo(StreamOutput out) throws IOException { } super.writeTo(out); out.writeArray((o, item) -> o.writeOptional(BulkItemRequest.THIN_WRITER, item), items); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(isSimulated); - } + out.writeBoolean(isSimulated); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/bulk/IndexDocFailureStoreStatus.java b/server/src/main/java/org/elasticsearch/action/bulk/IndexDocFailureStoreStatus.java index 5150f9f0b5603..6ec71677a319a 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/IndexDocFailureStoreStatus.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/IndexDocFailureStoreStatus.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -123,19 +122,13 @@ public ExceptionWithFailureStoreStatus(BulkItemResponse.Failure failure) { public ExceptionWithFailureStoreStatus(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - failureStoreStatus = IndexDocFailureStoreStatus.fromId(in.readByte()); - } else { - failureStoreStatus = NOT_APPLICABLE_OR_UNKNOWN; - } + failureStoreStatus = IndexDocFailureStoreStatus.fromId(in.readByte()); } @Override protected void writeTo(StreamOutput out, Writer nestedExceptionsWriter) throws IOException { super.writeTo(out, nestedExceptionsWriter); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeByte(failureStoreStatus.getId()); - } + out.writeByte(failureStoreStatus.getId()); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java index 14d9fa51f1add..d667118b94b8e 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java @@ -10,7 +10,6 @@ package org.elasticsearch.action.bulk; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.metadata.ComponentTemplate; import org.elasticsearch.cluster.metadata.ComposableIndexTemplate; import org.elasticsearch.common.io.stream.StreamInput; @@ -144,18 +143,9 @@ public SimulateBulkRequest( public SimulateBulkRequest(StreamInput in) throws IOException { super(in); this.pipelineSubstitutions = (Map>) in.readGenericValue(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.componentTemplateSubstitutions = (Map>) in.readGenericValue(); - this.indexTemplateSubstitutions = (Map>) in.readGenericValue(); - } else { - componentTemplateSubstitutions = Map.of(); - indexTemplateSubstitutions = Map.of(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - this.mappingAddition = (Map) in.readGenericValue(); - } else { - mappingAddition = Map.of(); - } + this.componentTemplateSubstitutions = (Map>) in.readGenericValue(); + this.indexTemplateSubstitutions = (Map>) in.readGenericValue(); + this.mappingAddition = (Map) in.readGenericValue(); if (in.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) { mappingMergeType = in.readOptionalString(); } else { @@ -167,13 +157,9 @@ public SimulateBulkRequest(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeGenericValue(pipelineSubstitutions); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeGenericValue(componentTemplateSubstitutions); - out.writeGenericValue(indexTemplateSubstitutions); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - out.writeGenericValue(mappingAddition); - } + out.writeGenericValue(componentTemplateSubstitutions); + out.writeGenericValue(indexTemplateSubstitutions); + out.writeGenericValue(mappingAddition); if (out.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) { out.writeOptionalString(mappingMergeType); } diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java index e811fe8715b9d..c653499d2a6b1 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java @@ -47,7 +47,6 @@ import java.util.Map; import java.util.Objects; -import static org.elasticsearch.TransportVersions.V_8_11_X; import static org.elasticsearch.cluster.metadata.DataStream.AUTO_SHARDING_FIELD; public class GetDataStreamAction extends ActionType { @@ -124,16 +123,8 @@ public Request(StreamInput in) throws IOException { super(in); this.names = in.readOptionalStringArray(); this.indicesOptions = IndicesOptions.readIndicesOptions(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - this.includeDefaults = in.readBoolean(); - } else { - this.includeDefaults = false; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.verbose = in.readBoolean(); - } else { - this.verbose = false; - } + this.includeDefaults = in.readBoolean(); + this.verbose = in.readBoolean(); } @Override @@ -345,16 +336,10 @@ public void writeTo(StreamOutput out) throws IOException { dataStreamStatus.writeTo(out); out.writeOptionalString(indexTemplate); out.writeOptionalString(ilmPolicyName); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - out.writeOptionalWriteable(timeSeries); - } - if (out.getTransportVersion().onOrAfter(V_8_11_X)) { - out.writeMap(indexSettingsValues); - out.writeBoolean(templatePreferIlmValue); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalVLong(maximumTimestamp); - } + out.writeOptionalWriteable(timeSeries); + out.writeMap(indexSettingsValues); + out.writeBoolean(templatePreferIlmValue); + out.writeOptionalVLong(maximumTimestamp); if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) { out.writeOptionalString(indexMode); } @@ -665,17 +650,13 @@ public DataStreamGlobalRetention getFailuresGlobalRetention() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeCollection(dataStreams); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeOptionalWriteable(rolloverConfiguration); - } + out.writeOptionalWriteable(rolloverConfiguration); // A version 9.x cluster will never read this, so we only need to include the patch version here. if (out.getTransportVersion().supports(INTRODUCE_FAILURES_DEFAULT_RETENTION_PATCH)) { out.writeOptionalTimeValue(dataGlobalRetention == null ? null : dataGlobalRetention.defaultRetention()); out.writeOptionalTimeValue(dataGlobalRetention == null ? null : dataGlobalRetention.maxRetention()); out.writeOptionalTimeValue(failuresGlobalRetention == null ? null : failuresGlobalRetention.defaultRetention()); - } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalWriteable(dataGlobalRetention); - } + } else out.writeOptionalWriteable(dataGlobalRetention); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainDataStreamLifecycleAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainDataStreamLifecycleAction.java index 09246a466aef7..267072307fb4b 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainDataStreamLifecycleAction.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainDataStreamLifecycleAction.java @@ -10,7 +10,6 @@ package org.elasticsearch.action.datastreams.lifecycle; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -177,13 +176,8 @@ public Response(StreamInput in) throws IOException { var defaultFailuresRetention = in.readOptionalTimeValue(); dataGlobalRetention = DataStreamGlobalRetention.create(defaultRetention, maxRetention); failureGlobalRetention = DataStreamGlobalRetention.create(defaultFailuresRetention, maxRetention); - } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - dataGlobalRetention = in.readOptionalWriteable(DataStreamGlobalRetention::read); - failureGlobalRetention = dataGlobalRetention; - } else { - dataGlobalRetention = null; - failureGlobalRetention = null; - } + } else dataGlobalRetention = in.readOptionalWriteable(DataStreamGlobalRetention::read); + failureGlobalRetention = dataGlobalRetention; } public List getIndices() { @@ -217,9 +211,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalTimeValue(dataGlobalRetention == null ? null : dataGlobalRetention.defaultRetention()); out.writeOptionalTimeValue(dataGlobalRetention == null ? null : dataGlobalRetention.maxRetention()); out.writeOptionalTimeValue(failureGlobalRetention == null ? null : failureGlobalRetention.defaultRetention()); - } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalWriteable(getDataGlobalRetention()); - } + } else out.writeOptionalWriteable(getDataGlobalRetention()); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycle.java b/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycle.java index f9bd135968246..2d1db6293c71e 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycle.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycle.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.datastreams.lifecycle; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration; import org.elasticsearch.cluster.metadata.DataStreamGlobalRetention; import org.elasticsearch.cluster.metadata.DataStreamLifecycle; @@ -26,8 +25,6 @@ import java.util.Objects; import java.util.function.Supplier; -import static org.elasticsearch.TransportVersions.V_8_12_0; - /** * Encapsulates the information that describes an index from its data stream lifecycle perspective. */ @@ -82,22 +79,13 @@ public ExplainIndexDataStreamLifecycle( public ExplainIndexDataStreamLifecycle(StreamInput in) throws IOException { this.index = in.readString(); this.managedByLifecycle = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.isInternalDataStream = in.readBoolean(); - } else { - this.isInternalDataStream = false; - } + this.isInternalDataStream = in.readBoolean(); if (managedByLifecycle) { this.indexCreationDate = in.readOptionalLong(); this.rolloverDate = in.readOptionalLong(); this.generationDateMillis = in.readOptionalLong(); this.lifecycle = in.readOptionalWriteable(DataStreamLifecycle::new); - if (in.getTransportVersion().onOrAfter(V_8_12_0)) { - this.error = in.readOptionalWriteable(ErrorEntry::new); - } else { - String bwcErrorMessage = in.readOptionalString(); - this.error = new ErrorEntry(-1L, bwcErrorMessage, -1L, -1); - } + this.error = in.readOptionalWriteable(ErrorEntry::new); } else { this.indexCreationDate = null; this.rolloverDate = null; @@ -165,20 +153,13 @@ public XContentBuilder toXContent( public void writeTo(StreamOutput out) throws IOException { out.writeString(index); out.writeBoolean(managedByLifecycle); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(isInternalDataStream); - } + out.writeBoolean(isInternalDataStream); if (managedByLifecycle) { out.writeOptionalLong(indexCreationDate); out.writeOptionalLong(rolloverDate); out.writeOptionalLong(generationDateMillis); out.writeOptionalWriteable(lifecycle); - if (out.getTransportVersion().onOrAfter(V_8_12_0)) { - out.writeOptionalWriteable(error); - } else { - String errorMessage = error != null ? error.error() : null; - out.writeOptionalString(errorMessage); - } + out.writeOptionalWriteable(error); } } diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java index 6f510ad26f5ec..e5ffee350d52a 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java @@ -62,11 +62,7 @@ public FieldCapabilitiesIndexResponse( } else { this.indexMappingHash = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.indexMode = IndexMode.readFrom(in); - } else { - this.indexMode = IndexMode.STANDARD; - } + this.indexMode = IndexMode.readFrom(in); } @Override @@ -77,9 +73,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().onOrAfter(MAPPING_HASH_VERSION)) { out.writeOptionalString(indexMappingHash); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - IndexMode.writeTo(indexMode, out); - } + IndexMode.writeTo(indexMode, out); } private record CompressedGroup(String[] indices, IndexMode indexMode, String mappingHash, int[] fields) {} @@ -94,11 +88,7 @@ static List readList(StreamInput input) throws I responses.add(new FieldCapabilitiesIndexResponse(input)); } final int groups = input.readVInt(); - if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - collectCompressedResponses(input, groups, responses); - } else { - collectResponsesLegacyFormat(input, groups, responses); - } + collectCompressedResponses(input, groups, responses); return responses; } @@ -154,11 +144,7 @@ static void writeList(StreamOutput output, List } output.writeCollection(ungroupedResponses); - if (output.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - writeCompressedResponses(output, groupedResponsesMap); - } else { - writeResponsesLegacyFormat(output, groupedResponsesMap); - } + writeCompressedResponses(output, groupedResponsesMap); } private static void writeResponsesLegacyFormat( @@ -179,9 +165,7 @@ private static void writeCompressedResponses(StreamOutput output, Map { o.writeCollection(fieldCapabilitiesIndexResponses, (oo, r) -> oo.writeString(r.indexName)); var first = fieldCapabilitiesIndexResponses.get(0); - if (output.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - IndexMode.writeTo(first.indexMode, o); - } + IndexMode.writeTo(first.indexMode, o); o.writeString(first.indexMappingHash); o.writeVInt(first.responseMap.size()); for (IndexFieldCapabilities ifc : first.responseMap.values()) { diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java index c305d77972fbf..4a4a7f3dc7ac7 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.fieldcaps; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.LegacyActionRequest; @@ -46,22 +45,13 @@ class FieldCapabilitiesNodeRequest extends LegacyActionRequest implements Indice super(in); shardIds = in.readCollectionAsList(ShardId::new); fields = in.readStringArray(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - filters = in.readStringArray(); - allowedTypes = in.readStringArray(); - } else { - filters = Strings.EMPTY_ARRAY; - allowedTypes = Strings.EMPTY_ARRAY; - } + filters = in.readStringArray(); + allowedTypes = in.readStringArray(); originalIndices = OriginalIndices.readOriginalIndices(in); indexFilter = in.readOptionalNamedWriteable(QueryBuilder.class); nowInMillis = in.readLong(); runtimeFields = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - includeEmptyFields = in.readBoolean(); - } else { - includeEmptyFields = true; - } + includeEmptyFields = in.readBoolean(); } FieldCapabilitiesNodeRequest( @@ -137,17 +127,13 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeCollection(shardIds); out.writeStringArray(fields); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeStringArray(filters); - out.writeStringArray(allowedTypes); - } + out.writeStringArray(filters); + out.writeStringArray(allowedTypes); OriginalIndices.writeOriginalIndices(originalIndices, out); out.writeOptionalNamedWriteable(indexFilter); out.writeLong(nowInMillis); out.writeGenericMap(runtimeFields); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(includeEmptyFields); - } + out.writeBoolean(includeEmptyFields); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java index 4ed4e24110cd9..e1b7495833aa5 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java @@ -10,7 +10,6 @@ package org.elasticsearch.action.fieldcaps; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.LegacyActionRequest; @@ -81,13 +80,9 @@ public FieldCapabilitiesRequest(StreamInput in) throws IOException { indexFilter = in.readOptionalNamedWriteable(QueryBuilder.class); nowInMillis = in.readOptionalLong(); runtimeFields = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - filters = in.readStringArray(); - types = in.readStringArray(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - includeEmptyFields = in.readBoolean(); - } + filters = in.readStringArray(); + types = in.readStringArray(); + includeEmptyFields = in.readBoolean(); if (in.getTransportVersion().supports(FIELD_CAPS_ADD_CLUSTER_ALIAS)) { clusterAlias = in.readOptionalString(); } else { @@ -135,13 +130,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalNamedWriteable(indexFilter); out.writeOptionalLong(nowInMillis); out.writeGenericMap(runtimeFields); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeStringArray(filters); - out.writeStringArray(types); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(includeEmptyFields); - } + out.writeStringArray(filters); + out.writeStringArray(types); + out.writeBoolean(includeEmptyFields); if (out.getTransportVersion().supports(FIELD_CAPS_ADD_CLUSTER_ALIAS)) { out.writeOptionalString(clusterAlias); } diff --git a/server/src/main/java/org/elasticsearch/action/get/GetRequest.java b/server/src/main/java/org/elasticsearch/action/get/GetRequest.java index 9ff4e662270f9..5459782de9b5b 100644 --- a/server/src/main/java/org/elasticsearch/action/get/GetRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/GetRequest.java @@ -80,11 +80,7 @@ public GetRequest(StreamInput in) throws IOException { this.versionType = VersionType.fromValue(in.readByte()); this.version = in.readLong(); fetchSourceContext = in.readOptionalWriteable(FetchSourceContext::readFrom); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - forceSyntheticSource = in.readBoolean(); - } else { - forceSyntheticSource = false; - } + forceSyntheticSource = in.readBoolean(); } @Override @@ -103,13 +99,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeByte(versionType.getValue()); out.writeLong(version); out.writeOptionalWriteable(fetchSourceContext); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeBoolean(forceSyntheticSource); - } else { - if (forceSyntheticSource) { - throw new IllegalArgumentException("force_synthetic_source is not supported before 8.4.0"); - } - } + out.writeBoolean(forceSyntheticSource); } /** diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java index b73aaffbbf012..5e754f81055ab 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java @@ -260,11 +260,7 @@ public MultiGetRequest(StreamInput in) throws IOException { refresh = in.readBoolean(); realtime = in.readBoolean(); items = in.readCollectionAsList(Item::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - forceSyntheticSource = in.readBoolean(); - } else { - forceSyntheticSource = false; - } + forceSyntheticSource = in.readBoolean(); } @Override @@ -274,13 +270,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(refresh); out.writeBoolean(realtime); out.writeCollection(items); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeBoolean(forceSyntheticSource); - } else { - if (forceSyntheticSource) { - throw new IllegalArgumentException("force_synthetic_source is not supported before 8.4.0"); - } - } + out.writeBoolean(forceSyntheticSource); } public List getItems() { diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java index 77f7b5087c96e..b0a26836a23ac 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.get; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -84,11 +83,7 @@ public int hashCode() { preference = in.readOptionalString(); refresh = in.readBoolean(); realtime = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - forceSyntheticSource = in.readBoolean(); - } else { - forceSyntheticSource = false; - } + forceSyntheticSource = in.readBoolean(); } @Override @@ -104,13 +99,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(preference); out.writeBoolean(refresh); out.writeBoolean(realtime); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeBoolean(forceSyntheticSource); - } else { - if (forceSyntheticSource) { - throw new IllegalArgumentException("force_synthetic_source is not supported before 8.4.0"); - } - } + out.writeBoolean(forceSyntheticSource); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java index 643d4076f7133..c0bae5d3c40df 100644 --- a/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java +++ b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java @@ -183,9 +183,7 @@ public Response(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { out.writeZLong(segmentGeneration); multiGetShardResponse.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeVLong(primaryTerm); - } + out.writeVLong(primaryTerm); } public long segmentGeneration() { diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java index 28f774b01b132..41cd6eaf0952f 100644 --- a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java @@ -202,30 +202,14 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio && in.getTransportVersion().before(TransportVersions.V_8_13_0)) { in.readBoolean(); // obsolete, prior to tracking normalisedBytesParsed } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.listExecutedPipelines = in.readBoolean(); - if (listExecutedPipelines) { - List possiblyImmutableExecutedPipelines = in.readOptionalCollectionAsList(StreamInput::readString); - this.executedPipelines = possiblyImmutableExecutedPipelines == null - ? null - : new ArrayList<>(possiblyImmutableExecutedPipelines); - } - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - requireDataStream = in.readBoolean(); - } else { - requireDataStream = false; - } - - if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - in.readZLong(); // obsolete normalisedBytesParsed - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - in.readBoolean(); // obsolete originatesFromUpdateByScript - in.readBoolean(); // obsolete originatesFromUpdateByDoc - } + this.listExecutedPipelines = in.readBoolean(); + if (listExecutedPipelines) { + List possiblyImmutableExecutedPipelines = in.readOptionalCollectionAsList(StreamInput::readString); + this.executedPipelines = possiblyImmutableExecutedPipelines == null + ? null + : new ArrayList<>(possiblyImmutableExecutedPipelines); } + requireDataStream = in.readBoolean(); if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) { includeSourceOnError = in.readBoolean(); @@ -797,26 +781,12 @@ private void writeBody(StreamOutput out) throws IOException { && out.getTransportVersion().before(TransportVersions.V_8_13_0)) { out.writeBoolean(false); // obsolete, prior to tracking normalisedBytesParsed } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeBoolean(listExecutedPipelines); - if (listExecutedPipelines) { - out.writeOptionalCollection(executedPipelines, StreamOutput::writeString); - } - } - - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(requireDataStream); + out.writeBoolean(listExecutedPipelines); + if (listExecutedPipelines) { + out.writeOptionalCollection(executedPipelines, StreamOutput::writeString); } - if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeZLong(-1); // obsolete normalisedBytesParsed - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeBoolean(false); // obsolete originatesFromUpdateByScript - out.writeBoolean(false); // obsolete originatesFromUpdateByDoc - } - } + out.writeBoolean(requireDataStream); if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) { out.writeBoolean(includeSourceOnError); } diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java b/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java index 7c45de8905174..920cdc99e2f3e 100644 --- a/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java +++ b/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.index; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.DocWriteResponse; import org.elasticsearch.action.bulk.IndexDocFailureStoreStatus; import org.elasticsearch.common.Strings; @@ -41,30 +40,14 @@ public class IndexResponse extends DocWriteResponse { public IndexResponse(ShardId shardId, StreamInput in) throws IOException { super(shardId, in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - executedPipelines = in.readOptionalCollectionAsList(StreamInput::readString); - } else { - executedPipelines = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - failureStoreStatus = IndexDocFailureStoreStatus.read(in); - } else { - failureStoreStatus = IndexDocFailureStoreStatus.NOT_APPLICABLE_OR_UNKNOWN; - } + executedPipelines = in.readOptionalCollectionAsList(StreamInput::readString); + failureStoreStatus = IndexDocFailureStoreStatus.read(in); } public IndexResponse(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - executedPipelines = in.readOptionalCollectionAsList(StreamInput::readString); - } else { - executedPipelines = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - failureStoreStatus = IndexDocFailureStoreStatus.read(in); - } else { - failureStoreStatus = IndexDocFailureStoreStatus.NOT_APPLICABLE_OR_UNKNOWN; - } + executedPipelines = in.readOptionalCollectionAsList(StreamInput::readString); + failureStoreStatus = IndexDocFailureStoreStatus.read(in); } public IndexResponse(ShardId shardId, String id, long seqNo, long primaryTerm, long version, boolean created) { @@ -123,23 +106,15 @@ private IndexResponse( @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalCollection(executedPipelines, StreamOutput::writeString); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - failureStoreStatus.writeTo(out); - } + out.writeOptionalCollection(executedPipelines, StreamOutput::writeString); + failureStoreStatus.writeTo(out); } @Override public void writeThin(StreamOutput out) throws IOException { super.writeThin(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalCollection(executedPipelines, StreamOutput::writeString); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - failureStoreStatus.writeTo(out); - } + out.writeOptionalCollection(executedPipelines, StreamOutput::writeString); + failureStoreStatus.writeTo(out); } public XContentBuilder innerToXContent(XContentBuilder builder, Params params) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java index d8b2926dc18c2..692795c75dd4d 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java @@ -53,11 +53,7 @@ public SimulateIndexResponse(StreamInput in) throws IOException { this.source = in.readBytesReference(); this.sourceXContentType = XContentType.valueOf(in.readString()); setShardInfo(ShardInfo.EMPTY); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.exception = in.readException(); - } else { - this.exception = null; - } + this.exception = in.readException(); if (in.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_IGNORED_FIELDS)) { this.ignoredFields = in.readStringCollectionAsList(); } else { @@ -149,9 +145,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeBytesReference(source); out.writeString(sourceXContentType.name()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeException(exception); - } + out.writeException(exception); if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_IGNORED_FIELDS)) { out.writeStringCollection(ignoredFields); } diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java index 55852b8ad392e..a3de05b61255b 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.ingest; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -173,11 +172,7 @@ public SimulateProcessorResult(String type, String processorTag, String descript * Read from a stream. */ SimulateProcessorResult(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.processorTag = in.readOptionalString(); - } else { - this.processorTag = in.readString(); - } + this.processorTag = in.readOptionalString(); this.ingestDocument = in.readOptionalWriteable(WriteableIngestDocument::new); this.failure = in.readException(); this.description = in.readOptionalString(); @@ -192,11 +187,7 @@ public SimulateProcessorResult(String type, String processorTag, String descript @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalString(processorTag); - } else { - out.writeString(processorTag); - } + out.writeOptionalString(processorTag); out.writeOptionalWriteable(ingestDocument); out.writeException(failure); out.writeOptionalString(description); diff --git a/server/src/main/java/org/elasticsearch/action/search/OpenPointInTimeRequest.java b/server/src/main/java/org/elasticsearch/action/search/OpenPointInTimeRequest.java index aa707d72bc6f1..29183e24d8f14 100644 --- a/server/src/main/java/org/elasticsearch/action/search/OpenPointInTimeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/OpenPointInTimeRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.search; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.LegacyActionRequest; @@ -57,15 +56,9 @@ public OpenPointInTimeRequest(StreamInput in) throws IOException { this.keepAlive = in.readTimeValue(); this.routing = in.readOptionalString(); this.preference = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - this.maxConcurrentShardRequests = in.readVInt(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.indexFilter = in.readOptionalNamedWriteable(QueryBuilder.class); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.allowPartialSearchResults = in.readBoolean(); - } + this.maxConcurrentShardRequests = in.readVInt(); + this.indexFilter = in.readOptionalNamedWriteable(QueryBuilder.class); + this.allowPartialSearchResults = in.readBoolean(); } @Override @@ -76,17 +69,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeTimeValue(keepAlive); out.writeOptionalString(routing); out.writeOptionalString(preference); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeVInt(maxConcurrentShardRequests); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalWriteable(indexFilter); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeBoolean(allowPartialSearchResults); - } else if (allowPartialSearchResults) { - throw new IOException("[allow_partial_search_results] is not supported on nodes with version " + out.getTransportVersion()); - } + out.writeVInt(maxConcurrentShardRequests); + out.writeOptionalWriteable(indexFilter); + out.writeBoolean(allowPartialSearchResults); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java index d9cfabcd45b97..a3f5709cb1ba3 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -268,11 +268,7 @@ public SearchRequest(StreamInput in) throws IOException { } waitForCheckpoints = in.readMap(StreamInput::readLongArray); waitForCheckpointsTimeout = in.readTimeValue(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - forceSyntheticSource = in.readBoolean(); - } else { - forceSyntheticSource = false; - } + forceSyntheticSource = in.readBoolean(); } @Override @@ -312,13 +308,7 @@ public void writeTo(StreamOutput out, boolean skipIndices) throws IOException { } out.writeMap(waitForCheckpoints, StreamOutput::writeLongArray); out.writeTimeValue(waitForCheckpointsTimeout); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeBoolean(forceSyntheticSource); - } else { - if (forceSyntheticSource) { - throw new IllegalArgumentException("force_synthetic_source is not supported before 8.4.0"); - } - } + out.writeBoolean(forceSyntheticSource); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java index 3b67d0b5ac160..cfe6957aaab32 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java @@ -917,11 +917,7 @@ public Cluster(StreamInput in) throws IOException { } this.timedOut = in.readBoolean(); this.failures = Collections.unmodifiableList(in.readCollectionAsList(ShardSearchFailure::readShardSearchFailure)); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - this.skipUnavailable = in.readBoolean(); - } else { - this.skipUnavailable = SKIP_UNAVAILABLE_DEFAULT; - } + this.skipUnavailable = in.readBoolean(); } /** @@ -1022,9 +1018,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalLong(took == null ? null : took.millis()); out.writeBoolean(timedOut); out.writeCollection(failures); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeBoolean(skipUnavailable); - } + out.writeBoolean(skipUnavailable); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java b/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java index 51a91280fc837..9dd3c31b8027c 100644 --- a/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java +++ b/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java @@ -910,12 +910,6 @@ public void writeIndicesOptions(StreamOutput out) throws IOException { } if (out.getTransportVersion() .between(TransportVersions.V_8_16_0, TransportVersions.REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX)) { - if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) { - out.writeVInt(1); // Enum set sized 1 - out.writeVInt(0); // ordinal 0 (::data selector) - } else { - out.writeByte((byte) 0); // ordinal 0 (::data selector) - } } } @@ -954,14 +948,6 @@ public static IndicesOptions readIndicesOptions(StreamInput in) throws IOExcepti if (in.getTransportVersion() .between(TransportVersions.V_8_16_0, TransportVersions.REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX)) { // Reading from an older node, which will be sending either an enum set or a single byte that needs to be read out and ignored. - if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) { - int size = in.readVInt(); - for (int i = 0; i < size; i++) { - in.readVInt(); - } - } else { - in.readByte(); - } } return new IndicesOptions( options.contains(Option.ALLOW_UNAVAILABLE_CONCRETE_TARGETS) diff --git a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java index 2f0bf8870830b..a72eec388514b 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.support.master; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -79,11 +78,7 @@ protected MasterNodeRequest(TimeValue masterNodeTimeout) { protected MasterNodeRequest(StreamInput in) throws IOException { super(in); masterNodeTimeout = in.readTimeValue(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - masterTerm = in.readVLong(); - } else { - masterTerm = 0L; - } + masterTerm = in.readVLong(); } @Override @@ -93,9 +88,7 @@ public void writeTo(StreamOutput out) throws IOException { assert masterTerm <= newMasterTerm : masterTerm + " vs " + newMasterTerm; super.writeTo(out); out.writeTimeValue(masterNodeTimeout); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeVLong(newMasterTerm); - } // else no protection against routing loops in older versions + out.writeVLong(newMasterTerm); } private long getNewMasterTerm(StreamOutput out) { diff --git a/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java b/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java index f5b10376b5b01..3392bfc0dfce9 100644 --- a/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java +++ b/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java @@ -363,11 +363,7 @@ public void writeTo(StreamOutput out) throws IOException { while (iterator.hasNext()) { iterator.next().writeTo(out); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeStringCollection(nodesIdsForRemoval); - } else { - assert nodesIdsForRemoval.isEmpty() : nodesIdsForRemoval; - } + out.writeStringCollection(nodesIdsForRemoval); } @Override @@ -1895,11 +1891,7 @@ public void writeTo(StreamOutput out) throws IOException { } else { new SimpleDiffable.CompleteDiff<>(after).writeTo(out); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeStringCollection(nodeIdsForRemoval); - } else { - assert nodeIdsForRemoval.isEmpty() : nodeIdsForRemoval; - } + out.writeStringCollection(nodeIdsForRemoval); } } diff --git a/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java index f24d5be356ee5..376e0aad3afa7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java +++ b/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java @@ -14,7 +14,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ResultDeduplicator; @@ -743,13 +742,11 @@ public ClusterState execute(BatchExecutionContext batchE */ IndexLongFieldRange newEventIngestedMillisRange = IndexLongFieldRange.UNKNOWN; TransportVersion minTransportVersion = batchExecutionContext.initialState().getMinTransportVersion(); - if (minTransportVersion.onOrAfter(TransportVersions.V_8_15_0)) { - newEventIngestedMillisRange = currentEventIngestedMillisRange.extendWithShardRange( - startedShardEntry.shardId.id(), - indexMetadata.getNumberOfShards(), - startedShardEntry.eventIngestedRange - ); - } + newEventIngestedMillisRange = currentEventIngestedMillisRange.extendWithShardRange( + startedShardEntry.shardId.id(), + indexMetadata.getNumberOfShards(), + startedShardEntry.eventIngestedRange + ); if (newTimestampMillisRange != currentTimestampMillisRange || newEventIngestedMillisRange != currentEventIngestedMillisRange) { @@ -853,11 +850,7 @@ public static class StartedShardEntry extends AbstractTransportRequest { primaryTerm = in.readVLong(); this.message = in.readString(); this.timestampRange = ShardLongFieldRange.readFrom(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.eventIngestedRange = ShardLongFieldRange.readFrom(in); - } else { - this.eventIngestedRange = ShardLongFieldRange.UNKNOWN; - } + this.eventIngestedRange = ShardLongFieldRange.readFrom(in); } public StartedShardEntry( @@ -884,9 +877,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(primaryTerm); out.writeString(message); timestampRange.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - eventIngestedRange.writeTo(out); - } + eventIngestedRange.writeTo(out); } @Override diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelper.java b/server/src/main/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelper.java index b9e2db8a14897..9e2d329a489de 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelper.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelper.java @@ -430,9 +430,7 @@ public void writeTo(StreamOutput out) throws IOException { lastCommittedConfiguration.writeTo(out); out.writeCollection(resolvedAddresses); out.writeCollection(foundPeers); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeCollection(mastersOfPeers); - } + out.writeCollection(mastersOfPeers); out.writeLong(currentTerm); out.writeBoolean(hasDiscoveredQuorum); statusInfo.writeTo(out); diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/JoinStatus.java b/server/src/main/java/org/elasticsearch/cluster/coordination/JoinStatus.java index 89083848d488d..854594a3ac8f3 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/JoinStatus.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/JoinStatus.java @@ -36,11 +36,6 @@ public void writeTo(StreamOutput out) throws IOException { remoteNode.writeTo(out); out.writeLong(term); out.writeString(message); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeTimeValue(age); - } else { - out.writeLong(age.duration()); - out.writeString(age.timeUnit().name()); - } + out.writeTimeValue(age); } } diff --git a/server/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java index 9cf567c219660..1a4d07dcef82b 100644 --- a/server/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java +++ b/server/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java @@ -9,7 +9,6 @@ package org.elasticsearch.cluster.health; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ClusterStatsLevel; import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.routing.IndexRoutingTable; @@ -111,11 +110,7 @@ public ClusterIndexHealth(final StreamInput in) throws IOException { unassignedShards = in.readVInt(); status = ClusterHealthStatus.readFrom(in); shards = in.readMapValues(ClusterShardHealth::new, ClusterShardHealth::getShardId); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - unassignedPrimaryShards = in.readVInt(); - } else { - unassignedPrimaryShards = 0; - } + unassignedPrimaryShards = in.readVInt(); } /** @@ -203,9 +198,7 @@ public void writeTo(final StreamOutput out) throws IOException { out.writeVInt(unassignedShards); out.writeByte(status.value()); out.writeMapValues(shards); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeVInt(unassignedPrimaryShards); - } + out.writeVInt(unassignedPrimaryShards); } @Override diff --git a/server/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java index f512acb6e04d0..47729190594d2 100644 --- a/server/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java +++ b/server/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java @@ -9,7 +9,6 @@ package org.elasticsearch.cluster.health; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; import org.elasticsearch.cluster.routing.RecoverySource; import org.elasticsearch.cluster.routing.ShardRouting; @@ -96,11 +95,7 @@ public ClusterShardHealth(final StreamInput in) throws IOException { initializingShards = in.readVInt(); unassignedShards = in.readVInt(); primaryActive = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - unassignedPrimaryShards = in.readVInt(); - } else { - unassignedPrimaryShards = 0; - } + unassignedPrimaryShards = in.readVInt(); } /** @@ -167,9 +162,7 @@ public void writeTo(final StreamOutput out) throws IOException { out.writeVInt(initializingShards); out.writeVInt(unassignedShards); out.writeBoolean(primaryActive); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeVInt(unassignedPrimaryShards); - } + out.writeVInt(unassignedPrimaryShards); } /** diff --git a/server/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java index e335232074df1..d9c125367613f 100644 --- a/server/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java +++ b/server/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java @@ -8,7 +8,6 @@ */ package org.elasticsearch.cluster.health; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlocks; import org.elasticsearch.cluster.metadata.IndexMetadata; @@ -138,11 +137,7 @@ public ClusterStateHealth(final StreamInput in) throws IOException { status = ClusterHealthStatus.readFrom(in); indices = in.readMapValues(ClusterIndexHealth::new, ClusterIndexHealth::getIndex); activeShardsPercent = in.readDouble(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - unassignedPrimaryShards = in.readVInt(); - } else { - unassignedPrimaryShards = 0; - } + unassignedPrimaryShards = in.readVInt(); } /** @@ -230,9 +225,7 @@ public void writeTo(final StreamOutput out) throws IOException { out.writeByte(status.value()); out.writeMapValues(indices); out.writeDouble(activeShardsPercent); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeVInt(unassignedPrimaryShards); - } + out.writeVInt(unassignedPrimaryShards); } @Override diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java index 5e128f8ec58b2..579670c4c448a 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java @@ -10,7 +10,6 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration; import org.elasticsearch.cluster.Diff; import org.elasticsearch.cluster.SimpleDiffable; @@ -111,11 +110,7 @@ public ComponentTemplate(StreamInput in) throws IOException { } else { this.metadata = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.deprecated = in.readOptionalBoolean(); - } else { - deprecated = null; - } + this.deprecated = in.readOptionalBoolean(); if (in.getTransportVersion().supports(COMPONENT_TEMPLATE_TRACKING_INFO)) { this.createdDateMillis = in.readOptionalLong(); this.modifiedDateMillis = in.readOptionalLong(); @@ -165,9 +160,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(true); out.writeGenericMap(this.metadata); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalBoolean(this.deprecated); - } + out.writeOptionalBoolean(this.deprecated); if (out.getTransportVersion().supports(COMPONENT_TEMPLATE_TRACKING_INFO)) { out.writeOptionalLong(this.createdDateMillis); out.writeOptionalLong(this.modifiedDateMillis); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java index ffc618227e018..8cf2753de5bd8 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java @@ -174,16 +174,8 @@ public ComposableIndexTemplate(StreamInput in) throws IOException { this.metadata = in.readGenericMap(); this.dataStreamTemplate = in.readOptionalWriteable(DataStreamTemplate::new); this.allowAutoCreate = in.readOptionalBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.ignoreMissingComponentTemplates = in.readOptionalStringCollectionAsList(); - } else { - this.ignoreMissingComponentTemplates = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.deprecated = in.readOptionalBoolean(); - } else { - this.deprecated = null; - } + this.ignoreMissingComponentTemplates = in.readOptionalStringCollectionAsList(); + this.deprecated = in.readOptionalBoolean(); if (in.getTransportVersion().supports(INDEX_TEMPLATE_TRACKING_INFO)) { this.createdDateMillis = in.readOptionalLong(); this.modifiedDateMillis = in.readOptionalLong(); @@ -295,12 +287,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(this.metadata); out.writeOptionalWriteable(dataStreamTemplate); out.writeOptionalBoolean(allowAutoCreate); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalStringCollection(ignoreMissingComponentTemplates); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalBoolean(deprecated); - } + out.writeOptionalStringCollection(ignoreMissingComponentTemplates); + out.writeOptionalBoolean(deprecated); if (out.getTransportVersion().supports(INDEX_TEMPLATE_TRACKING_INFO)) { out.writeOptionalLong(createdDateMillis); out.writeOptionalLong(modifiedDateMillis); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java index 9e7fcb1e60f16..dd07a8a5d4b26 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java @@ -315,25 +315,12 @@ public static DataStream read(StreamInput in) throws IOException { if (in.getTransportVersion().onOrAfter(DataStream.ADDED_AUTO_SHARDING_EVENT_VERSION)) { backingIndicesBuilder.setAutoShardingEvent(in.readOptionalWriteable(DataStreamAutoShardingEvent::new)); } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - // Read the rollover on write flag from the stream, but force it on if the failure indices are empty and we're not replicating - boolean failureStoreRolloverOnWrite = in.readBoolean() || (replicated == false && failureIndices.isEmpty()); - failureIndicesBuilder.setRolloverOnWrite(failureStoreRolloverOnWrite) - .setAutoShardingEvent(in.readOptionalWriteable(DataStreamAutoShardingEvent::new)); - } else { - // If we are reading from an older version that does not have these fields, just default - // to a reasonable value for rollover on write for the failure store - boolean failureStoreRolloverOnWrite = replicated == false && failureIndices.isEmpty(); - failureIndicesBuilder.setRolloverOnWrite(failureStoreRolloverOnWrite); - } + // Read the rollover on write flag from the stream, but force it on if the failure indices are empty and we're not replicating + boolean failureStoreRolloverOnWrite = in.readBoolean() || (replicated == false && failureIndices.isEmpty()); + failureIndicesBuilder.setRolloverOnWrite(failureStoreRolloverOnWrite) + .setAutoShardingEvent(in.readOptionalWriteable(DataStreamAutoShardingEvent::new)); DataStreamOptions dataStreamOptions; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - dataStreamOptions = in.readOptionalWriteable(DataStreamOptions::read); - } else { - // We cannot distinguish if failure store was explicitly disabled or not. Given that failure store - // is still behind a feature flag in previous version we use the default value instead of explicitly disabling it. - dataStreamOptions = failureStoreEnabled ? DataStreamOptions.FAILURE_STORE_ENABLED : null; - } + dataStreamOptions = in.readOptionalWriteable(DataStreamOptions::read); final Settings settings; if (in.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) { settings = Settings.readSettingsFromStream(in); @@ -1450,12 +1437,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(replicated); out.writeBoolean(system); out.writeBoolean(allowCustomRouting); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeOptionalEnum(indexMode); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeOptionalWriteable(lifecycle); - } + out.writeOptionalEnum(indexMode); + out.writeOptionalWriteable(lifecycle); if (out.getTransportVersion() .between(DataStream.ADDED_FAILURE_STORE_TRANSPORT_VERSION, DataStream.ADD_DATA_STREAM_OPTIONS_VERSION)) { // TODO: clear out the failure_store field, which is redundant https://github.com/elastic/elasticsearch/issues/127071 @@ -1464,16 +1447,12 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().onOrAfter(DataStream.ADDED_FAILURE_STORE_TRANSPORT_VERSION)) { out.writeCollection(failureIndices.indices); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(backingIndices.rolloverOnWrite); - } + out.writeBoolean(backingIndices.rolloverOnWrite); if (out.getTransportVersion().onOrAfter(DataStream.ADDED_AUTO_SHARDING_EVENT_VERSION)) { out.writeOptionalWriteable(backingIndices.autoShardingEvent); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(failureIndices.rolloverOnWrite); - out.writeOptionalWriteable(failureIndices.autoShardingEvent); - } + out.writeBoolean(failureIndices.rolloverOnWrite); + out.writeOptionalWriteable(failureIndices.autoShardingEvent); if (out.getTransportVersion().onOrAfter(DataStream.ADD_DATA_STREAM_OPTIONS_VERSION)) { out.writeOptionalWriteable(dataStreamOptions.isEmpty() ? null : dataStreamOptions); } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAction.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAction.java index ea8d8a478a83b..c87c12b9cf938 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAction.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAction.java @@ -156,9 +156,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeByte(type.value()); out.writeString(dataStream); out.writeString(index); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeBoolean(failureStore); - } + out.writeBoolean(failureStore); } public static DataStreamAction fromXContent(XContentParser parser) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java index f38ca54622a68..4ad16519085a4 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java @@ -8,7 +8,6 @@ */ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.Diff; import org.elasticsearch.cluster.SimpleDiffable; import org.elasticsearch.common.ParsingException; @@ -168,21 +167,7 @@ public DataStreamAlias(StreamInput in) throws IOException { this.name = in.readString(); this.dataStreams = in.readStringCollectionAsList(); this.writeDataStream = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.dataStreamToFilterMap = in.readMap(CompressedXContent::readCompressedString); - } else { - this.dataStreamToFilterMap = new HashMap<>(); - CompressedXContent filter = in.readBoolean() ? CompressedXContent.readCompressedString(in) : null; - if (filter != null) { - /* - * Here we're reading in a DataStreamAlias from before 8.7.0, which did not correctly associate filters with DataStreams. - * So we associated the same filter with all DataStreams in the alias to replicate the old behavior. - */ - for (String dataStream : dataStreams) { - dataStreamToFilterMap.put(dataStream, filter); - } - } - } + this.dataStreamToFilterMap = in.readMap(CompressedXContent::readCompressedString); } /** @@ -406,20 +391,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(name); out.writeStringCollection(dataStreams); out.writeOptionalString(writeDataStream); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeMap(dataStreamToFilterMap, StreamOutput::writeWriteable); - } else { - if (dataStreamToFilterMap.isEmpty()) { - out.writeBoolean(false); - } else { - /* - * TransportVersions before 8.7 incorrectly only allowed a single filter for all datastreams, - * and randomly dropped all others. We replicate that buggy behavior here if we have to write - * to an older node because there is no way to send multipole filters to an older node. - */ - dataStreamToFilterMap.values().iterator().next().writeTo(out); - } - } + out.writeMap(dataStreamToFilterMap, StreamOutput::writeWriteable); } @Override diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java index 7e60ddf0818d1..6f924e1dc2ccb 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java @@ -330,13 +330,10 @@ public int hashCode() { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { - out.writeOptionalTimeValue(dataRetention); - } else { - writeLegacyOptionalValue(dataRetention, out, StreamOutput::writeTimeValue); - } - + if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { + out.writeOptionalTimeValue(dataRetention); + } else { + writeLegacyOptionalValue(dataRetention, out, StreamOutput::writeTimeValue); } if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) { if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { @@ -352,14 +349,10 @@ public void writeTo(StreamOutput out) throws IOException { } public DataStreamLifecycle(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { - dataRetention = in.readOptionalTimeValue(); - } else { - dataRetention = readLegacyOptionalValue(in, StreamInput::readTimeValue); - } + if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { + dataRetention = in.readOptionalTimeValue(); } else { - dataRetention = null; + dataRetention = readLegacyOptionalValue(in, StreamInput::readTimeValue); } if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) { if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { @@ -718,12 +711,10 @@ public record Template( @Override public void writeTo(StreamOutput out) throws IOException { // The order of the fields is like this for bwc reasons - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { - ResettableValue.write(out, dataRetention, StreamOutput::writeTimeValue); - } else { - writeLegacyValue(out, dataRetention, StreamOutput::writeTimeValue); - } + if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { + ResettableValue.write(out, dataRetention, StreamOutput::writeTimeValue); + } else { + writeLegacyValue(out, dataRetention, StreamOutput::writeTimeValue); } if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) { if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { @@ -778,12 +769,10 @@ public static Template read(StreamInput in) throws IOException { ResettableValue> downsampling = ResettableValue.undefined(); // The order of the fields is like this for bwc reasons - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { - dataRetention = ResettableValue.read(in, StreamInput::readTimeValue); - } else { - dataRetention = readLegacyValues(in, StreamInput::readTimeValue); - } + if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { + dataRetention = ResettableValue.read(in, StreamInput::readTimeValue); + } else { + dataRetention = readLegacyValues(in, StreamInput::readTimeValue); } if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) { if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java index 3c65194c67309..73c933cf177fa 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java @@ -1705,15 +1705,11 @@ private static class IndexMetadataDiff implements Diff { } primaryTerms = in.readVLongArray(); mappings = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), MAPPING_DIFF_VALUE_READER); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - inferenceFields = DiffableUtils.readImmutableOpenMapDiff( - in, - DiffableUtils.getStringKeySerializer(), - INFERENCE_FIELDS_METADATA_DIFF_VALUE_READER - ); - } else { - inferenceFields = DiffableUtils.emptyDiff(); - } + inferenceFields = DiffableUtils.readImmutableOpenMapDiff( + in, + DiffableUtils.getStringKeySerializer(), + INFERENCE_FIELDS_METADATA_DIFF_VALUE_READER + ); aliases = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), ALIAS_METADATA_DIFF_VALUE_READER); customData = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), CUSTOM_DIFF_VALUE_READER); inSyncAllocationIds = DiffableUtils.readJdkMapDiff( @@ -1726,11 +1722,7 @@ private static class IndexMetadataDiff implements Diff { DiffableUtils.getStringKeySerializer(), ROLLOVER_INFO_DIFF_VALUE_READER ); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - mappingsUpdatedVersion = IndexVersion.readVersion(in); - } else { - mappingsUpdatedVersion = IndexVersions.ZERO; - } + mappingsUpdatedVersion = IndexVersion.readVersion(in); isSystem = in.readBoolean(); timestampRange = IndexLongFieldRange.readFrom(in); if (in.getTransportVersion().onOrAfter(STATS_AND_FORECAST_ADDED)) { @@ -1742,11 +1734,7 @@ private static class IndexMetadataDiff implements Diff { indexWriteLoadForecast = null; shardSizeInBytesForecast = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - eventIngestedRange = IndexLongFieldRange.readFrom(in); - } else { - eventIngestedRange = IndexLongFieldRange.UNKNOWN; - } + eventIngestedRange = IndexLongFieldRange.readFrom(in); if (in.getTransportVersion().supports(INDEX_RESHARDING_METADATA)) { reshardingMetadata = in.readOptionalWriteable(IndexReshardingMetadata::new); } else { @@ -1772,16 +1760,12 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeVLongArray(primaryTerms); mappings.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - inferenceFields.writeTo(out); - } + inferenceFields.writeTo(out); aliases.writeTo(out); customData.writeTo(out); inSyncAllocationIds.writeTo(out); rolloverInfos.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - IndexVersion.writeVersion(mappingsUpdatedVersion, out); - } + IndexVersion.writeVersion(mappingsUpdatedVersion, out); out.writeBoolean(isSystem); timestampRange.writeTo(out); if (out.getTransportVersion().onOrAfter(STATS_AND_FORECAST_ADDED)) { @@ -1860,10 +1844,8 @@ public static IndexMetadata readFrom(StreamInput in, @Nullable Function builder.putInferenceField(f)); - } + var fields = in.readCollectionAsImmutableList(InferenceFieldMetadata::new); + fields.stream().forEach(f -> builder.putInferenceField(f)); int aliasesSize = in.readVInt(); for (int i = 0; i < aliasesSize; i++) { AliasMetadata aliasMd = new AliasMetadata(in); @@ -1885,9 +1867,7 @@ public static IndexMetadata readFrom(StreamInput in, @Nullable Function DiffableUtils.StringSetValueSerializer.getInstance().write(v, o) ); out.writeCollection(rolloverInfos.values()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - IndexVersion.writeVersion(mappingsUpdatedVersion, out); - } + IndexVersion.writeVersion(mappingsUpdatedVersion, out); out.writeBoolean(isSystem); timestampRange.writeTo(out); if (out.getTransportVersion().onOrAfter(STATS_AND_FORECAST_ADDED)) { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/InferenceFieldMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/InferenceFieldMetadata.java index 7e0aa32c6a4f5..bded480c7fc91 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/InferenceFieldMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/InferenceFieldMetadata.java @@ -10,7 +10,6 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.Diff; import org.elasticsearch.cluster.SimpleDiffable; import org.elasticsearch.common.Strings; @@ -69,11 +68,7 @@ public InferenceFieldMetadata( public InferenceFieldMetadata(StreamInput input) throws IOException { this.name = input.readString(); this.inferenceId = input.readString(); - if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.searchInferenceId = input.readString(); - } else { - this.searchInferenceId = this.inferenceId; - } + this.searchInferenceId = input.readString(); this.sourceFields = input.readStringArray(); if (input.getTransportVersion().supports(SEMANTIC_TEXT_CHUNKING_CONFIG)) { this.chunkingSettings = input.readGenericMap(); @@ -86,9 +81,7 @@ public InferenceFieldMetadata(StreamInput input) throws IOException { public void writeTo(StreamOutput out) throws IOException { out.writeString(name); out.writeString(inferenceId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeString(searchInferenceId); - } + out.writeString(searchInferenceId); out.writeStringArray(sourceFields); if (out.getTransportVersion().supports(SEMANTIC_TEXT_CHUNKING_CONFIG)) { out.writeGenericMap(chunkingSettings); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ShutdownShardMigrationStatus.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ShutdownShardMigrationStatus.java index 3a95be87dcdb3..a0c8dc8dbe7ed 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ShutdownShardMigrationStatus.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ShutdownShardMigrationStatus.java @@ -9,7 +9,6 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.routing.allocation.ShardAllocationDecision; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.Iterators; @@ -128,17 +127,10 @@ private ShutdownShardMigrationStatus( public ShutdownShardMigrationStatus(StreamInput in) throws IOException { this.status = in.readEnum(SingleNodeShutdownMetadata.Status.class); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.startedShards = in.readZLong(); - this.relocatingShards = in.readZLong(); - this.initializingShards = in.readZLong(); - this.shardsRemaining = in.readZLong(); - } else { - this.startedShards = -1; - this.relocatingShards = -1; - this.initializingShards = -1; - this.shardsRemaining = in.readLong(); - } + this.startedShards = in.readZLong(); + this.relocatingShards = in.readZLong(); + this.initializingShards = in.readZLong(); + this.shardsRemaining = in.readZLong(); this.explanation = in.readOptionalString(); this.allocationDecision = in.readOptionalWriteable(ShardAllocationDecision::new); } @@ -188,14 +180,10 @@ private XContentBuilder buildHeader(XContentBuilder builder) throws IOException @Override public void writeTo(StreamOutput out) throws IOException { out.writeEnum(status); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeZLong(startedShards); - out.writeZLong(relocatingShards); - out.writeZLong(initializingShards); - out.writeZLong(shardsRemaining); - } else { - out.writeLong(shardsRemaining); - } + out.writeZLong(startedShards); + out.writeZLong(relocatingShards); + out.writeZLong(initializingShards); + out.writeZLong(shardsRemaining); out.writeOptionalString(explanation); out.writeOptionalWriteable(allocationDecision); } diff --git a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java index f733ab223fdd1..84d57285205ec 100644 --- a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java +++ b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java @@ -9,7 +9,6 @@ package org.elasticsearch.cluster.node; -import org.elasticsearch.TransportVersions; import org.elasticsearch.Version; import org.elasticsearch.cluster.Diff; import org.elasticsearch.cluster.SimpleDiffable; @@ -680,9 +679,7 @@ public String shortSummary() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(masterNodeId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeVLong(nodeLeftGeneration); - } // else nodeLeftGeneration is zero, or we're sending this to a remote cluster which does not care about the nodeLeftGeneration + out.writeVLong(nodeLeftGeneration); out.writeCollection(nodes.values()); } @@ -695,9 +692,7 @@ public static DiscoveryNodes readFrom(StreamInput in, DiscoveryNode localNode) t builder.localNodeId(localNode.getId()); } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - builder.nodeLeftGeneration(in.readVLong()); - } // else nodeLeftGeneration is zero, or we're receiving this from a remote cluster so the nodeLeftGeneration does not matter to us + builder.nodeLeftGeneration(in.readVLong()); int size = in.readVInt(); for (int i = 0; i < size; i++) { diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java index ade8008d6a1a3..220d592de8a0a 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java @@ -10,7 +10,6 @@ package org.elasticsearch.cluster.routing; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.Diff; import org.elasticsearch.cluster.Diffable; import org.elasticsearch.cluster.DiffableUtils; @@ -328,9 +327,6 @@ public static Diff readDiffFrom(StreamInput in) throws IOException public static RoutingTable readFrom(StreamInput in) throws IOException { Builder builder = new Builder(); - if (in.getTransportVersion().before(TransportVersions.V_8_16_0)) { - in.readLong(); // previously 'version', unused in all applicable versions so any number will do - } int size = in.readVInt(); for (int i = 0; i < size; i++) { IndexRoutingTable index = IndexRoutingTable.readFrom(in); @@ -342,9 +338,6 @@ public static RoutingTable readFrom(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_16_0)) { - out.writeLong(0); // previously 'version', unused in all applicable versions so any number will do - } out.writeCollection(indicesRouting.values()); } @@ -360,9 +353,6 @@ private static class RoutingTableDiff implements Diff { new DiffableUtils.DiffableValueReader<>(IndexRoutingTable::readFrom, IndexRoutingTable::readDiffFrom); RoutingTableDiff(StreamInput in) throws IOException { - if (in.getTransportVersion().before(TransportVersions.V_8_16_0)) { - in.readLong(); // previously 'version', unused in all applicable versions so any number will do - } indicesRouting = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), DIFF_VALUE_READER); } @@ -380,9 +370,6 @@ public RoutingTable apply(RoutingTable part) { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_16_0)) { - out.writeLong(0); // previously 'version', unused in all applicable versions so any number will do - } indicesRouting.writeTo(out); } } diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java index 2ce349e2d3b61..3655c9f7affbd 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java @@ -15,7 +15,6 @@ import org.elasticsearch.cluster.routing.RecoverySource.ExistingStoreRecoverySource; import org.elasticsearch.cluster.routing.RecoverySource.PeerRecoverySource; import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator; -import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -356,11 +355,7 @@ public ShardRouting(ShardId shardId, StreamInput in) throws IOException { } else { expectedShardSize = UNAVAILABLE_EXPECTED_SHARD_SIZE; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - role = Role.readFrom(in); - } else { - role = Role.DEFAULT; - } + role = Role.readFrom(in); targetRelocatingShard = initializeTargetRelocatingShard(); } @@ -393,13 +388,7 @@ public void writeToThin(StreamOutput out) throws IOException { out.writeLong(expectedShardSize); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - role.writeTo(out); - } else if (role != Role.DEFAULT) { - throw new IllegalStateException( - Strings.format("cannot send role [%s] to node with version [%s]", role, out.getTransportVersion().toReleaseVersion()) - ); - } + role.writeTo(out); } @Override diff --git a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java index 97aab50aa11e4..a34286bedd868 100644 --- a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java +++ b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java @@ -9,7 +9,6 @@ package org.elasticsearch.common.document; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -47,11 +46,7 @@ public DocumentField(StreamInput in) throws IOException { name = in.readString(); values = in.readCollectionAsList(StreamInput::readGenericValue); ignoredValues = in.readCollectionAsList(StreamInput::readGenericValue); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - lookupFields = in.readCollectionAsList(LookupField::new); - } else { - lookupFields = List.of(); - } + lookupFields = in.readCollectionAsList(LookupField::new); } public DocumentField(String name, List values) { @@ -122,14 +117,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(name); out.writeCollection(values, StreamOutput::writeGenericValue); out.writeCollection(ignoredValues, StreamOutput::writeGenericValue); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeCollection(lookupFields); - } else { - if (lookupFields.isEmpty() == false) { - assert false : "Lookup fields require all nodes be on 8.2 or later"; - throw new IllegalStateException("Lookup fields require all nodes be on 8.2 or later"); - } - } + out.writeCollection(lookupFields); } public List getLookupFields() { diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java index b45f3ccbdc5f3..701588c96ed3c 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java @@ -972,11 +972,7 @@ public final Instant readOptionalInstant() throws IOException { private ZonedDateTime readZonedDateTime() throws IOException { final String timeZoneId = readString(); final Instant instant; - if (getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - instant = Instant.ofEpochSecond(readZLong(), readInt()); - } else { - instant = Instant.ofEpochMilli(readLong()); - } + instant = Instant.ofEpochSecond(readZLong(), readInt()); return ZonedDateTime.ofInstant(instant, ZoneId.of(timeZoneId)); } diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java index d4c3d48c1f5b5..5a034dd99109a 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java @@ -14,7 +14,6 @@ import org.apache.lucene.util.BytesRefBuilder; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -613,11 +612,7 @@ public void writeMapWithConsistentOrder(@Nullable Map Iterator> iterator = map.entrySet().stream().sorted(Map.Entry.comparingByKey()).iterator(); while (iterator.hasNext()) { Map.Entry next = iterator.next(); - if (this.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.writeGenericValue(next.getKey()); - } else { - this.writeString(next.getKey()); - } + this.writeGenericValue(next.getKey()); this.writeGenericValue(next.getValue()); } } @@ -751,14 +746,8 @@ public final void writeOptionalInstant(@Nullable Instant instant) throws IOExcep } else { o.writeByte((byte) 10); } - if (o.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - final Map map = (Map) v; - o.writeMap(map, StreamOutput::writeGenericValue, StreamOutput::writeGenericValue); - } else { - @SuppressWarnings("unchecked") - final Map map = (Map) v; - o.writeMap(map, StreamOutput::writeGenericValue); - } + final Map map = (Map) v; + o.writeMap(map, StreamOutput::writeGenericValue, StreamOutput::writeGenericValue); }), entry(Byte.class, (o, v) -> { o.writeByte((byte) 11); @@ -809,12 +798,8 @@ public final void writeOptionalInstant(@Nullable Instant instant) throws IOExcep final ZonedDateTime zonedDateTime = (ZonedDateTime) v; o.writeString(zonedDateTime.getZone().getId()); Instant instant = zonedDateTime.toInstant(); - if (o.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - o.writeZLong(instant.getEpochSecond()); - o.writeInt(instant.getNano()); - } else { - o.writeLong(instant.toEpochMilli()); - } + o.writeZLong(instant.getEpochSecond()); + o.writeInt(instant.getNano()); }), entry(Set.class, (o, v) -> { if (v instanceof LinkedHashSet) { diff --git a/server/src/main/java/org/elasticsearch/health/node/UpdateHealthInfoCacheAction.java b/server/src/main/java/org/elasticsearch/health/node/UpdateHealthInfoCacheAction.java index 52c84fc3b130c..ac11dcb4721eb 100644 --- a/server/src/main/java/org/elasticsearch/health/node/UpdateHealthInfoCacheAction.java +++ b/server/src/main/java/org/elasticsearch/health/node/UpdateHealthInfoCacheAction.java @@ -89,25 +89,14 @@ public Request(String nodeId, FileSettingsService.FileSettingsHealthInfo info) { public Request(StreamInput in) throws IOException { super(in); this.nodeId = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.diskHealthInfo = in.readOptionalWriteable(DiskHealthInfo::new); - this.dslHealthInfo = in.readOptionalWriteable(DataStreamLifecycleHealthInfo::new); - this.repositoriesHealthInfo = in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0) - ? in.readOptionalWriteable(RepositoriesHealthInfo::new) - : null; - this.fileSettingsHealthInfo = in.getTransportVersion().supports(FILE_SETTINGS_HEALTH_INFO) - ? in.readOptionalWriteable(FileSettingsService.FileSettingsHealthInfo::new) - : null; - } else { - // BWC for pre-8.12 the disk health info was mandatory. Evolving this request has proven tricky however we've made use of - // waiting for all nodes to be on the {@link TransportVersions.HEALTH_INFO_ENRICHED_WITH_DSL_STATUS} transport version - // before sending any requests to update the health info that'd break the pre HEALTH_INFO_ENRICHED_WITH_DSL_STATUS - // transport invariant of always having a disk health information in the request - this.diskHealthInfo = new DiskHealthInfo(in); - this.dslHealthInfo = null; - this.repositoriesHealthInfo = null; - this.fileSettingsHealthInfo = null; - } + this.diskHealthInfo = in.readOptionalWriteable(DiskHealthInfo::new); + this.dslHealthInfo = in.readOptionalWriteable(DataStreamLifecycleHealthInfo::new); + this.repositoriesHealthInfo = in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0) + ? in.readOptionalWriteable(RepositoriesHealthInfo::new) + : null; + this.fileSettingsHealthInfo = in.getTransportVersion().supports(FILE_SETTINGS_HEALTH_INFO) + ? in.readOptionalWriteable(FileSettingsService.FileSettingsHealthInfo::new) + : null; } public String getNodeId() { @@ -140,21 +129,13 @@ public ActionRequestValidationException validate() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(nodeId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalWriteable(diskHealthInfo); - out.writeOptionalWriteable(dslHealthInfo); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeOptionalWriteable(repositoriesHealthInfo); - } - if (out.getTransportVersion().supports(FILE_SETTINGS_HEALTH_INFO)) { - out.writeOptionalWriteable(fileSettingsHealthInfo); - } - } else { - // BWC for pre-8.12 the disk health info was mandatory. Evolving this request has proven tricky however we've made use of - // waiting for all nodes to be on the {@link TransportVersions.V_8_12_0} transport version - // before sending any requests to update the health info that'd break the pre-8.12 - // transport invariant of always having a disk health information in the request - diskHealthInfo.writeTo(out); + out.writeOptionalWriteable(diskHealthInfo); + out.writeOptionalWriteable(dslHealthInfo); + if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { + out.writeOptionalWriteable(repositoriesHealthInfo); + } + if (out.getTransportVersion().supports(FILE_SETTINGS_HEALTH_INFO)) { + out.writeOptionalWriteable(fileSettingsHealthInfo); } } diff --git a/server/src/main/java/org/elasticsearch/index/engine/Segment.java b/server/src/main/java/org/elasticsearch/index/engine/Segment.java index 8afb7033f87d8..84351e4ad357e 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/Segment.java +++ b/server/src/main/java/org/elasticsearch/index/engine/Segment.java @@ -252,19 +252,7 @@ private static void writeSegmentSort(StreamOutput out, Sort sort) throws IOExcep o.writeGenericValue(field.getMissingValue()); o.writeBoolean(((SortedNumericSortField) field).getSelector() == SortedNumericSelector.Type.MAX); o.writeBoolean(field.getReverse()); - } else if (field.getType().equals(SortField.Type.STRING)) { - if (o.getTransportVersion().before(TransportVersions.V_8_5_0)) { - // The closest supported version before 8.5.0 was SortedSet fields, so we mimic that - o.writeByte(SORT_STRING_SET); - o.writeOptionalBoolean(field.getMissingValue() == null ? null : field.getMissingValue() == SortField.STRING_FIRST); - o.writeBoolean(true); - o.writeBoolean(field.getReverse()); - } else { - o.writeByte(SORT_STRING_SINGLE); - o.writeOptionalBoolean(field.getMissingValue() == null ? null : field.getMissingValue() == SortField.STRING_FIRST); - o.writeBoolean(field.getReverse()); - } - } else { + } else if (field.getType().equals(SortField.Type.STRING)) {} else { throw new IOException("invalid index sort field:" + field); } }, sort.getSort()); diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java b/server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java index 56e9d72a41562..59b81b857e33b 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java @@ -9,7 +9,6 @@ package org.elasticsearch.index.fielddata; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.FieldMemoryStats; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -48,18 +47,12 @@ public FieldDataStats(StreamInput in) throws IOException { memorySize = in.readVLong(); evictions = in.readVLong(); fields = in.readOptionalWriteable(FieldMemoryStats::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - long buildTimeMillis = in.readVLong(); - Map fieldGlobalOrdinalsStats = null; - if (in.readBoolean()) { - fieldGlobalOrdinalsStats = in.readMap( - in1 -> new GlobalOrdinalsStats.GlobalOrdinalFieldStats(in1.readVLong(), in1.readVLong()) - ); - } - globalOrdinalsStats = new GlobalOrdinalsStats(buildTimeMillis, fieldGlobalOrdinalsStats); - } else { - globalOrdinalsStats = new GlobalOrdinalsStats(0, null); + long buildTimeMillis = in.readVLong(); + Map fieldGlobalOrdinalsStats = null; + if (in.readBoolean()) { + fieldGlobalOrdinalsStats = in.readMap(in1 -> new GlobalOrdinalsStats.GlobalOrdinalFieldStats(in1.readVLong(), in1.readVLong())); } + globalOrdinalsStats = new GlobalOrdinalsStats(buildTimeMillis, fieldGlobalOrdinalsStats); } public FieldDataStats(long memorySize, long evictions, @Nullable FieldMemoryStats fields, GlobalOrdinalsStats globalOrdinalsStats) { @@ -111,17 +104,15 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(memorySize); out.writeVLong(evictions); out.writeOptionalWriteable(fields); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeVLong(globalOrdinalsStats.buildTimeMillis); - if (globalOrdinalsStats.fieldGlobalOrdinalsStats != null) { - out.writeBoolean(true); - out.writeMap(globalOrdinalsStats.fieldGlobalOrdinalsStats, (out1, value) -> { - out1.writeVLong(value.totalBuildingTime); - out1.writeVLong(value.valueCount); - }); - } else { - out.writeBoolean(false); - } + out.writeVLong(globalOrdinalsStats.buildTimeMillis); + if (globalOrdinalsStats.fieldGlobalOrdinalsStats != null) { + out.writeBoolean(true); + out.writeMap(globalOrdinalsStats.fieldGlobalOrdinalsStats, (out1, value) -> { + out1.writeVLong(value.totalBuildingTime); + out1.writeVLong(value.valueCount); + }); + } else { + out.writeBoolean(false); } } diff --git a/server/src/main/java/org/elasticsearch/index/query/RankDocsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RankDocsQueryBuilder.java index 03f7679584344..653ae34d0e621 100644 --- a/server/src/main/java/org/elasticsearch/index/query/RankDocsQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/RankDocsQueryBuilder.java @@ -42,13 +42,8 @@ public RankDocsQueryBuilder(RankDoc[] rankDocs, QueryBuilder[] queryBuilders, bo public RankDocsQueryBuilder(StreamInput in) throws IOException { super(in); this.rankDocs = in.readArray(c -> c.readNamedWriteable(RankDoc.class), RankDoc[]::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.queryBuilders = in.readOptionalArray(c -> c.readNamedWriteable(QueryBuilder.class), QueryBuilder[]::new); - this.onlyRankDocs = in.readBoolean(); - } else { - this.queryBuilders = null; - this.onlyRankDocs = false; - } + this.queryBuilders = in.readOptionalArray(c -> c.readNamedWriteable(QueryBuilder.class), QueryBuilder[]::new); + this.onlyRankDocs = in.readBoolean(); } @Override @@ -85,10 +80,8 @@ public RankDoc[] rankDocs() { @Override protected void doWriteTo(StreamOutput out) throws IOException { out.writeArray(StreamOutput::writeNamedWriteable, rankDocs); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalArray(StreamOutput::writeNamedWriteable, queryBuilders); - out.writeBoolean(onlyRankDocs); - } + out.writeOptionalArray(StreamOutput::writeNamedWriteable, queryBuilders); + out.writeBoolean(onlyRankDocs); } public QueryBuilder[] getQueryBuilders() { diff --git a/server/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java b/server/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java index ca5e7e40601a4..e4ebaaa876a19 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java @@ -9,7 +9,6 @@ package org.elasticsearch.index.reindex; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -102,11 +101,6 @@ public RemoteInfo(StreamInput in) throws IOException { port = in.readVInt(); query = in.readBytesReference(); username = in.readOptionalString(); - if (in.getTransportVersion().before(TransportVersions.V_8_2_0)) { - password = new SecureString(in.readOptionalString().toCharArray()); - } else { - password = in.readOptionalSecureString(); - } int headersLength = in.readVInt(); Map headers = Maps.newMapWithExpectedSize(headersLength); for (int i = 0; i < headersLength; i++) { @@ -125,11 +119,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVInt(port); out.writeBytesReference(query); out.writeOptionalString(username); - if (out.getTransportVersion().before(TransportVersions.V_8_2_0)) { - out.writeOptionalString(password.toString()); - } else { - out.writeOptionalSecureString(password); - } out.writeVInt(headers.size()); for (Map.Entry header : headers.entrySet()) { out.writeString(header.getKey()); diff --git a/server/src/main/java/org/elasticsearch/index/search/stats/FieldUsageStats.java b/server/src/main/java/org/elasticsearch/index/search/stats/FieldUsageStats.java index f7aa22fb6c4df..2a1e7beb0ee2f 100644 --- a/server/src/main/java/org/elasticsearch/index/search/stats/FieldUsageStats.java +++ b/server/src/main/java/org/elasticsearch/index/search/stats/FieldUsageStats.java @@ -9,7 +9,6 @@ package org.elasticsearch.index.search.stats; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -211,11 +210,7 @@ public PerFieldUsageStats(StreamInput in) throws IOException { payloads = in.readVLong(); termVectors = in.readVLong(); points = in.readVLong(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - knnVectors = in.readVLong(); - } else { - knnVectors = 0; - } + knnVectors = in.readVLong(); } @Override @@ -233,9 +228,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(payloads); out.writeVLong(termVectors); out.writeVLong(points); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeVLong(knnVectors); - } + out.writeVLong(knnVectors); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java b/server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java index d3fb292965fd2..21975a2398b4d 100644 --- a/server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java +++ b/server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java @@ -10,7 +10,6 @@ package org.elasticsearch.index.search.stats; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -116,10 +115,8 @@ private Stats(StreamInput in) throws IOException { suggestTimeInMillis = in.readVLong(); suggestCurrent = in.readVLong(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - queryFailure = in.readVLong(); - fetchFailure = in.readVLong(); - } + queryFailure = in.readVLong(); + fetchFailure = in.readVLong(); if (in.getTransportVersion().supports(SEARCH_LOAD_PER_INDEX_STATS)) { recentSearchLoad = in.readDouble(); @@ -144,10 +141,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(suggestTimeInMillis); out.writeVLong(suggestCurrent); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeVLong(queryFailure); - out.writeVLong(fetchFailure); - } + out.writeVLong(queryFailure); + out.writeVLong(fetchFailure); if (out.getTransportVersion().supports(SEARCH_LOAD_PER_INDEX_STATS)) { out.writeDouble(recentSearchLoad); diff --git a/server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java b/server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java index 005028c94d17a..294ec1e7d47f5 100644 --- a/server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java +++ b/server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java @@ -83,17 +83,9 @@ public IndexingPressureStats(StreamInput in) throws IOException { this.currentPrimaryOps = 0; this.currentReplicaOps = 0; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - primaryDocumentRejections = in.readVLong(); - } else { - primaryDocumentRejections = -1L; - } + primaryDocumentRejections = in.readVLong(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - totalCoordinatingRequests = in.readVLong(); - } else { - totalCoordinatingRequests = -1L; - } + totalCoordinatingRequests = in.readVLong(); if (in.getTransportVersion().onOrAfter(TransportVersions.INDEXING_PRESSURE_THROTTLING_STATS)) { lowWaterMarkSplits = in.readVLong(); @@ -185,13 +177,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(memoryLimit); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeVLong(primaryDocumentRejections); - } + out.writeVLong(primaryDocumentRejections); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeVLong(totalCoordinatingRequests); - } + out.writeVLong(totalCoordinatingRequests); if (out.getTransportVersion().onOrAfter(TransportVersions.INDEXING_PRESSURE_THROTTLING_STATS)) { out.writeVLong(lowWaterMarkSplits); diff --git a/server/src/main/java/org/elasticsearch/index/translog/Translog.java b/server/src/main/java/org/elasticsearch/index/translog/Translog.java index a5088b5896c80..995de1233c5ed 100644 --- a/server/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/server/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -1731,17 +1731,6 @@ public static List readOperations(StreamInput input, String source) t ArrayList operations = new ArrayList<>(); int numOps = input.readInt(); final BufferedChecksumStreamInput checksumStreamInput = new BufferedChecksumStreamInput(input, source); - if (input.getTransportVersion().before(TransportVersions.V_8_8_0)) { - for (int i = 0; i < numOps; i++) { - operations.add(readOperation(checksumStreamInput)); - } - } else { - for (int i = 0; i < numOps; i++) { - checksumStreamInput.resetDigest(); - operations.add(Translog.Operation.readOperation(checksumStreamInput)); - verifyChecksum(checksumStreamInput); - } - } return operations; } @@ -1781,13 +1770,9 @@ public static void writeOperations(StreamOutput outStream, List toWri if (size == 0) { return; } - if (outStream.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - final BufferedChecksumStreamOutput checksumStreamOutput = new BufferedChecksumStreamOutput(outStream); - for (Operation op : toWrite) { - writeOperationNoSize(checksumStreamOutput, op); - } - } else { - writeOperationsToStreamLegacyFormat(outStream, toWrite); + final BufferedChecksumStreamOutput checksumStreamOutput = new BufferedChecksumStreamOutput(outStream); + for (Operation op : toWrite) { + writeOperationNoSize(checksumStreamOutput, op); } } diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java index 83c9d9e3f1af2..07444305c061c 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.indices.recovery; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -44,11 +43,7 @@ public StartRecoveryRequest(StreamInput in) throws IOException { targetAllocationId = in.readString(); sourceNode = new DiscoveryNode(in); targetNode = new DiscoveryNode(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - clusterStateVersion = in.readVLong(); - } else { - clusterStateVersion = 0L; // bwc: do not wait for cluster state to be applied - } + clusterStateVersion = in.readVLong(); metadataSnapshot = Store.MetadataSnapshot.readFrom(in); primaryRelocation = in.readBoolean(); startingSeqNo = in.readLong(); @@ -161,9 +156,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(targetAllocationId); sourceNode.writeTo(out); targetNode.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeVLong(clusterStateVersion); - } // else bwc: just omit it, the receiver doesn't wait for a cluster state anyway + out.writeVLong(clusterStateVersion); metadataSnapshot.writeTo(out); out.writeBoolean(primaryRelocation); out.writeLong(startingSeqNo); diff --git a/server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetadata.java b/server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetadata.java index 8d3008bc28758..df0b6b6eca107 100644 --- a/server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetadata.java +++ b/server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetadata.java @@ -13,7 +13,6 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.index.IndexNotFoundException; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.FailedNodeException; import org.elasticsearch.action.support.ActionFilters; @@ -205,9 +204,6 @@ public record StoreFilesMetadata(Store.MetadataSnapshot metadataSnapshot, List processorStatsForPipeline = processorStats.getOrDefault(pipelineStat.projectId(), Map.of()) .get(pipelineStat.pipelineId()); if (processorStatsForPipeline == null) { diff --git a/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java b/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java index eebb10cc837d3..cab218263245d 100644 --- a/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java +++ b/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java @@ -10,7 +10,6 @@ package org.elasticsearch.ingest; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.Diff; import org.elasticsearch.cluster.SimpleDiffable; import org.elasticsearch.common.Strings; @@ -25,7 +24,6 @@ import org.elasticsearch.xcontent.ToXContentObject; import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentType; -import org.elasticsearch.xcontent.json.JsonXContent; import java.io.IOException; import java.util.ArrayList; @@ -172,13 +170,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws public static PipelineConfiguration readFrom(StreamInput in) throws IOException { final String id = in.readString(); final Map config; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - config = in.readGenericMap(); - } else { - final BytesReference bytes = in.readSlicedBytesReference(); - final XContentType type = in.readEnum(XContentType.class); - config = XContentHelper.convertToMap(bytes, true, type).v2(); - } + config = in.readGenericMap(); return new PipelineConfiguration(id, config); } @@ -196,14 +188,7 @@ public void writeTo(StreamOutput out) throws IOException { final TransportVersion transportVersion = out.getTransportVersion(); final Map configForTransport = configForTransport(transportVersion); out.writeString(id); - if (transportVersion.onOrAfter(TransportVersions.V_8_17_0)) { - out.writeGenericMap(configForTransport); - } else { - XContentBuilder builder = XContentBuilder.builder(JsonXContent.jsonXContent).prettyPrint(); - builder.map(configForTransport); - out.writeBytesReference(BytesReference.bytes(builder)); - XContentHelper.writeTo(out, XContentType.JSON); - } + out.writeGenericMap(configForTransport); } @Override diff --git a/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java index 81c3b039392e2..cb64c3e21dedc 100644 --- a/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java +++ b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java @@ -10,7 +10,6 @@ package org.elasticsearch.monitor.jvm; import org.apache.logging.log4j.Logger; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -276,10 +275,6 @@ public JvmInfo(StreamInput in) throws IOException { vmName = in.readString(); vmVersion = in.readString(); vmVendor = in.readString(); - if (in.getTransportVersion().before(TransportVersions.V_8_3_0)) { - // Before 8.0 the no-jdk distributions could have bundledJdk false, this is always true now. - in.readBoolean(); - } usingBundledJdk = in.readOptionalBoolean(); startTime = in.readLong(); inputArguments = new String[in.readInt()]; @@ -310,9 +305,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(vmName); out.writeString(vmVersion); out.writeString(vmVendor); - if (out.getTransportVersion().before(TransportVersions.V_8_3_0)) { - out.writeBoolean(true); - } out.writeOptionalBoolean(usingBundledJdk); out.writeLong(startTime); out.writeInt(inputArguments.length); diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java index fe08d30e0dd87..71a8a5bcc4687 100644 --- a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java +++ b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java @@ -488,11 +488,7 @@ public Cgroup( Cgroup(final StreamInput in) throws IOException { cpuAcctControlGroup = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - cpuAcctUsageNanos = in.readBigInteger(); - } else { - cpuAcctUsageNanos = BigInteger.valueOf(in.readLong()); - } + cpuAcctUsageNanos = in.readBigInteger(); cpuControlGroup = in.readString(); cpuCfsPeriodMicros = in.readLong(); cpuCfsQuotaMicros = in.readLong(); @@ -505,11 +501,7 @@ public Cgroup( @Override public void writeTo(final StreamOutput out) throws IOException { out.writeString(cpuAcctControlGroup); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - out.writeBigInteger(cpuAcctUsageNanos); - } else { - out.writeLong(cpuAcctUsageNanos.longValue()); - } + out.writeBigInteger(cpuAcctUsageNanos); out.writeString(cpuControlGroup); out.writeLong(cpuCfsPeriodMicros); out.writeLong(cpuCfsQuotaMicros); @@ -605,28 +597,16 @@ public CpuStat( } CpuStat(final StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - numberOfElapsedPeriods = in.readBigInteger(); - numberOfTimesThrottled = in.readBigInteger(); - timeThrottledNanos = in.readBigInteger(); - } else { - numberOfElapsedPeriods = BigInteger.valueOf(in.readLong()); - numberOfTimesThrottled = BigInteger.valueOf(in.readLong()); - timeThrottledNanos = BigInteger.valueOf(in.readLong()); - } + numberOfElapsedPeriods = in.readBigInteger(); + numberOfTimesThrottled = in.readBigInteger(); + timeThrottledNanos = in.readBigInteger(); } @Override public void writeTo(final StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - out.writeBigInteger(numberOfElapsedPeriods); - out.writeBigInteger(numberOfTimesThrottled); - out.writeBigInteger(timeThrottledNanos); - } else { - out.writeLong(numberOfElapsedPeriods.longValue()); - out.writeLong(numberOfTimesThrottled.longValue()); - out.writeLong(timeThrottledNanos.longValue()); - } + out.writeBigInteger(numberOfElapsedPeriods); + out.writeBigInteger(numberOfTimesThrottled); + out.writeBigInteger(timeThrottledNanos); } @Override diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java b/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java index 498557609c253..bc606470f351c 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java @@ -11,7 +11,6 @@ import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersions; -import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -118,17 +117,8 @@ public PluginDescriptor(final StreamInput in) throws IOException { this.name = in.readString(); this.description = in.readString(); this.version = in.readString(); - if (in.getTransportVersion().before(TransportVersions.V_8_12_0)) { - elasticsearchVersion = Version.readVersion(in).toString(); - } else { - elasticsearchVersion = in.readString(); - } javaVersion = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.classname = in.readOptionalString(); - } else { - this.classname = in.readString(); - } + this.classname = in.readOptionalString(); if (in.getTransportVersion().onOrAfter(MODULE_NAME_SUPPORT)) { this.moduleName = in.readOptionalString(); } else { @@ -143,13 +133,8 @@ public PluginDescriptor(final StreamInput in) throws IOException { } isLicensed = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - isModular = in.readBoolean(); - isStable = in.readBoolean(); - } else { - isModular = moduleName != null; - isStable = false; - } + isModular = in.readBoolean(); + isStable = in.readBoolean(); ensureCorrectArgumentsForPluginType(); } @@ -159,17 +144,8 @@ public void writeTo(final StreamOutput out) throws IOException { out.writeString(name); out.writeString(description); out.writeString(version); - if (out.getTransportVersion().before(TransportVersions.V_8_12_0)) { - Version.writeVersion(Version.fromString(elasticsearchVersion), out); - } else { - out.writeString(elasticsearchVersion); - } out.writeString(javaVersion); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalString(classname); - } else { - out.writeString(classname); - } + out.writeOptionalString(classname); if (out.getTransportVersion().onOrAfter(MODULE_NAME_SUPPORT)) { out.writeOptionalString(moduleName); } @@ -181,10 +157,8 @@ public void writeTo(final StreamOutput out) throws IOException { out.writeOptionalString(null); } out.writeBoolean(isLicensed); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeBoolean(isModular); - out.writeBoolean(isStable); - } + out.writeBoolean(isModular); + out.writeBoolean(isStable); } private void ensureCorrectArgumentsForPluginType() { diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java b/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java index 6da2b31b1e5ec..28f79c4679fd1 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginRuntimeInfo.java @@ -9,7 +9,6 @@ package org.elasticsearch.plugins; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -41,19 +40,11 @@ public PluginRuntimeInfo(StreamInput in) throws IOException { } private static Boolean readIsOfficial(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - return in.readBoolean(); - } else { - return null; - } + return in.readBoolean(); } private static PluginApiInfo readApiInfo(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - return in.readOptionalWriteable(PluginApiInfo::new); - } else { - return null; - } + return in.readOptionalWriteable(PluginApiInfo::new); } @Override @@ -73,9 +64,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public void writeTo(StreamOutput out) throws IOException { descriptor.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - out.writeBoolean(isOfficial); - out.writeOptionalWriteable(pluginApiInfo); - } + out.writeBoolean(isOfficial); + out.writeOptionalWriteable(pluginApiInfo); } } diff --git a/server/src/main/java/org/elasticsearch/repositories/RepositoriesStats.java b/server/src/main/java/org/elasticsearch/repositories/RepositoriesStats.java index 6359e09b01a55..2667a411d50ff 100644 --- a/server/src/main/java/org/elasticsearch/repositories/RepositoriesStats.java +++ b/server/src/main/java/org/elasticsearch/repositories/RepositoriesStats.java @@ -10,7 +10,6 @@ package org.elasticsearch.repositories; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -31,11 +30,7 @@ public class RepositoriesStats implements Writeable, ToXContentFragment { private final Map repositorySnapshotStats; public RepositoriesStats(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - repositorySnapshotStats = in.readMap(SnapshotStats::readFrom); - } else { - repositorySnapshotStats = new HashMap<>(); - } + repositorySnapshotStats = in.readMap(SnapshotStats::readFrom); } public RepositoriesStats(Map repositorySnapshotStats) { @@ -44,9 +39,7 @@ public RepositoriesStats(Map repositorySnapshotStats) { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeMap(repositorySnapshotStats, StreamOutput::writeWriteable); - } + out.writeMap(repositorySnapshotStats, StreamOutput::writeWriteable); } @Override diff --git a/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java b/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java index aca4571f6a963..5e070690b97ee 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java @@ -61,16 +61,8 @@ public static ScriptContextStats read(StreamInput in) throws IOException { var compilationLimitTriggered = in.readVLong(); TimeSeries compilationsHistory; TimeSeries cacheEvictionsHistory; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - compilationsHistory = new TimeSeries(in); - cacheEvictionsHistory = new TimeSeries(in); - } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - compilationsHistory = new TimeSeries(in).withTotal(compilations); - cacheEvictionsHistory = new TimeSeries(in).withTotal(cacheEvictions); - } else { - compilationsHistory = new TimeSeries(compilations); - cacheEvictionsHistory = new TimeSeries(cacheEvictions); - } + compilationsHistory = new TimeSeries(in); + cacheEvictionsHistory = new TimeSeries(in); return new ScriptContextStats( context, compilations, diff --git a/server/src/main/java/org/elasticsearch/script/ScriptStats.java b/server/src/main/java/org/elasticsearch/script/ScriptStats.java index 08ce12232a956..e736772fbda3d 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptStats.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptStats.java @@ -9,7 +9,6 @@ package org.elasticsearch.script; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.collect.Iterators; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -130,17 +129,10 @@ public static ScriptStats read(StreamInput in) throws IOException { TimeSeries cacheEvictionsHistory; long compilations; long cacheEvictions; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - compilationsHistory = new TimeSeries(in); - cacheEvictionsHistory = new TimeSeries(in); - compilations = compilationsHistory.total; - cacheEvictions = cacheEvictionsHistory.total; - } else { - compilations = in.readVLong(); - cacheEvictions = in.readVLong(); - compilationsHistory = new TimeSeries(compilations); - cacheEvictionsHistory = new TimeSeries(cacheEvictions); - } + compilationsHistory = new TimeSeries(in); + cacheEvictionsHistory = new TimeSeries(in); + compilations = compilationsHistory.total; + cacheEvictions = cacheEvictionsHistory.total; var compilationLimitTriggered = in.readVLong(); var contextStats = in.readCollectionAsList(ScriptContextStats::read); return new ScriptStats( @@ -155,13 +147,8 @@ public static ScriptStats read(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - compilationsHistory.writeTo(out); - cacheEvictionsHistory.writeTo(out); - } else { - out.writeVLong(compilations); - out.writeVLong(cacheEvictions); - } + compilationsHistory.writeTo(out); + cacheEvictionsHistory.writeTo(out); out.writeVLong(compilationLimitTriggered); out.writeCollection(contextStats); } diff --git a/server/src/main/java/org/elasticsearch/script/TimeSeries.java b/server/src/main/java/org/elasticsearch/script/TimeSeries.java index 20b93aa155149..99bcc1d85da49 100644 --- a/server/src/main/java/org/elasticsearch/script/TimeSeries.java +++ b/server/src/main/java/org/elasticsearch/script/TimeSeries.java @@ -9,7 +9,6 @@ package org.elasticsearch.script; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -59,11 +58,7 @@ public TimeSeries(StreamInput in) throws IOException { fiveMinutes = in.readVLong(); fifteenMinutes = in.readVLong(); twentyFourHours = in.readVLong(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - total = in.readVLong(); - } else { - total = 0; - } + total = in.readVLong(); } @Override @@ -80,9 +75,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(fiveMinutes); out.writeVLong(fifteenMinutes); out.writeVLong(twentyFourHours); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeVLong(total); - } + out.writeVLong(total); } public boolean areTimingsEmpty() { diff --git a/server/src/main/java/org/elasticsearch/search/DocValueFormat.java b/server/src/main/java/org/elasticsearch/search/DocValueFormat.java index 13256a2481867..27d1c5d1194a2 100644 --- a/server/src/main/java/org/elasticsearch/search/DocValueFormat.java +++ b/server/src/main/java/org/elasticsearch/search/DocValueFormat.java @@ -291,9 +291,7 @@ public static DateTime readFrom(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(formatter.pattern()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeString(formatter.locale().toString()); - } + out.writeString(formatter.locale().toString()); out.writeString(timeZone.getId()); out.writeVInt(resolution.ordinal()); out.writeBoolean(formatSortValues); diff --git a/server/src/main/java/org/elasticsearch/search/SearchHit.java b/server/src/main/java/org/elasticsearch/search/SearchHit.java index 31429dd91d9a9..5f0716949faec 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchHit.java +++ b/server/src/main/java/org/elasticsearch/search/SearchHit.java @@ -198,11 +198,7 @@ public SearchHit( public static SearchHit readFrom(StreamInput in, boolean pooled) throws IOException { final float score = in.readFloat(); final int rank; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - rank = in.readVInt(); - } else { - rank = NO_RANK; - } + rank = in.readVInt(); final Text id = in.readOptionalText(); if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { in.readOptionalText(); @@ -234,15 +230,7 @@ public static SearchHit readFrom(StreamInput in, boolean pooled) throws IOExcept final SearchSortValues sortValues = SearchSortValues.readFrom(in); final Map matchedQueries; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - matchedQueries = in.readOrderedMap(StreamInput::readString, StreamInput::readFloat); - } else { - int size = in.readVInt(); - matchedQueries = Maps.newLinkedHashMapWithExpectedSize(size); - for (int i = 0; i < size; i++) { - matchedQueries.put(in.readString(), Float.NaN); - } - } + matchedQueries = in.readOrderedMap(StreamInput::readString, StreamInput::readFloat); final SearchShardTarget shardTarget = in.readOptionalWriteable(SearchShardTarget::new); final String index; @@ -312,11 +300,7 @@ public static SearchHit unpooled(int nestedTopDocId, String id, NestedIdentity n public void writeTo(StreamOutput out) throws IOException { assert hasReferences(); out.writeFloat(score); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeVInt(rank); - } else if (rank != NO_RANK) { - throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]"); - } + out.writeVInt(rank); out.writeOptionalText(id); if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { out.writeOptionalText(SINGLE_MAPPING_TYPE); @@ -346,11 +330,7 @@ public void writeTo(StreamOutput out) throws IOException { } sortValues.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeMap(matchedQueries, StreamOutput::writeFloat); - } else { - out.writeStringCollection(matchedQueries.keySet()); - } + out.writeMap(matchedQueries, StreamOutput::writeFloat); out.writeOptionalWriteable(shard); if (innerHits == null) { out.writeVInt(0); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java index 84e25c1e3dd10..0abc95c0694df 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java @@ -137,9 +137,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeCollection(filters, keyed ? StreamOutput::writeWriteable : (o, v) -> o.writeNamedWriteable(v.filter())); out.writeBoolean(otherBucket); out.writeString(otherBucketKey); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeBoolean(keyedBucket); - } + out.writeBoolean(keyedBucket); } /** diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java index 682af97e1e8f5..6231471994b06 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java @@ -152,9 +152,7 @@ public InternalFilters(StreamInput in) throws IOException { @Override protected void doWriteTo(StreamOutput out) throws IOException { out.writeBoolean(keyed); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeBoolean(keyedBucket); - } + out.writeBoolean(keyedBucket); out.writeCollection(buckets); } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/InternalRandomSampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/InternalRandomSampler.java index 760e66fac67d1..5826066190025 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/InternalRandomSampler.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/InternalRandomSampler.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.aggregations.bucket.sampler.random; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Releasables; @@ -57,11 +56,7 @@ public InternalRandomSampler(StreamInput in) throws IOException { super(in); this.seed = in.readInt(); this.probability = in.readDouble(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - this.shardSeed = in.readOptionalInt(); - } else { - this.shardSeed = null; - } + this.shardSeed = in.readOptionalInt(); } @Override @@ -69,9 +64,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { super.doWriteTo(out); out.writeInt(seed); out.writeDouble(probability); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalInt(shardSeed); - } + out.writeOptionalInt(shardSeed); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java index 122c4736c5f26..b6aaebfd3fd7b 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.aggregations.bucket.terms; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; @@ -198,9 +197,7 @@ public TermsAggregationBuilder(StreamInput in) throws IOException { includeExclude = in.readOptionalWriteable(IncludeExclude::new); order = InternalOrder.Streams.readOrder(in); showTermDocCountError = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - excludeDeletedDocs = in.readBoolean(); - } + excludeDeletedDocs = in.readBoolean(); } @Override @@ -216,9 +213,7 @@ protected void innerWriteTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(includeExclude); order.writeTo(out); out.writeBoolean(showTermDocCountError); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeBoolean(excludeDeletedDocs); - } + out.writeBoolean(excludeDeletedDocs); } /** diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalHDRPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalHDRPercentiles.java index e97b9fdf063ed..528465451ad62 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalHDRPercentiles.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalHDRPercentiles.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.aggregations.metrics; import org.HdrHistogram.DoubleHistogram; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.DocValueFormat; @@ -59,14 +58,10 @@ abstract class AbstractInternalHDRPercentiles extends InternalNumericMetricsAggr protected AbstractInternalHDRPercentiles(StreamInput in) throws IOException { super(in); keys = in.readDoubleArray(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - if (in.readBoolean()) { - state = decode(in); - } else { - state = null; - } - } else { + if (in.readBoolean()) { state = decode(in); + } else { + state = null; } keyed = in.readBoolean(); } @@ -88,18 +83,11 @@ private DoubleHistogram decode(StreamInput in) throws IOException { protected void doWriteTo(StreamOutput out) throws IOException { out.writeNamedWriteable(format); out.writeDoubleArray(keys); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - if (this.state != null) { - out.writeBoolean(true); - encode(this.state, out); - } else { - out.writeBoolean(false); - } + if (this.state != null) { + out.writeBoolean(true); + encode(this.state, out); } else { - DoubleHistogram state = this.state != null ? this.state - : out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0) ? EMPTY_HISTOGRAM_ZERO_DIGITS - : EMPTY_HISTOGRAM_THREE_DIGITS; - encode(state, out); + out.writeBoolean(false); } out.writeBoolean(keyed); } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalTDigestPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalTDigestPercentiles.java index 59c94205d8378..6affa2f4ac077 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalTDigestPercentiles.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalTDigestPercentiles.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.aggregations.metrics; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.DocValueFormat; @@ -62,14 +61,10 @@ abstract class AbstractInternalTDigestPercentiles extends InternalNumericMetrics protected AbstractInternalTDigestPercentiles(StreamInput in) throws IOException { super(in); keys = in.readDoubleArray(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - if (in.readBoolean()) { - state = TDigestState.read(in); - } else { - state = null; - } - } else { + if (in.readBoolean()) { state = TDigestState.read(in); + } else { + state = null; } keyed = in.readBoolean(); } @@ -78,16 +73,11 @@ protected AbstractInternalTDigestPercentiles(StreamInput in) throws IOException protected void doWriteTo(StreamOutput out) throws IOException { out.writeNamedWriteable(format); out.writeDoubleArray(keys); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - if (this.state != null) { - out.writeBoolean(true); - TDigestState.write(state, out); - } else { - out.writeBoolean(false); - } - } else { - TDigestState state = this.state != null ? this.state : EMPTY_HISTOGRAM; + if (this.state != null) { + out.writeBoolean(true); TDigestState.write(state, out); + } else { + out.writeBoolean(false); } out.writeBoolean(keyed); } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregationBuilder.java index b439a34d0857b..7c6549a95a7b3 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregationBuilder.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.aggregations.metrics; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.aggregations.AggregationBuilder; @@ -65,11 +64,7 @@ public MedianAbsoluteDeviationAggregationBuilder(String name) { public MedianAbsoluteDeviationAggregationBuilder(StreamInput in) throws IOException { super(in); compression = in.readDouble(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - executionHint = in.readOptionalWriteable(TDigestExecutionHint::readFrom); - } else { - executionHint = TDigestExecutionHint.HIGH_ACCURACY; - } + executionHint = in.readOptionalWriteable(TDigestExecutionHint::readFrom); } protected MedianAbsoluteDeviationAggregationBuilder( @@ -121,9 +116,7 @@ protected ValuesSourceType defaultValueSourceType() { @Override protected void innerWriteTo(StreamOutput out) throws IOException { out.writeDouble(compression); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeOptionalWriteable(executionHint); - } + out.writeOptionalWriteable(executionHint); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TDigestState.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TDigestState.java index 239d794fe6906..cb4809dfafe5e 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TDigestState.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TDigestState.java @@ -10,7 +10,6 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.breaker.NoopCircuitBreaker; import org.elasticsearch.common.io.stream.StreamInput; @@ -173,10 +172,8 @@ public final double compression() { public static void write(TDigestState state, StreamOutput out) throws IOException { out.writeDouble(state.compression); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeString(state.type.toString()); - out.writeVLong(state.tdigest.size()); - } + out.writeString(state.type.toString()); + out.writeVLong(state.tdigest.size()); out.writeVInt(state.centroidCount()); for (Centroid centroid : state.centroids()) { @@ -202,12 +199,8 @@ public static TDigestState read(CircuitBreaker breaker, StreamInput in) throws I try { breaker.addEstimateBytesAndMaybeBreak(SHALLOW_SIZE, "tdigest-state-read"); try { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - state = new TDigestState(breaker, Type.valueOf(in.readString()), compression); - size = in.readVLong(); - } else { - state = new TDigestState(breaker, Type.valueForHighAccuracy(), compression); - } + state = new TDigestState(breaker, Type.valueOf(in.readString()), compression); + size = in.readVLong(); } finally { if (state == null) { breaker.addWithoutBreaking(-SHALLOW_SIZE); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java index de688cb59fa28..2c708dfe11557 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.aggregations.support; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -169,11 +168,7 @@ public MultiValuesSourceFieldConfig(StreamInput in) throws IOException { this.filter = in.readOptionalNamedWriteable(QueryBuilder.class); this.userValueTypeHint = in.readOptionalWriteable(ValueType::readFromStream); this.format = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.includeExclude = in.readOptionalWriteable(IncludeExclude::new); - } else { - this.includeExclude = null; - } + this.includeExclude = in.readOptionalWriteable(IncludeExclude::new); } public Object getMissing() { @@ -217,9 +212,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalNamedWriteable(filter); out.writeOptionalWriteable(userValueTypeHint); out.writeOptionalString(format); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalWriteable(includeExclude); - } + out.writeOptionalWriteable(includeExclude); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java index 913dec7e56a39..0b5beeb927d0f 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.builder; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.search.SearchContextId; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -63,21 +62,13 @@ public PointInTimeBuilder(BytesReference pitID) { } public PointInTimeBuilder(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - encodedId = in.readBytesReference(); - } else { - encodedId = new BytesArray(Base64.getUrlDecoder().decode(in.readString())); - } + encodedId = in.readBytesReference(); keepAlive = in.readOptionalTimeValue(); } @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBytesReference(encodedId); - } else { - out.writeString(Base64.getUrlEncoder().encodeToString(BytesReference.toBytes(encodedId))); - } + out.writeBytesReference(encodedId); out.writeOptionalTimeValue(keepAlive); } diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index a4f56d5f4a6dc..cbcc5c34ecb47 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.builder; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.ParsingException; @@ -235,14 +234,7 @@ public SearchSourceBuilder(StreamInput in) throws IOException { indexBoosts = in.readCollectionAsList(IndexBoost::new); minScore = in.readOptionalFloat(); postQueryBuilder = in.readOptionalNamedWriteable(QueryBuilder.class); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - subSearchSourceBuilders = in.readCollectionAsList(SubSearchSourceBuilder::new); - } else { - QueryBuilder queryBuilder = in.readOptionalNamedWriteable(QueryBuilder.class); - if (queryBuilder != null) { - subSearchSourceBuilders.add(new SubSearchSourceBuilder(queryBuilder)); - } - } + subSearchSourceBuilders = in.readCollectionAsList(SubSearchSourceBuilder::new); if (in.readBoolean()) { rescoreBuilders = in.readNamedWriteableCollectionAsList(RescorerBuilder.class); } @@ -277,22 +269,8 @@ public SearchSourceBuilder(StreamInput in) throws IOException { } pointInTimeBuilder = in.readOptionalWriteable(PointInTimeBuilder::new); runtimeMappings = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - if (in.getTransportVersion().before(TransportVersions.V_8_7_0)) { - KnnSearchBuilder searchBuilder = in.readOptionalWriteable(KnnSearchBuilder::new); - knnSearch = searchBuilder != null ? List.of(searchBuilder) : List.of(); - } else { - knnSearch = in.readCollectionAsList(KnnSearchBuilder::new); - } - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - rankBuilder = in.readOptionalNamedWriteable(RankBuilder.class); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) { - skipInnerHits = in.readBoolean(); - } else { - skipInnerHits = false; - } + rankBuilder = in.readOptionalNamedWriteable(RankBuilder.class); + skipInnerHits = in.readBoolean(); } @Override @@ -313,15 +291,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeCollection(indexBoosts); out.writeOptionalFloat(minScore); out.writeOptionalNamedWriteable(postQueryBuilder); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeCollection(subSearchSourceBuilders); - } else if (out.getTransportVersion().before(TransportVersions.V_8_4_0) && subSearchSourceBuilders.size() >= 2) { - throw new IllegalArgumentException( - "cannot serialize [sub_searches] to version [" + out.getTransportVersion().toReleaseVersion() + "]" - ); - } else { - out.writeOptionalNamedWriteable(query()); - } + out.writeCollection(subSearchSourceBuilders); boolean hasRescoreBuilders = rescoreBuilders != null; out.writeBoolean(hasRescoreBuilders); if (hasRescoreBuilders) { @@ -361,30 +331,8 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeOptionalWriteable(pointInTimeBuilder); out.writeGenericMap(runtimeMappings); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - if (out.getTransportVersion().before(TransportVersions.V_8_7_0)) { - if (knnSearch.size() > 1) { - throw new IllegalArgumentException( - "Versions before [" - + TransportVersions.V_8_7_0.toReleaseVersion() - + "] don't support multiple [knn] search clauses and search was sent to [" - + out.getTransportVersion().toReleaseVersion() - + "]" - ); - } - out.writeOptionalWriteable(knnSearch.isEmpty() ? null : knnSearch.get(0)); - } else { - out.writeCollection(knnSearch); - } - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalNamedWriteable(rankBuilder); - } else if (rankBuilder != null) { - throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]"); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) { - out.writeBoolean(skipInnerHits); - } + out.writeOptionalNamedWriteable(rankBuilder); + out.writeBoolean(skipInnerHits); } /** diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsKnnResults.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsKnnResults.java index 66ae11509d014..c29f1ac9da6c3 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsKnnResults.java +++ b/server/src/main/java/org/elasticsearch/search/dfs/DfsKnnResults.java @@ -17,8 +17,6 @@ import java.io.IOException; -import static org.elasticsearch.TransportVersions.V_8_11_X; - public class DfsKnnResults implements Writeable { private final String nestedPath; private final ScoreDoc[] scoreDocs; @@ -30,11 +28,7 @@ public DfsKnnResults(String nestedPath, ScoreDoc[] scoreDocs) { public DfsKnnResults(StreamInput in) throws IOException { scoreDocs = in.readArray(Lucene::readScoreDoc, ScoreDoc[]::new); - if (in.getTransportVersion().onOrAfter(V_8_11_X)) { - nestedPath = in.readOptionalString(); - } else { - nestedPath = null; - } + nestedPath = in.readOptionalString(); } public String getNestedPath() { @@ -47,8 +41,6 @@ public ScoreDoc[] scoreDocs() { public void writeTo(StreamOutput out) throws IOException { out.writeArray(Lucene::writeScoreDoc, scoreDocs); - if (out.getTransportVersion().onOrAfter(V_8_11_X)) { - out.writeOptionalString(nestedPath); - } + out.writeOptionalString(nestedPath); } } diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java index 737096ed652d2..1f94abdd5dfae 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java +++ b/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java @@ -54,17 +54,13 @@ public DfsSearchResult(StreamInput in) throws IOException { maxDoc = in.readVInt(); setShardSearchRequest(in.readOptionalWriteable(ShardSearchRequest::new)); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - knnResults = in.readOptionalCollectionAsList(DfsKnnResults::new); - } else { - DfsKnnResults results = in.readOptionalWriteable(DfsKnnResults::new); - knnResults = results != null ? List.of(results) : List.of(); - } - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - searchProfileDfsPhaseResult = in.readOptionalWriteable(SearchProfileDfsPhaseResult::new); + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { + knnResults = in.readOptionalCollectionAsList(DfsKnnResults::new); + } else { + DfsKnnResults results = in.readOptionalWriteable(DfsKnnResults::new); + knnResults = results != null ? List.of(results) : List.of(); } + searchProfileDfsPhaseResult = in.readOptionalWriteable(SearchProfileDfsPhaseResult::new); } public DfsSearchResult(ShardSearchContextId contextId, SearchShardTarget shardTarget, ShardSearchRequest shardSearchRequest) { @@ -134,25 +130,21 @@ public void writeTo(StreamOutput out) throws IOException { writeFieldStats(out, fieldStatistics); out.writeVInt(maxDoc); out.writeOptionalWriteable(getShardSearchRequest()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalCollection(knnResults); - } else { - if (knnResults != null && knnResults.size() > 1) { - throw new IllegalArgumentException( - "Cannot serialize multiple KNN results to nodes using previous transport version [" - + out.getTransportVersion().toReleaseVersion() - + "], minimum required transport version is [" - + TransportVersions.V_8_7_0.toReleaseVersion() - + "]" - ); - } - out.writeOptionalWriteable(knnResults == null || knnResults.isEmpty() ? null : knnResults.get(0)); + if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { + out.writeOptionalCollection(knnResults); + } else { + if (knnResults != null && knnResults.size() > 1) { + throw new IllegalArgumentException( + "Cannot serialize multiple KNN results to nodes using previous transport version [" + + out.getTransportVersion().toReleaseVersion() + + "], minimum required transport version is [" + + TransportVersions.V_8_7_0.toReleaseVersion() + + "]" + ); } + out.writeOptionalWriteable(knnResults == null || knnResults.isEmpty() ? null : knnResults.get(0)); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeOptionalWriteable(searchProfileDfsPhaseResult); - } + out.writeOptionalWriteable(searchProfileDfsPhaseResult); } public static void writeFieldStats(StreamOutput out, Map fieldStatistics) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java index 534c764c07b7b..66c9d3b9d73b6 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.fetch; import org.apache.lucene.search.ScoreDoc; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.OriginalIndices; import org.elasticsearch.action.support.IndicesOptions; @@ -61,11 +60,7 @@ public ShardFetchSearchRequest(StreamInput in) throws IOException { shardSearchRequest = in.readOptionalWriteable(ShardSearchRequest::new); rescoreDocIds = new RescoreDocIds(in); aggregatedDfs = in.readOptionalWriteable(AggregatedDfs::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.rankDocs = in.readOptionalWriteable(RankDocShardInfo::new); - } else { - this.rankDocs = null; - } + this.rankDocs = in.readOptionalWriteable(RankDocShardInfo::new); } @Override @@ -75,9 +70,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(shardSearchRequest); rescoreDocIds.writeTo(out); out.writeOptionalWriteable(aggregatedDfs); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalWriteable(rankDocs); - } + out.writeOptionalWriteable(rankDocs); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java index 2a48e8338e377..8aa15184d4eb0 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java @@ -11,7 +11,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.vectorhighlight.SimpleBoundaryScanner; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -122,9 +121,6 @@ public HighlightBuilder(HighlightBuilder template, QueryBuilder highlightQuery, */ public HighlightBuilder(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().before(TransportVersions.V_8_14_0)) { - encoder(in.readOptionalString()); - } useExplicitFieldOrder(in.readBoolean()); this.fields = in.readCollectionAsList(Field::new); assert this.equals(new HighlightBuilder(this, highlightQuery, fields)) : "copy constructor is broken"; @@ -132,9 +128,6 @@ public HighlightBuilder(StreamInput in) throws IOException { @Override protected void doWriteTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_14_0)) { - out.writeOptionalString(encoder); - } out.writeBoolean(useExplicitFieldOrder); out.writeCollection(fields); } diff --git a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java index 10d2fb0e23b3b..32ac446b85fdc 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java @@ -329,16 +329,7 @@ public ShardSearchRequest(StreamInput in) throws IOException { channelVersion = TransportVersion.min(TransportVersion.readVersion(in), in.getTransportVersion()); waitForCheckpoint = in.readLong(); waitForCheckpointsTimeout = in.readTimeValue(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - forceSyntheticSource = in.readBoolean(); - } else { - /* - * Synthetic source is not supported before 8.3.0 so any request - * from a coordinating node of that version will not want to - * force it. - */ - forceSyntheticSource = false; - } + forceSyntheticSource = in.readBoolean(); originalIndices = OriginalIndices.readOriginalIndices(in); } @@ -392,13 +383,7 @@ protected final void innerWriteTo(StreamOutput out, boolean asKey) throws IOExce TransportVersion.writeVersion(channelVersion, out); out.writeLong(waitForCheckpoint); out.writeTimeValue(waitForCheckpointsTimeout); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeBoolean(forceSyntheticSource); - } else { - if (forceSyntheticSource) { - throw new IllegalArgumentException("force_synthetic_source is not supported before 8.4.0"); - } - } + out.writeBoolean(forceSyntheticSource); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/profile/SearchProfileDfsPhaseResult.java b/server/src/main/java/org/elasticsearch/search/profile/SearchProfileDfsPhaseResult.java index 932aabfd3da20..7b9aeed767dc6 100644 --- a/server/src/main/java/org/elasticsearch/search/profile/SearchProfileDfsPhaseResult.java +++ b/server/src/main/java/org/elasticsearch/search/profile/SearchProfileDfsPhaseResult.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.profile; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -42,22 +41,13 @@ public SearchProfileDfsPhaseResult( public SearchProfileDfsPhaseResult(StreamInput in) throws IOException { dfsShardResult = in.readOptionalWriteable(ProfileResult::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - queryProfileShardResult = in.readOptionalCollectionAsList(QueryProfileShardResult::new); - } else { - QueryProfileShardResult singleResult = in.readOptionalWriteable(QueryProfileShardResult::new); - queryProfileShardResult = singleResult != null ? List.of(singleResult) : null; - } + queryProfileShardResult = in.readOptionalCollectionAsList(QueryProfileShardResult::new); } @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(dfsShardResult); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalCollection(queryProfileShardResult); - } else { - out.writeOptionalWriteable(combineQueryProfileShardResults()); - } + out.writeOptionalCollection(queryProfileShardResult); } public static final ParseField STATISTICS = new ParseField("statistics"); diff --git a/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java index 1b3af6c22ca51..8f97d18a78800 100644 --- a/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java +++ b/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java @@ -12,7 +12,6 @@ import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.TotalHits; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.SubscribableListener; import org.elasticsearch.common.io.stream.DelayableWriteable; @@ -453,11 +452,9 @@ private void readFromWithId(ShardSearchContextId id, StreamInput in, boolean del nodeQueueSize = in.readInt(); setShardSearchRequest(in.readOptionalWriteable(ShardSearchRequest::new)); setRescoreDocIds(new RescoreDocIds(in)); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - rankShardResult = in.readOptionalNamedWriteable(RankShardResult.class); - if (versionSupportsBatchedExecution(in.getTransportVersion())) { - reduced = in.readBoolean(); - } + rankShardResult = in.readOptionalNamedWriteable(RankShardResult.class); + if (versionSupportsBatchedExecution(in.getTransportVersion())) { + reduced = in.readBoolean(); } if (in.getTransportVersion().supports(TIMESTAMP_RANGE_TELEMETRY)) { timeRangeFilterFromMillis = in.readOptionalLong(); @@ -524,11 +521,7 @@ public void writeToNoId(StreamOutput out) throws IOException { out.writeInt(nodeQueueSize); out.writeOptionalWriteable(getShardSearchRequest()); getRescoreDocIds().writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalNamedWriteable(rankShardResult); - } else if (rankShardResult != null) { - throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]"); - } + out.writeOptionalNamedWriteable(rankShardResult); if (versionSupportsBatchedExecution(out.getTransportVersion())) { out.writeBoolean(reduced); } diff --git a/server/src/main/java/org/elasticsearch/search/vectors/ExactKnnQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/ExactKnnQueryBuilder.java index 77d708432cf26..9447429faaf93 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/ExactKnnQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/ExactKnnQueryBuilder.java @@ -49,17 +49,9 @@ public ExactKnnQueryBuilder(VectorData query, String field, Float vectorSimilari public ExactKnnQueryBuilder(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - this.query = in.readOptionalWriteable(VectorData::new); - } else { - this.query = VectorData.fromFloats(in.readFloatArray()); - } + this.query = in.readOptionalWriteable(VectorData::new); this.field = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.vectorSimilarity = in.readOptionalFloat(); - } else { - this.vectorSimilarity = null; - } + this.vectorSimilarity = in.readOptionalFloat(); } String getField() { @@ -81,15 +73,9 @@ public String getWriteableName() { @Override protected void doWriteTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalWriteable(query); - } else { - out.writeFloatArray(query.asFloatVector()); - } + out.writeOptionalWriteable(query); out.writeString(field); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalFloat(vectorSimilarity); - } + out.writeOptionalFloat(vectorSimilarity); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java index ddea64b43abaa..35f07bf2a29a3 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java @@ -68,26 +68,17 @@ public KnnScoreDocQueryBuilder( public KnnScoreDocQueryBuilder(StreamInput in) throws IOException { super(in); this.scoreDocs = in.readArray(Lucene::readScoreDoc, ScoreDoc[]::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - this.fieldName = in.readOptionalString(); - if (in.readBoolean()) { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - this.queryVector = in.readOptionalWriteable(VectorData::new); - } else { - this.queryVector = VectorData.fromFloats(in.readFloatArray()); - } + this.fieldName = in.readOptionalString(); + if (in.readBoolean()) { + if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { + this.queryVector = in.readOptionalWriteable(VectorData::new); } else { - this.queryVector = null; + this.queryVector = VectorData.fromFloats(in.readFloatArray()); } } else { - this.fieldName = null; this.queryVector = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.vectorSimilarity = in.readOptionalFloat(); - } else { - this.vectorSimilarity = null; - } + this.vectorSimilarity = in.readOptionalFloat(); if (in.getTransportVersion().supports(TO_CHILD_BLOCK_JOIN_QUERY)) { this.filterQueries = readQueries(in); } else { @@ -119,22 +110,18 @@ Float vectorSimilarity() { @Override protected void doWriteTo(StreamOutput out) throws IOException { out.writeArray(Lucene::writeScoreDoc, scoreDocs); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeOptionalString(fieldName); - if (queryVector != null) { - out.writeBoolean(true); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalWriteable(queryVector); - } else { - out.writeFloatArray(queryVector.asFloatVector()); - } + out.writeOptionalString(fieldName); + if (queryVector != null) { + out.writeBoolean(true); + if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { + out.writeOptionalWriteable(queryVector); } else { - out.writeBoolean(false); + out.writeFloatArray(queryVector.asFloatVector()); } + } else { + out.writeBoolean(false); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalFloat(vectorSimilarity); - } + out.writeOptionalFloat(vectorSimilarity); if (out.getTransportVersion().supports(TO_CHILD_BLOCK_JOIN_QUERY)) { writeQueries(out, filterQueries); } diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java index 22ad37b9a0dfd..18dc105560fe9 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java @@ -33,7 +33,6 @@ import java.util.Objects; import java.util.function.Supplier; -import static org.elasticsearch.TransportVersions.V_8_11_X; import static org.elasticsearch.common.Strings.format; import static org.elasticsearch.index.query.AbstractQueryBuilder.DEFAULT_BOOST; import static org.elasticsearch.search.SearchService.DEFAULT_SIZE; @@ -332,32 +331,14 @@ public KnnSearchBuilder(StreamInput in) throws IOException { } else { this.visitPercentage = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - this.queryVector = in.readOptionalWriteable(VectorData::new); - } else { - this.queryVector = VectorData.fromFloats(in.readFloatArray()); - } + this.queryVector = in.readOptionalWriteable(VectorData::new); this.filterQueries = in.readNamedWriteableCollectionAsList(QueryBuilder.class); this.boost = in.readFloat(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.queryName = in.readOptionalString(); - } else { - this.queryName = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.queryVectorBuilder = in.readOptionalNamedWriteable(QueryVectorBuilder.class); - } else { - this.queryVectorBuilder = null; - } + this.queryName = in.readOptionalString(); + this.queryVectorBuilder = in.readOptionalNamedWriteable(QueryVectorBuilder.class); this.querySupplier = null; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - this.similarity = in.readOptionalFloat(); - } else { - this.similarity = null; - } - if (in.getTransportVersion().onOrAfter(V_8_11_X)) { - this.innerHitBuilder = in.readOptionalWriteable(InnerHitBuilder::new); - } + this.similarity = in.readOptionalFloat(); + this.innerHitBuilder = in.readOptionalWriteable(InnerHitBuilder::new); if (in.getTransportVersion().onOrAfter(TransportVersions.KNN_QUERY_RESCORE_OVERSAMPLE)) { this.rescoreVectorBuilder = in.readOptional(RescoreVectorBuilder::new); } else { @@ -603,16 +584,10 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().supports(VISIT_PERCENTAGE)) { out.writeOptionalFloat(visitPercentage); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalWriteable(queryVector); - } else { - out.writeFloatArray(queryVector.asFloatVector()); - } + out.writeOptionalWriteable(queryVector); out.writeNamedWriteableCollection(filterQueries); out.writeFloat(boost); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalString(queryName); - } + out.writeOptionalString(queryName); if (out.getTransportVersion().before(TransportVersions.V_8_7_0) && queryVectorBuilder != null) { throw new IllegalArgumentException( format( @@ -622,15 +597,9 @@ public void writeTo(StreamOutput out) throws IOException { ) ); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalNamedWriteable(queryVectorBuilder); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalFloat(similarity); - } - if (out.getTransportVersion().onOrAfter(V_8_11_X)) { - out.writeOptionalWriteable(innerHitBuilder); - } + out.writeOptionalNamedWriteable(queryVectorBuilder); + out.writeOptionalFloat(similarity); + out.writeOptionalWriteable(innerHitBuilder); if (out.getTransportVersion().onOrAfter(TransportVersions.KNN_QUERY_RESCORE_OVERSAMPLE)) { out.writeOptionalWriteable(rescoreVectorBuilder); } diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java index 1139e0c3119fb..a482586425478 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java @@ -258,46 +258,17 @@ private KnnVectorQueryBuilder( public KnnVectorQueryBuilder(StreamInput in) throws IOException { super(in); this.fieldName = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.k = in.readOptionalVInt(); - } else { - this.k = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - this.numCands = in.readOptionalVInt(); - } else { - this.numCands = in.readVInt(); - } + this.k = in.readOptionalVInt(); + this.numCands = in.readOptionalVInt(); if (in.getTransportVersion().supports(VISIT_PERCENTAGE)) { this.visitPercentage = in.readOptionalFloat(); } else { this.visitPercentage = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - this.queryVector = in.readOptionalWriteable(VectorData::new); - } else { - if (in.getTransportVersion().before(TransportVersions.V_8_7_0) - || in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.queryVector = VectorData.fromFloats(in.readFloatArray()); - } else { - in.readBoolean(); - this.queryVector = VectorData.fromFloats(in.readFloatArray()); - in.readBoolean(); // used for byteQueryVector, which was always null - } - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - this.filterQueries.addAll(readQueries(in)); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - this.vectorSimilarity = in.readOptionalFloat(); - } else { - this.vectorSimilarity = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - this.queryVectorBuilder = in.readOptionalNamedWriteable(QueryVectorBuilder.class); - } else { - this.queryVectorBuilder = null; - } + this.queryVector = in.readOptionalWriteable(VectorData::new); + this.filterQueries.addAll(readQueries(in)); + this.vectorSimilarity = in.readOptionalFloat(); + this.queryVectorBuilder = in.readOptionalNamedWriteable(QueryVectorBuilder.class); if (in.getTransportVersion().onOrAfter(KNN_QUERY_RESCORE_OVERSAMPLE)) { this.rescoreVectorBuilder = in.readOptional(RescoreVectorBuilder::new); } else { @@ -364,45 +335,14 @@ protected void doWriteTo(StreamOutput out) throws IOException { throw new IllegalStateException("missing a rewriteAndFetch?"); } out.writeString(fieldName); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalVInt(k); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeOptionalVInt(numCands); - } else { - if (numCands == null) { - throw new IllegalArgumentException( - "[" - + NUM_CANDS_FIELD.getPreferredName() - + "] field was mandatory in previous releases " - + "and is required to be non-null by some nodes. " - + "Please make sure to provide the parameter as part of the request." - ); - } else { - out.writeVInt(numCands); - } - } + out.writeOptionalVInt(k); + out.writeOptionalVInt(numCands); if (out.getTransportVersion().supports(VISIT_PERCENTAGE)) { out.writeOptionalFloat(visitPercentage); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalWriteable(queryVector); - } else { - if (out.getTransportVersion().before(TransportVersions.V_8_7_0) - || out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeFloatArray(queryVector.asFloatVector()); - } else { - out.writeBoolean(true); - out.writeFloatArray(queryVector.asFloatVector()); - out.writeBoolean(false); // used for byteQueryVector, which was always null - } - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - writeQueries(out, filterQueries); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalFloat(vectorSimilarity); - } + out.writeOptionalWriteable(queryVector); + writeQueries(out, filterQueries); + out.writeOptionalFloat(vectorSimilarity); if (out.getTransportVersion().before(TransportVersions.V_8_14_0) && queryVectorBuilder != null) { throw new IllegalArgumentException( format( @@ -412,9 +352,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { ) ); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalNamedWriteable(queryVectorBuilder); - } + out.writeOptionalNamedWriteable(queryVectorBuilder); if (out.getTransportVersion().onOrAfter(KNN_QUERY_RESCORE_OVERSAMPLE)) { out.writeOptionalWriteable(rescoreVectorBuilder); } diff --git a/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java b/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java index b4c68d1284b63..f31ba2b437e43 100644 --- a/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java +++ b/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java @@ -9,7 +9,6 @@ package org.elasticsearch.transport; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.network.NetworkAddress; @@ -25,10 +24,6 @@ public class ActionTransportException extends TransportException { public ActionTransportException(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().before(TransportVersions.V_8_1_0)) { - in.readOptionalWriteable(TransportAddress::new); - in.readOptionalString(); - } } public ActionTransportException(String name, TransportAddress address, String action, Throwable cause) { @@ -46,10 +41,6 @@ public ActionTransportException(String name, InetSocketAddress address, String a @Override protected void writeTo(StreamOutput out, Writer nestedExceptionsWriter) throws IOException { super.writeTo(out, nestedExceptionsWriter); - if (out.getTransportVersion().before(TransportVersions.V_8_1_0)) { - out.writeMissingWriteable(TransportAddress.class); - out.writeMissingString(); // action - } } private static String buildMessage(String name, InetSocketAddress address, String action, String msg) { diff --git a/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java b/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java index 302175cc4f5a0..233bec25e85d0 100644 --- a/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java +++ b/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java @@ -9,7 +9,6 @@ package org.elasticsearch.transport; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -37,9 +36,6 @@ public ConnectTransportException(DiscoveryNode node, String msg, String action, public ConnectTransportException(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().before(TransportVersions.V_8_1_0)) { - in.readOptionalWriteable(DiscoveryNode::new); - } } /** @@ -57,8 +53,5 @@ public final RestStatus status() { @Override protected void writeTo(StreamOutput out, Writer nestedExceptionsWriter) throws IOException { super.writeTo(out, nestedExceptionsWriter); - if (out.getTransportVersion().before(TransportVersions.V_8_1_0)) { - out.writeMissingWriteable(DiscoveryNode.class); - } } } diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java index ae078479ba85c..cfeb746b56d6f 100644 --- a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java +++ b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java @@ -9,7 +9,6 @@ package org.elasticsearch.transport; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -52,11 +51,7 @@ public RemoteConnectionInfo(StreamInput input) throws IOException { initialConnectionTimeout = input.readTimeValue(); clusterAlias = input.readString(); skipUnavailable = input.readBoolean(); - if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - hasClusterCredentials = input.readBoolean(); - } else { - hasClusterCredentials = false; - } + hasClusterCredentials = input.readBoolean(); } public boolean isConnected() { @@ -82,9 +77,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeTimeValue(initialConnectionTimeout); out.writeString(clusterAlias); out.writeBoolean(skipUnavailable); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeBoolean(hasClusterCredentials); - } + out.writeBoolean(hasClusterCredentials); } @Override diff --git a/server/src/main/java/org/elasticsearch/transport/TransportStats.java b/server/src/main/java/org/elasticsearch/transport/TransportStats.java index c28e79f683435..f518d670bc3a7 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportStats.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportStats.java @@ -10,7 +10,6 @@ package org.elasticsearch.transport; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.collect.Iterators; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -85,11 +84,7 @@ public TransportStats(StreamInput in) throws IOException { for (int i = 0; i < inboundHandlingTimeBucketFrequencies.length; i++) { outboundHandlingTimeBucketFrequencies[i] = in.readVLong(); } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - transportActionStats = Collections.unmodifiableMap(in.readOrderedMap(StreamInput::readString, TransportActionStats::new)); - } else { - transportActionStats = Map.of(); - } + transportActionStats = Collections.unmodifiableMap(in.readOrderedMap(StreamInput::readString, TransportActionStats::new)); assert assertHistogramsConsistent(); } @@ -112,9 +107,7 @@ public void writeTo(StreamOutput out) throws IOException { for (long handlingTimeBucketFrequency : outboundHandlingTimeBucketFrequencies) { out.writeVLong(handlingTimeBucketFrequency); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeMap(transportActionStats, StreamOutput::writeWriteable); - } // else just drop these stats + out.writeMap(transportActionStats, StreamOutput::writeWriteable); } public long serverOpen() { diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java index 25c4c1672e852..10608d6f49a6a 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java @@ -175,10 +175,6 @@ private static RescoreVectorBuilder randomRescoreVectorBuilder() { public void testRandomVersionSerialization() throws IOException { SearchRequest searchRequest = createSearchRequest(); TransportVersion version = TransportVersionUtils.randomVersion(random()); - if (version.before(TransportVersions.V_8_4_0)) { - // Versions before 8.4.0 don't support force_synthetic_source - searchRequest.setForceSyntheticSource(false); - } if (version.before(TransportVersions.V_8_7_0) && searchRequest.hasKnnSearch() && searchRequest.source().knnSearch().size() > 1) { // Versions before 8.7.0 don't support more than one KNN clause searchRequest.source().knnSearch(List.of(searchRequest.source().knnSearch().get(0))); diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java index bbbf8404f1be7..722fb32b286ea 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java @@ -9,7 +9,6 @@ package org.elasticsearch.cluster.action.shard; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionTestUtils; import org.elasticsearch.cluster.ClusterState; @@ -439,19 +438,6 @@ public void testExpandsTimestampRangeForPrimary() throws Exception { } final var eventIngestedRange = resultingState.metadata().getProject().index(indexName).getEventIngestedRange(); - if (clusterState.getMinTransportVersion().before(TransportVersions.V_8_15_0)) { - assertThat(eventIngestedRange, sameInstance(IndexLongFieldRange.UNKNOWN)); - } else { - if (shardEventIngestedRange == ShardLongFieldRange.UNKNOWN) { - assertThat(eventIngestedRange, sameInstance(IndexLongFieldRange.UNKNOWN)); - } else if (shardEventIngestedRange == ShardLongFieldRange.EMPTY) { - assertThat(eventIngestedRange, sameInstance(IndexLongFieldRange.EMPTY)); - } else { - assertTrue(eventIngestedRange.isComplete()); - assertThat(eventIngestedRange.getMin(), equalTo(shardEventIngestedRange.getMin())); - assertThat(eventIngestedRange.getMax(), equalTo(shardEventIngestedRange.getMax())); - } - } } public void testExpandsTimestampRangeForReplica() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java index b189d7796b51a..8c6145f6e7609 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java @@ -599,11 +599,6 @@ public void testStartedShardEntrySerialization() throws Exception { assertThat(deserialized.primaryTerm, equalTo(primaryTerm)); assertThat(deserialized.message, equalTo(message)); assertThat(deserialized.timestampRange, equalTo(timestampRange)); - if (version.before(TransportVersions.V_8_15_0)) { - assertThat(deserialized.eventIngestedRange, equalTo(ShardLongFieldRange.UNKNOWN)); - } else { - assertThat(deserialized.eventIngestedRange, equalTo(eventIngestedRange)); - } } } diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/AbstractStreamTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/AbstractStreamTests.java index a6b493fad3883..8d32305072fe1 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/AbstractStreamTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/AbstractStreamTests.java @@ -787,16 +787,11 @@ public void checkZonedDateTimeSerialization(TransportVersion tv) throws IOExcept assertGenericRoundtrip(ofInstant(ofEpochSecond(randomLongBetween(minEpochSecond, maxEpochSecond)), randomZone()), tv); assertGenericRoundtrip(ofInstant(ofEpochSecond(randomLongBetween(minEpochSecond, maxEpochSecond), 1_000_000), randomZone()), tv); assertGenericRoundtrip(ofInstant(ofEpochSecond(randomLongBetween(minEpochSecond, maxEpochSecond), 999_000_000), randomZone()), tv); - if (tv.onOrAfter(TransportVersions.V_8_16_0)) { - assertGenericRoundtrip( - ofInstant(ofEpochSecond(randomLongBetween(minEpochSecond, maxEpochSecond), 999_999_999), randomZone()), - tv - ); - assertGenericRoundtrip( - ofInstant(ofEpochSecond(randomLongBetween(minEpochSecond, maxEpochSecond), randomIntBetween(0, 999_999_999)), randomZone()), - tv - ); - } + assertGenericRoundtrip(ofInstant(ofEpochSecond(randomLongBetween(minEpochSecond, maxEpochSecond), 999_999_999), randomZone()), tv); + assertGenericRoundtrip( + ofInstant(ofEpochSecond(randomLongBetween(minEpochSecond, maxEpochSecond), randomIntBetween(0, 999_999_999)), randomZone()), + tv + ); } public void testOptional() throws IOException { diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java index c6ab672c9f25b..f56b2ced6a7a0 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java @@ -10,7 +10,6 @@ package org.elasticsearch.indices.recovery; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNodeUtils; import org.elasticsearch.common.UUIDs; @@ -76,11 +75,7 @@ public void testSerialization() throws Exception { assertThat(outRequest.recoveryId(), equalTo(inRequest.recoveryId())); assertThat(outRequest.startingSeqNo(), equalTo(inRequest.startingSeqNo())); - if (serializationVersion.onOrAfter(TransportVersions.V_8_11_X)) { - assertEquals(outRequest.clusterStateVersion(), inRequest.clusterStateVersion()); - } else { - assertEquals(0L, inRequest.clusterStateVersion()); - } + assertEquals(outRequest.clusterStateVersion(), inRequest.clusterStateVersion()); } public void testDescription() { diff --git a/server/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java index c233dfc8e7de9..a0a900cbd3d37 100644 --- a/server/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java +++ b/server/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java @@ -10,7 +10,6 @@ package org.elasticsearch.search.suggest; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -304,18 +303,6 @@ public void testSerialization() throws IOException { // suggest is disallowed when using rank, but the randomization rarely sets it // we need to make sure CompletionSuggestion$Entry$Option doesn't have "rank" set // because for some older versions it will not serialize. - if (bwcVersion.before(TransportVersions.V_8_8_0)) { - for (CompletionSuggestion s : suggest.filter(CompletionSuggestion.class)) { - for (CompletionSuggestion.Entry entry : s.entries) { - List options = entry.getOptions(); - for (CompletionSuggestion.Entry.Option o : entry.getOptions()) { - if (o.getHit() != null) { - o.getHit().setRank(-1); - } - } - } - } - } final Suggest bwcSuggest; diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregationBuilder.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregationBuilder.java index ef99a55138482..cd2d7d06686b9 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregationBuilder.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregationBuilder.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.analytics.boxplot; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.aggregations.AggregationBuilder; @@ -83,11 +82,7 @@ protected AggregationBuilder shallowCopy(AggregatorFactories.Builder factoriesBu public BoxplotAggregationBuilder(StreamInput in) throws IOException { super(in); compression = in.readDouble(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - executionHint = in.readOptionalWriteable(TDigestExecutionHint::readFrom); - } else { - executionHint = TDigestExecutionHint.HIGH_ACCURACY; - } + executionHint = in.readOptionalWriteable(TDigestExecutionHint::readFrom); } @Override @@ -98,9 +93,7 @@ public Set metricNames() { @Override protected void innerWriteTo(StreamOutput out) throws IOException { out.writeDouble(compression); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeOptionalWriteable(executionHint); - } + out.writeOptionalWriteable(executionHint); } @Override diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java index 8ae6901cd3407..389d10f883c48 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java @@ -15,7 +15,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.io.stream.ByteArrayStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -400,11 +399,7 @@ public void parse(DocumentParserContext context) throws IOException { ); } else if (count > 0) { // we do not add elements with count == 0 - if (streamOutput.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - streamOutput.writeVLong(count); - } else { - streamOutput.writeVInt(Math.toIntExact(count)); - } + streamOutput.writeVLong(count); streamOutput.writeLong(Double.doubleToRawLongBits(values.get(i))); } } @@ -471,11 +466,7 @@ void reset(BytesRef bytesRef) { @Override public boolean next() throws IOException { if (streamInput.available() > 0) { - if (streamInput.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - count = streamInput.readVLong(); - } else { - count = streamInput.readVInt(); - } + count = streamInput.readVLong(); value = Double.longBitsToDouble(streamInput.readLong()); return true; } diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/InternalResetTrackingRate.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/InternalResetTrackingRate.java index 4cc457d68e5f3..721f9b9f99299 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/InternalResetTrackingRate.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/InternalResetTrackingRate.java @@ -65,11 +65,7 @@ public InternalResetTrackingRate(StreamInput in) throws IOException { this.startTime = in.readLong(); this.endTime = in.readLong(); this.resetCompensation = in.readDouble(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - this.rateUnit = Rounding.DateTimeUnit.resolve(in.readByte()); - } else { - this.rateUnit = Rounding.DateTimeUnit.SECOND_OF_MINUTE; - } + this.rateUnit = Rounding.DateTimeUnit.resolve(in.readByte()); } @Override diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/GetAutoscalingCapacityAction.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/GetAutoscalingCapacityAction.java index 5a7bc7c9b6da4..ad3557fa7a0d4 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/GetAutoscalingCapacityAction.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/GetAutoscalingCapacityAction.java @@ -7,11 +7,9 @@ package org.elasticsearch.xpack.autoscaling.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; -import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -47,17 +45,11 @@ public Request(TimeValue masterNodeTimeout) { public Request(final StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().before(TransportVersions.V_8_15_0)) { - in.readTimeValue(); // unused - } } @Override public void writeTo(final StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().before(TransportVersions.V_8_15_0)) { - out.writeTimeValue(AcknowledgedRequest.DEFAULT_ACK_TIMEOUT); // unused - } } @Override diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCapacity.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCapacity.java index f5197d4efe346..29baa8745fe31 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCapacity.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCapacity.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.autoscaling.capacity; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -46,11 +45,7 @@ public AutoscalingResources(ByteSizeValue storage, ByteSizeValue memory, Process public AutoscalingResources(StreamInput in) throws IOException { this.storage = in.readOptionalWriteable(ByteSizeValue::readFrom); this.memory = in.readOptionalWriteable(ByteSizeValue::readFrom); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.processors = in.readOptionalWriteable(Processors::readFrom); - } else { - this.processors = null; - } + this.processors = in.readOptionalWriteable(Processors::readFrom); } @Nullable @@ -88,9 +83,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(storage); out.writeOptionalWriteable(memory); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalWriteable(processors); - } + out.writeOptionalWriteable(processors); } public static AutoscalingResources max(AutoscalingResources sm1, AutoscalingResources sm2) { diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/FixedAutoscalingDeciderService.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/FixedAutoscalingDeciderService.java index 75106a967a9af..3a0ee92200b40 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/FixedAutoscalingDeciderService.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/FixedAutoscalingDeciderService.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.autoscaling.capacity; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.node.DiscoveryNodeRole; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -119,11 +118,7 @@ public FixedReason(StreamInput in) throws IOException { this.storage = in.readOptionalWriteable(ByteSizeValue::readFrom); this.memory = in.readOptionalWriteable(ByteSizeValue::readFrom); this.nodes = in.readInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.processors = in.readOptionalWriteable(Processors::readFrom); - } else { - this.processors = null; - } + this.processors = in.readOptionalWriteable(Processors::readFrom); } @Override @@ -149,9 +144,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(storage); out.writeOptionalWriteable(memory); out.writeInt(nodes); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalWriteable(processors); - } + out.writeOptionalWriteable(processors); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/LogsDBFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/LogsDBFeatureSetUsage.java index f35dcfadf0beb..698d932801eaa 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/LogsDBFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/LogsDBFeatureSetUsage.java @@ -28,13 +28,8 @@ public LogsDBFeatureSetUsage(StreamInput input) throws IOException { super(input); indicesCount = input.readVInt(); indicesWithSyntheticSource = input.readVInt(); - if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - numDocs = input.readVLong(); - sizeInBytes = input.readVLong(); - } else { - numDocs = 0; - sizeInBytes = 0; - } + numDocs = input.readVLong(); + sizeInBytes = input.readVLong(); var transportVersion = input.getTransportVersion(); if (transportVersion.isPatchFrom(TransportVersions.V_8_17_0) || transportVersion.onOrAfter(TransportVersions.LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE)) { @@ -49,10 +44,8 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeVInt(indicesCount); out.writeVInt(indicesWithSyntheticSource); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) { - out.writeVLong(numDocs); - out.writeVLong(sizeInBytes); - } + out.writeVLong(numDocs); + out.writeVLong(sizeInBytes); var transportVersion = out.getTransportVersion(); if (transportVersion.isPatchFrom(TransportVersions.V_8_17_0) || transportVersion.onOrAfter(TransportVersions.LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE)) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/action/PutFollowAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/action/PutFollowAction.java index b8990adab4af1..f47232f24f8a4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/action/PutFollowAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/action/PutFollowAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ccr.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -197,9 +196,7 @@ public Request(StreamInput in) throws IOException { this.settings = Settings.readSettingsFromStream(in); this.parameters = new FollowParameters(in); waitForActiveShards(ActiveShardCount.readFrom(in)); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.dataStreamName = in.readOptionalString(); - } + this.dataStreamName = in.readOptionalString(); } @Override @@ -211,9 +208,7 @@ public void writeTo(StreamOutput out) throws IOException { settings.writeTo(out); parameters.writeTo(out); waitForActiveShards.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalString(this.dataStreamName); - } + out.writeOptionalString(this.dataStreamName); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsage.java index bebe3f19df80a..62deaeec8aaf2 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsage.java @@ -113,47 +113,22 @@ public LifecycleStats( } public static LifecycleStats read(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - return new LifecycleStats( - in.readVLong(), - in.readBoolean(), - RetentionStats.read(in), - RetentionStats.read(in), - in.readMap(GlobalRetentionStats::new) - ); - } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - var dataStreamsWithLifecyclesCount = in.readVLong(); - var minDataRetention = in.readVLong(); - var maxDataRetention = in.readVLong(); - var avgDataRetention = in.readDouble(); - var defaultRolledOverUsed = in.readBoolean(); - return new LifecycleStats( - dataStreamsWithLifecyclesCount, - defaultRolledOverUsed, - new RetentionStats(dataStreamsWithLifecyclesCount, avgDataRetention, minDataRetention, maxDataRetention), - RetentionStats.NO_DATA, - Map.of() - ); - } else { - return INITIAL; - } + return new LifecycleStats( + in.readVLong(), + in.readBoolean(), + RetentionStats.read(in), + RetentionStats.read(in), + in.readMap(GlobalRetentionStats::new) + ); } @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeVLong(dataStreamsWithLifecyclesCount); - out.writeBoolean(defaultRolloverUsed); - dataRetentionStats.writeTo(out); - effectiveRetentionStats.writeTo(out); - out.writeMap(globalRetentionStats, (o, v) -> v.writeTo(o)); - } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeVLong(dataStreamsWithLifecyclesCount); - out.writeVLong(dataRetentionStats.minMillis() == null ? 0 : dataRetentionStats.minMillis()); - out.writeVLong(dataRetentionStats.maxMillis() == null ? 0 : dataRetentionStats.maxMillis()); - out.writeDouble(dataRetentionStats.avgMillis() == null ? 0 : dataRetentionStats.avgMillis()); - out.writeBoolean(defaultRolloverUsed); - } + out.writeVLong(dataStreamsWithLifecyclesCount); + out.writeBoolean(defaultRolloverUsed); + dataRetentionStats.writeTo(out); + effectiveRetentionStats.writeTo(out); + out.writeMap(globalRetentionStats, (o, v) -> v.writeTo(o)); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichPolicy.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichPolicy.java index 61020c7561fb3..180176bd05ccf 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichPolicy.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichPolicy.java @@ -6,8 +6,6 @@ */ package org.elasticsearch.xpack.core.enrich; -import org.elasticsearch.TransportVersions; -import org.elasticsearch.Version; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -117,10 +115,6 @@ public EnrichPolicy(StreamInput in) throws IOException { this.indices = in.readStringCollectionAsList(); this.matchField = in.readString(); this.enrichFields = in.readStringCollectionAsList(); - if (in.getTransportVersion().before(TransportVersions.V_8_12_0)) { - // consume the passed-in meaningless version that old elasticsearch clusters will send - Version.readVersion(in); - } } public EnrichPolicy(String type, QuerySource query, List indices, String matchField, List enrichFields) { @@ -208,10 +202,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeStringCollection(indices); out.writeString(matchField); out.writeStringCollection(enrichFields); - if (out.getTransportVersion().before(TransportVersions.V_8_12_0)) { - // emit the current version of elasticsearch for bwc serialization reasons - Version.writeVersion(Version.CURRENT, out); - } } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java index b1511718d127c..5cf404c705c50 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ilm; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -347,16 +346,8 @@ public IndexLifecycleExplainResponse(StreamInput in) throws IOException { repositoryName = in.readOptionalString(); snapshotName = in.readOptionalString(); shrinkIndexName = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - indexCreationDate = in.readOptionalLong(); - } else { - indexCreationDate = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - previousStepInfo = in.readOptionalBytesReference(); - } else { - previousStepInfo = null; - } + indexCreationDate = in.readOptionalLong(); + previousStepInfo = in.readOptionalBytesReference(); if (in.getTransportVersion().supports(ILM_ADD_SKIP_SETTING)) { skip = in.readBoolean(); } else { @@ -409,12 +400,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(repositoryName); out.writeOptionalString(snapshotName); out.writeOptionalString(shrinkIndexName); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeOptionalLong(indexCreationDate); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalBytesReference(previousStepInfo); - } + out.writeOptionalLong(indexCreationDate); + out.writeOptionalBytesReference(previousStepInfo); if (out.getTransportVersion().supports(ILM_ADD_SKIP_SETTING)) { out.writeBoolean(skip); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java index 03b9f899aeac8..93cc209f39d77 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleFeatureSetUsage.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ilm; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.indices.rollover.RolloverConditions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -427,24 +426,12 @@ public ActionConfigStats(StreamInput in) throws IOException { this.setPriorityPriority = in.readOptionalVInt(); this.shrinkMaxPrimaryShardSize = in.readOptionalWriteable(ByteSizeValue::readFrom); this.shrinkNumberOfShards = in.readOptionalVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - this.rolloverMaxPrimaryShardDocs = in.readOptionalVLong(); - } else { - this.rolloverMaxPrimaryShardDocs = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.rolloverMinAge = in.readOptionalTimeValue(); - this.rolloverMinDocs = in.readOptionalVLong(); - this.rolloverMinPrimaryShardSize = in.readOptionalWriteable(ByteSizeValue::readFrom); - this.rolloverMinSize = in.readOptionalWriteable(ByteSizeValue::readFrom); - this.rolloverMinPrimaryShardDocs = in.readOptionalVLong(); - } else { - this.rolloverMinAge = null; - this.rolloverMinDocs = null; - this.rolloverMinPrimaryShardSize = null; - this.rolloverMinSize = null; - this.rolloverMinPrimaryShardDocs = null; - } + this.rolloverMaxPrimaryShardDocs = in.readOptionalVLong(); + this.rolloverMinAge = in.readOptionalTimeValue(); + this.rolloverMinDocs = in.readOptionalVLong(); + this.rolloverMinPrimaryShardSize = in.readOptionalWriteable(ByteSizeValue::readFrom); + this.rolloverMinSize = in.readOptionalWriteable(ByteSizeValue::readFrom); + this.rolloverMinPrimaryShardDocs = in.readOptionalVLong(); } @Override @@ -458,16 +445,12 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalVInt(setPriorityPriority); out.writeOptionalWriteable(shrinkMaxPrimaryShardSize); out.writeOptionalVInt(shrinkNumberOfShards); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeOptionalVLong(rolloverMaxPrimaryShardDocs); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalTimeValue(rolloverMinAge); - out.writeOptionalVLong(rolloverMinDocs); - out.writeOptionalWriteable(rolloverMinPrimaryShardSize); - out.writeOptionalWriteable(rolloverMinSize); - out.writeOptionalVLong(rolloverMinPrimaryShardDocs); - } + out.writeOptionalVLong(rolloverMaxPrimaryShardDocs); + out.writeOptionalTimeValue(rolloverMinAge); + out.writeOptionalVLong(rolloverMinDocs); + out.writeOptionalWriteable(rolloverMinPrimaryShardSize); + out.writeOptionalWriteable(rolloverMinSize); + out.writeOptionalVLong(rolloverMinPrimaryShardDocs); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java index 9129e4f029dd6..8fdfd1a0e2699 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ilm; -import org.elasticsearch.TransportVersions; import org.elasticsearch.client.internal.Client; import org.elasticsearch.cluster.SimpleDiffable; import org.elasticsearch.common.Strings; @@ -113,11 +112,7 @@ public LifecyclePolicy(StreamInput in) throws IOException { name = in.readString(); phases = in.readImmutableMap(Phase::new); this.metadata = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.deprecated = in.readOptionalBoolean(); - } else { - this.deprecated = null; - } + this.deprecated = in.readOptionalBoolean(); } /** @@ -159,9 +154,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(name); out.writeMap(phases, StreamOutput::writeWriteable); out.writeGenericMap(this.metadata); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalBoolean(deprecated); - } + out.writeOptionalBoolean(deprecated); } /** diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java index f3c72004d6cc9..3603f28ec00a1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ilm; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.admin.indices.rollover.RolloverConditions; import org.elasticsearch.client.internal.Client; import org.elasticsearch.common.Strings; @@ -87,16 +86,12 @@ public static RolloverAction read(StreamInput in) throws IOException { builder.addMaxPrimaryShardSizeCondition(in.readOptionalWriteable(ByteSizeValue::readFrom)); builder.addMaxIndexAgeCondition(in.readOptionalTimeValue()); builder.addMaxIndexDocsCondition(in.readOptionalVLong()); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - builder.addMaxPrimaryShardDocsCondition(in.readOptionalVLong()); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - builder.addMinIndexSizeCondition(in.readOptionalWriteable(ByteSizeValue::readFrom)); - builder.addMinPrimaryShardSizeCondition(in.readOptionalWriteable(ByteSizeValue::readFrom)); - builder.addMinIndexAgeCondition(in.readOptionalTimeValue()); - builder.addMinIndexDocsCondition(in.readOptionalVLong()); - builder.addMinPrimaryShardDocsCondition(in.readOptionalVLong()); - } + builder.addMaxPrimaryShardDocsCondition(in.readOptionalVLong()); + builder.addMinIndexSizeCondition(in.readOptionalWriteable(ByteSizeValue::readFrom)); + builder.addMinPrimaryShardSizeCondition(in.readOptionalWriteable(ByteSizeValue::readFrom)); + builder.addMinIndexAgeCondition(in.readOptionalTimeValue()); + builder.addMinIndexDocsCondition(in.readOptionalVLong()); + builder.addMinPrimaryShardDocsCondition(in.readOptionalVLong()); return new RolloverAction(builder.build()); } @@ -105,24 +100,13 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(conditions.getMaxSize()); out.writeOptionalWriteable(conditions.getMaxPrimaryShardSize()); out.writeOptionalTimeValue(conditions.getMaxAge()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeOptionalVLong(conditions.getMaxDocs()); - out.writeOptionalVLong(conditions.getMaxPrimaryShardDocs()); - } else { - // With an older version and if maxDocs is empty, we use maxPrimaryShardDocs in its place. - if (conditions.getMaxDocs() == null) { - out.writeOptionalVLong(conditions.getMaxPrimaryShardDocs()); - } else { - out.writeOptionalVLong(conditions.getMaxDocs()); - } - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalWriteable(conditions.getMinSize()); - out.writeOptionalWriteable(conditions.getMinPrimaryShardSize()); - out.writeOptionalTimeValue(conditions.getMinAge()); - out.writeOptionalVLong(conditions.getMinDocs()); - out.writeOptionalVLong(conditions.getMinPrimaryShardDocs()); - } + out.writeOptionalVLong(conditions.getMaxDocs()); + out.writeOptionalVLong(conditions.getMaxPrimaryShardDocs()); + out.writeOptionalWriteable(conditions.getMinSize()); + out.writeOptionalWriteable(conditions.getMinPrimaryShardSize()); + out.writeOptionalTimeValue(conditions.getMinAge()); + out.writeOptionalVLong(conditions.getMinDocs()); + out.writeOptionalVLong(conditions.getMinPrimaryShardDocs()); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotAction.java index 50f5d70054282..855a9349a346b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotAction.java @@ -594,9 +594,7 @@ public String getWriteableName() { public void writeTo(StreamOutput out) throws IOException { out.writeString(snapshotRepository); out.writeBoolean(forceMergeIndex); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalInt(totalShardsPerNode); - } + out.writeOptionalInt(totalShardsPerNode); if (out.getTransportVersion().onOrAfter(ILM_ADD_SEARCHABLE_SNAPSHOT_ADD_REPLICATE_FOR)) { out.writeOptionalTimeValue(replicateFor); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ShrinkAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ShrinkAction.java index 177cd5badcfb1..33189d8aa9326 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ShrinkAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ShrinkAction.java @@ -133,9 +133,7 @@ public void writeTo(StreamOutput out) throws IOException { } else { maxPrimaryShardSize.writeTo(out); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeBoolean(this.allowWriteAfterShrink); - } + out.writeBoolean(this.allowWriteAfterShrink); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/DeleteInferenceEndpointAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/DeleteInferenceEndpointAction.java index c3f991a8b4e1e..ec2d490582565 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/DeleteInferenceEndpointAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/DeleteInferenceEndpointAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.inference.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; @@ -50,13 +49,8 @@ public Request(StreamInput in) throws IOException { super(in); this.inferenceEndpointId = in.readString(); this.taskType = TaskType.fromStream(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.forceDelete = Boolean.TRUE.equals(in.readOptionalBoolean()); - this.dryRun = Boolean.TRUE.equals(in.readOptionalBoolean()); - } else { - this.forceDelete = false; - this.dryRun = false; - } + this.forceDelete = Boolean.TRUE.equals(in.readOptionalBoolean()); + this.dryRun = Boolean.TRUE.equals(in.readOptionalBoolean()); } public String getInferenceEndpointId() { @@ -80,10 +74,8 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(inferenceEndpointId); taskType.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalBoolean(forceDelete); - out.writeOptionalBoolean(dryRun); - } + out.writeOptionalBoolean(forceDelete); + out.writeOptionalBoolean(dryRun); } @Override @@ -121,32 +113,19 @@ public Response(boolean acknowledged, Set pipelineIds, Set seman public Response(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - pipelineIds = in.readCollectionAsSet(StreamInput::readString); - } else { - pipelineIds = Set.of(); - } + pipelineIds = in.readCollectionAsSet(StreamInput::readString); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - indexes = in.readCollectionAsSet(StreamInput::readString); - dryRunMessage = in.readOptionalString(); - } else { - indexes = Set.of(); - dryRunMessage = null; - } + indexes = in.readCollectionAsSet(StreamInput::readString); + dryRunMessage = in.readOptionalString(); } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeCollection(pipelineIds, StreamOutput::writeString); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeCollection(indexes, StreamOutput::writeString); - out.writeOptionalString(dryRunMessage); - } + out.writeCollection(pipelineIds, StreamOutput::writeString); + out.writeCollection(indexes, StreamOutput::writeString); + out.writeOptionalString(dryRunMessage); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceModelAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceModelAction.java index 8bf264024d119..3bfaa94ecfdf1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceModelAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceModelAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.inference.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; @@ -19,7 +18,6 @@ import org.elasticsearch.xcontent.XContentBuilder; import java.io.IOException; -import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -59,11 +57,7 @@ public Request(StreamInput in) throws IOException { super(in); this.inferenceEntityId = in.readString(); this.taskType = TaskType.fromStream(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.persistDefaultConfig = in.readBoolean(); - } else { - this.persistDefaultConfig = PERSIST_DEFAULT_CONFIGS; - } + this.persistDefaultConfig = in.readBoolean(); } public String getInferenceEntityId() { @@ -83,9 +77,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(inferenceEntityId); taskType.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeBoolean(this.persistDefaultConfig); - } + out.writeBoolean(this.persistDefaultConfig); } @Override @@ -113,12 +105,7 @@ public Response(List endpoints) { } public Response(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - endpoints = in.readCollectionAsList(ModelConfigurations::new); - } else { - endpoints = new ArrayList<>(); - endpoints.add(new ModelConfigurations(in)); - } + endpoints = in.readCollectionAsList(ModelConfigurations::new); } public List getEndpoints() { @@ -127,11 +114,7 @@ public List getEndpoints() { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeCollection(endpoints); - } else { - endpoints.get(0).writeTo(out); - } + out.writeCollection(endpoints); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java index c3066a56447c9..bcecf8e1870de 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java @@ -9,7 +9,6 @@ import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -164,25 +163,12 @@ public Request(StreamInput in) throws IOException { super(in); this.taskType = TaskType.fromStream(in); this.inferenceEntityId = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.input = in.readStringCollectionAsList(); - } else { - this.input = List.of(in.readString()); - } + this.input = in.readStringCollectionAsList(); this.taskSettings = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - this.inputType = in.readEnum(InputType.class); - } else { - this.inputType = InputType.UNSPECIFIED; - } + this.inputType = in.readEnum(InputType.class); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - this.query = in.readOptionalString(); - this.inferenceTimeout = in.readTimeValue(); - } else { - this.query = null; - this.inferenceTimeout = DEFAULT_TIMEOUT; - } + this.query = in.readOptionalString(); + this.inferenceTimeout = in.readTimeValue(); if (in.getTransportVersion().supports(RERANK_COMMON_OPTIONS_ADDED)) { this.returnDocuments = in.readOptionalBoolean(); @@ -298,21 +284,13 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); taskType.writeTo(out); out.writeString(inferenceEntityId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeStringCollection(input); - } else { - out.writeString(input.get(0)); - } + out.writeStringCollection(input); out.writeGenericMap(taskSettings); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeEnum(getInputTypeToWrite(inputType, out.getTransportVersion())); - } + out.writeEnum(getInputTypeToWrite(inputType, out.getTransportVersion())); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) { - out.writeOptionalString(query); - out.writeTimeValue(inferenceTimeout); - } + out.writeOptionalString(query); + out.writeTimeValue(inferenceTimeout); if (out.getTransportVersion().supports(RERANK_COMMON_OPTIONS_ADDED)) { out.writeOptionalBoolean(returnDocuments); @@ -322,13 +300,6 @@ public void writeTo(StreamOutput out) throws IOException { // default for easier testing static InputType getInputTypeToWrite(InputType inputType, TransportVersion version) { - if (version.before(TransportVersions.V_8_13_0)) { - if (validEnumsBeforeUnspecifiedAdded.contains(inputType) == false) { - return InputType.INGEST; - } else if (validEnumsBeforeClassificationClusteringAdded.contains(inputType) == false) { - return InputType.UNSPECIFIED; - } - } return inputType; } @@ -509,13 +480,7 @@ public Response(InferenceServiceResults results, Flow.Publisher asMap() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java index 844a61d0221b7..4b8fb8c7f4ec0 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.XContentBuilder; @@ -66,11 +65,7 @@ public MachineLearningFeatureSetUsage(StreamInput in) throws IOException { this.analyticsUsage = in.readGenericMap(); this.inferenceUsage = in.readGenericMap(); this.nodeCount = in.readInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.memoryUsage = in.readGenericMap(); - } else { - this.memoryUsage = Map.of(); - } + this.memoryUsage = in.readGenericMap(); } @Override @@ -86,9 +81,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(analyticsUsage); out.writeGenericMap(inferenceUsage); out.writeInt(nodeCount); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeGenericMap(memoryUsage); - } + out.writeGenericMap(memoryUsage); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CreateTrainedModelAssignmentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CreateTrainedModelAssignmentAction.java index 47aed64e49912..a3ec9233e1957 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CreateTrainedModelAssignmentAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CreateTrainedModelAssignmentAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -47,11 +46,7 @@ public Request(StartTrainedModelDeploymentAction.TaskParams taskParams, Adaptive public Request(StreamInput in) throws IOException { super(in); this.taskParams = new StartTrainedModelDeploymentAction.TaskParams(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.adaptiveAllocationsSettings = in.readOptionalWriteable(AdaptiveAllocationsSettings::new); - } else { - this.adaptiveAllocationsSettings = null; - } + this.adaptiveAllocationsSettings = in.readOptionalWriteable(AdaptiveAllocationsSettings::new); } @Override @@ -63,9 +58,7 @@ public ActionRequestValidationException validate() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); taskParams.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalWriteable(adaptiveAllocationsSettings); - } + out.writeOptionalWriteable(adaptiveAllocationsSettings); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteJobAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteJobAction.java index 99b045d19bdd0..4b3d2929f6fbc 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteJobAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteJobAction.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; @@ -52,11 +51,7 @@ public Request(StreamInput in) throws IOException { super(in); jobId = in.readString(); force = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - deleteUserAnnotations = in.readBoolean(); - } else { - deleteUserAnnotations = false; - } + deleteUserAnnotations = in.readBoolean(); } public String getJobId() { @@ -105,9 +100,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(jobId); out.writeBoolean(force); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeBoolean(deleteUserAnnotations); - } + out.writeBoolean(deleteUserAnnotations); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteTrainedModelAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteTrainedModelAction.java index d76c4e2db064a..0ffb5d97a028e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteTrainedModelAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteTrainedModelAction.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; @@ -40,11 +39,7 @@ public static class Request extends AcknowledgedRequest implements ToXC public Request(StreamInput in) throws IOException { super(in); id = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - force = in.readBoolean(); - } else { - force = false; - } + force = in.readBoolean(); } public Request(String id) { @@ -83,9 +78,7 @@ public boolean equals(Object o) { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(id); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeBoolean(force); - } + out.writeBoolean(force); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedRunningStateAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedRunningStateAction.java index 7dc3015091dae..1441e4a38361a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedRunningStateAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedRunningStateAction.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.tasks.BaseTasksRequest; import org.elasticsearch.action.support.tasks.BaseTasksResponse; @@ -100,11 +99,7 @@ public RunningState(boolean realTimeConfigured, boolean realTimeRunning, @Nullab public RunningState(StreamInput in) throws IOException { this.realTimeConfigured = in.readBoolean(); this.realTimeRunning = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - this.searchInterval = in.readOptionalWriteable(SearchInterval::new); - } else { - this.searchInterval = null; - } + this.searchInterval = in.readOptionalWriteable(SearchInterval::new); } @Override @@ -126,9 +121,7 @@ public int hashCode() { public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(realTimeConfigured); out.writeBoolean(realTimeRunning); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeOptionalWriteable(searchInterval); - } + out.writeOptionalWriteable(searchInterval); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java index f465e5212ddd2..fc5cbc647ac79 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -174,29 +173,11 @@ public Request(StreamInput in) throws IOException { this.objectsToInfer = in.readCollectionAsImmutableList(StreamInput::readGenericMap); this.update = in.readNamedWriteable(InferenceConfigUpdate.class); this.previouslyLicensed = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - this.inferenceTimeout = in.readTimeValue(); - } else { - this.inferenceTimeout = TimeValue.MAX_VALUE; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - textInput = in.readOptionalStringCollectionAsList(); - } else { - textInput = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - highPriority = in.readBoolean(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - prefixType = in.readEnum(TrainedModelPrefixStrings.PrefixType.class); - } else { - prefixType = TrainedModelPrefixStrings.PrefixType.NONE; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - chunked = in.readBoolean(); - } else { - chunked = false; - } + this.inferenceTimeout = in.readTimeValue(); + textInput = in.readOptionalStringCollectionAsList(); + highPriority = in.readBoolean(); + prefixType = in.readEnum(TrainedModelPrefixStrings.PrefixType.class); + chunked = in.readBoolean(); } public int numberOfDocuments() { @@ -267,21 +248,11 @@ public void writeTo(StreamOutput out) throws IOException { out.writeCollection(objectsToInfer, StreamOutput::writeGenericMap); out.writeNamedWriteable(update); out.writeBoolean(previouslyLicensed); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - out.writeTimeValue(inferenceTimeout); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalStringCollection(textInput); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeBoolean(highPriority); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeEnum(prefixType); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(chunked); - } + out.writeTimeValue(inferenceTimeout); + out.writeOptionalStringCollection(textInput); + out.writeBoolean(highPriority); + out.writeEnum(prefixType); + out.writeBoolean(chunked); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java index eb41ff4ce870d..ed7813c64172a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.tasks.BaseTasksRequest; @@ -125,24 +124,10 @@ public Request(StreamInput in) throws IOException { docs = in.readCollectionAsImmutableList(StreamInput::readGenericMap); update = in.readOptionalNamedWriteable(InferenceConfigUpdate.class); inferenceTimeout = in.readOptionalTimeValue(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - highPriority = in.readBoolean(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - textInput = in.readOptionalStringCollectionAsList(); - } else { - textInput = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - prefixType = in.readEnum(TrainedModelPrefixStrings.PrefixType.class); - } else { - prefixType = TrainedModelPrefixStrings.PrefixType.NONE; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - chunkResults = in.readBoolean(); - } else { - chunkResults = false; - } + highPriority = in.readBoolean(); + textInput = in.readOptionalStringCollectionAsList(); + prefixType = in.readEnum(TrainedModelPrefixStrings.PrefixType.class); + chunkResults = in.readBoolean(); } public String getId() { @@ -223,18 +208,10 @@ public void writeTo(StreamOutput out) throws IOException { out.writeCollection(docs, StreamOutput::writeGenericMap); out.writeOptionalNamedWriteable(update); out.writeOptionalTimeValue(inferenceTimeout); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - out.writeBoolean(highPriority); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalStringCollection(textInput); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeEnum(prefixType); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(chunkResults); - } + out.writeBoolean(highPriority); + out.writeOptionalStringCollection(textInput); + out.writeEnum(prefixType); + out.writeBoolean(chunkResults); } @Override @@ -282,22 +259,14 @@ public Response(StreamInput in) throws IOException { super(in); // Multiple results added in 8.6.1 - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_1)) { - results = in.readNamedWriteableCollectionAsList(InferenceResults.class); - } else { - results = List.of(in.readNamedWriteable(InferenceResults.class)); - } + results = in.readNamedWriteableCollectionAsList(InferenceResults.class); } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_1)) { - out.writeNamedWriteableCollection(results); - } else { - out.writeNamedWriteable(results.get(0)); - } + out.writeNamedWriteableCollection(results); } public List getResults() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedAction.java index 968d0b3fb38aa..98d81735ee5b8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedAction.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -86,13 +85,8 @@ public Request(StreamInput in) throws IOException { datafeedId = in.readString(); datafeedConfig = in.readOptionalWriteable(DatafeedConfig::new); jobConfig = in.readOptionalWriteable(Job.Builder::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - this.startTime = in.readOptionalLong(); - this.endTime = in.readOptionalLong(); - } else { - this.startTime = null; - this.endTime = null; - } + this.startTime = in.readOptionalLong(); + this.endTime = in.readOptionalLong(); } public Request(String datafeedId, String start, String end) { @@ -164,10 +158,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(datafeedId); out.writeOptionalWriteable(datafeedConfig); out.writeOptionalWriteable(jobConfig); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - out.writeOptionalLong(startTime); - out.writeOptionalLong(endTime); - } + out.writeOptionalLong(startTime); + out.writeOptionalLong(endTime); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelAction.java index 0cfd763da3a36..ba0ac39ebc2c7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelAction.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -85,11 +84,7 @@ public Request(StreamInput in) throws IOException { super(in); this.config = new TrainedModelConfig(in); this.deferDefinitionDecompression = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - this.waitForCompletion = in.readBoolean(); - } else { - this.waitForCompletion = false; - } + this.waitForCompletion = in.readBoolean(); } public TrainedModelConfig getTrainedModelConfig() { @@ -125,9 +120,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); config.writeTo(out); out.writeBoolean(deferDefinitionDecompression); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeBoolean(waitForCompletion); - } + out.writeBoolean(waitForCompletion); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelVocabularyAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelVocabularyAction.java index 106f37a378897..bd46c71dc2918 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelVocabularyAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelVocabularyAction.java @@ -82,16 +82,8 @@ public Request(StreamInput in) throws IOException { super(in); this.modelId = in.readString(); this.vocabulary = in.readStringCollectionAsList(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - this.merges = in.readStringCollectionAsList(); - } else { - this.merges = List.of(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - this.scores = in.readCollectionAsList(StreamInput::readDouble); - } else { - this.scores = List.of(); - } + this.merges = in.readStringCollectionAsList(); + this.scores = in.readCollectionAsList(StreamInput::readDouble); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) { this.allowOverwriting = in.readBoolean(); } else { @@ -134,12 +126,8 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(modelId); out.writeStringCollection(vocabulary); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeStringCollection(merges); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeCollection(scores, StreamOutput::writeDouble); - } + out.writeStringCollection(merges); + out.writeCollection(scores, StreamOutput::writeDouble); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) { out.writeBoolean(allowOverwriting); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ResetJobAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ResetJobAction.java index ea030feab320a..40859681f149d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ResetJobAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ResetJobAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; @@ -62,11 +61,7 @@ public Request(StreamInput in) throws IOException { super(in); jobId = in.readString(); skipJobStateValidation = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - deleteUserAnnotations = in.readBoolean(); - } else { - deleteUserAnnotations = false; - } + deleteUserAnnotations = in.readBoolean(); } @Override @@ -74,9 +69,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(jobId); out.writeBoolean(skipJobStateValidation); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeBoolean(deleteUserAnnotations); - } + out.writeBoolean(deleteUserAnnotations); } public void setSkipJobStateValidation(boolean skipJobStateValidation) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java index d16c4a2fc20a2..bac9e7d89ea34 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.MasterNodeRequest; @@ -168,31 +167,13 @@ public Request(StreamInput in) throws IOException { modelId = in.readString(); timeout = in.readTimeValue(); waitForState = in.readEnum(AllocationStatus.State.class); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - numberOfAllocations = in.readOptionalVInt(); - } else { - numberOfAllocations = in.readVInt(); - } + numberOfAllocations = in.readOptionalVInt(); threadsPerAllocation = in.readVInt(); queueCapacity = in.readVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - this.priority = in.readEnum(Priority.class); - } else { - this.priority = Priority.NORMAL; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - this.deploymentId = in.readString(); - } else { - this.deploymentId = modelId; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.adaptiveAllocationsSettings = in.readOptionalWriteable(AdaptiveAllocationsSettings::new); - } else { - this.adaptiveAllocationsSettings = null; - } + this.cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); + this.priority = in.readEnum(Priority.class); + this.deploymentId = in.readString(); + this.adaptiveAllocationsSettings = in.readOptionalWriteable(AdaptiveAllocationsSettings::new); } public final void setModelId(String modelId) { @@ -296,25 +277,13 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(modelId); out.writeTimeValue(timeout); out.writeEnum(waitForState); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalVInt(numberOfAllocations); - } else { - out.writeVInt(numberOfAllocations); - } + out.writeOptionalVInt(numberOfAllocations); out.writeVInt(threadsPerAllocation); out.writeVInt(queueCapacity); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalWriteable(cacheSize); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeEnum(priority); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeString(deploymentId); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalWriteable(adaptiveAllocationsSettings); - } + out.writeOptionalWriteable(cacheSize); + out.writeEnum(priority); + out.writeString(deploymentId); + out.writeOptionalWriteable(adaptiveAllocationsSettings); } @Override @@ -577,21 +546,9 @@ public TaskParams(StreamInput in) throws IOException { this.threadsPerAllocation = in.readVInt(); this.numberOfAllocations = in.readVInt(); this.queueCapacity = in.readVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); - } else { - this.cacheSize = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - this.priority = in.readEnum(Priority.class); - } else { - this.priority = Priority.NORMAL; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - this.deploymentId = in.readString(); - } else { - this.deploymentId = modelId; - } + this.cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); + this.priority = in.readEnum(Priority.class); + this.deploymentId = in.readString(); if (in.getTransportVersion().onOrAfter(TrainedModelConfig.VERSION_ALLOCATION_MEMORY_ADDED)) { // We store additional model usage per allocation in the task params. @@ -645,15 +602,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVInt(threadsPerAllocation); out.writeVInt(numberOfAllocations); out.writeVInt(queueCapacity); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalWriteable(cacheSize); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeEnum(priority); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeString(deploymentId); - } + out.writeOptionalWriteable(cacheSize); + out.writeEnum(priority); + out.writeString(deploymentId); if (out.getTransportVersion().onOrAfter(TrainedModelConfig.VERSION_ALLOCATION_MEMORY_ADDED)) { out.writeLong(perDeploymentMemoryBytes); out.writeLong(perAllocationMemoryBytes); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StopTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StopTrainedModelDeploymentAction.java index b8fb383f53671..2077584930713 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StopTrainedModelDeploymentAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StopTrainedModelDeploymentAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.tasks.BaseTasksRequest; import org.elasticsearch.action.support.tasks.BaseTasksResponse; @@ -79,11 +78,7 @@ public Request(StreamInput in) throws IOException { allowNoMatch = in.readBoolean(); force = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - finishPendingWork = in.readBoolean(); - } else { - finishPendingWork = false; - } + finishPendingWork = in.readBoolean(); } private Request() {} @@ -132,9 +127,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(allowNoMatch); out.writeBoolean(force); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeBoolean(finishPendingWork); - } + out.writeBoolean(finishPendingWork); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateTrainedModelDeploymentAction.java index 2018c9526ec83..797233260db60 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateTrainedModelDeploymentAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateTrainedModelDeploymentAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; @@ -87,15 +86,6 @@ public Request(String deploymentId) { public Request(StreamInput in) throws IOException { super(in); deploymentId = in.readString(); - if (in.getTransportVersion().before(TransportVersions.V_8_16_0)) { - numberOfAllocations = in.readVInt(); - adaptiveAllocationsSettings = null; - isInternal = false; - } else { - numberOfAllocations = in.readOptionalVInt(); - adaptiveAllocationsSettings = in.readOptionalWriteable(AdaptiveAllocationsSettings::new); - isInternal = in.readBoolean(); - } } public final void setDeploymentId(String deploymentId) { @@ -134,13 +124,6 @@ public AdaptiveAllocationsSettings getAdaptiveAllocationsSettings() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(deploymentId); - if (out.getTransportVersion().before(TransportVersions.V_8_16_0)) { - out.writeVInt(numberOfAllocations); - } else { - out.writeOptionalVInt(numberOfAllocations); - out.writeOptionalWriteable(adaptiveAllocationsSettings); - out.writeBoolean(isInternal); - } } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/calendars/ScheduledEvent.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/calendars/ScheduledEvent.java index 742daa1bf6137..55e62af2f4b9c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/calendars/ScheduledEvent.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/calendars/ScheduledEvent.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.calendars; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -115,15 +114,9 @@ public ScheduledEvent(StreamInput in) throws IOException { description = in.readString(); startTime = in.readInstant(); endTime = in.readInstant(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - skipResult = in.readBoolean(); - skipModelUpdate = in.readBoolean(); - forceTimeShift = in.readOptionalInt(); - } else { - skipResult = true; - skipModelUpdate = true; - forceTimeShift = null; - } + skipResult = in.readBoolean(); + skipModelUpdate = in.readBoolean(); + forceTimeShift = in.readOptionalInt(); calendarId = in.readString(); eventId = in.readOptionalString(); } @@ -204,11 +197,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(description); out.writeInstant(startTime); out.writeInstant(endTime); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeBoolean(skipResult); - out.writeBoolean(skipModelUpdate); - out.writeOptionalInt(forceTimeShift); - } + out.writeBoolean(skipResult); + out.writeBoolean(skipModelUpdate); + out.writeOptionalInt(forceTimeShift); out.writeString(calendarId); out.writeOptionalString(eventId); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java index 779c6ef263ebe..5acbaf1c76395 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.dataframe; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -191,12 +190,8 @@ public DataFrameAnalyticsConfig(StreamInput in) throws IOException { this.version = in.readBoolean() ? MlConfigVersion.readVersion(in) : null; this.allowLazyStart = in.readBoolean(); this.maxNumThreads = in.readVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - Map readMeta = in.readGenericMap(); - this.meta = readMeta == null ? null : Collections.unmodifiableMap(readMeta); - } else { - this.meta = null; - } + Map readMeta = in.readGenericMap(); + this.meta = readMeta == null ? null : Collections.unmodifiableMap(readMeta); } public String getId() { @@ -323,9 +318,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeBoolean(allowLazyStart); out.writeVInt(maxNumThreads); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeGenericMap(meta); - } + out.writeGenericMap(meta); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigUpdate.java index 403e4f6de0e36..e628aee31c3ef 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigUpdate.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.dataframe; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -83,12 +82,8 @@ public DataFrameAnalyticsConfigUpdate(StreamInput in) throws IOException { this.modelMemoryLimit = in.readOptionalWriteable(ByteSizeValue::readFrom); this.allowLazyStart = in.readOptionalBoolean(); this.maxNumThreads = in.readOptionalVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - Map readMeta = in.readGenericMap(); - this.meta = readMeta == null ? null : Collections.unmodifiableMap(readMeta); - } else { - this.meta = null; - } + Map readMeta = in.readGenericMap(); + this.meta = readMeta == null ? null : Collections.unmodifiableMap(readMeta); } @Override @@ -98,9 +93,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(modelMemoryLimit); out.writeOptionalBoolean(allowLazyStart); out.writeOptionalVInt(maxNumThreads); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeGenericMap(meta); - } + out.writeGenericMap(meta); } public String getId() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsTaskState.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsTaskState.java index 61c18c7c84161..aa48bd91c5aad 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsTaskState.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsTaskState.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.dataframe; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -84,11 +83,7 @@ public DataFrameAnalyticsTaskState(StreamInput in) throws IOException { this.state = DataFrameAnalyticsState.fromStream(in); this.allocationId = in.readLong(); this.reason = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - lastStateChangeTime = in.readOptionalInstant(); - } else { - lastStateChangeTime = null; - } + lastStateChangeTime = in.readOptionalInstant(); } public DataFrameAnalyticsState getState() { @@ -129,9 +124,7 @@ public void writeTo(StreamOutput out) throws IOException { state.writeTo(out); out.writeLong(allocationId); out.writeOptionalString(reason); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalInstant(lastStateChangeTime); - } + out.writeOptionalInstant(lastStateChangeTime); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java index 9fc42d9fa5de7..402ea1443a3b3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java @@ -279,21 +279,10 @@ public TrainedModelConfig(StreamInput in) throws IOException { this.inferenceConfig = in.readOptionalNamedWriteable(InferenceConfig.class); this.modelType = in.readOptionalEnum(TrainedModelType.class); this.location = in.readOptionalNamedWriteable(TrainedModelLocation.class); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - modelPackageConfig = in.readOptionalWriteable(ModelPackageConfig::new); - fullDefinition = in.readOptionalBoolean(); - } else { - modelPackageConfig = null; - fullDefinition = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - platformArchitecture = in.readOptionalString(); - } else { - platformArchitecture = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - prefixStrings = in.readOptionalWriteable(TrainedModelPrefixStrings::new); - } + modelPackageConfig = in.readOptionalWriteable(ModelPackageConfig::new); + fullDefinition = in.readOptionalBoolean(); + platformArchitecture = in.readOptionalString(); + prefixStrings = in.readOptionalWriteable(TrainedModelPrefixStrings::new); } public boolean isPackagedModel() { @@ -468,18 +457,12 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalEnum(modelType); out.writeOptionalNamedWriteable(location); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalWriteable(modelPackageConfig); - out.writeOptionalBoolean(fullDefinition); - } + out.writeOptionalWriteable(modelPackageConfig); + out.writeOptionalBoolean(fullDefinition); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeOptionalString(platformArchitecture); - } + out.writeOptionalString(platformArchitecture); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalWriteable(prefixStrings); - } + out.writeOptionalWriteable(prefixStrings); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AssignmentStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AssignmentStats.java index a518654ec6785..1163f2d667171 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AssignmentStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AssignmentStats.java @@ -163,40 +163,17 @@ public NodeStats(StreamInput in) throws IOException { this.pendingCount = in.readOptionalVInt(); this.routingState = in.readOptionalWriteable(RoutingStateAndReason::new); this.startTime = in.readOptionalInstant(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - this.threadsPerAllocation = in.readOptionalVInt(); - this.numberOfAllocations = in.readOptionalVInt(); - this.errorCount = in.readVInt(); - this.rejectedExecutionCount = in.readVInt(); - this.timeoutCount = in.readVInt(); - } else { - this.threadsPerAllocation = null; - this.numberOfAllocations = null; - this.errorCount = 0; - this.rejectedExecutionCount = 0; - this.timeoutCount = 0; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - this.peakThroughput = in.readVLong(); - this.throughputLastPeriod = in.readVLong(); - this.avgInferenceTimeLastPeriod = in.readOptionalDouble(); - } else { - this.peakThroughput = 0; - this.throughputLastPeriod = 0; - this.avgInferenceTimeLastPeriod = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.cacheHitCount = in.readOptionalVLong(); - this.cacheHitCountLastPeriod = in.readOptionalVLong(); - } else { - this.cacheHitCount = null; - this.cacheHitCountLastPeriod = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - this.avgInferenceTimeExcludingCacheHit = in.readOptionalDouble(); - } else { - this.avgInferenceTimeExcludingCacheHit = null; - } + this.threadsPerAllocation = in.readOptionalVInt(); + this.numberOfAllocations = in.readOptionalVInt(); + this.errorCount = in.readVInt(); + this.rejectedExecutionCount = in.readVInt(); + this.timeoutCount = in.readVInt(); + this.peakThroughput = in.readVLong(); + this.throughputLastPeriod = in.readVLong(); + this.avgInferenceTimeLastPeriod = in.readOptionalDouble(); + this.cacheHitCount = in.readOptionalVLong(); + this.cacheHitCountLastPeriod = in.readOptionalVLong(); + this.avgInferenceTimeExcludingCacheHit = in.readOptionalDouble(); } @@ -342,25 +319,17 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalVInt(pendingCount); out.writeOptionalWriteable(routingState); out.writeOptionalInstant(startTime); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeOptionalVInt(threadsPerAllocation); - out.writeOptionalVInt(numberOfAllocations); - out.writeVInt(errorCount); - out.writeVInt(rejectedExecutionCount); - out.writeVInt(timeoutCount); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeVLong(peakThroughput); - out.writeVLong(throughputLastPeriod); - out.writeOptionalDouble(avgInferenceTimeLastPeriod); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalVLong(cacheHitCount); - out.writeOptionalVLong(cacheHitCountLastPeriod); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - out.writeOptionalDouble(avgInferenceTimeExcludingCacheHit); - } + out.writeOptionalVInt(threadsPerAllocation); + out.writeOptionalVInt(numberOfAllocations); + out.writeVInt(errorCount); + out.writeVInt(rejectedExecutionCount); + out.writeVInt(timeoutCount); + out.writeVLong(peakThroughput); + out.writeVLong(throughputLastPeriod); + out.writeOptionalDouble(avgInferenceTimeLastPeriod); + out.writeOptionalVLong(cacheHitCount); + out.writeOptionalVLong(cacheHitCountLastPeriod); + out.writeOptionalDouble(avgInferenceTimeExcludingCacheHit); } @Override @@ -484,26 +453,10 @@ public AssignmentStats(StreamInput in) throws IOException { state = in.readOptionalEnum(AssignmentState.class); reason = in.readOptionalString(); allocationStatus = in.readOptionalWriteable(AllocationStatus::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); - } else { - cacheSize = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - priority = in.readEnum(Priority.class); - } else { - priority = Priority.NORMAL; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - deploymentId = in.readString(); - } else { - deploymentId = modelId; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - adaptiveAllocationsSettings = in.readOptionalWriteable(AdaptiveAllocationsSettings::new); - } else { - adaptiveAllocationsSettings = null; - } + cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); + priority = in.readEnum(Priority.class); + deploymentId = in.readString(); + adaptiveAllocationsSettings = in.readOptionalWriteable(AdaptiveAllocationsSettings::new); } public String getDeploymentId() { @@ -679,18 +632,10 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeOptionalString(reason); out.writeOptionalWriteable(allocationStatus); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalWriteable(cacheSize); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeEnum(priority); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeString(deploymentId); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalWriteable(adaptiveAllocationsSettings); - } + out.writeOptionalWriteable(cacheSize); + out.writeEnum(priority); + out.writeString(deploymentId); + out.writeOptionalWriteable(adaptiveAllocationsSettings); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/RoutingInfo.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/RoutingInfo.java index 6e7cdf6e9ab03..43d0ff61b46eb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/RoutingInfo.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/RoutingInfo.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.inference.assignment; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -75,13 +74,8 @@ public RoutingInfo(int currentAllocations, int targetAllocations, RoutingState s } public RoutingInfo(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.currentAllocations = in.readVInt(); - this.targetAllocations = in.readVInt(); - } else { - this.currentAllocations = 0; - this.targetAllocations = 0; - } + this.currentAllocations = in.readVInt(); + this.targetAllocations = in.readVInt(); this.state = in.readEnum(RoutingState.class); this.reason = in.readOptionalString(); } @@ -120,10 +114,8 @@ public boolean isOutdated() { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeVInt(currentAllocations); - out.writeVInt(targetAllocations); - } + out.writeVInt(currentAllocations); + out.writeVInt(targetAllocations); out.writeEnum(state); out.writeOptionalString(reason); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/RoutingInfoUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/RoutingInfoUpdate.java index 8458db7a3d641..4d90c0eb4b80a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/RoutingInfoUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/RoutingInfoUpdate.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.inference.assignment; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -35,24 +34,14 @@ private RoutingInfoUpdate(Optional numberOfAllocations, Optional calculateAllocationStatus() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/AbstractTokenizationUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/AbstractTokenizationUpdate.java index 0431472302414..8ff0bf3ea3639 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/AbstractTokenizationUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/AbstractTokenizationUpdate.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -34,11 +33,7 @@ public AbstractTokenizationUpdate(@Nullable Tokenization.Truncate truncate, @Nul public AbstractTokenizationUpdate(StreamInput in) throws IOException { this.truncate = in.readOptionalEnum(Tokenization.Truncate.class); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - this.span = in.readOptionalInt(); - } else { - this.span = null; - } + this.span = in.readOptionalInt(); } @Override @@ -62,9 +57,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalEnum(truncate); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeOptionalInt(span); - } + out.writeOptionalInt(span); } public Integer getSpan() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java index cfbc6c6701427..312d0a826d053 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -178,16 +177,8 @@ public ModelPackageConfig(StreamInput in) throws IOException { this.modelType = in.readOptionalString(); this.tags = in.readOptionalCollectionAsList(StreamInput::readString); this.vocabularyFile = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - this.platformArchitecture = in.readOptionalString(); - } else { - platformArchitecture = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - prefixStrings = in.readOptionalWriteable(TrainedModelPrefixStrings::new); - } else { - prefixStrings = null; - } + this.platformArchitecture = in.readOptionalString(); + prefixStrings = in.readOptionalWriteable(TrainedModelPrefixStrings::new); } public String getPackagedModelId() { @@ -312,12 +303,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(modelType); out.writeOptionalStringCollection(tags); out.writeOptionalString(vocabularyFile); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeOptionalString(platformArchitecture); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalWriteable(prefixStrings); - } + out.writeOptionalString(platformArchitecture); + out.writeOptionalWriteable(prefixStrings); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NlpConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NlpConfigUpdate.java index 328c851d63be6..9980ef6d9f6a6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NlpConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NlpConfigUpdate.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -84,18 +83,12 @@ public NlpConfigUpdate(@Nullable TokenizationUpdate tokenizationUpdate) { } public NlpConfigUpdate(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - tokenizationUpdate = in.readOptionalNamedWriteable(TokenizationUpdate.class); - } else { - tokenizationUpdate = null; - } + tokenizationUpdate = in.readOptionalNamedWriteable(TokenizationUpdate.class); } @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeOptionalNamedWriteable(tokenizationUpdate); - } + out.writeOptionalNamedWriteable(tokenizationUpdate); } protected boolean isNoop() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfig.java index e21d594fbd9f4..34074d4d9d0a4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfig.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -114,11 +113,7 @@ public TextEmbeddingConfig(StreamInput in) throws IOException { vocabularyConfig = new VocabularyConfig(in); tokenization = in.readNamedWriteable(Tokenization.class); resultsField = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - embeddingSize = in.readOptionalVInt(); - } else { - embeddingSize = null; - } + embeddingSize = in.readOptionalVInt(); } @Override @@ -146,9 +141,7 @@ public void writeTo(StreamOutput out) throws IOException { vocabularyConfig.writeTo(out); out.writeNamedWriteable(tokenization); out.writeOptionalString(resultsField); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalVInt(embeddingSize); - } + out.writeOptionalVInt(embeddingSize); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/Tokenization.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/Tokenization.java index a7c46a68538c0..b2640d43f25f8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/Tokenization.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/Tokenization.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.ElasticsearchStatusException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.NamedWriteable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -134,11 +133,7 @@ public Tokenization(StreamInput in) throws IOException { this.withSpecialTokens = in.readBoolean(); this.maxSequenceLength = in.readVInt(); this.truncate = in.readEnum(Truncate.class); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - this.span = in.readInt(); - } else { - this.span = UNSET_SPAN_VALUE; - } + this.span = in.readInt(); } /** @@ -177,9 +172,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(withSpecialTokens); out.writeVInt(maxSequenceLength); out.writeEnum(truncate); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeInt(span); - } + out.writeInt(span); } public abstract String getMaskToken(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java index 4bdced325311f..0330a15180059 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.job.config; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -68,11 +67,7 @@ public DetectionRule(StreamInput in) throws IOException { actions = in.readEnumSet(RuleAction.class); scope = new RuleScope(in); conditions = in.readCollectionAsList(RuleCondition::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - params = new RuleParams(in); - } else { - params = new RuleParams(); - } + params = new RuleParams(in); } @Override @@ -80,9 +75,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeEnumSet(actions); scope.writeTo(out); out.writeCollection(conditions); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - params.writeTo(out); - } + params.writeTo(out); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobTaskState.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobTaskState.java index 64c449020daa8..523a060f96a04 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobTaskState.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobTaskState.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.job.config; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -80,11 +79,7 @@ public JobTaskState(StreamInput in) throws IOException { state = JobState.fromStream(in); allocationId = in.readLong(); reason = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - lastStateChangeTime = in.readOptionalInstant(); - } else { - lastStateChangeTime = null; - } + lastStateChangeTime = in.readOptionalInstant(); } public JobState getState() { @@ -136,9 +131,7 @@ public void writeTo(StreamOutput out) throws IOException { state.writeTo(out); out.writeLong(allocationId); out.writeOptionalString(reason); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalInstant(lastStateChangeTime); - } + out.writeOptionalInstant(lastStateChangeTime); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/output/FlushAcknowledgement.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/output/FlushAcknowledgement.java index 24a6668a0c016..a223472bdfc54 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/output/FlushAcknowledgement.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/output/FlushAcknowledgement.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.job.process.autodetect.output; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -66,20 +65,14 @@ public FlushAcknowledgement(String id, Instant lastFinalizedBucketEnd, Boolean r public FlushAcknowledgement(StreamInput in) throws IOException { id = in.readString(); lastFinalizedBucketEnd = in.readOptionalInstant(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - refreshRequired = in.readBoolean(); - } else { - refreshRequired = true; - } + refreshRequired = in.readBoolean(); } @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(id); out.writeOptionalInstant(lastFinalizedBucketEnd); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeBoolean(refreshRequired); - } + out.writeBoolean(refreshRequired); } public String getId() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSizeStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSizeStats.java index 3a9123445e697..c2371d0cf8768 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSizeStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSizeStats.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.job.process.autodetect.state; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -264,11 +263,7 @@ public ModelSizeStats(StreamInput in) throws IOException { } else { assignmentMemoryBasis = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - outputMemoryAllocatorBytes = in.readOptionalVLong(); - } else { - outputMemoryAllocatorBytes = null; - } + outputMemoryAllocatorBytes = in.readOptionalVLong(); categorizedDocCount = in.readVLong(); totalCategoryCount = in.readVLong(); frequentCategoryCount = in.readVLong(); @@ -306,9 +301,7 @@ public void writeTo(StreamOutput out) throws IOException { } else { out.writeBoolean(false); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalVLong(outputMemoryAllocatorBytes); - } + out.writeOptionalVLong(outputMemoryAllocatorBytes); out.writeVLong(categorizedDocCount); out.writeVLong(totalCategoryCount); out.writeVLong(frequentCategoryCount); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/search/TextExpansionQueryBuilder.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/search/TextExpansionQueryBuilder.java index aa30bb4574306..87c93f83589b0 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/search/TextExpansionQueryBuilder.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/search/TextExpansionQueryBuilder.java @@ -86,11 +86,7 @@ public TextExpansionQueryBuilder(StreamInput in) throws IOException { this.fieldName = in.readString(); this.modelText = in.readString(); this.modelId = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - this.tokenPruningConfig = in.readOptionalWriteable(TokenPruningConfig::new); - } else { - this.tokenPruningConfig = null; - } + this.tokenPruningConfig = in.readOptionalWriteable(TokenPruningConfig::new); } private TextExpansionQueryBuilder(TextExpansionQueryBuilder other, SetOnce weightedTokensSupplier) { @@ -129,9 +125,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeString(fieldName); out.writeString(modelText); out.writeString(modelId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeOptionalWriteable(tokenPruningConfig); - } + out.writeOptionalWriteable(tokenPruningConfig); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncStatusResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncStatusResponse.java index 89d4be514adde..b4f3696e04136 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncStatusResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncStatusResponse.java @@ -134,11 +134,7 @@ public AsyncStatusResponse(StreamInput in) throws IOException { this.skippedShards = in.readVInt(); this.failedShards = in.readVInt(); this.completionStatus = (this.isRunning == false) ? RestStatus.readFrom(in) : null; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - this.clusters = in.readOptionalWriteable(SearchResponse.Clusters::new); - } else { - this.clusters = null; - } + this.clusters = in.readOptionalWriteable(SearchResponse.Clusters::new); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) { this.completionTimeMillis = in.readOptionalVLong(); } else { @@ -160,10 +156,8 @@ public void writeTo(StreamOutput out) throws IOException { if (isRunning == false) { RestStatus.writeTo(out, completionStatus); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - // optional since only CCS uses is; it is null for local-only searches - out.writeOptionalWriteable(clusters); - } + // optional since only CCS uses is; it is null for local-only searches + out.writeOptionalWriteable(clusters); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) { out.writeOptionalVLong(completionTimeMillis); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java index 8731804f03046..168bead7aca92 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.security; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.XContentBuilder; @@ -63,15 +62,9 @@ public SecurityFeatureSetUsage(StreamInput in) throws IOException { roleMappingStoreUsage = in.readGenericMap(); fips140Usage = in.readGenericMap(); operatorPrivilegesUsage = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - domainsUsage = in.readGenericMap(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - userProfileUsage = in.readGenericMap(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - remoteClusterServerUsage = in.readGenericMap(); - } + domainsUsage = in.readGenericMap(); + userProfileUsage = in.readGenericMap(); + remoteClusterServerUsage = in.readGenericMap(); } public SecurityFeatureSetUsage( @@ -127,15 +120,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(roleMappingStoreUsage); out.writeGenericMap(fips140Usage); out.writeGenericMap(operatorPrivilegesUsage); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeGenericMap(domainsUsage); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - out.writeGenericMap(userProfileUsage); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeGenericMap(remoteClusterServerUsage); - } + out.writeGenericMap(domainsUsage); + out.writeGenericMap(userProfileUsage); + out.writeGenericMap(remoteClusterServerUsage); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/Grant.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/Grant.java index c98564251cd43..98802d2513e9a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/Grant.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/Grant.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.security.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -57,16 +56,8 @@ public Grant(StreamInput in) throws IOException { this.username = in.readOptionalString(); this.password = in.readOptionalSecureString(); this.accessToken = in.readOptionalSecureString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.runAsUsername = in.readOptionalString(); - } else { - this.runAsUsername = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.clientAuthentication = in.readOptionalWriteable(ClientAuthentication::new); - } else { - this.clientAuthentication = null; - } + this.runAsUsername = in.readOptionalString(); + this.clientAuthentication = in.readOptionalWriteable(ClientAuthentication::new); } public void writeTo(StreamOutput out) throws IOException { @@ -74,12 +65,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(username); out.writeOptionalSecureString(password); out.writeOptionalSecureString(accessToken); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalString(runAsUsername); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalWriteable(clientAuthentication); - } + out.writeOptionalString(runAsUsername); + out.writeOptionalWriteable(clientAuthentication); } public String getType() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/settings/UpdateSecuritySettingsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/settings/UpdateSecuritySettingsAction.java index d438450a68328..4fb0479f4029f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/settings/UpdateSecuritySettingsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/settings/UpdateSecuritySettingsAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.security.action.settings; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.ValidateActions; @@ -135,9 +134,7 @@ private Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, StreamInput i @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - super.writeTo(out); - } + super.writeTo(out); out.writeGenericMap(this.mainIndexSettings); out.writeGenericMap(this.tokensIndexSettings); out.writeGenericMap(this.profilesIndexSettings); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateRequest.java index 5f22c73aa8ce4..1175ddb0e3087 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateRequest.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -20,10 +19,6 @@ public class AuthenticateRequest extends LegacyActionRequest { public AuthenticateRequest(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().before(TransportVersions.V_8_5_0)) { - // Older versions included the username as a field - in.readString(); - } } private AuthenticateRequest() {} @@ -37,8 +32,5 @@ public ActionRequestValidationException validate() { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().before(TransportVersions.V_8_5_0)) { - throw new IllegalStateException("cannot send authenticate request to a node of earlier version"); - } } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java index 59b8c21733b8c..dcca0f60c7c35 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -51,11 +50,7 @@ public GetUserPrivilegesResponse(StreamInput in) throws IOException { index = in.readCollectionAsImmutableSet(Indices::new); application = in.readCollectionAsImmutableSet(RoleDescriptor.ApplicationResourcePrivileges::new); runAs = in.readCollectionAsImmutableSet(StreamInput::readString); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - remoteIndex = in.readCollectionAsImmutableSet(RemoteIndices::new); - } else { - remoteIndex = Set.of(); - } + remoteIndex = in.readCollectionAsImmutableSet(RemoteIndices::new); if (in.getTransportVersion().onOrAfter(ROLE_REMOTE_CLUSTER_PRIVS)) { remoteClusterPermissions = new RemoteClusterPermissions(in); } else { @@ -124,17 +119,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeCollection(index); out.writeCollection(application); out.writeStringCollection(runAs); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeCollection(remoteIndex); - } else if (hasRemoteIndicesPrivileges()) { - throw new IllegalArgumentException( - "versions of Elasticsearch before [" - + TransportVersions.V_8_8_0.toReleaseVersion() - + "] can't handle remote indices privileges and attempted to send to [" - + out.getTransportVersion().toReleaseVersion() - + "]" - ); - } + out.writeCollection(remoteIndex); if (out.getTransportVersion().onOrAfter(ROLE_REMOTE_CLUSTER_PRIVS)) { remoteClusterPermissions.writeTo(out); } else if (hasRemoteClusterPrivileges()) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersRequest.java index 6ad0d6ace842f..8e387cc2282cf 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersRequest.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; @@ -28,11 +27,7 @@ public class GetUsersRequest extends LegacyActionRequest implements UserRequest public GetUsersRequest(StreamInput in) throws IOException { super(in); usernames = in.readStringArray(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - withProfileUid = in.readBoolean(); - } else { - withProfileUid = false; - } + withProfileUid = in.readBoolean(); } public GetUsersRequest() { @@ -77,9 +72,7 @@ public void setWithProfileUid(boolean withProfileUid) { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeStringArray(usernames); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - out.writeBoolean(withProfileUid); - } + out.writeBoolean(withProfileUid); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersResponse.java index c7f51b21f4920..a0e1b127a6797 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersResponse.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -57,13 +56,11 @@ public void writeTo(StreamOutput out) throws IOException { Authentication.AuthenticationSerializationHelper.writeUserTo(user, out); } } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - if (profileUidLookup != null) { - out.writeBoolean(true); - out.writeMap(profileUidLookup, StreamOutput::writeString); - } else { - out.writeBoolean(false); - } + if (profileUidLookup != null) { + out.writeBoolean(true); + out.writeMap(profileUidLookup, StreamOutput::writeString); + } else { + out.writeBoolean(false); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java index 9f5aaa8562a88..df71392974839 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java @@ -215,11 +215,7 @@ public RoleDescriptor(StreamInput in) throws IOException { this.applicationPrivileges = in.readArray(ApplicationResourcePrivileges::new, ApplicationResourcePrivileges[]::new); this.configurableClusterPrivileges = ConfigurableClusterPrivileges.readArray(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - this.remoteIndicesPrivileges = in.readArray(RemoteIndicesPrivileges::new, RemoteIndicesPrivileges[]::new); - } else { - this.remoteIndicesPrivileges = RemoteIndicesPrivileges.NONE; - } + this.remoteIndicesPrivileges = in.readArray(RemoteIndicesPrivileges::new, RemoteIndicesPrivileges[]::new); if (in.getTransportVersion().onOrAfter(WORKFLOWS_RESTRICTION_VERSION)) { this.restriction = new Restriction(in); } else { @@ -484,9 +480,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(transientMetadata); out.writeArray(ApplicationResourcePrivileges::write, applicationPrivileges); ConfigurableClusterPrivileges.writeArray(out, getConditionalClusterPrivileges()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeArray(remoteIndicesPrivileges); - } + out.writeArray(remoteIndicesPrivileges); if (out.getTransportVersion().onOrAfter(WORKFLOWS_RESTRICTION_VERSION)) { restriction.writeTo(out); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ConfigurableClusterPrivileges.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ConfigurableClusterPrivileges.java index 7eeaf8d19c49f..d2de5dd731c18 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ConfigurableClusterPrivileges.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ConfigurableClusterPrivileges.java @@ -9,7 +9,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -82,16 +81,7 @@ public static ConfigurableClusterPrivilege[] readArray(StreamInput in) throws IO * Utility method to write an array of {@link ConfigurableClusterPrivilege} objects to a {@link StreamOutput} */ public static void writeArray(StreamOutput out, ConfigurableClusterPrivilege[] privileges) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeArray(WRITER, privileges); - } else { - out.writeArray( - WRITER, - Arrays.stream(privileges) - .filter(privilege -> privilege instanceof ManageRolesPrivilege == false) - .toArray(ConfigurableClusterPrivilege[]::new) - ); - } + out.writeArray(WRITER, privileges); } /** diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/support/SecurityMigrationTaskParams.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/support/SecurityMigrationTaskParams.java index e69a058914634..0b55e4393de52 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/support/SecurityMigrationTaskParams.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/support/SecurityMigrationTaskParams.java @@ -48,19 +48,13 @@ public SecurityMigrationTaskParams(int migrationVersion, boolean migrationNeeded public SecurityMigrationTaskParams(StreamInput in) throws IOException { this.migrationVersion = in.readInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.migrationNeeded = in.readBoolean(); - } else { - this.migrationNeeded = true; - } + this.migrationNeeded = in.readBoolean(); } @Override public void writeTo(StreamOutput out) throws IOException { out.writeInt(migrationVersion); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeBoolean(migrationNeeded); - } + out.writeBoolean(migrationNeeded); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/cert/CertificateInfo.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/cert/CertificateInfo.java index d477b7a58f8ad..b8d0501c5511f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/cert/CertificateInfo.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/cert/CertificateInfo.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ssl.cert; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -63,11 +62,7 @@ public CertificateInfo(StreamInput in) throws IOException { this.serialNumber = in.readString(); this.hasPrivateKey = in.readBoolean(); this.expiry = Instant.ofEpochMilli(in.readLong()).atZone(ZoneOffset.UTC); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - this.issuer = in.readString(); - } else { - this.issuer = ""; - } + this.issuer = in.readString(); } @Override @@ -79,9 +74,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(serialNumber); out.writeBoolean(hasPrivateKey); out.writeLong(expiry.toInstant().toEpochMilli()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeString(issuer); - } + out.writeString(issuer); } @Nullable diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/NodeTermsEnumResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/NodeTermsEnumResponse.java index ed27df9b61115..2df81591c99d4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/NodeTermsEnumResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/NodeTermsEnumResponse.java @@ -7,15 +7,12 @@ package org.elasticsearch.xpack.core.termsenum.action; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.transport.TransportResponse; import java.io.IOException; import java.util.List; -import java.util.stream.Collectors; /** * Internal response of a terms enum request executed directly against a specific shard. @@ -30,15 +27,6 @@ class NodeTermsEnumResponse extends TransportResponse { private final String nodeId; NodeTermsEnumResponse(StreamInput in) throws IOException { - if (in.getTransportVersion().before(TransportVersions.V_8_2_0)) { - terms = in.readCollectionAsList(r -> { - String term = r.readString(); - in.readLong(); // obsolete docCount field - return term; - }); - } else { - terms = in.readStringCollectionAsList(); - } error = in.readOptionalString(); complete = in.readBoolean(); nodeId = in.readString(); @@ -69,14 +57,6 @@ private NodeTermsEnumResponse(String nodeId, List terms, String error, b @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_2_0)) { - out.writeCollection(terms.stream().map(term -> (Writeable) out1 -> { - out1.writeString(term); - out1.writeLong(1); // obsolete docCount field - }).collect(Collectors.toList())); - } else { - out.writeStringCollection(terms); - } out.writeOptionalString(error); out.writeBoolean(complete); out.writeString(nodeId); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/AbstractFindStructureRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/AbstractFindStructureRequest.java index 3f202fafb588d..9276312835674 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/AbstractFindStructureRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/AbstractFindStructureRequest.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.textstructure.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -81,11 +80,7 @@ public abstract class AbstractFindStructureRequest extends LegacyActionRequest { quote = in.readBoolean() ? (char) in.readVInt() : null; shouldTrimFields = in.readOptionalBoolean(); grokPattern = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - ecsCompatibility = in.readOptionalString(); - } else { - ecsCompatibility = null; - } + ecsCompatibility = in.readOptionalString(); timestampFormat = in.readOptionalString(); timestampField = in.readOptionalString(); } @@ -327,9 +322,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeOptionalBoolean(shouldTrimFields); out.writeOptionalString(grokPattern); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - out.writeOptionalString(ecsCompatibility); - } + out.writeOptionalString(ecsCompatibility); out.writeOptionalString(timestampFormat); out.writeOptionalString(timestampField); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/TextStructure.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/TextStructure.java index 6c49d94a4ee90..0b502fbbcbbd1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/TextStructure.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/TextStructure.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.textstructure.structurefinder; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -226,11 +225,7 @@ public TextStructure(StreamInput in) throws IOException { quote = in.readBoolean() ? (char) in.readVInt() : null; shouldTrimFields = in.readOptionalBoolean(); grokPattern = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - ecsCompatibility = getNonNullEcsCompatibilityString(in.readString()); - } else { - ecsCompatibility = getNonNullEcsCompatibilityString(null); - } + ecsCompatibility = getNonNullEcsCompatibilityString(in.readString()); jodaTimestampFormats = in.readBoolean() ? in.readCollectionAsImmutableList(StreamInput::readString) : null; javaTimestampFormats = in.readBoolean() ? in.readCollectionAsImmutableList(StreamInput::readString) : null; timestampField = in.readOptionalString(); @@ -272,9 +267,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeOptionalBoolean(shouldTrimFields); out.writeOptionalString(grokPattern); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - out.writeString(ecsCompatibility); - } + out.writeString(ecsCompatibility); if (jodaTimestampFormats == null) { out.writeBoolean(false); } else { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/DeleteTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/DeleteTransformAction.java index 79ae38745934d..5c160456b8d31 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/DeleteTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/DeleteTransformAction.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.transform.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; @@ -44,11 +43,7 @@ public Request(StreamInput in) throws IOException { super(in); id = in.readString(); force = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - deleteDestIndex = in.readBoolean(); - } else { - deleteDestIndex = false; - } + deleteDestIndex = in.readBoolean(); } public String getId() { @@ -68,9 +63,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(id); out.writeBoolean(force); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeBoolean(deleteDestIndex); - } + out.writeBoolean(deleteDestIndex); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointAction.java index 4fdd068774adb..882c6ae08bf38 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -59,15 +58,9 @@ public Request(StreamInput in) throws IOException { super(in); indices = in.readStringArray(); indicesOptions = IndicesOptions.readIndicesOptions(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - query = in.readOptionalNamedWriteable(QueryBuilder.class); - cluster = in.readOptionalString(); - timeout = in.readOptionalTimeValue(); - } else { - query = null; - cluster = null; - timeout = null; - } + query = in.readOptionalNamedWriteable(QueryBuilder.class); + cluster = in.readOptionalString(); + timeout = in.readOptionalTimeValue(); } public Request(String[] indices, IndicesOptions indicesOptions, QueryBuilder query, String cluster, TimeValue timeout) { @@ -132,11 +125,9 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeStringArray(indices); indicesOptions.writeIndicesOptions(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalNamedWriteable(query); - out.writeOptionalString(cluster); - out.writeOptionalTimeValue(timeout); - } + out.writeOptionalNamedWriteable(query); + out.writeOptionalString(cluster); + out.writeOptionalTimeValue(timeout); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointNodeAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointNodeAction.java index e3bff41fc0a8a..a037bf97c21b6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointNodeAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointNodeAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -104,11 +103,7 @@ public Request(StreamInput in) throws IOException { super(in); this.shards = in.readCollectionAsImmutableSet(ShardId::new); this.originalIndices = OriginalIndices.readOriginalIndices(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - this.timeout = in.readOptionalTimeValue(); - } else { - this.timeout = null; - } + this.timeout = in.readOptionalTimeValue(); } @Override @@ -121,9 +116,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeCollection(shards); OriginalIndices.writeOriginalIndices(originalIndices, out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalTimeValue(timeout); - } + out.writeOptionalTimeValue(timeout); } public Set getShards() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformAction.java index 56faa2f80128f..4054e2e80b841 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformAction.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.common.ValidationException; @@ -179,12 +178,8 @@ public Response(List transformConfigs, long count, List public Response(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - if (in.readBoolean()) { - this.errors = in.readCollectionAsList(Error::new); - } else { - this.errors = null; - } + if (in.readBoolean()) { + this.errors = in.readCollectionAsList(java.lang.Error::new); } else { this.errors = null; } @@ -240,13 +235,11 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - if (errors != null) { - out.writeBoolean(true); - out.writeCollection(errors); - } else { - out.writeBoolean(false); - } + if (errors != null) { + out.writeBoolean(true); + out.writeCollection(errors); + } else { + out.writeBoolean(false); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformStatsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformStatsAction.java index 6fe4427b1065c..e72a3c69ca24e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformStatsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetTransformStatsAction.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.TaskOperationFailure; @@ -77,11 +76,7 @@ public Request(StreamInput in) throws IOException { expandedIds = in.readCollectionAsImmutableList(StreamInput::readString); pageParams = new PageParams(in); allowNoMatch = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - basic = in.readBoolean(); - } else { - basic = false; - } + basic = in.readBoolean(); } @Override @@ -130,9 +125,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeStringCollection(expandedIds); pageParams.writeTo(out); out.writeBoolean(allowNoMatch); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(basic); - } + out.writeBoolean(basic); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java index f02aaf553b8a9..fab1764b2f9d4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartTransformAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.action.support.tasks.BaseTasksResponse; @@ -51,11 +50,7 @@ public Request(String id, Instant from, TimeValue timeout) { public Request(StreamInput in) throws IOException { super(in); id = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - from = in.readOptionalInstant(); - } else { - from = null; - } + from = in.readOptionalInstant(); } public String getId() { @@ -70,9 +65,7 @@ public Instant from() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(id); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalInstant(from); - } + out.writeOptionalInstant(from); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateTransformAction.java index 6a2394463f4b9..c3d4275194dcf 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateTransformAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.tasks.BaseTasksRequest; @@ -66,10 +65,8 @@ public Request(StreamInput in) throws IOException { if (in.readBoolean()) { this.config = new TransformConfig(in); } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - if (in.readBoolean()) { - this.authState = new AuthorizationState(in); - } + if (in.readBoolean()) { + this.authState = new AuthorizationState(in); } } @@ -153,13 +150,11 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(true); config.writeTo(out); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - if (authState == null) { - out.writeBoolean(false); - } else { - out.writeBoolean(true); - authState.writeTo(out); - } + if (authState == null) { + out.writeBoolean(false); + } else { + out.writeBoolean(true); + authState.writeTo(out); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DestConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DestConfig.java index b306f13d19a63..bff93d4aeef6c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DestConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DestConfig.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -64,11 +63,7 @@ public DestConfig(String index, List aliases, String pipeline) { public DestConfig(final StreamInput in) throws IOException { index = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - aliases = in.readOptionalCollectionAsList(DestAlias::new); - } else { - aliases = null; - } + aliases = in.readOptionalCollectionAsList(DestAlias::new); pipeline = in.readOptionalString(); } @@ -96,9 +91,7 @@ public void checkForDeprecations(String id, NamedXContentRegistry namedXContentR @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(index); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalCollection(aliases); - } + out.writeOptionalCollection(aliases); out.writeOptionalString(pipeline); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SettingsConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SettingsConfig.java index 1557f2843b6af..798b9e67ff385 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SettingsConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SettingsConfig.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -162,21 +161,9 @@ public SettingsConfig(final StreamInput in) throws IOException { this.alignCheckpoints = in.readOptionalInt(); this.usePit = in.readOptionalInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - deduceMappings = in.readOptionalInt(); - } else { - deduceMappings = DEFAULT_DEDUCE_MAPPINGS; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - numFailureRetries = in.readOptionalInt(); - } else { - numFailureRetries = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - unattended = in.readOptionalInt(); - } else { - unattended = DEFAULT_UNATTENDED; - } + deduceMappings = in.readOptionalInt(); + numFailureRetries = in.readOptionalInt(); + unattended = in.readOptionalInt(); } public Integer getMaxPageSearchSize() { @@ -278,15 +265,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalInt(alignCheckpoints); out.writeOptionalInt(usePit); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) { - out.writeOptionalInt(deduceMappings); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { - out.writeOptionalInt(numFailureRetries); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - out.writeOptionalInt(unattended); - } + out.writeOptionalInt(deduceMappings); + out.writeOptionalInt(numFailureRetries); + out.writeOptionalInt(unattended); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformHealthIssue.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformHealthIssue.java index 451cfd89f31af..4ba1ece030b11 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformHealthIssue.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformHealthIssue.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -49,11 +48,7 @@ public TransformHealthIssue(String type, String issue, String details, int count } public TransformHealthIssue(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - this.type = in.readString(); - } else { - this.type = DEFAULT_TYPE_PRE_8_8; - } + this.type = in.readString(); this.issue = in.readString(); this.details = in.readOptionalString(); this.count = in.readVInt(); @@ -97,9 +92,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeString(type); - } + out.writeString(type); out.writeString(issue); out.writeOptionalString(details); out.writeVInt(count); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java index 18925cb4a9eae..8a849a1031a23 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -137,11 +136,7 @@ public TransformState(StreamInput in) throws IOException { progress = in.readOptionalWriteable(TransformProgress::new); node = in.readOptionalWriteable(NodeAttributes::new); shouldStopAtNextCheckpoint = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - authState = in.readOptionalWriteable(AuthorizationState::new); - } else { - authState = null; - } + authState = in.readOptionalWriteable(AuthorizationState::new); } public TransformTaskState getTaskState() { @@ -234,9 +229,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(progress); out.writeOptionalWriteable(node); out.writeBoolean(shouldStopAtNextCheckpoint); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - out.writeOptionalWriteable(authState); - } + out.writeOptionalWriteable(authState); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformStats.java index 16e25f031cd55..adc07655bcd0f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformStats.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -89,12 +88,8 @@ public TransformStats(StreamInput in) throws IOException { this.indexerStats = new TransformIndexerStats(in); this.checkpointingInfo = new TransformCheckpointingInfo(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - if (in.readBoolean()) { - this.health = new TransformHealth(in); - } else { - this.health = null; - } + if (in.readBoolean()) { + this.health = new TransformHealth(in); } else { this.health = null; } @@ -133,13 +128,11 @@ public void writeTo(StreamOutput out) throws IOException { } indexerStats.writeTo(out); checkpointingInfo.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - if (health != null) { - out.writeBoolean(true); - health.writeTo(out); - } else { - out.writeBoolean(false); - } + if (health != null) { + out.writeBoolean(true); + health.writeTo(out); + } else { + out.writeBoolean(false); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformTaskParams.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformTaskParams.java index 77aa92f830d61..b06ca0f8207ff 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformTaskParams.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformTaskParams.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.SimpleDiffable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -77,11 +76,7 @@ public TransformTaskParams(String transformId, TransformConfigVersion version, I public TransformTaskParams(StreamInput in) throws IOException { this.transformId = in.readString(); this.version = TransformConfigVersion.readVersion(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.from = in.readOptionalInstant(); - } else { - this.from = null; - } + this.from = in.readOptionalInstant(); this.frequency = in.readOptionalTimeValue(); this.requiresRemote = in.readBoolean(); } @@ -100,9 +95,7 @@ public TransportVersion getMinimalSupportedVersion() { public void writeTo(StreamOutput out) throws IOException { out.writeString(transformId); TransformConfigVersion.writeVersion(version, out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalInstant(from); - } + out.writeOptionalInstant(from); out.writeOptionalTimeValue(frequency); out.writeBoolean(requiresRemote); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java index a0ae881919d81..f3ba35a4ee7a3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.transform.transforms.pivot; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Rounding; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -228,11 +227,7 @@ public DateHistogramGroupSource(StreamInput in) throws IOException { super(in); this.interval = readInterval(in); this.timeZone = in.readOptionalZoneId(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.offset = in.readLong(); - } else { - this.offset = 0; - } + this.offset = in.readLong(); this.rounding = buildRounding(); } @@ -331,9 +326,7 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); writeInterval(interval, out); out.writeOptionalZoneId(timeZone); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeLong(offset); - } + out.writeLong(offset); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/GetWatcherSettingsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/GetWatcherSettingsAction.java index 8b96ca44b5f93..b2638af62d7e1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/GetWatcherSettingsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/GetWatcherSettingsAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.watcher.transport.actions.put; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; @@ -47,11 +46,7 @@ public Request(TimeValue masterNodeTimeout) { */ @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT) public static Request readFrom(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - return new Request(in); - } else { - return new Request(TimeValue.THIRTY_SECONDS); - } + return new Request(in); } private Request(StreamInput in) throws IOException { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/InferenceActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/InferenceActionRequestTests.java index 6044b4ab33061..2d645c97dacac 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/InferenceActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/InferenceActionRequestTests.java @@ -630,107 +630,6 @@ protected InferenceAction.Request mutateInstance(InferenceAction.Request instanc protected InferenceAction.Request mutateInstanceForVersion(InferenceAction.Request instance, TransportVersion version) { InferenceAction.Request mutated; - if (version.before(TransportVersions.V_8_12_0)) { - mutated = new InferenceAction.Request( - instance.getTaskType(), - instance.getInferenceEntityId(), - null, - null, - null, - instance.getInput().subList(0, 1), - instance.getTaskSettings(), - InputType.UNSPECIFIED, - InferenceAction.Request.DEFAULT_TIMEOUT, - false - ); - } else if (version.before(TransportVersions.V_8_13_0)) { - mutated = new InferenceAction.Request( - instance.getTaskType(), - instance.getInferenceEntityId(), - null, - null, - null, - instance.getInput(), - instance.getTaskSettings(), - InputType.UNSPECIFIED, - InferenceAction.Request.DEFAULT_TIMEOUT, - false - ); - } else if (version.before(TransportVersions.V_8_13_0) - && (instance.getInputType() == InputType.UNSPECIFIED - || instance.getInputType() == InputType.CLASSIFICATION - || instance.getInputType() == InputType.CLUSTERING)) { - mutated = new InferenceAction.Request( - instance.getTaskType(), - instance.getInferenceEntityId(), - null, - null, - null, - instance.getInput(), - instance.getTaskSettings(), - InputType.INGEST, - InferenceAction.Request.DEFAULT_TIMEOUT, - false - ); - } else if (version.before(TransportVersions.V_8_13_0) - && (instance.getInputType() == InputType.CLUSTERING || instance.getInputType() == InputType.CLASSIFICATION)) { - mutated = new InferenceAction.Request( - instance.getTaskType(), - instance.getInferenceEntityId(), - null, - null, - null, - instance.getInput(), - instance.getTaskSettings(), - InputType.UNSPECIFIED, - InferenceAction.Request.DEFAULT_TIMEOUT, - false - ); - } else if (version.before(TransportVersions.V_8_14_0)) { - mutated = new InferenceAction.Request( - instance.getTaskType(), - instance.getInferenceEntityId(), - null, - null, - null, - instance.getInput(), - instance.getTaskSettings(), - instance.getInputType(), - InferenceAction.Request.DEFAULT_TIMEOUT, - false - ); - } else if (version.supports(INFERENCE_CONTEXT) == false) { - mutated = new InferenceAction.Request( - instance.getTaskType(), - instance.getInferenceEntityId(), - instance.getQuery(), - null, - null, - instance.getInput(), - instance.getTaskSettings(), - instance.getInputType(), - instance.getInferenceTimeout(), - false, - InferenceContext.EMPTY_INSTANCE - ); - } else if (version.supports(RERANK_COMMON_OPTIONS_ADDED) == false) { - mutated = new InferenceAction.Request( - instance.getTaskType(), - instance.getInferenceEntityId(), - instance.getQuery(), - null, - null, - instance.getInput(), - instance.getTaskSettings(), - instance.getInputType(), - instance.getInferenceTimeout(), - false, - instance.getContext() - ); - } else { - mutated = instance; - } - return mutated; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/results/RankedDocsResultsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/results/RankedDocsResultsTests.java index 6873d0e7642d5..faeca9f4494e1 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/results/RankedDocsResultsTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/results/RankedDocsResultsTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.inference.results; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.xcontent.XContentParser; import org.elasticsearch.xpack.core.ml.AbstractChunkedBWCSerializationTestCase; @@ -58,12 +57,7 @@ protected RankedDocsResults mutateInstance(RankedDocsResults instance) throws IO @Override protected RankedDocsResults mutateInstanceForVersion(RankedDocsResults instance, TransportVersion fromVersion) { - if (fromVersion.onOrAfter(TransportVersions.V_8_15_0)) { - return instance; - } else { - var compatibleDocs = rankedDocsNullStringToEmpty(instance.getRankedDocs()); - return new RankedDocsResults(compatibleDocs); - } + return instance; } private List rankedDocsNullStringToEmpty(List rankedDocs) { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsageTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsageTests.java index e9ec8dfe8ee52..64bd7980ec098 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsageTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsageTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.Tuple; @@ -57,18 +56,6 @@ protected MachineLearningFeatureSetUsage mutateInstance(MachineLearningFeatureSe @Override protected MachineLearningFeatureSetUsage mutateInstanceForVersion(MachineLearningFeatureSetUsage instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_16_0)) { - return new MachineLearningFeatureSetUsage( - instance.available(), - instance.enabled(), - instance.getJobsUsage(), - instance.getDatafeedsUsage(), - instance.getAnalyticsUsage(), - instance.getInferenceUsage(), - Collections.emptyMap(), - instance.getNodeCount() - ); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceActionRequestTests.java index 91070d5768f63..c86ff340cd27f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceActionRequestTests.java @@ -116,9 +116,6 @@ protected CoordinatedInferenceAction.Request mutateInstanceForVersion( CoordinatedInferenceAction.Request instance, TransportVersion version ) { - if (version.before(TransportVersions.V_8_13_0)) { - instance.setPrefixType(TrainedModelPrefixStrings.PrefixType.NONE); - } var newInstance = new CoordinatedInferenceAction.Request( instance.getModelId(), diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FlushJobActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FlushJobActionRequestTests.java index 6d85e90dc3108..46798c1cc47b8 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FlushJobActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FlushJobActionRequestTests.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.xpack.core.ml.AbstractBWCWireSerializationTestCase; import org.elasticsearch.xpack.core.ml.action.FlushJobAction.Request; @@ -53,9 +52,6 @@ protected Writeable.Reader instanceReader() { @Override protected Request mutateInstanceForVersion(Request instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_9_X)) { - instance.setRefreshRequired(true); - } return instance; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferModelActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferModelActionRequestTests.java index 05266e58964c9..2ab4d78f457ed 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferModelActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferModelActionRequestTests.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.TimeValue; @@ -211,62 +210,6 @@ protected NamedWriteableRegistry getNamedWriteableRegistry() { protected Request mutateInstanceForVersion(Request instance, TransportVersion version) { InferenceConfigUpdate adjustedUpdate = mutateInferenceConfigUpdate(instance.getUpdate(), version); - if (version.before(TransportVersions.V_8_3_0)) { - return new Request( - instance.getId(), - adjustedUpdate, - instance.getObjectsToInfer(), - null, - TimeValue.MAX_VALUE, - instance.isPreviouslyLicensed() - ); - } else if (version.before(TransportVersions.V_8_7_0)) { - return new Request( - instance.getId(), - adjustedUpdate, - instance.getObjectsToInfer(), - null, - instance.getInferenceTimeout(), - instance.isPreviouslyLicensed() - ); - } else if (version.before(TransportVersions.V_8_8_0)) { - var r = new Request( - instance.getId(), - adjustedUpdate, - instance.getObjectsToInfer(), - instance.getTextInput(), - instance.getInferenceTimeout(), - instance.isPreviouslyLicensed() - ); - r.setHighPriority(false); - return r; - } else if (version.before(TransportVersions.V_8_12_0)) { - var r = new Request( - instance.getId(), - adjustedUpdate, - instance.getObjectsToInfer(), - instance.getTextInput(), - instance.getInferenceTimeout(), - instance.isPreviouslyLicensed() - ); - r.setHighPriority(instance.isHighPriority()); - r.setPrefixType(TrainedModelPrefixStrings.PrefixType.NONE); - return r; - } else if (version.before(TransportVersions.V_8_15_0)) { - var r = new Request( - instance.getId(), - adjustedUpdate, - instance.getObjectsToInfer(), - instance.getTextInput(), - instance.getInferenceTimeout(), - instance.isPreviouslyLicensed() - ); - r.setHighPriority(instance.isHighPriority()); - r.setPrefixType(instance.getPrefixType()); - r.setChunked(false); // r.setChunked(instance.isChunked()); for the next version - return r; - } - return instance; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentResponseTests.java index eb373080eee4a..62d26ead2b641 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentResponseTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.xcontent.NamedXContentRegistry; @@ -68,9 +67,6 @@ protected InferTrainedModelDeploymentAction.Response mutateInstanceForVersion( InferTrainedModelDeploymentAction.Response instance, TransportVersion version ) { - if (version.before(TransportVersions.V_8_6_1)) { - return new InferTrainedModelDeploymentAction.Response(instance.getResults().subList(0, 1)); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigTests.java index 933aaeadcb0c9..9b25c4f0ab657 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigTests.java @@ -11,7 +11,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -117,9 +116,6 @@ protected DataFrameAnalyticsConfig mutateInstanceForVersion(DataFrameAnalyticsCo if (instance.getAnalysis() instanceof Classification) { builder.setAnalysis(ClassificationTests.mutateForVersion((Classification) instance.getAnalysis(), version)); } - if (version.before(TransportVersions.V_8_8_0)) { - builder.setMeta(null); - } return builder.build(); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java index 4f80dc8d86c50..856d0f02632a7 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.inference; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -456,12 +455,6 @@ protected TrainedModelConfig mutateInstanceForVersion(TrainedModelConfig instanc if (instance.getInferenceConfig() instanceof NlpConfig nlpConfig) { builder.setInferenceConfig(InferenceConfigItemTestCase.mutateForVersion(nlpConfig, version)); } - if (version.before(TransportVersions.V_8_11_X)) { - builder.setPlatformArchitecture(null); - } - if (version.before(TransportVersions.V_8_12_0)) { - builder.setPrefixStrings(null); - } return builder.build(); } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertJapaneseTokenizationTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertJapaneseTokenizationTests.java index 8c3c0c1ea2c40..13079eaa6ae32 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertJapaneseTokenizationTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertJapaneseTokenizationTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractBWCSerializationTestCase; import org.elasticsearch.xcontent.XContentParser; @@ -21,15 +20,6 @@ public class BertJapaneseTokenizationTests extends AbstractBWCSerializationTestC private boolean lenient; public static BertJapaneseTokenization mutateForVersion(BertJapaneseTokenization instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_2_0)) { - return new BertJapaneseTokenization( - instance.doLowerCase, - instance.withSpecialTokens, - instance.maxSequenceLength, - instance.truncate, - null - ); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertJapaneseTokenizationUpdateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertJapaneseTokenizationUpdateTests.java index f8f87b2eb4144..7dd942e49ade7 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertJapaneseTokenizationUpdateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertJapaneseTokenizationUpdateTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.xpack.core.ml.AbstractBWCWireSerializationTestCase; @@ -75,9 +74,6 @@ protected BertJapaneseTokenizationUpdate mutateInstance(BertJapaneseTokenization @Override protected BertJapaneseTokenizationUpdate mutateInstanceForVersion(BertJapaneseTokenizationUpdate instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_2_0)) { - return new BertJapaneseTokenizationUpdate(instance.getTruncate(), null); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertTokenizationTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertTokenizationTests.java index c9c4795df8f01..12f520346f220 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertTokenizationTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/BertTokenizationTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractBWCSerializationTestCase; import org.elasticsearch.xcontent.XContentParser; @@ -23,15 +22,6 @@ public class BertTokenizationTests extends AbstractBWCSerializationTestCase { - public static TextEmbeddingConfig mutateForVersion(TextEmbeddingConfig instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_8_0)) { - return TextEmbeddingConfig.create( - instance.getVocabularyConfig(), - InferenceConfigTestScaffolding.mutateTokenizationForVersion(instance.getTokenization(), version), - instance.getResultsField(), - null - ); - } else { - return TextEmbeddingConfig.create( - instance.getVocabularyConfig(), - InferenceConfigTestScaffolding.mutateTokenizationForVersion(instance.getTokenization(), version), - instance.getResultsField(), - instance.getEmbeddingSize() - ); - } - } + public static TextEmbeddingConfig mutateForVersion(TextEmbeddingConfig instance, TransportVersion version) {} @Override protected boolean supportsUnknownFields() { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfigUpdateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfigUpdateTests.java index 2df71b8470948..e50b17f341a69 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfigUpdateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfigUpdateTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.Tuple; import org.elasticsearch.xcontent.XContentParser; @@ -35,9 +34,6 @@ public static TextEmbeddingConfigUpdate randomUpdate() { } public static TextEmbeddingConfigUpdate mutateForVersion(TextEmbeddingConfigUpdate instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_1_0)) { - return new TextEmbeddingConfigUpdate(instance.getResultsField(), null); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextExpansionConfigUpdateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextExpansionConfigUpdateTests.java index ba373dfd23b64..c4d870bb504b8 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextExpansionConfigUpdateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextExpansionConfigUpdateTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.Tuple; import org.elasticsearch.xcontent.XContentParser; @@ -31,9 +30,6 @@ public static TextExpansionConfigUpdate randomUpdate() { } public static TextExpansionConfigUpdate mutateForVersion(TextExpansionConfigUpdate instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_1_0)) { - return new TextExpansionConfigUpdate(instance.getResultsField(), null); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextSimilarityConfigUpdateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextSimilarityConfigUpdateTests.java index e5061a743c672..6968b604a166e 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextSimilarityConfigUpdateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextSimilarityConfigUpdateTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.Tuple; import org.elasticsearch.xcontent.XContentParser; @@ -41,9 +40,6 @@ public static TextSimilarityConfigUpdate randomUpdate() { } public static TextSimilarityConfigUpdate mutateForVersion(TextSimilarityConfigUpdate instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_1_0)) { - return new TextSimilarityConfigUpdate(instance.getText(), instance.getResultsField(), null, null); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/XLMRobertaTokenizationTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/XLMRobertaTokenizationTests.java index 646a3387be043..02508b1ff2a9c 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/XLMRobertaTokenizationTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/XLMRobertaTokenizationTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractBWCSerializationTestCase; import org.elasticsearch.xcontent.XContentParser; @@ -21,9 +20,6 @@ public class XLMRobertaTokenizationTests extends AbstractBWCSerializationTestCas private boolean lenient; public static XLMRobertaTokenization mutateForVersion(XLMRobertaTokenization instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_2_0)) { - return new XLMRobertaTokenization(instance.withSpecialTokens, instance.maxSequenceLength, instance.truncate, null); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/XLMRobertaTokenizationUpdateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/XLMRobertaTokenizationUpdateTests.java index 90492cbcfde1c..0cc5df513ffb2 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/XLMRobertaTokenizationUpdateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/XLMRobertaTokenizationUpdateTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.xpack.core.ml.AbstractBWCWireSerializationTestCase; @@ -68,9 +67,6 @@ protected XLMRobertaTokenizationUpdate mutateInstance(XLMRobertaTokenizationUpda @Override protected XLMRobertaTokenizationUpdate mutateInstanceForVersion(XLMRobertaTokenizationUpdate instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_2_0)) { - return new XLMRobertaTokenizationUpdate(instance.getTruncate(), null); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfigUpdateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfigUpdateTests.java index ed034bb8518d9..d7defbfc4212d 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfigUpdateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfigUpdateTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.Tuple; import org.elasticsearch.xcontent.XContentParser; @@ -38,9 +37,6 @@ public static ZeroShotClassificationConfigUpdate mutateForVersion( ZeroShotClassificationConfigUpdate instance, TransportVersion version ) { - if (version.before(TransportVersions.V_8_1_0)) { - return new ZeroShotClassificationConfigUpdate(instance.getLabels(), instance.getMultiLabel(), instance.getResultsField(), null); - } return instance; } diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java index 22bb1673cb638..47ef7ff6c40c7 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.application.rules; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -133,11 +132,7 @@ public QueryRule(StreamInput in) throws IOException { this.criteria = in.readCollectionAsList(QueryRuleCriteria::new); this.actions = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.priority = in.readOptionalVInt(); - } else { - this.priority = null; - } + this.priority = in.readOptionalVInt(); validate(); } @@ -184,9 +179,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(type.toString()); out.writeCollection(criteria); out.writeGenericMap(actions); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalVInt(priority); - } + out.writeOptionalVInt(priority); } @SuppressWarnings("unchecked") diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesetListItem.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesetListItem.java index 88a61d50f8d52..4cce6e191d54b 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesetListItem.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesetListItem.java @@ -68,11 +68,7 @@ public QueryRulesetListItem(StreamInput in) throws IOException { this.criteriaTypeToCountMap = Map.of(); } TransportVersion streamTransportVersion = in.getTransportVersion(); - if (streamTransportVersion.onOrAfter(TransportVersions.V_8_16_1)) { - this.ruleTypeToCountMap = in.readMap(m -> in.readEnum(QueryRule.QueryRuleType.class), StreamInput::readInt); - } else { - this.ruleTypeToCountMap = Map.of(); - } + this.ruleTypeToCountMap = in.readMap(m -> in.readEnum(QueryRule.QueryRuleType.class), StreamInput::readInt); } @Override @@ -102,9 +98,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeMap(criteriaTypeToCountMap, StreamOutput::writeEnum, StreamOutput::writeInt); } TransportVersion streamTransportVersion = out.getTransportVersion(); - if (streamTransportVersion.onOrAfter(TransportVersions.V_8_16_1)) { - out.writeMap(ruleTypeToCountMap, StreamOutput::writeEnum, StreamOutput::writeInt); - } + out.writeMap(ruleTypeToCountMap, StreamOutput::writeEnum, StreamOutput::writeInt); } /** diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java index 7f107660ba1de..43e4de64eec8d 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java @@ -88,13 +88,7 @@ public RuleQueryBuilder(StreamInput in) throws IOException { super(in); organicQuery = in.readNamedWriteable(QueryBuilder.class); matchCriteria = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rulesetIds = in.readStringCollectionAsList(); - } else { - rulesetIds = List.of(in.readString()); - in.readOptionalStringCollectionAsList(); - in.readOptionalCollectionAsList(SpecifiedDocument::new); - } + rulesetIds = in.readStringCollectionAsList(); pinnedDocsSupplier = null; excludedDocsSupplier = null; } @@ -144,13 +138,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeNamedWriteable(organicQuery); out.writeGenericMap(matchCriteria); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeStringCollection(rulesetIds); - } else { - out.writeString(rulesetIds.get(0)); - out.writeOptionalStringCollection(null); - out.writeOptionalCollection(null); - } + out.writeStringCollection(rulesetIds); } public List rulesetIds() { diff --git a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/GetQueryRulesetActionResponseBWCSerializingTests.java b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/GetQueryRulesetActionResponseBWCSerializingTests.java index 8bfbcd5ec471b..ce74cd4368995 100644 --- a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/GetQueryRulesetActionResponseBWCSerializingTests.java +++ b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/GetQueryRulesetActionResponseBWCSerializingTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.application.rules.action; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractBWCSerializationTestCase; import org.elasticsearch.xcontent.XContentParser; @@ -61,14 +60,8 @@ protected GetQueryRulesetAction.Response mutateInstanceForVersion(GetQueryRulese rules.add(new QueryRule(rule.id(), rule.type(), newCriteria, rule.actions(), null)); } return new GetQueryRulesetAction.Response(new QueryRuleset(instance.queryRuleset().id(), rules)); - } else if (version.before(TransportVersions.V_8_15_0)) { - List rules = new ArrayList<>(); - for (QueryRule rule : instance.queryRuleset().rules()) { - rules.add(new QueryRule(rule.id(), rule.type(), rule.criteria(), rule.actions(), null)); - } - return new GetQueryRulesetAction.Response(new QueryRuleset(instance.queryRuleset().id(), rules)); - } + } else - return instance; + return instance; } } diff --git a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java index 7f22866de4412..47363f0a4bcb7 100644 --- a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java +++ b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.application.rules.action; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.xpack.application.EnterpriseSearchModuleTestUtils; import org.elasticsearch.xpack.application.rules.QueryRule; @@ -17,8 +16,6 @@ import org.elasticsearch.xpack.application.rules.QueryRulesetListItem; import org.elasticsearch.xpack.core.ml.AbstractBWCWireSerializationTestCase; -import java.util.ArrayList; -import java.util.List; import java.util.Map; public class ListQueryRulesetsActionResponseBWCSerializingTests extends AbstractBWCWireSerializationTestCase< @@ -59,22 +56,6 @@ protected ListQueryRulesetsAction.Response mutateInstanceForVersion( ListQueryRulesetsAction.Response instance, TransportVersion version ) { - if (version.onOrAfter(TransportVersions.V_8_16_1)) { - return instance; - } else if (version.onOrAfter(QueryRulesetListItem.EXPANDED_RULESET_COUNT_TRANSPORT_VERSION)) { - List updatedResults = new ArrayList<>(); - for (QueryRulesetListItem listItem : instance.queryPage.results()) { - updatedResults.add( - new QueryRulesetListItem(listItem.rulesetId(), listItem.ruleTotalCount(), listItem.criteriaTypeToCountMap(), Map.of()) - ); - } - return new ListQueryRulesetsAction.Response(updatedResults, instance.queryPage.count()); - } else { - List updatedResults = new ArrayList<>(); - for (QueryRulesetListItem listItem : instance.queryPage.results()) { - updatedResults.add(new QueryRulesetListItem(listItem.rulesetId(), listItem.ruleTotalCount(), Map.of(), Map.of())); - } - return new ListQueryRulesetsAction.Response(updatedResults, instance.queryPage.count()); - } + return instance; } } diff --git a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/PutQueryRulesetActionRequestBWCSerializingTests.java b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/PutQueryRulesetActionRequestBWCSerializingTests.java index 3b6195cc8f495..71979db1284a9 100644 --- a/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/PutQueryRulesetActionRequestBWCSerializingTests.java +++ b/x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/PutQueryRulesetActionRequestBWCSerializingTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.application.rules.action; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractBWCSerializationTestCase; import org.elasticsearch.xcontent.XContentParser; @@ -63,15 +62,9 @@ protected PutQueryRulesetAction.Request mutateInstanceForVersion(PutQueryRuleset rules.add(new QueryRule(rule.id(), rule.type(), newCriteria, rule.actions(), null)); } return new PutQueryRulesetAction.Request(new QueryRuleset(instance.queryRuleset().id(), rules)); - } else if (version.before(TransportVersions.V_8_15_0)) { - List rules = new ArrayList<>(); - for (QueryRule rule : instance.queryRuleset().rules()) { - rules.add(new QueryRule(rule.id(), rule.type(), rule.criteria(), rule.actions(), null)); - } - return new PutQueryRulesetAction.Request(new QueryRuleset(instance.queryRuleset().id(), rules)); - } + } else - // Default to current instance - return instance; + // Default to current instance + return instance; } } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java index a11f81c1a4bac..60961657548ac 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java @@ -130,9 +130,7 @@ public EqlSearchRequest(StreamInput in) throws IOException { fetchFields = in.readCollectionAsList(FieldAndFormat::new); } runtimeMappings = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - maxSamplesPerKey = in.readInt(); - } + maxSamplesPerKey = in.readInt(); if (in.getTransportVersion().onOrAfter(TransportVersions.EQL_ALLOW_PARTIAL_SEARCH_RESULTS)) { allowPartialSearchResults = in.readOptionalBoolean(); allowPartialSequenceResults = in.readOptionalBoolean(); @@ -488,9 +486,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeCollection(fetchFields); } out.writeGenericMap(runtimeMappings); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeInt(maxSamplesPerKey); - } + out.writeInt(maxSamplesPerKey); if (out.getTransportVersion().onOrAfter(TransportVersions.EQL_ALLOW_PARTIAL_SEARCH_RESULTS)) { out.writeOptionalBoolean(allowPartialSearchResults); out.writeOptionalBoolean(allowPartialSequenceResults); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/chunking/SentenceBoundaryChunkingSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/chunking/SentenceBoundaryChunkingSettings.java index 25b5d248f294b..0700e47bef03d 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/chunking/SentenceBoundaryChunkingSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/chunking/SentenceBoundaryChunkingSettings.java @@ -49,9 +49,7 @@ public SentenceBoundaryChunkingSettings(Integer maxChunkSize, @Nullable Integer public SentenceBoundaryChunkingSettings(StreamInput in) throws IOException { maxChunkSize = in.readInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - sentenceOverlap = in.readVInt(); - } + sentenceOverlap = in.readVInt(); } @Override @@ -156,9 +154,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeInt(maxChunkSize); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeVInt(sentenceOverlap); - } + out.writeVInt(sentenceOverlap); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureopenai/embeddings/AzureOpenAiEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureopenai/embeddings/AzureOpenAiEmbeddingsServiceSettings.java index 9e8ca478987ec..ff691f1869cc5 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureopenai/embeddings/AzureOpenAiEmbeddingsServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureopenai/embeddings/AzureOpenAiEmbeddingsServiceSettings.java @@ -185,11 +185,7 @@ public AzureOpenAiEmbeddingsServiceSettings(StreamInput in) throws IOException { maxInputTokens = in.readOptionalVInt(); similarity = in.readOptionalEnum(SimilarityMeasure.class); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings = new RateLimitSettings(in); - } else { - rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS; - } + rateLimitSettings = new RateLimitSettings(in); } private AzureOpenAiEmbeddingsServiceSettings(CommonFields fields) { @@ -303,9 +299,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalVInt(maxInputTokens); out.writeOptionalEnum(SimilarityMeasure.translateSimilarity(similarity, out.getTransportVersion())); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings.writeTo(out); - } + rateLimitSettings.writeTo(out); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/CohereServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/CohereServiceSettings.java index aadd40ccb448a..a08c088ef9f3a 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/CohereServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/CohereServiceSettings.java @@ -179,11 +179,7 @@ public CohereServiceSettings(StreamInput in) throws IOException { maxInputTokens = in.readOptionalVInt(); modelId = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings = new RateLimitSettings(in); - } else { - rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS; - } + rateLimitSettings = new RateLimitSettings(in); if (in.getTransportVersion().supports(ML_INFERENCE_COHERE_API_VERSION)) { this.apiVersion = in.readEnum(CohereServiceSettings.CohereApiVersion.class); } else { @@ -283,9 +279,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalVInt(maxInputTokens); out.writeOptionalString(modelId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings.writeTo(out); - } + rateLimitSettings.writeTo(out); if (out.getTransportVersion().supports(ML_INFERENCE_COHERE_API_VERSION)) { out.writeEnum(apiVersion); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettings.java index 3da857433704e..d176d55b3333e 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettings.java @@ -15,7 +15,6 @@ import org.elasticsearch.core.Nullable; import org.elasticsearch.inference.ModelConfigurations; import org.elasticsearch.inference.ServiceSettings; -import org.elasticsearch.inference.SimilarityMeasure; import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xpack.inference.services.ConfigurationParseContext; import org.elasticsearch.xpack.inference.services.cohere.CohereRateLimitServiceSettings; @@ -110,20 +109,9 @@ public CohereRerankServiceSettings( public CohereRerankServiceSettings(StreamInput in) throws IOException { this.uri = createOptionalUri(in.readOptionalString()); - if (in.getTransportVersion().before(TransportVersions.V_8_16_0)) { - // An older node sends these fields, so we need to skip them to progress through the serialized data - in.readOptionalEnum(SimilarityMeasure.class); - in.readOptionalVInt(); - in.readOptionalVInt(); - } - this.modelId = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - this.rateLimitSettings = new RateLimitSettings(in); - } else { - this.rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS; - } + this.rateLimitSettings = new RateLimitSettings(in); if (in.getTransportVersion().supports(ML_INFERENCE_COHERE_API_VERSION)) { this.apiVersion = in.readEnum(CohereServiceSettings.CohereApiVersion.class); @@ -193,19 +181,9 @@ public void writeTo(StreamOutput out) throws IOException { var uriToWrite = uri != null ? uri.toString() : null; out.writeOptionalString(uriToWrite); - if (out.getTransportVersion().before(TransportVersions.V_8_16_0)) { - // An old node expects this data to be present, so we need to send at least the booleans - // indicating that the fields are not set - out.writeOptionalEnum(null); - out.writeOptionalVInt(null); - out.writeOptionalVInt(null); - } - out.writeOptionalString(modelId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings.writeTo(out); - } + rateLimitSettings.writeTo(out); if (out.getTransportVersion().supports(ML_INFERENCE_COHERE_API_VERSION)) { out.writeEnum(apiVersion); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/CustomElandInternalTextEmbeddingServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/CustomElandInternalTextEmbeddingServiceSettings.java index 6395cd36457c2..cdf8bae9d0371 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/CustomElandInternalTextEmbeddingServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/CustomElandInternalTextEmbeddingServiceSettings.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.inference.services.elasticsearch; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.ValidationException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -124,15 +123,9 @@ private static CommonFields commonFieldsFromMap(Map map, Validat public CustomElandInternalTextEmbeddingServiceSettings(StreamInput in) throws IOException { super(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - dimensions = in.readOptionalVInt(); - similarityMeasure = in.readEnum(SimilarityMeasure.class); - elementType = in.readEnum(DenseVectorFieldMapper.ElementType.class); - } else { - dimensions = null; - similarityMeasure = SimilarityMeasure.COSINE; - elementType = DenseVectorFieldMapper.ElementType.FLOAT; - } + dimensions = in.readOptionalVInt(); + similarityMeasure = in.readEnum(SimilarityMeasure.class); + elementType = in.readEnum(DenseVectorFieldMapper.ElementType.class); } private CustomElandInternalTextEmbeddingServiceSettings(CommonFields commonFields) { @@ -183,11 +176,9 @@ public String getWriteableName() { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - out.writeOptionalVInt(dimensions); - out.writeEnum(similarityMeasure); - out.writeEnum(elementType); - } + out.writeOptionalVInt(dimensions); + out.writeEnum(similarityMeasure); + out.writeEnum(elementType); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceSettings.java index 67a537b5ac2c0..0787245f2beba 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceSettings.java @@ -147,11 +147,7 @@ public ElasticsearchInternalServiceSettings(ElasticsearchInternalServiceSettings } public ElasticsearchInternalServiceSettings(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.numAllocations = in.readOptionalVInt(); - } else { - this.numAllocations = in.readVInt(); - } + this.numAllocations = in.readOptionalVInt(); this.numThreads = in.readVInt(); this.modelId = in.readString(); this.adaptiveAllocationsSettings = in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0) @@ -167,17 +163,11 @@ public void setAllocations(Integer numAllocations, @Nullable AdaptiveAllocations @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalVInt(getNumAllocations()); - } else { - out.writeVInt(getNumAllocations()); - } + out.writeOptionalVInt(getNumAllocations()); out.writeVInt(getNumThreads()); out.writeString(modelId()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeOptionalWriteable(getAdaptiveAllocationsSettings()); - out.writeOptionalString(deploymentId); - } + out.writeOptionalWriteable(getAdaptiveAllocationsSettings()); + out.writeOptionalString(deploymentId); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceServiceSettings.java index 91735d39f3973..43012659009f5 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceServiceSettings.java @@ -103,21 +103,11 @@ public HuggingFaceServiceSettings(String url) { public HuggingFaceServiceSettings(StreamInput in) throws IOException { this.uri = createUri(in.readString()); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - similarity = in.readOptionalEnum(SimilarityMeasure.class); - dimensions = in.readOptionalVInt(); - maxInputTokens = in.readOptionalVInt(); - } else { - similarity = null; - dimensions = null; - maxInputTokens = null; - } + similarity = in.readOptionalEnum(SimilarityMeasure.class); + dimensions = in.readOptionalVInt(); + maxInputTokens = in.readOptionalVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings = new RateLimitSettings(in); - } else { - rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS; - } + rateLimitSettings = new RateLimitSettings(in); } @Override @@ -158,15 +148,11 @@ public TransportVersion getMinimalSupportedVersion() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(uri.toString()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalEnum(SimilarityMeasure.translateSimilarity(similarity, out.getTransportVersion())); - out.writeOptionalVInt(dimensions); - out.writeOptionalVInt(maxInputTokens); - } + out.writeOptionalEnum(SimilarityMeasure.translateSimilarity(similarity, out.getTransportVersion())); + out.writeOptionalVInt(dimensions); + out.writeOptionalVInt(maxInputTokens); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings.writeTo(out); - } + rateLimitSettings.writeTo(out); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/elser/HuggingFaceElserServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/elser/HuggingFaceElserServiceSettings.java index ad771e72b6b35..58b390c42aed6 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/elser/HuggingFaceElserServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/elser/HuggingFaceElserServiceSettings.java @@ -76,11 +76,7 @@ public HuggingFaceElserServiceSettings(String url) { public HuggingFaceElserServiceSettings(StreamInput in) throws IOException { uri = createUri(in.readString()); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings = new RateLimitSettings(in); - } else { - rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS; - } + rateLimitSettings = new RateLimitSettings(in); } @Override @@ -134,9 +130,7 @@ public TransportVersion getMinimalSupportedVersion() { public void writeTo(StreamOutput out) throws IOException { out.writeString(uri.toString()); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings.writeTo(out); - } + rateLimitSettings.writeTo(out); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/completion/OpenAiChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/completion/OpenAiChatCompletionServiceSettings.java index 6d340320c655c..f6b036001aa89 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/completion/OpenAiChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/completion/OpenAiChatCompletionServiceSettings.java @@ -119,11 +119,7 @@ public OpenAiChatCompletionServiceSettings(StreamInput in) throws IOException { this.organizationId = in.readOptionalString(); this.maxInputTokens = in.readOptionalVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings = new RateLimitSettings(in); - } else { - rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS; - } + rateLimitSettings = new RateLimitSettings(in); } @Override @@ -197,9 +193,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(organizationId); out.writeOptionalVInt(maxInputTokens); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings.writeTo(out); - } + rateLimitSettings.writeTo(out); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsServiceSettings.java index e9b6a7c77a5fa..72961baab17f3 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsServiceSettings.java @@ -183,29 +183,14 @@ public OpenAiEmbeddingsServiceSettings( public OpenAiEmbeddingsServiceSettings(StreamInput in) throws IOException { uri = createOptionalUri(in.readOptionalString()); organizationId = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - similarity = in.readOptionalEnum(SimilarityMeasure.class); - dimensions = in.readOptionalVInt(); - maxInputTokens = in.readOptionalVInt(); - } else { - similarity = null; - dimensions = null; - maxInputTokens = null; - } + similarity = in.readOptionalEnum(SimilarityMeasure.class); + dimensions = in.readOptionalVInt(); + maxInputTokens = in.readOptionalVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - dimensionsSetByUser = in.readBoolean(); - modelId = in.readString(); - } else { - dimensionsSetByUser = false; - modelId = "unset"; - } + dimensionsSetByUser = in.readBoolean(); + modelId = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings = new RateLimitSettings(in); - } else { - rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS; - } + rateLimitSettings = new RateLimitSettings(in); } private OpenAiEmbeddingsServiceSettings(CommonFields fields, Boolean dimensionsSetByUser) { @@ -318,20 +303,14 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(uriToWrite); out.writeOptionalString(organizationId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeOptionalEnum(SimilarityMeasure.translateSimilarity(similarity, out.getTransportVersion())); - out.writeOptionalVInt(dimensions); - out.writeOptionalVInt(maxInputTokens); - } + out.writeOptionalEnum(SimilarityMeasure.translateSimilarity(similarity, out.getTransportVersion())); + out.writeOptionalVInt(dimensions); + out.writeOptionalVInt(maxInputTokens); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeBoolean(dimensionsSetByUser); - out.writeString(modelId); - } + out.writeBoolean(dimensionsSetByUser); + out.writeString(modelId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { - rateLimitSettings.writeTo(out); - } + rateLimitSettings.writeTo(out); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsTaskSettings.java index bef64b868fea3..edcb33e6fb6ba 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsTaskSettings.java @@ -47,12 +47,7 @@ public OpenAiEmbeddingsTaskSettings(StreamInput in) throws IOException { private static Settings readTaskSettingsFromStream(StreamInput in) throws IOException { String user; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - user = in.readOptionalString(); - } else { - var discard = in.readString(); - user = in.readOptionalString(); - } + user = in.readOptionalString(); Map headers; @@ -77,12 +72,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { - out.writeOptionalString(user()); - } else { - out.writeString("m"); // write any string - out.writeOptionalString(user()); - } + out.writeOptionalString(user()); if (out.getTransportVersion().supports(INFERENCE_API_OPENAI_EMBEDDINGS_HEADERS)) { out.writeOptionalMap(headers(), StreamOutput::writeString, StreamOutput::writeString); diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettingsTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettingsTests.java index 08635c25c240d..c28d9e0f610b8 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettingsTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettingsTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.inference.services.cohere.rerank; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.Nullable; @@ -83,22 +82,6 @@ protected CohereRerankServiceSettings mutateInstance(CohereRerankServiceSettings @Override protected CohereRerankServiceSettings mutateInstanceForVersion(CohereRerankServiceSettings instance, TransportVersion version) { - if (version.before(TransportVersions.V_8_15_0)) { - // We always default to the same rate limit settings, if a node is on a version before rate limits were introduced - return new CohereRerankServiceSettings( - instance.uri(), - instance.modelId(), - CohereServiceSettings.DEFAULT_RATE_LIMIT_SETTINGS, - CohereServiceSettings.CohereApiVersion.V1 - ); - } else if (version.supports(ML_INFERENCE_COHERE_API_VERSION) == false) { - return new CohereRerankServiceSettings( - instance.uri(), - instance.modelId(), - instance.rateLimitSettings(), - CohereServiceSettings.CohereApiVersion.V1 - ); - } return instance; } diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/googlevertexai/embeddings/GoogleVertexAiEmbeddingsTaskSettingsTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/googlevertexai/embeddings/GoogleVertexAiEmbeddingsTaskSettingsTests.java index 79cf62c53c348..b1f53d039c0f5 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/googlevertexai/embeddings/GoogleVertexAiEmbeddingsTaskSettingsTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/googlevertexai/embeddings/GoogleVertexAiEmbeddingsTaskSettingsTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.inference.services.googlevertexai.embeddings; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.ValidationException; import org.elasticsearch.common.io.stream.Writeable; @@ -234,10 +233,6 @@ protected GoogleVertexAiEmbeddingsTaskSettings mutateInstanceForVersion( GoogleVertexAiEmbeddingsTaskSettings instance, TransportVersion version ) { - if (version.before(TransportVersions.V_8_17_0)) { - // default to null input type if node is on a version before input type was introduced - return new GoogleVertexAiEmbeddingsTaskSettings(instance.autoTruncate(), null); - } return instance; } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java index b6bb013e86421..9d9c7105c1c8d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java @@ -166,16 +166,8 @@ public FrequentItemSetsAggregationBuilder(StreamInput in) throws IOException { this.minimumSupport = in.readDouble(); this.minimumSetSize = in.readVInt(); this.size = in.readVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - this.filter = in.readOptionalNamedWriteable(QueryBuilder.class); - } else { - this.filter = null; - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - this.executionHint = in.readOptionalString(); - } else { - this.executionHint = null; - } + this.filter = in.readOptionalNamedWriteable(QueryBuilder.class); + this.executionHint = in.readOptionalString(); } @Override @@ -199,12 +191,8 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeDouble(minimumSupport); out.writeVInt(minimumSetSize); out.writeVInt(size); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeOptionalNamedWriteable(filter); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { - out.writeOptionalString(executionHint); - } + out.writeOptionalNamedWriteable(filter); + out.writeOptionalString(executionHint); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/ImmutableTransactionStore.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/ImmutableTransactionStore.java index f6d62b7b0f8dd..5368796778f82 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/ImmutableTransactionStore.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/ImmutableTransactionStore.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.ml.aggs.frequentitemsets; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.util.BigArrays; @@ -82,11 +81,7 @@ public ImmutableTransactionStore(StreamInput in, BigArrays bigArrays) throws IOE } this.totalTransactionCount = in.readVLong(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - this.filteredTransactionCount = in.readVLong(); - } else { - this.filteredTransactionCount = 0; - } + this.filteredTransactionCount = in.readVLong(); success = true; } finally { @@ -158,9 +153,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(transactionCounts.get(i)); } out.writeVLong(totalTransactionCount); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeVLong(filteredTransactionCount); - } + out.writeVLong(filteredTransactionCount); } } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/Vocabulary.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/Vocabulary.java index 72fc96683b721..ee25c8f98f898 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/Vocabulary.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/Vocabulary.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.ml.inference.nlp; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -64,16 +63,8 @@ public Vocabulary(List vocab, String modelId, @Nullable List mer public Vocabulary(StreamInput in) throws IOException { vocab = in.readStringCollectionAsList(); modelId = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - merges = in.readStringCollectionAsList(); - } else { - merges = List.of(); - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - scores = in.readCollectionAsList(StreamInput::readDouble); - } else { - scores = List.of(); - } + merges = in.readStringCollectionAsList(); + scores = in.readCollectionAsList(StreamInput::readDouble); } public List get() { @@ -92,12 +83,8 @@ public List scores() { public void writeTo(StreamOutput out) throws IOException { out.writeStringCollection(vocab); out.writeString(modelId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - out.writeStringCollection(merges); - } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeCollection(scores, StreamOutput::writeDouble); - } + out.writeStringCollection(merges); + out.writeCollection(scores, StreamOutput::writeDouble); } @Override diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java index 549c7ffab7f29..5beef47854d0f 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.ql.execution.search.extractor; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.document.DocumentField; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -76,11 +75,6 @@ protected AbstractFieldHitExtractor(StreamInput in) throws IOException { String typeName = in.readOptionalString(); dataType = typeName != null ? loadTypeFromName(typeName) : null; hitName = in.readOptionalString(); - if (in.getTransportVersion().before(TransportVersions.V_8_6_0)) { - this.multiValueSupport = in.readBoolean() ? MultiValueSupport.LENIENT : MultiValueSupport.NONE; - } else { - this.multiValueSupport = in.readEnum(MultiValueSupport.class); - } zoneId = readZoneId(in); } @@ -95,11 +89,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(fieldName); out.writeOptionalString(dataType == null ? null : dataType.typeName()); out.writeOptionalString(hitName); - if (out.getTransportVersion().before(TransportVersions.V_8_6_0)) { - out.writeBoolean(multiValueSupport != MultiValueSupport.NONE); - } else { - out.writeEnum(multiValueSupport); - } } diff --git a/x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/rrf/RRFRankDoc.java b/x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/rrf/RRFRankDoc.java index b3ea263b1d705..78c7211a0dd70 100644 --- a/x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/rrf/RRFRankDoc.java +++ b/x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/rrf/RRFRankDoc.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.rank.rrf; import org.apache.lucene.search.Explanation; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.rank.RankDoc; @@ -78,11 +77,7 @@ public RRFRankDoc(StreamInput in) throws IOException { } else { positions = in.readIntArray(); scores = in.readFloatArray(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - this.rankConstant = in.readVInt(); - } else { - this.rankConstant = DEFAULT_RANK_CONSTANT; - } + this.rankConstant = in.readVInt(); } } @@ -147,9 +142,7 @@ public void doWriteTo(StreamOutput out) throws IOException { } else { out.writeIntArray(positions == null ? new int[0] : positions); out.writeFloatArray(scores == null ? new float[0] : scores); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { - out.writeVInt(rankConstant == null ? DEFAULT_RANK_CONSTANT : rankConstant); - } + out.writeVInt(rankConstant == null ? DEFAULT_RANK_CONSTANT : rankConstant); } } diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java index 41cd0cb0f8cea..5c9907f208e99 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java @@ -483,37 +483,35 @@ public void run() { final Random random = new Random(request.getSeed()); final List nodes = getSnapshotNodes(discoveryNodes); - if (minClusterTransportVersion.onOrAfter(TransportVersions.V_8_8_0)) { - final String contendedRegisterName = CONTENDED_REGISTER_NAME_PREFIX + UUIDs.randomBase64UUID(random); - final AtomicBoolean contendedRegisterAnalysisComplete = new AtomicBoolean(); - final int registerOperations = Math.max(nodes.size(), request.getRegisterOperationCount()); - try ( - var registerRefs = new RefCountingRunnable( - finalRegisterValueVerifier( - contendedRegisterName, - registerOperations, - random, - Releasables.wrap(requestRefs.acquire(), () -> contendedRegisterAnalysisComplete.set(true)) - ) + final String contendedRegisterName = CONTENDED_REGISTER_NAME_PREFIX + UUIDs.randomBase64UUID(random); + final AtomicBoolean contendedRegisterAnalysisComplete = new AtomicBoolean(); + final int registerOperations = Math.max(nodes.size(), request.getRegisterOperationCount()); + try ( + var registerRefs = new RefCountingRunnable( + finalRegisterValueVerifier( + contendedRegisterName, + registerOperations, + random, + Releasables.wrap(requestRefs.acquire(), () -> contendedRegisterAnalysisComplete.set(true)) ) - ) { - for (int i = 0; i < registerOperations; i++) { - final ContendedRegisterAnalyzeAction.Request registerAnalyzeRequest = new ContendedRegisterAnalyzeAction.Request( - request.getRepositoryName(), - blobPath, - contendedRegisterName, - registerOperations, - random.nextInt((registerOperations + 1) * 2) - ); - final DiscoveryNode node = nodes.get(i < nodes.size() ? i : random.nextInt(nodes.size())); - final Releasable registerRef = registerRefs.acquire(); - queue.add(ref -> runContendedRegisterAnalysis(Releasables.wrap(registerRef, ref), registerAnalyzeRequest, node)); - } + ) + ) { + for (int i = 0; i < registerOperations; i++) { + final ContendedRegisterAnalyzeAction.Request registerAnalyzeRequest = new ContendedRegisterAnalyzeAction.Request( + request.getRepositoryName(), + blobPath, + contendedRegisterName, + registerOperations, + random.nextInt((registerOperations + 1) * 2) + ); + final DiscoveryNode node = nodes.get(i < nodes.size() ? i : random.nextInt(nodes.size())); + final Releasable registerRef = registerRefs.acquire(); + queue.add(ref -> runContendedRegisterAnalysis(Releasables.wrap(registerRef, ref), registerAnalyzeRequest, node)); } + } - if (minClusterTransportVersion.onOrAfter(TransportVersions.V_8_12_0)) { - new UncontendedRegisterAnalysis(new Random(random.nextLong()), nodes, contendedRegisterAnalysisComplete).run(); - } + if (minClusterTransportVersion.onOrAfter(TransportVersions.V_8_12_0)) { + new UncontendedRegisterAnalysis(new Random(random.nextLong()), nodes, contendedRegisterAnalysisComplete).run(); } final List blobSizes = getBlobSizes(request); @@ -972,11 +970,7 @@ public Request(StreamInput in) throws IOException { rareActionProbability = in.readDouble(); blobCount = in.readVInt(); concurrency = in.readVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - registerOperationCount = in.readVInt(); - } else { - registerOperationCount = concurrency; - } + registerOperationCount = in.readVInt(); readNodeCount = in.readVInt(); earlyReadNodeCount = in.readVInt(); timeout = in.readTimeValue(); @@ -1000,15 +994,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeDouble(rareActionProbability); out.writeVInt(blobCount); out.writeVInt(concurrency); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { - out.writeVInt(registerOperationCount); - } else if (registerOperationCount != concurrency) { - throw new IllegalArgumentException( - "cannot send request with registerOperationCount != concurrency to version [" - + out.getTransportVersion().toReleaseVersion() - + "]" - ); - } + out.writeVInt(registerOperationCount); out.writeVInt(readNodeCount); out.writeVInt(earlyReadNodeCount); out.writeTimeValue(timeout); diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/InternalGeoLine.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/InternalGeoLine.java index ecccd59cb512f..35b9df2f32e92 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/InternalGeoLine.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/InternalGeoLine.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.spatial.search.aggregations; import org.apache.lucene.geo.GeoEncodingUtils; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.aggregations.AggregationReduceContext; @@ -89,13 +88,8 @@ public InternalGeoLine(StreamInput in) throws IOException { this.includeSorts = in.readBoolean(); this.sortOrder = SortOrder.readFromStream(in); this.size = in.readVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - nonOverlapping = in.readBoolean(); - simplified = in.readBoolean(); - } else { - nonOverlapping = false; - simplified = false; - } + nonOverlapping = in.readBoolean(); + simplified = in.readBoolean(); } @Override @@ -106,10 +100,8 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeBoolean(includeSorts); sortOrder.writeTo(out); out.writeVInt(size); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { - out.writeBoolean(nonOverlapping); - out.writeBoolean(simplified); - } + out.writeBoolean(nonOverlapping); + out.writeBoolean(simplified); } @Override diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/SearchHitCursor.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/SearchHitCursor.java index 8fa41017762a7..4977bea81b36d 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/SearchHitCursor.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/SearchHitCursor.java @@ -80,9 +80,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeNamedWriteableCollection(extractors); out.writeByteArray(mask.toByteArray()); out.writeBoolean(includeFrozen); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { - out.writeBoolean(allowPartialSearchResults); - } + out.writeBoolean(allowPartialSearchResults); } @Override diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetCheckpointAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetCheckpointAction.java index ce590773fe72e..9c1cd8d0e677e 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetCheckpointAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetCheckpointAction.java @@ -8,7 +8,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; import org.elasticsearch.action.NoShardAvailableActionException; @@ -38,7 +37,6 @@ import org.elasticsearch.tasks.CancellableTask; import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.TaskId; -import org.elasticsearch.transport.ActionNotFoundTransportException; import org.elasticsearch.transport.TransportRequestOptions; import org.elasticsearch.transport.TransportResponseHandler; import org.elasticsearch.transport.TransportService; @@ -166,9 +164,6 @@ private static Map> resolveIndicesToPrimaryShards(ClusterSt } if (shard.assignedToNode() && nodes.get(shard.currentNodeId()) != null) { // special case: The minimum TransportVersion in the cluster is on an old version - if (clusterState.getMinTransportVersion().before(TransportVersions.V_8_2_0)) { - throw new ActionNotFoundTransportException(GetCheckpointNodeAction.NAME); - } String nodeId = shard.currentNodeId(); nodesAndShards.computeIfAbsent(nodeId, k -> new HashSet<>()).add(shard.shardId());