diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java
index 0e421971b..340ff54eb 100644
--- a/ebean-api/src/main/java/io/ebean/DB.java
+++ b/ebean-api/src/main/java/io/ebean/DB.java
@@ -266,55 +266,6 @@ public final class DB {
getDefault().register(transactionCallback);
}
- /**
- * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
- *
- * Commit the current transaction.
- */
- @Deprecated(forRemoval = true)
- public static void commitTransaction() {
- getDefault().commitTransaction();
- }
-
- /**
- * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
- *
- * Rollback the current transaction.
- */
- @Deprecated(forRemoval = true)
- public static void rollbackTransaction() {
- getDefault().rollbackTransaction();
- }
-
- /**
- * If the current transaction has already been committed do nothing otherwise
- * rollback the transaction.
- *
- * It is preferable to use try with resources rather than this.
- *
- * Useful to put in a finally block to ensure the transaction is ended, rather
- * than a rollbackTransaction() in each catch block.
- *
- * Code example:
- *
- *
{@code
- * DB.beginTransaction();
- * try {
- * // do some fetching and or persisting
- *
- * // commit at the end
- * DB.commitTransaction();
- *
- * } finally {
- * // if commit didn't occur then rollback the transaction
- * DB.endTransaction();
- * }
- * }
- */
- public static void endTransaction() {
- getDefault().endTransaction();
- }
-
/**
* Mark the current transaction as rollback only.
*/
diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index bc3f0139b..5c3ca8265 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -666,49 +666,6 @@ public interface Database {
*/
void flush();
- /**
- * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
- *
- * Commit the current transaction.
- */
- @Deprecated(forRemoval = true)
- void commitTransaction();
-
- /**
- * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
- *
- * Rollback the current transaction.
- */
- @Deprecated(forRemoval = true)
- void rollbackTransaction();
-
- /**
- * If the current transaction has already been committed do nothing otherwise
- * rollback the transaction.
- *
- * Useful to put in a finally block to ensure the transaction is ended, rather
- * than a rollbackTransaction() in each catch block.
- *
- * Code example:
- *
- *
{@code
- *
- * database.beginTransaction();
- * try {
- * // do some fetching and or persisting ...
- *
- * // commit at the end
- * database.commitTransaction();
- *
- * } finally {
- * // if commit didn't occur then rollback the transaction
- * database.endTransaction();
- * }
- *
- * }
- */
- void endTransaction();
-
/**
* Refresh the values of a bean.
*
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index b19001ac2..4c7f66b35 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -86,6 +86,11 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
*/
SpiTransactionManager transactionManager();
+ /**
+ * End the current transaction if it is active.
+ */
+ void endTransaction();
+
/**
* Return all the descriptors.
*/
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 38e8955e0..89229f300 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -756,16 +756,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
currentTransaction().flush();
}
- @Override
- public void commitTransaction() {
- currentTransaction().commit();
- }
-
- @Override
- public void rollbackTransaction() {
- currentTransaction().rollback();
- }
-
@Override
public void endTransaction() {
Transaction transaction = transactionManager.inScope();
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java
index 225888156..9e18e4b9d 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java
@@ -1,5 +1,6 @@
package io.ebean.xtest.base;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.AfterEach;
@@ -18,15 +19,17 @@ import org.tests.model.basic.ResetBasicData;
*/
public abstract class TransactionalTestCase extends BaseTestCase {
+ private Transaction transaction;
+
@BeforeEach
public void startTransaction() {
ResetBasicData.reset();
- DB.beginTransaction();
+ transaction = DB.beginTransaction();
}
@AfterEach
public void endTransaction() {
- DB.rollbackTransaction();
- DB.endTransaction();
+ transaction.rollback();
+ transaction.end();
}
}
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
index 184ef9009..8e314bfb3 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
@@ -578,14 +578,6 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
public void flush() {
}
- @Override
- public void commitTransaction() {
- }
-
- @Override
- public void rollbackTransaction() {
- }
-
@Override
public void endTransaction() {
}
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
index fefece847..ff3418550 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
@@ -222,21 +222,6 @@ public class TDSpiServer implements SpiServer {
}
- @Override
- public void commitTransaction() {
-
- }
-
- @Override
- public void rollbackTransaction() {
-
- }
-
- @Override
- public void endTransaction() {
-
- }
-
@Override
public void refresh(Object bean) {
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java
index 8c9455bcb..96a2353d8 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java
@@ -79,9 +79,7 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
@ForPlatform({Platform.H2})
@Test
public void end_withoutActiveTransaction_isFine() {
-
assertNull(DB.currentTransaction());
- DB.endTransaction();
}
@ForPlatform({Platform.H2})
diff --git a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java
index 1174f7a34..8675c2387 100644
--- a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java
+++ b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java
@@ -1,5 +1,6 @@
package org.tests.basic;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.BeanState;
import io.ebean.DB;
@@ -36,13 +37,11 @@ public class TestDynamicUpdate extends BaseTestCase {
server.save(b2);
- server.beginTransaction();
- try {
+ try (Transaction txn = server.beginTransaction()) {
EMain b3 = server.find(EMain.class, b.getId());
assertEquals("ABC", b3.getEmbeddable().getDescription());
- } finally {
- server.endTransaction();
}
+
EMain b4 = server.find(EMain.class, b.getId());
b4.setName("bbb");
b4.getEmbeddable().setDescription("123");
diff --git a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java
index ebc134ff2..329a684e7 100644
--- a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java
+++ b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java
@@ -1,5 +1,6 @@
package org.tests.basic;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
@@ -17,8 +18,7 @@ public class TestInheritRef extends BaseTestCase {
@Test
public void testAssocOne() {
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
DB.createUpdate(Vehicle.class, "delete from vehicle");
Car c = new Car();
@@ -52,9 +52,6 @@ public class TestInheritRef extends BaseTestCase {
assertEquals(1, found);
assertTrue(foundTruck.getCapacity() == 20D);
-
- } finally {
- DB.rollbackTransaction();
}
}
}
diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java
index a41255450..3bfa60b61 100644
--- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java
+++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java
@@ -47,10 +47,9 @@ public class TestPersistenceContext extends BaseTestCase {
// implicit transaction with its own persistence context
Order oBefore = DB.find(Order.class, 1);
// start a persistence context
- DB.beginTransaction();
Order order;
- try {
+ try (Transaction txn = DB.beginTransaction()) {
order = DB.find(Order.class, 1);
// not the same instance ...as a different persistence context
assertNotSame(order, oBefore);
@@ -63,9 +62,6 @@ public class TestPersistenceContext extends BaseTestCase {
// all the same instance
assertSame(order, o2);
assertSame(order, o3);
-
- } finally {
- DB.endTransaction();
}
// implicit transaction with its own persistence context
@@ -74,8 +70,7 @@ public class TestPersistenceContext extends BaseTestCase {
assertNotSame(oAfter, order);
// start a persistence context
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC");
Integer id = testOrder.getCustomer().getId();
Integer orderId = testOrder.getId();
@@ -94,9 +89,6 @@ public class TestPersistenceContext extends BaseTestCase {
assertEquals(customer.getId(), customer2.getId());
assertSame(customer, customer2);
-
- } finally {
- DB.endTransaction();
}
}
diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
index b69276295..941aed9cb 100644
--- a/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
+++ b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java
@@ -1,5 +1,6 @@
package org.tests.cache;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
@@ -26,8 +27,7 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {
order.setCustomer(customer);
DB.save(order);
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
Order foundOrder = DB.find(Order.class)
.where().eq("id", order.getId())
@@ -47,9 +47,6 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {
assertSame(foundOrder, order1);
assertTrue(DB.beanState(foundOrder).isDirty());
-
- } finally {
- DB.endTransaction();
}
// cleanup
diff --git a/ebean-test/src/test/java/org/tests/genkey/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/genkey/TestGeneratedKeys.java
index a663738c8..f8209e897 100644
--- a/ebean-test/src/test/java/org/tests/genkey/TestGeneratedKeys.java
+++ b/ebean-test/src/test/java/org/tests/genkey/TestGeneratedKeys.java
@@ -1,6 +1,7 @@
package org.tests.genkey;
import io.ebean.DB;
+import io.ebean.Transaction;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.TOne;
@@ -19,12 +20,10 @@ public class TestGeneratedKeys {
c1.setName("Two");
c1.setDescription("Test Gen Key Two");
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
DB.save(c);
DB.save(c1);
- } finally {
- DB.commitTransaction();
+ txn.commit();
}
Integer id = c.getId();
assertNotNull(id);
diff --git a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java
index 5973dcf7d..34a71b899 100644
--- a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java
+++ b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java
@@ -1,5 +1,6 @@
package org.tests.level.test;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
@@ -19,8 +20,7 @@ public class ManyToManyTest extends BaseTestCase {
@Test
public void test() {
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
Level4 i = new Level4("i");
Level4 ii = new Level4("ii");
Level4 iii = new Level4("iii");
@@ -92,9 +92,6 @@ public class ManyToManyTest extends BaseTestCase {
.findList();
validateObjectGraph(i, ii, iii, one, two, x1, x2, x3, x4, x5, things);
-
- } finally {
- DB.endTransaction();
}
}
diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java
index 1734be563..81e0c8f54 100644
--- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java
+++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java
@@ -54,7 +54,6 @@ public class TestDeleteUnloadedChildren extends BaseTestCase {
@Test
public void testCascadeDelete2() {
-
init();
try (Transaction txn = DB.beginTransaction()) {
@@ -68,18 +67,14 @@ public class TestDeleteUnloadedChildren extends BaseTestCase {
@Test
public void testCascadeDelete3() {
-
init();
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
EdExtendedParent extendedParent = DB.find(EdExtendedParent.class).where()
.eq("name", "My second computer").findOne();
extendedParent.getChildren().size();
DB.delete(extendedParent);
- DB.commitTransaction();
- } finally {
- DB.endTransaction();
+ txn.commit();
}
}
diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
index fb1af1d3c..26c3162dc 100644
--- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
+++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
@@ -49,7 +49,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
// nothing flushed yet
assertThat(LoggedSql.start()).isEmpty();
- DB.commitTransaction();
+ txn.commit();
// insert statements for EdExtendedParent
List loggedSql2 = LoggedSql.start();
diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
index 675f79588..2dec54c2c 100644
--- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
+++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
@@ -44,7 +44,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
parent.setName("MyDesk");
DB.save(parent);
- DB.commitTransaction();
+ txn.commit();
// insert statements for EdExtendedParent
List loggedSql = LoggedSql.stop();
@@ -87,7 +87,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
DB.save(parent);
// flush
- DB.commitTransaction();
+ txn.commit();
// insert statements for EdExtendedParent
List loggedSql = LoggedSql.stop();
diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
index e321664b6..ad87c5f89 100644
--- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
+++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
@@ -58,7 +58,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
// insert statements for EdParent
List loggedSql1 = LoggedSql.start();
- DB.commitTransaction();
+ txn.commit();
assertEquals(0, loggedSql1.size());
diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java
index f858739db..2d36fc5d5 100644
--- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java
+++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java
@@ -1,5 +1,6 @@
package org.tests.persistencecontext;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
@@ -12,12 +13,9 @@ public class TestPersistenceContextOnUpdateDuringTxn extends BaseTestCase {
@Test
public void test() {
-
Database server = DB.getDefault();
- server.beginTransaction();
- try {
-
+ try (Transaction txn = server.beginTransaction()) {
EBasic bean1 = new EBasic();
bean1.setName("hello");
@@ -33,11 +31,7 @@ public class TestPersistenceContextOnUpdateDuringTxn extends BaseTestCase {
EBasic loadedEntity = server.find(EBasic.class, bean1.getId());
assertThat(loadedEntity.getName()).isEqualTo("hello-changed");
-
- } finally {
- server.endTransaction();
}
-
}
}
diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java
index 56988bc4b..bfe12fd8f 100644
--- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java
+++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java
@@ -1,5 +1,6 @@
package org.tests.persistencecontext;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
@@ -21,8 +22,7 @@ public class TestPersistenceContextQueryScope extends BaseTestCase {
//DB.cacheManager().setCaching(EBasicVer.class, true);
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
EBasicVer bean1 = DB.find(EBasicVer.class, bean.getId());
// do an update of the name in the DB
@@ -65,10 +65,7 @@ public class TestPersistenceContextQueryScope extends BaseTestCase {
assertEquals("second", bean3.getName());
DB.delete(bean3);
- DB.commitTransaction();
-
- } finally {
- DB.endTransaction();
+ txn.commit();
}
}
}
diff --git a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java
index e009b8866..a7c3aaff0 100644
--- a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java
+++ b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java
@@ -1,5 +1,6 @@
package org.tests.query;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
@@ -50,23 +51,18 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase {
try {
for (int i = 0; i < 100; i++) {
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
Query q0 = DB.find(Customer.class).where().icontains("namexxx", "Rob")
.query();
q0.findList();
- DB.commitTransaction();
+ txn.commit();
} catch (Exception e) {
if (e.getMessage().contains("Unsuccessfully waited")) {
fail("No connections found while only one thread is running. (after " + i + " queries)");
} else {
e.printStackTrace();
}
- } finally {
- if (DB.currentTransaction().isActive()) {
- DB.rollbackTransaction();
- }
}
}
diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java
index 9632a8d87..4a78a5a41 100644
--- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java
+++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java
@@ -219,8 +219,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
// kinda not normal but just wrap in a transaction to assert
// the background fetch does not occur (which explicitly creates
// its own transaction) ... so a bit naughty with the test here
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
List orders = pagedList.getList();
int totalRowCount = pagedList.getTotalCount();
@@ -238,13 +237,9 @@ public class TestQueryFindPagedList extends BaseTestCase {
String secTxn = loggedSql.get(1).substring(0, 10);
assertEquals(firstTxn, secTxn);
-
- } finally {
- DB.endTransaction();
}
}
-
@Test
public void test_usingAlias() {
diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index c7bc9d5ca..823327e3f 100644
--- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -84,15 +84,10 @@ public class TestCustomerFinder extends BaseTestCase {
@Test
public void currentTransaction() {
-
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
Transaction t1 = DB.currentTransaction();
Transaction t2 = Customer.find.currentTransaction();
assertThat(t2).isSameAs(t1);
-
- } finally {
- DB.endTransaction();
}
}
diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
index 4b1e18e03..40e16134d 100644
--- a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
+++ b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java
@@ -1,9 +1,10 @@
package org.tests.query.joins;
-import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Expr;
import io.ebean.Query;
+import io.ebean.Transaction;
+import io.ebean.xtest.BaseTestCase;
import org.junit.jupiter.api.Test;
import org.tests.basic.one2one.Wheel;
import org.tests.model.basic.MRole;
@@ -18,8 +19,7 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
@Test
public void test() {
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
MRole r1 = new MRole();
r1.setRoleName("role1B");
@@ -63,8 +63,6 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
assertSqlOuterJoins(sql);
assertThat(sql).contains(".role_name = ?");
- } finally {
- DB.rollbackTransaction();
}
}
@@ -76,7 +74,7 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
.eq("roles.roleid", roleid)
.endOr().query();
- query.findList();
+ query.findList();
String sql = sqlOf(query);
assertSqlOuterJoins(sql);
@@ -85,19 +83,16 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
@Test
public void testSelectOneToOneDisjunction() {
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
Query query = DB.find(Wheel.class)
- .select("id")
- .where().or()
- .ge("tire.id", 100)
- .lt("tire.id", 100)
- .endOr().query();
+ .select("id")
+ .where().or()
+ .ge("tire.id", 100)
+ .lt("tire.id", 100)
+ .endOr().query();
query.findList();
String sql = sqlOf(query);
assertThat(sql).contains("join");
- } finally {
- DB.rollbackTransaction();
}
}
diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java
index cbbba65dd..1f05b7830 100644
--- a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java
+++ b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java
@@ -1,5 +1,6 @@
package org.tests.query.other;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebeaninternal.api.SpiEbeanServer;
@@ -44,8 +45,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase {
// start transaction to keep PC going to lazy query
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
DB.find(Order.class, 1);
SpiQuery query0 = (SpiQuery) DB.find(OrderDetail.class);
@@ -57,9 +57,6 @@ public class TestManyLazyLoadingQuery extends BaseTestCase {
query0.findList();
assertThat(query0.getGeneratedSql()).contains(" from o_order_detail t0 where (t0.order_id) ");
platformAssertIn(query0.getGeneratedSql(), "where (t0.order_id)");
-
- } finally {
- DB.endTransaction();
}
List details = DB.find(OrderDetail.class)
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
index 3181d8456..994565fd5 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java
@@ -62,8 +62,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
List list = server.find(UTMaster.class).fetch("details").findList();
- Transaction txn = server.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
txn.setBatchMode(true);
txn.setBatchOnCascade(true);
@@ -103,11 +102,8 @@ public class TestBatchPersistCascade extends BaseTestCase {
logger.info("commit ------------ ");
- server.commitTransaction();
- } finally {
- server.endTransaction();
+ txn.commit();
}
-
}
private UTDetail createUTDetail(String master, int count) {
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java
index 0d10b7e23..01d28a254 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java
@@ -1,5 +1,6 @@
package org.tests.transaction;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebeaninternal.api.SpiTransaction;
@@ -19,9 +20,8 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase {
EBasicVer bean = new EBasicVer("Please Delete Me");
DB.save(bean);
- SpiTransaction transaction = (SpiTransaction) DB.beginTransaction();
- try {
-
+ try (Transaction txn = DB.beginTransaction()) {
+ SpiTransaction spiTransaction = (SpiTransaction)txn;
EBasicVer bean2 = DB.find(EBasicVer.class, bean.getId());
assertNotSame(bean, bean2);
@@ -29,18 +29,15 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase {
// same instance from PersistenceContext
assertSame(bean2, bean3);
- Object bean4 = transaction.persistenceContext().get(EBasicVer.class, bean.getId());
+ Object bean4 = spiTransaction.persistenceContext().get(EBasicVer.class, bean.getId());
assertSame(bean2, bean4);
DB.delete(bean2);
- Object bean5 = transaction.persistenceContext().get(EBasicVer.class, bean.getId());
+ Object bean5 = spiTransaction.persistenceContext().get(EBasicVer.class, bean.getId());
assertNull(bean5);
- DB.commitTransaction();
-
- } finally {
- DB.endTransaction();
+ txn.commit();
}
EBasicVer bean6 = DB.find(EBasicVer.class).where().eq("id", bean.getId()).findOne();
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
index 1952a0715..51816e8cd 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -37,8 +37,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
try (Transaction txn1 = server.beginTransaction()) {
bean.setName("x2");
server.save(bean);
- //txn1.commit();
- server.commitTransaction();
+ txn1.commit();
}
EBasic fresh = server.find(EBasic.class, bean.getId());
@@ -48,8 +47,7 @@ public class TestNestedSubTransaction extends BaseTestCase {
try (Transaction txn2 = server.beginTransaction()) {
bean.setName("barney");
DB.save(bean);
- //txn2.commit();
- server.commitTransaction();
+ txn2.commit();
}
fresh = server.find(EBasic.class)
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java
index d03fcea7f..016e28375 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java
@@ -1,5 +1,6 @@
package org.tests.transaction;
+import io.ebean.Transaction;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.Test;
@@ -12,10 +13,7 @@ public class TestStatelessUpdateClearPC extends BaseTestCase {
@Test
public void test() {
-
-
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
EBasic newUser = new EBasic();
newUser.setName("any@email.com");
DB.save(newUser);
@@ -32,8 +30,6 @@ public class TestStatelessUpdateClearPC extends BaseTestCase {
EBasic loadedUser = DB.find(EBasic.class, newUser.getId());
assertEquals("anyNew@email.com", loadedUser.getName());
- } finally {
- DB.rollbackTransaction();
}
}
}
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java
index 2717cbc03..35c4f9a6d 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java
@@ -31,11 +31,8 @@ public class TestTransactionCallback extends BaseTestCase {
assertEquals(0, countPreRollback);
assertEquals(0, countPostRollback);
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
DB.register(new MyCallback());
- } finally {
- DB.rollbackTransaction();
}
assertEquals(1, countPreCommit);
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java
index bc59408ca..e27f6a64c 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java
@@ -32,8 +32,7 @@ public class TestTransactionalNotSupports extends BaseTestCase {
public void withOuterTransaction_expect_currentTransaction_null_and_originalTxnRestored() {
outerTxn = null;
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
currentTxn = DB.currentTransaction();
assertNotNull(currentTxn);
new SomeTransactionalWithNotSupported().doStuff();
@@ -44,8 +43,6 @@ public class TestTransactionalNotSupports extends BaseTestCase {
// the original transaction was restored
Transaction restored = DB.currentTransaction();
assertSame(currentTxn, restored);
- } finally {
- DB.endTransaction();
}
}
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java
index 4b48f682c..7bcd26ffc 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java
@@ -40,8 +40,7 @@ public class TestTransactionalRequired extends BaseTestCase {
public void withOuterBegin() {
outerTxn = null;
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
currentTxn = DB.currentTransaction();
assertNotNull(currentTxn);
new OuterTransactionalWithRequired().doOuter();
@@ -51,8 +50,6 @@ public class TestTransactionalRequired extends BaseTestCase {
assertSame(currentTxn, restored);
assertSame(currentTxn, innerTxn);
assertSame(currentTxn, outerTxn);
- } finally {
- DB.endTransaction();
}
assertNull(DB.currentTransaction());
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java
index 37a8760ed..913d782e5 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java
@@ -68,11 +68,8 @@ public class TestTransactionalRequiresNew extends BaseTestCase {
Database server = server();
try(Transaction txn = server.beginTransaction()) {
String txnName = txn.toString();
- DB.beginTransaction(TxScope.requiresNew());
- try {
- DB.commitTransaction();
- } finally {
- DB.endTransaction();
+ try (Transaction txn2 = DB.beginTransaction(TxScope.requiresNew())) {
+ txn2.commit();
}
assertThat(txn.toString()).isEqualTo(txnName);
}
@@ -83,11 +80,8 @@ public class TestTransactionalRequiresNew extends BaseTestCase {
Database server = server();
try (Transaction txn = server.beginTransaction()) {
String txnName = txn.toString();
- server.beginTransaction(TxScope.requiresNew());
- try {
- server.commitTransaction();
- } finally {
- server.endTransaction();
+ try (Transaction txn2 = server.beginTransaction(TxScope.requiresNew())) {
+ txn2.commit();
}
assertThat(txn.toString()).isEqualTo(txnName);
}
@@ -98,11 +92,8 @@ public class TestTransactionalRequiresNew extends BaseTestCase {
Database server = server();
try (Transaction txn = server.beginTransaction()) {
String txnName = txn.toString();
- Transaction txn2 = DB.beginTransaction(TxScope.requiresNew());
- try {
+ try (Transaction txn2 = DB.beginTransaction(TxScope.requiresNew())) {
txn2.commit();
- } finally {
- txn2.end();
}
assertThat(txn.toString()).isEqualTo(txnName);
}
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java
index bf881b878..7927e889b 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java
@@ -33,12 +33,9 @@ public class TestTransactionalSupports extends BaseTestCase {
public void withOuterTransaction_expect_currentTransactionAvailable() {
outerTxn = null;
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
new SomeTransactionalWithSupports().doStuff();
assertNotNull(outerTxn);
- } finally {
- DB.endTransaction();
}
}
diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
index b8108dcf7..c8cab2ee2 100644
--- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
+++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java
@@ -177,9 +177,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
assertEquals("foo3", log4.getDescription());
assertEquals("mod1", log4.getModifiedDescription());
-
- DB.beginTransaction();
- try {
+ try (Transaction txn = DB.beginTransaction()) {
SqlUpdate update = DB.sqlUpdate(updateDml);
update.setParameter("desc", "foo4");
update.setParameter("id", id);
@@ -189,9 +187,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
updateMod.setParameter("desc", "mod2");
updateMod.execute();
- DB.commitTransaction();
- } finally {
- DB.endTransaction();
+ txn.commit();
}
AuditLog log5 = DB.find(AuditLog.class, log.getId());
assertEquals("foo4", log5.getDescription());