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 21:02:54 UTC
[isis] branch master updated: ISIS-2177: moving persistence queries
'runtime' -> 'jdo-dn5'
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 acdccad ISIS-2177: moving persistence queries 'runtime' -> 'jdo-dn5'
acdccad is described below
commit acdccad692109c872ab672526b4040540a4bb0cd
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 22:02:43 2019 +0100
ISIS-2177: moving persistence queries 'runtime' -> 'jdo-dn5'
---
.../queries/PersistenceQueryFindAllInstancesProcessor.java | 2 +-
.../queries/PersistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../datanucleus/persistence/queries/PersistenceQueryProcessor.java | 2 +-
.../persistence/queries/PersistenceQueryProcessorAbstract.java | 2 +-
.../jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../jdo/datanucleus5/persistence/PersistenceSession5.java | 6 +++---
.../jdo/datanucleus5/persistence/query}/PersistenceQuery.java | 2 +-
.../datanucleus5}/persistence/query/PersistenceQueryAbstract.java | 3 +--
.../datanucleus5/persistence/query}/PersistenceQueryFactory.java | 4 +---
.../persistence/query/PersistenceQueryFindAllInstances.java | 2 +-
.../query/PersistenceQueryFindUsingApplibQueryDefault.java | 2 +-
11 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
index 410d342..9b21ffc 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
@@ -21,8 +21,8 @@ package org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.que
import java.util.List;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
+import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index 09308a5..8100e1b 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -28,12 +28,12 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.metamodel.JdoPropertyUtils;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
+import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
index 2877db5..28bcc00 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessor.java
@@ -21,7 +21,7 @@ package org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.que
import java.util.List;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.persistence.session.PersistenceQuery;
+import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQuery;
public interface PersistenceQueryProcessor<T extends PersistenceQuery> {
List<ObjectAdapter> process(T query);
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
index 5e7b540..6b05f14 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -30,7 +30,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisLifecycleListener;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
-import org.apache.isis.runtime.persistence.session.PersistenceQuery;
+import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQuery;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
public abstract class PersistenceQueryProcessorAbstract<T extends PersistenceQuery>
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 ead70f3..e91c427 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
@@ -37,12 +37,12 @@ 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.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFactory;
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.session.PersistenceQueryFactory;
import org.apache.isis.runtime.persistence.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 aa00bdf..64e6b12 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
@@ -87,9 +87,9 @@ import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapterC
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.DestroyObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.PersistenceCommand;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import org.apache.isis.runtime.persistence.session.PersistenceQuery;
+import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQuery;
+import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import static java.util.Objects.requireNonNull;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQuery.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQuery.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQuery.java
rename to core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQuery.java
index fc87ab7..148159a 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQuery.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQuery.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.session;
+package org.apache.isis.persistence.jdo.datanucleus5.persistence.query;
import org.apache.isis.applib.query.Query;
import org.apache.isis.metamodel.spec.ObjectSpecification;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryAbstract.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java
rename to core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryAbstract.java
index dc88b18..205b5d0 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryAbstract.java
@@ -17,10 +17,9 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.query;
+package org.apache.isis.persistence.jdo.datanucleus5.persistence.query;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.session.PersistenceQuery;
public abstract class PersistenceQueryAbstract implements PersistenceQuery {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQueryFactory.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQueryFactory.java
rename to core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
index 878765a..7a19aeb 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceQueryFactory.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session;
+package org.apache.isis.persistence.jdo.datanucleus5.persistence.query;
import java.util.Map;
import java.util.function.Function;
@@ -29,8 +29,6 @@ import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindAllInstances.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java
rename to core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindAllInstances.java
index e64f275..74956a5 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindAllInstances.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.query;
+package org.apache.isis.persistence.jdo.datanucleus5.persistence.query;
import org.apache.isis.applib.query.QueryFindAllInstances;
import org.apache.isis.metamodel.commons.ToString;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
rename to core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
index 0f2bf43..18e4fe7 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.query;
+package org.apache.isis.persistence.jdo.datanucleus5.persistence.query;
import java.util.Collections;
import java.util.Map;