Skip to content

Commit eaf7a34

Browse files
author
Zhen
committed
Reformat the code to use the default format
1 parent 8cc1106 commit eaf7a34

28 files changed

+243
-207
lines changed

‎driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public void assumeBookmarkSupport()
7575
public void shouldConnectIPv6Uri()
7676
{
7777
// Given
78-
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687", AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD) );
78+
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687",
79+
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
7980
Session session = driver.session() )
8081
{
8182
// When

‎driver/src/test/java/org/neo4j/driver/v1/integration/DriverCloseIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ protected Driver createDriver()
174174
.withLogging( new ConsoleLogging( Level.OFF ) )
175175
.toConfig();
176176

177-
return GraphDatabase.driver( "bolt+routing://127.0.0.1:9001", AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config );
177+
return GraphDatabase.driver( "bolt+routing://127.0.0.1:9001",
178+
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
178179
}
179180

180181
@Test

‎driver/src/test/java/org/neo4j/driver/v1/integration/LoadCSVIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@
3939
public class LoadCSVIT
4040
{
4141
@Rule
42-
public TestNeo4j neo4j = new TestNeo4j( Neo4jSettings.TEST_SETTINGS.without( Neo4jSettings.IMPORT_DIR ));
42+
public TestNeo4j neo4j = new TestNeo4j( Neo4jSettings.TEST_SETTINGS.without( Neo4jSettings.IMPORT_DIR ) );
4343

4444
@Test
4545
public void shouldLoadCSV() throws Throwable
4646
{
47-
try( Driver driver = GraphDatabase.driver( neo4j.uri(), AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD) );
47+
try( Driver driver = GraphDatabase.driver( neo4j.uri(),
48+
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
4849
Session session = driver.session() )
4950
{
5051
String csvFileUrl = createLocalIrisData( session );

‎driver/src/test/java/org/neo4j/driver/v1/integration/LoggingIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import org.junit.Rule;
2222
import org.junit.Test;
2323

24-
import java.net.URI;
25-
2624
import org.neo4j.driver.v1.AuthTokens;
2725
import org.neo4j.driver.v1.Config;
2826
import org.neo4j.driver.v1.Driver;
@@ -53,7 +51,7 @@ public void logShouldRecordDebugAndTraceInfo() throws Exception
5351

5452
try( Driver driver = GraphDatabase.driver(
5553
Neo4jRunner.DEFAULT_URI,
56-
AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD),
54+
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ),
5755
Config.build().withLogging( logging ).toConfig() ) )
5856
{
5957
// When

‎driver/src/test/java/org/neo4j/driver/v1/integration/ServerKilledIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public void shouldRecoverFromServerRestart() throws Throwable
8181
// config with sessionLivenessCheckTimeout not set, i.e. turned off
8282
Config config = Config.build().withEncryptionLevel( encryptionLevel ).toConfig();
8383

84-
try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config ) )
84+
try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI,
85+
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config ) )
8586
{
8687
acquireAndReleaseConnections( 4, driver );
8788

@@ -158,7 +159,7 @@ private static void acquireAndReleaseConnections( int count, Driver driver )
158159
private static Driver createDriver( Clock clock, Config config )
159160
{
160161
DriverFactory factory = new DriverFactoryWithClock( clock );
161-
AuthToken auth = AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD);
162+
AuthToken auth = AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD );
162163
RoutingSettings routingSettings = new RoutingSettings( 1, 1 );
163164
RetrySettings retrySettings = RetrySettings.DEFAULT;
164165
return factory.newInstance( Neo4jRunner.DEFAULT_URI, auth, routingSettings, retrySettings, config );

‎driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void shouldKnowSessionIsClosed() throws Throwable
114114
public void shouldHandleNullConfig() throws Throwable
115115
{
116116
// Given
117-
try( Driver driver = GraphDatabase.driver( neo4j.uri(), AuthTokens.none(), null ) )
117+
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), AuthTokens.none(), null ) )
118118
{
119119
Session session = driver.session();
120120

@@ -132,7 +132,7 @@ public void shouldHandleNullAuthToken() throws Throwable
132132
{
133133
// Given
134134
AuthToken token = null;
135-
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), token) )
135+
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), token ) )
136136
{
137137
Session session = driver.session();
138138

@@ -194,7 +194,7 @@ public void shouldKillLongStreamingResult() throws Throwable
194194
long startTime = -1, endTime;
195195
int recordCount = 0;
196196

197-
try( final Session session = driver.session() )
197+
try ( final Session session = driver.session() )
198198
{
199199
StatementResult result = session.run( "CALL test.driver.longStreamingResult({seconds})",
200200
parameters( "seconds", executionTimeout ) );
@@ -203,19 +203,19 @@ public void shouldKillLongStreamingResult() throws Throwable
203203

204204
// When
205205
startTime = System.currentTimeMillis();
206-
while( result.hasNext() )
206+
while ( result.hasNext() )
207207
{
208208
result.next();
209209
recordCount++;
210210
}
211211

212-
fail("Should have got an exception about streaming get killed.");
212+
fail( "Should have got an exception about streaming get killed." );
213213
}
214-
catch( ClientException e )
214+
catch ( ClientException e )
215215
{
216216
endTime = System.currentTimeMillis();
217-
assertThat( e.code(), equalTo("Neo.ClientError.Procedure.ProcedureCallFailed") );
218-
assertThat( recordCount, greaterThan(1) );
217+
assertThat( e.code(), equalTo( "Neo.ClientError.Procedure.ProcedureCallFailed" ) );
218+
assertThat( recordCount, greaterThan( 1 ) );
219219

220220
assertTrue( startTime > 0 );
221221
assertTrue( endTime - startTime > killTimeout * 1000 ); // get reset by session.reset
@@ -231,11 +231,11 @@ public void shouldNotAllowBeginTxIfResetFailureIsNotConsumed() throws Throwable
231231
neo4j.ensureProcedures( "longRunningStatement.jar" );
232232
Driver driver = newDriver();
233233

234-
try( Session session = driver.session() )
234+
try ( Session session = driver.session() )
235235
{
236236
Transaction tx = session.beginTransaction();
237237

238-
tx.run("CALL test.driver.longRunningStatement({seconds})",
238+
tx.run( "CALL test.driver.longRunningStatement({seconds})",
239239
parameters( "seconds", 10 ) );
240240
Thread.sleep( 1000 );
241241
session.reset();
@@ -280,11 +280,11 @@ public void shouldBeAbleToBeginTxAfterResetFailureIsConsumed() throws Throwable
280280
neo4j.ensureProcedures( "longRunningStatement.jar" );
281281
Driver driver = newDriver();
282282

283-
try( Session session = driver.session() )
283+
try ( Session session = driver.session() )
284284
{
285285
Transaction tx = session.beginTransaction();
286286

287-
StatementResult procedureResult = tx.run("CALL test.driver.longRunningStatement({seconds})",
287+
StatementResult procedureResult = tx.run( "CALL test.driver.longRunningStatement({seconds})",
288288
parameters( "seconds", 10 ) );
289289
Thread.sleep( 1000 );
290290
session.reset();
@@ -367,19 +367,19 @@ public void shouldAllowMoreTxAfterSessionReset()
367367
try ( Driver driver = newDriver();
368368
Session session = driver.session() )
369369
{
370-
try( Transaction tx = session.beginTransaction() )
370+
try ( Transaction tx = session.beginTransaction() )
371371
{
372-
tx.run("Return 1");
372+
tx.run( "Return 1" );
373373
tx.success();
374374
}
375375

376376
// When reset the state of this session
377377
session.reset();
378378

379379
// Then can run more Tx
380-
try( Transaction tx = session.beginTransaction() )
380+
try ( Transaction tx = session.beginTransaction() )
381381
{
382-
tx.run("Return 2");
382+
tx.run( "Return 2" );
383383
tx.success();
384384
}
385385
}
@@ -393,15 +393,15 @@ public void shouldMarkTxAsFailedAndDisallowRunAfterSessionReset()
393393
try ( Driver driver = newDriver();
394394
Session session = driver.session() )
395395
{
396-
try( Transaction tx = session.beginTransaction() )
396+
try ( Transaction tx = session.beginTransaction() )
397397
{
398398
// When reset the state of this session
399399
session.reset();
400-
// Then
400+
// Then
401401
tx.run( "Return 1" );
402402
fail( "Should not allow tx run as tx is already failed." );
403403
}
404-
catch( Exception e )
404+
catch ( Exception e )
405405
{
406406
assertThat( e.getMessage(), startsWith( "Cannot run more statements in this transaction" ) );
407407
}
@@ -416,16 +416,16 @@ public void shouldAllowMoreTxAfterSessionResetInTx()
416416
try ( Driver driver = newDriver();
417417
Session session = driver.session() )
418418
{
419-
try( Transaction tx = session.beginTransaction() )
419+
try ( Transaction tx = session.beginTransaction() )
420420
{
421421
// When reset the state of this session
422422
session.reset();
423423
}
424424

425425
// Then can run more Tx
426-
try( Transaction tx = session.beginTransaction() )
426+
try ( Transaction tx = session.beginTransaction() )
427427
{
428-
tx.run("Return 2");
428+
tx.run( "Return 2" );
429429
tx.success();
430430
}
431431
}
@@ -1341,13 +1341,14 @@ private Driver newDriverWithFixedRetries( int maxRetriesCount )
13411341
{
13421342
DriverFactory driverFactory = new DriverFactoryWithFixedRetryLogic( maxRetriesCount );
13431343
RoutingSettings routingConf = new RoutingSettings( 1, 1 );
1344-
AuthToken auth = AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD);
1344+
AuthToken auth = AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD );
13451345
return driverFactory.newInstance( neo4j.uri(), auth, routingConf, RetrySettings.DEFAULT, noLoggingConfig() );
13461346
}
13471347

13481348
private Driver newDriver()
13491349
{
1350-
return GraphDatabase.driver( neo4j.uri(), AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), noLoggingConfig() );
1350+
return GraphDatabase
1351+
.driver( neo4j.uri(), AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), noLoggingConfig() );
13511352
}
13521353

13531354
private Driver newDriverWithLimitedRetries( int maxTxRetryTime, TimeUnit unit )
@@ -1356,7 +1357,7 @@ private Driver newDriverWithLimitedRetries( int maxTxRetryTime, TimeUnit unit )
13561357
.withLogging( DevNullLogging.DEV_NULL_LOGGING )
13571358
.withMaxTransactionRetryTime( maxTxRetryTime, unit )
13581359
.toConfig();
1359-
return GraphDatabase.driver( neo4j.uri(), AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config );
1360+
return GraphDatabase.driver( neo4j.uri(), AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
13601361
}
13611362

13621363
private static Config noLoggingConfig()

‎driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ public void shouldNotPerformTLSHandshakeWithNonSystemCert() throws Throwable
154154
TLSSocketChannel sslChannel = null;
155155
try
156156
{
157-
sslChannel = TLSSocketChannel.create(address, securityPlan, channel, logger);
158-
fail( "Should have thrown exception" );
157+
sslChannel = TLSSocketChannel.create( address, securityPlan, channel, logger );
158+
fail( "Should have thrown exception" );
159159
}
160160
catch ( SecurityException e )
161161
{
@@ -165,7 +165,7 @@ public void shouldNotPerformTLSHandshakeWithNonSystemCert() throws Throwable
165165
}
166166
finally
167167
{
168-
if( sslChannel != null )
168+
if ( sslChannel != null )
169169
{
170170
sslChannel.close();
171171
}
@@ -221,7 +221,7 @@ private void createFakeServerCertPairInKnownCerts( BoltServerAddress address, Fi
221221
String serverId = address.toString();
222222

223223
X509Certificate cert = CertificateToolTest.generateSelfSignedCertificate();
224-
String certStr = fingerprint(cert);
224+
String certStr = fingerprint( cert );
225225

226226
BufferedWriter writer = new BufferedWriter( new FileWriter( knownCerts, true ) );
227227
writer.write( serverId + " " + certStr );
@@ -234,8 +234,8 @@ public void shouldFailTLSHandshakeDueToServerCertNotSignedByKnownCA() throws Thr
234234
{
235235
// Given
236236
neo4j.restart( Neo4jSettings.TEST_SETTINGS.updateWith(
237-
Neo4jSettings.CERT_DIR,
238-
folder.getRoot().getAbsolutePath().replace( "\\", "/" ) ) );
237+
Neo4jSettings.CERT_DIR,
238+
folder.getRoot().getAbsolutePath().replace( "\\", "/" ) ) );
239239
SocketChannel channel = SocketChannel.open();
240240
channel.connect( neo4j.address().toSocketAddress() );
241241
File trustedCertFile = folder.newFile( "neo4j_trusted_cert.tmp" );
@@ -274,7 +274,7 @@ private Throwable getRootCause( Throwable e )
274274
parentError = error.getCause();
275275

276276
}
277-
while( parentError != null );
277+
while ( parentError != null );
278278
return error;
279279
}
280280

@@ -301,8 +301,9 @@ public void shouldEstablishTLSConnection() throws Throwable
301301

302302
Config config = Config.build().withEncryptionLevel( Config.EncryptionLevel.REQUIRED ).toConfig();
303303

304-
try( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config );
305-
Session session = driver.session() )
304+
try ( Driver driver = GraphDatabase
305+
.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
306+
Session session = driver.session() )
306307
{
307308
StatementResult result = session.run( "RETURN 1" );
308309
assertEquals( 1, result.next().get( 0 ).asInt() );
@@ -317,7 +318,7 @@ public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable
317318

318319
Logger logger = mock( Logger.class );
319320
Logging logging = mock( Logging.class );
320-
when(logging.getLog( anyString() )).thenReturn( logger );
321+
when( logging.getLog( anyString() ) ).thenReturn( logger );
321322

322323
SocketChannel channel = SocketChannel.open();
323324
channel.connect( new InetSocketAddress( "localhost", 7687 ) );
@@ -329,8 +330,9 @@ public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable
329330
.toConfig();
330331

331332
// When
332-
try (Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config );
333-
Session session = driver.session() )
333+
try ( Driver driver = GraphDatabase
334+
.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
335+
Session session = driver.session() )
334336
{
335337
session.run( "RETURN 1" ).consume();
336338
}

0 commit comments

Comments
 (0)