Merge branch '3.0' of https://github.com/arangodb/arangodb-java-driver into 3.0

Author: a-brandt

ChangeLog

@@ -1,7 +1,13 @@
-v3.0.0 (2016-XX-XX)
+v3.0.0 (2016-06-17)
 ---------------------------
 * removed ArangoDriver.EdgeEntity() (/_api/edge withdrawn in Server)
 * removed CAP-Index (Cap-constraints are withdrawn in Server)
+* removed Param database in User-Methods (in 3.0 users are managed in _users Collection in _system Database only) 
+* added User-Method grantDatabaseAccess(username, database)
+* replaced Graph-Functions (graph_edge, graph_vertices, graph_shortes_path) with AQL
+* removed deprecated Methods
+* added Transaction attribute allowImplicit
+* refactored QueryCachePropertiesEntity, TransactionResultEntity
 
 v2.7.4 (2016-04-15)
 ---------------------------

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

@@ -4560,6 +4560,64 @@ public TransactionResultEntity executeTransaction(final TransactionEntity transa
 		return this.transactionDriver.executeTransaction(getDefaultDatabase(), transactionEntity);
 	}
 
+	/**
+	 * Create an edge in an edge collection.
+	 *
+	 * @param collectionName
+	 *            name of the edge collection
+	 * @param value
+	 *            the edge object
+	 * @param fromHandle
+	 *            id of document 'from'
+	 * @param toHandle
+	 *            id of document 'to'
+	 * @param waitForSync
+	 *            wait for sync
+	 * @return the new created EdgeEntity object
+	 * @throws ArangoException
+	 */
+	public <T> EdgeEntity<T> createEdge(
+		final String collectionName,
+		final T value,
+		final String fromHandle,
+		final String toHandle,
+		final Boolean waitForSync) throws ArangoException {
+
+		return createEdge(collectionName, null, value, fromHandle, toHandle, waitForSync);
+	}
+
+	/**
+	 * Create an edge in an edge collection. This method allows to define to
+	 * documents key. Note that the collection's property
+	 * CollectionKeyOption.allowUserKeys has to be set accordingly.
+	 * 
+	 * @param collectionName
+	 *            name of the edge collection
+	 * @param documentKey
+	 *            the desired document key
+	 * @param value
+	 *            the edge object
+	 * @param fromHandle
+	 *            id of document 'from'
+	 * @param toHandle
+	 *            id of document 'to'
+	 * @param waitForSync
+	 *            wait for sync
+	 * @return the new created EdgeEntity object
+	 * @throws ArangoException
+	 */
+	public <T> EdgeEntity<T> createEdge(
+		final String collectionName,
+		final String documentKey,
+		final T value,
+		final String fromHandle,
+		final String toHandle,
+		final Boolean waitForSync) throws ArangoException {
+
+		return documentDriver.createEdge(getDefaultDatabase(), collectionName, documentKey, value, fromHandle, toHandle,
+			waitForSync);
+	}
+
 	/**
 	 * Do a graph traversal.
 	 * 

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

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.arangodb.entity.DocumentEntity;
+import com.arangodb.entity.EdgeEntity;
 import com.arangodb.impl.BaseDriverInterface;
 
 /**
@@ -67,4 +68,14 @@ String getDocumentRaw(String database, String documentHandle, Long ifNoneMatchRe
 			throws ArangoException;
 
 	DocumentEntity<?> deleteDocument(String database, String documentHandle, Long rev) throws ArangoException;
+
+	<T> EdgeEntity<T> createEdge(
+		String database,
+		String collectionName,
+		String documentKey,
+		T value,
+		String fromHandle,
+		String toHandle,
+		Boolean waitForSync) throws ArangoException;
+
 }

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

@@ -37,6 +37,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.arangodb.entity.CollectionEntity.Figures;
+import com.arangodb.entity.QueryCachePropertiesEntity.CacheMode;
 import com.arangodb.entity.ReplicationApplierState.LastError;
 import com.arangodb.entity.ReplicationApplierState.Progress;
 import com.arangodb.entity.ReplicationInventoryEntity.Collection;
@@ -1958,6 +1959,9 @@ public ReplicationLoggerStateEntity.Client deserialize(
 	}
 
 	public static class GraphEntityDeserializer implements JsonDeserializer<GraphEntity> {
+
+		private static final String COLLECTION = "collection";
+
 		@Override
 		public GraphEntity deserialize(
 			final JsonElement json,
@@ -2007,8 +2011,8 @@ private void addEdgeDefinitions(final GraphEntity entity, final JsonArray edgeDe
 			for (int i = 0, imax = edgeDefinitions.size(); i < imax; i++) {
 				final EdgeDefinitionEntity edgeDefinitionEntity = new EdgeDefinitionEntity();
 				final JsonObject edgeDefinition = edgeDefinitions.get(i).getAsJsonObject();
-				if (edgeDefinition.has("collection")) {
-					edgeDefinitionEntity.setCollection(edgeDefinition.get("collection").getAsString());
+				if (edgeDefinition.has(COLLECTION)) {
+					edgeDefinitionEntity.setCollection(edgeDefinition.get(COLLECTION).getAsString());
 				}
 				if (edgeDefinition.has("from")) {
 					final List<String> from = new ArrayList<String>();
@@ -2302,7 +2306,8 @@ public QueryCachePropertiesEntity deserialize(
 			final QueryCachePropertiesEntity entity = deserializeBaseParameter(obj, new QueryCachePropertiesEntity());
 
 			if (obj.has("mode")) {
-				entity.setMode(obj.getAsJsonPrimitive("mode").getAsString());
+				final String modeAsString = obj.getAsJsonPrimitive("mode").getAsString();
+				entity.setMode(CacheMode.valueOf(modeAsString));
 			}
 
 			if (obj.has("maxResults")) {

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

@@ -21,11 +21,15 @@
  */
 public class QueryCachePropertiesEntity extends BaseEntity {
 
+	public enum CacheMode {
+		off, on, demand;
+	}
+
 	/**
 	 * The mode the AQL query cache operates in. The mode is one of the
 	 * following values: "off", "on" or "demand".
 	 */
-	private String mode;
+	private CacheMode mode;
 
 	/**
 	 * The maximum number of query results that will be stored per
@@ -41,7 +45,7 @@ public QueryCachePropertiesEntity() {
 	 * 
 	 * @return The mode is one of the following values: "off", "on" or "demand".
 	 */
-	public String getMode() {
+	public CacheMode getMode() {
 		return mode;
 	}
 
@@ -52,7 +56,7 @@ public String getMode() {
 	 *            The mode is one of the following values: "off", "on" or
 	 *            "demand".
 	 */
-	public void setMode(String mode) {
+	public void setMode(CacheMode mode) {
 		this.mode = mode;
 	}
 

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

@@ -27,9 +27,19 @@ public class TransactionEntity extends BaseEntity {
 
 	public static class ReadWriteCollections {
 
-		List<String> read = new ArrayList<String>();
+		private List<String> read = new ArrayList<String>();
 
-		List<String> write = new ArrayList<String>();
+		private List<String> write = new ArrayList<String>();
+
+		private boolean allowImplicit = true;
+
+		public boolean isAllowImplicit() {
+			return allowImplicit;
+		}
+
+		public void setAllowImplicit(boolean allowImplicit) {
+			this.allowImplicit = allowImplicit;
+		}
 	}
 
 	ReadWriteCollections collections = new ReadWriteCollections();
@@ -62,6 +72,15 @@ public void addWriteCollection(String collection) {
 		this.collections.write.add(collection);
 	}
 
+	/**
+	 * @param allowImplicit
+	 *            allows(true)/ disallows(false) read access to other
+	 *            collections than specified. Default is true.
+	 */
+	public void setAllowImplicit(final boolean allowImplicit) {
+		collections.setAllowImplicit(allowImplicit);
+	}
+
 	public String getAction() {
 		return action;
 	}

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

@@ -16,6 +16,8 @@
 
 package com.arangodb.entity;
 
+import com.google.gson.JsonObject;
+
 /**
  * @author tamtam180 - kirscheless at gmail.com
  * @author gschwab
@@ -28,9 +30,8 @@ public class TransactionResultEntity extends BaseEntity {
 	 */
 	private Object result;
 
-	@SuppressWarnings("unchecked")
-	public <T> T getResult() {
-		return (T) this.result;
+	public JsonObject getResultAsJsonObject() {
+		return (JsonObject) result;
 	}
 
 	public long getResultAsLong() {
@@ -58,6 +59,14 @@ public int getResultAsInt() {
 		return number.intValue();
 	}
 
+	public boolean getResultAsBoolean() {
+		return (Boolean) result;
+	}
+
+	public String getResultAsString() {
+		return (String) result;
+	}
+
 	public void setResult(Object result) {
 		this.result = result;
 	}

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

@@ -26,6 +26,7 @@
  */
 class BaseArangoDriverImpl extends BaseArangoDriver implements BaseDriverInterface {
 
+	protected static final String COLLECTION = "collection";
 	protected ArangoConfigure configure;
 	protected HttpManager httpManager;
 	protected AnnotationHandler annotationHandler;

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

@@ -25,11 +25,14 @@
 import com.arangodb.entity.CursorEntity;
 import com.arangodb.entity.DefaultEntity;
 import com.arangodb.entity.DocumentEntity;
+import com.arangodb.entity.EdgeEntity;
 import com.arangodb.entity.EntityFactory;
 import com.arangodb.http.HttpManager;
 import com.arangodb.http.HttpResponseEntity;
+import com.arangodb.util.EdgeUtils;
 import com.arangodb.util.MapBuilder;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 /**
  * @author tamtam180 - kirscheless at gmail.com
@@ -67,7 +70,7 @@ private <T> DocumentEntity<T> internalCreateDocument(
 		}
 
 		final HttpResponseEntity res = httpManager.doPost(createDocumentEndpointUrl(database),
-			new MapBuilder().put("collection", collectionName).put(WAIT_FOR_SYNC, waitForSync).get(), body);
+			new MapBuilder().put(COLLECTION, collectionName).put(WAIT_FOR_SYNC, waitForSync).get(), body);
 
 		@SuppressWarnings("unchecked")
 		final DocumentEntity<T> result = createEntity(res, DocumentEntity.class);
@@ -183,7 +186,7 @@ public DocumentEntity<String> updateDocumentRaw(
 	@Override
 	public List<String> getDocuments(final String database, final String collectionName) throws ArangoException {
 		final HttpResponseEntity res = httpManager.doPut(createEndpointUrl(database, "/_api/simple/all-keys"), null,
-			EntityFactory.toJsonString(new MapBuilder().put("collection", collectionName).put("type", "id").get()));
+			EntityFactory.toJsonString(new MapBuilder().put(COLLECTION, collectionName).put("type", "id").get()));
 
 		@SuppressWarnings("unchecked")
 		final CursorEntity<String> tmp = createEntity(res, CursorEntity.class, String.class);
@@ -264,4 +267,36 @@ private Map<String, Object> createRevisionCheckHeader(final Long rev) {
 		}
 		return header;
 	}
+
+	@Override
+	public <T> EdgeEntity<T> createEdge(
+		String database,
+		String collectionName,
+		String documentKey,
+		T value,
+		String fromHandle,
+		String toHandle,
+		Boolean waitForSync) throws ArangoException {
+
+		validateCollectionName(collectionName);
+
+		JsonObject obj = EdgeUtils.valueToEdgeJsonObject(documentKey, fromHandle, toHandle, value);
+
+		final HttpResponseEntity res = httpManager.doPost(createDocumentEndpointUrl(database),
+			new MapBuilder().put(COLLECTION, collectionName).put(WAIT_FOR_SYNC, waitForSync).get(),
+			EntityFactory.toJsonString(obj));
+
+		@SuppressWarnings("unchecked")
+		final EdgeEntity<T> entity = createEntity(res, EdgeEntity.class);
+
+		if (value != null) {
+			entity.setEntity(value);
+			annotationHandler.updateDocumentAttributes(value, entity.getDocumentRevision(), entity.getDocumentHandle(),
+				entity.getDocumentKey());
+		}
+
+		entity.setFromVertexHandle(fromHandle);
+		entity.setToVertexHandle(toHandle);
+		return entity;
+	}
 }