Skip to content

Commit aeccdfe

Browse files
author
Zhen
committed
Revert "Merge pull request #339 from zhenlineo/1.3-fix-routing-context"
This reverts commit 465c105, reversing changes made to 47deff5.
1 parent 465c105 commit aeccdfe

File tree

11 files changed

+16
-62
lines changed

11 files changed

+16
-62
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,13 @@
2323
import org.neo4j.driver.v1.Value;
2424
import org.neo4j.driver.v1.Values;
2525

26-
import static java.util.Collections.emptyMap;
27-
import static java.util.Collections.singletonMap;
28-
2926
public class RoutingSettings
3027
{
3128
final int maxRoutingFailures;
3229
final long retryTimeoutDelay;
3330
final Value routingParameters;
3431

35-
public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, Object> routingParameters )
32+
public RoutingSettings( int maxRoutingFailures, long retryTimeoutDelay, Map<String, String> routingParameters )
3633
{
3734
this.maxRoutingFailures = maxRoutingFailures;
3835
this.retryTimeoutDelay = retryTimeoutDelay;

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import org.neo4j.driver.v1.util.Immutable;
3434
import org.neo4j.driver.v1.util.Resource;
3535

36-
import static java.util.Collections.emptyMap;
37-
import static java.util.Collections.singletonMap;
3836
import static org.neo4j.driver.v1.Config.TrustStrategy.trustAllCertificates;
3937

4038
/**
@@ -77,7 +75,7 @@ public class Config
7775
private final int connectionTimeoutMillis;
7876
private final RetrySettings retrySettings;
7977

80-
private final Map<String, Object> routingContext;
78+
private final Map<String, String> routingContext;
8179

8280
private Config( ConfigBuilder builder)
8381
{
@@ -212,7 +210,7 @@ public static class ConfigBuilder
212210
private long routingRetryDelayMillis = TimeUnit.SECONDS.toMillis( 5 );
213211
private int connectionTimeoutMillis = (int) TimeUnit.SECONDS.toMillis( 5 );
214212
private RetrySettings retrySettings = RetrySettings.DEFAULT;
215-
private Map<String,Object> routingContext = singletonMap( "context", (Object) emptyMap() );
213+
private Map<String,String> routingContext = null;
216214

217215
private ConfigBuilder() {}
218216

@@ -490,7 +488,7 @@ public ConfigBuilder withMaxTransactionRetryTime( long value, TimeUnit unit )
490488
* @since 1.3
491489
* @return this builder
492490
*/
493-
public ConfigBuilder withRoutingContext( Map<String, Object> context )
491+
public ConfigBuilder withRoutingContext( Map<String, String> context )
494492
{
495493
this.routingContext = context;
496494
return this;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.neo4j.driver.v1.AuthTokens;
4242
import org.neo4j.driver.v1.Config;
4343
import org.neo4j.driver.v1.Driver;
44-
import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
4544

4645
import static org.hamcrest.Matchers.instanceOf;
4746
import static org.junit.Assert.assertArrayEquals;
@@ -140,7 +139,7 @@ private Driver createDriver( DriverFactory driverFactory )
140139
private Driver createDriver( DriverFactory driverFactory, Config config )
141140
{
142141
AuthToken auth = AuthTokens.none();
143-
RoutingSettings routingSettings = new TestRoutingSettings( 42, 42 );
142+
RoutingSettings routingSettings = new RoutingSettings( 42, 42, null );
144143
return driverFactory.newInstance( uri, auth, routingSettings, RetrySettings.DEFAULT, config );
145144
}
146145

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.neo4j.driver.v1.exceptions.SessionExpiredException;
5050
import org.neo4j.driver.v1.util.Function;
5151
import org.neo4j.driver.v1.util.StubServer;
52-
import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
5352

5453
import static org.hamcrest.Matchers.instanceOf;
5554
import static org.hamcrest.core.IsEqual.equalTo;
@@ -874,7 +873,7 @@ private static Driver newDriverWithFixedRetries( String uriString, int retries )
874873
private static Driver newDriver( String uriString, DriverFactory driverFactory )
875874
{
876875
URI uri = URI.create( uriString );
877-
RoutingSettings routingConf = new TestRoutingSettings( 1, 1 );
876+
RoutingSettings routingConf = new RoutingSettings( 1, 1, null );
878877
AuthToken auth = AuthTokens.none();
879878
return driverFactory.newInstance( uri, auth, routingConf, RetrySettings.DEFAULT, config );
880879
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.neo4j.driver.v1.exceptions.ClientException;
5050
import org.neo4j.driver.v1.exceptions.ProtocolException;
5151
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
52-
import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
5352

5453
import static java.util.Arrays.asList;
5554
import static junit.framework.TestCase.fail;
@@ -346,7 +345,7 @@ private final Driver driverWithServers( long ttl, Map<String,Object>... serverIn
346345

347346
private Driver driverWithPool( ConnectionPool pool )
348347
{
349-
RoutingSettings settings = new TestRoutingSettings( 10, 5_000 );
348+
RoutingSettings settings = new RoutingSettings( 10, 5_000, null );
350349
ConnectionProvider connectionProvider = new LoadBalancer( SEED, settings, pool, clock, logging );
351350
Config config = Config.build().withLogging( logging ).toConfig();
352351
SessionFactory sessionFactory = new NetworkSessionWithAddressFactory( connectionProvider, config );

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.neo4j.driver.v1.Logger;
3737
import org.neo4j.driver.v1.exceptions.ProtocolException;
3838
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
39-
import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
4039

4140
import static java.util.Arrays.asList;
4241
import static org.hamcrest.Matchers.containsString;
@@ -85,7 +84,7 @@ public void shouldTryConfiguredMaxRoutingFailures() throws Exception
8584
{
8685
// given
8786
int maxRoutingFailures = 7;
88-
RoutingSettings settings = new TestRoutingSettings( maxRoutingFailures, 10 );
87+
RoutingSettings settings = new RoutingSettings( maxRoutingFailures, 10, null );
8988
Clock clock = mock( Clock.class );
9089
RoutingTable routingTable = new TestRoutingTable( A );
9190

@@ -451,7 +450,7 @@ private static ClusterComposition rediscover( ConnectionPool connections, Routin
451450
private static ClusterComposition rediscover( BoltServerAddress initialRouter, ConnectionPool connections,
452451
RoutingTable routingTable, ClusterCompositionProvider provider )
453452
{
454-
RoutingSettings settings = new TestRoutingSettings( 1, 0 );
453+
RoutingSettings settings = new RoutingSettings( 1, 0, null );
455454
Clock mockedClock = mock( Clock.class );
456455
Logger mockedLogger = mock( Logger.class );
457456

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import org.neo4j.driver.v1.util.cc.Cluster;
5555
import org.neo4j.driver.v1.util.cc.ClusterMember;
5656
import org.neo4j.driver.v1.util.cc.ClusterRule;
57-
import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
5857

5958
import static org.hamcrest.Matchers.containsString;
6059
import static org.hamcrest.Matchers.instanceOf;
@@ -107,7 +106,7 @@ public void sessionCreationShouldFailIfCallingDiscoveryProcedureOnEdgeServer() t
107106
catch ( ServiceUnavailableException ex )
108107
{
109108
assertThat( ex.getMessage(), containsString(
110-
"Failed to run 'Statement{text='CALL dbms.cluster.routing" ) );
109+
"Failed to run 'Statement{text='CALL dbms.cluster.routing.getServers', parameters={}}' on server." ) );
111110
}
112111
}
113112

@@ -220,8 +219,7 @@ public void shouldDropBrokenOldSessions() throws Exception
220219

221220
URI routingUri = cluster.leader().getRoutingUri();
222221
AuthToken auth = clusterRule.getDefaultAuthToken();
223-
RoutingSettings routingSettings = new TestRoutingSettings( 1,
224-
TimeUnit.SECONDS.toMillis( 5 ) );
222+
RoutingSettings routingSettings = new RoutingSettings( 1, TimeUnit.SECONDS.toMillis( 5 ), null );
225223
RetrySettings retrySettings = RetrySettings.DEFAULT;
226224

227225
try ( Driver driver = driverFactory.newInstance( routingUri, auth, routingSettings, retrySettings, config ) )

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.neo4j.driver.v1.exceptions.ClientException;
5353
import org.neo4j.driver.v1.summary.ResultSummary;
5454
import org.neo4j.driver.v1.util.TestNeo4j;
55-
import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
5655

5756
import static org.hamcrest.Matchers.instanceOf;
5857
import static org.junit.Assert.assertEquals;
@@ -82,7 +81,7 @@ public void createDriver()
8281
{
8382
DriverFactoryWithConnector driverFactory = new DriverFactoryWithConnector();
8483
AuthToken auth = AuthTokens.none();
85-
RoutingSettings routingSettings = new TestRoutingSettings( 1, 1 );
84+
RoutingSettings routingSettings = new RoutingSettings( 1, 1, null );
8685
RetrySettings retrySettings = RetrySettings.DEFAULT;
8786
driver = driverFactory.newInstance( neo4j.uri(), auth, routingSettings, retrySettings, defaultConfig() );
8887
connectionPool = driverFactory.connectionPool;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
4646
import org.neo4j.driver.v1.util.Neo4jRunner;
4747
import org.neo4j.driver.v1.util.TestNeo4j;
48-
import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
4948

5049
import static org.junit.Assert.assertEquals;
5150
import static org.junit.Assert.fail;
@@ -160,7 +159,7 @@ private static Driver createDriver( Clock clock, Config config )
160159
{
161160
DriverFactory factory = new DriverFactoryWithClock( clock );
162161
AuthToken auth = AuthTokens.none();
163-
RoutingSettings routingSettings = new TestRoutingSettings( 1, 1 );
162+
RoutingSettings routingSettings = new RoutingSettings( 1, 1, null );
164163
RetrySettings retrySettings = RetrySettings.DEFAULT;
165164
return factory.newInstance( Neo4jRunner.DEFAULT_URI, auth, routingSettings, retrySettings, config );
166165
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.neo4j.driver.internal.cluster.RoutingSettings;
3232
import org.neo4j.driver.internal.retry.RetrySettings;
3333
import org.neo4j.driver.internal.util.DriverFactoryWithFixedRetryLogic;
34-
import org.neo4j.driver.internal.util.ServerVersion;
3534
import org.neo4j.driver.v1.AccessMode;
3635
import org.neo4j.driver.v1.AuthToken;
3736
import org.neo4j.driver.v1.AuthTokens;
@@ -45,8 +44,8 @@
4544
import org.neo4j.driver.v1.exceptions.ClientException;
4645
import org.neo4j.driver.v1.exceptions.Neo4jException;
4746
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
47+
import org.neo4j.driver.internal.util.ServerVersion;
4848
import org.neo4j.driver.v1.util.TestNeo4j;
49-
import org.neo4j.driver.v1.util.cc.TestRoutingSettings;
5049

5150
import static java.lang.String.format;
5251
import static org.hamcrest.CoreMatchers.containsString;
@@ -68,9 +67,9 @@
6867
import static org.mockito.Mockito.spy;
6968
import static org.mockito.Mockito.times;
7069
import static org.mockito.Mockito.verify;
71-
import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
7270
import static org.neo4j.driver.v1.Config.defaultConfig;
7371
import static org.neo4j.driver.v1.Values.parameters;
72+
import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
7473

7574
public class SessionIT
7675
{
@@ -957,7 +956,7 @@ private Driver newDriverWithoutRetries()
957956
private Driver newDriverWithFixedRetries( int maxRetriesCount )
958957
{
959958
DriverFactory driverFactory = new DriverFactoryWithFixedRetryLogic( maxRetriesCount );
960-
RoutingSettings routingConf = new TestRoutingSettings( 1, 1 );
959+
RoutingSettings routingConf = new RoutingSettings( 1, 1, null );
961960
AuthToken auth = AuthTokens.none();
962961
return driverFactory.newInstance( neo4j.uri(), auth, routingConf, RetrySettings.DEFAULT, defaultConfig() );
963962
}

driver/src/test/java/org/neo4j/driver/v1/util/cc/TestRoutingSettings.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)