ShortestPathEntity updates

Author: a-brandt

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

@@ -5320,6 +5320,10 @@ public <V, E> ShortestPathEntity<V, E> graphGetShortesPath(
 		Class<V> vertexClass,
 		Class<E> edgeClass) throws ArangoException {
 
+		if (shortestPathOptions == null) {
+			shortestPathOptions = new ShortestPathOptions();
+		}
+
 		return cursorDriver.getShortesPath(getDefaultDatabase(), graphName, startVertexExample, endVertexExample,
 			shortestPathOptions, getDefaultAqlQueryOptions(), vertexClass, edgeClass);
 	}

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

@@ -1969,23 +1969,32 @@ public static class ShortestPathEntityDeserializer implements JsonDeserializer<S
 					edgeClazz = nextParameterized();
 				}
 
-				if (result.has("vertex")) {
-					if (result.get("vertex").isJsonObject()) {
-						entity.setVertex(result.getAsJsonObject("vertex").getAsJsonPrimitive("_id").getAsString());
-					} else if (result.get("vertex").isJsonPrimitive()) {
-						entity.setVertex(result.getAsJsonPrimitive("vertex").getAsString());
-					}
-				}
 				if (result.has("distance")) {
 					entity.setDistance(result.get("distance").getAsLong());
 				} else {
 					entity.setDistance(-1L);
 				}
-				if (result.has("startVertex")) {
-					entity.setStartVertex(result.get("startVertex").getAsString());
+				if (result.has("edges")) {
+					// new version >= 2.6
+					entity.setEdges(getEdges(edgeClazz, context, result.getAsJsonArray("edges")));
+				}
+				if (result.has("vertices")) {
+					// new version >= 2.6
+					entity.setVertices(getVertices(vertexClazz, context, result.getAsJsonArray("vertices")));
 				}
 				if (result.has("paths")) {
-					entity.setPaths(getPaths(context, result, vertexClazz, edgeClazz));
+					// old version < 2.6
+					JsonArray paths = result.getAsJsonArray("paths");
+					if (!paths.equals(null) && paths.size() > 0) {
+						JsonObject path = paths.get(0).getAsJsonObject();
+
+						if (path.has("edges")) {
+							entity.setEdges(getEdges(edgeClazz, context, path.getAsJsonArray("edges")));
+						}
+						if (path.has("vertices")) {
+							entity.setVertices(getVertices(vertexClazz, context, path.getAsJsonArray("vertices")));
+						}
+					}
 				}
 			} else {
 				entity.setDistance(-1L);

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

@@ -330,9 +330,7 @@ public void shortesPathTest() throws ArangoException {
 		assertEquals(201, entity.getCode());
 
 		assertEquals(1L, entity.getDistance().longValue());
-		assertEquals(vertex1.getDocumentHandle(), entity.getStartVertex());
-		assertEquals(vertex2.getDocumentHandle(), entity.getVertex());
-		// assertEquals(1, entity.getPaths().get(0).getEdges().size());
-		// assertEquals(2, entity.getPaths().get(0).getVertices().size());
+		assertEquals(1, entity.getEdges().size());
+		assertEquals(2, entity.getVertices().size());
 	}
 }

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

@@ -122,9 +122,10 @@ public static void main(String[] args) {
 
 	private static void printShortestPath(ShortestPathEntity<Person, Knows> shortestPath) {
 		if (shortestPath.getDistance() > -1) {
-			System.out.printf("%20s -> %20s distance = %d, paths.size() = %d, paths.get(0).edges.size() = %d%n",
-				shortestPath.getStartVertex(), shortestPath.getVertex(), shortestPath.getDistance(), shortestPath
-						.getPaths().size(), shortestPath.getPaths().get(0).getEdges().size());
+			System.out.printf("%s -> %s : distance = %d, getVertices().size() = %d, edges.size() = %d%n", shortestPath
+					.getVertices().get(0).getDocumentHandle(),
+				shortestPath.getVertices().get(shortestPath.getVertices().size() - 1).getDocumentHandle(),
+				shortestPath.getDistance(), shortestPath.getVertices().size(), shortestPath.getEdges().size());
 		} else {
 			System.out.println("no path");
 		}