make V_3_0_0 package private and reuse in test

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Jan 14, 2022 · 2601e64 · 2601e64
1 parent 0830a2c
commit 2601e64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/transport/TransportHandshaker.java b/server/src/main/java/org/opensearch/transport/TransportHandshaker.java
@@ -64,7 +64,7 @@ final class TransportHandshaker {
     private final HandshakeRequestSender handshakeRequestSender;
 
     // @todo remove in 3.0.0
-    private static final Version V_3_0_0 = Version.fromId(3000099 ^ Version.MASK);
+    static final Version V_3_0_0 = Version.fromId(3000099 ^ Version.MASK);
 
     TransportHandshaker(Version version, ThreadPool threadPool, HandshakeRequestSender handshakeRequestSender) {
         this.version = version;

diff --git a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java
@@ -107,6 +107,7 @@
 
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.emptySet;
+import static org.opensearch.transport.TransportHandshaker.V_3_0_0;
 import static org.opensearch.transport.TransportService.NOOP_TRANSPORT_INTERCEPTOR;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.empty;
@@ -2229,9 +2230,7 @@ public void testHandshakeUpdatesVersion() throws IOException {
                 // OpenSearch [1.0:3.0) in bwc mode should only "upgrade" to Legacy v7.10.2
                 assertEquals(
                     connection.getVersion(),
-                    version.onOrAfter(Version.V_1_0_0) && version.before(Version.fromId(3000099 ^ Version.MASK))
-                        ? LegacyESVersion.V_7_10_2
-                        : version
+                    version.onOrAfter(Version.V_1_0_0) && version.before(V_3_0_0) ? LegacyESVersion.V_7_10_2 : version
                 );
             }
         }