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 22:38:09 UTC
[isis] branch master updated (332abd8 -> 2cecfac)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 332abd8 ISIS-2033: fixes CommandJdoRepository, as cannot create Instant from time without zone info
new b00c8ac ISIS-2033: tiny
new 2cecfac ISIS-2033: dn-integration: decouple persistence from transaction
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../isis/commons/internal/context/_Context.java | 9 +++++
.../jdo/integration/IsisModuleJdoIntegration.java | 2 +-
.../IsisLifecycleListener.java | 4 +--
.../jdo/integration/lifecycles/_Utils.java | 22 ++++++------
.../persistence/IsisPersistenceSessionJdo.java | 22 ++----------
.../persistence/IsisPersistenceSessionJdoBase.java | 6 ++--
.../persistence/PersistenceSession5.java | 7 ++--
.../jdo/integration/persistence/_ContextUtil.java | 9 -----
.../jdo/integration/persistence/_Utils.java | 15 ++------
...ctCommand.java => PersistenceCommandQueue.java} | 5 +--
.../queries/PersistenceQueryProcessorAbstract.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 24 ++++---------
.../IsisTransactionJdo.java | 3 +-
.../jdo/integration/transaction/TxHelper.java | 41 ++++++++--------------
.../jdo/integration/transaction/TxManFactory.java | 40 ++++++++++-----------
.../_IsisTransactionManagerJdo.java | 15 +++++---
16 files changed, 91 insertions(+), 135 deletions(-)
rename persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/{persistence => lifecycles}/IsisLifecycleListener.java (98%)
copy tooling/projectmodel/src/main/java/org/apache/isis/tooling/projectmodel/gradle/WriterAbstract.java => persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java (65%)
copy persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/command/{CreateObjectCommand.java => PersistenceCommandQueue.java} (90%)
rename persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/{persistence => transaction}/IsisPlatformTransactionManagerForJdo.java (89%)
rename persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/{persistence => transaction}/IsisTransactionJdo.java (99%)
copy commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java => persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxHelper.java (64%)
copy core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContext.java => persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxManFactory.java (55%)
rename persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/{persistence => transaction}/_IsisTransactionManagerJdo.java (95%)
[isis] 02/02: ISIS-2033: dn-integration: decouple persistence from
transaction
Posted by ah...@apache.org.
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
commit 2cecfac83606176faed9bf03880a7a9f890a8623
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 23:07:13 2020 +0100
ISIS-2033: dn-integration: decouple persistence from transaction
---
.../isis/commons/internal/context/_Context.java | 9 +++++
.../jdo/integration/IsisModuleJdoIntegration.java | 2 +-
.../IsisLifecycleListener.java | 4 +-
.../jdo/integration/lifecycles/_Utils.java | 37 ++++++++++++++++++
.../persistence/IsisPersistenceSessionJdo.java | 22 +----------
.../persistence/IsisPersistenceSessionJdoBase.java | 6 ++-
.../persistence/PersistenceSession5.java | 7 ++--
.../jdo/integration/persistence/_ContextUtil.java | 9 -----
.../jdo/integration/persistence/_Utils.java | 11 ------
.../command/PersistenceCommandQueue.java | 25 ++++++++++++
.../queries/PersistenceQueryProcessorAbstract.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 24 ++++--------
.../IsisTransactionJdo.java | 3 +-
.../jdo/integration/transaction/TxHelper.java | 43 +++++++++++++++++++++
.../jdo/integration/transaction/TxManFactory.java | 45 ++++++++++++++++++++++
.../_IsisTransactionManagerJdo.java | 15 +++++---
16 files changed, 192 insertions(+), 72 deletions(-)
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java b/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
index 782b69e..01a0f3e 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
@@ -349,6 +349,15 @@ public final class _Context {
return Class.forName(className, true, getDefaultClassLoader());
}
+ public static boolean isJUnitTest() {
+ for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
+ if (element.getClassName().startsWith("org.junit.")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
// -- HELPER
private static void tryClose(Object singleton) {
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
index 2d17690..74f9f58 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
@@ -27,8 +27,8 @@ import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoProviderDatanucl
import org.apache.isis.persistence.jdo.integration.jdosupport.IsisJdoSupportDN5;
import org.apache.isis.persistence.jdo.integration.lifecycles.JdoPersistenceLifecycleService;
import org.apache.isis.persistence.jdo.integration.metamodel.JdoIntegrationProgrammingModel;
-import org.apache.isis.persistence.jdo.integration.persistence.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.persistence.jdo.integration.persistence.PersistenceSessionFactory5;
+import org.apache.isis.persistence.jdo.integration.transaction.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.persistence.jdo.metamodel.IsisModuleJdoMetamodel;
@Configuration
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisLifecycleListener.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/IsisLifecycleListener.java
similarity index 98%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisLifecycleListener.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/IsisLifecycleListener.java
index d4d44a4..757f67c 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisLifecycleListener.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/IsisLifecycleListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.lifecycles;
import java.util.Map;
@@ -42,7 +42,7 @@ DetachLifecycleListener, DirtyLifecycleListener, LoadLifecycleListener, StoreLif
/**
* The internal contract between PersistenceSession and this class.
*/
- interface PersistenceSessionLifecycleManagement {
+ public interface PersistenceSessionLifecycleManagement {
ManagedObject initializeEntity(Persistable pojo);
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java
new file mode 100644
index 0000000..4c7ec36
--- /dev/null
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/lifecycles/_Utils.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.persistence.jdo.integration.lifecycles;
+
+import javax.jdo.listener.InstanceLifecycleEvent;
+
+import org.datanucleus.enhancement.Persistable;
+
+final class _Utils {
+
+ static Persistable persistableFor(InstanceLifecycleEvent event) {
+ return (Persistable)event.getSource();
+ }
+
+ static boolean ensureRootObject(final Persistable pojo) {
+ return pojo!=null; // why would a Persistable ever be something different?
+ }
+
+
+
+}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPersistenceSessionJdo.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPersistenceSessionJdo.java
index be12b30..5c17543 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPersistenceSessionJdo.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPersistenceSessionJdo.java
@@ -21,35 +21,17 @@ package org.apache.isis.persistence.jdo.integration.persistence;
import java.util.List;
import org.apache.isis.persistence.jdo.integration.persistence.command.PersistenceCommand;
+import org.apache.isis.persistence.jdo.integration.transaction.TxHelper;
/**
*
* @since 2.0
*/
public interface IsisPersistenceSessionJdo
-extends PersistenceSession {
+extends PersistenceSession, TxHelper {
void execute(List<PersistenceCommand> persistenceCommandList);
-
- /**
- * to tell the underlying object store to start a transaction.
- */
- void startTransaction();
-
- /**
- * to tell the underlying object store to commit a transaction.
- */
- void endTransaction();
- /**
- * to tell the underlying object store to abort a transaction.
- */
- void abortTransaction();
-
- /**
- * to tell the underlying object store to flush a transaction.
- */
- void flushTransaction();
/**
* Not type safe. For type-safe queries use <br/><br/> {@code pm().newNamedQuery(cls, queryName)}
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 bc46f24..9576196 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
@@ -37,8 +37,10 @@ import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.transaction.changetracking.EntityChangeTracker;
import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
+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 lombok.Getter;
import lombok.val;
@@ -66,7 +68,7 @@ abstract class IsisPersistenceSessionJdoBase implements IsisPersistenceSessionJd
*/
protected final PersistenceManagerFactory jdoPersistenceManagerFactory;
- _IsisTransactionManagerJdo transactionManager;
+ PersistenceCommandQueue commandQueue;
/**
* populated only when {@link #open()}ed.
@@ -109,7 +111,7 @@ abstract class IsisPersistenceSessionJdoBase implements IsisPersistenceSessionJd
this.persistenceQueryFactory = PersistenceQueryFactory.of(
obj->this.adapterFor(obj),
this.specificationLoader);
- this.transactionManager = new _IsisTransactionManagerJdo(serviceRegistry, this);
+ this.commandQueue = TxManFactory.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 c91e8bc..a83f20d 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
@@ -48,6 +48,7 @@ import org.apache.isis.core.transaction.integration.IsisTransactionObject;
import org.apache.isis.persistence.jdo.applib.exceptions.NotPersistableException;
import org.apache.isis.persistence.jdo.applib.exceptions.UnsupportedFindException;
import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
+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.oid.JdoObjectIdSerializer;
@@ -62,6 +63,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;
@@ -467,13 +469,12 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
transactionService.executeWithinTransaction(()->{
log.debug("persist {}", adapter);
val createObjectCommand = newCreateObjectCommand(adapter);
- transactionManager.addCommand(createObjectCommand);
+ commandQueue.addCommand(createObjectCommand);
});
}
// -- destroyObjectInTransaction
-
@Override
public void destroyObjectInTransaction(final ManagedObject adapter) {
val spec = adapter.getSpecification();
@@ -483,7 +484,7 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
log.debug("destroyObject {}", adapter);
transactionService.executeWithinTransaction(()->{
val destroyObjectCommand = newDestroyObjectCommand(adapter);
- transactionManager.addCommand(destroyObjectCommand);
+ commandQueue.addCommand(destroyObjectCommand);
});
}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_ContextUtil.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_ContextUtil.java
index 6143dc0..05382b3 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_ContextUtil.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_ContextUtil.java
@@ -54,13 +54,4 @@ final class _ContextUtil {
return Optional.ofNullable(metaModelContext);
}
- static boolean isJUnitTest() {
- for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
- if (element.getClassName().startsWith("org.junit.")) {
- return true;
- }
- }
- return false;
- }
-
}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java
index 111bb2a..63d4d78 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java
@@ -20,9 +20,6 @@ package org.apache.isis.persistence.jdo.integration.persistence;
import javax.annotation.Nullable;
import javax.jdo.PersistenceManager;
-import javax.jdo.listener.InstanceLifecycleEvent;
-
-import org.datanucleus.enhancement.Persistable;
import org.apache.isis.commons.functional.Result;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -39,14 +36,6 @@ import lombok.val;
final class _Utils {
- static Persistable persistableFor(InstanceLifecycleEvent event) {
- return (Persistable)event.getSource();
- }
-
- static boolean ensureRootObject(final Persistable pojo) {
- return pojo!=null; // why would a Persistable ever be something different?
- }
-
@Nullable
static ManagedObject adapterFor(
final @NonNull MetaModelContext mmc,
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/command/PersistenceCommandQueue.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/command/PersistenceCommandQueue.java
new file mode 100644
index 0000000..7301740
--- /dev/null
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/command/PersistenceCommandQueue.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.persistence.jdo.integration.persistence.command;
+
+public interface PersistenceCommandQueue {
+
+ void addCommand(PersistenceCommand command);
+
+}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/queries/PersistenceQueryProcessorAbstract.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/queries/PersistenceQueryProcessorAbstract.java
index 092d0ff..2c1c4cc 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -30,7 +30,7 @@ import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
-import org.apache.isis.persistence.jdo.integration.persistence.IsisLifecycleListener;
+import org.apache.isis.persistence.jdo.integration.lifecycles.IsisLifecycleListener;
import org.apache.isis.persistence.jdo.integration.persistence.PersistenceSession5;
import org.apache.isis.persistence.jdo.integration.persistence.query.PersistenceQuery;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisPlatformTransactionManagerForJdo.java
similarity index 89%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPlatformTransactionManagerForJdo.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisPlatformTransactionManagerForJdo.java
index 96a5106..48c9b06 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisPlatformTransactionManagerForJdo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.transaction;
import javax.inject.Inject;
import javax.inject.Named;
@@ -32,6 +32,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.core.interaction.session.InteractionTracker;
@@ -45,6 +46,7 @@ import org.apache.isis.core.transaction.integration.IsisTransactionAspectSupport
import org.apache.isis.core.transaction.integration.IsisTransactionObject;
import org.apache.isis.core.transaction.integration.IsisTransactionObject.IsisInteractionScopeType;
+import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -53,26 +55,16 @@ import lombok.extern.log4j.Log4j2;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("JdoDN5")
+@RequiredArgsConstructor(onConstructor_ = {@Inject})
@Log4j2
public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransactionManager {
-
private static final long serialVersionUID = 1L;
private final InteractionFactory isisInteractionFactory;
private final EventBusService eventBusService;
private final InteractionTracker isisInteractionTracker;
- @Inject
- public IsisPlatformTransactionManagerForJdo(
- final InteractionFactory isisInteractionFactory,
- final EventBusService eventBusService,
- final InteractionTracker isisInteractionTracker) {
- this.isisInteractionFactory = isisInteractionFactory;
- this.eventBusService = eventBusService;
- this.isisInteractionTracker = isisInteractionTracker;
- }
-
@Override
protected Object doGetTransaction() throws TransactionException {
@@ -87,7 +79,7 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
if(!isInInteraction) {
- if(_ContextUtil.isJUnitTest()) {
+ if(_Context.isJUnitTest()) {
throw _Exceptions.illegalState("No InteractionSession available. "
+ "Transactions are expected to be within scope of an InteractionSession."
@@ -162,10 +154,8 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
private _IsisTransactionManagerJdo transactionManagerJdo() {
return isisInteractionTracker.currentInteractionSession()
- .map(interaction->interaction.getAttribute(IsisPersistenceSessionJdo.class))
- .map(IsisPersistenceSessionJdoBase.class::cast)
- .map(ps->ps.transactionManager)
- .orElseThrow(()->_Exceptions.unrecoverable("no current IsisPersistenceSessionJdoBase available"));
+ .map(interaction->interaction.getAttribute(_IsisTransactionManagerJdo.class))
+ .orElseThrow(()->_Exceptions.unrecoverable("no current _IsisTransactionManagerJdo available"));
}
}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisTransactionJdo.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisTransactionJdo.java
similarity index 99%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisTransactionJdo.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisTransactionJdo.java
index ad448e4..f5b0e84 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/IsisTransactionJdo.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/IsisTransactionJdo.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.transaction;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
@@ -41,6 +41,7 @@ import org.apache.isis.core.metamodel.commons.ToString;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.transaction.integration.IsisTransactionFlushException;
import org.apache.isis.core.transaction.integration.IsisTransactionManagerException;
+import org.apache.isis.persistence.jdo.integration.persistence.IsisPersistenceSessionJdo;
import org.apache.isis.persistence.jdo.integration.persistence.command.CreateObjectCommand;
import org.apache.isis.persistence.jdo.integration.persistence.command.DestroyObjectCommand;
import org.apache.isis.persistence.jdo.integration.persistence.command.PersistenceCommand;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxHelper.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxHelper.java
new file mode 100644
index 0000000..a1c5f96
--- /dev/null
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxHelper.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.persistence.jdo.integration.transaction;
+
+public interface TxHelper {
+
+ /**
+ * to tell the underlying object store to start a transaction.
+ */
+ void startTransaction();
+
+ /**
+ * to tell the underlying object store to commit a transaction.
+ */
+ void endTransaction();
+
+ /**
+ * to tell the underlying object store to abort a transaction.
+ */
+ void abortTransaction();
+
+ /**
+ * to tell the underlying object store to flush a transaction.
+ */
+ void flushTransaction();
+
+}
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/TxManFactory.java
new file mode 100644
index 0000000..d1ea889
--- /dev/null
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/TxManFactory.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.persistence.jdo.integration.transaction;
+
+import org.apache.isis.core.interaction.session.InteractionTracker;
+import org.apache.isis.core.metamodel.context.MetaModelContext;
+import org.apache.isis.persistence.jdo.integration.persistence.command.PersistenceCommandQueue;
+
+import lombok.val;
+
+public class TxManFactory {
+
+ public static PersistenceCommandQueue newCommandQueue(
+ MetaModelContext mmc,
+ TxHelper txHelper) {
+
+ val txMan = new _IsisTransactionManagerJdo(mmc, txHelper);
+
+ val isisInteractionTracker = mmc.getServiceRegistry()
+ .lookupServiceElseFail(InteractionTracker.class);
+
+ isisInteractionTracker.currentInteractionSession()
+ .map(interaction->interaction.putAttribute(_IsisTransactionManagerJdo.class, txMan));
+
+ return txMan;
+
+ }
+
+}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_IsisTransactionManagerJdo.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_IsisTransactionManagerJdo.java
similarity index 95%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_IsisTransactionManagerJdo.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_IsisTransactionManagerJdo.java
index 8688aa1..5c0bcc2 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_IsisTransactionManagerJdo.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/transaction/_IsisTransactionManagerJdo.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.persistence;
+package org.apache.isis.persistence.jdo.integration.transaction;
import java.util.function.Supplier;
@@ -28,29 +28,33 @@ import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.transaction.integration.IsisTransactionAspectSupport;
import org.apache.isis.core.transaction.integration.IsisTransactionManagerException;
import org.apache.isis.core.transaction.integration.IsisTransactionObject;
import org.apache.isis.persistence.jdo.integration.persistence.command.PersistenceCommand;
+import org.apache.isis.persistence.jdo.integration.persistence.command.PersistenceCommandQueue;
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@Vetoed @Log4j2
-class _IsisTransactionManagerJdo {
+class _IsisTransactionManagerJdo implements PersistenceCommandQueue {
// -- constructor, fields
@Getter
- private final IsisPersistenceSessionJdo persistenceSession;
+ private final TxHelper persistenceSession;
private final ServiceRegistry serviceRegistry;
private final Supplier<InteractionContext> interactionContextProvider;
- _IsisTransactionManagerJdo(ServiceRegistry serviceRegistry, IsisPersistenceSessionJdo persistenceSession) {
+ _IsisTransactionManagerJdo(
+ MetaModelContext mmc,
+ TxHelper persistenceSession) {
- this.serviceRegistry = serviceRegistry;
+ this.serviceRegistry = mmc.getServiceRegistry();
this.persistenceSession = persistenceSession;
this.interactionContextProvider = ()->serviceRegistry.lookupServiceElseFail(InteractionContext.class);
}
@@ -313,6 +317,7 @@ class _IsisTransactionManagerJdo {
}
}
+ @Override
public void addCommand(PersistenceCommand command) {
val transaction = getCurrentTransaction();
if (transaction != null && command != null) {
[isis] 01/02: ISIS-2033: tiny
Posted by ah...@apache.org.
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
commit b00c8ace867748d230177b0a32ae9be845eb4d86
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 21:57:37 2020 +0100
ISIS-2033: tiny
---
.../apache/isis/persistence/jdo/integration/persistence/_Utils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java
index 7eab3e9..111bb2a 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_Utils.java
@@ -49,8 +49,8 @@ final class _Utils {
@Nullable
static ManagedObject adapterFor(
- final MetaModelContext mmc,
- final Object pojo) {
+ final @NonNull MetaModelContext mmc,
+ final @Nullable Object pojo) {
if(pojo == null) {
return null;