Merge branch 'master' of https://github.com/arangodb/arangodb-java-driver

Author: a-brandt

README.md

@@ -26,13 +26,13 @@ To add the driver to your project with maven, add the following code to your pom
   <dependency>
     <groupId>com.arangodb</groupId>
     <artifactId>arangodb-java-driver</artifactId>
-    <version>2.5.7</version>
+    <version>2.6.8</version>
   </dependency>
 	....
 </dependencies>
 ```
 
-If you want to test with a snapshot version (e.g. 2.5.8-SNAPSHOT), add the staging repository of oss.sonatype.org to your pom.xml:
+If you want to test with a snapshot version (e.g. 2.6.9-SNAPSHOT), add the staging repository of oss.sonatype.org to your pom.xml:
 
 ```XML
 <repositories>
@@ -430,4 +430,6 @@ see 2.4.4
 	* createEdge takes graphName but needs database name
 * ArangoDB 2.6 support
 
+## since 2.6.8
+* fixed GRAPH_EDGES() 2.6-incompatibility
 

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.arangodb</groupId>
 	<artifactId>arangodb-java-driver</artifactId>
-	<version>2.5.8-SNAPSHOT</version>
+	<version>2.6.9-SNAPSHOT</version>
 	<inceptionYear>2012</inceptionYear>
 	<packaging>jar</packaging>
 

src/main/java/com/arangodb/ArangoDriver.java

@@ -5073,7 +5073,7 @@ public <T> EdgeEntity<T> graphUpdateEdge(
 	public CursorEntity<PlainEdgeEntity> graphGetEdges(String graphName) throws ArangoException {
 
 		validateCollectionName(graphName);
-		String query = "for i in graph_edges(@graphName, null) return i";
+		String query = "for i in graph_edges(@graphName, null, { includeData: true }) return i";
 		Map<String, Object> bindVars = new MapBuilder().put("graphName", graphName).get();
 
 		CursorEntity<PlainEdgeEntity> result = this.executeQuery(query, bindVars, PlainEdgeEntity.class, true, 20);
@@ -5240,7 +5240,7 @@ public <T> CursorEntity<T> graphGetEdges(String graphName, Class<T> clazz, Strin
 			throws ArangoException {
 
 		validateCollectionName(graphName);
-		String query = "for i in graph_edges(@graphName, @vertexDocumentHandle) return i";
+		String query = "for i in graph_edges(@graphName, @vertexDocumentHandle, { includeData: true }) return i";
 		Map<String, Object> bindVars = new MapBuilder().put("graphName", graphName)
 				.put("vertexDocumentHandle", vertexDocumentHandle).get();
 
@@ -5282,7 +5282,7 @@ public <T> EdgeCursor<T> graphGetEdgeCursorByExample(String graphName, Class<T>
 	public <T> CursorEntity<T> graphGetEdgesByExampleObject(String graphName, Class<T> clazz, Object vertexExample)
 			throws ArangoException {
 		validateCollectionName(graphName);
-		String query = "for i in graph_edges(@graphName, @vertexExample) return i";
+		String query = "for i in graph_edges(@graphName, @vertexExample, { includeData: true }) return i";
 
 		Map<String, Object> bindVars = new MapBuilder().put("graphName", graphName).put("vertexExample", vertexExample)
 				.get();
@@ -5312,7 +5312,7 @@ public <T> CursorEntity<T> graphGetEdgesByExampleMap(
 		Class<T> clazz,
 		Map<String, Object> vertexExample) throws ArangoException {
 		validateCollectionName(graphName);
-		String query = "for i in graph_edges(@graphName, @vertexExample) return i";
+		String query = "for i in graph_edges(@graphName, @vertexExample, { includeData: true }) return i";
 
 		Map<String, Object> bindVars = new MapBuilder().put("graphName", graphName).put("vertexExample", vertexExample)
 				.get();
@@ -5322,7 +5322,7 @@ public <T> CursorEntity<T> graphGetEdgesByExampleMap(
 		return result;
 	}
 
-	public <V, E> ShortestPathEntity<V, E> graphGetShortesPath(
+	public <V, E> ShortestPathEntity<V, E> graphGetShortestPath(
 		String graphName,
 		Object startVertexExample,
 		Object endVertexExample,
@@ -5334,7 +5334,7 @@ public <V, E> ShortestPathEntity<V, E> graphGetShortesPath(
 			shortestPathOptions = new ShortestPathOptions();
 		}
 
-		return cursorDriver.getShortesPath(getDefaultDatabase(), graphName, startVertexExample, endVertexExample,
+		return cursorDriver.getShortestPath(getDefaultDatabase(), graphName, startVertexExample, endVertexExample,
 			shortestPathOptions, getDefaultAqlQueryOptions(), vertexClass, edgeClass);
 	}
 

src/main/java/com/arangodb/InternalCursorDriver.java

@@ -71,7 +71,7 @@ <T, S extends DocumentEntity<T>> DocumentCursorResult<T, S> executeBaseCursorQue
 	 * @return a ShortestPathEntity object
 	 * @throws ArangoException
 	 */
-	public <V, E> ShortestPathEntity<V, E> getShortesPath(
+	public <V, E> ShortestPathEntity<V, E> getShortestPath(
 		String database,
 		String graphName,
 		Object startVertexExample,

src/main/java/com/arangodb/entity/BaseDocument.java

@@ -14,7 +14,7 @@ public class BaseDocument extends BaseEntity implements DocumentHolder {
 
 	public static final String KEY = "_key";
 
-	public static final String ID = "_ID";
+	public static final String ID = "_id";
 
 	public static final String FROM = "_from";
 

src/main/java/com/arangodb/impl/InternalCursorDriverImpl.java

@@ -138,7 +138,7 @@ public <T> CursorResult<T> executeAqlQuery(
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public <V, E> ShortestPathEntity<V, E> getShortesPath(
+	public <V, E> ShortestPathEntity<V, E> getShortestPath(
 		String database,
 		String graphName,
 		Object startVertexExample,

src/test/java/com/arangodb/ArangoDriverGraphEdgesGetCursorTest.java

@@ -308,7 +308,7 @@ public void edgesAqlTest() throws ArangoException {
 	}
 
 	@Test
-	public void shortesPathTest() throws ArangoException {
+	public void shortestPathTest() throws ArangoException {
 
 		TestComplexEntity01 v1 = new TestComplexEntity01("Homer", "A Simpson", 38);
 		TestComplexEntity01 v2 = new TestComplexEntity01("Marge", "A Simpson", 36);
@@ -323,7 +323,7 @@ public void shortesPathTest() throws ArangoException {
 		shortestPathOptions.setDirection(Direction.OUTBOUND);
 
 		//
-		ShortestPathEntity<TestComplexEntity01, TestComplexEntity02> entity = driver.graphGetShortesPath(GRAPH_NAME,
+		ShortestPathEntity<TestComplexEntity01, TestComplexEntity02> entity = driver.graphGetShortestPath(GRAPH_NAME,
 			vertex1.getDocumentHandle(), vertex2.getDocumentHandle(), shortestPathOptions, TestComplexEntity01.class,
 			TestComplexEntity02.class);
 

src/test/java/com/arangodb/example/GraphQueryExample.java

@@ -101,13 +101,13 @@ public static void main(String[] args) {
 			}
 
 			// path A -> F
-			ShortestPathEntity<Person, Knows> shortestPath = driver.graphGetShortesPath(GRAPH_NAME, new Person("A"),
+			ShortestPathEntity<Person, Knows> shortestPath = driver.graphGetShortestPath(GRAPH_NAME, new Person("A"),
 				new Person("F"), new ShortestPathOptions().setDirection(Direction.OUTBOUND), Person.class, Knows.class);
 
 			printShortestPath(shortestPath);
 
 			// path F -> A (empty result)
-			shortestPath = driver.graphGetShortesPath(GRAPH_NAME, new Person("F"), new Person("A"),
+			shortestPath = driver.graphGetShortestPath(GRAPH_NAME, new Person("F"), new Person("A"),
 				new ShortestPathOptions().setDirection(Direction.OUTBOUND), Person.class, Knows.class);
 
 			printShortestPath(shortestPath);