diff --git a/src/dorkbox/util/messagebus/MessageBus.java b/src/dorkbox/util/messagebus/MessageBus.java index 439ca8d..361c2ce 100644 --- a/src/dorkbox/util/messagebus/MessageBus.java +++ b/src/dorkbox/util/messagebus/MessageBus.java @@ -9,7 +9,10 @@ import dorkbox.util.messagebus.error.DefaultErrorHandler; import dorkbox.util.messagebus.error.ErrorHandlingSupport; import dorkbox.util.messagebus.error.PublicationError; import dorkbox.util.messagebus.publication.*; -import dorkbox.util.messagebus.subscription.*; +import dorkbox.util.messagebus.subscription.FirstArgSubscriber; +import dorkbox.util.messagebus.subscription.MultiArgSubscriber; +import dorkbox.util.messagebus.subscription.Subscriber; +import dorkbox.util.messagebus.subscription.SubscriptionManager; import dorkbox.util.messagebus.utils.ClassUtils; import org.jctools.util.Pow2; @@ -71,7 +74,7 @@ public class MessageBus implements IMessageBus { subscriber = new MultiArgSubscriber(errorHandler, classUtils); } else { - subscriber = new FirstArgSubscriber(errorHandler, classUtils); + subscriber = new FirstArgSubscriber(errorHandler); } switch (publishMode) { diff --git a/src/dorkbox/util/messagebus/subscription/Publisher.java b/src/dorkbox/util/messagebus/publication/Publisher.java similarity index 83% rename from src/dorkbox/util/messagebus/subscription/Publisher.java rename to src/dorkbox/util/messagebus/publication/Publisher.java index 7953086..d63c720 100644 --- a/src/dorkbox/util/messagebus/subscription/Publisher.java +++ b/src/dorkbox/util/messagebus/publication/Publisher.java @@ -1,4 +1,4 @@ -package dorkbox.util.messagebus.subscription; +package dorkbox.util.messagebus.publication; public interface Publisher { void publish(Object message1); diff --git a/src/dorkbox/util/messagebus/publication/PublisherAll_MultiArg.java b/src/dorkbox/util/messagebus/publication/PublisherAll_MultiArg.java index 24b2b1c..e19ee38 100644 --- a/src/dorkbox/util/messagebus/publication/PublisherAll_MultiArg.java +++ b/src/dorkbox/util/messagebus/publication/PublisherAll_MultiArg.java @@ -4,7 +4,6 @@ import dorkbox.util.messagebus.common.DeadMessage; import dorkbox.util.messagebus.common.adapter.StampedLock; import dorkbox.util.messagebus.error.ErrorHandlingSupport; import dorkbox.util.messagebus.error.PublicationError; -import dorkbox.util.messagebus.subscription.Publisher; import dorkbox.util.messagebus.subscription.Subscriber; import dorkbox.util.messagebus.subscription.Subscription; import dorkbox.util.messagebus.utils.VarArgUtils; diff --git a/src/dorkbox/util/messagebus/publication/PublisherExactWithSuperTypes_FirstArg.java b/src/dorkbox/util/messagebus/publication/PublisherExactWithSuperTypes_FirstArg.java index e0dd54d..012c9ed 100644 --- a/src/dorkbox/util/messagebus/publication/PublisherExactWithSuperTypes_FirstArg.java +++ b/src/dorkbox/util/messagebus/publication/PublisherExactWithSuperTypes_FirstArg.java @@ -4,7 +4,6 @@ import dorkbox.util.messagebus.common.DeadMessage; import dorkbox.util.messagebus.common.adapter.StampedLock; import dorkbox.util.messagebus.error.ErrorHandlingSupport; import dorkbox.util.messagebus.error.PublicationError; -import dorkbox.util.messagebus.subscription.Publisher; import dorkbox.util.messagebus.subscription.Subscriber; import dorkbox.util.messagebus.subscription.Subscription; @@ -79,13 +78,15 @@ public class PublisherExactWithSuperTypes_FirstArg implements Publisher { // Run subscriptions if (subscriptions != null) { + Class>[] handledMessages; Subscription sub; for (int i = 0; i < subscriptions.length; i++) { sub = subscriptions[i]; - final Class>[] handledMessages = sub.getHandler().getHandledMessages(); - - sub.publish(message1, message2); + handledMessages = sub.getHandler().getHandledMessages(); + if (handledMessages.length == 2) { + sub.publish(message1, message2); + } } } else { @@ -122,10 +123,15 @@ public class PublisherExactWithSuperTypes_FirstArg implements Publisher { // Run subscriptions if (subscriptions != null) { + Class>[] handledMessages; Subscription sub; for (int i = 0; i < subscriptions.length; i++) { sub = subscriptions[i]; - sub.publish(message1, message2, message3); + + handledMessages = sub.getHandler().getHandledMessages(); + if (handledMessages.length == 3) { + sub.publish(message1, message2, message3); + } } } else { @@ -155,7 +161,8 @@ public class PublisherExactWithSuperTypes_FirstArg implements Publisher { try { final Object message1 = messages[0]; final Class> messageClass = message1.getClass(); - final Object[] newMessages = Arrays.copyOfRange(messages, 1, messages.length); + final int length = messages.length; + final Object[] newMessages = Arrays.copyOfRange(messages, 1, length); final StampedLock lock = this.lock; long stamp = lock.readLock(); @@ -164,10 +171,15 @@ public class PublisherExactWithSuperTypes_FirstArg implements Publisher { // Run subscriptions if (subscriptions != null) { + Class>[] handledMessages; Subscription sub; for (int i = 0; i < subscriptions.length; i++) { sub = subscriptions[i]; - sub.publish(message1, newMessages); + + handledMessages = sub.getHandler().getHandledMessages(); + if (handledMessages.length == length) { + sub.publish(message1, newMessages); + } } } else { diff --git a/src/dorkbox/util/messagebus/publication/PublisherExactWithSuperTypes_MultiArg.java b/src/dorkbox/util/messagebus/publication/PublisherExactWithSuperTypes_MultiArg.java index 84267ac..8f519f7 100644 --- a/src/dorkbox/util/messagebus/publication/PublisherExactWithSuperTypes_MultiArg.java +++ b/src/dorkbox/util/messagebus/publication/PublisherExactWithSuperTypes_MultiArg.java @@ -4,7 +4,6 @@ import dorkbox.util.messagebus.common.DeadMessage; import dorkbox.util.messagebus.common.adapter.StampedLock; import dorkbox.util.messagebus.error.ErrorHandlingSupport; import dorkbox.util.messagebus.error.PublicationError; -import dorkbox.util.messagebus.subscription.Publisher; import dorkbox.util.messagebus.subscription.Subscriber; import dorkbox.util.messagebus.subscription.Subscription; diff --git a/src/dorkbox/util/messagebus/publication/PublisherExact_FirstArg.java b/src/dorkbox/util/messagebus/publication/PublisherExact_FirstArg.java index d2900fe..8853c84 100644 --- a/src/dorkbox/util/messagebus/publication/PublisherExact_FirstArg.java +++ b/src/dorkbox/util/messagebus/publication/PublisherExact_FirstArg.java @@ -4,12 +4,9 @@ import dorkbox.util.messagebus.common.DeadMessage; import dorkbox.util.messagebus.common.adapter.StampedLock; import dorkbox.util.messagebus.error.ErrorHandlingSupport; import dorkbox.util.messagebus.error.PublicationError; -import dorkbox.util.messagebus.subscription.Publisher; import dorkbox.util.messagebus.subscription.Subscriber; import dorkbox.util.messagebus.subscription.Subscription; -import java.util.Arrays; - public class PublisherExact_FirstArg implements Publisher { private final ErrorHandlingSupport errorHandler; private final Subscriber subscriber; @@ -33,10 +30,15 @@ public class PublisherExact_FirstArg implements Publisher { // Run subscriptions if (subscriptions != null) { + Class>[] handledMessages; Subscription sub; for (int i = 0; i < subscriptions.length; i++) { sub = subscriptions[i]; - sub.publish(message1); + + handledMessages = sub.getHandler().getHandledMessages(); + if (handledMessages.length == 1) { + sub.publish(message1); + } } } else { @@ -73,10 +75,15 @@ public class PublisherExact_FirstArg implements Publisher { // Run subscriptions if (subscriptions != null) { + Class>[] handledMessages; Subscription sub; for (int i = 0; i < subscriptions.length; i++) { sub = subscriptions[i]; - sub.publish(message1, message2); + + handledMessages = sub.getHandler().getHandledMessages(); + if (handledMessages.length == 2) { + sub.publish(message1, message2); + } } } else { @@ -113,10 +120,15 @@ public class PublisherExact_FirstArg implements Publisher { // Run subscriptions if (subscriptions != null) { + Class>[] handledMessages; Subscription sub; for (int i = 0; i < subscriptions.length; i++) { sub = subscriptions[i]; - sub.publish(message1, message2, message3); + + handledMessages = sub.getHandler().getHandledMessages(); + if (handledMessages.length == 3) { + sub.publish(message1, message2, message3); + } } } else { @@ -144,9 +156,8 @@ public class PublisherExact_FirstArg implements Publisher { @Override public void publish(final Object[] messages) { try { - final Object message1 = messages[0]; - final Class> messageClass = message1.getClass(); - final Object[] newMessages = Arrays.copyOfRange(messages, 1, messages.length); + final Class> messageClass = messages[0].getClass(); + final int length = messages.length; final StampedLock lock = this.lock; long stamp = lock.readLock(); @@ -155,10 +166,15 @@ public class PublisherExact_FirstArg implements Publisher { // Run subscriptions if (subscriptions != null) { + Class>[] handledMessages; Subscription sub; for (int i = 0; i < subscriptions.length; i++) { sub = subscriptions[i]; - sub.publish(message1, newMessages); + + handledMessages = sub.getHandler().getHandledMessages(); + if (handledMessages.length == length) { + sub.publish(messages); + } } } else { @@ -168,7 +184,7 @@ public class PublisherExact_FirstArg implements Publisher { lock.unlockRead(stamp); if (deadSubscriptions != null) { - final DeadMessage deadMessage = new DeadMessage(message1, newMessages); + final DeadMessage deadMessage = new DeadMessage(messages); Subscription sub; for (int i = 0; i < deadSubscriptions.length; i++) { diff --git a/src/dorkbox/util/messagebus/publication/PublisherExact_MultiArg.java b/src/dorkbox/util/messagebus/publication/PublisherExact_MultiArg.java index 5199ebd..0f9066c 100644 --- a/src/dorkbox/util/messagebus/publication/PublisherExact_MultiArg.java +++ b/src/dorkbox/util/messagebus/publication/PublisherExact_MultiArg.java @@ -4,7 +4,6 @@ import dorkbox.util.messagebus.common.DeadMessage; import dorkbox.util.messagebus.common.adapter.StampedLock; import dorkbox.util.messagebus.error.ErrorHandlingSupport; import dorkbox.util.messagebus.error.PublicationError; -import dorkbox.util.messagebus.subscription.Publisher; import dorkbox.util.messagebus.subscription.Subscriber; import dorkbox.util.messagebus.subscription.Subscription; diff --git a/src/dorkbox/util/messagebus/subscription/FirstArgSubscriber.java b/src/dorkbox/util/messagebus/subscription/FirstArgSubscriber.java index db1304d..c9e0537 100644 --- a/src/dorkbox/util/messagebus/subscription/FirstArgSubscriber.java +++ b/src/dorkbox/util/messagebus/subscription/FirstArgSubscriber.java @@ -3,7 +3,6 @@ package dorkbox.util.messagebus.subscription; import dorkbox.util.messagebus.common.MessageHandler; import dorkbox.util.messagebus.common.adapter.JavaVersionAdapter; import dorkbox.util.messagebus.error.ErrorHandlingSupport; -import dorkbox.util.messagebus.utils.ClassUtils; import dorkbox.util.messagebus.utils.VarArgUtils; import java.util.ArrayList; @@ -14,6 +13,9 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * Permits subscriptions that only use the first parameters as the signature. The publisher MUST provide the correct additional parameters, * and they must be of the correct type, otherwise it will throw an error. + *
+ * Parameter length checking during publication is performed, so that you can have multiple handlers with the same signature, but each + * with a different number of parameters */ public class FirstArgSubscriber implements Subscriber { @@ -24,82 +26,47 @@ public class FirstArgSubscriber implements Subscriber { // write access is synchronized and happens only when a listener of a specific class is registered the first time // the following are used ONLY for FIRST ARG subscription/publication. (subscriptionsPerMessageMulti isn't used in this case) - private final Map