Support for recursive custom event handlers

Author: rinokadijk

src/main/java/org/axonframework/intellij/ide/plugin/handler/DefaultEventHandlerProvider.java

@@ -104,22 +104,27 @@ private Map<String, String> getFullyQualifiedNames(final Project project) {
 
         for (AnnotationTypes annotationType : AnnotationTypes.values()) {
             annotations.put(annotationType.getFullyQualifiedName(), annotationType.getAnnotation());
+            addCustomHandlers(annotations, project, annotationType.getFullyQualifiedName());
+        }
+        return annotations;
+    }
 
-            final PsiClass eventHandlerAnnotation = JavaPsiFacade.getInstance(project)
-                    .findClass(annotationType.getFullyQualifiedName(),
-                            GlobalSearchScope.allScope(project));
+    private void addCustomHandlers(final HashMap<String, String> annotations, final Project project, final String fullyQualifiedName) {
+        final PsiClass eventHandlerAnnotation = JavaPsiFacade.getInstance(project)
+                .findClass(fullyQualifiedName, GlobalSearchScope.allScope(project));
 
-            if (eventHandlerAnnotation != null) {
-                final Query<PsiClass> customEventHandlers = searchPsiClasses(eventHandlerAnnotation, projectScope(project));
-                customEventHandlers.forEach(new Processor<PsiClass>() {
-                    @Override
-                    public boolean process(final PsiClass psiClass) {
-                        annotations.put(psiClass.getQualifiedName(), psiClass.getName());
-                        return true;
+        if (eventHandlerAnnotation != null) {
+            final Query<PsiClass> customEventHandlers = searchPsiClasses(eventHandlerAnnotation, projectScope(project));
+            customEventHandlers.forEach(new Processor<PsiClass>() {
+                @Override
+                public boolean process(final PsiClass psiClass) {
+                    if (psiClass.isAnnotationType()) {
+                        addCustomHandlers(annotations, project, psiClass.getQualifiedName());
                     }
-                });
-            }
+                    annotations.put(psiClass.getQualifiedName(), psiClass.getName());
+                    return true;
+                }
+            });
         }
-        return annotations;
     }
 }