diff --git a/driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java b/driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java index 9899e75a36..82204ef275 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java @@ -31,15 +31,15 @@ import java.time.ZonedDateTime; import java.util.List; import java.util.concurrent.ThreadLocalRandom; +import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Stream; -import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; import org.neo4j.driver.Record; import org.neo4j.driver.Result; import org.neo4j.driver.Value; +import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; import org.neo4j.driver.types.IsoDuration; -import java.util.function.Function; import org.neo4j.driver.util.ParallelizableIT; import org.neo4j.driver.util.SessionExtension; import org.neo4j.driver.util.TemporalUtil; @@ -48,10 +48,10 @@ import static java.util.Collections.singletonMap; import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.neo4j.driver.internal.util.Neo4jFeature.TEMPORAL_TYPES; import static org.neo4j.driver.Values.isoDuration; import static org.neo4j.driver.Values.ofOffsetDateTime; import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.internal.util.Neo4jFeature.TEMPORAL_TYPES; @EnabledOnNeo4jWith( TEMPORAL_TYPES ) @ParallelizableIT diff --git a/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java b/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java index 022e3858a0..7d1d5d2cc6 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java +++ b/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java @@ -116,7 +116,7 @@ public Session newSession( AccessMode mode ) { if ( driver == null ) { - driver = createDriver( clusterRule.getCluster().leader().getRoutingUri() ); + driver = createDriver( clusterRule.getCluster().getRoutingUri() ); } return driver.session( builder().withDefaultAccessMode( mode ).build() ); @@ -275,7 +275,7 @@ void shouldDropBrokenOldConnections() throws Exception FakeClock clock = new FakeClock(); ChannelTrackingDriverFactory driverFactory = new ChannelTrackingDriverFactory( clock ); - URI routingUri = cluster.leader().getRoutingUri(); + URI routingUri = cluster.getRoutingUri(); AuthToken auth = clusterRule.getDefaultAuthToken(); try ( Driver driver = driverFactory.newInstance( routingUri, auth, RoutingSettings.DEFAULT, RetrySettings.DEFAULT, config, SecurityPlanImpl.insecure() ) ) @@ -335,10 +335,9 @@ void shouldAcceptMultipleBookmarks() throws Exception String value = "Alice"; Cluster cluster = clusterRule.getCluster(); - ClusterMember leader = cluster.leader(); executor = newExecutor(); - try ( Driver driver = createDriver( leader.getRoutingUri() ) ) + try ( Driver driver = createDriver( cluster.getRoutingUri() ) ) { List> futures = new ArrayList<>(); for ( int i = 0; i < threadCount; i++ ) @@ -367,16 +366,18 @@ void shouldAcceptMultipleBookmarks() throws Exception void shouldNotReuseReadConnectionForWriteTransaction() { Cluster cluster = clusterRule.getCluster(); - ClusterMember leader = cluster.leader(); - try ( Driver driver = createDriver( leader.getRoutingUri() ) ) + try ( Driver driver = createDriver( cluster.getRoutingUri() ) ) { AsyncSession session = driver.asyncSession( builder().withDefaultAccessMode( AccessMode.READ ).build() ); CompletionStage> resultsStage = session.runAsync( "RETURN 42" ) - .thenCompose( cursor1 -> - session.writeTransactionAsync( tx -> tx.runAsync( "CREATE (:Node1) RETURN 42" ) - .thenCompose( cursor2 -> combineCursors( cursor2, cursor1 ) ) ) ); + .thenCompose( cursor1 -> + session.writeTransactionAsync( + tx -> tx.runAsync( "CREATE (:Node1) RETURN 42" ) + .thenCompose( + cursor2 -> combineCursors( cursor2, + cursor1 ) ) ) ); List results = await( resultsStage ); assertEquals( 2, results.size() ); @@ -405,7 +406,6 @@ void shouldNotReuseReadConnectionForWriteTransaction() void shouldRespectMaxConnectionPoolSizePerClusterMember() { Cluster cluster = clusterRule.getCluster(); - ClusterMember leader = cluster.leader(); Config config = Config.builder() .withMaxConnectionPoolSize( 2 ) @@ -413,7 +413,7 @@ void shouldRespectMaxConnectionPoolSizePerClusterMember() .withLogging( DEV_NULL_LOGGING ) .build(); - try ( Driver driver = createDriver( leader.getRoutingUri(), config ) ) + try ( Driver driver = createDriver( cluster.getRoutingUri(), config ) ) { String database = "neo4j"; Session writeSession1 = @@ -443,11 +443,10 @@ void shouldRespectMaxConnectionPoolSizePerClusterMember() void shouldAllowExistingTransactionToCompleteAfterDifferentConnectionBreaks() { Cluster cluster = clusterRule.getCluster(); - ClusterMember leader = cluster.leader(); FailingConnectionDriverFactory driverFactory = new FailingConnectionDriverFactory(); - try ( Driver driver = driverFactory.newInstance( leader.getRoutingUri(), clusterRule.getDefaultAuthToken(), + try ( Driver driver = driverFactory.newInstance( cluster.getRoutingUri(), clusterRule.getDefaultAuthToken(), RoutingSettings.DEFAULT, RetrySettings.DEFAULT, configWithoutLogging(), SecurityPlanImpl.insecure() ) ) { Session session1 = driver.session(); @@ -486,10 +485,9 @@ RoutingSettings.DEFAULT, RetrySettings.DEFAULT, configWithoutLogging(), Security void shouldRediscoverWhenConnectionsToAllCoresBreak() { Cluster cluster = clusterRule.getCluster(); - ClusterMember leader = cluster.leader(); ChannelTrackingDriverFactory driverFactory = new ChannelTrackingDriverFactory(); - try ( Driver driver = driverFactory.newInstance( leader.getRoutingUri(), clusterRule.getDefaultAuthToken(), + try ( Driver driver = driverFactory.newInstance( cluster.getRoutingUri(), clusterRule.getDefaultAuthToken(), RoutingSettings.DEFAULT, RetrySettings.DEFAULT, configWithoutLogging(), SecurityPlanImpl.insecure() ) ) { String database = "neo4j"; @@ -556,7 +554,7 @@ void shouldKeepOperatingWhenConnectionsBreak() throws Exception .withMaxTransactionRetryTime( testRunTimeMs, MILLISECONDS ) .build(); - try ( Driver driver = driverFactory.newInstance( cluster.leader().getRoutingUri(), clusterRule.getDefaultAuthToken(), + try ( Driver driver = driverFactory.newInstance( cluster.getRoutingUri(), clusterRule.getDefaultAuthToken(), RoutingSettings.DEFAULT, RetrySettings.DEFAULT, config, SecurityPlanImpl.insecure() ) ) { List> results = new ArrayList<>(); diff --git a/driver/src/test/java/org/neo4j/driver/util/cc/Cluster.java b/driver/src/test/java/org/neo4j/driver/util/cc/Cluster.java index b7f5d9709e..81079cce95 100644 --- a/driver/src/test/java/org/neo4j/driver/util/cc/Cluster.java +++ b/driver/src/test/java/org/neo4j/driver/util/cc/Cluster.java @@ -19,6 +19,7 @@ package org.neo4j.driver.util.cc; import java.io.FileNotFoundException; +import java.net.URI; import java.nio.file.Path; import java.util.HashSet; import java.util.Map; @@ -66,6 +67,11 @@ Cluster withMembers( Set newMembers ) throws ClusterUnavailableEx return new Cluster( path, newMembers, clusterDrivers ); } + public URI getRoutingUri() + { + return randomOf( cores() ).getRoutingUri(); + } + public Path getPath() { return path; diff --git a/driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java b/driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java index ffd6a3935d..0de95e7318 100644 --- a/driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java +++ b/driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java @@ -71,7 +71,7 @@ public void beforeAll( ExtensionContext context ) throws Exception { localClusterExtension = new ClusterExtension(); localClusterExtension.beforeAll( context ); - clusterUri = localClusterExtension.getCluster().leader().getRoutingUri(); + clusterUri = localClusterExtension.getCluster().getRoutingUri(); } } diff --git a/driver/src/test/java/org/neo4j/driver/util/cc/SharedCluster.java b/driver/src/test/java/org/neo4j/driver/util/cc/SharedCluster.java index ea7b47f925..c032dbde1f 100644 --- a/driver/src/test/java/org/neo4j/driver/util/cc/SharedCluster.java +++ b/driver/src/test/java/org/neo4j/driver/util/cc/SharedCluster.java @@ -101,13 +101,6 @@ static void stop() debug( "Cluster at `%s` stopped.", clusterInstance.getPath() ); } - static void stop( ClusterMember member ) - { - assertClusterExists(); - ClusterControl.stopClusterMember( member.getPath() ); - debug( "Cluster member at `%s` stopped.", member.getPath() ); - } - static void kill() { assertClusterExists(); @@ -115,13 +108,6 @@ static void kill() debug( "Cluster at `%s` killed.", clusterInstance.getPath() ); } - static void kill( ClusterMember member ) - { - assertClusterExists(); - ClusterControl.killClusterMember( member.getPath() ); - debug( "Cluster member at `%s` killed.", member.getPath() ); - } - private static Set parseStartCommandOutput( String output ) { Set result = new HashSet<>(); diff --git a/examples/src/test/java/org/neo4j/docs/driver/RoutingExamplesIT.java b/examples/src/test/java/org/neo4j/docs/driver/RoutingExamplesIT.java index 8c4b6ceeed..200acc99a3 100644 --- a/examples/src/test/java/org/neo4j/docs/driver/RoutingExamplesIT.java +++ b/examples/src/test/java/org/neo4j/docs/driver/RoutingExamplesIT.java @@ -37,7 +37,7 @@ class RoutingExamplesIT void testShouldRunConfigCustomResolverExample() throws Exception { // Given - URI uri = neo4j.getCluster().leader().getRoutingUri(); + URI uri = neo4j.getCluster().getRoutingUri(); try ( ConfigCustomResolverExample example = new ConfigCustomResolverExample( "neo4j://x.example.com", neo4j.getDefaultAuthToken(), ServerAddress.of( uri.getHost(), uri.getPort() ) ) ) {