support for meta-annotations

Author: rinokadijk

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

@@ -8,39 +8,56 @@
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.searches.AnnotatedElementsSearch;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Processor;
 import com.intellij.util.Query;
 
 class DefaultEventHandlerProvider implements HandlerProvider {
     @Override
-    public void scanHandlers(Project project, GlobalSearchScope scope, final Registrar registrar) {
+    public void scanHandlers(Project project, final GlobalSearchScope scope, final Registrar registrar) {
         for (final AnnotationTypes annotationType : AnnotationTypes.values()) {
-            PsiClass eventHandlerAnnotation = JavaPsiFacade.getInstance(project)
+            final PsiClass eventHandlerAnnotation = JavaPsiFacade.getInstance(project)
                     .findClass(annotationType.getFullyQualifiedName(),
                             GlobalSearchScope.allScope(project));
+
             if (eventHandlerAnnotation != null) {
-                Query<PsiReference> annotationUsages = ReferencesSearch.search(eventHandlerAnnotation, scope);
-                annotationUsages.forEachAsync(new Processor<PsiReference>() {
+                final Query<PsiClass> customEventHandlers = AnnotatedElementsSearch.searchPsiClasses(eventHandlerAnnotation, scope);
+                customEventHandlers.forEach(new Processor<PsiClass>() {
                     @Override
-                    public boolean process(PsiReference psiReference) {
-                        PsiMethod method = (PsiMethod) PsiTreeUtil.findFirstParent(psiReference.getElement(),
-                                new IsMethodCondition());
-                        if (method != null) {
-                            // this doesn't say the method is annotated
-                            final PsiAnnotation annotation = locateAnnotation(method);
-                            if (annotation != null) {
-                                Handler handler = createHandlerBasedOnAnnotation(method, annotation);
-                                if (handler != null) {
-                                    registrar.registerHandler(handler);
-                                }
-                            }
-                        }
+                    public boolean process(final PsiClass psiClass) {
+                        registerEventHandlerAnnotation(scope, registrar, eventHandlerAnnotation);
                         return true;
                     }
                 });
             }
+
+            registerEventHandlerAnnotation(scope, registrar, eventHandlerAnnotation);
+        }
+    }
+
+    private void registerEventHandlerAnnotation(final GlobalSearchScope scope, final Registrar registrar, final PsiClass eventHandlerAnnotation) {
+        if (eventHandlerAnnotation != null) {
+            Query<PsiReference> annotationUsages = ReferencesSearch.search(eventHandlerAnnotation, scope);
+            annotationUsages.forEachAsync(new Processor<PsiReference>() {
+                @Override
+                public boolean process(PsiReference psiReference) {
+                    PsiMethod method = (PsiMethod) PsiTreeUtil.findFirstParent(psiReference.getElement(),
+                            new IsMethodCondition());
+                    if (method != null) {
+                        // this doesn't say the method is annotated
+                        final PsiAnnotation annotation = locateAnnotation(method);
+                        if (annotation != null) {
+                            Handler handler = createHandlerBasedOnAnnotation(method, annotation);
+                            if (handler != null) {
+                                registrar.registerHandler(handler);
+                            }
+                        }
+                    }
+                    return true;
+                }
+            });
         }
     }
 

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

@@ -0,0 +1,13 @@
+package org.axonframework.intellij.ide.plugin.handler;
+
+import com.intellij.openapi.util.Condition;
+import com.intellij.psi.PsiAnnotation;
+import com.intellij.psi.PsiElement;
+
+public class IsAnnotationCondition implements Condition<PsiElement> {
+
+    @Override
+    public boolean value(PsiElement psiElement) {
+        return psiElement instanceof PsiAnnotation;
+    }
+}