Remove transport version constant V_8_16_0 (#139269)

ES-13702

Author: jdconrad

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpTaskState.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.ingest.geoip;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -123,7 +122,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_8_16_0;
+        return TransportVersion.minimumCompatible();
     }
 
     @Override

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpMetadata.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.ingest.geoip;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.Diff;
 import org.elasticsearch.cluster.DiffableUtils;
 import org.elasticsearch.cluster.NamedDiff;
@@ -69,7 +68,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_8_16_0;
+        return TransportVersion.minimumCompatible();
     }
 
     public Map<String, DatabaseConfigurationMetadata> getDatabases() {
@@ -138,7 +137,7 @@ public String getWriteableName() {
 
         @Override
         public TransportVersion getMinimalSupportedVersion() {
-            return TransportVersions.V_8_16_0;
+            return TransportVersion.minimumCompatible();
         }
     }
 

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

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

@@ -60,7 +60,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_8_14_0 = def(8_636_0_01);
     public static final TransportVersion V_8_15_0 = def(8_702_0_02);
     public static final TransportVersion V_8_15_2 = def(8_702_0_03);
-    public static final TransportVersion V_8_16_0 = def(8_772_0_01);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java

@@ -135,18 +135,14 @@ public Request(TimeValue masterNodeTimeout, TaskId parentTaskId, EnumSet<Metric>
 
         public Request(StreamInput in) throws IOException {
             super(in);
-            this.metrics = in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)
-                ? in.readEnumSet(Metric.class)
-                : EnumSet.of(Metric.ALLOCATIONS, Metric.FS);
+            this.metrics = in.readEnumSet(Metric.class);
         }
 
         @Override
         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<Metric> metrics() {

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;
@@ -38,14 +37,14 @@ public NodesStatsRequestParameters() {
 
     public NodesStatsRequestParameters(StreamInput in) throws IOException {
         indices = new CommonStatsFlags(in);
-        requestedMetrics = Metric.readSetFrom(in);
+        requestedMetrics = in.readEnumSet(Metric.class);
         includeShardsStats = in.readBoolean();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         indices.writeTo(out);
-        Metric.writeSetTo(out, requestedMetrics);
+        out.writeEnumSet(requestedMetrics);
         out.writeBoolean(includeShardsStats);
     }
 
@@ -110,26 +109,6 @@ public static Metric get(String name) {
             return metric;
         }
 
-        public static void writeSetTo(StreamOutput out, EnumSet<Metric> 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));
-            }
-        }
-
-        public static EnumSet<Metric> 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);
-                });
-            }
-        }
-
         public String metricName() {
             return metricName;
         }

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.action.admin.cluster.snapshots.create;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -107,7 +106,7 @@ public CreateSnapshotRequest(StreamInput in) throws IOException {
         waitForCompletion = in.readBoolean();
         partial = in.readBoolean();
         userMetadata = in.readGenericMap();
-        uuid = in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0) ? in.readOptionalString() : null;
+        uuid = in.readOptionalString();
     }
 
     @Override
@@ -122,9 +121,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

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.stats;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
 import org.elasticsearch.action.admin.indices.stats.ShardStats;
@@ -41,13 +40,8 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
         this.nodeStats = new NodeStats(in);
         this.shardsStats = in.readArray(ShardStats::new, ShardStats[]::new);
         searchUsageStats = new SearchUsageStats(in);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
-            repositoryUsageStats = RepositoryUsageStats.readFrom(in);
-            searchCcsMetrics = new CCSTelemetrySnapshot(in);
-        } else {
-            repositoryUsageStats = RepositoryUsageStats.EMPTY;
-            searchCcsMetrics = new CCSTelemetrySnapshot();
-        }
+        repositoryUsageStats = RepositoryUsageStats.readFrom(in);
+        searchCcsMetrics = new CCSTelemetrySnapshot(in);
         esqlCcsMetrics = new CCSTelemetrySnapshot(in);
     }
 
@@ -117,10 +111,8 @@ public void writeTo(StreamOutput out) throws IOException {
         nodeStats.writeTo(out);
         out.writeArray(shardsStats);
         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
+        repositoryUsageStats.writeTo(out);
+        searchCcsMetrics.writeTo(out);
         esqlCcsMetrics.writeTo(out);
     }
 

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.cluster.stats;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.LegacyActionRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -36,11 +35,6 @@ public ActionRequestValidationException validate() {
 
     @Override
     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);
     }
 }

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/SearchUsageStats.java

@@ -23,8 +23,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import static org.elasticsearch.TransportVersions.V_8_16_0;
-
 /**
  * Holds a snapshot of the search usage statistics.
  * Used to hold the stats for a single node that's part of a {@link ClusterStatsNodeResponse}, as well as to
@@ -78,7 +76,7 @@ public SearchUsageStats(StreamInput in) throws IOException {
         this.sections = in.readMap(StreamInput::readLong);
         this.totalSearchCount = in.readVLong();
         this.rescorers = in.readMap(StreamInput::readLong);
-        this.retrievers = in.getTransportVersion().onOrAfter(V_8_16_0) ? in.readMap(StreamInput::readLong) : Map.of();
+        this.retrievers = in.readMap(StreamInput::readLong);
         this.extendedSearchUsageStats = in.getTransportVersion().supports(EXTENDED_SEARCH_USAGE_TELEMETRY)
             ? new ExtendedSearchUsageStats(in)
             : ExtendedSearchUsageStats.EMPTY;
@@ -89,11 +87,8 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeMap(queries, StreamOutput::writeLong);
         out.writeMap(sections, StreamOutput::writeLong);
         out.writeVLong(totalSearchCount);
-
         out.writeMap(rescorers, StreamOutput::writeLong);
-        if (out.getTransportVersion().onOrAfter(V_8_16_0)) {
-            out.writeMap(retrievers, StreamOutput::writeLong);
-        }
+        out.writeMap(retrievers, StreamOutput::writeLong);
         if (out.getTransportVersion().supports(EXTENDED_SEARCH_USAGE_TELEMETRY)) {
             extendedSearchUsageStats.writeTo(out);
         }