typed GeoResult converters

Author: rashtao

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

@@ -200,7 +200,7 @@ private Object convertResult(final ArangoCursor<?> result, final ArangoParameter
 			}
 			return (Integer) result.next() > 0;
 		}
-		final ArangoResultConverter resultConverter = new ArangoResultConverter(accessor, result, operations, domainClass);
+		final ArangoResultConverter<?> resultConverter = new ArangoResultConverter<>(accessor, result, operations, domainClass);
 		return resultConverter.convertResult(method.getReturnType().getType());
 	}
 

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

@@ -53,15 +53,15 @@
  * @author Mark Vollmary
  * @author Christian Lechner
  */
-public class ArangoResultConverter {
+public class ArangoResultConverter<T> {
 
     private final static String MISSING_FULL_COUNT = "Query result does not contain the full result count! "
             + "The most likely cause is a forgotten LIMIT clause in the query.";
 
     private final ArangoParameterAccessor accessor;
     private final ArangoCursor<?> result;
     private final ArangoOperations operations;
-    private final Class<?> domainClass;
+    private final Class<T> domainClass;
 
 
     /**
@@ -71,7 +71,7 @@ public class ArangoResultConverter {
      * @param domainClass class type of documents
      */
     public ArangoResultConverter(final ArangoParameterAccessor accessor, final ArangoCursor<?> result,
-                                 final ArangoOperations operations, final Class<?> domainClass) {
+                                 final ArangoOperations operations, final Class<T> domainClass) {
         this.accessor = accessor;
         this.result = result;
         this.operations = operations;
@@ -132,22 +132,21 @@ private Set<?> buildSet(final ArangoCursor<?> cursor) {
      * @param cursor query result from driver
      * @return GeoResult object
      */
-    private GeoResult<?> buildGeoResult(final ArangoCursor<?> cursor) {
+    private GeoResult<T> buildGeoResult(final ArangoCursor<TxJsonNode> cursor) {
         return buildGeoResult(cursor.next());
     }
 
     /**
      * Construct a GeoResult from the given object
      *
-     * @param object object representing one document in the result
+     * @param data object representing one document in the result
      * @return GeoResult object
      */
-    private GeoResult<?> buildGeoResult(final Object object) {
-        final TxJsonNode data = (TxJsonNode) object;
+    private GeoResult<T> buildGeoResult(final TxJsonNode data) {
         final JsonNode slice = data.value();
         final JsonNode distSlice = slice.get("_distance");
         final Double distanceInMeters = distSlice.isDouble() ? distSlice.doubleValue() : null;
-        final Object entity = operations.getConverter().read(domainClass, data);
+        final T entity = operations.getConverter().read(domainClass, data);
         final Distance distance = new Distance(distanceInMeters / 1000, Metrics.KILOMETERS);
         return new GeoResult<>(entity, distance);
     }
@@ -158,11 +157,10 @@ private GeoResult<?> buildGeoResult(final Object object) {
      * @param cursor ArangoCursor containing query results
      * @return GeoResults object with all results
      */
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    private GeoResults<?> buildGeoResults(final ArangoCursor<?> cursor) {
-        final List<GeoResult<?>> list = new LinkedList<>();
+    private GeoResults<T> buildGeoResults(final ArangoCursor<TxJsonNode> cursor) {
+        final List<GeoResult<T>> list = new LinkedList<>();
         cursor.forEachRemaining(o -> list.add(buildGeoResult(o)));
-        return new GeoResults(list);
+        return new GeoResults<>(list);
     }
 
     public Optional<?> convertOptional() {
@@ -186,17 +184,20 @@ public ArangoCursor<?> convertArangoCursor() {
         return result;
     }
 
-    public GeoResult<?> convertGeoResult() {
-        return buildGeoResult(result);
+    @SuppressWarnings("unchecked")
+    public GeoResult<T> convertGeoResult() {
+        return buildGeoResult((ArangoCursor<TxJsonNode>) result);
     }
 
-    public GeoResults<?> convertGeoResults() {
-        return buildGeoResults(result);
+    @SuppressWarnings("unchecked")
+    public GeoResults<T> convertGeoResults() {
+        return buildGeoResults((ArangoCursor<TxJsonNode>) result);
     }
 
-    public GeoPage<?> convertGeoPage() {
+    @SuppressWarnings("unchecked")
+    public GeoPage<T> convertGeoPage() {
         Assert.notNull(result.getStats().getFullCount(), MISSING_FULL_COUNT);
-        return new GeoPage<>(buildGeoResults(result), accessor.getPageable(), ((Number) result.getStats().getFullCount()).longValue());
+        return new GeoPage<>(buildGeoResults((ArangoCursor<TxJsonNode>) result), accessor.getPageable(), ((Number) result.getStats().getFullCount()).longValue());
     }
 
     public Object convertArray() {