Address review comments

 * use shorter name `routingDriver` instead of `routingDriverFromFirstAvailableAddress`
 * no overloads
 * take `Iterable<URI>` of server URIs and verify 'bolt+routing' scheme
 * introduce constants for URIs schemes

Author: lutovich

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

@@ -47,10 +47,12 @@
 
 import static java.lang.String.format;
 import static org.neo4j.driver.internal.security.SecurityPlan.insecure;
-import static org.neo4j.driver.v1.Config.EncryptionLevel.REQUIRED;
 
 public class DriverFactory
 {
+    public static final String BOLT_URI_SCHEME = "bolt";
+    public static final String BOLT_ROUTING_URI_SCHEME = "bolt+routing";
+
     public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings routingSettings,
             RetrySettings retrySettings, Config config )
     {
@@ -86,10 +88,10 @@ private Driver createDriver( URI uri, BoltServerAddress address, ConnectionPool
         String scheme = uri.getScheme().toLowerCase();
         switch ( scheme )
         {
-        case "bolt":
+        case BOLT_URI_SCHEME:
             assertNoRoutingContext( uri, routingSettings );
             return createDirectDriver( address, connectionPool, config, securityPlan, retryLogic );
-        case "bolt+routing":
+        case BOLT_ROUTING_URI_SCHEME:
             return createRoutingDriver( address, connectionPool, config, routingSettings, securityPlan, retryLogic );
         default:
             throw new ClientException( format( "Unsupported URI scheme: %s", scheme ) );

driver/src/main/java/org/neo4j/driver/v1/GraphDatabase.java

@@ -19,13 +19,14 @@
 package org.neo4j.driver.v1;
 
 import java.net.URI;
-import java.util.List;
 
 import org.neo4j.driver.internal.DriverFactory;
 import org.neo4j.driver.internal.cluster.RoutingSettings;
 import org.neo4j.driver.internal.retry.RetrySettings;
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
 
+import static org.neo4j.driver.internal.DriverFactory.BOLT_ROUTING_URI_SCHEME;
+
 /**
  * Creates {@link Driver drivers}, optionally letting you {@link #driver(URI, Config)} to configure them.
  * @see Driver
@@ -135,42 +136,44 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
     }
 
     /**
-     * Try to create a bolt+routing driver from the first available address.
-     * This is wrapper for the {@link #driver} method that finds the first
+     * Try to create a bolt+routing driver from the <b>first</b> available address.
+     * This is wrapper for the {@link #driver} method that finds the <b>first</b>
      * server to respond positively.
      *
-     * @param addresses a list of server addresses for Neo4j instances
+     * @param routingUris an {@link Iterable} of server {@link URI}s for Neo4j instances. All given URIs should
+     * have 'bolt+routing' scheme.
      * @param authToken authentication to use, see {@link AuthTokens}
      * @param config user defined configuration
      * @return a new driver instance
      */
-    public static Driver routingDriverFromFirstAvailableAddress( List<String> addresses, AuthToken authToken, Config config )
+    public static Driver routingDriver( Iterable<URI> routingUris, AuthToken authToken, Config config )
     {
-        for( String address: addresses )
+        assertRoutingUris( routingUris );
+
+        for ( URI uri : routingUris )
         {
             try
             {
-                return driver( "bolt+routing://" + address, authToken, config );
+                return driver( uri, authToken, config );
             }
-            catch( ServiceUnavailableException e )
+            catch ( ServiceUnavailableException e )
             {
                 // try the next one
             }
         }
+
         throw new ServiceUnavailableException( "Failed to discover an available server" );
     }
 
-    /**
-     * Try to create a bolt+routing driver from the first available address.
-     * This is wrapper for the {@link #driver} method that finds the first
-     * server to respond positively.
-     *
-     * @param addresses a list of server addresses for Neo4j instances
-     * @param authToken authentication to use, see {@link AuthTokens}
-     * @return a new driver instance
-     */
-    public static Driver routingDriverFromFirstAvailableAddress( List<String> addresses, AuthToken authToken )
+    private static void assertRoutingUris( Iterable<URI> uris )
     {
-        return routingDriverFromFirstAvailableAddress( addresses, authToken, Config.defaultConfig() );
+        for ( URI uri : uris )
+        {
+            if ( !BOLT_ROUTING_URI_SCHEME.equals( uri.getScheme() ) )
+            {
+                throw new IllegalArgumentException(
+                        "Illegal URI scheme, expected '" + BOLT_ROUTING_URI_SCHEME + "' in '" + uri + "'" );
+            }
+        }
     }
 }

driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java

@@ -67,6 +67,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
 import static org.neo4j.driver.v1.Values.parameters;
 
 public class CausalClusteringIT
@@ -459,10 +460,10 @@ private int executeWriteAndReadThroughBolt( ClusterMember member ) throws Timeou
 
     private int executeWriteAndReadThroughBoltOnFirstAvailableAddress( ClusterMember... members ) throws TimeoutException, InterruptedException
     {
-        List<String> addresses = new ArrayList<>( members.length );
+        List<URI> addresses = new ArrayList<>( members.length );
         for ( ClusterMember member : members )
         {
-            addresses.add( member.getRoutingUri().getAuthority() );
+            addresses.add( member.getRoutingUri() );
         }
         try ( Driver driver = discoverDriver( addresses ) )
         {
@@ -616,22 +617,13 @@ public Logger getLog( String name )
         return GraphDatabase.driver( boltUri, clusterRule.getDefaultAuthToken(), config );
     }
 
-    private Driver discoverDriver( List<String> addresses )
+    private Driver discoverDriver( List<URI> routingUris )
     {
-        Logging devNullLogging = new Logging()
-        {
-            @Override
-            public Logger getLog( String name )
-            {
-                return DevNullLogger.DEV_NULL_LOGGER;
-            }
-        };
-
         Config config = Config.build()
-                .withLogging( devNullLogging )
+                .withLogging( DEV_NULL_LOGGING )
                 .toConfig();
 
-        return GraphDatabase.routingDriverFromFirstAvailableAddress( addresses, clusterRule.getDefaultAuthToken(), config );
+        return GraphDatabase.routingDriver( routingUris, clusterRule.getDefaultAuthToken(), config );
     }
 
     private static void createNodesInDifferentThreads( int count, final Driver driver ) throws Exception

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

@@ -25,6 +25,8 @@
 import org.neo4j.driver.v1.AuthToken;
 import org.neo4j.driver.v1.AuthTokens;
 
+import static org.neo4j.driver.internal.DriverFactory.BOLT_ROUTING_URI_SCHEME;
+
 public class LocalOrRemoteClusterRule extends ExternalResource
 {
     private static final String CLUSTER_URI_SYSTEM_PROPERTY_NAME = "externalClusterUri";
@@ -88,7 +90,7 @@ private static void assertValidSystemPropertiesDefined()
                     "Both cluster uri and 'neo4j' user password system properties should be set. " +
                     "Uri: '" + uri + "', Password: '" + password + "'" );
         }
-        if ( uri != null && !"bolt+routing".equals( uri.getScheme() ) )
+        if ( uri != null && !BOLT_ROUTING_URI_SCHEME.equals( uri.getScheme() ) )
         {
             throw new IllegalStateException( "CLuster uri should have bolt+routing scheme: '" + uri + "'" );
         }