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 2019/12/12 16:01:05 UTC
[isis] branch master updated: ISIS-2177: moves fixture state
related classes 'runtime' -> 'jdo-applib'
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 eed91f6 ISIS-2177: moves fixture state related classes 'runtime' -> 'jdo-applib'
eed91f6 is described below
commit eed91f6568ed92ec546b959b2c76bd381822f6c0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 17:00:54 2019 +0100
ISIS-2177: moves fixture state related classes 'runtime' -> 'jdo-applib'
also moving persistence layer specific exceptions
---
.../jdo/applib/exceptions}/NotPersistableException.java | 2 +-
.../jdo/applib/exceptions}/UnsupportedFindException.java | 2 +-
.../jdo/applib/fixturestate}/FixturesInstalledFlag.java | 7 +++----
.../jdo/applib/fixturestate}/FixturesInstalledState.java | 2 +-
.../jdo/applib/fixturestate}/FixturesInstalledStateHolder.java | 2 +-
.../isis/persistence/jdo/applib/fixturestate}/package-info.java | 2 +-
.../datanucleus5/persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../jdo/datanucleus5/persistence/PersistenceSession5.java | 8 ++++----
.../jdo/datanucleus5/persistence/PersistenceSessionFactory5.java | 8 ++++----
9 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/NotPersistableException.java b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/NotPersistableException.java
rename to core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java
index 8b5132a..2110f45 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/NotPersistableException.java
+++ b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.persistence.jdo.applib.exceptions;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/UnsupportedFindException.java b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/UnsupportedFindException.java
rename to core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java
index c33c3c9..98cd25f 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/UnsupportedFindException.java
+++ b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.persistence.jdo.applib.exceptions;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledFlag.java b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledFlag.java
rename to core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
index 445d843..c7102f2 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledFlag.java
+++ b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
@@ -17,12 +17,11 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence;
-
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
+package org.apache.isis.persistence.jdo.applib.fixturestate;
/**
- * For {@link org.apache.isis.runtime.system.persistence.PersistenceSessionFactory} implementations that can cache the
+ * For {@link org.apache.isis.runtime.system.persistence.PersistenceSessionFactory}
+ * implementations that can cache the
* {@link PersistenceSession#isFixturesInstalled()} so is only called once per
* application scope.
*/
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledState.java b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledState.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledState.java
rename to core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledState.java
index 96b21e6..1c6433e 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledState.java
+++ b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledState.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.persistence.jdo.applib.fixturestate;
/**
*
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledStateHolder.java b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledStateHolder.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledStateHolder.java
rename to core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledStateHolder.java
index e17eace..5af18ca 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledStateHolder.java
+++ b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledStateHolder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.persistence.jdo.applib.fixturestate;
/**
* Implementing classes must cache the FixturesInstalledState, so fixtures are installed (run)
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/package-info.java b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/package-info.java
rename to core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
index 0272b8c..44b134c 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/package-info.java
+++ b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
@@ -43,5 +43,5 @@
* responsibility of the {@link PersistenceMechanismInstaller} to ensure that the correct helper objects
* are passed to the {@link PersistenceSession} implementation.
*/
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.persistence.jdo.applib.fixturestate;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 8785780..9444227 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -35,13 +35,13 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.FixturesInstalledStateHolder;
import org.apache.isis.runtime.system.persistence.PersistenceQueryFactory;
import org.apache.isis.runtime.system.transaction.ChangedObjectsService;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
index 6ee432b..a5e3782 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
@@ -49,6 +49,9 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+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.datanucleus5.datanucleus.persistence.commands.DataNucleusCreateObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.commands.DataNucleusDeleteObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.queries.PersistenceQueryFindAllInstancesProcessor;
@@ -81,9 +84,6 @@ import org.apache.isis.metamodel.spec.EntityState;
import org.apache.isis.metamodel.spec.FreeStandingList;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.FixturesInstalledStateHolder;
-import org.apache.isis.runtime.persistence.NotPersistableException;
-import org.apache.isis.runtime.persistence.UnsupportedFindException;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
@@ -337,7 +337,7 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
* The {@link QueryCardinality} determines whether all instances or just the
* first matching instance is returned.
*
- * @throws org.apache.isis.runtime.persistence.UnsupportedFindException
+ * @throws org.apache.isis.persistence.jdo.applib.exceptions.UnsupportedFindException
* if the criteria is not support by this persistor
*/
private <T> ObjectAdapter findInstancesInTransaction(final Query<T> query, final QueryCardinality cardinality) {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index a24bec2..31fcb86 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -28,7 +28,6 @@ import javax.inject.Named;
import javax.inject.Singleton;
import javax.jdo.listener.StoreLifecycleListener;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.datanucleus.PropertyNames;
import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -36,17 +35,18 @@ import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.metamodel.context.MetaModelContext;
+import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledState;
+import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusSettings;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.JDOStateManagerForIsis;
import org.apache.isis.persistence.jdo.datanucleus5.entities.JdoEntityTypeRegistry;
import org.apache.isis.persistence.jdo.datanucleus5.lifecycles.JdoStoreLifecycleListenerForIsis;
-import org.apache.isis.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.persistence.FixturesInstalledState;
-import org.apache.isis.runtime.persistence.FixturesInstalledStateHolder;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;