Handle null params in tx.run

Author: pontusmelke

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

@@ -35,6 +35,7 @@
 import org.neo4j.driver.v1.types.TypeSystem;
 
 import static org.neo4j.driver.v1.Values.ofValue;
+import static org.neo4j.driver.v1.Values.value;
 
 public class InternalTransaction implements Transaction
 {
@@ -142,14 +143,15 @@ public StatementResult run( String statementText )
     @Override
     public StatementResult run( String statementText, Map<String,Object> statementParameters )
     {
-        return run( statementText, Values.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/TransactionIT.java

@@ -22,6 +22,9 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import java.util.Map;
+
+import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.StatementResult;
 import org.neo4j.driver.v1.Transaction;
 import org.neo4j.driver.v1.Value;
@@ -164,4 +167,48 @@ public void shouldHandleFailureAfterClosingTransaction()
         session.run("CREAT (n) RETURN n").consume();
     }
 
+    @SuppressWarnings( "ConstantConditions" )
+    @Test
+    public void shouldHandleNullRecordParameters() throws Throwable
+    {
+        // When
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            Record params = null;
+            tx.run( "CREATE (n:FirstNode)", params );
+            tx.success();
+        }
+
+        // Then it wasn't the end of the world as we know it
+    }
+
+    @SuppressWarnings( "ConstantConditions" )
+    @Test
+    public void shouldHandleNullValueParameters() throws Throwable
+    {
+        // When
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            Value params = null;
+            tx.run( "CREATE (n:FirstNode)", params );
+            tx.success();
+        }
+
+        // Then it wasn't the end of the world as we know it
+    }
+
+    @SuppressWarnings( "ConstantConditions" )
+    @Test
+    public void shouldHandleNullMapParameters() throws Throwable
+    {
+        // When
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            Map<String, Object> params = null;
+            tx.run( "CREATE (n:FirstNode)", params );
+            tx.success();
+        }
+
+        // Then it wasn't the end of the world as we know it
+    }
 }