First simple working transaction behavior

Author: JohannesRabauer

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/SimpleEclipseStoreRepository.java

@@ -97,6 +97,12 @@ public Field getIdField()
 	public synchronized <S extends T> List<S> saveBulk(final Collection<S> entities)
 	{
 		final EclipseStoreTransaction transaction = this.transactionManager.getTransaction();
+		transaction.addAction(() -> this.uncachedStore(entities));
+		return (List<S>)entities;
+	}
+	
+	private synchronized <S extends T> void uncachedStore(final Collection<S> entities)
+	{
 		if(LOG.isDebugEnabled())
 		{
 			LOG.debug("Saving {} entities...", entities.size());
@@ -123,7 +129,6 @@ public synchronized <S extends T> List<S> saveBulk(final Collection<S> entities)
 			LOG.debug("Collected {} non-entities to store.", nonEntitiesToStore.size());
 		}
 		this.storage.store(nonEntitiesToStore, this.domainClass, entitiesToStore);
-		return (List<S>)entities;
 	}
 
 	@Override
@@ -246,8 +251,12 @@ public void deleteById(@Nonnull final ID id)
 	@Override
 	public void delete(@Nonnull final T entity)
 	{
-		this.storage.delete(this.domainClass, this.copier.getOriginal(entity));
-		this.copier.deregister(entity);
+		final EclipseStoreTransaction transaction = this.transactionManager.getTransaction();
+		transaction.addAction(() ->
+		{
+			this.storage.delete(this.domainClass, this.copier.getOriginal(entity));
+			this.copier.deregister(entity);
+		});
 	}
 
 	@Override
@@ -271,7 +280,8 @@ public void deleteAll(final Iterable<? extends T> entities)
 	@Override
 	public void deleteAll()
 	{
-		this.storage.deleteAll(this.domainClass);
+		final EclipseStoreTransaction transaction = this.transactionManager.getTransaction();
+		transaction.addAction(() -> this.storage.deleteAll(this.domainClass));
 	}
 
 	@Override

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/transactions/EclipseStoreExistingTransactionObject.java

@@ -15,26 +15,53 @@
  */
 package software.xdev.spring.data.eclipse.store.transactions;
 
+import java.util.ArrayList;
+
+import org.springframework.transaction.TransactionSystemException;
+
+
 public class EclipseStoreExistingTransactionObject implements EclipseStoreTransaction
 {
+	private ArrayList<EclipseStoreTransactionAction> actions;
+	
 	public void startTransaction()
 	{
-	
+		if(this.actions != null)
+		{
+			throw new TransactionSystemException(
+				"Transaction is already started but it should start again. This is not allowed!");
+		}
+		this.actions = new ArrayList<>();
 	}
 
 	public void rollbackTransaction()
 	{
-	
+		this.actions = null;
 	}
 
 	public void commitTransaction()
 	{
-	
+		if(this.actions == null)
+		{
+			throw new TransactionSystemException(
+				"Transaction is not started but actions should be executed. This is not allowed!");
+		}
+		this.actions.forEach(EclipseStoreTransactionAction::execute);
+		this.actions = null;
 	}
 
 	@Override
 	public void addAction(final EclipseStoreTransactionAction action)
 	{
-	
+		if(action == null)
+		{
+			return;
+		}
+		if(this.actions == null)
+		{
+			throw new TransactionSystemException(
+				"Transaction is not started but action should be added. This is not allowed!");
+		}
+		this.actions.add(action);
 	}
 }

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/transactions/TransactionsTest.java

@@ -87,6 +87,12 @@ void accountTransaction_Working(@Autowired final PlatformTransactionManager tran
 			this.accountRepository.findById(this.account2.getId()).get().getBalance());
 	}
 
+	/**
+	 * This is actually correct (if you look at Spring Data JPA for comparison). The second change is also persisted
+	 * and
+	 * not only the first one. This seems counterintuitive, but is just like with the rest of Spring Data
+	 * Implementations.
+	 */
 	@Test
 	void accountTransaction_ChangeAfterSave(@Autowired final PlatformTransactionManager transactionManager)
 	{
@@ -101,7 +107,7 @@ void accountTransaction_ChangeAfterSave(@Autowired final PlatformTransactionMana
 		);
 
 		Assertions.assertEquals(
-			BigDecimal.valueOf(9),
+			BigDecimal.valueOf(8),
 			this.accountRepository.findById(this.account1.getId()).get().getBalance());
 	}