Revert "Since Server v4.0 the server agent received in response to the Hello message is unreliable. Instead, since the server and Bolt protocol versions are aligned, we use the protocol version instead for all connections to Server 4.0 and higher (neo4j#708) (neo4j#718)"

This reverts commit 31d3495.

Author: gjmwoods

driver/src/main/java/org/neo4j/driver/internal/handlers/HelloResponseHandler.java

@@ -37,30 +37,20 @@ public class HelloResponseHandler implements ResponseHandler
 
     private final ChannelPromise connectionInitializedPromise;
     private final Channel channel;
-    private final int protocolVersion;
 
-    public HelloResponseHandler( ChannelPromise connectionInitializedPromise, int protocolVersion )
+    public HelloResponseHandler( ChannelPromise connectionInitializedPromise )
     {
         this.connectionInitializedPromise = connectionInitializedPromise;
         this.channel = connectionInitializedPromise.channel();
-        this.protocolVersion = protocolVersion;
     }
 
     @Override
     public void onSuccess( Map<String,Value> metadata )
     {
         try
         {
-            // From Server V4 extracting server from metadata in the success message is unreliable
-            // so we fix the Server version against the Bolt Protocol version for Server V4 and above.
-            if ( protocolVersion == 4 )
-            {
-                setServerVersion( channel, ServerVersion.v4_0_0 );
-            }
-            else
-            {
-                setServerVersion( channel, extractNeo4jServerVersion( metadata ) );
-            }
+            ServerVersion serverVersion = extractNeo4jServerVersion( metadata );
+            setServerVersion( channel, serverVersion );
 
             String connectionId = extractConnectionId( metadata );
             setConnectionId( channel, connectionId );

driver/src/main/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3.java

@@ -80,7 +80,7 @@ public void initializeChannel( String userAgent, Map<String,Value> authToken, Ch
         Channel channel = channelInitializedPromise.channel();
 
         HelloMessage message = new HelloMessage( userAgent, authToken );
-        HelloResponseHandler handler = new HelloResponseHandler( channelInitializedPromise, version() );
+        HelloResponseHandler handler = new HelloResponseHandler( channelInitializedPromise );
 
         messageDispatcher( channel ).enqueue( handler );
         channel.writeAndFlush( message, channel.voidPromise() );

driver/src/test/java/org/neo4j/driver/internal/handlers/HelloResponseHandlerTest.java

@@ -37,7 +37,6 @@
 import org.neo4j.driver.internal.async.inbound.InboundMessageDispatcher;
 import org.neo4j.driver.internal.async.outbound.OutboundMessageHandler;
 import org.neo4j.driver.internal.messaging.v1.MessageFormatV1;
-import org.neo4j.driver.internal.util.ServerVersion;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -74,7 +73,7 @@ void tearDown()
     void shouldSetServerVersionOnChannel()
     {
         ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 3 );
+        HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         Map<String,Value> metadata = metadata( anyServerVersion(), "bolt-1" );
         handler.onSuccess( metadata );
@@ -87,7 +86,7 @@ void shouldSetServerVersionOnChannel()
     void shouldThrowWhenServerVersionNotReturned()
     {
         ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 3 );
+        HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         Map<String,Value> metadata = metadata( null, "bolt-1" );
         assertThrows( UntrustedServerException.class, () -> handler.onSuccess( metadata ) );
@@ -100,7 +99,7 @@ void shouldThrowWhenServerVersionNotReturned()
     void shouldThrowWhenServerVersionIsNull()
     {
         ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 3 );
+        HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         Map<String,Value> metadata = metadata( Values.NULL, "bolt-x" );
         assertThrows( UntrustedServerException.class, () -> handler.onSuccess( metadata ) );
@@ -113,7 +112,7 @@ void shouldThrowWhenServerVersionIsNull()
     void shouldThrowWhenServerVersionCantBeParsed()
     {
         ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 3 );
+        HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         Map<String,Value> metadata = metadata( "WrongServerVersion", "bolt-x" );
         assertThrows( IllegalArgumentException.class, () -> handler.onSuccess( metadata ) );
@@ -122,25 +121,11 @@ void shouldThrowWhenServerVersionCantBeParsed()
         assertTrue( channel.closeFuture().isDone() ); // channel was closed
     }
 
-    @Test
-    void shouldUseProtocolVersionForServerVersionWhenConnectedWithBoltV4()
-    {
-        ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 4 );
-
-        // server used in metadata should be ignored
-        Map<String,Value> metadata = metadata( ServerVersion.vInDev, "bolt-1" );
-        handler.onSuccess( metadata );
-
-        assertTrue( channelPromise.isSuccess() );
-        assertEquals( ServerVersion.v4_0_0, serverVersion( channel ) );
-    }
-
     @Test
     void shouldSetConnectionIdOnChannel()
     {
         ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 3 );
+        HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         Map<String,Value> metadata = metadata( anyServerVersion(), "bolt-42" );
         handler.onSuccess( metadata );
@@ -153,7 +138,7 @@ void shouldSetConnectionIdOnChannel()
     void shouldThrowWhenConnectionIdNotReturned()
     {
         ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 3 );
+        HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         Map<String,Value> metadata = metadata( anyServerVersion(), null );
         assertThrows( IllegalStateException.class, () -> handler.onSuccess( metadata ) );
@@ -166,7 +151,7 @@ void shouldThrowWhenConnectionIdNotReturned()
     void shouldThrowWhenConnectionIdIsNull()
     {
         ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 3 );
+        HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         Map<String,Value> metadata = metadata( anyServerVersion(), Values.NULL );
         assertThrows( IllegalStateException.class, () -> handler.onSuccess( metadata ) );
@@ -179,7 +164,7 @@ void shouldThrowWhenConnectionIdIsNull()
     void shouldCloseChannelOnFailure() throws Exception
     {
         ChannelPromise channelPromise = channel.newPromise();
-        HelloResponseHandler handler = new HelloResponseHandler( channelPromise, 3 );
+        HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         RuntimeException error = new RuntimeException( "Hi!" );
         handler.onFailure( error );