#80 reuse collection name from persistent entity, escape collection names

Author: aburmeis

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

@@ -21,15 +21,12 @@
 package com.arangodb.springframework.repository.query;
 
 import com.arangodb.model.AqlQueryOptions;
-import com.arangodb.springframework.annotation.Document;
-import com.arangodb.springframework.annotation.Edge;
 import com.arangodb.springframework.core.ArangoOperations;
 import com.arangodb.springframework.core.util.AqlUtils;
 import com.arangodb.springframework.repository.query.ArangoParameters.ArangoParameter;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.expression.BeanFactoryAccessor;
 import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ParserContext;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -111,22 +108,17 @@ private Collection<String> allCollectionNames(Map<String, Object> bindVars) {
 		bindVars.entrySet().stream()
 				.filter(entry -> entry.getKey().startsWith("@"))
 				.map(Map.Entry::getValue)
-				.map(value -> value instanceof Class ? getCollectionName((Class<?>) value): value.toString())
-				.filter(Objects::nonNull)
+				.map(this::asCollectionName)
+				.map(AqlUtils::buildCollectionName)
 				.forEach(allCollections::add);
 		return allCollections;
 	}
 
-	private String getCollectionName(Class<?> value) {
-		Document document = AnnotationUtils.findAnnotation(value, Document.class);
-		if (document != null) {
-			return document.value();
+	private String asCollectionName(Object value) {
+		if (value instanceof Class<?>) {
+			return mappingContext.getRequiredPersistentEntity((Class<?>) value).getCollection();
 		}
-		Edge edge = AnnotationUtils.findAnnotation(value, Edge.class);
-		if (edge != null) {
-			return edge.value();
-		}
-		return null;
+		return value.toString();
 	}
 
 	@Override

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

@@ -25,6 +25,7 @@
 import com.arangodb.entity.StreamTransactionStatus;
 import com.arangodb.model.StreamTransactionOptions;
 import com.arangodb.springframework.core.template.CollectionCallback;
+import com.arangodb.springframework.core.util.AqlUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.lang.Nullable;
@@ -35,6 +36,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.springframework.transaction.TransactionDefinition.TIMEOUT_DEFAULT;
 
@@ -67,7 +69,9 @@ void configure(TransactionDefinition definition) {
             this.timeout = definition.getTimeout();
         }
         if (definition instanceof TransactionAttribute) {
-            addCollections(((TransactionAttribute) definition).getLabels());
+            addCollections(((TransactionAttribute) definition).getLabels().stream()
+                    .map(AqlUtils::buildCollectionName)
+                    .collect(Collectors.toList()));
         }
     }