Merge remote-tracking branch 'origin/3.0'

Author: Mark

src/main/java/com/arangodb/ArangoConfigure.java

@@ -407,8 +407,8 @@ protected String createEndpointUrl(String database, String str, Object... paths)
 		return createEndpointUrl(database, newPaths);
 	}
 
-	protected String createUserEndpointUrl(String database, Object... paths) throws ArangoException {
-		return createEndpointUrl(database, "/_api/user", paths);
+	protected String createUserEndpointUrl(Object... paths) throws ArangoException {
+		return createEndpointUrl(null, "/_api/user", paths);
 	}
 
 	protected String createJobEndpointUrl(String database, Object... paths) throws ArangoException {

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

@@ -93,36 +93,8 @@ public <V, E> ShortestPathEntity<V, E> getShortestPath(
 		ShortestPathOptions shortestPathOptions,
 		AqlQueryOptions aqlQueryOptions,
 		Class<V> vertexClass,
-		Class<E> edgeClass) throws ArangoException;
-
-	@Deprecated
-	<T> CursorEntity<T> executeQuery(
-		String database,
-		String query,
-		Map<String, Object> bindVars,
-		Class<T> clazz,
-		Boolean calcCount,
-		Integer batchSize,
-		Boolean fullCount) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<T> executeQueryWithResultSet(
-		String database,
-		String query,
-		Map<String, Object> bindVars,
-		Class<T> clazz,
-		Boolean calcCount,
-		Integer batchSize,
-		Boolean fullCount) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<T> executeQueryWithResultSet(
-		String database,
-		String query,
-		Map<String, Object> bindVars,
-		Class<T> clazz,
-		Boolean calcCount,
-		Integer batchSize) throws ArangoException;
+		Class<E> edgeClass,
+		ArangoDriver driver) throws ArangoException;
 
 	QueryTrackingPropertiesEntity getQueryTrackingProperties(String database) throws ArangoException;
 

src/main/java/com/arangodb/BaseArangoDriver.java

@@ -21,21 +21,16 @@
 
 package com.arangodb;
 
-import java.util.Collection;
 import java.util.List;
 
-import com.arangodb.entity.CursorEntity;
 import com.arangodb.entity.DeletedEntity;
-import com.arangodb.entity.Direction;
 import com.arangodb.entity.EdgeDefinitionEntity;
 import com.arangodb.entity.EdgeEntity;
-import com.arangodb.entity.FilterCondition;
 import com.arangodb.entity.GraphEntity;
 import com.arangodb.entity.GraphsEntity;
 import com.arangodb.entity.marker.VertexEntity;
 import com.arangodb.impl.BaseDriverInterface;
 
-@SuppressWarnings("deprecation")
 public interface InternalGraphDriver extends BaseDriverInterface {
 
 	/**
@@ -117,7 +112,8 @@ GraphEntity createGraph(
 	 * @return List<String>
 	 * @throws ArangoException
 	 */
-	List<String> getVertexCollections(String databaseName, String graphName) throws ArangoException;
+	List<String> getVertexCollections(String databaseName, String graphName, boolean excludeOrphan)
+			throws ArangoException;
 
 	/**
 	 * 
@@ -468,35 +464,4 @@ <T> EdgeEntity<T> updateEdge(
 		Long ifMatchRevision,
 		Long ifNoneMatchRevision) throws ArangoException;
 
-	/**
-	 * 
-	 * 
-	 * @param database
-	 * @param graphName
-	 * @param vertexKey
-	 * @param clazz
-	 * @param batchSize
-	 * @param limit
-	 * @param count
-	 * @param direction
-	 * @param labels
-	 * @param driver
-	 * @param properties
-	 * @return a CursorEntity object
-	 * @throws ArangoException
-	 */
-	@Deprecated
-	<T> CursorEntity<EdgeEntity<T>> getEdges(
-		String database,
-		String graphName,
-		String vertexKey,
-		Class<T> clazz,
-		Integer batchSize,
-		Integer limit,
-		Boolean count,
-		Direction direction,
-		Collection<String> labels,
-		ArangoDriver driver,
-		FilterCondition... properties) throws ArangoException;
-
 }

src/main/java/com/arangodb/InternalCursorDriver.java

@@ -2,8 +2,6 @@
 
 import java.util.Map;
 
-import com.arangodb.entity.CursorEntity;
-import com.arangodb.entity.DocumentEntity;
 import com.arangodb.entity.ScalarExampleEntity;
 import com.arangodb.entity.SimpleByResultEntity;
 import com.arangodb.impl.BaseDriverInterface;
@@ -13,77 +11,13 @@
  */
 public interface InternalSimpleDriver extends BaseDriverInterface {
 
-	@Deprecated
-	<T> CursorEntity<T> executeSimpleAll(String database, String collectionName, int skip, int limit, Class<T> clazz)
-			throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<T> executeSimpleAllWithResultSet(
-		String database,
-		String collectionName,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorEntity<DocumentEntity<T>> executeSimpleAllWithDocument(
-		String database,
-		String collectionName,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<DocumentEntity<T>> executeSimpleAllWithDocumentResultSet(
-		String database,
-		String collectionName,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
 	<T> DocumentCursor<T> executeSimpleAllDocuments(
 		String database,
 		String collectionName,
 		int skip,
 		int limit,
 		Class<T> clazz) throws ArangoException;
 
-	@Deprecated
-	<T> CursorEntity<T> executeSimpleByExample(
-		String database,
-		String collectionName,
-		Map<String, Object> example,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<T> executeSimpleByExampleWithResultSet(
-		String database,
-		String collectionName,
-		Map<String, Object> example,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorEntity<DocumentEntity<T>> executeSimpleByExampleWithDocument(
-		String database,
-		String collectionName,
-		Map<String, Object> example,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<DocumentEntity<T>> executeSimpleByExampleWithDocumentResultSet(
-		String database,
-		String collectionName,
-		Map<String, Object> example,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
 	<T> DocumentCursor<T> executeSimpleByExampleDocuments(
 		String database,
 		String collectionName,
@@ -101,54 +35,6 @@ <T> ScalarExampleEntity<T> executeSimpleFirstExample(
 	<T> ScalarExampleEntity<T> executeSimpleAny(String database, String collectionName, Class<T> clazz)
 			throws ArangoException;
 
-	@Deprecated
-	<T> CursorEntity<T> executeSimpleRange(
-		String database,
-		String collectionName,
-		String attribute,
-		Object left,
-		Object right,
-		Boolean closed,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<T> executeSimpleRangeWithResultSet(
-		String database,
-		String collectionName,
-		String attribute,
-		Object left,
-		Object right,
-		Boolean closed,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorEntity<DocumentEntity<T>> executeSimpleRangeWithDocument(
-		String database,
-		String collectionName,
-		String attribute,
-		Object left,
-		Object right,
-		Boolean closed,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<DocumentEntity<T>> executeSimpleRangeWithDocumentResultSet(
-		String database,
-		String collectionName,
-		String attribute,
-		Object left,
-		Object right,
-		Boolean closed,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException;
-
 	<T> DocumentCursor<T> executeSimpleRangeWithDocuments(
 		String database,
 		String collectionName,
@@ -184,50 +70,6 @@ SimpleByResultEntity executeSimpleUpdateByExample(
 		Boolean waitForSync,
 		Integer limit) throws ArangoException;
 
-	@Deprecated
-	<T> CursorEntity<T> executeSimpleFulltext(
-		String database,
-		String collectionName,
-		String attribute,
-		String query,
-		int skip,
-		int limit,
-		String index,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<T> executeSimpleFulltextWithResultSet(
-		String database,
-		String collectionName,
-		String attribute,
-		String query,
-		int skip,
-		int limit,
-		String index,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorEntity<DocumentEntity<T>> executeSimpleFulltextWithDocument(
-		String database,
-		String collectionName,
-		String attribute,
-		String query,
-		int skip,
-		int limit,
-		String index,
-		Class<T> clazz) throws ArangoException;
-
-	@Deprecated
-	<T> CursorResultSet<DocumentEntity<T>> executeSimpleFulltextWithDocumentResultSet(
-		String database,
-		String collectionName,
-		String attribute,
-		String query,
-		int skip,
-		int limit,
-		String index,
-		Class<T> clazz) throws ArangoException;
-
 	<T> DocumentCursor<T> executeSimpleFulltextWithDocuments(
 		String database,
 		String collectionName,

src/main/java/com/arangodb/InternalGraphDriver.java

@@ -10,19 +10,21 @@
 /**
  * Created by fbartels on 10/27/14.
  */
-public interface InternalUsersDriver  extends BaseDriverInterface {
-  DefaultEntity createUser(String database, String username, String passwd, Boolean active,
-                           Map<String, Object> extra) throws ArangoException;
+public interface InternalUsersDriver extends BaseDriverInterface {
+	DefaultEntity createUser(String username, String passwd, Boolean active, Map<String, Object> extra)
+			throws ArangoException;
 
-  DefaultEntity deleteUser(String database, String username) throws ArangoException;
+	DefaultEntity deleteUser(String username) throws ArangoException;
 
-  UserEntity getUser(String database, String username) throws ArangoException;
+	UserEntity getUser(String username) throws ArangoException;
 
-  UsersEntity getUsers(String database) throws ArangoException;
+	UsersEntity getUsers() throws ArangoException;
 
-  DefaultEntity replaceUser(String database, String username, String passwd, Boolean active,
-                            Map<String, Object> extra) throws ArangoException;
+	DefaultEntity replaceUser(String username, String passwd, Boolean active, Map<String, Object> extra)
+			throws ArangoException;
 
-  DefaultEntity updateUser(String database, String username, String passwd, Boolean active,
-                           Map<String, Object> extra) throws ArangoException;
+	DefaultEntity updateUser(String username, String passwd, Boolean active, Map<String, Object> extra)
+			throws ArangoException;
+
+	DefaultEntity grantDatabaseAccess(final String username, final String database) throws ArangoException;
 }