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 2021/03/07 22:11:40 UTC
[isis] branch master updated: ISIS-2570: disable
JdoDiscriminatorAnnotationFacetFactory
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 424adf2 ISIS-2570: disable JdoDiscriminatorAnnotationFacetFactory
424adf2 is described below
commit 424adf2e159b941b66721493dd6c5ac71fd57500
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Mar 7 23:11:25 2021 +0100
ISIS-2570: disable JdoDiscriminatorAnnotationFacetFactory
as it breaks the idea of logical-type-names having namespaces
---
.../services/appfeat/ApplicationFeatureRepositoryDefault.java | 4 ++++
.../isis/persistence/jdo/metamodel/JdoProgrammingModel.java | 6 ++++--
...ctSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java | 9 ++++-----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index eb4c88e..c548b61 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -155,6 +155,10 @@ implements ApplicationFeatureRepository {
return;
}
+ if(spec.getCorrespondingClass().getName().startsWith("scinda.dom.smodel.composite.CompositeFood")) {
+ System.out.println("got " + spec.getCorrespondingClass() + " -> " + spec.getLogicalTypeName());
+ }
+
final String logicalTypeName = spec.getLogicalTypeName();
final ApplicationFeatureId typeFeatureId = ApplicationFeatureId.newType(logicalTypeName);
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
index c31f871..c9cc3c4 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
@@ -32,7 +32,6 @@ import org.apache.isis.core.metamodel.facets.object.parented.ParentedCollectionF
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel.Marker;
import org.apache.isis.persistence.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityAnnotationFacetFactory;
-import org.apache.isis.persistence.jdo.metamodel.facets.object.discriminator.JdoDiscriminatorAnnotationFacetFactory;
import org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableAnnotationFacetFactory;
import org.apache.isis.persistence.jdo.metamodel.facets.object.query.JdoQueryAnnotationFacetFactory;
import org.apache.isis.persistence.jdo.metamodel.facets.object.version.JdoVersionAnnotationFacetFactory;
@@ -71,7 +70,10 @@ public class JdoProgrammingModel implements MetaModelRefiner {
pm.addFactory(step2, JdoPrimaryKeyAnnotationFacetFactory.class, Marker.JDO);
pm.addFactory(step2, JdoNotPersistentAnnotationFacetFactory.class, Marker.JDO);
- pm.addFactory(step2, JdoDiscriminatorAnnotationFacetFactory.class, Marker.JDO);
+
+ // breaks idea of logical-type-names having namespaces
+ //pm.addFactory(step2, JdoDiscriminatorAnnotationFacetFactory.class, Marker.JDO);
+
pm.addFactory(step2, JdoVersionAnnotationFacetFactory.class, Marker.JDO);
pm.addFactory(step2, JdoQueryAnnotationFacetFactory.class, Marker.JDO);
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
index 56a675c..41d33bb 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
@@ -21,15 +21,14 @@ package org.apache.isis.persistence.jdo.metamodel.facets.object.discriminator;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacetAbstract;
+public class ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation
+extends ObjectSpecIdFacetAbstract {
-public class ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation extends
-ObjectSpecIdFacetAbstract {
-
- public ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation(final String value,
+ public ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation(
+ final String value,
final FacetHolder holder) {
super(value, holder);
}
}
-// Copyright (c) Naked Objects Group Ltd.