dorkbox
/
MessageBus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated for use of collections library and classUtils

master
Robinson 2023-08-05 11:58:48 -06:00
parent 1b053755aa
commit 4101700d96
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dorkbox/messageBus/common/MessageHandler.java
View File

@ -40,11 +40,11 @@ package dorkbox.messageBus.common;
import java.lang.reflect.Method;
import java.util.ArrayList;
import dorkbox.classUtil.ReflectionUtils;
import dorkbox.messageBus.annotations.Listener;
import dorkbox.messageBus.annotations.References;
import dorkbox.messageBus.annotations.Subscribe;
import dorkbox.messageBus.annotations.Synchronized;
import dorkbox.util.classes.ReflectionUtils;
/**
* Any method in any class annotated with the @Handler annotation represents a message handler. The class that contains
@ -74,7 +74,7 @@ class MessageHandler {
MessageHandler[] get(final Class<?> messageClass) {
// publish all handlers (this will include all (inherited) methods directly annotated using @Handler)
final Method[] allMethods = ReflectionUtils.getMethods(messageClass, Subscribe.class);
final Method[] allMethods = ReflectionUtils.INSTANCE.getMethods(messageClass, Subscribe.class);
final int length = allMethods.length;
final ArrayList<MessageHandler> finalMethods = new ArrayList<MessageHandler>(length);
@ -84,17 +84,17 @@ class MessageHandler {
method = allMethods[i];
// retain only those that are at the bottom of their respective class hierarchy (deepest overriding method)
if (!ReflectionUtils.containsOverridingMethod(allMethods, method)) {
if (!ReflectionUtils.INSTANCE.containsOverridingMethod(allMethods, method)) {
// for each handler there will be no overriding method that specifies @Handler annotation
// but an overriding method does inherit the listener configuration of the overwritten method
final Subscribe handler = ReflectionUtils.getAnnotation(method, Subscribe.class);
final Subscribe handler = ReflectionUtils.INSTANCE.getAnnotation(method, Subscribe.class);
if (handler == null || !handler.enabled()) {
// disabled or invalid listeners are ignored
continue;
}
Method overriddenHandler = ReflectionUtils.getOverridingMethod(method, messageClass);
Method overriddenHandler = ReflectionUtils.INSTANCE.getOverridingMethod(method, messageClass);
if (overriddenHandler == null) {
overriddenHandler = method;
}
@ -129,9 +129,9 @@ class MessageHandler {
this.method = method;
this.acceptsSubtypes = config.acceptSubtypes();
this.handledMessages = method.getParameterTypes();
this.isSynchronized = ReflectionUtils.getAnnotation(method, Synchronized.class) != null;
this.isSynchronized = ReflectionUtils.INSTANCE.getAnnotation(method, Synchronized.class) != null;
Listener annotation = ReflectionUtils.getAnnotation(clazz, Listener.class);
Listener annotation = ReflectionUtils.INSTANCE.getAnnotation(clazz, Listener.class);
if (annotation == null || annotation.references().equals(References.Undefined)) {
this.referenceType = UNDEFINED;
}

2
src/dorkbox/messageBus/subscription/Subscription.java
View File

@ -152,7 +152,7 @@ class Subscription<T> {
*/
public final
int size() {
return this.entries.size;
return this.entries.size();
}
public abstract boolean publish(final Publisher publisher, final ErrorHandler errorHandler, final Object message);

4
src/dorkbox/messageBus/subscription/SubscriptionManager.java
View File

@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import dorkbox.classUtil.ClassHierarchy;
import dorkbox.collections.IdentityMap;
import dorkbox.messageBus.SubscriptionMode;
import dorkbox.messageBus.common.ClassTree;
@ -26,7 +27,6 @@ import dorkbox.messageBus.common.MessageHandler;
import dorkbox.messageBus.common.MultiClass;
import dorkbox.messageBus.subscription.asm.AsmFactory;
import dorkbox.messageBus.subscription.reflection.ReflectionFactory;
import dorkbox.util.classes.ClassHierarchy;
/**
@ -167,7 +167,7 @@ class SubscriptionManager {
// explicitly clear out the subscriptions
final IdentityMap.Entries<Class<?>, Subscription[]> entries = subsPerListener.entries();
for (IdentityMap.Entry<Class<?>, Subscription[]> entry : entries) {
final Subscription[] subscriptions = entry.value;
final Subscription[] subscriptions = entry.getValue();
if (subscriptions != null) {
Subscription subscription;

7
test/dorkbox/util/messagebus/common/MessageBusTest.java
View File

@ -50,8 +50,7 @@ class MessageBusTest extends AssertSupport {
@Override
public
void handleError(PublicationError error) {
error.getCause()
.printStackTrace();
error.getCause().printStackTrace();
fail();
}
@ -65,9 +64,7 @@ class MessageBusTest extends AssertSupport {
@Before
public
void setUp() {
for (MessageTypes mes : MessageTypes.values()) {
mes.reset();
}
MessageTypes.resetAll();
}