Skip to content

Commit 002d783

Browse files
rinokadijkRino
rinokadijk
authored and
Rino
committed
Handler rename
1 parent dbeeb26 commit 002d783

13 files changed

+72
-67
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.intellij.psi.PsiMethodCallExpression;
1313
import com.intellij.psi.util.PsiTypesUtil;
1414
import org.axonframework.intellij.ide.plugin.handler.AnnotationTypes;
15-
import org.axonframework.intellij.ide.plugin.handler.EventHandler;
15+
import org.axonframework.intellij.ide.plugin.handler.Handler;
1616
import org.axonframework.intellij.ide.plugin.handler.HandlerProviderManager;
1717
import org.axonframework.intellij.ide.plugin.publisher.EventPublisher;
1818
import org.axonframework.intellij.ide.plugin.publisher.PublisherProviderManager;
@@ -42,7 +42,7 @@ public void annotate(@NotNull final PsiElement element, @NotNull AnnotationHolde
4242
tryAnnotateCommandClass(holder, (PsiClass) element, handlerManager);
4343
} else if ((element instanceof PsiMethodCallExpression || element instanceof PsiIdentifier)) {
4444
final EventPublisher publisher = publisherManager.resolveEventPublisher(element);
45-
final EventHandler handler = handlerManager.resolveEventHandler(element.getContext());
45+
final Handler handler = handlerManager.resolveEventHandler(element.getContext());
4646
if (publisher != null) {
4747
NotNullLazyValue<Collection<? extends PsiElement>> targetResolver =
4848
createNotNullLazyValueForHandlers(handlerManager.getRepository().findHandlers(publisher.getPublishedType()));
@@ -80,13 +80,13 @@ protected Collection<? extends PsiElement> compute() {
8080
};
8181
}
8282

83-
private NotNullLazyValue<Collection<? extends PsiElement>> createNotNullLazyValueForHandlers(final Set<EventHandler> handlers) {
83+
private NotNullLazyValue<Collection<? extends PsiElement>> createNotNullLazyValueForHandlers(final Set<Handler> handlers) {
8484
return new NotNullLazyValue<Collection<? extends PsiElement>>() {
8585
@NotNull
8686
@Override
8787
protected Collection<? extends PsiElement> compute() {
8888
Set<PsiEventHandlerWrapper> destinations = new TreeSet<PsiEventHandlerWrapper>();
89-
for (EventHandler eventHandler : handlers) {
89+
for (Handler eventHandler : handlers) {
9090
PsiElement elementForAnnotation = eventHandler.getElementForAnnotation();
9191
if (elementForAnnotation.isValid()) {
9292
destinations.add(new PsiEventHandlerWrapper(elementForAnnotation, eventHandler));
@@ -98,7 +98,7 @@ protected Collection<? extends PsiElement> compute() {
9898
}
9999

100100
private void tryAnnotateCommandClass(AnnotationHolder holder, PsiClass classElement, HandlerProviderManager handlerManager) {
101-
Set<EventHandler> handlers =
101+
Set<Handler> handlers =
102102
handlerManager.getRepository().findCommandHandlers(PsiTypesUtil.getClassType(classElement));
103103
if (!handlers.isEmpty()) {
104104
createGutterIconForCommandHandlers(
@@ -117,7 +117,7 @@ private void tryAnnotateEventClass(AnnotationHolder holder, PsiClass classElemen
117117
holder,
118118
createNotNullLazyValueForPublishers(publishers));
119119
}
120-
Set<EventHandler> handlers =
120+
Set<Handler> handlers =
121121
handlerManager.getRepository().findEventHandlers(PsiTypesUtil.getClassType(classElement));
122122
if (!handlers.isEmpty()) {
123123
createGutterIconForEventHandlers(

‎src/main/java/org/axonframework/intellij/ide/plugin/annotator/EventHandlerMethodCellRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.intellij.psi.PsiElement;
77
import com.intellij.psi.PsiMethod;
88
import com.intellij.psi.util.PsiTreeUtil;
9-
import org.axonframework.intellij.ide.plugin.handler.EventHandler;
9+
import org.axonframework.intellij.ide.plugin.handler.Handler;
1010
import org.axonframework.intellij.ide.plugin.handler.HandlerProviderManager;
1111
import org.axonframework.intellij.ide.plugin.handler.IsMethodCondition;
1212
import org.jetbrains.annotations.Nullable;
@@ -61,7 +61,7 @@ public IconMethodCellRenderer(HandlerProviderManager handlerProviderManager) {
6161

6262
@Override
6363
public Icon getIcon(PsiElement element) {
64-
EventHandler eventHandler = handlerProviderManager.resolveEventHandler(element);
64+
Handler eventHandler = handlerProviderManager.resolveEventHandler(element);
6565
if (eventHandler == null) {
6666
return super.getIcon(element);
6767
}

‎src/main/java/org/axonframework/intellij/ide/plugin/annotator/PsiEventHandlerWrapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.intellij.psi.search.GlobalSearchScope;
1111
import com.intellij.psi.search.SearchScope;
1212
import com.intellij.util.IncorrectOperationException;
13-
import org.axonframework.intellij.ide.plugin.handler.EventHandler;
13+
import org.axonframework.intellij.ide.plugin.handler.Handler;
1414
import org.jetbrains.annotations.NonNls;
1515
import org.jetbrains.annotations.NotNull;
1616
import org.jetbrains.annotations.Nullable;
@@ -19,9 +19,9 @@
1919

2020
class PsiEventHandlerWrapper implements PsiElement, Comparable<PsiEventHandlerWrapper> {
2121
private final PsiElement elementForAnnotation;
22-
private final EventHandler eventHandler;
22+
private final Handler eventHandler;
2323

24-
public PsiEventHandlerWrapper(PsiElement elementForAnnotation, EventHandler eventHandler) {
24+
public PsiEventHandlerWrapper(PsiElement elementForAnnotation, Handler eventHandler) {
2525
this.eventHandler = eventHandler;
2626
this.elementForAnnotation = elementForAnnotation;
2727
}
@@ -303,7 +303,7 @@ public <T> void putUserData(@NotNull Key<T> key, @Nullable T value) {
303303
elementForAnnotation.putUserData(key, value);
304304
}
305305

306-
public EventHandler getEventHandler() {
306+
public Handler getEventHandler() {
307307
return eventHandler;
308308
}
309309

‎src/main/java/org/axonframework/intellij/ide/plugin/handler/CommandEventHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.intellij.psi.*;
44

5-
public class CommandEventHandler implements EventHandler {
5+
public class CommandEventHandler implements Handler {
66

77
private final PsiType commandType;
88
private final PsiMethod method;
@@ -42,7 +42,7 @@ public boolean isSagaEvent() {
4242
return false;
4343
}
4444

45-
public static EventHandler createEventHandler(PsiMethod method) {
45+
public static Handler createEventHandler(PsiMethod method) {
4646
PsiType[] methodArguments = getMethodArguments(method);
4747
return new CommandEventHandler(methodArguments[0], method);
4848
}

‎src/main/java/org/axonframework/intellij/ide/plugin/handler/DefaultEventHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import static org.axonframework.intellij.ide.plugin.handler.InternalEventTypes.ABSTRACT_ANNOTATED_AGGREGATE_ROOT;
77
import static org.axonframework.intellij.ide.plugin.handler.InternalEventTypes.ABSTRACT_ANNOTATED_ENTITY;
88

9-
class DefaultEventHandler implements EventHandler {
9+
class DefaultEventHandler implements Handler {
1010

1111
private static final String EVENT_HANDLER_ARGUMENT = "eventType";
1212
private static final String AlTERNATIVE_EVENT_HANDLER_ARGUMENT = "payloadType";
@@ -119,7 +119,7 @@ private PsiType[] getAnnotationArguments(PsiAnnotationMemberValue eventType) {
119119
return new PsiType[]{};
120120
}
121121

122-
public static EventHandler createEventHandler(PsiMethod method, PsiAnnotation annotation) {
122+
public static Handler createEventHandler(PsiMethod method, PsiAnnotation annotation) {
123123
PsiAnnotationMemberValue eventType = annotation.findAttributeValue(DefaultEventHandler.EVENT_HANDLER_ARGUMENT);
124124
if (eventType == null) {
125125
eventType = annotation.findAttributeValue(AlTERNATIVE_EVENT_HANDLER_ARGUMENT);

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
package org.axonframework.intellij.ide.plugin.handler;
22

33
import com.intellij.openapi.project.Project;
4-
import com.intellij.psi.*;
4+
import com.intellij.psi.JavaPsiFacade;
5+
import com.intellij.psi.PsiAnnotation;
6+
import com.intellij.psi.PsiClass;
7+
import com.intellij.psi.PsiElement;
8+
import com.intellij.psi.PsiMethod;
9+
import com.intellij.psi.PsiReference;
510
import com.intellij.psi.search.GlobalSearchScope;
611
import com.intellij.psi.search.searches.ReferencesSearch;
712
import com.intellij.psi.util.PsiTreeUtil;
813
import com.intellij.util.Processor;
914
import com.intellij.util.Query;
1015

11-
class DefaultEventHandlerProvider implements EventHandlerProvider {
16+
class DefaultEventHandlerProvider implements HandlerProvider {
1217
@Override
1318
public void scanHandlers(Project project, GlobalSearchScope scope, final Registrar registrar) {
1419
for (final AnnotationTypes annotationType : AnnotationTypes.values()) {
@@ -26,7 +31,7 @@ public boolean process(PsiReference psiReference) {
2631
// this doesn't say the method is annotated
2732
final PsiAnnotation annotation = locateAnnotation(method);
2833
if (annotation != null) {
29-
EventHandler handler = createHandlerBasedOnAnnotation(method, annotation);
34+
Handler handler = createHandlerBasedOnAnnotation(method, annotation);
3035
if (handler != null) {
3136
registrar.registerHandler(handler);
3237
}
@@ -40,7 +45,7 @@ public boolean process(PsiReference psiReference) {
4045
}
4146

4247
@Override
43-
public EventHandler resolve(PsiElement element) {
48+
public Handler resolve(PsiElement element) {
4449
if (element instanceof PsiMethod) {
4550
PsiMethod methodElement = (PsiMethod) element;
4651
final PsiAnnotation annotation = locateAnnotation(methodElement);
@@ -51,7 +56,7 @@ public EventHandler resolve(PsiElement element) {
5156
return null;
5257
}
5358

54-
private EventHandler createHandlerBasedOnAnnotation(PsiMethod method, PsiAnnotation annotation) {
59+
private Handler createHandlerBasedOnAnnotation(PsiMethod method, PsiAnnotation annotation) {
5560
if (AnnotationTypes.COMMAND_EVENT_HANDLER.getFullyQualifiedName().equals(annotation.getQualifiedName())) {
5661
return CommandEventHandler.createEventHandler(method);
5762
} else {

‎src/main/java/org/axonframework/intellij/ide/plugin/handler/DefaultEventHandlerRepository.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
import java.util.Set;
99
import java.util.concurrent.CopyOnWriteArrayList;
1010

11-
class DefaultEventHandlerRepository implements EventHandlerRepository {
11+
class DefaultEventHandlerRepository implements HandlerRepository {
1212

13-
private final List<EventHandler> handlers = new CopyOnWriteArrayList<EventHandler>();
13+
private final List<Handler> handlers = new CopyOnWriteArrayList<Handler>();
1414

15-
public void registerHandler(EventHandler eventHandler) {
15+
public void registerHandler(Handler eventHandler) {
1616
handlers.add(eventHandler);
17-
List<EventHandler> invalidated = new ArrayList<EventHandler>();
18-
for (EventHandler entry : handlers) {
17+
List<Handler> invalidated = new ArrayList<Handler>();
18+
for (Handler entry : handlers) {
1919
if (!entry.isValid()) {
2020
invalidated.add(entry);
2121
}
@@ -24,9 +24,9 @@ public void registerHandler(EventHandler eventHandler) {
2424
}
2525

2626
@Override
27-
public Set<EventHandler> findHandlers(PsiType eventType) {
28-
Set<EventHandler> found = new HashSet<EventHandler>();
29-
for (EventHandler eventHandler : handlers) {
27+
public Set<Handler> findHandlers(PsiType eventType) {
28+
Set<Handler> found = new HashSet<Handler>();
29+
for (Handler eventHandler : handlers) {
3030
if (eventHandler.isValid() && eventHandler.canHandle(eventType)) {
3131
found.add(eventHandler);
3232
}
@@ -35,9 +35,9 @@ public Set<EventHandler> findHandlers(PsiType eventType) {
3535
}
3636

3737
@Override
38-
public Set<EventHandler> findEventHandlers(PsiType eventType) {
39-
Set<EventHandler> found = new HashSet<EventHandler>();
40-
for (EventHandler eventHandler : findHandlers(eventType)) {
38+
public Set<Handler> findEventHandlers(PsiType eventType) {
39+
Set<Handler> found = new HashSet<Handler>();
40+
for (Handler eventHandler : findHandlers(eventType)) {
4141
if (!(eventHandler instanceof CommandEventHandler)) {
4242
found.add(eventHandler);
4343
}
@@ -46,9 +46,9 @@ public Set<EventHandler> findEventHandlers(PsiType eventType) {
4646
}
4747

4848
@Override
49-
public Set<EventHandler> findCommandHandlers(PsiType eventType) {
50-
Set<EventHandler> found = new HashSet<EventHandler>();
51-
for (EventHandler eventHandler : findHandlers(eventType)) {
49+
public Set<Handler> findCommandHandlers(PsiType eventType) {
50+
Set<Handler> found = new HashSet<Handler>();
51+
for (Handler eventHandler : findHandlers(eventType)) {
5252
if (eventHandler instanceof CommandEventHandler) {
5353
found.add(eventHandler);
5454
}

‎src/main/java/org/axonframework/intellij/ide/plugin/handler/EventHandlerRepository.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/main/java/org/axonframework/intellij/ide/plugin/handler/EventHandler.java renamed to ‎src/main/java/org/axonframework/intellij/ide/plugin/handler/Handler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.intellij.psi.PsiElement;
44
import com.intellij.psi.PsiType;
55

6-
public interface EventHandler {
6+
public interface Handler {
77

88
/**
99
* Returns the PsiType describing the type of Event handled by this handler

‎src/main/java/org/axonframework/intellij/ide/plugin/handler/EventHandlerProvider.java renamed to ‎src/main/java/org/axonframework/intellij/ide/plugin/handler/HandlerProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
import com.intellij.psi.PsiElement;
55
import com.intellij.psi.search.GlobalSearchScope;
66

7-
interface EventHandlerProvider {
7+
interface HandlerProvider {
88

99
void scanHandlers(Project project, GlobalSearchScope scope, Registrar registrar);
1010

11-
EventHandler resolve(PsiElement element);
11+
Handler resolve(PsiElement element);
1212

1313
interface Registrar {
1414

15-
void registerHandler(EventHandler eventHandler);
15+
void registerHandler(Handler eventHandler);
1616

1717
}
1818
}

0 commit comments

Comments
 (0)