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/13 12:26:01 UTC
[isis] branch master updated: ISIS-2226: incubator: rename @Model
-> @Supporting
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 91a4f4c ISIS-2226: incubator: rename @Model -> @Supporting
91a4f4c is described below
commit 91a4f4cf1f086c408669d2dc90aed673d59ce8fb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 13 13:25:51 2019 +0100
ISIS-2226: incubator: rename @Model -> @Supporting
---
.../isis/testdomain/model/bad/InvalidOrphanedActionSupport.java | 4 ++--
.../isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java | 4 ++--
.../isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java | 4 ++--
.../org/apache/isis/testdomain/model/good/ProperActionSupport.java | 4 ++--
.../isis/testdomain/model/good/ProperActionSupport_action.java | 4 ++--
.../isis/testdomain/model/good/ProperActionSupport_collection.java | 4 ++--
.../isis/testdomain/model/good/ProperActionSupport_collection2.java | 4 ++--
.../isis/testdomain/model/good/ProperActionSupport_mixin.java | 4 ++--
.../isis/testdomain/model/good/ProperActionSupport_property.java | 4 ++--
.../isis/testdomain/model/good/ProperActionSupport_property2.java | 4 ++--
.../apache/isis/testdomain/model/good/ProperCollectionSupport.java | 4 ++--
.../org/apache/isis/testdomain/model/good/ProperPrefixedMember.java | 4 ++--
.../apache/isis/testdomain/model/good/ProperPropertySupport.java | 4 ++--
.../model/applib/annotation/{Model.java => Supporting.java} | 4 ++--
.../metamodel/facets/SupportingMethodValidatorRefinerFactory.java | 6 +++---
15 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
index a5b88da..ddb94e5 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
@@ -19,14 +19,14 @@
package org.apache.isis.testdomain.model.bad;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.applib.annotation.Nature;
@DomainObject(nature = Nature.VIEW_MODEL)
public class InvalidOrphanedActionSupport {
// should fail
- @Model
+ @Supporting
public boolean hideOrphaned() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
index 6a15f99..62f93b8 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
@@ -19,14 +19,14 @@
package org.apache.isis.testdomain.model.bad;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.applib.annotation.Nature;
@DomainObject(nature = Nature.VIEW_MODEL)
public class InvalidOrphanedCollectionSupport {
// should fail
- @Model
+ @Supporting
public boolean hideMyCollection() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
index 3f29a80..96eb8c9 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
@@ -19,14 +19,14 @@
package org.apache.isis.testdomain.model.bad;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.applib.annotation.Nature;
@DomainObject(nature = Nature.VIEW_MODEL)
public class InvalidOrphanedPropertySupport {
// should fail
- @Model
+ @Supporting
public boolean hideMyProperty() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport.java
index 0bda640..cf8899a 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport.java
@@ -21,7 +21,7 @@ package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
@DomainObject(nature = Nature.VIEW_MODEL)
public class ProperActionSupport {
@@ -33,7 +33,7 @@ public class ProperActionSupport {
}
// proper support
- @Model
+ @Supporting
public boolean hideMyAction() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_action.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_action.java
index 1985099..2d7b542 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_action.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_action.java
@@ -20,7 +20,7 @@ package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -38,7 +38,7 @@ public class ProperActionSupport_action {
}
// proper support
- @Model
+ @Supporting
public boolean hide$$() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_collection.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_collection.java
index e870236..77b6f45 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_collection.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_collection.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -41,7 +41,7 @@ public class ProperActionSupport_collection {
}
// proper support
- @Model
+ @Supporting
public boolean hide$$() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_collection2.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_collection2.java
index 6344cdf..a276ba85 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_collection2.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_collection2.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -42,7 +42,7 @@ public class ProperActionSupport_collection2 {
}
// proper support
- @Model
+ @Supporting
public boolean hide$$() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_mixin.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_mixin.java
index cac6cf8..581c564 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_mixin.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_mixin.java
@@ -20,7 +20,7 @@ package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -36,7 +36,7 @@ public class ProperActionSupport_mixin {
}
// proper support
- @Model
+ @Supporting
public boolean hide$$() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_property.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_property.java
index 2a83c38..1e90ebe 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_property.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_property.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.testdomain.model.good;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
@@ -38,7 +38,7 @@ public class ProperActionSupport_property {
}
// proper support
- @Model
+ @Supporting
public boolean hide$$() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_property2.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_property2.java
index 09f4296..b28ba7a 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_property2.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_property2.java
@@ -19,7 +19,7 @@
package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
@@ -39,7 +39,7 @@ public class ProperActionSupport_property2 {
}
// proper support
- @Model
+ @Supporting
public boolean hide$$() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperCollectionSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperCollectionSupport.java
index 7a93cd2..b78d581 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperCollectionSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperCollectionSupport.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.applib.annotation.Nature;
import lombok.Getter;
@@ -36,7 +36,7 @@ public class ProperCollectionSupport {
private List<String> myCollection;
// proper support
- @Model
+ @Supporting
public boolean hideMyCollection() {
return false;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPrefixedMember.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPrefixedMember.java
index 2f5e01b..345fa61 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPrefixedMember.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPrefixedMember.java
@@ -2,7 +2,7 @@ package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
@@ -19,7 +19,7 @@ public class ProperPrefixedMember {
}
// should be identified as support
- @Model
+ @Supporting
public String disableDisableSomething() {
return null;
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPropertySupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPropertySupport.java
index 5f592a3..8e97ba6 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPropertySupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPropertySupport.java
@@ -19,7 +19,7 @@
package org.apache.isis.testdomain.model.good;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
@@ -34,7 +34,7 @@ public class ProperPropertySupport {
private String myProperty;
// proper support
- @Model
+ @Supporting
public boolean hideMyProperty() {
return false;
}
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Supporting.java
similarity index 91%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
rename to incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Supporting.java
index e0443d4..5d7d74a 100644
--- a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
+++ b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Supporting.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
* Indicates that a method is a supporting-method, one that contributes (hide, validate, ...)
* to an <em>Action/</em>.
* <p>
- * By placing the {@link Model} annotation on a method, a contract with the meta-model is enforced,
+ * By placing the {@link Supporting} annotation on a method, a contract with the meta-model is enforced,
* such that this method must be recognized and cannot be ignored.
*
* @since 2.0
@@ -37,6 +37,6 @@ import java.lang.annotation.Target;
@Inherited
@Target({ ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
-public @interface Model {
+public @interface Supporting {
}
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
index 0b8d3e6..b903d2b 100644
--- a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
+++ b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
@@ -24,7 +24,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.metamodel.commons.MethodUtil;
@@ -73,7 +73,7 @@ implements MetaModelRefiner {
// methods intended by the coder to be known to the metamodel
val intendedMethods = _Sets.<Method>newHashSet();
for(val method: type.getDeclaredMethods()) {
- if(method.getDeclaredAnnotation(Model.class)!=null) {
+ if(method.getDeclaredAnnotation(Supporting.class)!=null) {
intendedMethods.add(method);
}
}
@@ -94,7 +94,7 @@ implements MetaModelRefiner {
messageFormat,
spec.getIdentifier().getClassName(),
notRecognizedMethod.getName(),
- Model.class.getSimpleName(),
+ Supporting.class.getSimpleName(),
unmetContraints.stream()
.collect(Collectors.joining("; ")));
});