You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/12/22 23:57:56 UTC
[isis] branch master updated: ISIS-2033: shorter names for the
internal tx classes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 4f61170 ISIS-2033: shorter names for the internal tx classes
4f61170 is described below
commit 4f611708cdd0b9d59010b6566543b18100ffebb1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Dec 23 00:57:41 2020 +0100
ISIS-2033: shorter names for the internal tx classes
---
.../persistence/IsisPersistenceSessionJdoBase.java | 4 ++--
.../persistence/PersistenceSession5.java | 8 +++----
.../IsisPlatformTransactionManagerForJdo.java | 4 ++--
...nFactory.java => TxManagerInternalFactory.java} | 6 ++---
.../{IsisTransactionJdo.java => _Tx.java} | 20 ++++++++--------
...tionManagerJdo.java => _TxManagerInternal.java} | 28 +++++++++++-----------
6 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPersistenceSessionJdoBase.java
index 6d7c75e..c46ba7e 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPersistenceSessionJdoBase.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPersistenceSessionJdoBase.java
@@ -40,7 +40,7 @@ import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStat
import org.apache.isis.persistence.jdo.integration.persistence.command.PersistenceCommandQueue;
import org.apache.isis.persistence.jdo.integration.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.persistence.jdo.integration.persistence.query.PersistenceQueryFactory;
-import org.apache.isis.persistence.jdo.integration.transaction.TxManFactory;
+import org.apache.isis.persistence.jdo.integration.transaction.TxManagerInternalFactory;
import lombok.Getter;
import lombok.val;
@@ -112,7 +112,7 @@ implements IsisPersistenceSessionJdo {
this.persistenceQueryFactory = PersistenceQueryFactory.of(
obj->this.adapterFor(obj),
this.specificationLoader);
- this.commandQueue = TxManFactory.newCommandQueue(metaModelContext, this);
+ this.commandQueue = TxManagerInternalFactory.newCommandQueue(metaModelContext, this);
this.state = State.NOT_INITIALIZED;
}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/PersistenceSession5.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/PersistenceSession5.java
index 405fc40..3d20b09 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/PersistenceSession5.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/PersistenceSession5.java
@@ -61,9 +61,7 @@ import org.apache.isis.persistence.jdo.integration.persistence.queries.Persisten
import org.apache.isis.persistence.jdo.integration.persistence.query.PersistenceQuery;
import org.apache.isis.persistence.jdo.integration.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.persistence.jdo.integration.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import org.apache.isis.persistence.jdo.integration.transaction.IsisTransactionJdo;
-import lombok.Getter;
import lombok.NonNull;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -75,7 +73,7 @@ import lombok.extern.log4j.Log4j2;
public class PersistenceSession5 extends IsisPersistenceSessionJdoBase
implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
- @Getter private final TransactionService transactionService;
+ private final TransactionService transactionService;
private Runnable unregisterLifecycleListeners;
/**
@@ -144,8 +142,8 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
* Closes the subcomponents.
*
* <p>
- * Automatically {@link _IsisTransactionManagerJdo#commitTransaction(IsisTransactionObject)
- * ends (commits)} the current (Isis) {@link IsisTransactionJdo}. This in turn commits the underlying
+ * Automatically {@link _TxManagerInternal#commitTransaction(IsisTransactionObject)
+ * ends (commits)} the current (Isis) {@link _Tx}. This in turn commits the underlying
* JDO transaction.
*
* <p>
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisPlatformTransactionManagerForJdo.java
index 48c9b06..e134fff 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisPlatformTransactionManagerForJdo.java
@@ -152,9 +152,9 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
IsisTransactionAspectSupport.clearTransactionObject();
}
- private _IsisTransactionManagerJdo transactionManagerJdo() {
+ private _TxManagerInternal transactionManagerJdo() {
return isisInteractionTracker.currentInteractionSession()
- .map(interaction->interaction.getAttribute(_IsisTransactionManagerJdo.class))
+ .map(interaction->interaction.getAttribute(_TxManagerInternal.class))
.orElseThrow(()->_Exceptions.unrecoverable("no current _IsisTransactionManagerJdo available"));
}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxManFactory.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxManagerInternalFactory.java
similarity index 89%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxManFactory.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxManagerInternalFactory.java
index fc7d320..3a2f62b 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxManFactory.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxManagerInternalFactory.java
@@ -25,19 +25,19 @@ import org.apache.isis.persistence.jdo.integration.persistence.command.Persisten
import lombok.val;
-public class TxManFactory {
+public class TxManagerInternalFactory {
public static PersistenceCommandQueue newCommandQueue(
MetaModelContext mmc,
HasPersistenceManager pmProvider) {
- val txMan = new _IsisTransactionManagerJdo(mmc, pmProvider);
+ val txMan = new _TxManagerInternal(mmc, pmProvider);
val isisInteractionTracker = mmc.getServiceRegistry()
.lookupServiceElseFail(InteractionTracker.class);
isisInteractionTracker.currentInteractionSession()
- .map(interaction->interaction.putAttribute(_IsisTransactionManagerJdo.class, txMan));
+ .map(interaction->interaction.putAttribute(_TxManagerInternal.class, txMan));
return txMan;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisTransactionJdo.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_Tx.java
similarity index 95%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisTransactionJdo.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_Tx.java
index 1bf7e61..347b7af 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisTransactionJdo.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_Tx.java
@@ -51,19 +51,19 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
/**
- * Used by the {@link _IsisTransactionManagerJdo} to captures a set of changes to be
+ * Used by the {@link _TxManagerInternal} to captures a set of changes to be
* applied.
*
* <p>
* Note that methods such as <tt>flush()</tt>, <tt>commit()</tt> and
* <tt>abort()</tt> are not part of the API. The place to control transactions
- * is through the {@link _IsisTransactionManagerJdo transaction manager}, because
+ * is through the {@link _TxManagerInternal transaction manager}, because
* some implementations may support nesting and such like. It is also the job of
- * the {@link _IsisTransactionManagerJdo} to ensure that the underlying persistence
+ * the {@link _TxManagerInternal} to ensure that the underlying persistence
* mechanism (for example, the <tt>ObjectStore</tt>) is also committed.
*/
@Vetoed @Log4j2
-public class IsisTransactionJdo implements Transaction {
+class _Tx implements Transaction {
public enum State {
/**
@@ -117,23 +117,23 @@ public class IsisTransactionJdo implements Transaction {
/**
- * Whether it is valid to {@link IsisTransactionJdo#commit() commit} this
- * {@link IsisTransactionJdo transaction}.
+ * Whether it is valid to {@link _Tx#commit() commit} this
+ * {@link _Tx transaction}.
*/
public boolean canCommit() {
return this == IN_PROGRESS;
}
/**
- * Whether it is valid to {@link IsisTransactionJdo#markAsAborted() abort} this
- * {@link IsisTransactionJdo transaction}.
+ * Whether it is valid to {@link _Tx#markAsAborted() abort} this
+ * {@link _Tx transaction}.
*/
public boolean canAbort() {
return this == IN_PROGRESS || this == MUST_ABORT;
}
/**
- * Whether the {@link IsisTransactionJdo transaction} is complete (and so a
+ * Whether the {@link _Tx transaction} is complete (and so a
* new one can be started).
*/
public boolean isComplete() {
@@ -164,7 +164,7 @@ public class IsisTransactionJdo implements Transaction {
private IsisException abortCause;
- public IsisTransactionJdo(
+ public _Tx(
final MetaModelContext mmc,
final _TxHelper txHelper,
final UUID interactionId,
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_IsisTransactionManagerJdo.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_TxManagerInternal.java
similarity index 92%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_IsisTransactionManagerJdo.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_TxManagerInternal.java
index d75dfd0..6856804 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_IsisTransactionManagerJdo.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_TxManagerInternal.java
@@ -39,7 +39,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Vetoed @Log4j2
-class _IsisTransactionManagerJdo
+class _TxManagerInternal
implements
PersistenceCommandQueue {
@@ -49,7 +49,7 @@ implements
private final Supplier<InteractionContext> interactionContextProvider;
private final _TxHelper txHelper;
- _IsisTransactionManagerJdo(
+ _TxManagerInternal(
MetaModelContext mmc,
HasPersistenceManager pmProvider) {
@@ -58,7 +58,7 @@ implements
this.txHelper = _TxHelper.create(pmProvider);
}
- public IsisTransactionJdo beginTransaction() {
+ public _Tx beginTransaction() {
val txInProgress = IsisTransactionAspectSupport.isTransactionInProgress();
if (txInProgress) {
@@ -76,7 +76,7 @@ implements
nestingLevel);
}
- return (IsisTransactionJdo) txObject.getCurrentTransaction();
+ return (_Tx) txObject.getCurrentTransaction();
} else {
@@ -85,7 +85,7 @@ implements
val command = interaction.getCommand();
val transactionId = command.getUniqueId();
- val currentTransaction = new IsisTransactionJdo(
+ val currentTransaction = new _Tx(
mmc,
txHelper,
transactionId,
@@ -103,7 +103,7 @@ implements
}
- public void flushTransaction(IsisTransactionJdo transaction) {
+ public void flushTransaction(_Tx transaction) {
if (transaction != null) {
log.debug("flushTransaction");
transaction.flush();
@@ -112,8 +112,8 @@ implements
/**
* Ends the transaction if nesting level is 0 (but will abort the transaction instead,
- * even if nesting level is not 0, if an {@link IsisTransactionJdo#getAbortCause() abort cause}
- * has been {@link IsisTransactionJdo#setAbortCause(IsisException) set}.
+ * even if nesting level is not 0, if an {@link _Tx#getAbortCause() abort cause}
+ * has been {@link _Tx#setAbortCause(IsisException) set}.
*
* <p>
* If in the process of committing the transaction an exception is thrown, then this will
@@ -125,7 +125,7 @@ implements
*/
public void commitTransaction(IsisTransactionObject txObject) {
- val transaction = (IsisTransactionJdo) txObject.getCurrentTransaction();
+ val transaction = (_Tx) txObject.getCurrentTransaction();
if (transaction == null) {
// allow this method to be called >1 with no adverse affects
@@ -157,7 +157,7 @@ implements
try {
endTransactionInternal(txObject);
} finally {
- val tx = (IsisTransactionJdo) txObject.getCurrentTransaction();
+ val tx = (_Tx) txObject.getCurrentTransaction();
if(tx==null) {
log.error("race condition when ending the current transaction object");
} else {
@@ -172,7 +172,7 @@ implements
private void endTransactionInternal(IsisTransactionObject txObject) {
- val transaction = (IsisTransactionJdo) txObject.getCurrentTransaction();
+ val transaction = (_Tx) txObject.getCurrentTransaction();
// terminate the transaction early if an abort cause was already set.
RuntimeException abortCause = transaction.getAbortCause();
@@ -311,7 +311,7 @@ implements
}
public void abortTransaction(IsisTransactionObject txObject) {
- val transaction = (IsisTransactionJdo) txObject.getCurrentTransaction();
+ val transaction = (_Tx) txObject.getCurrentTransaction();
if (transaction != null) {
transaction.markAsAborted();
txHelper.abortTransaction();
@@ -329,10 +329,10 @@ implements
// -- HELPER
- private IsisTransactionJdo getCurrentTransaction() {
+ private _Tx getCurrentTransaction() {
return IsisTransactionAspectSupport.currentTransactionObject()
.map(IsisTransactionObject::getCurrentTransaction)
- .map(IsisTransactionJdo.class::cast)
+ .map(_Tx.class::cast)
.orElse(null);
}