|
32 | 32 | import java.net.URI; |
33 | 33 | import java.util.Optional; |
34 | 34 | import java.util.concurrent.TimeUnit; |
| 35 | +import java.util.logging.Level; |
35 | 36 |
|
36 | 37 | import org.neo4j.driver.AuthToken; |
37 | 38 | import org.neo4j.driver.AuthTokens; |
38 | 39 | import org.neo4j.driver.Config; |
| 40 | +import org.neo4j.driver.Logging; |
39 | 41 | import org.neo4j.driver.internal.DefaultDomainNameResolver; |
40 | 42 | import org.neo4j.driver.internal.DomainNameResolver; |
41 | 43 | import org.neo4j.driver.internal.DriverFactory; |
| 44 | +import org.neo4j.driver.internal.SecuritySettings; |
42 | 45 | import org.neo4j.driver.internal.cluster.RoutingSettings; |
43 | 46 | import org.neo4j.driver.internal.retry.RetrySettings; |
44 | | -import org.neo4j.driver.internal.security.SecurityPlanImpl; |
| 47 | +import org.neo4j.driver.internal.security.SecurityPlan; |
45 | 48 | import org.neo4j.driver.net.ServerAddressResolver; |
46 | 49 |
|
47 | 50 | @Setter |
@@ -81,6 +84,7 @@ public TestkitResponse process( TestkitState testkitState ) |
81 | 84 | } |
82 | 85 | Optional.ofNullable( data.userAgent ).ifPresent( configBuilder::withUserAgent ); |
83 | 86 | Optional.ofNullable( data.connectionTimeoutMs ).ifPresent( timeout -> configBuilder.withConnectionTimeout( timeout, TimeUnit.MILLISECONDS ) ); |
| 87 | + configBuilder.withLogging( Logging.console( Level.FINE ) ); |
84 | 88 | testkitState.getDrivers().putIfAbsent( id, driver( URI.create( data.uri ), authToken, configBuilder.build(), domainNameResolver ) ); |
85 | 89 | return Driver.builder().data( Driver.DriverBody.builder().id( id ).build() ).build(); |
86 | 90 | } |
@@ -129,8 +133,11 @@ private org.neo4j.driver.Driver driver( URI uri, AuthToken authToken, Config con |
129 | 133 | { |
130 | 134 | RoutingSettings routingSettings = RoutingSettings.DEFAULT; |
131 | 135 | RetrySettings retrySettings = RetrySettings.DEFAULT; |
| 136 | + SecuritySettings.SecuritySettingsBuilder securitySettingsBuilder = new SecuritySettings.SecuritySettingsBuilder(); |
| 137 | + SecuritySettings securitySettings = securitySettingsBuilder.build(); |
| 138 | + SecurityPlan securityPlan = securitySettings.createSecurityPlan( uri.getScheme() ); |
132 | 139 | return new DriverFactoryWithDomainNameResolver( domainNameResolver ) |
133 | | - .newInstance( uri, authToken, routingSettings, retrySettings, config, SecurityPlanImpl.insecure() ); |
| 140 | + .newInstance( uri, authToken, routingSettings, retrySettings, config, securityPlan ); |
134 | 141 | } |
135 | 142 |
|
136 | 143 | @Setter |
|
0 commit comments