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/25 19:38:47 UTC
[isis] branch master updated: ISIS-2033: minor cleanup
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 0c0f1c1 ISIS-2033: minor cleanup
0c0f1c1 is described below
commit 0c0f1c175307ed7005487ad62fd1d7687c11008d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 25 20:38:35 2020 +0100
ISIS-2033: minor cleanup
---
.../jdo/integration/persistence/JdoPersistenceSession5.java | 11 +----------
.../integration/persistence/_JdoPersistenceSessionBase.java | 6 +++---
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession5.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession5.java
index 5c3e5da..b435385 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession5.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/JdoPersistenceSession5.java
@@ -36,7 +36,6 @@ import org.apache.isis.persistence.jdo.integration.lifecycles.FetchResultHandler
import org.apache.isis.persistence.jdo.integration.lifecycles.IsisLifecycleListener;
import org.apache.isis.persistence.jdo.integration.lifecycles.JdoStoreLifecycleListenerForIsis;
import org.apache.isis.persistence.jdo.integration.lifecycles.LoadLifecycleListenerForIsis;
-import org.apache.isis.persistence.jdo.integration.transaction.TransactionalProcessor;
import lombok.NonNull;
import lombok.val;
@@ -144,11 +143,6 @@ implements
public ManagedObject adaptEntityAndInjectServices(final @NonNull Persistable pojo) {
return _Utils.adaptEntityAndInjectServices(getMetaModelContext(), pojo);
}
-
- @Override
- public TransactionalProcessor getTransactionalProcessor() {
- return txCommandProcessor;
- }
// -- REFRESH
@@ -168,8 +162,7 @@ implements
try {
persistenceManager.refresh(domainObject);
} catch (final RuntimeException e) {
- final Oid oid = oidFor(domainObject);
- throw new PojoRefreshException(oid, e);
+ throw new PojoRefreshException(oidFor(domainObject), e);
}
// possibly redundant because also called in the post-load event
@@ -178,8 +171,6 @@ implements
initializeEntityAfterFetched((Persistable) domainObject);
}
- // -- FrameworkSynchronizer delegate methods
-
@Override
public void enlistDeletingAndInvokeIsisRemovingCallbackFacet(final Persistable pojo) {
val entity = adaptEntityAndInjectServices(pojo);
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_JdoPersistenceSessionBase.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_JdoPersistenceSessionBase.java
index f25875c..4267f1c 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_JdoPersistenceSessionBase.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_JdoPersistenceSessionBase.java
@@ -43,9 +43,9 @@ implements JdoPersistenceSession {
// -- FIELDS
protected final FixturesInstalledStateHolder fixturesInstalledStateHolder;
- protected final TransactionalProcessor txCommandProcessor;
- @Getter protected final MetaModelContext metaModelContext;
+ @Getter(onMethod_ = {@Override}) protected final TransactionalProcessor transactionalProcessor;
+ @Getter(onMethod_ = {@Override}) protected final MetaModelContext metaModelContext;
/**
* Used to create the {@link #persistenceManager} when {@link #open()}ed.
@@ -77,7 +77,7 @@ implements JdoPersistenceSession {
this.fixturesInstalledStateHolder = fixturesInstalledStateHolder;
// sub-components
- this.txCommandProcessor = TxManagerInternalFactory.newCommandQueue(
+ this.transactionalProcessor = TxManagerInternalFactory.newCommandQueue(
metaModelContext,
this,
(FetchResultHandler)this);