neo4j
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/cluster/GetServersProcedureClusterCompositionProvider.java
Copy file name to clipboard
+14-10Lines changed: 14 additions & 10 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/cluster/GetServersProcedureClusterCompositionProvider.java
Copy file name to clipboard
+14-10Lines changed: 14 additions & 10 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/cluster/GetServersProcedureRunner.java
Copy file name to clipboard
+35-3Lines changed: 35 additions & 3 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/cluster/GetServersProcedureRunner.java
Copy file name to clipboard
+35-3Lines changed: 35 additions & 3 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/cluster/LoadBalancer.java
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎driver/src/main/java/org/neo4j/driver/internal/cluster/LoadBalancer.java
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingSettings.java
Copy file name to clipboard
+8-1Lines changed: 8 additions & 1 deletion b/‎driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingSettings.java
Copy file name to clipboard
+8-1Lines changed: 8 additions & 1 deletion
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/summary/InternalServerInfo.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎driver/src/main/java/org/neo4j/driver/internal/summary/InternalServerInfo.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎driver/src/test/java/org/neo4j/driver/v1/util/ServerVersion.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/util/ServerVersion.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎driver/src/test/java/org/neo4j/driver/v1/util/ServerVersion.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/util/ServerVersion.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎driver/src/main/java/org/neo4j/driver/v1/Config.java
Copy file name to clipboard
+22-1Lines changed: 22 additions & 1 deletion b/‎driver/src/main/java/org/neo4j/driver/v1/Config.java
Copy file name to clipboard
+22-1Lines changed: 22 additions & 1 deletion
diff --git a/‎driver/src/test/java/org/neo4j/driver/internal/DriverFactoryTest.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎driver/src/test/java/org/neo4j/driver/internal/DriverFactoryTest.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎driver/src/test/java/org/neo4j/driver/internal/RoutingDriverBoltKitTest.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎driver/src/test/java/org/neo4j/driver/internal/RoutingDriverBoltKitTest.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎driver/src/test/java/org/neo4j/driver/internal/RoutingDriverTest.java
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions b/‎driver/src/test/java/org/neo4j/driver/internal/RoutingDriverTest.java
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions
@@ -33,17 +33,16 @@
 
 public class GetServersProcedureClusterCompositionProvider implements ClusterCompositionProvider
 {
-    private final String GET_SERVERS = "dbms.cluster.routing.getServers";
-    private final String PROTOCOL_ERROR_MESSAGE = "Failed to parse '" + GET_SERVERS +
-                                                         "' result received from server due to ";
+
+    private final String PROTOCOL_ERROR_MESSAGE = "Failed to parse `%s' result received from server due to ";
 
     private final Clock clock;
     private final Logger log;
     private final GetServersProcedureRunner getServersRunner;
 
-    public GetServersProcedureClusterCompositionProvider( Clock clock, Logger log )
+    public GetServersProcedureClusterCompositionProvider( Clock clock, Logger log, RoutingSettings settings )
     {
-        this( clock, log, new GetServersProcedureRunner() );
+        this( clock, log, new GetServersProcedureRunner( settings.routingParameters ) );
     }
 
     GetServersProcedureClusterCompositionProvider( Clock clock, Logger log, GetServersProcedureRunner getServersRunner )
@@ -66,8 +65,10 @@ public ClusterCompositionResponse getClusterComposition( Connection connection )
         catch ( ClientException e )
         {
             return new ClusterCompositionResponse.Failure( new ServiceUnavailableException( format(
-                    "Failed to call '%s' procedure on server. " +
-                    "Please make sure that there is a Neo4j 3.1+ causal cluster up running.", GET_SERVERS ), e ) );
+                    "Failed to run '%s' on server. " +
+                    "Please make sure that there is a Neo4j 3.1+ causal cluster up running.",
+                    getServersRunner.procedureCalled() ), e
+            ) );
         }
 
         log.info( "Got getServers response: %s", records );
@@ -77,7 +78,8 @@ public ClusterCompositionResponse getClusterComposition( Connection connection )
         if ( records.size() != 1 )
         {
             return new ClusterCompositionResponse.Failure( new ProtocolException( format(
-                    "%srecords received '%s' is too few or too many.", PROTOCOL_ERROR_MESSAGE,
+                    PROTOCOL_ERROR_MESSAGE +
+                    "records received '%s' is too few or too many.", getServersRunner.procedureCalled(),
                     records.size() ) ) );
         }
 
@@ -90,14 +92,16 @@ public ClusterCompositionResponse getClusterComposition( Connection connection )
         catch ( ValueException e )
         {
             return new ClusterCompositionResponse.Failure( new ProtocolException( format(
-                    "%sunparsable record received.", PROTOCOL_ERROR_MESSAGE ), e ) );
+                    PROTOCOL_ERROR_MESSAGE +
+                    "unparsable record received.", getServersRunner.procedureCalled() ), e ) );
         }
 
         // the cluster result is not a legal reply
         if ( !cluster.hasRoutersAndReaders() )
         {
             return new ClusterCompositionResponse.Failure( new ProtocolException( format(
-                    "%sno router or reader found in response.", PROTOCOL_ERROR_MESSAGE ) ) );
+                    PROTOCOL_ERROR_MESSAGE +
+                    "no router or reader found in response.", getServersRunner.procedureCalled() ) ) );
         }
 
         // all good
 
@@ -22,17 +22,49 @@
 import java.util.List;
 
 import org.neo4j.driver.internal.NetworkSession;
-import org.neo4j.driver.internal.SessionResourcesHandler;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Statement;
+import org.neo4j.driver.v1.Value;
+
+import static org.neo4j.driver.internal.SessionResourcesHandler.NO_OP;
+import static org.neo4j.driver.internal.util.ServerVersion.v3_2_0;
+import static org.neo4j.driver.internal.util.ServerVersion.version;
 
 public class GetServersProcedureRunner
 {
-    private static final String CALL_GET_SERVERS = "CALL dbms.cluster.routing.getServers";
+    static final String GET_SERVERS = "dbms.cluster.routing.getServers";
+    static final String GET_ROUTING_TABLE = "dbms.cluster.routing.getRoutingTable";
+
+    private final Value routingContext;
+    private Statement procedureCalled;
+
+    public GetServersProcedureRunner( Value context )
+    {
+        this.routingContext = context;
+    }
 
     public List<Record> run( Connection connection )
     {
-        return NetworkSession.run( connection, new Statement( CALL_GET_SERVERS ), SessionResourcesHandler.NO_OP ).list();
+        if( version( connection.server().version() ).greaterThanOrEqual( v3_2_0 ) )
+        {
+            procedureCalled = new Statement( "CALL " + GET_ROUTING_TABLE, routingContext );
+        }
+        else
+        {
+            procedureCalled = new Statement("CALL " + GET_SERVERS );
+        }
+
+        return runProcedure( connection, procedureCalled );
+    }
+
+    List<Record> runProcedure( Connection connection, Statement procedure )
+    {
+        return NetworkSession.run( connection, procedure, NO_OP ).list();
+    }
+
+    Statement procedureCalled()
+    {
+        return procedureCalled;
     }
 }
@@ -156,7 +156,8 @@ private RoundRobinAddressSet addressSetFor( AccessMode mode )
     private static Rediscovery createRediscovery( BoltServerAddress initialRouter, RoutingSettings settings,
             Clock clock, Logger log )
     {
-        ClusterCompositionProvider clusterComposition = new GetServersProcedureClusterCompositionProvider( clock, log );
+        ClusterCompositionProvider clusterComposition =
+                new GetServersProcedureClusterCompositionProvider( clock, log, settings );
         return new Rediscovery( initialRouter, settings, clock, log, clusterComposition );
     }
 }
@@ -18,14 +18,21 @@
  */
 package org.neo4j.driver.internal.cluster;
 
+import java.util.Map;
+
+import org.neo4j.driver.v1.Value;
+import org.neo4j.driver.v1.Values;
+
 public class RoutingSettings
 {
     final int maxRoutingFailures;
     final long retryTimeoutDelay;
+    final Value routingParameters;
 
-    public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay )
+    public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, String> routingParameters )
     {
         this.maxRoutingFailures = maxRoutingFailures;
         this.retryTimeoutDelay = retryTimeoutDelay;
+        this.routingParameters = Values.value( routingParameters );
     }
 }
@@ -26,7 +26,7 @@ public class InternalServerInfo implements ServerInfo
     private final BoltServerAddress address;
     private final String version;
 
-    public InternalServerInfo(BoltServerAddress address, String version)
+    public InternalServerInfo( BoltServerAddress address, String version )
     {
         this.address = address;
         this.version = version;
 
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1.util;
+package org.neo4j.driver.internal.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -19,6 +19,7 @@
 package org.neo4j.driver.v1;
 
 import java.io.File;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
@@ -74,6 +75,8 @@ public class Config
     private final int connectionTimeoutMillis;
     private final RetrySettings retrySettings;
 
+    private final Map<String, String> routingContext;
+
     private Config( ConfigBuilder builder)
     {
         this.logging = builder.logging;
@@ -88,6 +91,8 @@ private Config( ConfigBuilder builder)
         this.routingRetryDelayMillis = builder.routingRetryDelayMillis;
         this.connectionTimeoutMillis = builder.connectionTimeoutMillis;
         this.retrySettings = builder.retrySettings;
+
+        this.routingContext = builder.routingContext;
     }
 
     /**
@@ -182,7 +187,7 @@ public static Config defaultConfig()
 
     RoutingSettings routingSettings()
     {
-        return new RoutingSettings( routingFailureLimit, routingRetryDelayMillis );
+        return new RoutingSettings( routingFailureLimit, routingRetryDelayMillis, routingContext );
     }
 
     RetrySettings retrySettings()
@@ -205,6 +210,7 @@ public static class ConfigBuilder
         private long routingRetryDelayMillis = TimeUnit.SECONDS.toMillis( 5 );
         private int connectionTimeoutMillis = (int) TimeUnit.SECONDS.toMillis( 5 );
         private RetrySettings retrySettings = RetrySettings.DEFAULT;
+        private Map<String,String> routingContext = null;
 
         private ConfigBuilder() {}
 
@@ -473,6 +479,21 @@ public ConfigBuilder withMaxTransactionRetryTime( long value, TimeUnit unit )
             return this;
         }
 
+        /**
+         * Specify routing context that would be passed to server in getRoutingTable Procedure call for customized
+         * routing table reply.
+         * This parameter is only valid for the routing driver, a.k.a. the driver created use bolt+routing in URI
+         * scheme with 3.2+ Neo4j Casual Cluster servers.
+         * @param context The routing context to pass to getRoutingTable Procedure
+         * @since 1.3
+         * @return this builder
+         */
+        public ConfigBuilder withRoutingContext( Map<String, String> context )
+        {
+            this.routingContext = context;
+            return this;
+        }
+
         /**
          * Create a config instance from this builder.
          * @return a {@link Config} instance
 
@@ -139,7 +139,7 @@ private Driver createDriver( DriverFactory driverFactory )
     private Driver createDriver( DriverFactory driverFactory, Config config )
     {
         AuthToken auth = AuthTokens.none();
-        RoutingSettings routingSettings = new RoutingSettings( 42, 42 );
+        RoutingSettings routingSettings = new RoutingSettings( 42, 42, null );
         return driverFactory.newInstance( uri, auth, routingSettings, RetrySettings.DEFAULT, config );
     }
 
 
@@ -873,7 +873,7 @@ private static Driver newDriverWithFixedRetries( String uriString, int retries )
     private static Driver newDriver( String uriString, DriverFactory driverFactory )
     {
         URI uri = URI.create( uriString );
-        RoutingSettings routingConf = new RoutingSettings( 1, 1 );
+        RoutingSettings routingConf = new RoutingSettings( 1, 1, null );
         AuthToken auth = AuthTokens.none();
         return driverFactory.newInstance( uri, auth, routingConf, RetrySettings.DEFAULT, config );
     }
 
@@ -36,6 +36,7 @@
 import org.neo4j.driver.internal.spi.ConnectionPool;
 import org.neo4j.driver.internal.spi.ConnectionProvider;
 import org.neo4j.driver.internal.spi.PooledConnection;
+import org.neo4j.driver.internal.summary.InternalServerInfo;
 import org.neo4j.driver.internal.util.FakeClock;
 import org.neo4j.driver.v1.AccessMode;
 import org.neo4j.driver.v1.Config;
@@ -148,8 +149,8 @@ public void shouldFailIfNoRouting()
         // Then
         catch ( ServiceUnavailableException e )
         {
-            assertThat( e.getMessage(),
-                    containsString( "Failed to call 'dbms.cluster.routing.getServers' procedure on server" ) );
+            assertThat( e.getMessage(), containsString( "Failed to run " +
+                    "'Statement{text='CALL dbms.cluster.routing.getServers', parameters={}}' on server." ) );
         }
     }
 
@@ -344,7 +345,7 @@ private final Driver driverWithServers( long ttl, Map<String,Object>... serverIn
 
     private Driver driverWithPool( ConnectionPool pool )
     {
-        RoutingSettings settings = new RoutingSettings( 10, 5_000 );
+        RoutingSettings settings = new RoutingSettings( 10, 5_000, null );
         ConnectionProvider connectionProvider = new LoadBalancer( SEED, settings, pool, clock, logging );
         Config config = Config.build().withLogging( logging ).toConfig();
         SessionFactory sessionFactory = new NetworkSessionWithAddressFactory( connectionProvider, config );
@@ -383,6 +384,7 @@ public PooledConnection answer( InvocationOnMock invocationOnMock ) throws Throw
                 PooledConnection connection = mock( PooledConnection.class );
                 when( connection.isOpen() ).thenReturn( true );
                 when( connection.boltServerAddress() ).thenReturn( address );
+                when( connection.server() ).thenReturn( new InternalServerInfo( address, "Neo4j/3.1.0" ) );
                 doAnswer( withKeys( "ttl", "servers" ) ).when( connection ).run(
                         eq( GET_SERVERS ),
                         eq( Collections.<String,Value>emptyMap() ),
Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,16 @@`
`33`	`33`
`34`	`34`	`public class GetServersProcedureClusterCompositionProvider implements ClusterCompositionProvider`
`35`	`35`	`{`
`36`		`- private final String GET_SERVERS = "dbms.cluster.routing.getServers";`
`37`		`- private final String PROTOCOL_ERROR_MESSAGE = "Failed to parse '" + GET_SERVERS +`
`38`		`- "' result received from server due to ";`
	`36`	`+`
	`37`	+ private final String PROTOCOL_ERROR_MESSAGE = "Failed to parse `%s' result received from server due to ";
`39`	`38`
`40`	`39`	`private final Clock clock;`
`41`	`40`	`private final Logger log;`
`42`	`41`	`private final GetServersProcedureRunner getServersRunner;`
`43`	`42`
`44`		`- public GetServersProcedureClusterCompositionProvider( Clock clock, Logger log )`
	`43`	`+ public GetServersProcedureClusterCompositionProvider( Clock clock, Logger log, RoutingSettings settings )`
`45`	`44`	`{`
`46`		`- this( clock, log, new GetServersProcedureRunner() );`
	`45`	`+ this( clock, log, new GetServersProcedureRunner( settings.routingParameters ) );`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`GetServersProcedureClusterCompositionProvider( Clock clock, Logger log, GetServersProcedureRunner getServersRunner )`
`@@ -66,8 +65,10 @@ public ClusterCompositionResponse getClusterComposition( Connection connection )`
`66`	`65`	`catch ( ClientException e )`
`67`	`66`	`{`
`68`	`67`	`return new ClusterCompositionResponse.Failure( new ServiceUnavailableException( format(`
`69`		`- "Failed to call '%s' procedure on server. " +`
`70`		`- "Please make sure that there is a Neo4j 3.1+ causal cluster up running.", GET_SERVERS ), e ) );`
	`68`	`+ "Failed to run '%s' on server. " +`
	`69`	`+ "Please make sure that there is a Neo4j 3.1+ causal cluster up running.",`
	`70`	`+ getServersRunner.procedureCalled() ), e`
	`71`	`+ ) );`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`log.info( "Got getServers response: %s", records );`
`@@ -77,7 +78,8 @@ public ClusterCompositionResponse getClusterComposition( Connection connection )`
`77`	`78`	`if ( records.size() != 1 )`
`78`	`79`	`{`
`79`	`80`	`return new ClusterCompositionResponse.Failure( new ProtocolException( format(`
`80`		`- "%srecords received '%s' is too few or too many.", PROTOCOL_ERROR_MESSAGE,`
	`81`	`+ PROTOCOL_ERROR_MESSAGE +`
	`82`	`+ "records received '%s' is too few or too many.", getServersRunner.procedureCalled(),`
`81`	`83`	`records.size() ) ) );`
`82`	`84`	`}`
`83`	`85`
`@@ -90,14 +92,16 @@ public ClusterCompositionResponse getClusterComposition( Connection connection )`
`90`	`92`	`catch ( ValueException e )`
`91`	`93`	`{`
`92`	`94`	`return new ClusterCompositionResponse.Failure( new ProtocolException( format(`
`93`		`- "%sunparsable record received.", PROTOCOL_ERROR_MESSAGE ), e ) );`
	`95`	`+ PROTOCOL_ERROR_MESSAGE +`
	`96`	`+ "unparsable record received.", getServersRunner.procedureCalled() ), e ) );`
`94`	`97`	`}`
`95`	`98`
`96`	`99`	`// the cluster result is not a legal reply`
`97`	`100`	`if ( !cluster.hasRoutersAndReaders() )`
`98`	`101`	`{`
`99`	`102`	`return new ClusterCompositionResponse.Failure( new ProtocolException( format(`
`100`		`- "%sno router or reader found in response.", PROTOCOL_ERROR_MESSAGE ) ) );`
	`103`	`+ PROTOCOL_ERROR_MESSAGE +`
	`104`	`+ "no router or reader found in response.", getServersRunner.procedureCalled() ) ) );`
`101`	`105`	`}`
`102`	`106`
`103`	`107`	`// all good`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,8 @@ private RoundRobinAddressSet addressSetFor( AccessMode mode )`
`156`	`156`	`private static Rediscovery createRediscovery( BoltServerAddress initialRouter, RoutingSettings settings,`
`157`	`157`	`Clock clock, Logger log )`
`158`	`158`	`{`
`159`		`- ClusterCompositionProvider clusterComposition = new GetServersProcedureClusterCompositionProvider( clock, log );`
	`159`	`+ ClusterCompositionProvider clusterComposition =`
	`160`	`+ new GetServersProcedureClusterCompositionProvider( clock, log, settings );`
`160`	`161`	`return new Rediscovery( initialRouter, settings, clock, log, clusterComposition );`
`161`	`162`	`}`
`162`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,21 @@`
`18`	`18`	`*/`
`19`	`19`	`package org.neo4j.driver.internal.cluster;`
`20`	`20`
	`21`	`+import java.util.Map;`
	`22`	`+`
	`23`	`+import org.neo4j.driver.v1.Value;`
	`24`	`+import org.neo4j.driver.v1.Values;`
	`25`	`+`
`21`	`26`	`public class RoutingSettings`
`22`	`27`	`{`
`23`	`28`	`final int maxRoutingFailures;`
`24`	`29`	`final long retryTimeoutDelay;`
	`30`	`+ final Value routingParameters;`
`25`	`31`
`26`		`- public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay )`
	`32`	`+ public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, String> routingParameters )`
`27`	`33`	`{`
`28`	`34`	`this.maxRoutingFailures = maxRoutingFailures;`
`29`	`35`	`this.retryTimeoutDelay = retryTimeoutDelay;`
	`36`	`+ this.routingParameters = Values.value( routingParameters );`
`30`	`37`	`}`
`31`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class InternalServerInfo implements ServerInfo`
`26`	`26`	`private final BoltServerAddress address;`
`27`	`27`	`private final String version;`
`28`	`28`
`29`		`- public InternalServerInfo(BoltServerAddress address, String version)`
	`29`	`+ public InternalServerInfo( BoltServerAddress address, String version )`
`30`	`30`	`{`
`31`	`31`	`this.address = address;`
`32`	`32`	`this.version = version;`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ private Driver createDriver( DriverFactory driverFactory )`
`139`	`139`	`private Driver createDriver( DriverFactory driverFactory, Config config )`
`140`	`140`	`{`
`141`	`141`	`AuthToken auth = AuthTokens.none();`
`142`		`- RoutingSettings routingSettings = new RoutingSettings( 42, 42 );`
	`142`	`+ RoutingSettings routingSettings = new RoutingSettings( 42, 42, null );`
`143`	`143`	`return driverFactory.newInstance( uri, auth, routingSettings, RetrySettings.DEFAULT, config );`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,7 @@ private static Driver newDriverWithFixedRetries( String uriString, int retries )`
`873`	`873`	`private static Driver newDriver( String uriString, DriverFactory driverFactory )`
`874`	`874`	`{`
`875`	`875`	`URI uri = URI.create( uriString );`
`876`		`- RoutingSettings routingConf = new RoutingSettings( 1, 1 );`
	`876`	`+ RoutingSettings routingConf = new RoutingSettings( 1, 1, null );`
`877`	`877`	`AuthToken auth = AuthTokens.none();`
`878`	`878`	`return driverFactory.newInstance( uri, auth, routingConf, RetrySettings.DEFAULT, config );`
`879`	`879`	`}`