added support of ArangoDB 2.6

Author: Achim Brandt

src/main/java/com/arangodb/blueprints/client/ArangoDBBaseQuery.java

@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.arangodb.CursorResult;
@@ -67,7 +67,9 @@ public enum Direction {
 	};
 
 	public enum QueryType {
-		GRAPH_VERTICES, GRAPH_EDGES, GRAPH_NEIGHBORS
+		GRAPH_VERTICES,
+		GRAPH_EDGES,
+		GRAPH_NEIGHBORS
 	}
 
 	/**
@@ -101,14 +103,7 @@ public CursorResult<Map> getCursorResult() throws ArangoDBException {
 
 		Map<String, Object> options = new HashMap<String, Object>();
 		options.put("includeData", true);
-		options.put("direction", "any");
-		if (direction != null) {
-			if (direction == Direction.IN) {
-				options.put("direction", "inbound");
-			} else if (direction == Direction.OUT) {
-				options.put("direction", "outbound");
-			}
-		}
+		options.put("direction", getDirectionString());
 
 		Map<String, Object> bindVars = new HashMap<String, Object>();
 		bindVars.put("graphName", graph.getName());
@@ -132,9 +127,13 @@ public CursorResult<Map> getCursorResult() throws ArangoDBException {
 			sb.append("for i in GRAPH_EDGES(@graphName , @vertexExample, @options)");
 			break;
 		case GRAPH_NEIGHBORS:
-			sb.append("for i in GRAPH_NEIGHBORS(@graphName , @vertexExample, @options)");
-			prefix = "i.path.edges[0].";
-			returnExp = " return i.vertex";
+			// version 2.5
+			// sb.append("for i in GRAPH_NEIGHBORS(@graphName , @vertexExample,
+			// @options)");
+			// prefix = "i.path.edges[0].";
+			// returnExp = " return i.vertex";
+			sb.append("for i in GRAPH_EDGES(@graphName , @vertexExample, @options)");
+			returnExp = " return DOCUMENT(" + getDocumentByDirection() + ")";
 			break;
 		default:
 			break;
@@ -178,6 +177,30 @@ public CursorResult<Map> getCursorResult() throws ArangoDBException {
 		return client.executeAqlQuery(query, bindVars, aqlQueryOptions);
 	}
 
+	private String getDirectionString() {
+		if (direction != null) {
+			if (direction == Direction.IN) {
+				return "inbound";
+			} else if (direction == Direction.OUT) {
+				return "outbound";
+			}
+		}
+
+		return "any";
+	}
+
+	private String getDocumentByDirection() {
+		if (direction != null) {
+			if (direction == Direction.IN) {
+				return "i._from";
+			} else if (direction == Direction.OUT) {
+				return "i._to";
+			}
+		}
+
+		return "i._to == @vertexExample ? i._from : i._to";
+	}
+
 	public ArangoDBSimpleVertex getStartVertex() {
 		return startVertex;
 	}