fixed importDocuments, insertDocuments to work with raw Jsons (#91)

Author: Mark

ChangeLog

@@ -1,3 +1,7 @@
+v4.1.7 (2017-01-26)
+---------------------------
+* fixed importDocuments, insertDocuments to work with raw Jsons (issue #91)
+
 v4.1.6 (2017-01-18)
 ---------------------------
 * added serializer support for enclosing types

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

@@ -119,7 +119,7 @@ protected <T> Request insertDocumentsRequest(final Collection<T> values, final D
 				executor.createPath(ArangoDBConstants.PATH_API_DOCUMENT, name));
 		request.putQueryParam(ArangoDBConstants.WAIT_FOR_SYNC, params.getWaitForSync());
 		request.putQueryParam(ArangoDBConstants.RETURN_NEW, params.getReturnNew());
-		request.setBody(executor.serialize(values));
+		request.setBody(util().serialize(values, false, true));
 		return request;
 	}
 
@@ -168,7 +168,7 @@ protected Request importDocumentsRequest(final String values, final DocumentImpo
 
 	protected Request importDocumentsRequest(final Collection<?> values, final DocumentImportOptions options) {
 		return importDocumentsRequest(options).putQueryParam(ArangoDBConstants.TYPE, ImportType.list)
-				.setBody(executor.serialize(values));
+				.setBody(util().serialize(values, false, true));
 	}
 
 	protected Request importDocumentsRequest(final DocumentImportOptions options) {

src/main/java/com/arangodb/util/ArangoUtil.java

@@ -21,6 +21,7 @@
 package com.arangodb.util;
 
 import java.lang.reflect.Type;
+import java.util.Iterator;
 import java.util.Map;
 
 import com.arangodb.ArangoDBException;
@@ -81,17 +82,7 @@ public <T> T deserialize(final VPackSlice vpack, final Type type) throws ArangoD
 	 * @throws ArangoDBException
 	 */
 	public VPackSlice serialize(final Object entity) throws ArangoDBException {
-		try {
-			final VPackSlice vpack;
-			if (String.class.isAssignableFrom(entity.getClass())) {
-				vpack = vpackParser.fromJson((String) entity);
-			} else {
-				vpack = vpacker.serialize(entity);
-			}
-			return vpack;
-		} catch (final VPackException e) {
-			throw new ArangoDBException(e);
-		}
+		return serialize(entity, false);
 	}
 
 	/**
@@ -105,10 +96,37 @@ public VPackSlice serialize(final Object entity) throws ArangoDBException {
 	 * @throws ArangoDBException
 	 */
 	public VPackSlice serialize(final Object entity, final boolean serializeNullValues) throws ArangoDBException {
+		return serialize(entity, serializeNullValues, false);
+	}
+
+	/**
+	 * Serialize a given Object to VelocyPack. If the Object is from type Iterable<String> the String will be
+	 * interpreted as Json
+	 * 
+	 * @param entity
+	 *            The Object to serialize. If it is from type String, it will be handled as a Json.
+	 * @param serializeNullValues
+	 *            Whether or not null values should be excluded from serialization.
+	 * @param stringAsJson
+	 * @return the serialized VelocyPack
+	 * @throws ArangoDBException
+	 */
+	@SuppressWarnings("unchecked")
+	public VPackSlice serialize(final Object entity, final boolean serializeNullValues, final boolean stringAsJson)
+			throws ArangoDBException {
 		try {
 			final VPackSlice vpack;
-			if (String.class.isAssignableFrom(entity.getClass())) {
+			final Class<? extends Object> type = entity.getClass();
+			if (String.class.isAssignableFrom(type)) {
 				vpack = vpackParser.fromJson((String) entity, serializeNullValues);
+			} else if (stringAsJson && Iterable.class.isAssignableFrom(type)) {
+				final Iterator<?> iterator = Iterable.class.cast(entity).iterator();
+				if (iterator.hasNext() && String.class.isAssignableFrom(iterator.next().getClass())) {
+					vpack = vpackParser.fromJson((Iterable<String>) entity, serializeNullValues);
+				} else {
+					final VPack vp = serializeNullValues ? vpackerNull : vpacker;
+					vpack = vp.serialize(entity);
+				}
 			} else {
 				final VPack vp = serializeNullValues ? vpackerNull : vpacker;
 				vpack = vp.serialize(entity);

src/main/java/com/arangodb/velocypack/VPackParser.java

@@ -223,6 +223,26 @@ public VPackSlice fromJson(final String json, final boolean includeNullValues) t
 		return builder.slice();
 	}
 
+	public VPackSlice fromJson(final Iterable<String> jsons) throws VPackException {
+		return fromJson(jsons, false);
+	}
+
+	public VPackSlice fromJson(final Iterable<String> jsons, final boolean includeNullValues) throws VPackException {
+		final VPackBuilder builder = new VPackBuilder();
+		final JSONParser parser = new JSONParser();
+		final ContentHandler contentHandler = new VPackContentHandler(builder, includeNullValues, this);
+		try {
+			builder.add(ValueType.ARRAY);
+			for (final String json : jsons) {
+				parser.parse(json, contentHandler);
+			}
+			builder.close();
+		} catch (final ParseException e) {
+			throw new VPackBuilderException(e);
+		}
+		return builder.slice();
+	}
+
 	private static class VPackContentHandler implements ContentHandler {
 
 		private final VPackBuilder builder;

src/test/java/com/arangodb/ArangoCollectionTest.java

@@ -889,6 +889,21 @@ public void insertDocuments() {
 		assertThat(docs.getErrors().size(), is(0));
 	}
 
+	@Test
+	public void insertDocumentsJson() {
+		final Collection<String> values = new ArrayList<String>();
+		values.add("{}");
+		values.add("{}");
+		values.add("{}");
+		final MultiDocumentEntity<DocumentCreateEntity<String>> docs = db.collection(COLLECTION_NAME)
+				.insertDocuments(values);
+		assertThat(docs, is(notNullValue()));
+		assertThat(docs.getDocuments(), is(notNullValue()));
+		assertThat(docs.getDocuments().size(), is(3));
+		assertThat(docs.getErrors(), is(notNullValue()));
+		assertThat(docs.getErrors().size(), is(0));
+	}
+
 	@Test
 	public void insertDocumentsOne() {
 		final Collection<BaseDocument> values = new ArrayList<BaseDocument>();
@@ -968,6 +983,22 @@ public void importDocuments() {
 		assertThat(docs.getDetails(), is(empty()));
 	}
 
+	@Test
+	public void importDocumentsJsonList() {
+		final Collection<String> values = new ArrayList<String>();
+		values.add("{}");
+		values.add("{}");
+		values.add("{}");
+		final DocumentImportEntity docs = db.collection(COLLECTION_NAME).importDocuments(values);
+		assertThat(docs, is(notNullValue()));
+		assertThat(docs.getCreated(), is(values.size()));
+		assertThat(docs.getEmpty(), is(0));
+		assertThat(docs.getErrors(), is(0));
+		assertThat(docs.getIgnored(), is(0));
+		assertThat(docs.getUpdated(), is(0));
+		assertThat(docs.getDetails(), is(empty()));
+	}
+
 	@Test
 	public void importDocumentsDuplicateDefaultError() {
 		final Collection<BaseDocument> values = new ArrayList<BaseDocument>();