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/08/28 08:03:25 UTC
[isis] branch master updated: ISIS-2774: meta annotate those that
imply @Domain.Include
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 7671a25 ISIS-2774: meta annotate those that imply @Domain.Include
7671a25 is described below
commit 7671a25d1726a9cdaf585da3579e36f2b31da8b1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Aug 28 10:02:04 2021 +0200
ISIS-2774: meta annotate those that imply @Domain.Include
---
api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java | 1 +
.../src/main/java/org/apache/isis/applib/annotation/ActionLayout.java | 1 +
.../src/main/java/org/apache/isis/applib/annotation/Collection.java | 1 +
.../main/java/org/apache/isis/applib/annotation/CollectionLayout.java | 1 +
.../src/main/java/org/apache/isis/applib/annotation/Property.java | 1 +
.../main/java/org/apache/isis/applib/annotation/PropertyLayout.java | 1 +
api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java | 3 ++-
.../isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java | 2 --
8 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
index 68daaec..d874c00 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
@@ -55,6 +55,7 @@ import org.apache.isis.applib.value.Clob;
)
@Retention(RetentionPolicy.RUNTIME)
@DomainObject(nature=Nature.MIXIN, mixinMethod = "act") // meta annotation, only applies at class level
+@Domain.Include // meta annotation, in support of meta-model validation
public @interface Action {
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
index 011be50..aedd7e7 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
@@ -47,6 +47,7 @@ import org.apache.isis.applib.layout.component.CssClassFaPosition;
})
@Retention(RetentionPolicy.RUNTIME)
@DomainObject(nature=Nature.MIXIN, mixinMethod = "act") // meta annotation, only applies at class level
+@Domain.Include // meta annotation, in support of meta-model validation
public @interface ActionLayout {
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
index 0f0e44e..5b2ee82 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
@@ -46,6 +46,7 @@ import org.apache.isis.applib.events.domain.CollectionDomainEvent;
})
@Retention(RetentionPolicy.RUNTIME)
@DomainObject(nature=Nature.MIXIN, mixinMethod = "coll") // meta annotation, only applies at class level
+@Domain.Include // meta annotation, in support of meta-model validation
public @interface Collection {
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
index 8536cae..1a450f6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
@@ -45,6 +45,7 @@ import java.util.Comparator;
})
@Retention(RetentionPolicy.RUNTIME)
@DomainObject(nature=Nature.MIXIN, mixinMethod = "coll") // meta annotation, only applies at class level
+@Domain.Include // meta annotation, in support of meta-model validation
public @interface CollectionLayout {
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index 94c1829..0e22325 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -57,6 +57,7 @@ import org.apache.isis.applib.value.Clob;
})
@Retention(RetentionPolicy.RUNTIME)
@DomainObject(nature=Nature.MIXIN, mixinMethod = "prop") // meta annotation, only applies at class level
+@Domain.Include // meta annotation, in support of meta-model validation
public @interface Property {
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
index 8b9f55b..3e4ed62 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
@@ -40,6 +40,7 @@ import java.lang.annotation.Target;
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@DomainObject(nature=Nature.MIXIN, mixinMethod = "prop") // meta annotation, only applies at class level
+@Domain.Include // meta annotation, in support of meta-model validation
public @interface PropertyLayout {
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
index 2d461d0..d6f2e4b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
*
* <p>
* If more than one property is used, the order can be specified (using the
- * same Dewey-decimal notation).
+ * same Dewey-decimal notation).
* The string to use between the components can also be specified.
* </p>
*
@@ -40,6 +40,7 @@ import java.lang.annotation.Target;
ElementType.METHOD,
ElementType.FIELD
})
+@Domain.Include // meta annotation, in support of meta-model validation
public @interface Title {
/**
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 8197641..10094b4 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -465,8 +465,6 @@ class DomainModelTest_usingGoodDomain {
act.assertUsabilityIsVetoedWith("action disabled for testing purposes");
act.assertInvocationResult("Hallo World!", List.of());
- act.getMetaModel().get().isExplicitlyAnnotated();
-
// -- PROPERTY WITH PRIVATE GETTER AND SETTER
val prop = testerFactory