Merge branch 'hashset-for-axon-method-usages' of git://github.com/pbadenski/IdeaPlugin into pbadenski-hashset-for-axon-method-usages

Conflicts:
	src/main/java/org/axonframework/intellij/ide/plugin/publisher/DefaultEventPublisherProvider.java

Author: rinokadijk

src/main/java/org/axonframework/intellij/ide/plugin/publisher/DefaultEventPublisherProvider.java

@@ -19,31 +19,34 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Processor;
 import com.intellij.util.Query;
-import com.intellij.util.containers.ConcurrentMultiMap;
-import com.intellij.util.containers.MultiMap;
 
 import java.util.Collections;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static java.util.Arrays.asList;
 
 class DefaultEventPublisherProvider implements EventPublisherProvider {
 
-    private final MultiMap<Project, PsiMethod> publisherMethodsPerProject = new ConcurrentMultiMap<Project, PsiMethod>();
+    private final Map<Project, Set<PsiMethod>> publisherMethodsPerProject = new ConcurrentHashMap<Project, Set<PsiMethod>>();
 
     @Override
     public void scanPublishers(final Project project, GlobalSearchScope scope, final Registrar registrar) {
         cleanClosedProjects();
-        publisherMethodsPerProject.putValues(project, findMethods(project, GlobalSearchScope.allScope(project),
+        publisherMethodsPerProject.putIfAbsent(project, new HashSet<PsiMethod>());
+        Set<PsiMethod> psiMethods = publisherMethodsPerProject.get(project);
+        psiMethods.addAll(findMethods(project, GlobalSearchScope.allScope(project),
                 "org.axonframework.eventsourcing.AbstractEventSourcedAggregateRoot", "apply"));
-        publisherMethodsPerProject.putValues(project, findMethods(project, GlobalSearchScope.allScope(project),
+        psiMethods.addAll(findMethods(project, GlobalSearchScope.allScope(project),
                 "org.axonframework.domain.AbstractAggregateRoot", "registerEvent"));
-        publisherMethodsPerProject.putValues(project, findMethods(project, GlobalSearchScope.allScope(project),
+        psiMethods.addAll(findMethods(project, GlobalSearchScope.allScope(project),
                 "org.axonframework.eventsourcing.AbstractEventSourcedEntity", "apply"));
 
         GlobalSearchScope scopeNarrowedToJavaSourceFiles =
                 GlobalSearchScope.getScopeRestrictedByFileTypes(scope, StdFileTypes.JAVA);
-        scanEventPublishers(scopeNarrowedToJavaSourceFiles, registrar);
+        scanEventPublishers(project, scopeNarrowedToJavaSourceFiles, registrar);
         scanCommandPublishers(project, scopeNarrowedToJavaSourceFiles, registrar);
     }
 
@@ -120,8 +123,8 @@ private PsiClass findCommandHandlersAnnotation(Project project) {
                         GlobalSearchScope.allScope(project));
     }
 
-    private void scanEventPublishers(GlobalSearchScope scope, final Registrar registrar) {
-        for (final PsiMethod method : publisherMethodsPerProject.values()) {
+    private void scanEventPublishers(Project project, GlobalSearchScope scope, final Registrar registrar) {
+        for (final PsiMethod method : publisherMethodsPerProject.get(project)) {
             Query<PsiReference> invocations =
                     MethodReferencesSearch.search(method, scope, false);
             invocations.forEachAsync(new Processor<PsiReference>() {
@@ -160,13 +163,13 @@ private void cleanClosedProjects() {
         }
     }
 
-    private List<PsiMethod> findMethods(Project project, GlobalSearchScope allScope, String className,
-                                        String methodName) {
+    private Set<PsiMethod> findMethods(Project project, GlobalSearchScope allScope, String className,
+                                       String methodName) {
         PsiClass aggregateClass = JavaPsiFacade.getInstance(project).findClass(className, allScope);
         if (aggregateClass != null) {
-            return asList(aggregateClass.findMethodsByName(methodName, true));
+            return new HashSet<PsiMethod>(asList(aggregateClass.findMethodsByName(methodName, true)));
         }
-        return Collections.emptyList();
+        return Collections.emptySet();
     }
 
     @Override