Handle null params in session.run

Author: pontusmelke

driver/src/main/java/org/neo4j/driver/internal/InternalSession.java

@@ -69,14 +69,15 @@ public StatementResult run( String statementText )
     @Override
     public StatementResult run( String statementText, Map<String, Object> statementParameters )
     {
-        return run( statementText, value( statementParameters ) );
+        Value params = statementParameters == null ? Values.EmptyMap : value(statementParameters);
+        return run( statementText, params );
     }
 
     @Override
     public StatementResult run( String statementTemplate, Record statementParameters )
     {
-        // TODO: This conversion to map here is pointless, it gets converted right back
-        return run( statementTemplate, statementParameters.asMap() );
+        Value params = statementParameters == null ? Values.EmptyMap : value( statementParameters.asMap() );
+        return run( statementTemplate, params );
     }
 
     @Override

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

@@ -24,6 +24,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.StatementResult;
@@ -74,6 +75,45 @@ public void shouldRunWithParameters() throws Throwable
         // Then nothing should've failed
     }
 
+    @SuppressWarnings( "ConstantConditions" )
+    @Test
+    public void shouldRunWithNullValuesAsParameters() throws Throwable
+    {
+        // Given
+        Value params = null;
+
+        // When
+        session.run( "CREATE (n:FirstNode {name:'Steven'})", params );
+
+        // Then nothing should've failed
+    }
+
+    @SuppressWarnings( "ConstantConditions" )
+    @Test
+    public void shouldRunWithNullRecordAsParameters() throws Throwable
+    {
+        // Given
+        Record params = null;
+
+        // When
+        session.run( "CREATE (n:FirstNode {name:'Steven'})", params );
+
+        // Then nothing should've failed
+    }
+
+    @SuppressWarnings( "ConstantConditions" )
+    @Test
+    public void shouldRunWithNullMapAsParameters() throws Throwable
+    {
+        // Given
+        Map<String, Object> params = null;
+
+        // When
+        session.run( "CREATE (n:FirstNode {name:'Steven'})", params );
+
+        // Then nothing should've failed
+    }
+
     @Test
     public void shouldRunWithCollectionAsParameter() throws Throwable
     {