fix merge error

Author: aburmeis

src/main/java/com/arangodb/springframework/core/ArangoOperations.java

@@ -451,7 +451,7 @@ <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertAll(
 	 * @return information about the documents
 	 * @throws DataAccessException
 	 */
-	default <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertAll(Iterable<T> values, Class<T> entityClass)
+	default <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertAll(Iterable<? extends T> values, Class<T> entityClass)
 			throws DataAccessException {
 		return insertAll(values, new DocumentCreateOptions(), entityClass);
 	}
@@ -488,10 +488,10 @@ default <T> DocumentCreateEntity<T> insert(T value) throws DataAccessException {
 	 * @throws DataAccessException
 	 * @since ArangoDB 3.4
 	 */
-	<T> void repsert(T value, AqlQueryOptions options) throws DataAccessException;
+	<T> T repsert(T value, AqlQueryOptions options) throws DataAccessException;
 
 	default <T> T repsert(T value) throws DataAccessException {
-		repsert(value, new AqlQueryOptions());
+		return repsert(value, new AqlQueryOptions());
 	}
 
 	/**
@@ -505,9 +505,9 @@ default <T> T repsert(T value) throws DataAccessException {
 	 * @throws DataAccessException
 	 * @since ArangoDB 3.4
 	 */
-	<T> Iterable<T> repsertAll(Iterable<? extends T> values, Class<T> entityClass, AqlQueryOptions options) throws DataAccessException;
+	<T> Iterable<T> repsertAll(Iterable<T> values, Class<? super T> entityClass, AqlQueryOptions options) throws DataAccessException;
 
-	default <T> Iterable<T> repsertAll(Iterable<? extends T> values, Class<T> entityClass) throws DataAccessException {
+	default <T> Iterable<T> repsertAll(Iterable<T> values, Class<? super T> entityClass) throws DataAccessException {
 		return repsertAll(values, entityClass, new AqlQueryOptions());
 	}
 

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

@@ -23,6 +23,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Optional;
 
+import com.arangodb.ArangoDBException;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.ApplicationContext;
@@ -45,32 +46,39 @@ public class DefaultResolverFactory implements ResolverFactory, ApplicationConte
     @SuppressWarnings("unchecked")
     @Override
     public <A extends Annotation> Optional<ReferenceResolver<A>> getReferenceResolver(final A annotation) {
-        ReferenceResolver<A> resolver = null;
-        if (annotation instanceof Ref) {
-            resolver = (ReferenceResolver<A>) new RefResolver(template.getObject(), transactionBridge.getIfUnique());
+        try {
+            if (annotation instanceof Ref) {
+                return Optional.of((ReferenceResolver<A>) new RefResolver(template.getObject(), transactionBridge.getIfUnique()));
+            }
+        } catch (final Exception e) {
+            throw new ArangoDBException(e);
         }
-        return Optional.ofNullable(resolver);
+        return Optional.empty();
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public <A extends Annotation> Optional<RelationResolver<A>> getRelationResolver(final A annotation,
                                                                                     final Class<? extends Annotation> collectionType) {
         RelationResolver<A> resolver = null;
-        if (annotation instanceof From) {
-            if (collectionType == Edge.class) {
-                resolver = (RelationResolver<A>) new EdgeFromResolver(template.getObject(), transactionBridge.getIfUnique());
-            } else if (collectionType == Document.class) {
-                resolver = (RelationResolver<A>) new DocumentFromResolver(template.getObject(), transactionBridge.getIfUnique());
-            }
-        } else if (annotation instanceof To) {
-            if (collectionType == Edge.class) {
-                resolver = (RelationResolver<A>) new EdgeToResolver(template.getObject(), transactionBridge.getIfUnique());
-            } else if (collectionType == Document.class) {
-                resolver = (RelationResolver<A>) new DocumentToResolver(template.getObject(), transactionBridge.getIfUnique());
+        try {
+            if (annotation instanceof From) {
+                if (collectionType == Edge.class) {
+                    resolver = (RelationResolver<A>) new EdgeFromResolver(template.getObject(), null);
+                } else if (collectionType == Document.class) {
+                    resolver = (RelationResolver<A>) new DocumentFromResolver(template.getObject(), null);
+                }
+            } else if (annotation instanceof To) {
+                if (collectionType == Edge.class) {
+                    resolver = (RelationResolver<A>) new EdgeToResolver(template.getObject(), null);
+                } else if (collectionType == Document.class) {
+                    resolver = (RelationResolver<A>) new DocumentToResolver(template.getObject(), null);
+                }
+            } else if (annotation instanceof Relations) {
+                resolver = (RelationResolver<A>) new RelationsResolver(template.getObject(), null);
             }
-        } else if (annotation instanceof Relations) {
-            resolver = (RelationResolver<A>) new RelationsResolver(template.getObject(), transactionBridge.getIfUnique());
+        } catch (final Exception e) {
+            throw new ArangoDBException(e);
         }
         return Optional.ofNullable(resolver);
     }

src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java

@@ -32,7 +32,6 @@
 import com.arangodb.springframework.core.mapping.ArangoPersistentEntity;
 import com.arangodb.springframework.core.mapping.ArangoPersistentProperty;
 import com.arangodb.springframework.core.mapping.event.*;
-import com.arangodb.springframework.core.template.DefaultUserOperation.CollectionCallback;
 import com.arangodb.springframework.core.util.ArangoExceptionTranslator;
 import com.arangodb.springframework.core.util.MetadataUtils;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
@@ -723,6 +722,11 @@ public CollectionOperations collection(final Class<?> entityClass) throws DataAc
 		return collection(_collection(entityClass, false));
     }
 
+    @Override
+    public CollectionOperations collection(String name) throws DataAccessException {
+        return ArangoOperations.super.collection(name);
+    }
+
     @Override
     public CollectionOperations collection(final String name, final CollectionCreateOptions options)
             throws DataAccessException {

src/main/java/com/arangodb/springframework/repository/SimpleArangoRepository.java

@@ -301,7 +301,7 @@ public <S extends T> Optional<S> findOne(final Example<S> example) {
 	 */
 	@Override
 	public <S extends T> Iterable<S> findAll(final Example<S> example) {
-		return (ArangoCursor) findAllInternal((Pageable) null, example, new HashMap<>());
+		return (ArangoCursor<S>) findAllInternal((Pageable) null, example, new HashMap<>());
 	}
 
 	/**