Provider rename

Author: rinokadijk

src/main/java/org/axonframework/intellij/ide/plugin/annotator/AxonGutterAnnotator.java

@@ -14,7 +14,7 @@
 import org.axonframework.intellij.ide.plugin.handler.AnnotationTypes;
 import org.axonframework.intellij.ide.plugin.handler.Handler;
 import org.axonframework.intellij.ide.plugin.handler.HandlerProviderManager;
-import org.axonframework.intellij.ide.plugin.publisher.EventPublisher;
+import org.axonframework.intellij.ide.plugin.publisher.Publisher;
 import org.axonframework.intellij.ide.plugin.publisher.PublisherProviderManager;
 import org.jetbrains.annotations.NotNull;
 
@@ -41,7 +41,7 @@ public void annotate(@NotNull final PsiElement element, @NotNull AnnotationHolde
             tryAnnotateEventClass(holder, (PsiClass) element, publisherManager, handlerManager);
             tryAnnotateCommandClass(holder, (PsiClass) element, handlerManager);
         } else if ((element instanceof PsiMethodCallExpression || element instanceof PsiIdentifier)) {
-            final EventPublisher publisher = publisherManager.resolveEventPublisher(element);
+            final Publisher publisher = publisherManager.resolveEventPublisher(element);
             final Handler handler = handlerManager.resolveEventHandler(element.getContext());
             if (publisher != null) {
                 NotNullLazyValue<Collection<? extends PsiElement>> targetResolver =
@@ -53,7 +53,7 @@ public void annotate(@NotNull final PsiElement element, @NotNull AnnotationHolde
             }
 
             if (handler != null) {
-                Collection<EventPublisher> publishers = publisherManager.getRepository()
+                Collection<Publisher> publishers = publisherManager.getRepository()
                         .getPublishersFor(handler.getHandledType());
                 createGutterIconForEventPublishers(
                         handler.getElementForAnnotation(),
@@ -63,13 +63,13 @@ public void annotate(@NotNull final PsiElement element, @NotNull AnnotationHolde
         }
     }
 
-    private NotNullLazyValue<Collection<? extends PsiElement>> createNotNullLazyValueForPublishers(final Collection<EventPublisher> publishers) {
+    private NotNullLazyValue<Collection<? extends PsiElement>> createNotNullLazyValueForPublishers(final Collection<Publisher> publishers) {
         return new NotNullLazyValue<Collection<? extends PsiElement>>() {
             @NotNull
             @Override
             protected Collection<? extends PsiElement> compute() {
                 Collection<PsiElement> publishLocations = new ArrayList<PsiElement>();
-                for (EventPublisher eventPublisher : publishers) {
+                for (Publisher eventPublisher : publishers) {
                     PsiElement psiElement = eventPublisher.getPsiElement();
                     if (psiElement.isValid()) {
                         publishLocations.add(psiElement);
@@ -110,7 +110,7 @@ private void tryAnnotateCommandClass(AnnotationHolder holder, PsiClass classElem
 
     private void tryAnnotateEventClass(AnnotationHolder holder, PsiClass classElement,
                                        PublisherProviderManager publisherManager, HandlerProviderManager handlerManager) {
-        Set<EventPublisher> publishers = publisherManager.getRepository().getPublishersFor(PsiTypesUtil.getClassType(classElement));
+        Set<Publisher> publishers = publisherManager.getRepository().getPublishersFor(PsiTypesUtil.getClassType(classElement));
         if (!publishers.isEmpty()) {
             createGutterIconForEventPublishers(
                     classElement.getNameIdentifier(),
@@ -128,7 +128,7 @@ private void tryAnnotateEventClass(AnnotationHolder holder, PsiClass classElemen
         }
     }
 
-    private void addCreateEventHandlerQuickFixes(EventPublisher publisher, Annotation gutterIconForPublisher) {
+    private void addCreateEventHandlerQuickFixes(Publisher publisher, Annotation gutterIconForPublisher) {
         gutterIconForPublisher.registerFix(new CreateEventHandlerQuickfix(publisher.getPublishedType(), AnnotationTypes.EVENT_HANDLER));
         gutterIconForPublisher.registerFix(new CreateEventHandlerQuickfix(publisher.getPublishedType(), AnnotationTypes.EVENT_SOURCING_HANDLER));
         gutterIconForPublisher.registerFix(new CreateEventHandlerQuickfix(publisher.getPublishedType(), AnnotationTypes.SAGA_EVENT_HANDLER));

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

@@ -2,7 +2,7 @@
 
 import com.intellij.psi.*;
 
-public class CommandEventPublisher implements EventPublisher {
+public class CommandEventPublisher implements Publisher {
 
     private final PsiElement psiElement;
     private PsiType commandType;

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

@@ -4,7 +4,7 @@
 import com.intellij.psi.PsiType;
 import com.intellij.psi.impl.source.PsiImmediateClassType;
 
-class DefaultEventPublisher implements EventPublisher {
+class DefaultEventPublisher implements Publisher {
 
     private final PsiType publishedType;
     private final PsiElement psiElement;

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

@@ -18,7 +18,7 @@
 
 import static java.util.Arrays.asList;
 
-class DefaultEventPublisherProvider implements EventPublisherProvider {
+class DefaultEventPublisherProvider implements PublisherProvider {
 
     private final ConcurrentHashMap<Project, Set<PsiMethod>> publisherMethodsPerProject = new ConcurrentHashMap<Project, Set<PsiMethod>>();
 
@@ -163,7 +163,7 @@ private Set<PsiMethod> findMethods(Project project, GlobalSearchScope allScope,
     }
 
     @Override
-    public EventPublisher resolve(PsiElement element) {
+    public Publisher resolve(PsiElement element) {
         if (element instanceof PsiMethodCallExpression) {
             PsiMethodCallExpression expression = (PsiMethodCallExpression) element;
             PsiType[] expressionTypes = expression.getArgumentList().getExpressionTypes();

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

@@ -8,14 +8,14 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-class DefaultEventPublisherRepository implements EventPublisherRepository {
+class DefaultEventPublisherRepository implements PublisherRepository {
 
-    private final List<EventPublisher> publishers = new CopyOnWriteArrayList<EventPublisher>();
+    private final List<Publisher> publishers = new CopyOnWriteArrayList<Publisher>();
 
-    public void registerPublisher(EventPublisher eventPublisher) {
+    public void registerPublisher(Publisher eventPublisher) {
         publishers.add(eventPublisher);
-        List<EventPublisher> invalidated = new ArrayList<EventPublisher>();
-        for (EventPublisher entry : publishers) {
+        List<Publisher> invalidated = new ArrayList<Publisher>();
+        for (Publisher entry : publishers) {
             if (!entry.isValid()) {
                 invalidated.add(entry);
             }
@@ -24,9 +24,9 @@ public void registerPublisher(EventPublisher eventPublisher) {
     }
 
     @Override
-    public Set<EventPublisher> getPublishersFor(PsiType type) {
-        Set<EventPublisher> foundPublishers = new HashSet<EventPublisher>();
-        for (EventPublisher publisher : publishers) {
+    public Set<Publisher> getPublishersFor(PsiType type) {
+        Set<Publisher> foundPublishers = new HashSet<Publisher>();
+        for (Publisher publisher : publishers) {
             if (publisher.isValid() && publisher.canPublishType(type)) {
                 foundPublishers.add(publisher);
             }

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

@@ -3,7 +3,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiType;
 
-public interface EventPublisher {
+public interface Publisher {
 
     boolean canPublishType(PsiType eventType);
 

src/main/java/org/axonframework/intellij/ide/plugin/publisher/EventPublisher.java renamed to src/main/java/org/axonframework/intellij/ide/plugin/publisher/Publisher.java

@@ -4,15 +4,15 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
 
-interface EventPublisherProvider {
+interface PublisherProvider {
 
     void scanPublishers(Project project, GlobalSearchScope scope, Registrar registrar);
 
-    EventPublisher resolve(PsiElement element);
+    Publisher resolve(PsiElement element);
 
     interface Registrar {
 
-        void registerPublisher(EventPublisher eventPublisher);
+        void registerPublisher(Publisher eventPublisher);
 
     }
 }

src/main/java/org/axonframework/intellij/ide/plugin/publisher/EventPublisherProvider.java renamed to src/main/java/org/axonframework/intellij/ide/plugin/publisher/PublisherProvider.java

@@ -9,10 +9,10 @@
 
 public class PublisherProviderManager {
 
-    private final EventPublisherRepository repository;
+    private final PublisherRepository repository;
     private final Project project;
     private boolean initialized;
-    private EventPublisherProvider[] eventPublisherProviders;
+    private PublisherProvider[] eventPublisherProviders;
 
     public static PublisherProviderManager getInstance(Project project) {
         final PublisherProviderManager manager = ServiceManager.getService(project, PublisherProviderManager.class);
@@ -28,13 +28,13 @@ public PublisherProviderManager(Project project) {
     private synchronized void ensureInitialized() {
         if (!initialized) {
             eventPublisherProviders = Extensions.getExtensions(ExtensionPointName
-                                                                       .<EventPublisherProvider>create(
+                                                                       .<PublisherProvider>create(
                                                                                "org.axonframework.intellij.axonplugin.publisherProvider"));
-            for (EventPublisherProvider provider : eventPublisherProviders) {
+            for (PublisherProvider provider : eventPublisherProviders) {
                 provider.scanPublishers(project, GlobalSearchScope.projectScope(project),
-                                        new EventPublisherProvider.Registrar() {
+                                        new PublisherProvider.Registrar() {
                                             @Override
-                                            public void registerPublisher(EventPublisher eventPublisher) {
+                                            public void registerPublisher(Publisher eventPublisher) {
                                                 repository.registerPublisher(eventPublisher);
                                             }
                                         });
@@ -43,13 +43,13 @@ public void registerPublisher(EventPublisher eventPublisher) {
         }
     }
 
-    public EventPublisherRepository getRepository() {
+    public PublisherRepository getRepository() {
         return repository;
     }
 
-    public EventPublisher resolveEventPublisher(PsiElement psiElement) {
-        for (EventPublisherProvider eventPublisherProvider : eventPublisherProviders) {
-            EventPublisher publisher = eventPublisherProvider.resolve(psiElement);
+    public Publisher resolveEventPublisher(PsiElement psiElement) {
+        for (PublisherProvider eventPublisherProvider : eventPublisherProviders) {
+            Publisher publisher = eventPublisherProvider.resolve(psiElement);
             if (publisher != null && psiElement.isValid()) {
                 repository.registerPublisher(publisher);
                 return publisher;

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

@@ -0,0 +1,12 @@
+package org.axonframework.intellij.ide.plugin.publisher;
+
+import com.intellij.psi.PsiType;
+
+import java.util.Set;
+
+public interface PublisherRepository {
+
+    void registerPublisher(Publisher eventPublisher);
+
+    Set<Publisher> getPublishersFor(PsiType type);
+}