#80 refactor resolvers: move template up

Author: aburmeis

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

@@ -24,6 +24,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
+import com.arangodb.springframework.core.ArangoOperations;
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.cglib.proxy.Callback;
@@ -57,11 +58,11 @@ public abstract class AbstractResolver<A extends Annotation> {
 	}
 
 	private final ObjenesisStd objenesis;
-	private final ConversionService conversionService;
+	protected final ArangoOperations template;
 
-	protected AbstractResolver(final ConversionService conversionService) {
+	protected AbstractResolver(final ArangoOperations template) {
 		super();
-		this.conversionService = conversionService;
+		this.template = template;
 		this.objenesis = new ObjenesisStd(true);
 	}
 
@@ -77,7 +78,7 @@ protected Object proxy(
 		final TypeInformation<?> type,
 		final A annotation,
 		final ResolverCallback<A> callback) {
-		final ProxyInterceptor interceptor = new ProxyInterceptor(id, type, annotation, callback, conversionService);
+		final ProxyInterceptor interceptor = new ProxyInterceptor(id, type, annotation, callback, template.getConverter().getConversionService());
 		if (type.getType().isInterface()) {
 			final ProxyFactory proxyFactory = new ProxyFactory(new Class<?>[] { type.getType() });
 			for (final Class<?> interf : type.getType().getInterfaces()) {

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

@@ -37,11 +37,8 @@
  */
 public class DocumentFromResolver extends AbstractResolver<From> implements RelationResolver<From> {
 
-	private final ArangoOperations template;
-
 	public DocumentFromResolver(final ArangoOperations template) {
-		super(template.getConverter().getConversionService());
-		this.template = template;
+		super(template);
 	}
 
 	@Override

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

@@ -37,11 +37,8 @@
  */
 public class DocumentToResolver extends AbstractResolver<To> implements RelationResolver<To> {
 
-	private final ArangoOperations template;
-
 	public DocumentToResolver(final ArangoOperations template) {
-		super(template.getConverter().getConversionService());
-		this.template = template;
+		super(template);
 	}
 
 	@Override

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

@@ -33,11 +33,8 @@
  */
 public class EdgeFromResolver extends AbstractResolver<From> implements RelationResolver<From> {
 
-	private final ArangoOperations template;
-
 	public EdgeFromResolver(final ArangoOperations template) {
-		super(template.getConverter().getConversionService());
-		this.template = template;
+		super(template);
 	}
 
 	@Override

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

@@ -33,11 +33,8 @@
  */
 public class EdgeToResolver extends AbstractResolver<To> implements RelationResolver<To> {
 
-	private final ArangoOperations template;
-
 	public EdgeToResolver(final ArangoOperations template) {
-		super(template.getConverter().getConversionService());
-		this.template = template;
+		super(template);
 	}
 
 	@Override

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

@@ -38,11 +38,8 @@
 public class RefResolver extends AbstractResolver<Ref>
 		implements ReferenceResolver<Ref>, AbstractResolver.ResolverCallback<Ref> {
 
-	private final ArangoOperations template;
-
 	public RefResolver(final ArangoOperations template) {
-		super(template.getConverter().getConversionService());
-		this.template = template;
+		super(template);
 	}
 
 	@Override

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

@@ -37,11 +37,8 @@
  */
 public class RelationsResolver extends AbstractResolver<Relations> implements RelationResolver<Relations> {
 
-	private final ArangoOperations template;
-
 	public RelationsResolver(final ArangoOperations template) {
-		super(template.getConverter().getConversionService());
-		this.template = template;
+		super(template);
 	}
 
 	@Override