Merge branch 'devel' of github.com:arangodb/arangodb-java-driver into devel

a-brandt · a-brandt · commit c4e9b26aeec8 · 2014-10-31T15:57:01.000+01:00
diff --git a/src/main/java/com/arangodb/ArangoDriver.java b/src/main/java/com/arangodb/ArangoDriver.java
@@ -1908,11 +1908,8 @@ public GraphEntity graphDeleteEdgeDefinition(String graphName, String edgeCollec
    * @return <T> DocumentEntity<T>
    * @throws ArangoException
    */
-  public <T> DocumentEntity<T> graphCreateVertex(
-    String graphName,
-    String collectionName,
-    Object vertex,
-    Boolean waitForSync) throws ArangoException {
+  public <T> DocumentEntity<T>
+      graphCreateVertex(String graphName, String collectionName, T vertex, Boolean waitForSync) throws ArangoException {
     return graphDriver.createVertex(getDefaultDatabase(), graphName, collectionName, vertex, waitForSync);
   }
 
diff --git a/src/main/java/com/arangodb/InternalGraphDriver.java b/src/main/java/com/arangodb/InternalGraphDriver.java
@@ -215,7 +215,7 @@ <T> DocumentEntity<T> createVertex(
     String database,
     String graphName,
     String collectionName,
-    Object vertex,
+    T vertex,
     Boolean waitForSync) throws ArangoException;
 
   <T> DocumentEntity<T> getVertex(
diff --git a/src/main/java/com/arangodb/impl/InternalGraphDriverImpl.java b/src/main/java/com/arangodb/impl/InternalGraphDriverImpl.java
@@ -330,7 +330,7 @@ public <T> DocumentEntity<T> createVertex(
     String database,
     String graphName,
     String collectionName,
-    Object vertex,
+    T vertex,
     Boolean waitForSync) throws ArangoException {
 
     validateCollectionName(graphName);
diff --git a/src/test/java/com/arangodb/ArangoDriverGraphVertexTest.java b/src/test/java/com/arangodb/ArangoDriverGraphVertexTest.java
@@ -96,7 +96,7 @@ public void test_create_vertex_error_collection() throws ArangoException {
   }
 
   @Test
-  public void test_get_vertex() throws ArangoException {
+  public void test_graphGetVertex() throws ArangoException {
     driver.createGraph(this.graphName, this.createEdgeDefinitions(2, 0), this.createOrphanCollections(2), true);
     DocumentEntity<TestComplexEntity01> vertex = driver.graphCreateVertex(
       this.graphName,

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public void test_create_vertex_error_collection() throws ArangoException {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Test`
`99`		`- public void test_get_vertex() throws ArangoException {`
	`99`	`+ public void test_graphGetVertex() throws ArangoException {`
`100`	`100`	`driver.createGraph(this.graphName, this.createEdgeDefinitions(2, 0), this.createOrphanCollections(2), true);`
`101`	`101`	`DocumentEntity<TestComplexEntity01> vertex = driver.graphCreateVertex(`
`102`	`102`	`this.graphName,`