fixed GeoResult converters

Author: rashtao

src/main/java/com/arangodb/springframework/repository/query/ArangoResultConverter.java

@@ -95,15 +95,9 @@ public Object convertResult(final Class<?> type) {
     private Object convert(Class<?> type) {
         if (type.isArray()) {
             return convertArray();
-        } else if (List.class.equals(type)) {
+        } else if (List.class.equals(type) || Iterable.class.equals(type) || Collection.class.equals(type)) {
             return convertList();
-        } else if (Iterable.class.equals(type)) {
-            return convertList();
-        } else if (Collection.class.equals(type)) {
-            return convertList();
-        } else if (Page.class.equals(type)) {
-            return convertPage();
-        } else if (Slice.class.equals(type)) {
+        } else if (Page.class.equals(type) || Slice.class.equals(type)) {
             return convertPage();
         } else if (Set.class.equals(type)) {
             return convertSet();
@@ -139,29 +133,7 @@ private Set<?> buildSet(final ArangoCursor<?> cursor) {
      * @return GeoResult object
      */
     private GeoResult<?> buildGeoResult(final ArangoCursor<?> cursor) {
-        GeoResult<?> geoResult = null;
-        // FIXME
-        while (cursor.hasNext() && geoResult == null) {
-            final Object object = cursor.next();
-            if (!(object instanceof TxJsonNode)) {
-                // FIXME
-                continue;
-            }
-
-            final TxJsonNode data = (TxJsonNode) object;
-            final JsonNode slice = data.value();
-            final JsonNode distSlice = slice.get("_distance");
-            final Double distanceInMeters = distSlice.isDouble() ? distSlice.doubleValue() : null;
-            if (distanceInMeters == null) {
-                // FIXME
-                continue;
-            }
-
-            final Object entity = operations.getConverter().read(domainClass, data);
-            final Distance distance = new Distance(distanceInMeters / 1000, Metrics.KILOMETERS);
-            geoResult = new GeoResult<>(entity, distance);
-        }
-        return geoResult;
+        return buildGeoResult(cursor.next());
     }
 
     /**
@@ -171,20 +143,10 @@ private GeoResult<?> buildGeoResult(final ArangoCursor<?> cursor) {
      * @return GeoResult object
      */
     private GeoResult<?> buildGeoResult(final Object object) {
-        if (object == null || !(object instanceof TxJsonNode)) {
-            // FIXME
-            return null;
-        }
-
         final TxJsonNode data = (TxJsonNode) object;
         final JsonNode slice = data.value();
         final JsonNode distSlice = slice.get("_distance");
         final Double distanceInMeters = distSlice.isDouble() ? distSlice.doubleValue() : null;
-        if (distanceInMeters == null) {
-            // FIXME
-            return null;
-        }
-
         final Object entity = operations.getConverter().read(domainClass, data);
         final Distance distance = new Distance(distanceInMeters / 1000, Metrics.KILOMETERS);
         return new GeoResult<>(entity, distance);
@@ -199,12 +161,7 @@ private GeoResult<?> buildGeoResult(final Object object) {
     @SuppressWarnings({"rawtypes", "unchecked"})
     private GeoResults<?> buildGeoResults(final ArangoCursor<?> cursor) {
         final List<GeoResult<?>> list = new LinkedList<>();
-        cursor.forEachRemaining(o -> {
-            final GeoResult<?> geoResult = buildGeoResult(o);
-            if (geoResult != null) {
-                list.add(geoResult);
-            }
-        });
+        cursor.forEachRemaining(o -> list.add(buildGeoResult(o)));
         return new GeoResults(list);
     }