Fix serialization of bind parameter with null values (Issue #177)

Author: mpv1989

ChangeLog

@@ -1,5 +1,7 @@
 v4.3.4 (2018-xx-xx)
 ---------------------------
+
+* fixed serialization of bind parameter with null values (Issue #177)
 * made ErrorEntity serializable (Issue #178)
 * fixed VelocyStream multi-thread authentication bug
 

src/main/java/com/arangodb/internal/InternalArangoDatabase.java

@@ -50,6 +50,7 @@
 import com.arangodb.model.TraversalOptions;
 import com.arangodb.model.UserAccessOptions;
 import com.arangodb.util.ArangoSerialization;
+import com.arangodb.util.ArangoSerializer;
 import com.arangodb.velocypack.Type;
 import com.arangodb.velocypack.VPackSlice;
 import com.arangodb.velocypack.exception.VPackException;
@@ -174,8 +175,9 @@ protected Request queryRequest(
 		final String query,
 		final Map<String, Object> bindVars,
 		final AqlQueryOptions options) {
-		return new Request(name, RequestType.POST, ArangoDBConstants.PATH_API_CURSOR).setBody(
-			util().serialize(OptionsBuilder.build(options != null ? options : new AqlQueryOptions(), query, bindVars)));
+		return new Request(name, RequestType.POST, ArangoDBConstants.PATH_API_CURSOR).setBody(util().serialize(
+			OptionsBuilder.build(options != null ? options : new AqlQueryOptions(), query, bindVars != null
+					? util().serialize(bindVars, new ArangoSerializer.Options().serializeNullValues(true)) : null)));
 	}
 
 	protected Request queryNextRequest(final String id) {

src/main/java/com/arangodb/model/AqlQueryOptions.java

@@ -21,7 +21,8 @@
 package com.arangodb.model;
 
 import java.util.Collection;
-import java.util.Map;
+
+import com.arangodb.velocypack.VPackSlice;
 
 /**
  * @author Mark Vollmary
@@ -36,7 +37,7 @@ public class AqlQueryOptions {
 	private Integer batchSize;
 	private Boolean cache;
 	private Long memoryLimit;
-	private Map<String, Object> bindVars;
+	private VPackSlice bindVars;
 	private String query;
 	private Options options;
 
@@ -126,7 +127,7 @@ public AqlQueryOptions cache(final Boolean cache) {
 		return this;
 	}
 
-	protected Map<String, Object> getBindVars() {
+	protected VPackSlice getBindVars() {
 		return bindVars;
 	}
 
@@ -135,7 +136,7 @@ protected Map<String, Object> getBindVars() {
 	 *            key/value pairs representing the bind parameters
 	 * @return options
 	 */
-	protected AqlQueryOptions bindVars(final Map<String, Object> bindVars) {
+	protected AqlQueryOptions bindVars(final VPackSlice bindVars) {
 		this.bindVars = bindVars;
 		return this;
 	}

src/main/java/com/arangodb/model/OptionsBuilder.java

@@ -25,6 +25,7 @@
 
 import com.arangodb.entity.EdgeDefinition;
 import com.arangodb.entity.Permissions;
+import com.arangodb.velocypack.VPackSlice;
 
 /**
  * @author Mark Vollmary
@@ -64,10 +65,7 @@ public static CollectionCreateOptions build(final CollectionCreateOptions option
 		return options.name(name);
 	}
 
-	public static AqlQueryOptions build(
-		final AqlQueryOptions options,
-		final String query,
-		final Map<String, Object> bindVars) {
+	public static AqlQueryOptions build(final AqlQueryOptions options, final String query, final VPackSlice bindVars) {
 		return options.query(query).bindVars(bindVars);
 	}
 

src/test/java/com/arangodb/ArangoDatabaseTest.java

@@ -791,6 +791,18 @@ public void queryNoResults() throws IOException {
 		}
 	}
 
+	@Test
+	public void queryWithNullBindParam() throws IOException {
+		try {
+			db.createCollection(COLLECTION_NAME);
+			final ArangoCursor<BaseDocument> cursor = db.query("FOR i IN @@col FILTER i.test == @test RETURN i",
+				new MapBuilder().put("@col", COLLECTION_NAME).put("test", null).get(), null, BaseDocument.class);
+			cursor.close();
+		} finally {
+			db.collection(COLLECTION_NAME).drop();
+		}
+	}
+
 	@Test
 	public void explainQuery() {
 		final AqlExecutionExplainEntity explain = arangoDB.db().explainQuery("for i in 1..1 return i", null, null);