#80 refactor resolvers: prepare read and query options

Author: aburmeis

src/main/java/com/arangodb/springframework/core/convert/resolver/AbstractResolver.java

@@ -102,6 +102,16 @@ private Class<?> enhancedTypeFor(final Class<?> type) {
 		return enhancer.createClass();
 	}
 
+	protected DocumentReadOptions defaultReadOptions() {
+		DocumentReadOptions options = new DocumentReadOptions();
+		return options;
+	}
+
+	protected AqlQueryOptions defaultQueryOptions() {
+		AqlQueryOptions options = new AqlQueryOptions();
+		return options;
+	}
+
 	static class ProxyInterceptor<A extends Annotation> implements Serializable,
 			org.springframework.cglib.proxy.MethodInterceptor, org.aopalliance.intercept.MethodInterceptor {
 

src/main/java/com/arangodb/springframework/core/convert/resolver/DocumentFromResolver.java

@@ -23,7 +23,6 @@
 import org.springframework.data.util.TypeInformation;
 
 import com.arangodb.ArangoCursor;
-import com.arangodb.model.AqlQueryOptions;
 import com.arangodb.springframework.annotation.From;
 import com.arangodb.springframework.core.ArangoOperations;
 import com.arangodb.util.MapBuilder;
@@ -63,8 +62,8 @@ private Object _resolveMultiple(final String id, final TypeInformation<?> type)
 
 	private ArangoCursor<?> _resolve(final String id, final Class<?> type, final boolean limit) {
 		final String query = String.format("FOR e IN @@edge FILTER e._from == @id %s RETURN e", limit ? "LIMIT 1" : "");
-		return template.query(query, new MapBuilder().put("@edge", type).put("id", id).get(), new AqlQueryOptions(),
-			type);
+		return template.query(query, new MapBuilder().put("@edge", type).put("id", id).get(),
+				defaultQueryOptions(), type);
 	}
 
 }

src/main/java/com/arangodb/springframework/core/convert/resolver/DocumentToResolver.java

@@ -23,7 +23,6 @@
 import org.springframework.data.util.TypeInformation;
 
 import com.arangodb.ArangoCursor;
-import com.arangodb.model.AqlQueryOptions;
 import com.arangodb.springframework.annotation.To;
 import com.arangodb.springframework.core.ArangoOperations;
 import com.arangodb.util.MapBuilder;
@@ -62,8 +61,8 @@ private Object _resolveMultiple(final String id, final TypeInformation<?> type)
 
 	private ArangoCursor<?> _resolve(final String id, final Class<?> type, final boolean limit) {
 		final String query = String.format("FOR e IN @@edge FILTER e._to == @id RETURN e", limit ? "LIMIT 1" : "");
-		return template.query(query, new MapBuilder().put("@edge", type).put("id", id).get(), new AqlQueryOptions(),
-			type);
+		return template.query(query, new MapBuilder().put("@edge", type).put("id", id).get(),
+				defaultQueryOptions(), type);
 	}
 
 }

src/main/java/com/arangodb/springframework/core/convert/resolver/EdgeFromResolver.java

@@ -43,7 +43,7 @@ public Object resolveOne(final String id, final TypeInformation<?> type, Collect
 	}
 
 	private Object _resolveOne(final String id, final TypeInformation<?> type) {
-		return template.find(id, type.getType()).get();
+		return template.find(id, type.getType(), defaultReadOptions()).get();
 	}
 
 	@Override

src/main/java/com/arangodb/springframework/core/convert/resolver/EdgeToResolver.java

@@ -43,7 +43,7 @@ public Object resolveOne(final String id, final TypeInformation<?> type, Collect
 	}
 
 	private Object _resolveOne(final String id, final TypeInformation<?> type) {
-		return template.find(id, type.getType()).get();
+		return template.find(id, type.getType(), defaultReadOptions()).get();
 	}
 
 	@Override

src/main/java/com/arangodb/springframework/core/convert/resolver/RefResolver.java

@@ -55,7 +55,7 @@ public Object resolveMultiple(final Collection<String> ids, final TypeInformatio
 
 	@Override
 	public Object resolve(final String id, final TypeInformation<?> type, final Ref annotation) {
-		return template.find(id, type.getType()).get();
+		return template.find(id, type.getType(), defaultReadOptions()).get();
 	}
 
 	@Override

src/main/java/com/arangodb/springframework/core/convert/resolver/RelationsResolver.java

@@ -100,7 +100,7 @@ private ArangoCursor<?> _resolve(
 				edges, //
 				limit ? "LIMIT 1" : "");
 
-		return template.query(query, bindVars.get(), type);
+		return template.query(query, bindVars.get(), defaultQueryOptions(), type);
 	}
 
 }