changes for ArangoDB 2.6

Author: a-brandt

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

@@ -5211,7 +5211,7 @@ public <T> VertexCursor<T> graphGetVertexCursor(
 	public EdgeCursor<PlainEdgeEntity> graphGetEdgeCursor(String graphName) throws ArangoException {
 		validateCollectionName(graphName);
 
-		return graphGetEdgeCursor(graphName, PlainEdgeEntity.class, null, null, null);
+		return graphGetEdgeCursor(graphName, PlainEdgeEntity.class, null, new GraphEdgesOptions(), null);
 	}
 
 	/**
@@ -5253,7 +5253,7 @@ public <T> CursorEntity<T> graphGetEdges(String graphName, Class<T> clazz, Strin
 	public <T> EdgeCursor<T> graphGetEdgeCursorByExample(String graphName, Class<T> clazz, Object vertexExample)
 			throws ArangoException {
 
-		return graphGetEdgeCursor(graphName, clazz, vertexExample, null, null);
+		return graphGetEdgeCursor(graphName, clazz, vertexExample, new GraphEdgesOptions(), null);
 	}
 
 	/**

src/main/java/com/arangodb/util/GraphEdgesOptions.java

@@ -18,6 +18,7 @@ public class GraphEdgesOptions implements OptionsInterface {
 	private Integer minDepth;
 	private Integer maxDepth;
 	private Integer maxIterations;
+	private Boolean includeData = Boolean.TRUE;
 
 	/**
 	 * The direction of the edges as a string. Possible values are outbound,
@@ -217,6 +218,26 @@ public GraphEdgesOptions setMaxIterations(Integer maxIterations) {
 		return this;
 	}
 
+	/**
+	 * Get include data
+	 * 
+	 * @return
+	 */
+	public Boolean getIncludeData() {
+		return includeData;
+	}
+
+	/**
+	 * set include data to be compatible with older versions of AnrangoDB
+	 * 
+	 * @param includeData
+	 * 
+	 * @since ArangoDB 2.6
+	 */
+	public void setIncludeData(Boolean includeData) {
+		this.includeData = includeData;
+	}
+
 	@Override
 	public Map<String, Object> toMap() {
 		MapBuilder mp = new MapBuilder();
@@ -247,6 +268,10 @@ public Map<String, Object> toMap() {
 		if (maxIterations != null) {
 			mp.put("maxIterations", maxIterations);
 		}
+		if (includeData != null) {
+			mp.put("includeData", includeData);
+		}
+
 		return mp.get();
 	}
 

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

@@ -232,7 +232,7 @@ public void batchSizeAndLimitTest() throws ArangoException {
 		Boolean count = true;
 		Boolean fullCount = true;
 
-		String query = "for i in graph_edges(@graphName, null) LIMIT 3 return i";
+		String query = "for i in graph_edges(@graphName, null, {includeData: true}) LIMIT 3 return i";
 		Map<String, Object> bindVars = new MapBuilder().put("graphName", GRAPH_NAME).get();
 
 		EdgeCursor<TestComplexEntity02> cursor = driver.executeEdgeQuery(query, bindVars,
@@ -279,7 +279,7 @@ public void edgesAqlTest() throws ArangoException {
 		String query = "for i in graph_edges(@graphName, @vertex, @options) return i";
 
 		// options bindVars
-		Map<String, Object> options = new MapBuilder().put("direction", "outbound").get();
+		Map<String, Object> options = new MapBuilder().put("direction", "outbound").put("includeData", true).get();
 
 		// bindVars
 		Map<String, Object> bindVars = new MapBuilder().put("graphName", GRAPH_NAME)