fixed update/replaceDocumets with Json (#98)

Author: Mark

Diff for: ChangeLog

@@ -8,6 +8,7 @@ v4.1.8 (2017-02-xx)
 * improved ArangoDBException with responseCode, errorNum, errorMessage
 * changed ArangoCollection.deleteDocuments() to work with keys and documents
 * fixed URL encoding bug (#97)
+* fixed update/replaceDocumets with Json (#98)
 
 v4.1.7 (2017-01-26)
 ---------------------------

Diff for: src/main/java/com/arangodb/internal/InternalArangoCollection.java

@@ -240,7 +240,7 @@ protected <T> Request replaceDocumentsRequest(final Collection<T> values, final
 		request.putQueryParam(ArangoDBConstants.RETURN_NEW, params.getReturnNew());
 		request.putQueryParam(ArangoDBConstants.RETURN_OLD, params.getReturnOld());
 		request.putHeaderParam(ArangoDBConstants.IF_MATCH, params.getIfMatch());
-		request.setBody(executor.serialize(values));
+		request.setBody(util().serialize(values, false, true));
 		return request;
 	}
 
@@ -334,7 +334,7 @@ protected <T> Request updateDocumentsRequest(final Collection<T> values, final D
 		request.putQueryParam(ArangoDBConstants.RETURN_NEW, params.getReturnNew());
 		request.putQueryParam(ArangoDBConstants.RETURN_OLD, params.getReturnOld());
 		request.putHeaderParam(ArangoDBConstants.IF_MATCH, params.getIfMatch());
-		request.setBody(executor.serialize(values, true));
+		request.setBody(util().serialize(values, true, true));
 		return request;
 	}
 

Diff for: src/test/java/com/arangodb/ArangoCollectionTest.java

@@ -1530,6 +1530,22 @@ public void updateDocumentsWithoutKey() {
 		assertThat(updateResult.getErrors().size(), is(1));
 	}
 
+	@Test
+	public void updateDocumentsJson() {
+		final Collection<String> values = new ArrayList<String>();
+		values.add("{\"_key\":\"1\"}");
+		values.add("{\"_key\":\"2\"}");
+		db.collection(COLLECTION_NAME).insertDocuments(values);
+
+		final Collection<String> updatedValues = new ArrayList<String>();
+		updatedValues.add("{\"_key\":\"1\", \"foo\":\"bar\"}");
+		updatedValues.add("{\"_key\":\"2\", \"foo\":\"bar\"}");
+		final MultiDocumentEntity<DocumentUpdateEntity<String>> updateResult = db.collection(COLLECTION_NAME)
+				.updateDocuments(updatedValues);
+		assertThat(updateResult.getDocuments().size(), is(2));
+		assertThat(updateResult.getErrors().size(), is(0));
+	}
+
 	@Test
 	public void replaceDocuments() {
 		final Collection<BaseDocument> values = new ArrayList<BaseDocument>();
@@ -1596,6 +1612,22 @@ public void replaceDocumentsWithoutKey() {
 		assertThat(updateResult.getErrors().size(), is(1));
 	}
 
+	@Test
+	public void replaceDocumentsJson() {
+		final Collection<String> values = new ArrayList<String>();
+		values.add("{\"_key\":\"1\"}");
+		values.add("{\"_key\":\"2\"}");
+		db.collection(COLLECTION_NAME).insertDocuments(values);
+
+		final Collection<String> updatedValues = new ArrayList<String>();
+		updatedValues.add("{\"_key\":\"1\", \"foo\":\"bar\"}");
+		updatedValues.add("{\"_key\":\"2\", \"foo\":\"bar\"}");
+		final MultiDocumentEntity<DocumentUpdateEntity<String>> updateResult = db.collection(COLLECTION_NAME)
+				.replaceDocuments(updatedValues);
+		assertThat(updateResult.getDocuments().size(), is(2));
+		assertThat(updateResult.getErrors().size(), is(0));
+	}
+
 	@Test
 	public void load() {
 		final CollectionEntity result = db.collection(COLLECTION_NAME).load();