Remove transport versions V_8_2_0 through V_8_5_0 (#136240)

Author: mark-vieira

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() {

modules/aggregations/src/test/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java

@@ -9,14 +9,10 @@
 
 package org.elasticsearch.aggregations.bucket.histogram;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.aggregations.bucket.AggregationMultiBucketAggregationTestCase;
 import org.elasticsearch.aggregations.bucket.histogram.AutoDateHistogramAggregationBuilder.RoundingInfo;
 import org.elasticsearch.aggregations.bucket.histogram.InternalAutoDateHistogram.BucketInfo;
 import org.elasticsearch.common.Rounding;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.io.stream.NamedWriteableAwareStreamInput;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.index.mapper.DateFieldMapper;
@@ -28,15 +24,13 @@
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.test.InternalAggregationTestCase;
 
-import java.io.IOException;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -456,24 +450,4 @@ public void testCreateWithReplacementBuckets() {
         assertThat(copy.getFormatter(), equalTo(orig.getFormatter()));
         assertThat(copy.getInterval(), equalTo(orig.getInterval()));
     }
-
-    public void testReadFromPre830() throws IOException {
-        byte[] bytes = Base64.getDecoder()
-            .decode(
-                "BG5hbWUKAAYBCAFa6AcEAAAAAQAAAAUAAAAKAAAAHgFzBnNlY29uZAEHAVrg1AMEAAAAAQAAAAUAAAAKAAA"
-                    + "AHgFtBm1pbnV0ZQEGAVqA3dsBAwAAAAEAAAADAAAADAFoBGhvdXIBBQFagLiZKQIAAAABAAAABwFk"
-                    + "A2RheQEEAVqAkPvTCQIAAAABAAAAAwFNBW1vbnRoAQIBWoDYxL11BgAAAAEAAAAFAAAACgAAABQAA"
-                    + "AAyAAAAZAF5BHllYXIAAARib29sAQAAAAAAAAAKZAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            );
-        try (StreamInput in = new NamedWriteableAwareStreamInput(new BytesArray(bytes).streamInput(), getNamedWriteableRegistry())) {
-            in.setTransportVersion(TransportVersions.V_8_2_0);
-            InternalAutoDateHistogram deserialized = new InternalAutoDateHistogram(in);
-            assertEquals("name", deserialized.getName());
-            assertEquals(1, deserialized.getBucketInnerInterval());
-            assertEquals(1, deserialized.getBuckets().size());
-            InternalAutoDateHistogram.Bucket bucket = deserialized.getBuckets().iterator().next();
-            assertEquals(10, bucket.key);
-            assertEquals(100, bucket.getDocCount());
-        }
-    }
 }

server/src/main/java/org/elasticsearch/Build.java

@@ -205,11 +205,7 @@ static URL getElasticsearchCodeSourceLocation() {
 
     public static Build readBuild(StreamInput in) throws IOException {
         final String flavor;
-        if (in.getTransportVersion().before(TransportVersions.V_8_3_0) || in.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) {
-            flavor = in.readString();
-        } else {
-            flavor = "default";
-        }
+        flavor = in.readString();
         // be lenient when reading on the wire, the enumeration values from other versions might be different than what we know
         final Type type = Type.fromDisplayName(in.readString(), false);
         String hash = in.readString();
@@ -251,10 +247,7 @@ public static Build readBuild(StreamInput in) throws IOException {
     }
 
     public static void writeBuild(Build build, StreamOutput out) throws IOException {
-        if (out.getTransportVersion().before(TransportVersions.V_8_3_0)
-            || out.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) {
-            out.writeString(build.flavor());
-        }
+        out.writeString(build.flavor());
         out.writeString(build.type().displayName());
         out.writeString(build.hash());
         out.writeString(build.date());

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -61,10 +61,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_7_9_0 = def(7_09_00_99);
     public static final TransportVersion V_7_10_0 = def(7_10_00_99);
     public static final TransportVersion V_8_0_0 = def(8_00_00_99);
-    public static final TransportVersion V_8_2_0 = def(8_02_00_99);
-    public static final TransportVersion V_8_3_0 = def(8_03_00_99);
-    public static final TransportVersion V_8_4_0 = def(8_04_00_99);
-    public static final TransportVersion V_8_5_0 = def(8_05_00_99);
     public static final TransportVersion V_8_6_0 = def(8_06_00_99);
     public static final TransportVersion V_8_6_1 = def(8_06_01_99);
     public static final TransportVersion V_8_7_0 = def(8_07_00_99);

server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java

@@ -9,8 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.desirednodes;
 
-import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ValidateActions;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
@@ -27,8 +25,6 @@
 import java.util.Objects;
 
 public class UpdateDesiredNodesRequest extends AcknowledgedRequest<UpdateDesiredNodesRequest> {
-    private static final TransportVersion DRY_RUN_VERSION = TransportVersions.V_8_4_0;
-
     private final String historyID;
     private final long version;
     private final List<DesiredNode> nodes;
@@ -69,11 +65,7 @@ public UpdateDesiredNodesRequest(StreamInput in) throws IOException {
         this.historyID = in.readString();
         this.version = in.readLong();
         this.nodes = in.readCollectionAsList(DesiredNode::readFrom);
-        if (in.getTransportVersion().onOrAfter(DRY_RUN_VERSION)) {
-            this.dryRun = in.readBoolean();
-        } else {
-            this.dryRun = false;
-        }
+        this.dryRun = in.readBoolean();
     }
 
     @Override
@@ -82,9 +74,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(historyID);
         out.writeLong(version);
         out.writeCollection(nodes);
-        if (out.getTransportVersion().onOrAfter(DRY_RUN_VERSION)) {
-            out.writeBoolean(dryRun);
-        }
+        out.writeBoolean(dryRun);
     }
 
     public static UpdateDesiredNodesRequest fromXContent(

server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesResponse.java

@@ -9,8 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.desirednodes;
 
-import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -21,7 +19,6 @@
 import java.util.Objects;
 
 public class UpdateDesiredNodesResponse extends ActionResponse implements ToXContentObject {
-    private static final TransportVersion DRY_RUN_SUPPORTING_VERSION = TransportVersions.V_8_4_0;
 
     private final boolean replacedExistingHistoryId;
     private final boolean dryRun;
@@ -37,15 +34,13 @@ public UpdateDesiredNodesResponse(boolean replacedExistingHistoryId, boolean dry
 
     public UpdateDesiredNodesResponse(StreamInput in) throws IOException {
         this.replacedExistingHistoryId = in.readBoolean();
-        dryRun = in.getTransportVersion().onOrAfter(DRY_RUN_SUPPORTING_VERSION) ? in.readBoolean() : false;
+        dryRun = in.readBoolean();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeBoolean(replacedExistingHistoryId);
-        if (out.getTransportVersion().onOrAfter(DRY_RUN_SUPPORTING_VERSION)) {
-            out.writeBoolean(dryRun);
-        }
+        out.writeBoolean(dryRun);
     }
 
     public boolean hasReplacedExistingHistoryId() {

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);
     }
 

server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.settings;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
@@ -51,7 +50,6 @@ public Request(TimeValue masterNodeTimeout) {
         @UpdateForV10(owner = UpdateForV10.Owner.CORE_INFRA)
         public Request(StreamInput in) throws IOException {
             super(in);
-            assert in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0);
         }
 
         @Override
@@ -101,7 +99,6 @@ public Response(Settings persistentSettings, Settings transientSettings, Setting
         @UpdateForV10(owner = UpdateForV10.Owner.CORE_INFRA)
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            assert out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0);
             persistentSettings.writeTo(out);
             transientSettings.writeTo(out);
             settings.writeTo(out);

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.action.admin.cluster.snapshots.get;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.Strings;
@@ -41,7 +40,6 @@ public class GetSnapshotsRequest extends MasterNodeRequest<GetSnapshotsRequest>
     public static final String NO_POLICY_PATTERN = "_none";
     public static final boolean DEFAULT_VERBOSE_MODE = true;
 
-    private static final TransportVersion INDICES_FLAG_VERSION = TransportVersions.V_8_3_0;
     private static final TransportVersion STATE_FLAG_VERSION = TransportVersion.fromName("state_param_get_snapshot");
 
     public static final int NO_LIMIT = -1;
@@ -121,9 +119,7 @@ public GetSnapshotsRequest(StreamInput in) throws IOException {
         offset = in.readVInt();
         policies = in.readStringArray();
         fromSortValue = in.readOptionalString();
-        if (in.getTransportVersion().onOrAfter(INDICES_FLAG_VERSION)) {
-            includeIndexNames = in.readBoolean();
-        }
+        includeIndexNames = in.readBoolean();
         if (in.getTransportVersion().supports(STATE_FLAG_VERSION)) {
             states = in.readEnumSet(SnapshotState.class);
         } else {
@@ -145,9 +141,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeVInt(offset);
         out.writeStringArray(policies);
         out.writeOptionalString(fromSortValue);
-        if (out.getTransportVersion().onOrAfter(INDICES_FLAG_VERSION)) {
-            out.writeBoolean(includeIndexNames);
-        }
+        out.writeBoolean(includeIndexNames);
         if (out.getTransportVersion().supports(STATE_FLAG_VERSION)) {
             out.writeEnumSet(states);
         } else if (states.equals(EnumSet.allOf(SnapshotState.class)) == false) {

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java

@@ -9,8 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.snapshots.restore;
 
-import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.MasterNodeRequest;
@@ -52,7 +50,6 @@ public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotReq
     private boolean includeGlobalState = false;
     private boolean partial = false;
     private boolean includeAliases = true;
-    public static final TransportVersion VERSION_SUPPORTING_QUIET_PARAMETER = TransportVersions.V_8_4_0;
     private boolean quiet = false;
     private Settings indexSettings = Settings.EMPTY;
     private String[] ignoreIndexSettings = Strings.EMPTY_ARRAY;
@@ -92,11 +89,7 @@ public RestoreSnapshotRequest(StreamInput in) throws IOException {
         includeGlobalState = in.readBoolean();
         partial = in.readBoolean();
         includeAliases = in.readBoolean();
-        if (in.getTransportVersion().onOrAfter(VERSION_SUPPORTING_QUIET_PARAMETER)) {
-            quiet = in.readBoolean();
-        } else {
-            quiet = true;
-        }
+        quiet = in.readBoolean();
         indexSettings = readSettingsFromStream(in);
         ignoreIndexSettings = in.readStringArray();
         snapshotUuid = in.readOptionalString();
@@ -116,9 +109,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeBoolean(includeGlobalState);
         out.writeBoolean(partial);
         out.writeBoolean(includeAliases);
-        if (out.getTransportVersion().onOrAfter(VERSION_SUPPORTING_QUIET_PARAMETER)) {
-            out.writeBoolean(quiet);
-        }
+        out.writeBoolean(quiet);
         indexSettings.writeTo(out);
         out.writeStringArray(ignoreIndexSettings);
         out.writeOptionalString(snapshotUuid);