Skip to content

Commit 6091eb9

Browse files
author
Maria Scharin
authored
Merge pull request #349 from zhenlineo/1.2-examples
1.2 examples
2 parents bdd1cb9 + eaf7a34 commit 6091eb9

38 files changed

+1284
-735
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎driver/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,6 @@
9393

9494
<build>
9595
<plugins>
96-
<plugin>
97-
<groupId>com.mycila</groupId>
98-
<artifactId>license-maven-plugin</artifactId>
99-
<configuration>
100-
<header>../driver/src/main/resources/license-header.txt</header>
101-
<mapping>
102-
<java>SLASHSTAR_STYLE</java>
103-
</mapping>
104-
</configuration>
105-
</plugin>
10696
<plugin>
10797
<artifactId>maven-compiler-plugin</artifactId>
10898
<version>2.3.2</version>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.HashSet;
2727

2828
import org.neo4j.driver.v1.AccessMode;
29+
import org.neo4j.driver.v1.AuthTokens;
2930
import org.neo4j.driver.v1.Driver;
3031
import org.neo4j.driver.v1.GraphDatabase;
3132
import org.neo4j.driver.v1.Session;
@@ -34,6 +35,7 @@
3435
import org.neo4j.driver.v1.exceptions.ClientException;
3536
import org.neo4j.driver.v1.exceptions.TransientException;
3637
import org.neo4j.driver.v1.util.ServerVersion;
38+
import org.neo4j.driver.v1.util.TestNeo4j;
3739
import org.neo4j.driver.v1.util.TestNeo4jSession;
3840

3941
import static java.util.Arrays.asList;
@@ -73,8 +75,9 @@ public void assumeBookmarkSupport()
7375
public void shouldConnectIPv6Uri()
7476
{
7577
// Given
76-
try( Driver driver = GraphDatabase.driver( "bolt://[::1]:7687" );
77-
Session session = driver.session() )
78+
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687",
79+
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
80+
Session session = driver.session() )
7881
{
7982
// When
8083
StatementResult result = session.run( "RETURN 1" );

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class ConnectionHandlingIT
8080
public void createDriver()
8181
{
8282
DriverFactoryWithConnector driverFactory = new DriverFactoryWithConnector();
83-
AuthToken auth = AuthTokens.none();
83+
AuthToken auth = neo4j.authToken();
8484
RoutingSettings routingSettings = new RoutingSettings( 1, 1 );
8585
RetrySettings retrySettings = RetrySettings.DEFAULT;
8686
driver = driverFactory.newInstance( neo4j.uri(), auth, routingSettings, retrySettings, defaultConfig() );

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import org.neo4j.driver.internal.logging.ConsoleLogging;
3232
import org.neo4j.driver.v1.AccessMode;
33+
import org.neo4j.driver.v1.AuthTokens;
3334
import org.neo4j.driver.v1.Config;
3435
import org.neo4j.driver.v1.Driver;
3536
import org.neo4j.driver.v1.GraphDatabase;
@@ -123,7 +124,7 @@ public static class DirectDriverCloseIT extends DriverCloseITBase
123124
@Override
124125
protected Driver createDriver()
125126
{
126-
return GraphDatabase.driver( neo4j.uri() );
127+
return GraphDatabase.driver( neo4j.uri(), neo4j.authToken() );
127128
}
128129

129130
@Test
@@ -173,7 +174,8 @@ protected Driver createDriver()
173174
.withLogging( new ConsoleLogging( Level.OFF ) )
174175
.toConfig();
175176

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

179181
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class EncryptionIT
3737
public void shouldOperateWithNoEncryption() throws Exception
3838
{
3939
// Given
40-
Driver driver = GraphDatabase.driver( neo4j.uri(), Config.build().withEncryptionLevel( NONE ).toConfig() );
40+
Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), Config.build().withEncryptionLevel( NONE ).toConfig() );
4141

4242
// Then
4343
assertThat( driver.isEncrypted(), equalTo( false ) );
@@ -60,7 +60,7 @@ public void shouldOperateWithNoEncryption() throws Exception
6060
public void shouldOperateWithRequiredEncryption() throws Exception
6161
{
6262
// Given
63-
Driver driver = GraphDatabase.driver( neo4j.uri(), Config.build().withEncryptionLevel( REQUIRED ).toConfig() );
63+
Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), Config.build().withEncryptionLevel( REQUIRED ).toConfig() );
6464

6565
// Then
6666
assertThat( driver.isEncrypted(), equalTo( true ) );

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.io.IOException;
2525

26+
import org.neo4j.driver.v1.AuthTokens;
2627
import org.neo4j.driver.v1.Driver;
2728
import org.neo4j.driver.v1.GraphDatabase;
2829
import org.neo4j.driver.v1.Session;
@@ -38,13 +39,14 @@
3839
public class LoadCSVIT
3940
{
4041
@Rule
41-
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 ) );
4243

4344
@Test
4445
public void shouldLoadCSV() throws Throwable
4546
{
46-
try( Driver driver = GraphDatabase.driver( neo4j.uri() );
47-
Session session = driver.session() )
47+
try( Driver driver = GraphDatabase.driver( neo4j.uri(),
48+
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
49+
Session session = driver.session() )
4850
{
4951
String csvFileUrl = createLocalIrisData( session );
5052

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import org.junit.Rule;
2222
import org.junit.Test;
2323

24-
import java.net.URI;
25-
24+
import org.neo4j.driver.v1.AuthTokens;
2625
import org.neo4j.driver.v1.Config;
2726
import org.neo4j.driver.v1.Driver;
2827
import org.neo4j.driver.v1.GraphDatabase;
@@ -52,6 +51,7 @@ public void logShouldRecordDebugAndTraceInfo() throws Exception
5251

5352
try( Driver driver = GraphDatabase.driver(
5453
Neo4jRunner.DEFAULT_URI,
54+
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ),
5555
Config.build().withLogging( logging ).toConfig() ) )
5656
{
5757
// 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, 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.none();
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.none();
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(), 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(), config );
1360+
return GraphDatabase.driver( neo4j.uri(), AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
13601361
}
13611362

13621363
private static Config noLoggingConfig()

0 commit comments

Comments
 (0)