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 2022/09/14 15:03:27 UTC
[isis] branch master updated: ISIS-3198: refactoring: relocate IdStringifierLookup to metamodel
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 0c4e2ac0b1 ISIS-3198: refactoring: relocate IdStringifierLookup to metamodel
0c4e2ac0b1 is described below
commit 0c4e2ac0b1ec7d9a3ef12f5f1ba3971fe15f78b9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 14 17:03:20 2022 +0200
ISIS-3198: refactoring: relocate IdStringifierLookup to metamodel
---
core/metamodel/src/main/java/module-info.java | 8 +++++++-
.../org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java | 2 ++
.../services}/idstringifier/IdStringifierLookupService.java | 6 +++---
core/runtime/src/main/java/module-info.java | 1 -
.../java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java | 2 --
.../jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java | 3 ++-
.../isis/persistence/jpa/integration/entity/JpaEntityFacet.java | 2 +-
7 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/core/metamodel/src/main/java/module-info.java b/core/metamodel/src/main/java/module-info.java
index 3849bbcd8d..d6d5de87fb 100644
--- a/core/metamodel/src/main/java/module-info.java
+++ b/core/metamodel/src/main/java/module-info.java
@@ -69,6 +69,7 @@ open module org.apache.isis.core.metamodel {
exports org.apache.isis.core.metamodel.services.exceprecog;
exports org.apache.isis.core.metamodel.services.grid.bootstrap;
exports org.apache.isis.core.metamodel.services.grid;
+ exports org.apache.isis.core.metamodel.services.idstringifier;
exports org.apache.isis.core.metamodel.services.ixn;
exports org.apache.isis.core.metamodel.services.layout;
exports org.apache.isis.core.metamodel.services.message;
@@ -90,7 +91,11 @@ open module org.apache.isis.core.metamodel {
//TODO don't expose impl. details
to org.apache.isis.viewer.wicket.ui, org.apache.isis.core.runtimeservices;
- exports org.apache.isis.core.metamodel.specloader;
+ exports org.apache.isis.core.metamodel.specloader
+ to org.apache.isis.core.runtimeservices,
+ //TODO don't expose to viewers
+ org.apache.isis.viewer.wicket.model, org.apache.isis.viewer.wicket.ui;
+
exports org.apache.isis.core.metamodel.specloader.validator;
exports org.apache.isis.core.metamodel.util;
@@ -124,6 +129,7 @@ open module org.apache.isis.core.metamodel {
requires spring.core;
requires org.apache.isis.core.privileged;
+//JUnit testing stuff, not required as long this module is an 'open' one
// opens org.apache.isis.core.metamodel.services to spring.core;
// opens org.apache.isis.core.metamodel.services.registry to spring.core;
// opens org.apache.isis.core.metamodel.services.grid to java.xml.bind;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
index 7a23e132cb..a5665005c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
@@ -60,6 +60,7 @@ import org.apache.isis.core.metamodel.services.grid.GridLoaderServiceDefault;
import org.apache.isis.core.metamodel.services.grid.GridReaderUsingJaxb;
import org.apache.isis.core.metamodel.services.grid.GridServiceDefault;
import org.apache.isis.core.metamodel.services.grid.bootstrap.GridSystemServiceBootstrap;
+import org.apache.isis.core.metamodel.services.idstringifier.IdStringifierLookupService;
import org.apache.isis.core.metamodel.services.layout.LayoutServiceDefault;
import org.apache.isis.core.metamodel.services.metamodel.MetaModelServiceDefault;
import org.apache.isis.core.metamodel.services.registry.ServiceRegistryDefault;
@@ -175,6 +176,7 @@ import lombok.NonNull;
IdStringifierForSerializable.class,
// @Service's
+ IdStringifierLookupService.class,
ObjectManagerDefault.class,
ServiceInjectorDefault.class,
MetamodelEventService.class,
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierLookupService.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/idstringifier/IdStringifierLookupService.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierLookupService.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/idstringifier/IdStringifierLookupService.java
index b5101a87e6..a3dfbcea5b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierLookupService.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/idstringifier/IdStringifierLookupService.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.isis.core.runtime.idstringifier;
+package org.apache.isis.core.metamodel.services.idstringifier;
import java.io.Serializable;
import java.util.List;
@@ -39,8 +39,8 @@ import org.apache.isis.applib.services.bookmark.IdStringifier;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet.PrimaryKeyType;
-import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
import lombok.val;
@@ -53,7 +53,7 @@ import lombok.val;
* @since 2.0
*/
@Service
-@Named(IsisModuleCoreRuntime.NAMESPACE + ".IdStringifierLookupService")
+@Named(IsisModuleCoreMetamodel.NAMESPACE + ".IdStringifierLookupService")
@Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("Default")
public class IdStringifierLookupService {
diff --git a/core/runtime/src/main/java/module-info.java b/core/runtime/src/main/java/module-info.java
index 557dc25504..76908dc22f 100644
--- a/core/runtime/src/main/java/module-info.java
+++ b/core/runtime/src/main/java/module-info.java
@@ -19,7 +19,6 @@
module org.apache.isis.core.runtime {
exports org.apache.isis.core.runtime;
exports org.apache.isis.core.runtime.context;
- exports org.apache.isis.core.runtime.idstringifier;
exports org.apache.isis.core.runtime.events;
requires java.annotation;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
index 063ea58bd9..b845cf1b72 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
@@ -25,7 +25,6 @@ import org.apache.isis.core.interaction.IsisModuleCoreInteraction;
import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import org.apache.isis.core.runtime.events.MetamodelEventService;
import org.apache.isis.core.runtime.events.TransactionEventEmitter;
-import org.apache.isis.core.runtime.idstringifier.IdStringifierLookupService;
import org.apache.isis.core.transaction.IsisModuleCoreTransaction;
import org.apache.isis.valuetypes.jodatime.integration.IsisModuleValJodatimeIntegration;
@@ -42,7 +41,6 @@ import org.apache.isis.valuetypes.jodatime.integration.IsisModuleValJodatimeInte
// @Service's
MetamodelEventService.class,
TransactionEventEmitter.class,
- IdStringifierLookupService.class,
// @Configuration's
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index 3d2ccc8142..dad1085578 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -52,10 +52,11 @@ import org.apache.isis.core.config.beans.PersistenceStack;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
+import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet.PrimaryKeyType;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
+import org.apache.isis.core.metamodel.services.idstringifier.IdStringifierLookupService;
import org.apache.isis.core.metamodel.services.objectlifecycle.ObjectLifecyclePublisher;
-import org.apache.isis.core.runtime.idstringifier.IdStringifierLookupService;
import org.apache.isis.persistence.jdo.datanucleus.entities.DnEntityStateProvider;
import org.apache.isis.persistence.jdo.datanucleus.entities.DnObjectProviderForIsis;
import org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetFactory;
diff --git a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacet.java b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacet.java
index b8821af9a0..2d9f3232c5 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacet.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacet.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.core.metamodel.object.ManagedObject;
-import org.apache.isis.core.runtime.idstringifier.IdStringifierLookupService;
+import org.apache.isis.core.metamodel.services.idstringifier.IdStringifierLookupService;
import lombok.NonNull;
import lombok.val;