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 d3a9027bc3..382476e30f 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() ) ) @@ -458,10 +458,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++ ) @@ -490,16 +489,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() ); @@ -528,7 +529,6 @@ void shouldNotReuseReadConnectionForWriteTransaction() void shouldRespectMaxConnectionPoolSizePerClusterMember() { Cluster cluster = clusterRule.getCluster(); - ClusterMember leader = cluster.leader(); Config config = Config.builder() .withMaxConnectionPoolSize( 2 ) @@ -536,7 +536,7 @@ void shouldRespectMaxConnectionPoolSizePerClusterMember() .withLogging( DEV_NULL_LOGGING ) .build(); - try ( Driver driver = createDriver( leader.getRoutingUri(), config ) ) + try ( Driver driver = createDriver( cluster.getRoutingUri(), config ) ) { Session writeSession1 = driver.session( builder().withDefaultAccessMode( AccessMode.WRITE ).build() ); writeSession1.beginTransaction(); @@ -561,11 +561,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(); @@ -604,10 +603,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() ) ) { try ( Session session = driver.session() ) @@ -673,7 +671,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 9fdd6cdbb6..4b4a72bfd8 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,12 +19,9 @@ package org.neo4j.driver.util.cc; import java.io.FileNotFoundException; -import java.net.InetAddress; import java.net.URI; -import java.net.UnknownHostException; import java.nio.file.Path; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ThreadLocalRandom; @@ -32,7 +29,6 @@ import org.neo4j.driver.Bookmark; import org.neo4j.driver.Driver; -import org.neo4j.driver.Record; import org.neo4j.driver.internal.BoltServerAddress; import org.neo4j.driver.util.TestUtil; import org.neo4j.driver.util.cc.ClusterMemberRoleDiscoveryFactory.ClusterMemberRoleDiscovery; @@ -71,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; @@ -165,13 +166,6 @@ public void stop( ClusterMember member ) waitForMembersToBeOnline(); } - public void kill( ClusterMember member ) - { - removeOfflineMember( member ); - SharedCluster.kill( member ); - waitForMembersToBeOnline(); - } - public Driver getDirectDriver( ClusterMember member ) { return clusterDrivers.getDriver( member ); @@ -389,32 +383,6 @@ private static Set extractBoltAddresses( Set m return addresses; } - private static BoltServerAddress extractBoltAddress( Record record ) - { - List addresses = record.get( "addresses" ).asList(); - String boltUriString = (String) addresses.get( 0 ); - URI boltUri = URI.create( boltUriString ); - return newBoltServerAddress( boltUri ); - } - - private static BoltServerAddress newBoltServerAddress( URI uri ) - { - try - { - return new BoltServerAddress( InetAddress.getByName( uri.getHost() ).getHostAddress(), uri.getPort() ); - } - catch ( UnknownHostException e ) - { - throw new RuntimeException( "Unable to resolve host to IP in URI: '" + uri + "'" ); - } - } - - private static ClusterMemberRole extractRole( Record record ) - { - String roleString = record.get( "role" ).asString(); - return ClusterMemberRole.valueOf( roleString.toUpperCase() ); - } - private static ClusterMember findByBoltAddress( BoltServerAddress boltAddress, Set members ) { for ( ClusterMember member : members ) 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..76bac72fab 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 @@ -115,13 +115,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<>();