Reapply "Remove V_8_0_0 transport version from tests (elastic#135942)" (elastic#136578) (elastic#138990)

This reverts commit 60a05a9.

Author: jdconrad

server/src/main/java/org/elasticsearch/action/fieldcaps/ResponseRewriter.java

@@ -453,7 +453,7 @@ private static FieldCapabilitiesResponse merge(
                 } else {
                     subIndices = ArrayUtil.copyOfSubArray(indices, lastPendingIndex, i);
                 }
-                innerMerge(subIndices, fieldsBuilder, request, indexResponses[lastPendingIndex]);
+                innerMerge(subIndices, fieldsBuilder, indexResponses[lastPendingIndex]);
                 lastPendingIndex = i;
             }
         }
@@ -578,15 +578,9 @@ private static String nextIndex(Iterator<String> iter, Set<String> filtered) {
     private static void innerMerge(
         String[] indices,
         Map<String, Map<String, FieldCapabilities.Builder>> responseMapBuilder,
-        FieldCapabilitiesRequest request,
         FieldCapabilitiesIndexResponse response
     ) {
-        Map<String, IndexFieldCapabilities> fields = ResponseRewriter.rewriteOldResponses(
-            response.getOriginVersion(),
-            response.get(),
-            request.filters(),
-            request.types()
-        );
+        Map<String, IndexFieldCapabilities> fields = response.get();
         for (Map.Entry<String, IndexFieldCapabilities> entry : fields.entrySet()) {
             final String field = entry.getKey();
             final IndexFieldCapabilities fieldCap = entry.getValue();

server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java

@@ -9,7 +9,7 @@
 
 package org.elasticsearch.action.admin.cluster.reroute;
 
-import org.elasticsearch.TransportVersions;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
@@ -132,7 +132,7 @@ public void testToXContentWithDeprecatedClusterState() {
                         "nodes_versions": [
                           {
                             "node_id": "node0",
-                            "transport_version": "8000099",
+                            "transport_version": "%s",
                             "mappings_versions": {
                               ".system-index": {
                                 "version": 1,
@@ -219,6 +219,7 @@ public void testToXContentWithDeprecatedClusterState() {
                 Version.CURRENT,
                 IndexVersions.MINIMUM_COMPATIBLE,
                 IndexVersion.current(),
+                TransportVersion.current(),
                 IndexVersion.current(),
                 IndexVersion.current()
             ),
@@ -335,7 +336,7 @@ private static ClusterState createClusterState() {
             .nodes(new DiscoveryNodes.Builder().add(node0).masterNodeId(node0.getId()).build())
             .putCompatibilityVersions(
                 node0.getId(),
-                TransportVersions.V_8_0_0,
+                TransportVersion.current(),
                 Map.of(".system-index", new SystemIndexDescriptor.MappingsVersion(1, 0))
             )
             .metadata(

server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java

@@ -9,19 +9,11 @@
 
 package org.elasticsearch.action.search;
 
-import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
-import org.elasticsearch.common.io.stream.BytesStreamOutput;
-import org.elasticsearch.common.io.stream.NamedWriteableAwareStreamInput;
-import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
-import org.elasticsearch.test.TransportVersionUtils;
 
 import java.io.IOException;
-import java.util.List;
 
 import static org.hamcrest.Matchers.equalTo;
 
@@ -95,19 +87,4 @@ protected OpenPointInTimeRequest mutateInstance(OpenPointInTimeRequest in) throw
             default -> throw new AssertionError("Unknown option");
         };
     }
-
-    public void testUseDefaultConcurrentForOldVersion() throws Exception {
-        TransportVersion previousVersion = TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_9_X);
-        try (BytesStreamOutput output = new BytesStreamOutput()) {
-            TransportVersion version = TransportVersionUtils.randomVersionBetween(random(), TransportVersions.V_8_0_0, previousVersion);
-            output.setTransportVersion(version);
-            OpenPointInTimeRequest original = createTestInstance();
-            original.writeTo(output);
-            try (StreamInput in = new NamedWriteableAwareStreamInput(output.bytes().streamInput(), new NamedWriteableRegistry(List.of()))) {
-                in.setTransportVersion(version);
-                OpenPointInTimeRequest copy = new OpenPointInTimeRequest(in);
-                assertThat(copy.maxConcurrentShardRequests(), equalTo(5));
-            }
-        }
-    }
 }

server/src/test/java/org/elasticsearch/action/fieldcaps/ResponseRewriterTests.java

@@ -11,7 +11,6 @@
 
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.Diff;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -620,7 +619,7 @@ public void testMissingValue() throws Exception {
 
     public void testReadWriteArray() throws IOException {
         BytesStreamOutput output = new BytesStreamOutput();
-        output.setTransportVersion(randomFrom(TransportVersion.current(), TransportVersions.V_8_0_0));
+        output.setTransportVersion(TransportVersion.current());
         Settings settings = Settings.builder().putList("foo.bar", "0", "1", "2", "3").put("foo.bar.baz", "baz").build();
         settings.writeTo(output);
         StreamInput in = StreamInput.wrap(BytesReference.toBytes(output.bytes()));