Remove part of transport version V_8_16_0

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

@@ -135,18 +135,13 @@ 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

@@ -117,23 +117,11 @@ public static Metric get(String name) {
         }
 
         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));
-            }
+            out.writeEnumSet(metrics);
         }
 
         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);
-                });
-            }
+            return in.readEnumSet(Metric.class);
         }
 
         public String 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

@@ -24,7 +24,6 @@
 import java.util.Objects;
 
 import static org.elasticsearch.TransportVersions.V_8_12_0;
-import static org.elasticsearch.TransportVersions.V_8_16_0;
 
 /**
  * Holds a snapshot of the search usage statistics.
@@ -79,7 +78,7 @@ public SearchUsageStats(StreamInput in) throws IOException {
         this.sections = in.readMap(StreamInput::readLong);
         this.totalSearchCount = in.readVLong();
         this.rescorers = in.getTransportVersion().onOrAfter(V_8_12_0) ? in.readMap(StreamInput::readLong) : Map.of();
-        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;
@@ -94,9 +93,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(V_8_12_0)) {
             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);
         }

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,10 @@ protected void sendItemRequest(String clusterAlias, ActionListener<RemoteCluster
             );
             var remoteRequest = new RemoteClusterStatsRequest();
             remoteRequest.setParentTask(taskId);
-            remoteClusterClient.getConnection(remoteRequest, listener.delegateFailureAndWrap((responseListener, connection) -> {
-                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) -> responseListener.onResponse(null))
+            );
         }
 
         @Override

server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComponentTemplateAction.java

@@ -183,9 +183,6 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
                 out.writeOptionalWriteable(rolloverConfiguration);
             }
-            if (out.getTransportVersion().between(TransportVersions.V_8_14_0, TransportVersions.V_8_16_0)) {
-                out.writeOptionalWriteable(null);
-            }
         }
 
         @Override

server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java

@@ -189,9 +189,6 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
                 out.writeOptionalWriteable(rolloverConfiguration);
             }
-            if (out.getTransportVersion().between(TransportVersions.V_8_14_0, TransportVersions.V_8_16_0)) {
-                out.writeOptionalWriteable(null);
-            }
         }
 
         @Override

server/src/main/java/org/elasticsearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java

@@ -86,9 +86,6 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
             out.writeOptionalWriteable(rolloverConfiguration);
         }
-        if (out.getTransportVersion().between(TransportVersions.V_8_14_0, TransportVersions.V_8_16_0)) {
-            out.writeOptionalWriteable(null);
-        }
     }
 
     @Override

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

server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java

@@ -12,7 +12,6 @@
 import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.RamUsageEstimator;
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.CompositeIndicesRequest;
@@ -107,11 +106,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);
         includeSourceOnError = in.readBoolean();
         if (in.getTransportVersion().supports(STREAMS_ENDPOINT_PARAM_RESTRICTIONS)) {
             paramsUsed = in.readCollectionAsImmutableSet(StreamInput::readString);
@@ -476,9 +471,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);
         out.writeBoolean(includeSourceOnError);
         if (out.getTransportVersion().supports(STREAMS_ENDPOINT_PARAM_RESTRICTIONS)) {
             out.writeCollection(paramsUsed, StreamOutput::writeString);

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

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<Throwable> 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

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,13 +143,8 @@ public SimulateBulkRequest(
     public SimulateBulkRequest(StreamInput in) throws IOException {
         super(in);
         this.pipelineSubstitutions = (Map<String, Map<String, Object>>) in.readGenericValue();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
-            this.componentTemplateSubstitutions = (Map<String, Map<String, Object>>) in.readGenericValue();
-            this.indexTemplateSubstitutions = (Map<String, Map<String, Object>>) in.readGenericValue();
-        } else {
-            componentTemplateSubstitutions = Map.of();
-            indexTemplateSubstitutions = Map.of();
-        }
+        this.componentTemplateSubstitutions = (Map<String, Map<String, Object>>) in.readGenericValue();
+        this.indexTemplateSubstitutions = (Map<String, Map<String, Object>>) in.readGenericValue();
         this.mappingAddition = (Map<String, Object>) in.readGenericValue();
         if (in.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
             mappingMergeType = in.readOptionalString();
@@ -163,10 +157,8 @@ 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);
-        }
+        out.writeGenericValue(componentTemplateSubstitutions);
+        out.writeGenericValue(indexTemplateSubstitutions);
         out.writeGenericValue(mappingAddition);
         if (out.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
             out.writeOptionalString(mappingMergeType);