GeoResult mapping refactoring

Author: rashtao

src/main/java/com/arangodb/springframework/core/convert/ArangoEntityReader.java

@@ -30,6 +30,7 @@
  */
 public interface ArangoEntityReader {
 
+    // FIXME: remove
     default <R> R read(Class<R> type, JsonNode source) {
         return read(type, source, TransactionMappingContext.EMPTY);
     }

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

@@ -20,19 +20,15 @@
 
 package com.arangodb.springframework.repository.query;
 
-import java.lang.reflect.Method;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Spliterators;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import com.arangodb.springframework.core.mapping.TransactionMappingContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -66,29 +62,6 @@ public class ArangoResultConverter {
     private final ArangoOperations operations;
     private final Class<?> domainClass;
 
-    private static Map<Object, Method> TYPE_MAP = new HashMap<>();
-
-    /**
-     * Build static map of all supported return types and the method used to convert them
-     */
-    static {
-        try {
-            TYPE_MAP.put(List.class, ArangoResultConverter.class.getMethod("convertList"));
-            TYPE_MAP.put(Iterable.class, ArangoResultConverter.class.getMethod("convertList"));
-            TYPE_MAP.put(Collection.class, ArangoResultConverter.class.getMethod("convertList"));
-            TYPE_MAP.put(Page.class, ArangoResultConverter.class.getMethod("convertPage"));
-            TYPE_MAP.put(Slice.class, ArangoResultConverter.class.getMethod("convertPage"));
-            TYPE_MAP.put(Set.class, ArangoResultConverter.class.getMethod("convertSet"));
-            TYPE_MAP.put(ArangoCursor.class, ArangoResultConverter.class.getMethod("convertArangoCursor"));
-            TYPE_MAP.put(GeoResult.class, ArangoResultConverter.class.getMethod("convertGeoResult"));
-            TYPE_MAP.put(GeoResults.class, ArangoResultConverter.class.getMethod("convertGeoResults"));
-            TYPE_MAP.put(GeoPage.class, ArangoResultConverter.class.getMethod("convertGeoPage"));
-            TYPE_MAP.put(Optional.class, ArangoResultConverter.class.getMethod("convertOptional"));
-            TYPE_MAP.put("array", ArangoResultConverter.class.getMethod("convertArray"));
-        } catch (final NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
 
     /**
      * @param accessor
@@ -112,18 +85,42 @@ public ArangoResultConverter(final ArangoParameterAccessor accessor, final Arang
      */
     public Object convertResult(final Class<?> type) {
         try {
-            if (type.isArray()) {
-                return TYPE_MAP.get("array").invoke(this);
-            }
-            if (!TYPE_MAP.containsKey(type)) {
-                return getNext(result);
-            }
-            return TYPE_MAP.get(type).invoke(this);
+            return convert(type);
         } catch (final Exception e) {
             throw new MappingException(String.format("Can't convert result to type %s!", type.getName()), e);
         }
     }
 
+    private Object convert(Class<?> type) {
+        if (type.isArray()) {
+            return convertArray();
+        } else if (List.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)) {
+            return convertPage();
+        } else if (Set.class.equals(type)) {
+            return convertSet();
+        } else if (ArangoCursor.class.equals(type)) {
+            return convertArangoCursor();
+        } else if (GeoResult.class.equals(type)) {
+            return convertGeoResult();
+        } else if (GeoResults.class.equals(type)) {
+            return convertGeoResults();
+        } else if (GeoPage.class.equals(type)) {
+            return convertGeoPage();
+        } else if (Optional.class.equals(type)) {
+            return convertOptional();
+        } else {
+            return getNext(result);
+        }
+    }
+
     /**
      * Creates a Set return type from the given cursor
      *
@@ -142,20 +139,23 @@ private Set<?> buildSet(final ArangoCursor<?> cursor) {
      */
     private GeoResult<?> buildGeoResult(final ArangoCursor<?> cursor) {
         GeoResult<?> geoResult = null;
+        // FIXME
         while (cursor.hasNext() && geoResult == null) {
             final Object object = cursor.next();
             if (!(object instanceof JsonNode)) {
+                // FIXME
                 continue;
             }
 
             final JsonNode slice = (JsonNode) object;
             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, slice, TransactionMappingContext.EMPTY);
+            final Object entity = operations.getConverter().read(domainClass, slice);
             final Distance distance = new Distance(distanceInMeters / 1000, Metrics.KILOMETERS);
             geoResult = new GeoResult<>(entity, distance);
         }
@@ -170,17 +170,19 @@ private GeoResult<?> buildGeoResult(final ArangoCursor<?> cursor) {
      */
     private GeoResult<?> buildGeoResult(final Object object) {
         if (object == null || !(object instanceof JsonNode)) {
+            // FIXME
             return null;
         }
 
         final JsonNode slice = (JsonNode) object;
         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, slice, TransactionMappingContext.EMPTY);
+        final Object entity = operations.getConverter().read(domainClass, slice);
         final Distance distance = new Distance(distanceInMeters / 1000, Metrics.KILOMETERS);
         return new GeoResult<>(entity, distance);
     }