Support IPv6 in routing procedure responses

driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java

@@ -56,7 +56,7 @@ public class DriverFactory
     public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings routingSettings,
             RetrySettings retrySettings, Config config )
     {
-        BoltServerAddress address = BoltServerAddress.from( uri );
+        BoltServerAddress address = new BoltServerAddress( uri );
         RoutingSettings newRoutingSettings = routingSettings.withRoutingContext( new RoutingContext( uri ) );
         SecurityPlan securityPlan = createSecurityPlan( address, config );
         ConnectionPool connectionPool = createConnectionPool( authToken, securityPlan, config );

driver/src/main/java/org/neo4j/driver/internal/net/BoltServerAddress.java

@@ -34,46 +34,23 @@ public class BoltServerAddress
     public static final int DEFAULT_PORT = 7687;
     public static final BoltServerAddress LOCAL_DEFAULT = new BoltServerAddress( "localhost", DEFAULT_PORT );
 
-    public static BoltServerAddress from( URI uri )
-    {
-        int port = uri.getPort();
-        if ( port == -1 )
-        {
-            port = DEFAULT_PORT;
-        }
-
-        if( uri.getHost() == null )
-        {
-            throw new IllegalArgumentException( "Invalid URI format `" + uri.toString() + "`");
-        }
-
-        return new BoltServerAddress( uri.getHost(), port );
-    }
-
     private final String host;
     private final int port;
 
-    private SocketAddress socketAddress = null;  // created lazily if required
+    public BoltServerAddress( String address )
+    {
+        this( uriFrom( address ) );
+    }
 
-    public BoltServerAddress( String host, int port )
+    public BoltServerAddress( URI uri )
     {
-        this.host = host;
-        this.port = port;
+        this( hostFrom( uri ), portFrom( uri ) );
     }
 
-    public BoltServerAddress( String host )
+    public BoltServerAddress( String host, int port )
     {
-        int colon = host.indexOf( ':' );
-        if ( colon >= 0 )
-        {
-            this.port = Integer.parseInt( host.substring( colon + 1 ) );
-            this.host = host.substring( 0, colon );
-        }
-        else
-        {
-            this.host = host;
-            this.port = DEFAULT_PORT;
-        }
+        this.host = host;
+        this.port = port;
     }
 
     @Override
@@ -145,4 +122,27 @@ public int port()
         return port;
     }
 
+    private static String hostFrom( URI uri )
+    {
+        String host = uri.getHost();
+        if ( host == null )
+        {
+            throw new IllegalArgumentException( "Invalid URI format `" + uri.toString() + "`" );
+        }
+        return host;
+    }
+
+    private static int portFrom( URI uri )
+    {
+        int port = uri.getPort();
+        return port == -1 ? DEFAULT_PORT : port;
+    }
+
+    private static URI uriFrom( String address )
+    {
+        // URI can't parse addresses without scheme, prepend fake "bolt://" to reuse the parsing facility
+        boolean hasScheme = address.contains( "://" );
+        String addressWithScheme = hasScheme ? address : "bolt://" + address;
+        return URI.create( addressWithScheme );
+    }
 }

driver/src/test/java/org/neo4j/driver/internal/DirectDriverTest.java

@@ -83,7 +83,7 @@ public void shouldAllowIPv6Address()
 
         // Given
         URI uri = URI.create( "bolt://[::1]" );
-        BoltServerAddress address = BoltServerAddress.from( uri );
+        BoltServerAddress address = new BoltServerAddress( uri );
 
         // When
         driver = GraphDatabase.driver( uri, neo4j.authToken() );
@@ -115,7 +115,7 @@ public void shouldRegisterSingleServer()
     {
         // Given
         URI uri = URI.create( "bolt://localhost:7687" );
-        BoltServerAddress address = BoltServerAddress.from( uri );
+        BoltServerAddress address = new BoltServerAddress( uri );
 
         // When
         driver = GraphDatabase.driver( uri, neo4j.authToken() );

driver/src/test/java/org/neo4j/driver/internal/InternalBuilderTest.java

@@ -26,8 +26,8 @@
 import org.neo4j.driver.internal.summary.InternalServerInfo;
 import org.neo4j.driver.internal.summary.InternalSummaryCounters;
 import org.neo4j.driver.internal.summary.SummaryBuilder;
-import org.neo4j.driver.v1.summary.ResultSummary;
 import org.neo4j.driver.v1.Statement;
+import org.neo4j.driver.v1.summary.ResultSummary;
 import org.neo4j.driver.v1.summary.ServerInfo;
 import org.neo4j.driver.v1.summary.SummaryCounters;
 
@@ -90,7 +90,7 @@ public void shouldObtainStatementAndServerInfoFromSummaryBuilder() throws Throwa
     {
         // Given
         SummaryBuilder builder = new SummaryBuilder( new Statement( "This is a test statement"), new
-                InternalServerInfo( BoltServerAddress.from( URI.create( "http://neo4j.com" ) ),
+                InternalServerInfo( new BoltServerAddress( URI.create( "http://neo4j.com" ) ),
                 "super-awesome" ) );
 
         // When

driver/src/test/java/org/neo4j/driver/internal/net/BoltServerAddressTest.java

@@ -23,6 +23,7 @@
 import java.net.SocketAddress;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertThat;
 
@@ -50,4 +51,37 @@ public void shouldAlwaysResolveAddress()
 
         assertNotSame( socketAddress1, socketAddress2 );
     }
+
+    @Test
+    public void shouldParseIPv4Addresses()
+    {
+        BoltServerAddress address1 = new BoltServerAddress( "127.0.0.1:1234" );
+        assertEquals( "127.0.0.1", address1.host() );
+        assertEquals( 1234, address1.port() );
+
+        BoltServerAddress address2 = new BoltServerAddress( "8.8.8.8:8080" );
+        assertEquals( "8.8.8.8", address2.host() );
+        assertEquals( 8080, address2.port() );
+    }
+
+    @Test
+    public void shouldParseIPv6Addresses()
+    {
+        BoltServerAddress address1 = new BoltServerAddress( "[::1]:7688" );
+        assertEquals( "[::1]", address1.host() );
+        assertEquals( 7688, address1.port() );
+
+        BoltServerAddress address2 = new BoltServerAddress( "[1afc:0:a33:85a3::ff2f]:9001" );
+        assertEquals( "[1afc:0:a33:85a3::ff2f]", address2.host() );
+        assertEquals( 9001, address2.port() );
+    }
+
+    @Test
+    public void shouldParseBoltAddresses()
+    {
+        BoltServerAddress address = new BoltServerAddress( "bolt://host:6565" );
+
+        assertEquals( "host", address.host() );
+        assertEquals( 6565, address.port() );
+    }
 }

driver/src/test/java/org/neo4j/driver/internal/net/SocketConnectionTest.java

@@ -63,7 +63,7 @@ public void shouldReceiveServerInfoAfterInit() throws Throwable
         SocketClient socket = mock( SocketClient.class );
         SocketConnection conn = new SocketConnection( socket, SERVER_INFO, DEV_NULL_LOGGER );
 
-        when( socket.address() ).thenReturn( BoltServerAddress.from( URI.create( "http://neo4j.com:9000" ) ) );
+        when( socket.address() ).thenReturn( new BoltServerAddress( URI.create( "http://neo4j.com:9000" ) ) );
 
         // set up response messages
         ArrayList<Message> serverResponses = new ArrayList<>();

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java

@@ -54,7 +54,7 @@ public class Neo4jRunner
     private static final String DEFAULT_NEOCTRL_ARGS = "-e 3.2.0";
     public static final String NEOCTRL_ARGS = System.getProperty( "neoctrl.args", DEFAULT_NEOCTRL_ARGS );
     public static final URI DEFAULT_URI = URI.create( "bolt://localhost:7687" );
-    public static final BoltServerAddress DEFAULT_ADDRESS = BoltServerAddress.from( DEFAULT_URI );
+    public static final BoltServerAddress DEFAULT_ADDRESS = new BoltServerAddress( DEFAULT_URI );
 
     public static final String USER = "neo4j";
     public static final String PASSWORD = "password";

driver/src/test/java/org/neo4j/driver/v1/util/cc/Cluster.java

@@ -380,7 +380,7 @@ private static BoltServerAddress newBoltServerAddress( URI uri )
     {
         try
         {
-            return BoltServerAddress.from( uri ).resolve();
+            return new BoltServerAddress( uri ).resolve();
         }
         catch ( UnknownHostException e )
         {

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterMember.java

@@ -75,7 +75,7 @@ private static BoltServerAddress newBoltServerAddress( URI uri )
     {
         try
         {
-            return BoltServerAddress.from( uri ).resolve();
+            return new BoltServerAddress( uri ).resolve();
         }
         catch ( UnknownHostException e )
         {