Revert "Merge pull request #339 from zhenlineo/1.3-fix-routing-context"

This reverts commit 465c105, reversing
changes made to 47deff5.

Author: Zhen

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

@@ -23,16 +23,13 @@
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
 
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonMap;
-
 public class RoutingSettings
 {
     final int maxRoutingFailures;
     final long retryTimeoutDelay;
     final Value routingParameters;
 
-    public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, Object> routingParameters )
+    public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, String> routingParameters )
     {
         this.maxRoutingFailures = maxRoutingFailures;
         this.retryTimeoutDelay = retryTimeoutDelay;

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

@@ -33,8 +33,6 @@
 import org.neo4j.driver.v1.util.Immutable;
 import org.neo4j.driver.v1.util.Resource;
 
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonMap;
 import static org.neo4j.driver.v1.Config.TrustStrategy.trustAllCertificates;
 
 /**
@@ -77,7 +75,7 @@ public class Config
     private final int connectionTimeoutMillis;
     private final RetrySettings retrySettings;
 
-    private final Map<String, Object> routingContext;
+    private final Map<String, String> routingContext;
 
     private Config( ConfigBuilder builder)
     {
@@ -212,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,Object> routingContext = singletonMap( "context", (Object) emptyMap() );
+        private Map<String,String> routingContext = null;
 
         private ConfigBuilder() {}
 
@@ -490,7 +488,7 @@ public ConfigBuilder withMaxTransactionRetryTime( long value, TimeUnit unit )
          * @since 1.3
          * @return this builder
          */
-        public ConfigBuilder withRoutingContext( Map<String, Object> context )
+        public ConfigBuilder withRoutingContext( Map<String, String> context )
         {
             this.routingContext = context;
             return this;

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

@@ -41,7 +41,6 @@
 import org.neo4j.driver.v1.AuthTokens;
 import org.neo4j.driver.v1.Config;
 import org.neo4j.driver.v1.Driver;
-import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertArrayEquals;
@@ -140,7 +139,7 @@ private Driver createDriver( DriverFactory driverFactory )
     private Driver createDriver( DriverFactory driverFactory, Config config )
     {
         AuthToken auth = AuthTokens.none();
-        RoutingSettings routingSettings = new TestRoutingSettings( 42, 42 );
+        RoutingSettings routingSettings = new RoutingSettings( 42, 42, null );
         return driverFactory.newInstance( uri, auth, routingSettings, RetrySettings.DEFAULT, config );
     }
 

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

@@ -49,7 +49,6 @@
 import org.neo4j.driver.v1.exceptions.SessionExpiredException;
 import org.neo4j.driver.v1.util.Function;
 import org.neo4j.driver.v1.util.StubServer;
-import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -874,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 TestRoutingSettings( 1, 1 );
+        RoutingSettings routingConf = new RoutingSettings( 1, 1, null );
         AuthToken auth = AuthTokens.none();
         return driverFactory.newInstance( uri, auth, routingConf, RetrySettings.DEFAULT, config );
     }

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

@@ -49,7 +49,6 @@
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.ProtocolException;
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
-import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
 
 import static java.util.Arrays.asList;
 import static junit.framework.TestCase.fail;
@@ -346,7 +345,7 @@ private final Driver driverWithServers( long ttl, Map<String,Object>... serverIn
 
     private Driver driverWithPool( ConnectionPool pool )
     {
-        RoutingSettings settings = new TestRoutingSettings( 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 );

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

@@ -36,7 +36,6 @@
 import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.exceptions.ProtocolException;
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
-import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
 
 import static java.util.Arrays.asList;
 import static org.hamcrest.Matchers.containsString;
@@ -85,7 +84,7 @@ public void shouldTryConfiguredMaxRoutingFailures() throws Exception
         {
             // given
             int maxRoutingFailures = 7;
-            RoutingSettings settings = new TestRoutingSettings( maxRoutingFailures, 10 );
+            RoutingSettings settings = new RoutingSettings( maxRoutingFailures, 10, null );
             Clock clock = mock( Clock.class );
             RoutingTable routingTable = new TestRoutingTable( A );
 
@@ -451,7 +450,7 @@ private static ClusterComposition rediscover( ConnectionPool connections, Routin
     private static ClusterComposition rediscover( BoltServerAddress initialRouter, ConnectionPool connections,
             RoutingTable routingTable, ClusterCompositionProvider provider )
     {
-        RoutingSettings settings = new TestRoutingSettings( 1, 0 );
+        RoutingSettings settings = new RoutingSettings( 1, 0, null );
         Clock mockedClock = mock( Clock.class );
         Logger mockedLogger = mock( Logger.class );
 

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

@@ -54,7 +54,6 @@
 import org.neo4j.driver.v1.util.cc.Cluster;
 import org.neo4j.driver.v1.util.cc.ClusterMember;
 import org.neo4j.driver.v1.util.cc.ClusterRule;
-import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.instanceOf;
@@ -107,7 +106,7 @@ public void sessionCreationShouldFailIfCallingDiscoveryProcedureOnEdgeServer() t
         catch ( ServiceUnavailableException ex )
         {
             assertThat( ex.getMessage(), containsString(
-                    "Failed to run 'Statement{text='CALL dbms.cluster.routing" ) );
+                    "Failed to run 'Statement{text='CALL dbms.cluster.routing.getServers', parameters={}}' on server." ) );
         }
     }
 
@@ -220,8 +219,7 @@ public void shouldDropBrokenOldSessions() throws Exception
 
         URI routingUri = cluster.leader().getRoutingUri();
         AuthToken auth = clusterRule.getDefaultAuthToken();
-        RoutingSettings routingSettings = new TestRoutingSettings( 1,
-                TimeUnit.SECONDS.toMillis( 5 ) );
+        RoutingSettings routingSettings = new RoutingSettings( 1, TimeUnit.SECONDS.toMillis( 5 ), null );
         RetrySettings retrySettings = RetrySettings.DEFAULT;
 
         try ( Driver driver = driverFactory.newInstance( routingUri, auth, routingSettings, retrySettings, config ) )

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

@@ -52,7 +52,6 @@
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.summary.ResultSummary;
 import org.neo4j.driver.v1.util.TestNeo4j;
-import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
@@ -82,7 +81,7 @@ public void createDriver()
     {
         DriverFactoryWithConnector driverFactory = new DriverFactoryWithConnector();
         AuthToken auth = AuthTokens.none();
-        RoutingSettings routingSettings = new TestRoutingSettings( 1, 1 );
+        RoutingSettings routingSettings = new RoutingSettings( 1, 1, null );
         RetrySettings retrySettings = RetrySettings.DEFAULT;
         driver = driverFactory.newInstance( neo4j.uri(), auth, routingSettings, retrySettings, defaultConfig() );
         connectionPool = driverFactory.connectionPool;

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

@@ -45,7 +45,6 @@
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
 import org.neo4j.driver.v1.util.Neo4jRunner;
 import org.neo4j.driver.v1.util.TestNeo4j;
-import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -160,7 +159,7 @@ private static Driver createDriver( Clock clock, Config config )
     {
         DriverFactory factory = new DriverFactoryWithClock( clock );
         AuthToken auth = AuthTokens.none();
-        RoutingSettings routingSettings = new TestRoutingSettings( 1, 1 );
+        RoutingSettings routingSettings = new RoutingSettings( 1, 1, null );
         RetrySettings retrySettings = RetrySettings.DEFAULT;
         return factory.newInstance( Neo4jRunner.DEFAULT_URI, auth, routingSettings, retrySettings, config );
     }

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

@@ -31,7 +31,6 @@
 import org.neo4j.driver.internal.cluster.RoutingSettings;
 import org.neo4j.driver.internal.retry.RetrySettings;
 import org.neo4j.driver.internal.util.DriverFactoryWithFixedRetryLogic;
-import org.neo4j.driver.internal.util.ServerVersion;
 import org.neo4j.driver.v1.AccessMode;
 import org.neo4j.driver.v1.AuthToken;
 import org.neo4j.driver.v1.AuthTokens;
@@ -45,8 +44,8 @@
 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.util.ServerVersion;
 import org.neo4j.driver.v1.util.TestNeo4j;
-import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
 
 import static java.lang.String.format;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -68,9 +67,9 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
 import static org.neo4j.driver.v1.Config.defaultConfig;
 import static org.neo4j.driver.v1.Values.parameters;
+import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
 
 public class SessionIT
 {
@@ -957,7 +956,7 @@ private Driver newDriverWithoutRetries()
     private Driver newDriverWithFixedRetries( int maxRetriesCount )
     {
         DriverFactory driverFactory = new DriverFactoryWithFixedRetryLogic( maxRetriesCount );
-        RoutingSettings routingConf = new TestRoutingSettings( 1, 1 );
+        RoutingSettings routingConf = new RoutingSettings( 1, 1, null );
         AuthToken auth = AuthTokens.none();
         return driverFactory.newInstance( neo4j.uri(), auth, routingConf, RetrySettings.DEFAULT, defaultConfig() );
     }