added dropCollection flag for dropGraph, added tests

Author: hkernbach

ChangeLog.md

@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [5.0.1] - 2018-09-25
 
+### Added
+
+- added `ArangoGraphAsync#drop(boolean dropCollections)`
+
 ### Fixed
 
 - fixed `ArangoCursor#next` when performing a dirty read

src/main/java/com/arangodb/ArangoGraphAsync.java

@@ -92,6 +92,17 @@ CompletableFuture<GraphEntity> createGraph(
 	 */
 	CompletableFuture<Void> drop();
 
+	/**
+	 * Delete an existing graph including
+	 * 
+	 * @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Management.html#drop-a-graph">API Documentation</a>
+	 * @param dropCollections
+	 *            Drop collections of this graph as well. Collections will only be dropped if they are not used in other
+	 *            graphs.
+	 * @return void
+	 */
+	CompletableFuture<Void> drop(boolean dropCollection);
+
 	/**
 	 * Get a graph from the graph module
 	 * 

src/main/java/com/arangodb/internal/ArangoGraphAsyncImpl.java

@@ -64,6 +64,11 @@ public CompletableFuture<Void> drop() {
 		return executor.execute(dropRequest(), Void.class);
 	}
 
+	@Override
+	public CompletableFuture<Void> drop(boolean dropCollection) {
+		return executor.execute(dropRequest(dropCollection), Void.class);
+	}
+
 	@Override
 	public CompletableFuture<GraphEntity> getInfo() {
 		return executor.execute(getInfoRequest(), getInfoResponseDeserializer());
@@ -109,5 +114,4 @@ public CompletableFuture<GraphEntity> removeEdgeDefinition(final String definiti
 		return executor.execute(removeEdgeDefinitionRequest(definitionName),
 			removeEdgeDefinitionResponseDeserializer());
 	}
-
 }

src/test/java/com/arangodb/ArangoGraphTest.java

@@ -29,6 +29,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.concurrent.ExecutionException;
 
@@ -239,9 +240,37 @@ public void smartGraph() throws InterruptedException, ExecutionException {
 			assertThat(graph.getSmartGraphAttribute(), is("test"));
 			assertThat(graph.getNumberOfShards(), is(2));
 			try {
-				db.graph(GRAPH_NAME + "_smart").drop().get();
+				db.graph(GRAPH_NAME + "_smart").drop(true).get();
 			} catch (final Exception e) {
 			}
 		}
 	}
+
+	@Test
+	public void drop() throws InterruptedException, ExecutionException {
+		final String edgeCollection = "edge_drop";
+		final String vertexCollection = "vertex_drop";
+		final String graph = GRAPH_NAME + "_drop";
+		final GraphEntity result = db.graph(graph).create(Collections
+				.singleton(new EdgeDefinition().collection(edgeCollection).from(vertexCollection).to(vertexCollection)))
+				.get();
+		assertThat(result, is(notNullValue()));
+		db.graph(graph).drop().get();
+		assertThat(db.collection(edgeCollection).exists().get(), is(true));
+		assertThat(db.collection(vertexCollection).exists().get(), is(true));
+	}
+
+	@Test
+	public void dropPlusDropCollections() throws InterruptedException, ExecutionException {
+		final String edgeCollection = "edge_dropC";
+		final String vertexCollection = "vertex_dropC";
+		final String graph = GRAPH_NAME + "_dropC";
+		final GraphEntity result = db.graph(graph).create(Collections
+				.singleton(new EdgeDefinition().collection(edgeCollection).from(vertexCollection).to(vertexCollection)))
+				.get();
+		assertThat(result, is(notNullValue()));
+		db.graph(graph).drop(true).get();
+		assertThat(db.collection(edgeCollection).exists().get(), is(false));
+		assertThat(db.collection(vertexCollection).exists().get(), is(false));
+	}
 }