fix merge errors

arangodb · Jul 18, 2024 · 8455f9b · 8455f9b
1 parent da4c35d
commit 8455f9b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/com/arangodb/springframework/core/ArangoOperations.java b/src/main/java/com/arangodb/springframework/core/ArangoOperations.java
@@ -105,6 +105,8 @@ default <T> ArangoCursor<T> query(String query, Map<String, Object> bindVars, Cl
 	 *
 	 * @param query
 	 *            An AQL query string
+	 * @param options
+	 *            Additional options that will be passed to the query API, can be null
 	 * @param entityClass
 	 *            The entity type of the result
 	 * @return cursor of the results

diff --git a/src/main/java/com/arangodb/springframework/core/convert/resolver/EdgeFromResolver.java b/src/main/java/com/arangodb/springframework/core/convert/resolver/EdgeFromResolver.java
@@ -34,8 +34,11 @@
  */
 public class EdgeFromResolver extends AbstractResolver implements RelationResolver<From> {
 
+	private final ArangoOperations template;
+
 	public EdgeFromResolver(final ArangoOperations template, QueryTransactionBridge transactionBridge) {
-		super(template, transactionBridge);
+		super(template.getConverter().getConversionService(), transactionBridge);
+		this.template = template;
 	}
 
 	@Override

diff --git a/src/main/java/com/arangodb/springframework/core/convert/resolver/EdgeToResolver.java b/src/main/java/com/arangodb/springframework/core/convert/resolver/EdgeToResolver.java
@@ -34,8 +34,11 @@
  */
 public class EdgeToResolver extends AbstractResolver implements RelationResolver<To> {
 
+	private final ArangoOperations template;
+
 	public EdgeToResolver(final ArangoOperations template, QueryTransactionBridge transactionBridge) {
-		super(template, transactionBridge);
+		super(template.getConverter().getConversionService(), transactionBridge);
+		this.template = template;
 	}
 
 	@Override

diff --git a/src/main/java/com/arangodb/springframework/transaction/ArangoTransactionManager.java b/src/main/java/com/arangodb/springframework/transaction/ArangoTransactionManager.java
@@ -114,7 +114,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) thr
 
     /**
      * Commit the current stream transaction. The query bridge is cleared
-     * afterwards.
+     * afterward.
      *
      * @see ArangoDatabase#commitStreamTransaction(String)
      * @see QueryTransactionBridge#clearCurrentTransaction()
@@ -147,7 +147,7 @@ protected void doCommit(DefaultTransactionStatus status) throws TransactionExcep
 
     /**
      * Roll back the current stream transaction. The query bridge is cleared
-     * afterwards.
+     * afterward.
      *
      * @see ArangoDatabase#abortStreamTransaction(String)
      * @see QueryTransactionBridge#clearCurrentTransaction()
@@ -169,7 +169,7 @@ protected void doRollback(DefaultTransactionStatus status) throws TransactionExc
 
     /**
      * Check if the transaction object has the bound holder. For new
-     * transactions the holder will be bound afterwards.
+     * transactions the holder will be bound afterward.
      */
     @Override
     protected boolean isExistingTransaction(Object transaction) throws TransactionException {
@@ -189,7 +189,6 @@ protected void doSetRollbackOnly(DefaultTransactionStatus status) throws Transac
     }
 
     /**
-     * Any transaction object is configured according to the definition upfront.
      * Bind the holder for the first new transaction created.
      *
      * @see ArangoTransactionHolder