#250 ensure collections before transaction start

arangodb · Aug 23, 2023 · ef0a287 · ef0a287
1 parent 5ed1cc6
commit ef0a287
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/main/java/com/arangodb/springframework/transaction/ArangoTransactionManager.java b/src/main/java/com/arangodb/springframework/transaction/ArangoTransactionManager.java
@@ -22,8 +22,8 @@
 
 import com.arangodb.ArangoDBException;
 import com.arangodb.ArangoDatabase;
-import com.arangodb.DbName;
 import com.arangodb.springframework.core.ArangoOperations;
+import com.arangodb.springframework.core.template.CollectionCallback;
 import com.arangodb.springframework.repository.query.QueryTransactionBridge;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
@@ -67,10 +67,10 @@ public void afterPropertiesSet() {
             throw new IllegalStateException("Nested transactions must not be allowed");
         }
         if (!isGlobalRollbackOnParticipationFailure()) {
-            throw new IllegalStateException("Global rollback on participating failure is needed");
+            throw new IllegalStateException("Global rollback on participating failure is required");
         }
         if (getTransactionSynchronization() == SYNCHRONIZATION_NEVER) {
-            throw new IllegalStateException("Transaction synchronization is needed always");
+            throw new IllegalStateException("Transaction synchronization must not be disabled");
         }
     }
 
@@ -81,7 +81,7 @@ public void afterPropertiesSet() {
     protected ArangoTransactionObject doGetTransaction() {
         ArangoTransactionHolder holder = (ArangoTransactionHolder) TransactionSynchronizationManager.getResource(this);
         try {
-            return new ArangoTransactionObject(operations.db(), getDefaultTimeout(), holder);
+            return new ArangoTransactionObject(operations.db(), CollectionCallback.fromOperations(operations), getDefaultTimeout(), holder);
         } catch (ArangoDBException error) {
             throw new TransactionSystemException("Cannot create transaction object", error);
         }

diff --git a/src/main/java/com/arangodb/springframework/transaction/ArangoTransactionObject.java b/src/main/java/com/arangodb/springframework/transaction/ArangoTransactionObject.java
@@ -24,6 +24,7 @@
 import com.arangodb.ArangoDatabase;
 import com.arangodb.entity.StreamTransactionStatus;
 import com.arangodb.model.StreamTransactionOptions;
+import com.arangodb.springframework.core.template.CollectionCallback;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.lang.Nullable;
@@ -46,11 +47,13 @@ class ArangoTransactionObject implements SmartTransactionObject {
     private static final Log logger = LogFactory.getLog(ArangoTransactionObject.class);
 
     private final ArangoDatabase database;
+    private final CollectionCallback collectionCallback;
     private final ArangoTransactionHolder holder;
     private int timeout;
 
-    ArangoTransactionObject(ArangoDatabase database, int defaultTimeout, @Nullable ArangoTransactionHolder holder) {
+    ArangoTransactionObject(ArangoDatabase database, CollectionCallback collectionCallback, int defaultTimeout, @Nullable ArangoTransactionHolder holder) {
         this.database = database;
+        this.collectionCallback = collectionCallback;
         this.holder = holder == null ? new ArangoTransactionHolder() : holder;
         this.timeout = defaultTimeout;
     }
@@ -71,6 +74,7 @@ void configure(TransactionDefinition definition) {
     ArangoTransactionHolder getOrBegin(Collection<String> collections) throws ArangoDBException {
         addCollections(collections);
         if (holder.getStreamTransactionId() == null) {
+            holder.getCollectionNames().forEach(collectionCallback::collection);
             StreamTransactionOptions options = new StreamTransactionOptions()
                     .allowImplicit(true)
                     .writeCollections(holder.getCollectionNames().toArray(new String[0]))

diff --git a/src/test/java/com/arangodb/springframework/testdata/Actor.java b/src/test/java/com/arangodb/springframework/testdata/Actor.java
@@ -22,6 +22,7 @@
 
 import java.util.List;
 
+import com.arangodb.springframework.annotation.PersistentIndex;
 import org.springframework.data.annotation.Id;
 
 import com.arangodb.springframework.annotation.Document;
@@ -33,6 +34,7 @@
  * @author Christian Lechner
  */
 @Document("actors")
+@PersistentIndex(fields = "name")
 public class Actor {
 
 	@Id

diff --git a/...java/com/arangodb/springframework/transaction/ArangoTransactionManagerRepositoryTest.java b/...java/com/arangodb/springframework/transaction/ArangoTransactionManagerRepositoryTest.java
@@ -4,7 +4,6 @@
 import com.arangodb.springframework.ArangoTransactionalTestConfiguration;
 import com.arangodb.springframework.repository.ActorRepository;
 import com.arangodb.springframework.repository.MovieRepository;
-import com.arangodb.springframework.testdata.Actor;
 import com.arangodb.springframework.testdata.Movie;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +17,7 @@
 public class ArangoTransactionManagerRepositoryTest extends AbstractArangoTest {
 
 	public ArangoTransactionManagerRepositoryTest() {
-		super(Movie.class, Actor.class);
+		super(Movie.class);
 	}
 
 	@Autowired
@@ -66,4 +65,10 @@ public void shouldRollbackWithinTransaction() {
 
 		assertThat(movieRepository.findById(starWars.getId())).isNotPresent();
 	}
+
+	@Test
+	@Transactional(label = "actors")
+	public void shouldCreateCollectionsBeforeTransaction() {
+		actorRepository.findAll();
+	}
 }