@@ -334,7 +334,7 @@ void shouldHandleGracefulLeaderSwitch() throws Exception
334334
335335 try ( Driver driver = createDriver ( leader .getRoutingUri () ) )
336336 {
337- Session session1 = driver .session ();
337+ Session session1 = driver .session ( builder (). withDatabase ( "neo4j" ). build () );
338338 Transaction tx1 = session1 .beginTransaction ();
339339
340340 // gracefully stop current leader to force re-election
@@ -346,7 +346,7 @@ void shouldHandleGracefulLeaderSwitch() throws Exception
346346
347347 session1 .close ();
348348
349- Bookmark bookmark = inExpirableSession ( driver , Driver :: session , session ->
349+ Bookmark bookmark = inExpirableSession ( driver , d -> d . session ( builder (). withDatabase ( "neo4j" ). build () ) , session ->
350350 {
351351 try ( Transaction tx = session .beginTransaction () )
352352 {
@@ -357,7 +357,8 @@ void shouldHandleGracefulLeaderSwitch() throws Exception
357357 return session .lastBookmark ();
358358 } );
359359
360- try ( Session session2 = driver .session ( builder ().withDefaultAccessMode ( AccessMode .READ ).withBookmarks ( bookmark ).build () );
360+ try ( Session session2 = driver .session (
361+ builder ().withDatabase ( "neo4j" ).withDefaultAccessMode ( AccessMode .READ ).withBookmarks ( bookmark ).build () );
361362 Transaction tx2 = session2 .beginTransaction () )
362363 {
363364 Record record = tx2 .run ( "MATCH (n:Person) RETURN COUNT(*) AS count" ).next ();
@@ -538,20 +539,20 @@ void shouldRespectMaxConnectionPoolSizePerClusterMember()
538539
539540 try ( Driver driver = createDriver ( leader .getRoutingUri (), config ) )
540541 {
541- Session writeSession1 = driver .session ( builder ().withDefaultAccessMode ( AccessMode .WRITE ).build () );
542+ Session writeSession1 = driver .session ( builder ().withDatabase ( "neo4j" ). withDefaultAccessMode ( AccessMode .WRITE ).build () );
542543 writeSession1 .beginTransaction ();
543544
544- Session writeSession2 = driver .session ( builder ().withDefaultAccessMode ( AccessMode .WRITE ).build () );
545+ Session writeSession2 = driver .session ( builder ().withDatabase ( "neo4j" ). withDefaultAccessMode ( AccessMode .WRITE ).build () );
545546 writeSession2 .beginTransaction ();
546547
547548 // should not be possible to acquire more connections towards leader because limit is 2
548- Session writeSession3 = driver .session ( builder ().withDefaultAccessMode ( AccessMode .WRITE ).build () );
549+ Session writeSession3 = driver .session ( builder ().withDatabase ( "neo4j" ). withDefaultAccessMode ( AccessMode .WRITE ).build () );
549550 ClientException e = assertThrows ( ClientException .class , writeSession3 ::beginTransaction );
550551 assertThat ( e , is ( connectionAcquisitionTimeoutError ( 42 ) ) );
551552
552553 // should be possible to acquire new connection towards read server
553554 // it's a different machine, not leader, so different max connection pool size limit applies
554- Session readSession = driver .session ( builder ().withDefaultAccessMode ( AccessMode .READ ).build () );
555+ Session readSession = driver .session ( builder ().withDatabase ( "neo4j" ). withDefaultAccessMode ( AccessMode .READ ).build () );
555556 Record record = readSession .readTransaction ( tx -> tx .run ( "RETURN 1" ).single () );
556557 assertEquals ( 1 , record .get ( 0 ).asInt () );
557558 }
@@ -610,7 +611,7 @@ void shouldRediscoverWhenConnectionsToAllCoresBreak()
610611 try ( Driver driver = driverFactory .newInstance ( leader .getRoutingUri (), clusterRule .getDefaultAuthToken (),
611612 RoutingSettings .DEFAULT , RetrySettings .DEFAULT , configWithoutLogging (), SecurityPlanImpl .insecure () ) )
612613 {
613- try ( Session session = driver .session () )
614+ try ( Session session = driver .session ( builder (). withDatabase ( "neo4j" ). build () ) )
614615 {
615616 createNode ( session , "Person" , "name" , "Vision" );
616617
@@ -626,18 +627,18 @@ RoutingSettings.DEFAULT, RetrySettings.DEFAULT, configWithoutLogging(), Security
626627 makeAllChannelsFailToRunQueries ( driverFactory , ServerVersion .version ( driver ) );
627628
628629 // observe that connection towards writer is broken
629- try ( Session session = driver .session ( builder ().withDefaultAccessMode ( AccessMode .WRITE ).build () ) )
630+ try ( Session session = driver .session ( builder ().withDatabase ( "neo4j" ). withDefaultAccessMode ( AccessMode .WRITE ).build () ) )
630631 {
631632 SessionExpiredException e = assertThrows ( SessionExpiredException .class ,
632- () -> runCreateNode ( session , "Person" , "name" , "Vision" ).consume () );
633+ () -> runCreateNode ( session , "Person" , "name" , "Vision" ).consume () );
633634 assertEquals ( "Disconnected" , e .getCause ().getMessage () );
634635 }
635636
636637 // probe connections to all readers
637638 int readersCount = cluster .followers ().size () + cluster .readReplicas ().size ();
638639 for ( int i = 0 ; i < readersCount ; i ++ )
639640 {
640- try ( Session session = driver .session ( builder ().withDefaultAccessMode ( AccessMode .READ ).build () ) )
641+ try ( Session session = driver .session ( builder ().withDatabase ( "neo4j" ). withDefaultAccessMode ( AccessMode .READ ).build () ) )
641642 {
642643 runCountNodes ( session , "Person" , "name" , "Vision" );
643644 }
@@ -646,7 +647,7 @@ RoutingSettings.DEFAULT, RetrySettings.DEFAULT, configWithoutLogging(), Security
646647 }
647648 }
648649
649- try ( Session session = driver .session () )
650+ try ( Session session = driver .session ( builder (). withDatabase ( "neo4j" ). build () ) )
650651 {
651652 updateNode ( session , "Person" , "name" , "Vision" , "Thanos" );
652653 assertEquals ( 0 , countNodes ( session , "Person" , "name" , "Vision" ) );
0 commit comments