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 2018/10/05 10:08:29 UTC
[isis] branch v2 updated: ISIS-1976: fixes event-handler annotation
processing (MM method-removal)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 90df9d7 ISIS-1976: fixes event-handler annotation processing (MM method-removal)
90df9d7 is described below
commit 90df9d7c2b224f0951706a127689eba6846a6d15
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 5 12:08:14 2018 +0200
ISIS-1976: fixes event-handler annotation processing (MM method-removal)
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index cb28256..36fa908 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -53,16 +53,15 @@ public class RemoveAnnotatedMethodsFacetFactory extends FacetFactoryAbstract {
eventHandlerClasses = eventHandlerClassNames.stream()
.map(name->{
- Class<? extends Annotation> eventHandlerClass;
+ Class<? extends Annotation> eventHandlerAnnotationClass;
try {
// doing this reflectively so that don't bring in a dependency on axon.
- eventHandlerClass = uncheckedCast(
- ClassUtil.forName("org.axonframework.eventhandling.annotation.EventHandler"));
+ eventHandlerAnnotationClass = uncheckedCast(ClassUtil.forName(name));
} catch(Exception ignore) {
// ignore
- eventHandlerClass = null;
+ eventHandlerAnnotationClass = null;
}
- return eventHandlerClass;
+ return eventHandlerAnnotationClass;
})
.filter(_NullSafe::isPresent)
.collect(Collectors.toList());