#80 prepare usage of stream transaction bridge and id for resolvers

Author: aburmeis

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

@@ -110,7 +110,7 @@ public <A extends Annotation> Optional<ReferenceResolver<A>> getReferenceResolve
 				ReferenceResolver<A> resolver = null;
 				try {
 					if (annotation instanceof Ref) {
-						resolver = (ReferenceResolver<A>) new RefResolver(arangoTemplate());
+						resolver = (ReferenceResolver<A>) new RefResolver(arangoTemplate(), null);
 					}
 				} catch (final Exception e) {
 					throw new ArangoDBException(e);
@@ -126,18 +126,18 @@ public <A extends Annotation> Optional<RelationResolver<A>> getRelationResolver(
 				try {
 					if (annotation instanceof From) {
 						if (collectionType == Edge.class) {
-							resolver = (RelationResolver<A>) new EdgeFromResolver(arangoTemplate());
+							resolver = (RelationResolver<A>) new EdgeFromResolver(arangoTemplate(), null);
 						} else if (collectionType == Document.class) {
-							resolver = (RelationResolver<A>) new DocumentFromResolver(arangoTemplate());
+							resolver = (RelationResolver<A>) new DocumentFromResolver(arangoTemplate(), null);
 						}
 					} else if (annotation instanceof To) {
 						if (collectionType == Edge.class) {
-							resolver = (RelationResolver<A>) new EdgeToResolver(arangoTemplate());
+							resolver = (RelationResolver<A>) new EdgeToResolver(arangoTemplate(), null);
 						} else if (collectionType == Document.class) {
-							resolver = (RelationResolver<A>) new DocumentToResolver(arangoTemplate());
+							resolver = (RelationResolver<A>) new DocumentToResolver(arangoTemplate(), null);
 						}
 					} else if (annotation instanceof Relations) {
-						resolver = (RelationResolver<A>) new RelationsResolver(arangoTemplate());
+						resolver = (RelationResolver<A>) new RelationsResolver(arangoTemplate(), null);
 					}
 				} catch (final Exception e) {
 					throw new ArangoDBException(e);

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

@@ -23,8 +23,12 @@
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.util.Collections;
 
+import com.arangodb.model.AqlQueryOptions;
+import com.arangodb.model.DocumentReadOptions;
 import com.arangodb.springframework.core.ArangoOperations;
+import com.arangodb.springframework.repository.query.QueryTransactionBridge;
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.cglib.proxy.Callback;
@@ -59,10 +63,12 @@ public abstract class AbstractResolver<A extends Annotation> {
 
 	private final ObjenesisStd objenesis;
 	protected final ArangoOperations template;
+	private final QueryTransactionBridge transactionBridge;
 
-	protected AbstractResolver(final ArangoOperations template) {
+	protected AbstractResolver(final ArangoOperations template, final QueryTransactionBridge transactionBridge) {
 		super();
 		this.template = template;
+		this.transactionBridge = transactionBridge;
 		this.objenesis = new ObjenesisStd(true);
 	}
 
@@ -104,11 +110,17 @@ private Class<?> enhancedTypeFor(final Class<?> type) {
 
 	protected DocumentReadOptions defaultReadOptions() {
 		DocumentReadOptions options = new DocumentReadOptions();
+		if (transactionBridge != null) {
+			options.streamTransactionId(transactionBridge.getCurrentTransaction(Collections.emptySet()));
+		}
 		return options;
 	}
 
 	protected AqlQueryOptions defaultQueryOptions() {
 		AqlQueryOptions options = new AqlQueryOptions();
+		if (transactionBridge != null) {
+			options.streamTransactionId(transactionBridge.getCurrentTransaction(Collections.emptySet()));
+		}
 		return options;
 	}
 

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

@@ -20,6 +20,7 @@
 
 package com.arangodb.springframework.core.convert.resolver;
 
+import com.arangodb.springframework.repository.query.QueryTransactionBridge;
 import org.springframework.data.util.TypeInformation;
 
 import com.arangodb.ArangoCursor;
@@ -36,8 +37,8 @@
  */
 public class DocumentFromResolver extends AbstractResolver<From> implements RelationResolver<From> {
 
-	public DocumentFromResolver(final ArangoOperations template) {
-		super(template);
+	public DocumentFromResolver(final ArangoOperations template, QueryTransactionBridge transactionBridge) {
+		super(template, transactionBridge);
 	}
 
 	@Override

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

@@ -20,6 +20,7 @@
 
 package com.arangodb.springframework.core.convert.resolver;
 
+import com.arangodb.springframework.repository.query.QueryTransactionBridge;
 import org.springframework.data.util.TypeInformation;
 
 import com.arangodb.ArangoCursor;
@@ -36,8 +37,8 @@
  */
 public class DocumentToResolver extends AbstractResolver<To> implements RelationResolver<To> {
 
-	public DocumentToResolver(final ArangoOperations template) {
-		super(template);
+	public DocumentToResolver(final ArangoOperations template, QueryTransactionBridge transactionBridge) {
+		super(template, transactionBridge);
 	}
 
 	@Override

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

@@ -20,6 +20,7 @@
 
 package com.arangodb.springframework.core.convert.resolver;
 
+import com.arangodb.springframework.repository.query.QueryTransactionBridge;
 import org.springframework.data.util.TypeInformation;
 
 import com.arangodb.springframework.annotation.From;
@@ -33,8 +34,8 @@
  */
 public class EdgeFromResolver extends AbstractResolver<From> implements RelationResolver<From> {
 
-	public EdgeFromResolver(final ArangoOperations template) {
-		super(template);
+	public EdgeFromResolver(final ArangoOperations template, QueryTransactionBridge transactionBridge) {
+		super(template, transactionBridge);
 	}
 
 	@Override

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

@@ -20,6 +20,7 @@
 
 package com.arangodb.springframework.core.convert.resolver;
 
+import com.arangodb.springframework.repository.query.QueryTransactionBridge;
 import org.springframework.data.util.TypeInformation;
 
 import com.arangodb.springframework.annotation.To;
@@ -33,8 +34,8 @@
  */
 public class EdgeToResolver extends AbstractResolver<To> implements RelationResolver<To> {
 
-	public EdgeToResolver(final ArangoOperations template) {
-		super(template);
+	public EdgeToResolver(final ArangoOperations template, QueryTransactionBridge transactionBridge) {
+		super(template, transactionBridge);
 	}
 
 	@Override

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

@@ -25,6 +25,7 @@
 
 import com.arangodb.springframework.core.mapping.ArangoPersistentEntity;
 import com.arangodb.springframework.core.util.MetadataUtils;
+import com.arangodb.springframework.repository.query.QueryTransactionBridge;
 import org.springframework.data.util.TypeInformation;
 
 import com.arangodb.springframework.annotation.Ref;
@@ -38,8 +39,8 @@
 public class RefResolver extends AbstractResolver<Ref>
 		implements ReferenceResolver<Ref>, AbstractResolver.ResolverCallback<Ref> {
 
-	public RefResolver(final ArangoOperations template) {
-		super(template);
+	public RefResolver(final ArangoOperations template, QueryTransactionBridge transactionBridge) {
+		super(template, transactionBridge);
 	}
 
 	@Override

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

@@ -23,6 +23,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.arangodb.springframework.repository.query.QueryTransactionBridge;
 import org.springframework.data.util.TypeInformation;
 
 import com.arangodb.ArangoCursor;
@@ -37,8 +38,8 @@
  */
 public class RelationsResolver extends AbstractResolver<Relations> implements RelationResolver<Relations> {
 
-	public RelationsResolver(final ArangoOperations template) {
-		super(template);
+	public RelationsResolver(final ArangoOperations template, QueryTransactionBridge transactionBridge) {
+		super(template, transactionBridge);
 	}
 
 	@Override