#80 extract collection callback, improve implementation

Author: aburmeis

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

@@ -45,11 +45,12 @@
 import com.arangodb.springframework.core.mapping.event.ArangoMappingEvent;
 import com.arangodb.springframework.core.mapping.event.BeforeDeleteEvent;
 import com.arangodb.springframework.core.mapping.event.BeforeSaveEvent;
-import com.arangodb.springframework.core.template.DefaultUserOperation.CollectionCallback;
 import com.arangodb.springframework.core.util.ArangoExceptionTranslator;
 import com.arangodb.springframework.core.util.MetadataUtils;
 import com.arangodb.util.MapBuilder;
 import com.arangodb.velocypack.VPackSlice;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -73,6 +74,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -98,6 +100,7 @@ public class ArangoTemplate implements ArangoOperations, CollectionCallback, App
 	private static final String REPSERT_QUERY = "LET doc = @doc " + REPSERT_QUERY_BODY;
 	private static final String REPSERT_MANY_QUERY = "FOR doc IN @docs " + REPSERT_QUERY_BODY;
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(ArangoTemplate.class);
 	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
 
 	private volatile ArangoDBVersion version;
@@ -191,7 +194,9 @@ private ArangoCollection _collection(final String name, final ArangoPersistentEn
 		final ArangoCollection collection = value.getCollection();
 		if (persistentEntity != null && !entities.contains(entityClass)) {
 			value.addEntityClass(entityClass);
-			if (!transactional) {
+			if (transactional) {
+				LOGGER.debug("Not ensuring any indexes of collection {} for {} during transaction", collection.name(), entityClass);
+			} else {
 				ensureCollectionIndexes(collection(collection), persistentEntity);
 			}
 		}
@@ -761,8 +766,13 @@ public CollectionOperations collection(final Class<?> entityClass) throws DataAc
 	}
 
 	@Override
-	public CollectionOperations collection(String name) {
-		return ArangoOperations.super.collection(name);
+	public CollectionOperations collection(String name) throws DataAccessException {
+		List<ArangoCollection> collections = converter.getMappingContext().getPersistentEntities().stream()
+				.filter(persistentEntity -> name.equals(persistentEntity.getCollection()))
+				.map(persistentEntity -> _collection(name, persistentEntity, persistentEntity.getCollectionOptions(), false))
+				.collect(Collectors.toList());
+		ArangoCollection result = collections.isEmpty() ? _collection(name, null, null, false) : collections.get(0);
+		return collection(result);
 	}
 
 	@Override

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

@@ -0,0 +1,61 @@
+/*
+ * 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.template;
+
+import com.arangodb.springframework.core.ArangoOperations;
+import com.arangodb.springframework.core.CollectionOperations;
+import org.springframework.dao.DataAccessException;
+
+/**
+ * Internal interface to handle collection operations.
+ * Typically implemented by same class as {@link com.arangodb.springframework.core.ArangoOperations}.
+ */
+public interface CollectionCallback {
+
+    /**
+     * @see com.arangodb.springframework.core.ArangoOperations#collection(Class)
+     */
+    CollectionOperations collection(Class<?> type) throws DataAccessException;
+
+    /**
+     * @see com.arangodb.springframework.core.ArangoOperations#collection(String)
+     */
+    CollectionOperations collection(String name) throws DataAccessException;
+
+
+    static CollectionCallback fromOperations(ArangoOperations operations) {
+        if (operations instanceof CollectionCallback) {
+            return (CollectionCallback) operations;
+        }
+        return new CollectionCallback() {
+            @Override
+            public CollectionOperations collection(Class<?> type) {
+                return operations.collection(type);
+            }
+
+            @Override
+            public CollectionOperations collection(String name) {
+                return operations.collection(name);
+            }
+        };
+    }
+
+}

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

@@ -29,7 +29,6 @@
 import com.arangodb.entity.UserEntity;
 import com.arangodb.model.UserCreateOptions;
 import com.arangodb.model.UserUpdateOptions;
-import com.arangodb.springframework.core.CollectionOperations;
 import com.arangodb.springframework.core.UserOperations;
 
 /**
@@ -38,12 +37,6 @@
  */
 public class DefaultUserOperation implements UserOperations {
 
-	public interface CollectionCallback {
-		CollectionOperations collection(Class<?> type);
-
-		CollectionOperations collection(String name);
-	}
-
 	private final ArangoDatabase db;
 	private final String username;
 	private final PersistenceExceptionTranslator exceptionTranslator;