Remove several remaining Core/Infra UpdateForV9 references (elastic#124197) (elastic#124231)

Author: thecoop

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

@@ -10,7 +10,6 @@
 package org.elasticsearch;
 
 import org.elasticsearch.core.Assertions;
-import org.elasticsearch.core.UpdateForV9;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -49,7 +48,7 @@ static TransportVersion def(int id) {
         return new TransportVersion(id);
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // remove the transport versions with which v9 will not need to interact
+    // TODO: ES-10337 we can remove all transport versions earlier than 8.18
     public static final TransportVersion ZERO = def(0);
     public static final TransportVersion V_7_0_0 = def(7_00_00_99);
     public static final TransportVersion V_7_1_0 = def(7_01_00_99);

server/src/main/java/org/elasticsearch/transport/TransportHandshaker.java

@@ -21,12 +21,10 @@
 import org.elasticsearch.common.metrics.CounterMetric;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.logging.Logger;
 import org.elasticsearch.threadpool.ThreadPool;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.util.Objects;
 import java.util.Set;
@@ -357,28 +355,18 @@ static final class HandshakeRequest extends TransportRequest {
             this.releaseVersion = Objects.requireNonNull(releaseVersion);
         }
 
-        @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // remainingMessage == null is invalid in v9
         HandshakeRequest(StreamInput streamInput) throws IOException {
             super(streamInput);
-            BytesReference remainingMessage;
-            try {
-                remainingMessage = streamInput.readSlicedBytesReference();
-            } catch (EOFException e) {
-                remainingMessage = null;
-            }
-            if (remainingMessage == null) {
-                transportVersion = null;
-                releaseVersion = null;
-            } else {
-                try (StreamInput messageStreamInput = remainingMessage.streamInput()) {
-                    this.transportVersion = TransportVersion.readVersion(messageStreamInput);
-                    if (streamInput.getTransportVersion().onOrAfter(V9_HANDSHAKE_VERSION)) {
-                        this.releaseVersion = messageStreamInput.readString();
-                    } else {
-                        this.releaseVersion = this.transportVersion.toReleaseVersion();
-                    }
+
+            try (StreamInput messageStreamInput = streamInput.readSlicedBytesReference().streamInput()) {
+                this.transportVersion = TransportVersion.readVersion(messageStreamInput);
+                if (streamInput.getTransportVersion().onOrAfter(V9_HANDSHAKE_VERSION)) {
+                    this.releaseVersion = messageStreamInput.readString();
+                } else {
+                    this.releaseVersion = this.transportVersion.toReleaseVersion();
                 }
             }
+
         }
 
         @Override

server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java

@@ -30,7 +30,6 @@
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.PathUtils;
 import org.elasticsearch.core.SuppressForbidden;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.gateway.MetadataStateFormat;
 import org.elasticsearch.gateway.PersistedClusterStateService;
 import org.elasticsearch.index.Index;
@@ -539,8 +538,6 @@ public void testBlocksDowngradeToVersionWithMultipleNodesInDataPath() throws IOE
         }
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    @AwaitsFix(bugUrl = "test won't work until we remove and bump minimum index versions")
     public void testIndexCompatibilityChecks() throws IOException {
         final Settings settings = buildEnvSettings(Settings.EMPTY);
 

server/src/test/java/org/elasticsearch/transport/OutboundHandlerTests.java

@@ -12,7 +12,6 @@
 import org.apache.logging.log4j.Level;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.cluster.node.DiscoveryNode;
@@ -35,7 +34,6 @@
 import org.elasticsearch.core.Streams;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.MockLog;
 import org.elasticsearch.test.TransportVersionUtils;
@@ -141,8 +139,7 @@ public void testSendRequest() throws IOException {
         TransportVersion version = isHandshake
             ? randomFrom(TransportHandshaker.ALLOWED_HANDSHAKE_VERSIONS)
             : TransportVersionUtils.randomCompatibleVersion(random());
-        @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // drop the version.onOrAfter() in v9
-        boolean compress = version.onOrAfter(TransportVersions.MINIMUM_COMPATIBLE) && randomBoolean();
+        boolean compress = randomBoolean();
         String value = "message";
         threadContext.putHeader("header", "header_value");
         TestRequest request = new TestRequest(value);
@@ -215,8 +212,7 @@ public void testSendResponse() throws IOException {
         TransportVersion version = isHandshake
             ? randomFrom(TransportHandshaker.ALLOWED_HANDSHAKE_VERSIONS)
             : TransportVersionUtils.randomCompatibleVersion(random());
-        @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // drop the version.onOrAfter() in v9
-        boolean compress = version.onOrAfter(TransportVersions.MINIMUM_COMPATIBLE) && randomBoolean();
+        boolean compress = randomBoolean();
 
         String value = "message";
         threadContext.putHeader("header", "header_value");