[DE-467] Graph API refactoring (#486)

* GET /_api/gharial

* POST /_api/gharial

* DELETE /_api/gharial/{graph}/vertex/{collection}

* PUT /_api/gharial/{graph}/edge/{definition}

* DELETE /_api/gharial/{graph}/edge/{definition}

Author: rashtao

core/src/main/java/com/arangodb/ArangoEdgeCollection.java

@@ -49,6 +49,25 @@ public interface ArangoEdgeCollection extends ArangoSerdeAccessor {
      */
     String name();
 
+    /**
+     * Remove one edge definition from the graph.
+     *
+     * @see <a href=
+     * "https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-an-edge-definition-from-the-graph">API
+     * Documentation</a>
+     */
+    void drop();
+
+    /**
+     * Remove one edge definition from the graph.
+     *
+     * @param options options
+     * @see <a href=
+     * "https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-an-edge-definition-from-the-graph">API
+     * Documentation</a>
+     */
+    void drop(EdgeCollectionDropOptions options);
+
     /**
      * Creates a new edge in the collection
      *

core/src/main/java/com/arangodb/ArangoGraph.java

@@ -23,6 +23,7 @@
 import com.arangodb.entity.EdgeDefinition;
 import com.arangodb.entity.GraphEntity;
 import com.arangodb.model.GraphCreateOptions;
+import com.arangodb.model.ReplaceEdgeDefinitionOptions;
 import com.arangodb.model.VertexCollectionCreateOptions;
 
 import javax.annotation.concurrent.ThreadSafe;
@@ -189,15 +190,15 @@ public interface ArangoGraph extends ArangoSerdeAccessor {
     GraphEntity replaceEdgeDefinition(EdgeDefinition definition);
 
     /**
-     * Remove one edge definition from the graph. This will only remove the edge collection, the vertex collections
-     * remain untouched and can still be used in your queries
+     * Change one specific edge definition. This will modify all occurrences of this definition in all graphs known to
+     * your database
      *
-     * @param definitionName The name of the edge collection used in the definition
+     * @param definition The edge definition
+     * @param options options
      * @return information about the graph
-     * @see <a href=
-     * "https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-an-edge-definition-from-the-graph">API
+     * @see <a href="https://www.arangodb.com/docs/stable/http/gharial-management.html#replace-an-edge-definition">API
      * Documentation</a>
      */
-    GraphEntity removeEdgeDefinition(String definitionName);
+    GraphEntity replaceEdgeDefinition(EdgeDefinition definition, ReplaceEdgeDefinitionOptions options);
 
 }

core/src/main/java/com/arangodb/ArangoVertexCollection.java

@@ -50,14 +50,22 @@ public interface ArangoVertexCollection extends ArangoSerdeAccessor {
     String name();
 
     /**
-     * Removes a vertex collection from the graph and optionally deletes the collection, if it is not used in any other
-     * graph
+     * Remove a vertex collection form the graph.
      *
      * @see <a href="https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-vertex-collection">API
      * Documentation</a>
      */
     void drop();
 
+    /**
+     * Remove a vertex collection form the graph.
+     *
+     * @param options options
+     * @see <a href="https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-vertex-collection">API
+     * Documentation</a>
+     */
+    void drop(VertexCollectionDropOptions options);
+
     /**
      * Creates a new vertex in the collection
      *

core/src/main/java/com/arangodb/async/ArangoEdgeCollectionAsync.java

@@ -51,6 +51,25 @@ public interface ArangoEdgeCollectionAsync extends ArangoSerdeAccessor {
      */
     String name();
 
+    /**
+     * Remove one edge definition from the graph.
+     *
+     * @see <a href=
+     * "https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-an-edge-definition-from-the-graph">API
+     * Documentation</a>
+     */
+    CompletableFuture<Void> drop();
+
+    /**
+     * Remove one edge definition from the graph.
+     *
+     * @param options options
+     * @see <a href=
+     * "https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-an-edge-definition-from-the-graph">API
+     * Documentation</a>
+     */
+    CompletableFuture<Void> drop(EdgeCollectionDropOptions options);
+
     /**
      * Creates a new edge in the collection
      *

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

@@ -24,6 +24,7 @@
 import com.arangodb.entity.EdgeDefinition;
 import com.arangodb.entity.GraphEntity;
 import com.arangodb.model.GraphCreateOptions;
+import com.arangodb.model.ReplaceEdgeDefinitionOptions;
 import com.arangodb.model.VertexCollectionCreateOptions;
 
 import javax.annotation.concurrent.ThreadSafe;
@@ -195,15 +196,15 @@ CompletableFuture<GraphEntity> createGraph(
     CompletableFuture<GraphEntity> replaceEdgeDefinition(final EdgeDefinition definition);
 
     /**
-     * Remove one edge definition from the graph. This will only remove the edge collection, the vertex collections
-     * remain untouched and can still be used in your queries
+     * Change one specific edge definition. This will modify all occurrences of this definition in all graphs known to
+     * your database
      *
-     * @param definitionName The name of the edge collection used in the definition
+     * @param definition The edge definition
+     * @param options    options
      * @return information about the graph
-     * @see <a href=
-     * "https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-an-edge-definition-from-the-graph">API
+     * @see <a href="https://www.arangodb.com/docs/stable/http/gharial-management.html#replace-an-edge-definition">API
      * Documentation</a>
      */
-    CompletableFuture<GraphEntity> removeEdgeDefinition(final String definitionName);
+    CompletableFuture<GraphEntity> replaceEdgeDefinition(final EdgeDefinition definition, final ReplaceEdgeDefinitionOptions options);
 
 }

core/src/main/java/com/arangodb/async/ArangoVertexCollectionAsync.java

@@ -52,15 +52,24 @@ public interface ArangoVertexCollectionAsync extends ArangoSerdeAccessor {
     String name();
 
     /**
-     * Removes a vertex collection from the graph and optionally deletes the collection, if it is not used in any other
-     * graph
+     * Removes a vertex collection from the graph and optionally deletes the collection.
      *
      * @return void
      * @see <a href="https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-vertex-collection">API
      * Documentation</a>
      */
     CompletableFuture<Void> drop();
 
+    /**
+     * Removes a vertex collection from the graph and optionally deletes the collection.
+     *
+     * @param options options
+     * @return void
+     * @see <a href="https://www.arangodb.com/docs/stable/http/gharial-management.html#remove-vertex-collection">API
+     * Documentation</a>
+     */
+    CompletableFuture<Void> drop(VertexCollectionDropOptions options);
+
     /**
      * Creates a new vertex in the collection
      *

core/src/main/java/com/arangodb/async/internal/ArangoDatabaseAsyncImpl.java

@@ -340,8 +340,7 @@ public ArangoGraphAsync graph(final String name) {
     public CompletableFuture<GraphEntity> createGraph(
             final String name,
             final Collection<EdgeDefinition> edgeDefinitions) {
-        return executor.execute(createGraphRequest(name, edgeDefinitions, new GraphCreateOptions()),
-                createGraphResponseDeserializer());
+        return createGraph(name, edgeDefinitions, new GraphCreateOptions());
     }
 
     @Override

core/src/main/java/com/arangodb/async/internal/ArangoEdgeCollectionAsyncImpl.java

@@ -40,6 +40,16 @@ public class ArangoEdgeCollectionAsyncImpl extends
         super(graph, name);
     }
 
+    @Override
+    public CompletableFuture<Void> drop() {
+        return drop(new EdgeCollectionDropOptions());
+    }
+
+    @Override
+    public CompletableFuture<Void> drop(final EdgeCollectionDropOptions options) {
+        return executor.execute(removeEdgeDefinitionRequest(options), Void.class);
+    }
+
     @Override
     public CompletableFuture<EdgeEntity> insertEdge(final Object value) {
         return executor.execute(insertEdgeRequest(value, new EdgeCreateOptions()),

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

@@ -27,6 +27,7 @@
 import com.arangodb.entity.GraphEntity;
 import com.arangodb.internal.InternalArangoGraph;
 import com.arangodb.model.GraphCreateOptions;
+import com.arangodb.model.ReplaceEdgeDefinitionOptions;
 import com.arangodb.model.VertexCollectionCreateOptions;
 
 import java.util.Collection;
@@ -114,12 +115,12 @@ public CompletableFuture<GraphEntity> addEdgeDefinition(final EdgeDefinition def
 
     @Override
     public CompletableFuture<GraphEntity> replaceEdgeDefinition(final EdgeDefinition definition) {
-        return executor.execute(replaceEdgeDefinitionRequest(definition), replaceEdgeDefinitionResponseDeserializer());
+        return replaceEdgeDefinition(definition, new ReplaceEdgeDefinitionOptions());
     }
 
     @Override
-    public CompletableFuture<GraphEntity> removeEdgeDefinition(final String definitionName) {
-        return executor.execute(removeEdgeDefinitionRequest(definitionName),
-                removeEdgeDefinitionResponseDeserializer());
+    public CompletableFuture<GraphEntity> replaceEdgeDefinition(final EdgeDefinition definition, final ReplaceEdgeDefinitionOptions options) {
+        return executor.execute(replaceEdgeDefinitionRequest(definition, options), replaceEdgeDefinitionResponseDeserializer());
     }
+
 }

core/src/main/java/com/arangodb/async/internal/ArangoVertexCollectionAsyncImpl.java

@@ -42,7 +42,12 @@ public class ArangoVertexCollectionAsyncImpl extends
 
     @Override
     public CompletableFuture<Void> drop() {
-        return executor.execute(dropRequest(), Void.class);
+        return drop(new VertexCollectionDropOptions());
+    }
+
+    @Override
+    public CompletableFuture<Void> drop(VertexCollectionDropOptions options) {
+        return executor.execute(dropRequest(options), Void.class);
     }
 
     @Override