anderick
diff --git a/‎src/main/java/com/arangodb/ArangoDriver.java
Lines changed: 128 additions & 29 deletions b/‎src/main/java/com/arangodb/ArangoDriver.java
Lines changed: 128 additions & 29 deletions
@@ -3505,6 +3505,8 @@ public GraphEntity graphDeleteEdgeDefinition(String graphName, String edgeCollec
    *
    * @param graphName
    *          The name of the graph.
+   * @param collectionName
+   *          The name of the collection, where the vertex will be created.
    * @param vertex
    *          The vertex object to be stored
    * @param waitForSync
@@ -3797,13 +3799,55 @@ public <T> DocumentEntity<T> graphUpdateVertex(
    * given collection.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection where the edge will be created.
+   * @param fromHandle
+   *          Document handle of vertex, where the edge comes from.
+   * @param toHandle
+   *          Document handle of vertex, where the edge goes to.
+   * @param value
+   *          Object to be stored with edge.
+   * @param waitForSync
+   *          Wait for sync.
+   * @return <T> EdgeEntity<T>
+   * @throws ArangoException
+   */
+  public <T> EdgeEntity<T> graphCreateEdge(
+    String graphName,
+    String edgeCollectionName,
+    String fromHandle,
+    String toHandle,
+    Object value,
+    Boolean waitForSync) throws ArangoException {
+    return graphDriver.createEdge(
+      getDefaultDatabase(),
+      graphName,
+      edgeCollectionName,
+      fromHandle,
+      toHandle,
+      value,
+      waitForSync);
+  }
+
+  /**
+   * Stores a new edge with the information contained within the body into the
+   * given collection.
+   * 
+   * @param graphName
+   *          The name of the graph.
+   * @param edgeCollectionName
+   *          The name of the collection where the edge will be created.
    * @param key
+   *          The key of the edge to create (has to be unique).
    * @param fromHandle
+   *          Document handle of vertex, where the edge comes from.
    * @param toHandle
+   *          Document handle of vertex, where the edge goes to.
    * @param value
-   * @param label
+   *          Object to be stored with edge.
    * @param waitForSync
+   *          Wait for sync.
    * @return <T> EdgeEntity<T>
    * @throws ArangoException
    */
@@ -3831,10 +3875,15 @@ public <T> EdgeEntity<T> graphCreateEdge(
    * given collection.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection where the edge will be created.
    * @param key
+   *          The key of the edge to create (has to be unique).
    * @param fromHandle
+   *          Document handle of vertex, where the edge comes from.
    * @param toHandle
+   *          Document handle of vertex, where the edge goes to.
    * @return <T> EdgeEntity<T>
    * @throws ArangoException
    */
@@ -3859,12 +3908,19 @@ public <T> EdgeEntity<T> graphCreateEdge(
    * Loads an edge with the given key if it is contained within your graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to get.
    * @param key
+   *          The key of the edge to get.
    * @param clazz
-   * @param rev
-   * @param ifNoneMatchRevision
+   *          The class of the edge to get.
    * @param ifMatchRevision
+   *          If not null the revision of the vertex in the database has to be
+   *          equal to load the edge.
+   * @param ifNoneMatchRevision
+   *          If not null the revision of the vertex in the database has to be
+   *          different to load the edge.
    * @return <T> EdgeEntity<T>
    * @throws ArangoException
    */
@@ -3873,42 +3929,47 @@ public <T> EdgeEntity<T> graphGetEdge(
     String edgeCollectionName,
     String key,
     Class<?> clazz,
-    Long rev,
-    Long ifNoneMatchRevision,
-    Long ifMatchRevision) throws ArangoException {
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException {
     return graphDriver.getEdge(
       getDefaultDatabase(),
       graphName,
       edgeCollectionName,
       key,
       clazz,
-      rev,
-      ifNoneMatchRevision,
-      ifMatchRevision);
+      ifMatchRevision,
+      ifNoneMatchRevision);
   }
 
   /**
    * Loads an edge with the given key if it is contained within your graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to get.
    * @param key
+   *          The key of the edge to get.
    * @param clazz
+   *          The class of the edge to get.
    * @return <T> EdgeEntity<T>
    * @throws ArangoException
    */
   public <T> EdgeEntity<T> graphGetEdge(String graphName, String edgeCollectionName, String key, Class<?> clazz)
       throws ArangoException {
-    return graphDriver.getEdge(getDefaultDatabase(), graphName, edgeCollectionName, key, clazz, null, null, null);
+    return graphDriver.getEdge(getDefaultDatabase(), graphName, edgeCollectionName, key, clazz, null, null);
   }
 
   /**
    * Deletes an edge with the given id, if it is contained within the graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to delete.
    * @param key
-   * @return
+   *          The key of the edge to delete.
+   * @return DeletedEntity
    * @throws ArangoException
    */
   public DeletedEntity graphDeleteEdge(String graphName, String edgeCollectionName, String key) throws ArangoException {
@@ -3919,9 +3980,13 @@ public DeletedEntity graphDeleteEdge(String graphName, String edgeCollectionName
    * Deletes an edge with the given id, if it is contained within the graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to delete.
    * @param key
+   *          The key of the edge to delete.
    * @param waitForSync
+   *          Wait for sync.
    * @return
    * @throws ArangoException
    */
@@ -3934,39 +3999,51 @@ public DeletedEntity graphDeleteEdge(String graphName, String edgeCollectionName
    * Deletes an edge with the given id, if it is contained within the graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to delete.
    * @param key
+   *          The key of the edge to delete.
    * @param waitForSync
-   * @param rev
+   *          Wait for sync.
    * @param ifMatchRevision
-   * @return
+   *          If not null the revision of the vertex in the database has to be
+   *          equal to delete the edge.
+   * @param ifNoneMatchRevision
+   *          If not null the revision of the vertex in the database has to be
+   *          different to delete the edge.
+   * @return DeletedEntity
    * @throws ArangoException
    */
   public DeletedEntity graphDeleteEdge(
     String graphName,
     String edgeCollectionName,
     String key,
     Boolean waitForSync,
-    Long rev,
-    Long ifMatchRevision) throws ArangoException {
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException {
     return graphDriver.deleteEdge(
       getDefaultDatabase(),
       graphName,
       edgeCollectionName,
       key,
       waitForSync,
-      rev,
-      ifMatchRevision);
+      ifMatchRevision,
+      ifNoneMatchRevision);
   }
 
   /**
    * Replaces an edge with the given key by the content in the body. This will
    * only run successfully if the edge is contained within the graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to replace.
    * @param key
+   *          The key of the edge to replace.
    * @param value
+   *          The object to replace the existing edge.
    * @return
    * @throws ArangoException
    */
@@ -3980,13 +4057,22 @@ public <T> EdgeEntity<T> graphReplaceEdge(String graphName, String edgeCollectio
    * only run successfully if the edge is contained within the graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to replace.
    * @param key
+   *          The key of the edge to replace.
    * @param value
+   *          The object to replace the existing edge.
    * @param waitForSync
-   * @param rev
+   *          Wait for sync.
    * @param ifMatchRevision
-   * @return
+   *          If not null the revision of the vertex in the database has to be
+   *          equal to replace the edge.
+   * @param ifNoneMatchRevision
+   *          If not null the revision of the vertex in the database has to be
+   * @return EdgeEntity<T>
    * @throws ArangoException
    */
   public <T> EdgeEntity<T> graphReplaceEdge(
@@ -3995,29 +4081,33 @@ public <T> EdgeEntity<T> graphReplaceEdge(
     String key,
     Object value,
     Boolean waitForSync,
-    Long rev,
-    Long ifMatchRevision) throws ArangoException {
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException {
     return graphDriver.replaceEdge(
       getDefaultDatabase(),
       graphName,
       edgeCollectionName,
       key,
       value,
       waitForSync,
-      rev,
-      ifMatchRevision);
+      ifMatchRevision,
+      ifNoneMatchRevision);
   }
 
   /**
    * Updates an edge with the given key by adding the content in the body. This
    * will only run successfully if the edge is contained within the graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to update.
    * @param key
+   *          The key of the edge to update.
    * @param value
+   *          The object to update the existing edge.
    * @param keepNull
-   * @return
+   * @return EdgeEntity<T>
    * @throws ArangoException
    */
   public <T> EdgeEntity<T> graphUpdateEdge(
@@ -4043,13 +4133,22 @@ public <T> EdgeEntity<T> graphUpdateEdge(
    * will only run successfully if the edge is contained within the graph.
    * 
    * @param graphName
+   *          The name of the graph.
    * @param edgeCollectionName
+   *          The name of the collection containing edge to update.
    * @param key
+   *          The key of the edge to update.
    * @param value
+   *          The object to update the existing edge.
    * @param waitForSync
+   *          Wait for sync.
    * @param keepNull
-   * @param rev
    * @param ifMatchRevision
+   *          If not null the revision of the vertex in the database has to be
+   *          equal to update the edge.
+   * @param ifNoneMatchRevision
+   *          If not null the revision of the vertex in the database has to be
+   *          different to update the edge.
    * @return
    * @throws ArangoException
    */
@@ -4060,8 +4159,8 @@ public <T> EdgeEntity<T> graphUpdateEdge(
     Object value,
     Boolean waitForSync,
     Boolean keepNull,
-    Long rev,
-    Long ifMatchRevision) throws ArangoException {
+    Long ifMatchRevision,
+    Long ifNoneMatchRevision) throws ArangoException {
     return graphDriver.updateEdge(
       getDefaultDatabase(),
       graphName,
@@ -4070,8 +4169,8 @@ public <T> EdgeEntity<T> graphUpdateEdge(
       value,
       waitForSync,
       keepNull,
-      rev,
-      ifMatchRevision);
+      ifMatchRevision,
+      ifNoneMatchRevision);
   }
 
   // Some methods not using the graph api