added ArangoDatabase.getVersion(), ArangoDatabase.getAccessibleDatabases

Author: mpv1989

ChangeLog

@@ -7,6 +7,7 @@ v4.1.11 (2017-03-xx)
 * extracted VelocyPack implementation to https://github.com/arangodb/java-velocypack
 * added dependency java-velocypack-module-jdk8
 * added support for replacing build-in VelocyPack serializer/deserializer
+* added ArangoDatabaseAsync.getVersion(), ArangoDatabaseAsync.getAccessibleDatabases()
 
 v4.1.10 (2017-02-22)
 ---------------------------

src/main/java/com/arangodb/ArangoDBAsync.java

@@ -399,7 +399,7 @@ public CompletableFuture<Collection<String>> getDatabases() {
 	 * @return a list of all databases the current user can access
 	 */
 	public CompletableFuture<Collection<String>> getAccessibleDatabases() {
-		return executor.execute(getAccessibleDatabasesRequest(db().name()), getDatabaseResponseDeserializer());
+		return db().getAccessibleDatabases();
 	}
 
 	/**
@@ -426,7 +426,7 @@ public CompletableFuture<Collection<String>> getAccessibleDatabasesFor(final Str
 	 * @return the server version, number
 	 */
 	public CompletableFuture<ArangoDBVersion> getVersion() {
-		return executor.execute(getVersionRequest(), ArangoDBVersion.class);
+		return db().getVersion();
 	}
 
 	/**

src/main/java/com/arangodb/ArangoDatabaseAsync.java

@@ -28,6 +28,7 @@
 import com.arangodb.entity.AqlExecutionExplainEntity;
 import com.arangodb.entity.AqlFunctionEntity;
 import com.arangodb.entity.AqlParseEntity;
+import com.arangodb.entity.ArangoDBVersion;
 import com.arangodb.entity.CollectionEntity;
 import com.arangodb.entity.CursorEntity;
 import com.arangodb.entity.DatabaseEntity;
@@ -77,6 +78,29 @@ protected ArangoDatabaseAsync(final CommunicationAsync communication, final Aran
 		super(null, new ArangoExecutorAsync(communication, util, documentCache, collectionCache), name);
 	}
 
+	/**
+	 * Returns the server name and version number.
+	 * 
+	 * @see <a href="https://docs.arangodb.com/current/HTTP/MiscellaneousFunctions/index.html#return-server-version">API
+	 *      Documentation</a>
+	 * @return the server version, number
+	 */
+	public CompletableFuture<ArangoDBVersion> getVersion() {
+		return executor.execute(getVersionRequest(), ArangoDBVersion.class);
+	}
+
+	/**
+	 * Retrieves a list of all databases the current user can access
+	 * 
+	 * @see <a href=
+	 *      "https://docs.arangodb.com/current/HTTP/Database/DatabaseManagement.html#list-of-accessible-databases">API
+	 *      Documentation</a>
+	 * @return a list of all databases the current user can access
+	 */
+	public CompletableFuture<Collection<String>> getAccessibleDatabases() {
+		return executor.execute(getAccessibleDatabasesRequest(), getDatabaseResponseDeserializer());
+	}
+
 	/**
 	 * Returns a handler of the collection by the given name
 	 * 

src/test/java/com/arangodb/ArangoDatabaseTest.java

@@ -24,6 +24,7 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
@@ -48,6 +49,7 @@
 import com.arangodb.entity.AqlFunctionEntity;
 import com.arangodb.entity.AqlParseEntity;
 import com.arangodb.entity.AqlParseEntity.AstNode;
+import com.arangodb.entity.ArangoDBVersion;
 import com.arangodb.entity.BaseDocument;
 import com.arangodb.entity.BaseEdgeDocument;
 import com.arangodb.entity.CollectionEntity;
@@ -81,6 +83,30 @@ public class ArangoDatabaseTest extends BaseTest {
 	private static final String COLLECTION_NAME = "db_test";
 	private static final String GRAPH_NAME = "graph_test";
 
+	@Test
+	public void getVersion() throws InterruptedException, ExecutionException {
+		final CompletableFuture<ArangoDBVersion> f = db.getVersion();
+		assertThat(f, is(notNullValue()));
+		f.whenComplete((version, ex) -> {
+			assertThat(version, is(notNullValue()));
+			assertThat(version.getServer(), is(notNullValue()));
+			assertThat(version.getVersion(), is(notNullValue()));
+		});
+		f.get();
+	}
+
+	@Test
+	public void getAccessibleDatabases() throws InterruptedException, ExecutionException {
+		final CompletableFuture<Collection<String>> f = db.getAccessibleDatabases();
+		assertThat(f, is(notNullValue()));
+		f.whenComplete((dbs, ex) -> {
+			assertThat(dbs, is(notNullValue()));
+			assertThat(dbs.size(), greaterThan(0));
+			assertThat(dbs, hasItem("_system"));
+		});
+		f.get();
+	}
+
 	@Test
 	public void createCollection() throws InterruptedException, ExecutionException {
 		try {
@@ -203,8 +229,8 @@ public void getCollectionsExcludeSystem() throws InterruptedException, Execution
 			final CollectionsReadOptions options = new CollectionsReadOptions().excludeSystem(true);
 			final Collection<CollectionEntity> systemCollections = db.getCollections(options).get();
 			assertThat(systemCollections.size(), is(0));
-			db.createCollection(COLLECTION_NAME + "1", null);
-			db.createCollection(COLLECTION_NAME + "2", null);
+			db.createCollection(COLLECTION_NAME + "1", null).get();
+			db.createCollection(COLLECTION_NAME + "2", null).get();
 			final CompletableFuture<Collection<CollectionEntity>> f = db.getCollections(options);
 			assertThat(f, is(notNullValue()));
 			f.whenComplete((collections, ex) -> {

src/test/java/com/arangodb/example/graph/AQLActorsAndMoviesExample.java

@@ -395,11 +395,11 @@ private static DocumentCreateEntity<BaseEdgeDocument> saveActsIn(
 	}
 
 	private static void createData() throws InterruptedException, ExecutionException {
-		db.createCollection("actors");
+		db.createCollection("actors").get();
 		final ArangoCollectionAsync actors = db.collection("actors");
-		db.createCollection("movies");
+		db.createCollection("movies").get();
 		final ArangoCollectionAsync movies = db.collection("movies");
-		db.createCollection("actsIn", new CollectionCreateOptions().type(CollectionType.EDGES));
+		db.createCollection("actsIn", new CollectionCreateOptions().type(CollectionType.EDGES)).get();
 		final ArangoCollectionAsync actsIn = db.collection("actsIn");
 
 		final String theMatrix = saveMovie(movies, "TheMatrix", "The Matrix", 1999, "Welcome to the Real World")