diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index 924c1c221..ffd330b1a 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -499,6 +499,13 @@ public final class Ebean { serverMgr.getDefaultServer().endTransaction(); } + /** + * Mark the current transaction as rollback only. + */ + public static void setRollbackOnly() { + serverMgr.getDefaultServer().currentTransaction().setRollbackOnly(); + } + /** * Return a map of the differences between two objects of the same type. *

diff --git a/src/main/java/com/avaje/ebean/Transaction.java b/src/main/java/com/avaje/ebean/Transaction.java index cd2db3004..526fe28bb 100644 --- a/src/main/java/com/avaje/ebean/Transaction.java +++ b/src/main/java/com/avaje/ebean/Transaction.java @@ -74,6 +74,11 @@ public interface Transaction extends Closeable { */ void rollback(Throwable e) throws PersistenceException; + /** + * Mark the transaction for rollback only. + */ + void setRollbackOnly(); + /** * If the transaction is active then perform rollback. Otherwise do nothing. */ diff --git a/src/main/java/com/avaje/ebeaninternal/api/ScopeTrans.java b/src/main/java/com/avaje/ebeaninternal/api/ScopeTrans.java index ecdda3085..c2eda8690 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ScopeTrans.java +++ b/src/main/java/com/avaje/ebeaninternal/api/ScopeTrans.java @@ -181,6 +181,15 @@ public class ScopeTrans implements Thread.UncaughtExceptionHandler { return e; } + /** + * Mark the underlying transaction as rollback only. + */ + public void setRollbackOnly() { + if (transaction != null) { + transaction.setRollbackOnly(); + } + } + /** * An Exception was caught and may or may not cause a rollback to occur. * Returns the exception and this should be thrown by the calling code. diff --git a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java b/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java index a8a98d5c2..44f7eb62c 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java @@ -49,6 +49,11 @@ public class ScopedTransaction implements SpiTransaction { scopeTrans.rollback(e); } + @Override + public void setRollbackOnly() { + scopeTrans.setRollbackOnly(); + } + @Override public void end() throws PersistenceException { try { diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java index 9edd8b395..79fe82379 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java @@ -66,6 +66,8 @@ public class JdbcTransaction implements SpiTransaction { */ protected boolean active; + protected boolean rollbackOnly; + /** * The underlying Connection. */ @@ -903,6 +905,10 @@ public class JdbcTransaction implements SpiTransaction { */ @Override public void commit() throws RollbackException { + if (rollbackOnly) { + rollback(); + return; + } if (!isActive()) { throw new IllegalStateException(illegalStateMessage); } @@ -945,6 +951,14 @@ public class JdbcTransaction implements SpiTransaction { } } + /** + * Mark the transaction as rollback only. + */ + @Override + public void setRollbackOnly() { + this.rollbackOnly = true; + } + /** * Rollback the transaction. */ diff --git a/src/test/java/com/avaje/tests/transaction/TestTransactionRollbackOnly.java b/src/test/java/com/avaje/tests/transaction/TestTransactionRollbackOnly.java new file mode 100644 index 000000000..5b536718c --- /dev/null +++ b/src/test/java/com/avaje/tests/transaction/TestTransactionRollbackOnly.java @@ -0,0 +1,53 @@ +package com.avaje.tests.transaction; + +import com.avaje.ebean.Ebean; +import com.avaje.ebean.Transaction; +import com.avaje.ebean.annotation.Transactional; +import com.avaje.tests.model.basic.EBasic; +import org.junit.Test; + +import static org.assertj.core.api.StrictAssertions.assertThat; + +public class TestTransactionRollbackOnly { + + private EBasic one; + + private EBasic two; + + @Test + public void transaction_setRollbackOnly() { + + doVia_currentTransaction(); + + assertThat(one.getId()).isNotNull(); + assertThat(Ebean.find(EBasic.class, one.getId())).isNull(); + } + + @Transactional + protected void doVia_currentTransaction() { + + one = new EBasic("WillNotSave"); + Ebean.save(one); + + Transaction transaction = Ebean.currentTransaction(); + transaction.setRollbackOnly(); + } + + @Test + public void test_Ebean_setRollbackOnly() { + + do_Ebean_setRollbackOnly(); + + assertThat(two.getId()).isNotNull(); + assertThat(Ebean.find(EBasic.class, two.getId())).isNull(); + } + + @Transactional + protected void do_Ebean_setRollbackOnly() { + + two = new EBasic("WillNotSave"); + Ebean.save(two); + + Ebean.setRollbackOnly(); + } +}