Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polish

Browse Source 
See #2838
This commit is contained in:
Michael Simons
2023-11-28 15:28:31 +01:00
committed by Mark Paluch
parent 9cd188286b
commit 1dc29c1de5
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/neo4j/integration/issues/gh2632/ReactiveConnectionAcquisitionIT.java
View File

@@ -153,7 +153,7 @@ class ReactiveConnectionAcquisitionIT {
.withConnectionAcquisitionTimeout(2, TimeUnit.SECONDS)
.withLeakedSessionsLogging()
.build();
return GraphDatabase.driver(neo4jConnectionSupport.url, neo4jConnectionSupport.authToken, config);
return GraphDatabase.driver(neo4jConnectionSupport.uri, neo4jConnectionSupport.authToken, config);
}
}
}

12
src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java
View File

@@ -36,6 +36,7 @@ import org.neo4j.driver.Session;
import org.neo4j.driver.SessionConfig;
import org.neo4j.driver.internal.DriverFactory;
import org.neo4j.driver.internal.SecuritySettings;
import org.neo4j.driver.internal.security.SecurityPlan;
import org.neo4j.driver.internal.security.SecurityPlans;
import org.springframework.core.log.LogMessage;
import org.springframework.lang.Nullable;
@@ -174,12 +175,14 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback {
private final DriverFactory driverFactory;
public final String url;
public final URI uri;
public final AuthToken authToken;
public final Config config;
private final SecurityPlan securityPlan;
private volatile ServerVersion cachedServerVersion;
/**
@@ -188,11 +191,13 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback {
private volatile Driver driverInstance;
public Neo4jConnectionSupport(String url, AuthToken authToken) {
this.url = url;
this.uri = URI.create(url);
this.authToken = authToken;
this.config = Config.builder().withLogging(Logging.slf4j())
.withMaxConnectionPoolSize(Runtime.getRuntime().availableProcessors())
.build();
var settings = new SecuritySettings(config.encrypted(), config.trustStrategy());
this.securityPlan = SecurityPlans.createSecurityPlan(settings, uri.getScheme());
this.driverFactory = new DriverFactory();
}
@@ -219,9 +224,6 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback {
}
private Driver createDriverInstance() {
var uri = URI.create(url);
var settings = new SecuritySettings(config.encrypted(), config.trustStrategy());
var securityPlan = SecurityPlans.createSecurityPlan(settings, uri.getScheme());
return this.driverFactory.newInstance(uri, AuthTokenManagers.basic(() -> authToken), config, securityPlan, EVENT_LOOP_GROUP, null);
}