Renamed bolt+routing scheme to neo4j

Author: Zhen Li

driver/src/main/java/org/neo4j/driver/Config.java

@@ -498,7 +498,7 @@ public ConfigBuilder withMaxConnectionLifetime( long value, TimeUnit unit )
          * Configure maximum amount of connections in the connection pool towards a single database. This setting
          * limits total amount of connections in the pool when used in direct driver, created for URI with 'bolt'
          * scheme. It will limit amount of connections per cluster member when used with routing driver, created for
-         * URI with 'bolt+routing' scheme.
+         * URI with 'neo4j' scheme.
          * <p>
          * Acquisition will be attempted for at most configured timeout
          * {@link #withConnectionAcquisitionTimeout(long, TimeUnit)} when limit is reached.

driver/src/main/java/org/neo4j/driver/Driver.java

@@ -52,13 +52,13 @@
  *             <td>Direct driver: connects directly to the host and port specified in the URI.</td>
  *         </tr>
  *         <tr>
- *             <td><code>bolt+routing</code></td>
+ *             <td><code>neo4j</code></td>
  *             <td>Routing driver: can automatically discover members of a Causal Cluster and route {@link Session sessions} based on {@link AccessMode}.</td>
  *         </tr>
  *     </tbody>
  * </table>
  *
- * @since 1.0 (<em>bolt+routing</em> URIs since 1.1)
+ * @since 1.0 (<em>neo4j</em> URIs since 1.1)
  */
 public interface Driver extends AutoCloseable
 {

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

@@ -137,12 +137,12 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
     }
 
     /**
-     * Try to create a bolt+routing driver from the <b>first</b> available address.
+     * Try to create a neo4j 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 routingUris an {@link Iterable} of server {@link URI}s for Neo4j instances. All given URIs should
-     * have 'bolt+routing' scheme.
+     * have 'neo4j' scheme.
      * @param authToken authentication to use, see {@link AuthTokens}
      * @param config user defined configuration
      * @return a new driver instance

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

@@ -66,7 +66,7 @@
 public class DriverFactory
 {
     public static final String BOLT_URI_SCHEME = "bolt";
-    public static final String BOLT_ROUTING_URI_SCHEME = "bolt+routing";
+    public static final String BOLT_ROUTING_URI_SCHEME = "neo4j";
 
     public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings routingSettings,
             RetrySettings retrySettings, Config config )
@@ -165,7 +165,7 @@ protected InternalDriver createDirectDriver( SecurityPlan securityPlan, BoltServ
     }
 
     /**
-     * Creates new a new driver for "bolt+routing" scheme.
+     * Creates new a new driver for "neo4j" scheme.
      * <p>
      * <b>This method is protected only for testing</b>
      */

driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java

@@ -80,7 +80,7 @@ void boltPlusDiscoverySchemeShouldInstantiateClusterDriver() throws Exception
     {
         // Given
         StubServer server = StubServer.start( "discover_servers.script", 9001 );
-        URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
+        URI uri = URI.create( "neo4j://127.0.0.1:9001" );
 
         // When
         Driver driver = GraphDatabase.driver( uri, INSECURE_CONFIG );
@@ -97,7 +97,7 @@ void boltPlusDiscoverySchemeShouldInstantiateClusterDriver() throws Exception
     @SuppressWarnings( "deprecation" )
     void boltPlusDiscoverySchemeShouldNotSupportTrustOnFirstUse()
     {
-        URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
+        URI uri = URI.create( "neo4j://127.0.0.1:9001" );
 
         Config config = Config.builder()
                 .withEncryption()
@@ -129,15 +129,15 @@ void shouldLogWhenUnableToCreateRoutingDriver() throws Exception
                 .build();
 
         List<URI> routingUris = asList(
-                URI.create( "bolt+routing://localhost:9001" ),
-                URI.create( "bolt+routing://localhost:9002" ) );
+                URI.create( "neo4j://localhost:9001" ),
+                URI.create( "neo4j://localhost:9002" ) );
 
         assertThrows( ServiceUnavailableException.class, () -> GraphDatabase.routingDriver( routingUris, AuthTokens.none(), config ) );
 
-        verify( logger ).warn( eq( "Unable to create routing driver for URI: bolt+routing://localhost:9001" ),
+        verify( logger ).warn( eq( "Unable to create routing driver for URI: neo4j://localhost:9001" ),
                 any( Throwable.class ) );
 
-        verify( logger ).warn( eq( "Unable to create routing driver for URI: bolt+routing://localhost:9002" ),
+        verify( logger ).warn( eq( "Unable to create routing driver for URI: neo4j://localhost:9002" ),
                 any( Throwable.class ) );
 
         assertEquals( 0, server1.exitStatus() );

driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java

@@ -169,7 +169,7 @@ void directDriverShouldFailEarlyOnWrongCredentials()
     @Test
     void routingDriverShouldFailEarlyOnWrongCredentials()
     {
-        testDriverFailureOnWrongCredentials( "bolt+routing://localhost:" + neo4j.boltPort() );
+        testDriverFailureOnWrongCredentials( "neo4j://localhost:" + neo4j.boltPort() );
     }
 
     private void testDriverFailureOnWrongCredentials( String uri )

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

@@ -67,7 +67,7 @@ class DriverFactoryTest
 {
     private static Stream<String> testUris()
     {
-        return Stream.of( "bolt://localhost:7687", "bolt+routing://localhost:7687" );
+        return Stream.of( "bolt://localhost:7687", "neo4j://localhost:7687" );
     }
 
     @ParameterizedTest