#80 do not add collections of abstract entity types

Author: aburmeis

src/main/java/com/arangodb/springframework/repository/query/StringBasedArangoQuery.java

@@ -36,6 +36,7 @@
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.util.Assert;
 
+import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -98,12 +99,14 @@ public StringBasedArangoQuery(final String query, final ArangoQueryMethod method
 
 		extractBindVars(accessor, bindVars);
 
-		return Pair.of(prepareQuery(accessor), allCollectionNames(collectionName, bindVars));
+		return Pair.of(prepareQuery(accessor), allCollectionNames(bindVars));
 	}
 
-	private Collection<String> allCollectionNames(String collectionName, Map<String, Object> bindVars) {
+	private Collection<String> allCollectionNames(Map<String, Object> bindVars) {
 		HashSet<String> allCollections = new HashSet<>();
-		allCollections.add(collectionName);
+		if (!Modifier.isAbstract(domainClass.getModifiers())) {
+			allCollections.add(collectionName);
+		}
 		bindVars.entrySet().stream()
 				.filter(entry -> entry.getKey().startsWith("@"))
 				.map(Map.Entry::getValue)

src/main/java/com/arangodb/springframework/transaction/ArangoTransaction.java

@@ -4,6 +4,8 @@
 import com.arangodb.entity.StreamTransactionEntity;
 import com.arangodb.entity.StreamTransactionStatus;
 import com.arangodb.model.StreamTransactionOptions;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.IllegalTransactionStateException;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.interceptor.TransactionAttribute;
@@ -15,6 +17,7 @@
 
 class ArangoTransaction implements SmartTransactionObject {
 
+    private final Log logger = LogFactory.getLog(getClass());
     private final ArangoDatabase database;
     private final Set<String> writeCollections = new HashSet<>();
     private TransactionDefinition definition;
@@ -50,6 +53,9 @@ String getOrBegin(Collection<String> collections) {
                 .writeCollections(writeCollections.toArray(new String[0]))
                 .lockTimeout(definition.getTimeout() == -1 ? 0 : definition.getTimeout());
         transaction = database.beginStreamTransaction(options);
+        if (logger.isDebugEnabled()) {
+            logger.debug("Began stream transaction " + transaction.getId() + " writing collections " + writeCollections);
+        }
         return transaction.getId();
     }
 

src/main/java/com/arangodb/springframework/transaction/ArangoTransactionManager.java

@@ -48,13 +48,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) thr
         }
         ArangoTransaction tx = (ArangoTransaction) transaction;
         tx.configure(definition);
-        Function<Collection<String>, String> begin = tx::getOrBegin;
-        bridge.setCurrentTransaction(begin.andThen(id -> {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Began stream transaction " + id);
-            }
-            return id;
-        }));
+        bridge.setCurrentTransaction(tx::getOrBegin);
     }
 
     @Override