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/05/15 11:24:53 UTC
[isis] branch master updated: ISIS-3051: set introspection mode explicit on MMNodes
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 fc3b2428f3 ISIS-3051: set introspection mode explicit on MMNodes
fc3b2428f3 is described below
commit fc3b2428f341994cba7423df664d9004c18cd4c4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun May 15 10:47:17 2022 +0200
ISIS-3051: set introspection mode explicit on MMNodes
---
.../java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java | 4 +++-
.../org/apache/isis/core/metamodel/inspect/model/CollectionNode.java | 4 +++-
.../org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java | 4 +++-
.../org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java | 4 +++-
.../java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java | 4 +++-
.../java/org/apache/isis/core/metamodel/inspect/model/MMNode.java | 2 ++
.../org/apache/isis/core/metamodel/inspect/model/ParameterNode.java | 4 +++-
.../org/apache/isis/core/metamodel/inspect/model/PropertyNode.java | 4 +++-
.../java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java | 4 +++-
9 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java
index c82cc4eaf0..56e9649866 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ActionNode.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
@@ -38,7 +39,8 @@ import lombok.ToString;
@DomainObject(
nature=Nature.VIEW_MODEL,
- logicalTypeName = ActionNode.LOGICAL_TYPE_NAME
+ logicalTypeName = ActionNode.LOGICAL_TYPE_NAME,
+ introspection = Introspection.ANNOTATION_REQUIRED
)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/CollectionNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/CollectionNode.java
index a0f7421b12..937188c1b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/CollectionNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/CollectionNode.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
@@ -38,7 +39,8 @@ import lombok.ToString;
@DomainObject(
nature=Nature.VIEW_MODEL,
- logicalTypeName = CollectionNode.LOGICAL_TYPE_NAME
+ logicalTypeName = CollectionNode.LOGICAL_TYPE_NAME,
+ introspection = Introspection.ANNOTATION_REQUIRED
)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java
index 32aa0a249d..fedfd1eaec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetAttrNode.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
@@ -38,7 +39,8 @@ import lombok.ToString;
@DomainObject(
nature=Nature.VIEW_MODEL,
- logicalTypeName = FacetAttrNode.LOGICAL_TYPE_NAME
+ logicalTypeName = FacetAttrNode.LOGICAL_TYPE_NAME,
+ introspection = Introspection.ANNOTATION_REQUIRED
)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java
index 060a05d7db..8f4d28ae01 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetGroupNode.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
@@ -39,7 +40,8 @@ import lombok.ToString;
@DomainObject(
nature=Nature.VIEW_MODEL,
- logicalTypeName = FacetGroupNode.LOGICAL_TYPE_NAME
+ logicalTypeName = FacetGroupNode.LOGICAL_TYPE_NAME,
+ introspection = Introspection.ANNOTATION_REQUIRED
)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java
index abeb7b3078..5b1fae9347 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/FacetNode.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
@@ -42,7 +43,8 @@ import lombok.val;
@DomainObject(
nature=Nature.VIEW_MODEL,
- logicalTypeName = FacetNode.LOGICAL_TYPE_NAME
+ logicalTypeName = FacetNode.LOGICAL_TYPE_NAME,
+ introspection = Introspection.ANNOTATION_REQUIRED
)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
index cc3dc0e891..2f41367263 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.Navigable;
import org.apache.isis.applib.annotation.ObjectSupport;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Strings;
@@ -70,6 +71,7 @@ public abstract class MMNode {
? title = createTitle()
: title;
}
+ @Programmatic
protected abstract String createTitle();
protected abstract String iconSuffix();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ParameterNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ParameterNode.java
index 3715d420da..168105ccea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ParameterNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/ParameterNode.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
@@ -38,7 +39,8 @@ import lombok.ToString;
@DomainObject(
nature=Nature.VIEW_MODEL,
- logicalTypeName = ParameterNode.LOGICAL_TYPE_NAME
+ logicalTypeName = ParameterNode.LOGICAL_TYPE_NAME,
+ introspection = Introspection.ANNOTATION_REQUIRED
)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/PropertyNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/PropertyNode.java
index 6ade25b4de..b8e1f4a26f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/PropertyNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/PropertyNode.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
@@ -37,7 +38,8 @@ import lombok.ToString;
@DomainObject(
nature=Nature.VIEW_MODEL,
- logicalTypeName = PropertyNode.LOGICAL_TYPE_NAME
+ logicalTypeName = PropertyNode.LOGICAL_TYPE_NAME,
+ introspection = Introspection.ANNOTATION_REQUIRED
)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java
index cbe53d4740..8bccc1b095 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/TypeNode.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Introspection;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
@@ -39,7 +40,8 @@ import lombok.ToString;
@DomainObject(
nature=Nature.VIEW_MODEL,
- logicalTypeName = TypeNode.LOGICAL_TYPE_NAME
+ logicalTypeName = TypeNode.LOGICAL_TYPE_NAME,
+ introspection = Introspection.ANNOTATION_REQUIRED
)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)