Reapply "Remove transport version V_8_16_1 (elastic#136335)" (elastic#136491) (elastic#139224)

This reverts commit fe44986.

Author: jdconrad

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

@@ -66,9 +66,6 @@ static TransportVersion def(int id) {
     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);
-    public static final TransportVersion V_8_16_1 = def(8_772_0_04);
-    public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_5 = def(8_772_0_05);
-    public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_6 = def(8_772_0_06);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java

@@ -66,11 +66,7 @@ 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
-            }
+            compatibilityVersions = CompatibilityVersions.readVersion(in);
             indexVersion = IndexVersion.readVersion(in);
         } else {
             Version legacyVersion = Version.readVersion(in);
@@ -245,9 +241,7 @@ public void writeTo(StreamOutput out) throws IOException {
         } else {
             Version.writeVersion(Version.fromString(version), out);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
-            compatibilityVersions.writeTo(out);
-        }
+        compatibilityVersions.writeTo(out);
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
             IndexVersion.writeVersion(indexVersion, out);
             out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt);

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;
@@ -273,11 +272,7 @@ public SearchSourceBuilder(StreamInput in) throws IOException {
         runtimeMappings = in.readGenericMap();
         knnSearch = in.readCollectionAsList(KnnSearchBuilder::new);
         rankBuilder = in.readOptionalNamedWriteable(RankBuilder.class);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
-            skipInnerHits = in.readBoolean();
-        } else {
-            skipInnerHits = false;
-        }
+        skipInnerHits = in.readBoolean();
     }
 
     @Override
@@ -340,9 +335,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeGenericMap(runtimeMappings);
         out.writeCollection(knnSearch);
         out.writeOptionalNamedWriteable(rankBuilder);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
-            out.writeBoolean(skipInnerHits);
-        }
+        out.writeBoolean(skipInnerHits);
     }
 
     /**

server/src/test/java/org/elasticsearch/TransportVersionTests.java

@@ -427,7 +427,7 @@ public void testTransportVersionsLocked() {
             "TransportVersions.java is locked. Generate transport versions with TransportVersion.fromName "
                 + "and generateTransportVersion gradle task",
             TransportVersions.DEFINED_VERSIONS.getLast().id(),
-            equalTo(8_772_0_06)
+            equalTo(8_772_0_01)
         );
     }
 }

x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesetListItem.java

@@ -7,8 +7,6 @@
 
 package org.elasticsearch.xpack.application.rules;
 
-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;
@@ -61,12 +59,7 @@ public QueryRulesetListItem(StreamInput in) throws IOException {
         this.rulesetId = in.readString();
         this.ruleTotalCount = in.readInt();
         this.criteriaTypeToCountMap = in.readMap(m -> in.readEnum(QueryRuleCriteriaType.class), StreamInput::readInt);
-        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
@@ -93,10 +86,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(rulesetId);
         out.writeInt(ruleTotalCount);
         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);
     }
 
     /**