fixes for ArangoDB 3.0.0

Author: a-brandt

src/main/java/com/arangodb/ArangoClient.java

@@ -36,22 +36,16 @@ public ArangoClient(ArangoConfigure configure) {
 		driver = new ArangoDriver(configure);
 	}
 
-	private void importDocumentsImpl(
-		String collectionName,
-		boolean createCollection,
-		List<String> values,
-		ImportResultEntity total) throws ArangoException {
-		ImportResultEntity result = driver.importDocuments(collectionName, createCollection, values);
+	private void importDocumentsImpl(String collectionName, List<String> values, ImportResultEntity total)
+			throws ArangoException {
+		ImportResultEntity result = driver.importDocuments(collectionName, values);
 		total.setCreated(total.getCreated() + result.getCreated());
 		total.setErrors(total.getErrors() + result.getErrors());
 		total.setEmpty(total.getEmpty() + result.getEmpty());
 	}
 
-	public ImportResultEntity importRawJsonDocuments(
-		String collectionName,
-		boolean createCollection,
-		Iterator<String> itr,
-		int bufferCount) throws ArangoException {
+	public ImportResultEntity importRawJsonDocuments(String collectionName, Iterator<String> itr, int bufferCount)
+			throws ArangoException {
 
 		int tmpBufferCount = bufferCount;
 		if (tmpBufferCount <= 0) {
@@ -64,12 +58,12 @@ public ImportResultEntity importRawJsonDocuments(
 		while (itr.hasNext()) {
 			buffers.add(itr.next());
 			if (buffers.size() % tmpBufferCount == 0) {
-				importDocumentsImpl(collectionName, createCollection, buffers, total);
+				importDocumentsImpl(collectionName, buffers, total);
 				buffers.clear();
 			}
 		}
 		if (!buffers.isEmpty()) {
-			importDocumentsImpl(collectionName, createCollection, buffers, total);
+			importDocumentsImpl(collectionName, buffers, total);
 		}
 
 		return total;

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

@@ -1608,18 +1608,6 @@ public <T> DocumentEntity<T> updateDocument(
 			keepNull);
 	}
 
-	/**
-	 * This method returns all document handles from a collection.
-	 *
-	 * @param collectionId
-	 *            The collection id.
-	 * @return List<String> - The list of document handles
-	 * @throws ArangoException
-	 */
-	public List<String> getDocuments(long collectionId) throws ArangoException {
-		return getDocuments(String.valueOf(collectionId), false);
-	}
-
 	/**
 	 * This method returns all document handles from a collection.
 	 *
@@ -1629,35 +1617,7 @@ public List<String> getDocuments(long collectionId) throws ArangoException {
 	 * @throws ArangoException
 	 */
 	public List<String> getDocuments(String collectionName) throws ArangoException {
-		return documentDriver.getDocuments(getDefaultDatabase(), collectionName, false);
-	}
-
-	/**
-	 * This method returns all document handles from a collection.
-	 *
-	 * @param collectionId
-	 *            The collection id.
-	 * @param handleConvert
-	 *            if set to true only the document identifiers are returned
-	 * @return List<String> - The list of document handles
-	 * @throws ArangoException
-	 */
-	public List<String> getDocuments(long collectionId, boolean handleConvert) throws ArangoException {
-		return getDocuments(String.valueOf(collectionId), handleConvert);
-	}
-
-	/**
-	 * This method returns all document handles from a collection.
-	 *
-	 * @param collectionName
-	 *            The collection name.
-	 * @param handleConvert
-	 *            if set to true only the document identifiers are returned
-	 * @return List<String> - The list of document handles
-	 * @throws ArangoException
-	 */
-	public List<String> getDocuments(String collectionName, boolean handleConvert) throws ArangoException {
-		return documentDriver.getDocuments(getDefaultDatabase(), collectionName, handleConvert);
+		return documentDriver.getDocuments(getDefaultDatabase(), collectionName);
 	}
 
 	/**
@@ -3713,36 +3673,29 @@ public List<UserEntity> getUsers() throws ArangoException {
 	 *
 	 * @param collection
 	 *            the collection as a string
-	 * @param createCollection
-	 *            if set to true the collection is created if it does not exist
 	 * @param values
 	 *            a list of Objects that will be stored as documents
 	 * @return ImportResultEntity
 	 * @throws ArangoException
 	 */
-	public ImportResultEntity importDocuments(String collection, Boolean createCollection, Collection<?> values)
-			throws ArangoException {
-		return importDriver.importDocuments(getDefaultDatabase(), collection, createCollection, values);
+	public ImportResultEntity importDocuments(String collection, Collection<?> values) throws ArangoException {
+		return importDriver.importDocuments(getDefaultDatabase(), collection, values);
 	}
 
 	/**
 	 * Creates documents in the collection.
 	 *
 	 * @param collection
 	 *            the collection as a string
-	 * @param createCollection
-	 *            if set to true the collection is created if it does not exist
 	 * @param headerValues
 	 *            a list of lists that will be stored as documents
 	 * @return ImportResultEntity
 	 * @throws ArangoException
 	 */
 	public ImportResultEntity importDocumentsByHeaderValues(
 		String collection,
-		Boolean createCollection,
 		Collection<? extends Collection<?>> headerValues) throws ArangoException {
-		return importDriver.importDocumentsByHeaderValues(getDefaultDatabase(), collection, createCollection,
-			headerValues);
+		return importDriver.importDocumentsByHeaderValues(getDefaultDatabase(), collection, headerValues);
 	}
 
 	/**

src/main/java/com/arangodb/InternalDocumentDriver.java

@@ -59,7 +59,7 @@ DocumentEntity<String> updateDocumentRaw(
 		Boolean waitForSync,
 		Boolean keepNull) throws ArangoException;
 
-	List<String> getDocuments(String database, String collectionName, boolean handleConvert) throws ArangoException;
+	List<String> getDocuments(String database, String collectionName) throws ArangoException;
 
 	long checkDocument(String database, String documentHandle) throws ArangoException;
 

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

@@ -8,8 +8,13 @@
 /**
  * Created by fbartels on 10/27/14.
  */
-public interface InternalImportDriver  extends BaseDriverInterface {
-  ImportResultEntity importDocuments(String database, String collection, Boolean createCollection, Collection<?> values) throws ArangoException;
+public interface InternalImportDriver extends BaseDriverInterface {
+
+	ImportResultEntity importDocuments(String database, String collection, Collection<?> values) throws ArangoException;
+
+	ImportResultEntity importDocumentsByHeaderValues(
+		String database,
+		String collection,
+		Collection<? extends Collection<?>> headerValues) throws ArangoException;
 
-  ImportResultEntity importDocumentsByHeaderValues(String database, String collection, Boolean createCollection, Collection<? extends Collection<?>> headerValues) throws ArangoException;
 }

src/main/java/com/arangodb/entity/CollectionsEntity.java

@@ -16,9 +16,12 @@
 
 package com.arangodb.entity;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.arangodb.util.CollectionUtils;
+
 /**
  * A entity representing a list of ArangoDB collections
  *
@@ -30,30 +33,28 @@ public class CollectionsEntity extends BaseEntity {
 	/**
 	 * The list of collections
 	 */
-	List<CollectionEntity> collections;
-
-	/**
-	 * A map containing the collection names as keys and the collections as
-	 * values
-	 */
-	Map<String, CollectionEntity> names;
+	private List<CollectionEntity> collections;
 
 	public List<CollectionEntity> getCollections() {
 		return collections;
 	}
 
 	public Map<String, CollectionEntity> getNames() {
+		Map<String, CollectionEntity> names = new HashMap<String, CollectionEntity>();
+
+		if (CollectionUtils.isNotEmpty(collections)) {
+			for (CollectionEntity collectionEntity : collections) {
+				names.put(collectionEntity.getName(), collectionEntity);
+			}
+		}
+
 		return names;
 	}
 
 	public void setCollections(List<CollectionEntity> collections) {
 		this.collections = collections;
 	}
 
-	public void setNames(Map<String, CollectionEntity> names) {
-		this.names = names;
-	}
-
 	@Override
 	public String toString() {
 		return "CollectionsEntity [collections=" + collections + "]";

src/main/java/com/arangodb/entity/EntityDeserializers.java

@@ -537,9 +537,8 @@ public CollectionEntity deserialize(JsonElement json, Type typeOfT, JsonDeserial
 	public static class CollectionsEntityDeserializer implements JsonDeserializer<CollectionsEntity> {
 		private Type collectionsType = new TypeToken<List<CollectionEntity>>() {
 		}.getType();
-		private Type namesType = new TypeToken<Map<String, CollectionEntity>>() {
-		}.getType();
 
+		@SuppressWarnings("unchecked")
 		@Override
 		public CollectionsEntity deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
 
@@ -550,11 +549,10 @@ public CollectionsEntity deserialize(JsonElement json, Type typeOfT, JsonDeseria
 			JsonObject obj = json.getAsJsonObject();
 			CollectionsEntity entity = deserializeBaseParameter(obj, new CollectionsEntity());
 
-			if (obj.has(COLLECTIONS)) {
-				entity.collections = context.deserialize(obj.get(COLLECTIONS), collectionsType);
-			}
-			if (obj.has("names")) {
-				entity.names = context.deserialize(obj.get("names"), namesType);
+			if (obj.has(RESULT)) {
+				entity.setCollections((List<CollectionEntity>) context.deserialize(obj.get(RESULT), collectionsType));
+			} else {
+				entity.setCollections(new ArrayList<CollectionEntity>());
 			}
 
 			return entity;

src/main/java/com/arangodb/entity/EntityFactory.java

@@ -59,6 +59,7 @@ public static GsonBuilder getGsonBuilder() {
 				.setFieldNamingStrategy(new ArangoFieldNamingStrategy())
 				.registerTypeAdapter(CollectionStatus.class, new CollectionStatusTypeAdapter())
 				.registerTypeAdapter(CollectionEntity.class, new EntityDeserializers.CollectionEntityDeserializer())
+				.registerTypeAdapter(CollectionsEntity.class, new EntityDeserializers.CollectionsEntityDeserializer())
 				.registerTypeAdapter(DocumentEntity.class, new EntityDeserializers.DocumentEntityDeserializer())
 				.registerTypeAdapter(DocumentsEntity.class, new EntityDeserializers.DocumentsEntityDeserializer())
 				.registerTypeAdapter(AqlFunctionsEntity.class, new EntityDeserializers.AqlfunctionsEntityDeserializer())

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

@@ -205,31 +205,14 @@ public DocumentEntity<String> updateDocumentRaw(
 	}
 
 	@Override
-	public List<String> getDocuments(String database, String collectionName, boolean handleConvert)
-			throws ArangoException {
-
-		// HttpResponseEntity res =
-		// httpManager.doGet(createDocumentEndpointUrl(database),
-		// new MapBuilder("collection", collectionName).get());
-
+	public List<String> getDocuments(String database, String collectionName) throws ArangoException {
 		HttpResponseEntity res = httpManager.doPut(createEndpointUrl(database, "/_api/simple/all-keys"), null,
-			EntityFactory.toJsonString(new MapBuilder().put("collection", collectionName).get()));
+			EntityFactory.toJsonString(new MapBuilder().put("collection", collectionName).put("type", "id").get()));
 
 		@SuppressWarnings("unchecked")
 		CursorEntity<String> tmp = createEntity(res, CursorEntity.class, String.class);
 
 		return tmp.getResults();
-		//
-		//
-		// DocumentResultEntity entity = createEntity(res,
-		// DocumentResultEntity.class);
-		// List<String> documents =
-		// CollectionUtils.safety(entity.getDocuments());
-		//
-		// if (handleConvert && !documents.isEmpty()) {
-		// updateDocumentHandles(documents);
-		// }
-		// return documents;
 	}
 
 	private void updateDocumentHandles(List<String> documents) {

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

@@ -39,15 +39,11 @@ public class InternalImportDriverImpl extends BaseArangoDriverImpl implements co
 	}
 
 	@Override
-	public ImportResultEntity importDocuments(
-		String database,
-		String collection,
-		Boolean createCollection,
-		Collection<?> values) throws ArangoException {
+	public ImportResultEntity importDocuments(String database, String collection, Collection<?> values)
+			throws ArangoException {
 
-		HttpResponseEntity res = httpManager.doPost(
-			createEndpointUrl(database, "/_api/import"), new MapBuilder().put("collection", collection)
-					.put("createCollection", createCollection).put("type", "array").get(),
+		HttpResponseEntity res = httpManager.doPost(createEndpointUrl(database, "/_api/import"),
+			new MapBuilder().put("collection", collection).put("type", "array").get(),
 			EntityFactory.toJsonString(values));
 
 		return createEntity(res, ImportResultEntity.class);
@@ -58,12 +54,10 @@ public ImportResultEntity importDocuments(
 	public ImportResultEntity importDocumentsByHeaderValues(
 		String database,
 		String collection,
-		Boolean createCollection,
 		Collection<? extends Collection<?>> headerValues) throws ArangoException {
 
 		HttpResponseEntity res = httpManager.doPost(createEndpointUrl(database, "/_api/import"),
-			new MapBuilder().put("collection", collection).put("createCollection", createCollection).get(),
-			EntityFactory.toImportHeaderValues(headerValues));
+			new MapBuilder().put("collection", collection).get(), EntityFactory.toImportHeaderValues(headerValues));
 
 		return createEntity(res, ImportResultEntity.class);