Skip to content

Commit 77f3a63

Browse files
pontusmelkepontusmelke
committed
Merge remote-tracking branch 'upstream/1.0' into 1.1
2 parents 1fdf441 + 42f7248 commit 77f3a63

File tree

7 files changed

+105
-89
lines changed

7 files changed

+105
-89
lines changed

‎driver/src/main/java/org/neo4j/driver/v1/Values.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public static Value value( Object value )
8080
if ( value instanceof Float ) { return value( (float) value ); }
8181

8282
if ( value instanceof List<?> ) { return value( (List<Object>) value ); }
83-
if ( value instanceof Iterable<?> ) { return value( (Iterable<Object>) value ); }
8483
if ( value instanceof Map<?, ?> ) { return value( (Map<String,Object>) value ); }
84+
if ( value instanceof Iterable<?> ) { return value( (Iterable<Object>) value ); }
8585
if ( value instanceof Iterator<?> ) { return value( (Iterator<Object>) value ); }
8686

8787
if ( value instanceof boolean[] ) { return value( (boolean[]) value ); }

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ public void basicCredentialsShouldWork() throws Throwable
5656
String password = "secret";
5757
enableAuth( password );
5858

59-
Driver driver = GraphDatabase.driver( neo4j.uri(),
59+
// When & Then
60+
try( Driver driver = GraphDatabase.driver( neo4j.uri(),
6061
basic("neo4j", password ) );
61-
62-
// When
63-
Session session = driver.session();
64-
Value single = session.run( "RETURN 1" ).single().get(0);
65-
66-
// Then
67-
assertThat( single.asLong(), equalTo( 1L ) );
62+
Session session = driver.session() )
63+
{
64+
Value single = session.run( "RETURN 1" ).single().get( 0 );
65+
assertThat( single.asLong(), equalTo( 1L ) );
66+
}
6867
}
6968

69+
@SuppressWarnings( "EmptyTryBlock" )
7070
@Test
7171
public void shouldGetHelpfulErrorOnInvalidCredentials() throws Throwable
7272
{
@@ -79,7 +79,10 @@ public void shouldGetHelpfulErrorOnInvalidCredentials() throws Throwable
7979
exception.expectMessage( "The client is unauthorized due to authentication failure." );
8080

8181
// When
82-
GraphDatabase.driver( neo4j.uri(), basic("thisisnotthepassword", password ) ).session();
82+
try( Driver driver = GraphDatabase.driver( neo4j.uri(), basic("thisisnotthepassword", password ) );
83+
Session ignored = driver.session() ) {
84+
//empty
85+
}
8386
}
8487

8588
private void enableAuth( String password ) throws Exception
@@ -88,15 +91,16 @@ private void enableAuth( String password ) throws Exception
8891
.updateWith( Neo4jSettings.AUTH_ENABLED, "true" )
8992
.updateWith( Neo4jSettings.DATA_DIR, tempDir.getRoot().getAbsolutePath().replace("\\", "/") ));
9093

91-
Driver setPassword = GraphDatabase.driver( neo4j.uri(), new InternalAuthToken(
92-
parameters(
94+
try ( Driver setPassword =
95+
GraphDatabase.driver( neo4j.uri(), new InternalAuthToken(
96+
parameters(
9397
"scheme", "basic",
9498
"principal", "neo4j",
9599
"credentials", "neo4j",
96100
"new_credentials", password ).asMap( ofValue()) ) );
97-
Session sess = setPassword.session();
98-
sess.run( "RETURN 1" ).consume();
99-
sess.close();
100-
setPassword.close();
101+
Session sess = setPassword.session() )
102+
{
103+
sess.run( "RETURN 1" ).consume();
104+
}
101105
}
102106
}

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.neo4j.driver.v1.Config;
2828
import org.neo4j.driver.v1.Driver;
2929
import org.neo4j.driver.v1.GraphDatabase;
30+
import org.neo4j.driver.v1.Session;
3031
import org.neo4j.driver.v1.StatementResult;
3132
import org.neo4j.driver.v1.Transaction;
3233
import org.neo4j.driver.v1.exceptions.ClientException;
@@ -118,10 +119,8 @@ public void shouldExplainConnectionError() throws Throwable
118119
"and that there is a working network connection to it." );
119120

120121
// When
121-
try ( Driver driver = GraphDatabase.driver( "bolt://localhost:7777" ) )
122-
{
123-
driver.session();
124-
}
122+
try ( Driver driver = GraphDatabase.driver( "bolt://localhost:7777" );
123+
Session session = driver.session()) {}
125124
}
126125

127126
@Test
@@ -156,16 +155,18 @@ public void shouldGetHelpfulErrorWhenTryingToConnectToHttpPort() throws Throwabl
156155
// Given
157156
//the http server needs some time to start up
158157
Thread.sleep( 2000 );
159-
Driver driver = GraphDatabase.driver( "bolt://localhost:7474", Config.build().withEncryptionLevel(
160-
Config.EncryptionLevel.NONE ).toConfig());
161-
162-
// Expect
163-
exception.expect( ClientException.class );
164-
exception.expectMessage( "Server responded HTTP. Make sure you are not trying to connect to the http endpoint " +
165-
"(HTTP defaults to port 7474 whereas BOLT defaults to port 7687)" );
166-
167-
// When
168-
driver.session();
158+
try( Driver driver = GraphDatabase.driver( "bolt://localhost:7474",
159+
Config.build().withEncryptionLevel( Config.EncryptionLevel.NONE ).toConfig() ) )
160+
{
161+
// Expect
162+
exception.expect( ClientException.class );
163+
exception.expectMessage(
164+
"Server responded HTTP. Make sure you are not trying to connect to the http endpoint " +
165+
"(HTTP defaults to port 7474 whereas BOLT defaults to port 7687)" );
166+
167+
// When
168+
try(Session session = driver.session() ){}
169+
}
169170
}
170171

171172
}

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

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,27 @@ public class LoadCSVIT
4343
@Test
4444
public void shouldLoadCSV() throws Throwable
4545
{
46-
// Given
47-
Driver driver = GraphDatabase.driver( neo4j.uri() );
48-
Session session = driver.session();
49-
String csvFileUrl = createLocalIrisData( session );
50-
51-
// When
52-
StatementResult result = session.run(
53-
"USING PERIODIC COMMIT 40\n" +
54-
"LOAD CSV WITH HEADERS FROM {csvFileUrl} AS l\n" +
55-
"MATCH (c:Class {name: l.class_name})\n" +
56-
"CREATE (s:Sample {sepal_length: l.sepal_length, sepal_width: l.sepal_width, petal_length: l.petal_length, petal_width: l.petal_width})\n" +
57-
"CREATE (c)<-[:HAS_CLASS]-(s) " +
58-
"RETURN count(*) AS c",
59-
parameters( "csvFileUrl", csvFileUrl ) );
60-
61-
62-
// Then
63-
assertThat( result.next().get( "c" ).asInt(), equalTo( 150 ) );
64-
assertFalse( result.hasNext() );
46+
try( Driver driver = GraphDatabase.driver( neo4j.uri() );
47+
Session session = driver.session() )
48+
{
49+
String csvFileUrl = createLocalIrisData( session );
50+
51+
// When
52+
StatementResult result = session.run(
53+
"USING PERIODIC COMMIT 40\n" +
54+
"LOAD CSV WITH HEADERS FROM {csvFileUrl} AS l\n" +
55+
"MATCH (c:Class {name: l.class_name})\n" +
56+
"CREATE (s:Sample {sepal_length: l.sepal_length, sepal_width: l.sepal_width, petal_length: l.petal_length, petal_width: l.petal_width})\n" +
57+
58+
"CREATE (c)<-[:HAS_CLASS]-(s) " +
59+
"RETURN count(*) AS c",
60+
parameters( "csvFileUrl", csvFileUrl ) );
61+
62+
63+
// Then
64+
assertThat( result.next().get( "c" ).asInt(), equalTo( 150 ) );
65+
assertFalse( result.hasNext() );
66+
}
6567
}
6668

6769
private String createLocalIrisData( Session session ) throws IOException

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
*/
1919
package org.neo4j.driver.v1.integration;
2020

21-
import java.net.URI;
22-
2321
import org.junit.Rule;
2422
import org.junit.Test;
2523

26-
import org.neo4j.driver.v1.Logger;
27-
import org.neo4j.driver.v1.Logging;
24+
import java.net.URI;
25+
2826
import org.neo4j.driver.v1.Config;
2927
import org.neo4j.driver.v1.Driver;
3028
import org.neo4j.driver.v1.GraphDatabase;
29+
import org.neo4j.driver.v1.Logger;
30+
import org.neo4j.driver.v1.Logging;
3131
import org.neo4j.driver.v1.Session;
3232
import org.neo4j.driver.v1.util.Neo4jRunner;
3333
import org.neo4j.driver.v1.util.TestNeo4j;
@@ -49,19 +49,21 @@ public void logShouldRecordDebugAndTraceInfo() throws Exception
4949
// Given
5050
Logging logging = mock( Logging.class );
5151
Logger logger = mock( Logger.class );
52-
Driver driver = GraphDatabase.driver(
53-
Neo4jRunner.DEFAULT_URI,
54-
Config.build().withLogging( logging ).toConfig() );
5552

56-
// When
57-
when( logging.getLog( anyString() ) ).thenReturn( logger );
58-
when( logger.isDebugEnabled() ).thenReturn( true );
59-
when( logger.isTraceEnabled() ).thenReturn( true );
60-
Session session = driver.session();
61-
session.run( "CREATE (a {name:'Cat'})" );
53+
try( Driver driver = GraphDatabase.driver(
54+
Neo4jRunner.DEFAULT_URI,
55+
Config.build().withLogging( logging ).toConfig() ) )
56+
{
57+
// When
58+
when( logging.getLog( anyString() ) ).thenReturn( logger );
59+
when( logger.isDebugEnabled() ).thenReturn( true );
60+
when( logger.isTraceEnabled() ).thenReturn( true );
6261

63-
session.close();
64-
driver.close();
62+
try( Session session = driver.session() )
63+
{
64+
session.run( "CREATE (a {name:'Cat'})" );
65+
}
66+
}
6567

6668
// Then
6769
verify( logger, atLeastOnce() ).debug( anyString() );

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

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,32 @@ public class SessionIT
4848
public void shouldKnowSessionIsClosed() throws Throwable
4949
{
5050
// Given
51-
Driver driver = GraphDatabase.driver( neo4j.uri() );
52-
Session session = driver.session();
51+
try( Driver driver = GraphDatabase.driver( neo4j.uri() ); )
52+
{
53+
Session session = driver.session();
5354

54-
// When
55-
session.close();
55+
// When
56+
session.close();
5657

57-
// Then
58-
assertFalse( session.isOpen() );
58+
// Then
59+
assertFalse( session.isOpen() );
60+
}
5961
}
6062

6163
@Test
6264
public void shouldHandleNullConfig() throws Throwable
6365
{
6466
// Given
65-
Driver driver = GraphDatabase.driver( neo4j.uri(), AuthTokens.none(), null );
66-
Session session = driver.session();
67+
try( Driver driver = GraphDatabase.driver( neo4j.uri(), AuthTokens.none(), null ) )
68+
{
69+
Session session = driver.session();
6770

68-
// When
69-
session.close();
71+
// When
72+
session.close();
7073

71-
// Then
72-
assertFalse( session.isOpen() );
74+
// Then
75+
assertFalse( session.isOpen() );
76+
}
7377
}
7478

7579
@SuppressWarnings( "ConstantConditions" )
@@ -78,14 +82,16 @@ public void shouldHandleNullAuthToken() throws Throwable
7882
{
7983
// Given
8084
AuthToken token = null;
81-
Driver driver = GraphDatabase.driver( neo4j.uri(), token);
82-
Session session = driver.session();
85+
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), token) )
86+
{
87+
Session session = driver.session();
8388

84-
// When
85-
session.close();
89+
// When
90+
session.close();
8691

87-
// Then
88-
assertFalse( session.isOpen() );
92+
// Then
93+
assertFalse( session.isOpen() );
94+
}
8995
}
9096

9197
@Test

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.neo4j.driver.internal.net.BoltServerAddress;
3939
import org.neo4j.driver.v1.*;
4040
import org.neo4j.driver.internal.util.CertificateTool;
41+
4142
import org.neo4j.driver.v1.util.CertificateToolTest;
4243
import org.neo4j.driver.v1.util.Neo4jRunner;
4344
import org.neo4j.driver.v1.util.Neo4jSettings;
@@ -257,12 +258,12 @@ public void shouldEstablishTLSConnection() throws Throwable
257258

258259
Config config = Config.build().withEncryptionLevel( Config.EncryptionLevel.REQUIRED ).toConfig();
259260

260-
Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, config );
261-
262-
StatementResult result = driver.session().run( "RETURN 1" );
263-
assertEquals( 1, result.next().get( 0 ).asInt() );
264-
assertFalse( result.hasNext() );
265-
266-
driver.close();
261+
try( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, config );
262+
Session session = driver.session() )
263+
{
264+
StatementResult result = session.run( "RETURN 1" );
265+
assertEquals( 1, result.next().get( 0 ).asInt() );
266+
assertFalse( result.hasNext() );
267+
}
267268
}
268269
}

0 commit comments

Comments
 (0)