diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java index 649a12f00..087cfabc5 100644 --- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -58,11 +58,6 @@ public class ScopedTransaction implements SpiTransaction { scopeTrans.rollback(e); } - @Override - public void rollbackIfActive() { - transaction.rollbackIfActive(); - } - @Override public void setRollbackOnly() { scopeTrans.setRollbackOnly(); diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java index 2e7f73b44..158e2278f 100644 --- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java +++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -116,17 +116,14 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL void externalModification(TransactionEventTable event); /** - * Create a ServerTransaction. - *

- * To specify to use the default transaction isolation use a value of -1. - *

+ * Begin a managed transaction (Uses scope manager / ThreadLocal). */ - SpiTransaction createServerTransaction(boolean isExplicit, int isolationLevel); + SpiTransaction beginServerTransaction(); /** * Return the current transaction or null if there is no current transaction. */ - SpiTransaction getCurrentServerTransaction(); + SpiTransaction currentServerTransaction(); /** * Create a ScopeTrans for a method for the given scope definition. diff --git a/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java index 83aba831b..f9e4ed399 100644 --- a/src/main/java/io/ebeaninternal/api/SpiTransaction.java +++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java @@ -218,12 +218,6 @@ public interface SpiTransaction extends Transaction { */ Connection getInternalConnection(); - /** - * Rollback if the transaction is active. This provides an internal - * mechanism for rollback failures occur on commit(). - */ - void rollbackIfActive(); - /** * Return true if the manyToMany intersection should be persisted for this particular relationship direction. */ diff --git a/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/src/main/java/io/ebeaninternal/server/core/BeanRequest.java index f6d379d2f..909ba0ecf 100644 --- a/src/main/java/io/ebeaninternal/server/core/BeanRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/BeanRequest.java @@ -44,10 +44,10 @@ public abstract class BeanRequest { if (transaction != null) { return false; } - transaction = ebeanServer.getCurrentServerTransaction(); + transaction = ebeanServer.currentServerTransaction(); if (transaction == null || !transaction.isActive()) { // create an implicit transaction to execute this query - transaction = ebeanServer.createServerTransaction(false, -1); + transaction = ebeanServer.beginServerTransaction(); createdTransaction = true; } return true; @@ -58,7 +58,7 @@ public abstract class BeanRequest { */ public void commitTransIfRequired() { if (createdTransaction) { - transaction.commit(); + ebeanServer.commitTransaction(); } } @@ -68,7 +68,7 @@ public abstract class BeanRequest { public void rollbackTransIfRequired() { if (createdTransaction) { try { - transaction.rollbackIfActive(); + ebeanServer.endTransaction(); } catch (Exception e) { // Just log this and carry on. A previous exception has been // thrown and if this rollback throws exception it likely means diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 8faf65235..d39e346ff 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -808,7 +808,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Returns the current transaction (or null) from the scope. */ @Override - public SpiTransaction getCurrentServerTransaction() { + public SpiTransaction currentServerTransaction() { return transactionScopeManager.get(); } @@ -1120,7 +1120,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { SpiTransaction t = (SpiTransaction) transaction; if (t == null) { - t = getCurrentServerTransaction(); + t = currentServerTransaction(); } BeanDescriptor desc = query.getBeanDescriptor(); @@ -1211,7 +1211,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { SpiTransaction t = (SpiTransaction) transaction; if (t == null) { - t = getCurrentServerTransaction(); + t = currentServerTransaction(); } if (t == null || !t.isSkipCache()) { id = spiQuery.getBeanDescriptor().cacheNaturalKeyIdLookup(spiQuery); @@ -1649,7 +1649,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { wrap.commitIfCreated(); } catch (RuntimeException e) { - wrap.rollbackIfCreated(); + wrap.endIfCreated(); throw e; } } @@ -1698,7 +1698,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { wrap.commitIfCreated(); } catch (RuntimeException e) { - wrap.rollbackIfCreated(); + wrap.endIfCreated(); throw e; } } @@ -1715,7 +1715,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return liveBeans; } catch (RuntimeException e) { - wrap.rollbackIfCreated(); + wrap.endIfCreated(); throw e; } } @@ -1750,7 +1750,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return beans; } catch (RuntimeException e) { - wrap.rollbackIfCreated(); + wrap.endIfCreated(); throw e; } } @@ -1814,7 +1814,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return saveCount; } catch (RuntimeException e) { - wrap.rollbackIfCreated(); + wrap.endIfCreated(); throw e; } } @@ -1850,7 +1850,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return rowCount; } catch (RuntimeException e) { - wrap.rollbackIfCreated(); + wrap.endIfCreated(); throw e; } } @@ -1885,7 +1885,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return count; } catch (RuntimeException e) { - wrap.rollbackIfCreated(); + wrap.endIfCreated(); throw e; } } @@ -1964,7 +1964,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return deleteCount; } catch (RuntimeException e) { - wrap.rollbackIfCreated(); + wrap.endIfCreated(); throw e; } } @@ -2146,22 +2146,24 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { TransWrapper initTransIfRequired(Transaction t) { if (t != null) { - return new TransWrapper((SpiTransaction) t, false); + return new TransWrapper((SpiTransaction) t, false, this); } boolean wasCreated = false; SpiTransaction trans = transactionScopeManager.get(); if (trans == null) { // create a transaction - trans = transactionManager.createTransaction(false, -1); + trans = beginServerTransaction(); wasCreated = true; } - return new TransWrapper(trans, wasCreated); + return new TransWrapper(trans, wasCreated, this); } @Override - public SpiTransaction createServerTransaction(boolean isExplicit, int isolationLevel) { - return transactionManager.createTransaction(isExplicit, isolationLevel); + public SpiTransaction beginServerTransaction() { + SpiTransaction t = transactionManager.createTransaction(false, -1); + transactionScopeManager.set(t); + return t; } @Override diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 950e5846e..dc76fe050 100644 --- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -221,7 +221,7 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe // first check if the query requires its own transaction if (transaction == null) { // maybe a current one - transaction = ebeanServer.getCurrentServerTransaction(); + transaction = ebeanServer.currentServerTransaction(); if (transaction == null) { // create an implicit transaction to execute this query transaction = ebeanServer.createQueryTransaction(query.getTenantId()); diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java index 7e91b0051..75e5cc67f 100644 --- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java @@ -73,10 +73,10 @@ public final class RelationalQueryRequest { */ public void initTransIfRequired() { if (trans == null) { - trans = ebeanServer.getCurrentServerTransaction(); + trans = ebeanServer.currentServerTransaction(); if (trans == null || !trans.isActive()) { // create a local readOnly transaction - trans = ebeanServer.createServerTransaction(false, -1); + trans = ebeanServer.beginServerTransaction(); createdTransaction = true; } } @@ -87,7 +87,7 @@ public final class RelationalQueryRequest { */ public void endTransIfRequired() { if (createdTransaction) { - trans.commit(); + ebeanServer.commitTransaction(); } } diff --git a/src/main/java/io/ebeaninternal/server/core/TransWrapper.java b/src/main/java/io/ebeaninternal/server/core/TransWrapper.java index a8f9d11e9..5f93fe8a7 100644 --- a/src/main/java/io/ebeaninternal/server/core/TransWrapper.java +++ b/src/main/java/io/ebeaninternal/server/core/TransWrapper.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.core; +import io.ebean.EbeanServer; import io.ebeaninternal.api.SpiTransaction; /** @@ -13,14 +14,17 @@ final class TransWrapper { final SpiTransaction transaction; + private final EbeanServer server; + private final boolean wasCreated; /** * Wrap the transaction indicating if it was just created. */ - TransWrapper(SpiTransaction t, boolean created) { - transaction = t; - wasCreated = created; + TransWrapper(SpiTransaction t, boolean created, EbeanServer server) { + this.transaction = t; + this.server = server; + this.wasCreated = created; } void batchEscalateOnCollection() { @@ -35,22 +39,14 @@ final class TransWrapper { void commitIfCreated() { if (wasCreated) { - transaction.commit(); + server.commitTransaction(); } } - void rollbackIfCreated() { + void endIfCreated() { if (wasCreated) { - transaction.rollbackIfActive(); + server.endTransaction(); } } - /** - * Return true if the transaction was just created. If true it should be - * committed after the request has been processed. - */ - boolean wasCreated() { - return wasCreated; - } - } diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index 0d0256191..c7a4b4f01 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -1036,16 +1036,6 @@ public class JdbcTransaction implements SpiTransaction { this.rollbackOnly = true; } - /** - * Perform rollback is the transaction is still active. - */ - @Override - public void rollbackIfActive() { - if (isActive()) { - rollback(null); - } - } - /** * Rollback the transaction. */ diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 5fb249e89..df53b34a9 100644 --- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -154,12 +154,12 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public SpiTransaction createServerTransaction(boolean isExplicit, int isolationLevel) { + public SpiTransaction beginServerTransaction() { return null; } @Override - public SpiTransaction getCurrentServerTransaction() { + public SpiTransaction currentServerTransaction() { return null; }