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 19:32:23 UTC
[isis] branch master updated: ISIS-2033: bit of a cleanup (DN
integration)
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 c0adb3d ISIS-2033: bit of a cleanup (DN integration)
c0adb3d is described below
commit c0adb3ddb9a03ace88c444965555bf88f5eda37e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 20:32:08 2020 +0100
ISIS-2033: bit of a cleanup (DN integration)
---
.../integration/persistence/IsisPersistenceSessionJdoBase.java | 4 ++--
.../persistence/IsisPlatformTransactionManagerForJdo.java | 2 +-
.../jdo/integration/persistence/IsisTransactionJdo.java | 6 +++---
.../jdo/integration/persistence/PersistenceSession5.java | 2 +-
.../integration/persistence/PersistenceSessionFactory5.java | 8 ++++----
.../{DNStoreManagerType.java => _DNStoreManagerType.java} | 10 +++++-----
...omponents5.java => _DataNucleusApplicationComponents5.java} | 6 +++---
...nsactionManagerJdo.java => _IsisTransactionManagerJdo.java} | 4 ++--
8 files changed, 21 insertions(+), 21 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 10d3820..bc46f24 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
@@ -66,7 +66,7 @@ abstract class IsisPersistenceSessionJdoBase implements IsisPersistenceSessionJd
*/
protected final PersistenceManagerFactory jdoPersistenceManagerFactory;
- IsisTransactionManagerJdo transactionManager;
+ _IsisTransactionManagerJdo transactionManager;
/**
* populated only when {@link #open()}ed.
@@ -109,7 +109,7 @@ abstract class IsisPersistenceSessionJdoBase implements IsisPersistenceSessionJd
this.persistenceQueryFactory = PersistenceQueryFactory.of(
obj->this.adapterFor(obj),
this.specificationLoader);
- this.transactionManager = new IsisTransactionManagerJdo(serviceRegistry, this);
+ this.transactionManager = new _IsisTransactionManagerJdo(serviceRegistry, this);
this.state = State.NOT_INITIALIZED;
}
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/persistence/IsisPlatformTransactionManagerForJdo.java
index fe18106..7aeba8d 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/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -160,7 +160,7 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
IsisTransactionAspectSupport.clearTransactionObject();
}
- private IsisTransactionManagerJdo transactionManagerJdo() {
+ private _IsisTransactionManagerJdo transactionManagerJdo() {
return isisInteractionTracker.currentInteractionSession()
.map(interaction->interaction.getAttribute(IsisPersistenceSessionJdo.class))
.map(IsisPersistenceSessionJdoBase.class::cast)
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/persistence/IsisTransactionJdo.java
index e03e370..ad448e4 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/persistence/IsisTransactionJdo.java
@@ -50,15 +50,15 @@ 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 _IsisTransactionManagerJdo} 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 _IsisTransactionManagerJdo 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 _IsisTransactionManagerJdo} to ensure that the underlying persistence
* mechanism (for example, the <tt>ObjectStore</tt>) is also committed.
*/
@Vetoed @Log4j2
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 b71fc03..c9a048d 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
@@ -144,7 +144,7 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
* Closes the subcomponents.
*
* <p>
- * Automatically {@link IsisTransactionManagerJdo#commitTransaction(IsisTransactionObject)
+ * Automatically {@link _IsisTransactionManagerJdo#commitTransaction(IsisTransactionObject)
* ends (commits)} the current (Isis) {@link IsisTransactionJdo}. This in turn commits the underlying
* JDO transaction.
*
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/PersistenceSessionFactory5.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/PersistenceSessionFactory5.java
index 664d080..f92f1c1 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/PersistenceSessionFactory5.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/PersistenceSessionFactory5.java
@@ -68,7 +68,7 @@ implements PersistenceSessionFactory, FixturesInstalledStateHolder {
@Inject private IsisBeanTypeRegistry isisBeanTypeRegistry;
- private final _Lazy<DataNucleusApplicationComponents5> applicationComponents =
+ private final _Lazy<_DataNucleusApplicationComponents5> applicationComponents =
_Lazy.threadSafe(this::createDataNucleusApplicationComponents);
private MetaModelContext metaModelContext;
@@ -95,13 +95,13 @@ implements PersistenceSessionFactory, FixturesInstalledStateHolder {
return this.configuration != null;
}
- private DataNucleusApplicationComponents5 createDataNucleusApplicationComponents() {
+ private _DataNucleusApplicationComponents5 createDataNucleusApplicationComponents() {
val dnSettings = metaModelContext.getServiceRegistry().lookupServiceElseFail(DnSettings.class);
val datanucleusProps = addDataNucleusPropertiesAsRequired(dnSettings);
val classesToBePersisted = jdoEntityTypeRegistry.getEntityTypes(isisBeanTypeRegistry);
- val dataNucleusApplicationComponents = new DataNucleusApplicationComponents5(
+ val dataNucleusApplicationComponents = new _DataNucleusApplicationComponents5(
configuration,
datanucleusProps,
classesToBePersisted);
@@ -119,7 +119,7 @@ implements PersistenceSessionFactory, FixturesInstalledStateHolder {
.forEach(entityClassName->log.debug(" - {}", entityClassName));
}
- DataNucleusApplicationComponents5.catalogNamedQueries(classesToBePersisted,
+ _DataNucleusApplicationComponents5.catalogNamedQueries(classesToBePersisted,
metaModelContext.getSpecificationLoader());
}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DNStoreManagerType.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DNStoreManagerType.java
similarity index 92%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DNStoreManagerType.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DNStoreManagerType.java
index 3ac5398..9eea932 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DNStoreManagerType.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DNStoreManagerType.java
@@ -35,14 +35,14 @@ import org.datanucleus.store.schema.SchemaAwareStoreManager;
*
* @since 2.0.0-M2
*/
-enum DNStoreManagerType {
+enum _DNStoreManagerType {
SchemaAware,
Federated, // [ahuber] not used by now
Other
;
- public static DNStoreManagerType typeOf(Map<String, Object> datanucleusProps) {
+ public static _DNStoreManagerType typeOf(Map<String, Object> datanucleusProps) {
if(hasSecondaryDataStore(datanucleusProps)) {
return Federated;
@@ -108,14 +108,14 @@ enum DNStoreManagerType {
return false;
}
- private static DNStoreManagerType probe(
+ private static _DNStoreManagerType probe(
Map<String, Object> datanucleusProps,
- Function<StoreManager, DNStoreManagerType> categorizer) {
+ Function<StoreManager, _DNStoreManagerType> categorizer) {
// we create a throw-away instance of PMF so that we can probe whether DN has
// been configured with a schema-aware store manager or not.
final JDOPersistenceManagerFactory probePmf = (JDOPersistenceManagerFactory)
- DataNucleusApplicationComponents5.newPersistenceManagerFactory(datanucleusProps);
+ _DataNucleusApplicationComponents5.newPersistenceManagerFactory(datanucleusProps);
try {
final PersistenceNucleusContext nucleusContext = probePmf.getNucleusContext();
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DataNucleusApplicationComponents5.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DataNucleusApplicationComponents5.java
similarity index 98%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DataNucleusApplicationComponents5.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DataNucleusApplicationComponents5.java
index 38550e9..706d1d8 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/DataNucleusApplicationComponents5.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/persistence/_DataNucleusApplicationComponents5.java
@@ -55,7 +55,7 @@ import lombok.extern.log4j.Log4j2;
@Vetoed
@Log4j2
-public class DataNucleusApplicationComponents5 {
+final class _DataNucleusApplicationComponents5 {
private final Set<String> persistableClassNameSet;
private final IsisConfiguration configuration;
@@ -63,7 +63,7 @@ public class DataNucleusApplicationComponents5 {
@Getter private PersistenceManagerFactory persistenceManagerFactory;
- public DataNucleusApplicationComponents5(
+ public _DataNucleusApplicationComponents5(
final IsisConfiguration configuration,
final Map<String, Object> datanucleusProps,
final Set<String> persistableClassNameSet) {
@@ -106,7 +106,7 @@ public class DataNucleusApplicationComponents5 {
final Set<String> persistableClassNameSet,
final Map<String, Object> datanucleusProps) {
- final DNStoreManagerType dnStoreManagerType = DNStoreManagerType.typeOf(datanucleusProps);
+ final _DNStoreManagerType dnStoreManagerType = _DNStoreManagerType.typeOf(datanucleusProps);
PersistenceManagerFactory persistenceManagerFactory;
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/persistence/_IsisTransactionManagerJdo.java
similarity index 98%
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/persistence/_IsisTransactionManagerJdo.java
index 771e4e0..8688aa1 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/persistence/_IsisTransactionManagerJdo.java
@@ -38,7 +38,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Vetoed @Log4j2
-class IsisTransactionManagerJdo {
+class _IsisTransactionManagerJdo {
// -- constructor, fields
@@ -48,7 +48,7 @@ class IsisTransactionManagerJdo {
private final ServiceRegistry serviceRegistry;
private final Supplier<InteractionContext> interactionContextProvider;
- IsisTransactionManagerJdo(ServiceRegistry serviceRegistry, IsisPersistenceSessionJdo persistenceSession) {
+ _IsisTransactionManagerJdo(ServiceRegistry serviceRegistry, IsisPersistenceSessionJdo persistenceSession) {
this.serviceRegistry = serviceRegistry;
this.persistenceSession = persistenceSession;