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/12 10:18:13 UTC
[isis] branch master updated: ISIS-1998: fixes regression from too
aggressive optimization
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 b4d92bd ISIS-1998: fixes regression from too aggressive optimization
b4d92bd is described below
commit b4d92bd2dff1c9b9a2c82c5ec3b17423de627b68
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 11:18:01 2019 +0100
ISIS-1998: fixes regression from too aggressive optimization
even though when @Action is mandatory, Mixins now can provide actions,
that do not need to be annotated at method-level
---
.../specloader/specimpl/FacetedMethodsBuilder.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 0cb82f6..545ed8d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -438,12 +438,13 @@ public class FacetedMethodsBuilder {
private boolean representsAction(
final Method actionMethod) {
- // try to short-circuit as much as possible
- if(explicitActionAnnotationConfigured()) {
- if(!_Annotations.isPresent(actionMethod, Action.class)) {
- return false;
- }
- }
+ //XXX commented out, because this is not applicable for Mixins in support of ISIS-1998
+// try to short-circuit as much as possible
+// if(isExplicitActionAnnotationConfigured()) {
+// if(!_Annotations.isPresent(actionMethod, Action.class)) {
+// return false;
+// }
+// }
if (MethodUtil.isStatic(actionMethod)) {
return false;
@@ -473,7 +474,7 @@ public class FacetedMethodsBuilder {
return true;
}
- if(explicitActionAnnotationConfigured()) {
+ if(isExplicitActionAnnotationConfigured()) {
if(_Annotations.isPresent(actionMethod, Action.class)) {
log.debug(" identified action {}", actionMethod);
@@ -495,7 +496,7 @@ public class FacetedMethodsBuilder {
}
- private boolean explicitActionAnnotationConfigured() {
+ private boolean isExplicitActionAnnotationConfigured() {
return explicitAnnotationsForActions;
}