added import options and raw import

Author: a-brandt

src/main/java/com/arangodb/ArangoDriver.java

@@ -81,6 +81,8 @@
 import com.arangodb.util.GraphEdgesOptions;
 import com.arangodb.util.GraphQueryUtil;
 import com.arangodb.util.GraphVerticesOptions;
+import com.arangodb.util.ImportOptions;
+import com.arangodb.util.ImportOptionsRaw;
 import com.arangodb.util.MapBuilder;
 import com.arangodb.util.ShortestPathOptions;
 import com.arangodb.util.TraversalQueryOptions;
@@ -2964,7 +2966,7 @@ public List<UserEntity> getUsers() throws ArangoException {
 	}
 
 	/**
-	 * Creates documents in the collection.
+	 * Creates documents in a collection.
 	 *
 	 * @param collection
 	 *            the collection as a string
@@ -2975,7 +2977,45 @@ public List<UserEntity> getUsers() throws ArangoException {
 	 */
 	public ImportResultEntity importDocuments(final String collection, final Collection<?> values)
 			throws ArangoException {
-		return importDriver.importDocuments(getDefaultDatabase(), collection, values);
+		return importDriver.importDocuments(getDefaultDatabase(), collection, values, new ImportOptions());
+	}
+
+	/**
+	 * Creates documents in a collection.
+	 *
+	 * @param collection
+	 *            the collection as a string
+	 * @param values
+	 *            a list of Objects that will be stored as documents
+	 * @param importOptions
+	 *            options for importing documents
+	 * @return ImportResultEntity
+	 * @throws ArangoException
+	 */
+	public ImportResultEntity importDocuments(
+		final String collection,
+		final Collection<?> values,
+		final ImportOptions importOptions) throws ArangoException {
+		return importDriver.importDocuments(getDefaultDatabase(), collection, values, importOptions);
+	}
+
+	/**
+	 * Creates documents in a collection.
+	 *
+	 * @param collection
+	 *            the collection as a string
+	 * @param values
+	 *            a raw string containing JSON data
+	 * @param importOptions
+	 *            options for importing documents
+	 * @return ImportResultEntity
+	 * @throws ArangoException
+	 */
+	public ImportResultEntity importDocumentsRaw(
+		final String collection,
+		final String values,
+		final ImportOptionsRaw importOptionsRaw) throws ArangoException {
+		return importDriver.importDocumentsRaw(getDefaultDatabase(), collection, values, importOptionsRaw);
 	}
 
 	/**

src/main/java/com/arangodb/InternalImportDriver.java

@@ -4,13 +4,25 @@
 
 import com.arangodb.entity.ImportResultEntity;
 import com.arangodb.impl.BaseDriverInterface;
+import com.arangodb.util.ImportOptions;
+import com.arangodb.util.ImportOptionsRaw;
 
 /**
  * Created by fbartels on 10/27/14.
  */
 public interface InternalImportDriver extends BaseDriverInterface {
 
-	ImportResultEntity importDocuments(String database, String collection, Collection<?> values) throws ArangoException;
+	ImportResultEntity importDocuments(
+		String database,
+		String collection,
+		Collection<?> values,
+		ImportOptions importOptions) throws ArangoException;
+
+	ImportResultEntity importDocumentsRaw(
+		String database,
+		String collection,
+		String values,
+		ImportOptionsRaw importOptionsRaw) throws ArangoException;
 
 	ImportResultEntity importDocumentsByHeaderValues(
 		String database,

src/main/java/com/arangodb/impl/InternalImportDriverImpl.java

@@ -17,13 +17,16 @@
 package com.arangodb.impl;
 
 import java.util.Collection;
+import java.util.Map;
 
 import com.arangodb.ArangoConfigure;
 import com.arangodb.ArangoException;
 import com.arangodb.entity.EntityFactory;
 import com.arangodb.entity.ImportResultEntity;
 import com.arangodb.http.HttpManager;
 import com.arangodb.http.HttpResponseEntity;
+import com.arangodb.util.ImportOptions;
+import com.arangodb.util.ImportOptionsRaw;
 import com.arangodb.util.MapBuilder;
 
 /**
@@ -39,12 +42,37 @@ public class InternalImportDriverImpl extends BaseArangoDriverImpl implements co
 	}
 
 	@Override
-	public ImportResultEntity importDocuments(String database, String collection, Collection<?> values)
-			throws ArangoException {
+	public ImportResultEntity importDocuments(
+		String database,
+		String collection,
+		Collection<?> values,
+		ImportOptions importOptions) throws ArangoException {
 
-		HttpResponseEntity res = httpManager.doPost(createEndpointUrl(database, "/_api/import"),
-			new MapBuilder().put(COLLECTION, collection).put("type", "array").get(),
-			EntityFactory.toJsonString(values));
+		Map<String, Object> map = importOptions.toMap();
+		map.put("type", "list");
+
+		return importDocumentsInternal(database, collection, EntityFactory.toJsonString(values), map);
+	}
+
+	@Override
+	public ImportResultEntity importDocumentsRaw(
+		String database,
+		String collection,
+		String values,
+		ImportOptionsRaw importOptionsRaw) throws ArangoException {
+
+		return importDocumentsInternal(database, collection, values, importOptionsRaw.toMap());
+	}
+
+	public ImportResultEntity importDocumentsInternal(
+		String database,
+		String collection,
+		String values,
+		Map<String, Object> importOptions) throws ArangoException {
+
+		importOptions.put(COLLECTION, collection);
+
+		HttpResponseEntity res = httpManager.doPost(createEndpointUrl(database, "/_api/import"), importOptions, values);
 
 		return createEntity(res, ImportResultEntity.class);