review feedback

Author: gjmwoods

driver/src/main/java/org/neo4j/driver/internal/async/connection/BoltProtocolUtil.java

@@ -33,9 +33,6 @@
 
 public final class BoltProtocolUtil
 {
-    // Represents the `TP` part of `HTTP` (0x48545450) which can be returned if connected to HTTP port
-    public static final BoltProtocolVersion HTTP = new BoltProtocolVersion(80, 84 );
-
     public static final int BOLT_MAGIC_PREAMBLE = 0x6060B017;
     public static final BoltProtocolVersion NO_PROTOCOL_VERSION = new BoltProtocolVersion( 0 , 0 );
 

driver/src/main/java/org/neo4j/driver/internal/async/connection/HandshakeHandler.java

@@ -38,8 +38,8 @@
 import org.neo4j.driver.exceptions.SecurityException;
 import org.neo4j.driver.exceptions.ServiceUnavailableException;
 
-import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.HTTP;
 import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.NO_PROTOCOL_VERSION;
+import static org.neo4j.driver.internal.messaging.BoltProtocolVersion.isHttp;
 
 public class HandshakeHandler extends ReplayingDecoder<Void>
 {
@@ -144,7 +144,7 @@ private void handleUnknownSuggestedProtocolVersion( BoltProtocolVersion version,
         {
             fail( ctx, protocolNoSupportedByServerError() );
         }
-        else if ( HTTP.equals( version ) )
+        else if ( isHttp( version ) )
         {
             fail( ctx, httpEndpointError() );
         }

driver/src/main/java/org/neo4j/driver/internal/messaging/BoltProtocolVersion.java

@@ -100,4 +100,11 @@ public int compareTo( BoltProtocolVersion other )
 
         return result;
     }
+
+    public static boolean isHttp( BoltProtocolVersion protocolVersion )
+    {
+        // server would respond with `HTTP..` We read 4 bytes to figure out the version. The first two are not used
+        // and therefore parse the `P` for major and `T` for minor.
+        return protocolVersion.getMajorVersion() == 'P' && protocolVersion.getMinorVersion() == 'T';
+    }
 }

driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java

@@ -54,7 +54,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.HTTP;
 import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.NO_PROTOCOL_VERSION;
 import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setMessageDispatcher;
 import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
@@ -209,7 +208,7 @@ void shouldFailGivenPromiseWhenServerSuggestsNoProtocol()
     @Test
     void shouldFailGivenPromiseWhenServerSuggestsHttp()
     {
-        testFailure( HTTP, "Server responded HTTP" );
+        testFailure( new BoltProtocolVersion( 'T', 'P' ), "Server responded HTTP" );
     }
 
     @Test