Fix routing context requirement

Author: Zhen

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

@@ -29,7 +29,7 @@ public class RoutingSettings
     final long retryTimeoutDelay;
     final Value routingParameters;
 
-    public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, String> routingParameters )
+    public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, Object> routingParameters )
     {
         this.maxRoutingFailures = maxRoutingFailures;
         this.retryTimeoutDelay = retryTimeoutDelay;

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.emptyMap;
 import static org.neo4j.driver.v1.Config.TrustStrategy.trustAllCertificates;
 
 /**
@@ -75,7 +76,7 @@ public class Config
     private final int connectionTimeoutMillis;
     private final RetrySettings retrySettings;
 
-    private final Map<String, String> routingContext;
+    private final Map<String, Object> routingContext;
 
     private Config( ConfigBuilder builder)
     {
@@ -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,Object> routingContext = emptyMap();
 
         private ConfigBuilder() {}
 
@@ -488,7 +489,7 @@ public ConfigBuilder withMaxTransactionRetryTime( long value, TimeUnit unit )
          * @since 1.3
          * @return this builder
          */
-        public ConfigBuilder withRoutingContext( Map<String, String> context )
+        public ConfigBuilder withRoutingContext( Map<String, Object> context )
         {
             this.routingContext = context;
             return this;

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

@@ -22,7 +22,9 @@
 import org.junit.Test;
 
 import java.net.URI;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -106,7 +108,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" ) );
         }
     }
 
@@ -219,7 +221,8 @@ public void shouldDropBrokenOldSessions() throws Exception
 
         URI routingUri = cluster.leader().getRoutingUri();
         AuthToken auth = clusterRule.getDefaultAuthToken();
-        RoutingSettings routingSettings = new RoutingSettings( 1, TimeUnit.SECONDS.toMillis( 5 ), null );
+        RoutingSettings routingSettings = new RoutingSettings( 1,
+                TimeUnit.SECONDS.toMillis( 5 ), emptyRoutingContext() );
         RetrySettings retrySettings = RetrySettings.DEFAULT;
 
         try ( Driver driver = driverFactory.newInstance( routingUri, auth, routingSettings, retrySettings, config ) )
@@ -425,11 +428,17 @@ public Logger getLog( String name )
 
         Config config = Config.build()
                 .withLogging( devNullLogging )
+                .withRoutingContext( emptyRoutingContext() )
                 .toConfig();
 
         return GraphDatabase.driver( boltUri, clusterRule.getDefaultAuthToken(), config );
     }
 
+    public static Map<String, Object> emptyRoutingContext()
+    {
+        return Collections.singletonMap( "context", (Object)Collections.emptyMap() );
+    }
+
     private static void createNodesInDifferentThreads( int count, final Driver driver ) throws Exception
     {
         final CountDownLatch beforeRunLatch = new CountDownLatch( count );

driver/src/test/java/org/neo4j/driver/v1/stress/CausalClusteringStressIT.java

@@ -52,6 +52,7 @@
 import org.neo4j.driver.v1.Transaction;
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.SecurityException;
+import org.neo4j.driver.v1.integration.CausalClusteringIT;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.util.DaemonThreadFactory;
 import org.neo4j.driver.v1.util.cc.LocalOrRemoteClusterRule;
@@ -480,7 +481,8 @@ public void execute( Context context )
             Logger logger = mock( Logger.class );
             Logging logging = mock( Logging.class );
             when( logging.getLog( anyString() ) ).thenReturn( logger );
-            Config config = Config.build().withLogging( logging ).toConfig();
+            Config config = Config.build().withLogging( logging )
+                    .withRoutingContext( CausalClusteringIT.emptyRoutingContext() ).toConfig();
 
             try
             {