Skip to content

Commit 709d070

Browse files
committed
Handle null for AuthToken and Config
1 parent 8a9d15d commit 709d070

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

driver/src/main/java/org/neo4j/driver/v1/GraphDatabase.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ public static Driver driver( String url, AuthToken authToken, Config config )
122122
*/
123123
public static Driver driver( URI url, AuthToken authToken, Config config )
124124
{
125-
return new InternalDriver( url, authToken, config );
125+
AuthToken tokenToUse = authToken != null ? authToken: AuthTokens.none();
126+
Config configToUse = config != null ? config: Config.defaultConfig();
127+
128+
return new InternalDriver( url, tokenToUse, configToUse );
126129
}
127130
}

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

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

24+
import org.neo4j.driver.v1.AuthToken;
25+
import org.neo4j.driver.v1.AuthTokens;
2426
import org.neo4j.driver.v1.Driver;
2527
import org.neo4j.driver.v1.GraphDatabase;
2628
import org.neo4j.driver.v1.Session;
@@ -46,4 +48,34 @@ public void shouldKnowSessionIsClosed() throws Throwable
4648
// Then
4749
assertFalse( session.isOpen() );
4850
}
51+
52+
@Test
53+
public void shouldHandleNullConfig() throws Throwable
54+
{
55+
// Given
56+
Driver driver = GraphDatabase.driver( neo4j.address(), AuthTokens.none(), null );
57+
Session session = driver.session();
58+
59+
// When
60+
session.close();
61+
62+
// Then
63+
assertFalse( session.isOpen() );
64+
}
65+
66+
@SuppressWarnings( "ConstantConditions" )
67+
@Test
68+
public void shouldHandleNullAuthToken() throws Throwable
69+
{
70+
// Given
71+
AuthToken token = null;
72+
Driver driver = GraphDatabase.driver( neo4j.address(), token);
73+
Session session = driver.session();
74+
75+
// When
76+
session.close();
77+
78+
// Then
79+
assertFalse( session.isOpen() );
80+
}
4981
}

0 commit comments

Comments
 (0)