Fix the bad pass-in of procedure paremeters

Author: Zhen

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

@@ -20,26 +20,28 @@
 package org.neo4j.driver.internal.cluster;
 
 import java.util.List;
+import java.util.Map;
 
 import org.neo4j.driver.internal.NetworkSession;
 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;
+import static org.neo4j.driver.v1.Values.parameters;
 
 public class GetServersProcedureRunner
 {
     static final String GET_SERVERS = "dbms.cluster.routing.getServers";
-    static final String GET_ROUTING_TABLE = "dbms.cluster.routing.getRoutingTable";
+    static final String GET_ROUTING_TABLE_PARAM = "context";
+    static final String GET_ROUTING_TABLE = "dbms.cluster.routing.getRoutingTable({" + GET_ROUTING_TABLE_PARAM + "})";
 
-    private final Value routingContext;
+    private final Map<String, String> routingContext;
     private Statement procedureCalled;
 
-    public GetServersProcedureRunner( Value context )
+    public GetServersProcedureRunner( Map<String, String> context )
     {
         this.routingContext = context;
     }
@@ -48,7 +50,8 @@ public List<Record> run( Connection connection )
     {
         if( version( connection.server().version() ).greaterThanOrEqual( v3_2_0 ) )
         {
-            procedureCalled = new Statement( "CALL " + GET_ROUTING_TABLE, routingContext );
+            procedureCalled = new Statement( "CALL " + GET_ROUTING_TABLE,
+                    parameters(GET_ROUTING_TABLE_PARAM, routingContext ) );
         }
         else
         {

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

@@ -20,19 +20,16 @@
 
 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;
+    final Map<String, String> routingParameters;
 
     public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, String> routingParameters )
     {
         this.maxRoutingFailures = maxRoutingFailures;
         this.retryTimeoutDelay = retryTimeoutDelay;
-        this.routingParameters = Values.value( routingParameters );
+        this.routingParameters = routingParameters;
     }
 }

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

@@ -33,6 +33,7 @@
 import org.neo4j.driver.v1.util.Immutable;
 import org.neo4j.driver.v1.util.Resource;
 
+import static java.util.Collections.EMPTY_MAP;
 import static org.neo4j.driver.v1.Config.TrustStrategy.trustAllCertificates;
 
 /**
@@ -210,7 +211,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 Map<String,String> routingContext = EMPTY_MAP;
 
         private ConfigBuilder() {}
 

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

@@ -22,29 +22,31 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.summary.InternalServerInfo;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Statement;
-import org.neo4j.driver.v1.Value;
 
+import static java.util.Collections.EMPTY_MAP;
 import static org.hamcrest.MatcherAssert.assertThat;
 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;
+import static org.neo4j.driver.internal.cluster.GetServersProcedureRunner.GET_ROUTING_TABLE_PARAM;
+import static org.neo4j.driver.internal.cluster.GetServersProcedureRunner.GET_SERVERS;
+import static org.neo4j.driver.v1.Values.parameters;
 
 public class GetServersProcedureRunnerTest
 {
     @Test
-    public void shouldCallGetServersV2WithNull() throws Throwable
+    public void shouldCallGetRoutingTableWithEmptyMap() throws Throwable
     {
         // Given
-        GetServersProcedureRunner runner = new TestGetServersProcedureRunner( value( (Object)null ) );
+        GetServersProcedureRunner runner = new TestGetServersProcedureRunner( EMPTY_MAP );
         Connection mock = mock( Connection.class );
         when( mock.server() ).thenReturn(
                 new InternalServerInfo( new BoltServerAddress( "123:45" ), "Neo4j/3.2.1" ) );
@@ -53,17 +55,17 @@ public void shouldCallGetServersV2WithNull() throws Throwable
 
         // Then
         assertThat( runner.procedureCalled(), equalTo(
-                new Statement( "CALL " + GET_ROUTING_TABLE, value( (Object) null) ) ) );
+                new Statement( "CALL " + GET_ROUTING_TABLE, parameters( GET_ROUTING_TABLE_PARAM, EMPTY_MAP ) ) ) );
     }
 
     @Test
-    public void shouldCallGetServersV2WithParam() throws Throwable
+    public void shouldCallGetRoutingTableWithParam() throws Throwable
     {
         // Given
         HashMap<String,String> param = new HashMap<>();
         param.put( "key1", "value1" );
         param.put( "key2", "value2" );
-        GetServersProcedureRunner runner = new TestGetServersProcedureRunner( value( param ) );
+        GetServersProcedureRunner runner = new TestGetServersProcedureRunner( param );
         Connection mock = mock( Connection.class );
         when( mock.server() ).thenReturn(
                 new InternalServerInfo( new BoltServerAddress( "123:45" ), "Neo4j/3.2.1" ) );
@@ -72,17 +74,17 @@ public void shouldCallGetServersV2WithParam() throws Throwable
 
         // Then
         assertThat( runner.procedureCalled(), equalTo(
-                new Statement( "CALL " + GET_ROUTING_TABLE, value( param ) ) ) );
+                new Statement( "CALL " + GET_ROUTING_TABLE, parameters( GET_ROUTING_TABLE_PARAM, param ) ) ) );
     }
 
     @Test
-    public void shouldCallGetServerV1() throws Throwable
+    public void shouldCallGetServers() throws Throwable
     {
         // Given
         HashMap<String,String> param = new HashMap<>();
         param.put( "key1", "value1" );
         param.put( "key2", "value2" );
-        GetServersProcedureRunner runner = new TestGetServersProcedureRunner( value( param ) );
+        GetServersProcedureRunner runner = new TestGetServersProcedureRunner( param );
         Connection mock = mock( Connection.class );
         when( mock.server() ).thenReturn(
                 new InternalServerInfo( new BoltServerAddress( "123:45" ), "Neo4j/3.1.8" ) );
@@ -97,7 +99,7 @@ public void shouldCallGetServerV1() throws Throwable
     private static class TestGetServersProcedureRunner extends GetServersProcedureRunner
     {
 
-        TestGetServersProcedureRunner( Value parameters )
+        TestGetServersProcedureRunner( Map<String, String> parameters )
         {
             super( parameters );
         }

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

@@ -106,7 +106,7 @@ public void sessionCreationShouldFailIfCallingDiscoveryProcedureOnEdgeServer() t
         catch ( ServiceUnavailableException ex )
         {
             assertThat( ex.getMessage(), containsString(
-                    "Failed to run 'Statement{text='CALL dbms.cluster.routing.getServers', parameters={}}' on server." ) );
+                    "Failed to run 'Statement{text='CALL dbms.cluster.routing." ) );
         }
     }