Merge pull request #141 from neo4j/1.0-stmt-map

Add additional constructor to Statement to make it match `run` signature

Author: pontusmelke

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

@@ -44,15 +44,34 @@ public class Statement
     private final String text;
     private final Value parameters;
 
+    /**
+     * Create a new statement.
+     * @param text the statement text
+     * @param parameters the statement parameters
+     */
     public Statement( String text, Value parameters )
     {
         this.text = text;
         this.parameters = parameters == null ? Values.EmptyMap : parameters;
     }
 
+    /**
+     * Create a new statement.
+     * @param text the statement text
+     * @param parameters the statement parameters
+     */
+    public Statement( String text, Map<String, Object> parameters )
+    {
+        this( text, Values.value( parameters ) );
+    }
+
+    /**
+     * Create a new statement.
+     * @param text the statement text
+     */
     public Statement( String text )
     {
-        this( text, null );
+        this( text, Values.EmptyMap );
     }
 
     /**
@@ -89,6 +108,15 @@ public Statement withParameters( Value newParameters )
         return new Statement( text, newParameters );
     }
 
+    /**
+     * @param newParameters the new statement's parameters
+     * @return a new statement with updated parameters
+     */
+    public Statement withParameters( Map<String, Object> newParameters )
+    {
+        return new Statement( text, newParameters );
+    }
+
     /**
      * Create a new statement with new parameters derived by updating this'
      * statement's parameters using the given updates.

driver/src/test/java/org/neo4j/driver/v1/StatementTest.java

@@ -20,6 +20,9 @@
 
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 import static org.neo4j.driver.v1.Values.parameters;
@@ -54,21 +57,6 @@ public void shouldConstructStatementWithNoParameters()
         assertThat( statement.parameters(), equalTo( Values.EmptyMap ) );
     }
 
-    @Test
-    public void shouldConstructStatementWithNullParameters()
-    {
-        // given
-        String text = "MATCH (n) RETURN n";
-
-        // when
-        Statement statement = new Statement( text, null );
-
-        // then
-        assertThat( statement.text(), equalTo( text ) );
-        assertThat( statement.parameters(), equalTo( Values.EmptyMap ) );
-    }
-
-
     @Test
     public void shouldUpdateStatementText()
     {
@@ -96,6 +84,19 @@ public void shouldReplaceStatementParameters()
         assertThat( statement.parameters(), equalTo( initialParameters ) );
     }
 
+    @Test
+    public void shouldReplaceMapParameters()
+    {
+        // when
+        String text = "MATCH (n) RETURN n";
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put( "a", 1 );
+        Statement statement = new Statement( "MATCH (n) RETURN n" ).withParameters( parameters );
+
+        // then
+        assertThat( statement.text(), equalTo( text ) );
+        assertThat( statement.parameters(), equalTo( Values.value( parameters ) ) );
+    }
 
     @Test
     public void shouldUpdateStatementParameters()