From 1dc29c1de5ca1be29767e9652e8ad137a50e6b1c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 28 Nov 2023 15:28:31 +0100 Subject: [PATCH] polish See #2838 --- .../gh2632/ReactiveConnectionAcquisitionIT.java | 2 +- .../data/neo4j/test/Neo4jExtension.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2632/ReactiveConnectionAcquisitionIT.java b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2632/ReactiveConnectionAcquisitionIT.java index d357725cb..8ce3640b5 100644 --- a/src/test/java/org/springframework/data/neo4j/integration/issues/gh2632/ReactiveConnectionAcquisitionIT.java +++ b/src/test/java/org/springframework/data/neo4j/integration/issues/gh2632/ReactiveConnectionAcquisitionIT.java @@ -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); } } } diff --git a/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java b/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java index 4049376ec..44dc7d5f5 100644 --- a/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java +++ b/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java @@ -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); }