Migrate ESTestCase.copy* and AbstractBWC test cases to TransportVersion (#93789)

Author: thecoop

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

@@ -147,7 +147,7 @@ public void testSerialization() {
                 )
             ),
             // Note: the cast of the Copy- and MutateFunction is needed for some IDE (specifically Eclipse 4.10.0) to infer the right type
-            (WriteableBuild b) -> copyWriteable(b, writableRegistry(), WriteableBuild::new, Version.CURRENT),
+            (WriteableBuild b) -> copyWriteable(b, writableRegistry(), WriteableBuild::new, TransportVersion.CURRENT),
             (WriteableBuild b) -> {
                 switch (randomIntBetween(1, 5)) {
                     case 1:

server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponseTests.java

@@ -9,7 +9,7 @@
 package org.elasticsearch.action.admin.cluster.snapshots.get;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.Version;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -62,7 +62,7 @@ private GetSnapshotsResponse copyInstance(GetSnapshotsResponse instance) throws
             new NamedWriteableRegistry(Collections.emptyList()),
             (out, value) -> value.writeTo(out),
             GetSnapshotsResponse::new,
-            Version.CURRENT
+            TransportVersion.CURRENT
         );
 
     }

server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/get/shard/GetShardSnapshotResponseSerializationTests.java

@@ -9,7 +9,7 @@
 package org.elasticsearch.action.admin.cluster.snapshots.get.shard;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.Version;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
@@ -56,7 +56,7 @@ private GetShardSnapshotResponse copyInstance(GetShardSnapshotResponse instance)
             new NamedWriteableRegistry(Collections.emptyList()),
             (out, value) -> value.writeTo(out),
             GetShardSnapshotResponse::new,
-            Version.CURRENT
+            TransportVersion.CURRENT
         );
     }
 

server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.action.search;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.common.Strings;
@@ -26,6 +25,7 @@
 import org.elasticsearch.search.vectors.KnnSearchBuilder;
 import org.elasticsearch.tasks.TaskId;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.TransportVersionUtils;
 import org.elasticsearch.test.VersionUtils;
 
 import java.io.IOException;
@@ -105,7 +105,7 @@ public void testSerializationMultiKNN() throws Exception {
                 searchRequest,
                 namedWriteableRegistry,
                 SearchRequest::new,
-                VersionUtils.randomVersionBetween(random(), Version.V_8_4_0, Version.V_8_6_0)
+                TransportVersionUtils.randomVersionBetween(random(), TransportVersion.V_8_4_0, TransportVersion.V_8_6_0)
             )
         );
 
@@ -115,22 +115,22 @@ public void testSerializationMultiKNN() throws Exception {
             searchRequest,
             namedWriteableRegistry,
             SearchRequest::new,
-            VersionUtils.randomVersionBetween(random(), Version.V_8_4_0, Version.V_8_6_0)
+            TransportVersionUtils.randomVersionBetween(random(), TransportVersion.V_8_4_0, TransportVersion.V_8_6_0)
         );
     }
 
     public void testRandomVersionSerialization() throws IOException {
         SearchRequest searchRequest = createSearchRequest();
-        Version version = VersionUtils.randomVersion(random());
-        if (version.before(Version.V_7_11_0) && searchRequest.source() != null) {
+        TransportVersion version = TransportVersionUtils.randomVersion(random());
+        if (version.before(TransportVersion.V_7_11_0) && searchRequest.source() != null) {
             // Versions before 7.11.0 don't support runtime mappings
             searchRequest.source().runtimeMappings(emptyMap());
         }
-        if (version.before(Version.V_8_4_0)) {
+        if (version.before(TransportVersion.V_8_4_0)) {
             // Versions before 8.4.0 don't support force_synthetic_source
             searchRequest.setForceSyntheticSource(false);
         }
-        if (version.before(Version.V_8_7_0) && searchRequest.hasKnnSearch() && searchRequest.source().knnSearch().size() > 1) {
+        if (version.before(TransportVersion.V_8_7_0) && searchRequest.hasKnnSearch() && searchRequest.source().knnSearch().size() > 1) {
             // Versions before 8.7.0 don't support more than one KNN clause
             searchRequest.source().knnSearch(List.of(searchRequest.source().knnSearch().get(0)));
         }

server/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java

@@ -9,7 +9,7 @@
 package org.elasticsearch.action.search;
 
 import org.apache.lucene.search.TotalHits;
-import org.elasticsearch.Version;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -307,7 +307,7 @@ public void testToXContent() throws IOException {
 
     public void testSerialization() throws IOException {
         SearchResponse searchResponse = createTestItem(false);
-        SearchResponse deserialized = copyWriteable(searchResponse, namedWriteableRegistry, SearchResponse::new, Version.CURRENT);
+        SearchResponse deserialized = copyWriteable(searchResponse, namedWriteableRegistry, SearchResponse::new, TransportVersion.CURRENT);
         if (searchResponse.getHits().getTotalHits() == null) {
             assertNull(deserialized.getHits().getTotalHits());
         } else {
@@ -333,7 +333,7 @@ public void testToXContentEmptyClusters() throws IOException {
             ShardSearchFailure.EMPTY_ARRAY,
             SearchResponse.Clusters.EMPTY
         );
-        SearchResponse deserialized = copyWriteable(searchResponse, namedWriteableRegistry, SearchResponse::new, Version.CURRENT);
+        SearchResponse deserialized = copyWriteable(searchResponse, namedWriteableRegistry, SearchResponse::new, TransportVersion.CURRENT);
         XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent());
         deserialized.getClusters().toXContent(builder, ToXContent.EMPTY_PARAMS);
         assertEquals(0, Strings.toString(builder).length());

server/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java

@@ -17,7 +17,7 @@
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.search.SearchShardTarget;
 import org.elasticsearch.test.ESTestCase;
-import org.elasticsearch.test.VersionUtils;
+import org.elasticsearch.test.TransportVersionUtils;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentType;
@@ -160,7 +160,7 @@ public void testSerialization() throws IOException {
                 testItem,
                 writableRegistry(),
                 ShardSearchFailure::new,
-                VersionUtils.randomVersion(random())
+                TransportVersionUtils.randomVersion(random())
             );
             assertEquals(testItem.index(), deserializedInstance.index());
             assertEquals(testItem.shard(), deserializedInstance.shard());

server/src/test/java/org/elasticsearch/action/support/master/ShardsAcknowledgedResponseTests.java

@@ -7,7 +7,7 @@
  */
 package org.elasticsearch.action.support.master;
 
-import org.elasticsearch.Version;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -27,12 +27,17 @@ public void testSerialization() throws Exception {
             testInstance,
             new NamedWriteableRegistry(List.of()),
             in -> new TestImpl(in, true),
-            Version.CURRENT
+            TransportVersion.CURRENT
         );
         assertThat(result.isAcknowledged(), is(true));
         assertThat(result.isShardsAcknowledged(), is(true));
 
-        result = copyWriteable(testInstance, new NamedWriteableRegistry(List.of()), in -> new TestImpl(in, false), Version.CURRENT);
+        result = copyWriteable(
+            testInstance,
+            new NamedWriteableRegistry(List.of()),
+            in -> new TestImpl(in, false),
+            TransportVersion.CURRENT
+        );
         assertThat(result.isAcknowledged(), is(true));
         assertThat(result.isShardsAcknowledged(), is(false));
     }

server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java

@@ -60,7 +60,7 @@
 import org.elasticsearch.search.MultiValueMode;
 import org.elasticsearch.search.sort.ShardDocSortField;
 import org.elasticsearch.test.ESTestCase;
-import org.elasticsearch.test.VersionUtils;
+import org.elasticsearch.test.TransportVersionUtils;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -567,7 +567,7 @@ public void testSortFieldSerialization() throws IOException {
             EMPTY_REGISTRY,
             Lucene::writeSortField,
             Lucene::readSortField,
-            VersionUtils.randomVersion(random())
+            TransportVersionUtils.randomVersion(random())
         );
         assertEquals(sortFieldTuple.v2(), deserialized);
     }
@@ -579,7 +579,7 @@ public void testSortValueSerialization() throws IOException {
             EMPTY_REGISTRY,
             Lucene::writeSortValue,
             Lucene::readSortValue,
-            VersionUtils.randomVersion(random())
+            TransportVersionUtils.randomVersion(random())
         );
         assertEquals(sortValue, deserialized);
     }

server/src/test/java/org/elasticsearch/common/util/BytesRefArrayTests.java

@@ -10,7 +10,7 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefBuilder;
-import org.elasticsearch.Version;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
 import org.elasticsearch.test.ESTestCase;
@@ -48,7 +48,7 @@ public void testRandomWithSerialization() throws IOException {
                 writableRegistry(),
                 (out, value) -> value.writeTo(out),
                 in -> new BytesRefArray(in, mockBigArrays()),
-                Version.CURRENT
+                TransportVersion.CURRENT
             );
 
             assertEquality(array, copy);
@@ -97,7 +97,7 @@ public void testLookup() throws IOException {
                     writableRegistry(),
                     (out, value) -> value.writeTo(out),
                     in -> new BytesRefArray(in, mockBigArrays()),
-                    Version.CURRENT
+                    TransportVersion.CURRENT
                 );
                 assertEquality(inArray, array);
                 inArray.close();

server/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java

@@ -11,7 +11,7 @@
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefBuilder;
-import org.elasticsearch.Version;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.common.breaker.CircuitBreakingException;
 import org.elasticsearch.common.settings.Settings;
@@ -394,7 +394,7 @@ public void testGetByteRefsAndSerialization() throws IOException {
                 writableRegistry(),
                 (out, value) -> value.writeTo(out),
                 in -> new BytesRefArray(in, mockBigArrays()),
-                Version.CURRENT
+                TransportVersion.CURRENT
             );
 
             BytesRefHash copy = new BytesRefHash(refArrayCopy, mockBigArrays());