Skip to content

Commit ba25055

Browse files
author
Zhen Li
committed
Merge branch '1.7' into 4.0
2 parents 156725f + bc43971 commit ba25055

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,7 @@ void setUp()
111111
{
112112
logging = new LoggerNameTrackingLogging();
113113

114-
Config.ConfigBuilder builder = Config.builder()
115-
.withLogging( logging )
116-
.withMaxConnectionPoolSize( 100 )
117-
.withConnectionAcquisitionTimeout( 1, MINUTES )
118-
.withDriverMetrics();
119-
120-
driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config( builder ) );
114+
driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config() );
121115

122116
ThreadFactory threadFactory = new DaemonThreadFactory( getClass().getSimpleName() + "-worker-" );
123117
executor = Executors.newCachedThreadPool( threadFactory );
@@ -216,7 +210,16 @@ private void runStressTest( Function<C,List<Future<?>>> threadLauncher ) throws
216210

217211
abstract AuthToken authToken();
218212

219-
abstract Config config( Config.ConfigBuilder builder );
213+
abstract Config.ConfigBuilder config( Config.ConfigBuilder builder );
214+
215+
Config config()
216+
{
217+
Config.ConfigBuilder builder = Config.builder()
218+
.withLogging( logging )
219+
.withMaxConnectionPoolSize( 100 )
220+
.withConnectionAcquisitionTimeout( 1, MINUTES );
221+
return config( builder ).build();
222+
}
220223

221224
abstract C createContext();
222225

@@ -264,7 +267,7 @@ private List<BlockingCommand<C>> createBlockingCommands()
264267
commands.add( new BlockingFailingQuery<>( driver ) );
265268
commands.add( new BlockingFailingQueryInTx<>( driver ) );
266269

267-
commands.add( new FailedAuth<>( databaseUri(), logging ) );
270+
commands.add( new FailedAuth<>( databaseUri(), config() ) );
268271

269272
commands.addAll( createTestSpecificBlockingCommands() );
270273

driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ AuthToken authToken()
6767
}
6868

6969
@Override
70-
Config config( Config.ConfigBuilder builder )
70+
Config.ConfigBuilder config( Config.ConfigBuilder builder )
7171
{
72-
return clusterRule.getDriverConfig( builder );
72+
return clusterRule.config( builder );
7373
}
7474

7575
@Override

driver/src/test/java/org/neo4j/driver/stress/FailedAuth.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.neo4j.driver.Config;
2424
import org.neo4j.driver.Driver;
2525
import org.neo4j.driver.GraphDatabase;
26-
import org.neo4j.driver.Logging;
2726
import org.neo4j.driver.exceptions.SecurityException;
2827

2928
import static org.hamcrest.Matchers.containsString;
@@ -34,19 +33,17 @@
3433
public class FailedAuth<C extends AbstractContext> implements BlockingCommand<C>
3534
{
3635
private final URI clusterUri;
37-
private final Logging logging;
36+
private final Config config;
3837

39-
public FailedAuth( URI clusterUri, Logging logging )
38+
public FailedAuth( URI clusterUri, Config config )
4039
{
4140
this.clusterUri = clusterUri;
42-
this.logging = logging;
41+
this.config = config;
4342
}
4443

4544
@Override
4645
public void execute( C context )
4746
{
48-
Config config = Config.builder().withLogging( logging ).build();
49-
5047
final Driver driver = GraphDatabase.driver( clusterUri, basic( "wrongUsername", "wrongPassword" ), config );
5148
SecurityException e = assertThrows( SecurityException.class, driver::verifyConnectivity );
5249
assertThat( e.getMessage(), containsString( "authentication failure" ) );

driver/src/test/java/org/neo4j/driver/stress/SingleInstanceStressIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ AuthToken authToken()
5454
}
5555

5656
@Override
57-
Config config( Config.ConfigBuilder builder )
57+
Config.ConfigBuilder config( Config.ConfigBuilder builder )
5858
{
59-
return builder.build();
59+
return builder.withoutEncryption();
6060
}
6161

6262
@Override

driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public AuthToken getAuthToken()
6262
return localClusterExtension.getDefaultAuthToken();
6363
}
6464

65-
public Config getDriverConfig( Config.ConfigBuilder builder )
65+
public Config.ConfigBuilder config( Config.ConfigBuilder builder )
6666
{
6767
if ( remoteClusterExists() )
6868
{
@@ -73,7 +73,7 @@ public Config getDriverConfig( Config.ConfigBuilder builder )
7373
builder.withoutEncryption();
7474
}
7575

76-
return builder.build();
76+
return builder;
7777
}
7878

7979
@Override

0 commit comments

Comments
 (0)