Skip to content

Commit 40c3f19

Browse files
committed
wip
1 parent 0ef0fa3 commit 40c3f19

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,17 @@ public void remove( DatabaseName databaseName )
8080
@Override
8181
public void removeAged()
8282
{
83-
routingTableHandlers.forEach( ( databaseName, handler ) ->
84-
{
85-
if ( handler.isRoutingTableAged() )
86-
{
87-
logger.info(
88-
"Routing table handler for database '%s' is removed because it has not been used for a long time. Routing table: %s",
89-
databaseName.description(), handler.routingTable() );
90-
routingTableHandlers.remove( databaseName );
91-
}
92-
} );
83+
routingTableHandlers.forEach(
84+
( databaseName, handler ) ->
85+
{
86+
if ( handler.isRoutingTableAged() )
87+
{
88+
logger.info(
89+
"Routing table handler for database '%s' is removed because it has not been used for a long time. Routing table: %s",
90+
databaseName.description(), handler.routingTable() );
91+
routingTableHandlers.remove( databaseName );
92+
}
93+
} );
9394
}
9495

9596
@Override
@@ -106,12 +107,13 @@ public boolean contains( DatabaseName databaseName )
106107

107108
private RoutingTableHandler getOrCreate( DatabaseName databaseName )
108109
{
109-
return routingTableHandlers.computeIfAbsent( databaseName, name ->
110-
{
111-
RoutingTableHandler handler = factory.newInstance( name, this );
112-
logger.debug( "Routing table handler for database '%s' is added.", databaseName.description() );
113-
return handler;
114-
} );
110+
return routingTableHandlers.computeIfAbsent(
111+
databaseName, name ->
112+
{
113+
RoutingTableHandler handler = factory.newInstance( name, this );
114+
logger.debug( "Routing table handler for database '%s' is added.", databaseName.description() );
115+
return handler;
116+
} );
115117
}
116118

117119
static class RoutingTableHandlerFactory

driver/src/main/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancer.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,12 @@ public RoutingTableRegistry getRoutingTableRegistry()
182182

183183
private CompletionStage<Boolean> supportsMultiDb( BoltServerAddress address )
184184
{
185-
return connectionPool.acquire( address ).thenCompose( conn ->
186-
{
187-
boolean supportsMultiDatabase = supportsMultiDatabase( conn );
188-
return conn.release().thenApply( ignored -> supportsMultiDatabase );
189-
} );
185+
return connectionPool.acquire( address ).thenCompose(
186+
conn ->
187+
{
188+
boolean supportsMultiDatabase = supportsMultiDatabase( conn );
189+
return conn.release().thenApply( ignored -> supportsMultiDatabase );
190+
} );
190191
}
191192

192193
private CompletionStage<Connection> acquire( AccessMode mode, RoutingTable routingTable )

0 commit comments

Comments
 (0)