Revert "move ResolverFactory impl from anon. class to own class (#99)"

This reverts commit 3769bfd.

Author: mpv1989

src/main/java/com/arangodb/springframework/config/AbstractArangoConfiguration.java

@@ -20,7 +20,9 @@
 
 package com.arangodb.springframework.config;
 
+import java.lang.annotation.Annotation;
 import java.util.Collections;
+import java.util.Optional;
 import java.util.Set;
 
 import org.springframework.context.annotation.Bean;
@@ -30,14 +32,24 @@
 import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 
 import com.arangodb.ArangoDB;
+import com.arangodb.ArangoDBException;
+import com.arangodb.springframework.annotation.From;
+import com.arangodb.springframework.annotation.Ref;
+import com.arangodb.springframework.annotation.Relations;
+import com.arangodb.springframework.annotation.To;
 import com.arangodb.springframework.core.ArangoOperations;
 import com.arangodb.springframework.core.convert.ArangoConverter;
 import com.arangodb.springframework.core.convert.ArangoCustomConversions;
 import com.arangodb.springframework.core.convert.ArangoTypeMapper;
 import com.arangodb.springframework.core.convert.DefaultArangoConverter;
 import com.arangodb.springframework.core.convert.DefaultArangoTypeMapper;
-import com.arangodb.springframework.core.convert.resolver.DefaultResolverFactory;
+import com.arangodb.springframework.core.convert.resolver.FromResolver;
+import com.arangodb.springframework.core.convert.resolver.RefResolver;
+import com.arangodb.springframework.core.convert.resolver.ReferenceResolver;
+import com.arangodb.springframework.core.convert.resolver.RelationResolver;
+import com.arangodb.springframework.core.convert.resolver.RelationsResolver;
 import com.arangodb.springframework.core.convert.resolver.ResolverFactory;
+import com.arangodb.springframework.core.convert.resolver.ToResolver;
 import com.arangodb.springframework.core.mapping.ArangoMappingContext;
 import com.arangodb.springframework.core.template.ArangoTemplate;
 
@@ -97,8 +109,40 @@ protected ArangoTypeMapper arangoTypeMapper() throws Exception {
 		return new DefaultArangoTypeMapper(typeKey(), arangoMappingContext());
 	}
 
-	protected ResolverFactory resolverFactory() throws Exception {
-		return new DefaultResolverFactory(arangoTemplate());
+	protected ResolverFactory resolverFactory() {
+		return new ResolverFactory() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public <A extends Annotation> Optional<ReferenceResolver<A>> getReferenceResolver(final A annotation) {
+				ReferenceResolver<A> resolver = null;
+				try {
+					if (annotation instanceof Ref) {
+						resolver = (ReferenceResolver<A>) new RefResolver(arangoTemplate());
+					}
+				} catch (final Exception e) {
+					throw new ArangoDBException(e);
+				}
+				return Optional.ofNullable(resolver);
+			}
+
+			@SuppressWarnings("unchecked")
+			@Override
+			public <A extends Annotation> Optional<RelationResolver<A>> getRelationResolver(final A annotation) {
+				RelationResolver<A> resolver = null;
+				try {
+					if (annotation instanceof From) {
+						resolver = (RelationResolver<A>) new FromResolver(arangoTemplate());
+					} else if (annotation instanceof To) {
+						resolver = (RelationResolver<A>) new ToResolver(arangoTemplate());
+					} else if (annotation instanceof Relations) {
+						resolver = (RelationResolver<A>) new RelationsResolver(arangoTemplate());
+					}
+				} catch (final Exception e) {
+					throw new ArangoDBException(e);
+				}
+				return Optional.ofNullable(resolver);
+			}
+		};
 	}
 
 }

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

@@ -1,36 +1,36 @@
-/*
- * DISCLAIMER
- *
- * Copyright 2017 ArangoDB GmbH, Cologne, Germany
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright holder is ArangoDB GmbH, Cologne, Germany
- */
-
-package com.arangodb.springframework.core.convert.resolver;
-
-import java.lang.annotation.Annotation;
-import java.util.Optional;
-
-/**
- * @author Mark Vollmary
- *
- */
-public interface ResolverFactory {
-
-	<A extends Annotation> Optional<ReferenceResolver<A>> getReferenceResolver(A annotation);
-
-	<A extends Annotation> Optional<RelationResolver<A>> getRelationResolver(A annotation);
-
-}
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2017 ArangoDB GmbH, Cologne, Germany
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright holder is ArangoDB GmbH, Cologne, Germany
+ */
+
+package com.arangodb.springframework.core.convert.resolver;
+
+import java.lang.annotation.Annotation;
+import java.util.Optional;
+
+/**
+ * @author Mark Vollmary
+ *
+ */
+public interface ResolverFactory {
+
+	<A extends Annotation> Optional<ReferenceResolver<A>> getReferenceResolver(A annotation);
+
+	<A extends Annotation> Optional<RelationResolver<A>> getRelationResolver(A annotation);
+
+}