Fix after review

Renamed to `getRoutingTable` and `withRoutingContext`

Author: Zhen

driver/src/main/java/org/neo4j/driver/internal/cluster/GetServersProcedureRunner.java

@@ -28,27 +28,27 @@
 import org.neo4j.driver.v1.Value;
 
 import static org.neo4j.driver.internal.SessionResourcesHandler.NO_OP;
-import static org.neo4j.driver.internal.cluster.ServerVersion.v3_2_0;
-import static org.neo4j.driver.internal.cluster.ServerVersion.version;
+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 GET_SERVERS = "dbms.cluster.routing.getServers";
-    private static final String GET_SERVERS_V2 = "dbms.cluster.routing.getServersV2";
+    static final String GET_SERVERS = "dbms.cluster.routing.getServers";
+    static final String GET_ROUTING_TABLE = "dbms.cluster.routing.getRoutingTable";
 
-    private final Value routingParameters;
+    private final Value routingContext;
     private Statement procedureCalled;
 
-    public GetServersProcedureRunner( Value parameters )
+    public GetServersProcedureRunner( Value context )
     {
-        this.routingParameters = parameters;
+        this.routingContext = context;
     }
 
     public List<Record> run( Connection connection )
     {
         if( version( connection.server().version() ).greaterThanOrEqual( v3_2_0 ) )
         {
-            procedureCalled = new Statement( "CALL " + GET_SERVERS_V2, routingParameters );
+            procedureCalled = new Statement( "CALL " + GET_ROUTING_TABLE, routingContext );
         }
         else
         {

driver/src/main/java/org/neo4j/driver/internal/cluster/ServerVersion.java renamed to driver/src/main/java/org/neo4j/driver/internal/util/ServerVersion.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.internal.cluster;
+package org.neo4j.driver.internal.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

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

@@ -75,7 +75,7 @@ public class Config
     private final int connectionTimeoutMillis;
     private final RetrySettings retrySettings;
 
-    private final Map<String, String> routingParameters;
+    private final Map<String, String> routingContext;
 
     private Config( ConfigBuilder builder)
     {
@@ -92,7 +92,7 @@ private Config( ConfigBuilder builder)
         this.connectionTimeoutMillis = builder.connectionTimeoutMillis;
         this.retrySettings = builder.retrySettings;
 
-        this.routingParameters = builder.routingParameters;
+        this.routingContext = builder.routingContext;
     }
 
     /**
@@ -187,7 +187,7 @@ public static Config defaultConfig()
 
     RoutingSettings routingSettings()
     {
-        return new RoutingSettings( routingFailureLimit, routingRetryDelayMillis, routingParameters );
+        return new RoutingSettings( routingFailureLimit, routingRetryDelayMillis, routingContext );
     }
 
     RetrySettings retrySettings()
@@ -210,7 +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> routingParameters = null;
+        private Map<String,String> routingContext = null;
 
         private ConfigBuilder() {}
 
@@ -480,17 +480,17 @@ public ConfigBuilder withMaxTransactionRetryTime( long value, TimeUnit unit )
         }
 
         /**
-         * Specify routing parameters that would be passed to server in getServers Procedure call for customized
+         * 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 parameters The parameters to pass to getServers Procedure
+         * @param context The routing context to pass to getRoutingTable Procedure
          * @since 1.3
          * @return this builder
          */
-        public ConfigBuilder withRoutingParameters( Map<String, String> parameters )
+        public ConfigBuilder withRoutingContext( Map<String, String> context )
         {
-            this.routingParameters = parameters;
+            this.routingContext = context;
             return this;
         }
 

driver/src/test/java/org/neo4j/driver/internal/cluster/GetServersProcedureRunnerTest.java

@@ -34,6 +34,8 @@
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.neo4j.driver.internal.cluster.GetServersProcedureRunner.GET_SERVERS;
+import static org.neo4j.driver.internal.cluster.GetServersProcedureRunner.GET_ROUTING_TABLE;
 import static org.neo4j.driver.v1.Values.value;
 
 public class GetServersProcedureRunnerTest
@@ -50,8 +52,8 @@ public void shouldCallGetServersV2WithNull() throws Throwable
         runner.run( mock );
 
         // Then
-        assertThat( runner.procedureCalled().toString(), equalTo(
-                "Statement{text='CALL dbms.cluster.routing.getServersV2', parameters=NULL}" ) );
+        assertThat( runner.procedureCalled(), equalTo(
+                new Statement( "CALL " + GET_ROUTING_TABLE, value( (Object) null) ) ) );
     }
 
     @Test
@@ -69,9 +71,8 @@ public void shouldCallGetServersV2WithParam() throws Throwable
         runner.run( mock );
 
         // Then
-        assertThat( runner.procedureCalled().toString(), equalTo(
-                "Statement{text='CALL dbms.cluster.routing.getServersV2', " +
-                "parameters={key2: \"value2\", key1: \"value1\"}}" ) );
+        assertThat( runner.procedureCalled(), equalTo(
+                new Statement( "CALL " + GET_ROUTING_TABLE, value( param ) ) ) );
     }
 
     @Test
@@ -89,8 +90,8 @@ public void shouldCallGetServerV1() throws Throwable
         runner.run( mock );
 
         // Then
-        assertThat( runner.procedureCalled().toString(), equalTo(
-                "Statement{text='CALL dbms.cluster.routing.getServers', parameters={}}" ) );
+        assertThat( runner.procedureCalled(), equalTo(
+                new Statement( "CALL " + GET_SERVERS ) ) );
     }
 
     private static class TestGetServersProcedureRunner extends GetServersProcedureRunner

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

@@ -31,7 +31,7 @@
 import org.neo4j.driver.v1.Transaction;
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.TransientException;
-import org.neo4j.driver.internal.cluster.ServerVersion;
+import org.neo4j.driver.internal.util.ServerVersion;
 import org.neo4j.driver.v1.util.TestNeo4jSession;
 
 import static java.util.Arrays.asList;
@@ -43,7 +43,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
-import static org.neo4j.driver.internal.cluster.ServerVersion.v3_1_0;
+import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
 
 public class BookmarkIT
 {

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

@@ -44,7 +44,7 @@
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.Neo4jException;
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
-import org.neo4j.driver.internal.cluster.ServerVersion;
+import org.neo4j.driver.internal.util.ServerVersion;
 import org.neo4j.driver.v1.util.TestNeo4j;
 
 import static org.hamcrest.CoreMatchers.containsString;
@@ -68,7 +68,7 @@
 import static org.mockito.Mockito.verify;
 import static org.neo4j.driver.v1.Config.defaultConfig;
 import static org.neo4j.driver.v1.Values.parameters;
-import static org.neo4j.driver.internal.cluster.ServerVersion.v3_1_0;
+import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
 
 public class SessionIT
 {

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

@@ -43,8 +43,8 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.neo4j.driver.internal.cluster.ServerVersion.v3_1_0;
-import static org.neo4j.driver.internal.cluster.ServerVersion.version;
+import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
+import static org.neo4j.driver.internal.util.ServerVersion.version;
 
 public class SummaryIT
 {