updated tests package

src9/dorkbox/messageBus/EmptyClass.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 dorkbox, llc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dorkbox.messageBus;
+
+/**
+ * Required for intellij to not complain regarding `module-info` for a multi-release jar.
+ * This file is completely ignored by the gradle build process
+ */
+public
+class EmptyClass {}

src9/module-info.java

@@ -0,0 +1,17 @@
+module dorkbox.MessageBus {
+    exports dorkbox.messageBus;
+
+    requires transitive dorkbox.classUtils;
+    requires transitive dorkbox.collections;
+    requires transitive dorkbox.updates;
+    requires transitive dorkbox.utilities;
+
+    requires transitive com.conversantmedia.disruptor;
+    requires transitive com.lmax.disruptor;
+    requires transitive org.objectweb.asm;
+    requires transitive com.esotericsoftware.reflectasm;
+
+    requires transitive org.slf4j;
+
+    requires transitive kotlin.stdlib;
+}

test/dorkbox/messagebus/AllTests.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

test/dorkbox/messagebus/AsyncFIFOBusTest.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 import dorkbox.messageBus.MessageBus;
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.common.MessageBusTest;
+import dorkbox.messagebus.common.MessageBusTest;
 
 /**
  * NOTE: the async publication is truly async. There is no guaranteed order to when it's handled.

test/dorkbox/messagebus/DeadMessageTest.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -30,13 +30,13 @@ import org.junit.Test;
 import dorkbox.messageBus.MessageBus;
 import dorkbox.messageBus.annotations.Subscribe;
 import dorkbox.messageBus.error.DeadMessage;
-import dorkbox.util.messagebus.common.ConcurrentExecutor;
+import dorkbox.messagebus.common.ConcurrentExecutor;
-import dorkbox.util.messagebus.common.ListenerFactory;
+import dorkbox.messagebus.common.ListenerFactory;
-import dorkbox.util.messagebus.common.MessageBusTest;
+import dorkbox.messagebus.common.MessageBusTest;
-import dorkbox.util.messagebus.common.TestUtil;
+import dorkbox.messagebus.common.TestUtil;
-import dorkbox.util.messagebus.listeners.IMessageListener;
+import dorkbox.messagebus.listeners.IMessageListener;
-import dorkbox.util.messagebus.listeners.MessageTypesListener;
+import dorkbox.messagebus.listeners.MessageTypesListener;
-import dorkbox.util.messagebus.listeners.ObjectListener;
+import dorkbox.messagebus.listeners.ObjectListener;
 
 /**
  * Verify correct behaviour in case of message publications that do not have any matching subscriptions
@@ -44,7 +44,7 @@ import dorkbox.util.messagebus.listeners.ObjectListener;
  * @author bennidi
  *         Date: 1/18/13
  */
-public class DeadMessageTest extends MessageBusTest{
+public class DeadMessageTest extends MessageBusTest {
 
     private static final AtomicInteger deadMessages = new AtomicInteger(0);
 

test/dorkbox/messagebus/MBassadorTest.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -29,18 +29,18 @@ import org.junit.Test;
 import dorkbox.messageBus.MessageBus;
 import dorkbox.messageBus.error.IPublicationErrorHandler;
 import dorkbox.messageBus.error.PublicationError;
-import dorkbox.util.messagebus.common.ConcurrentExecutor;
+import dorkbox.messagebus.common.ConcurrentExecutor;
-import dorkbox.util.messagebus.common.ListenerFactory;
+import dorkbox.messagebus.common.ListenerFactory;
-import dorkbox.util.messagebus.common.MessageBusTest;
+import dorkbox.messagebus.common.MessageBusTest;
-import dorkbox.util.messagebus.common.MessageManager;
+import dorkbox.messagebus.common.MessageManager;
-import dorkbox.util.messagebus.common.TestUtil;
+import dorkbox.messagebus.common.TestUtil;
-import dorkbox.util.messagebus.listeners.ExceptionThrowingListener;
+import dorkbox.messagebus.listeners.ExceptionThrowingListener;
-import dorkbox.util.messagebus.listeners.IMessageListener;
+import dorkbox.messagebus.listeners.IMessageListener;
-import dorkbox.util.messagebus.listeners.Listeners;
+import dorkbox.messagebus.listeners.Listeners;
-import dorkbox.util.messagebus.listeners.MessageTypesListener;
+import dorkbox.messagebus.listeners.MessageTypesListener;
-import dorkbox.util.messagebus.messages.MessageTypes;
+import dorkbox.messagebus.messages.MessageTypes;
-import dorkbox.util.messagebus.messages.MultipartMessage;
+import dorkbox.messagebus.messages.MultipartMessage;
-import dorkbox.util.messagebus.messages.StandardMessage;
+import dorkbox.messagebus.messages.StandardMessage;
 
 /**
  * Test synchronous and asynchronous dispatch in single and multi-threaded scenario.

test/dorkbox/messagebus/MetadataReaderTest.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import java.io.BufferedReader;
 import java.util.Arrays;
@@ -33,7 +33,7 @@ import org.junit.Test;
 
 import dorkbox.messageBus.annotations.Subscribe;
 import dorkbox.messageBus.common.MessageHandler;
-import dorkbox.util.messagebus.common.AssertSupport;
+import dorkbox.messagebus.common.AssertSupport;
 
 /**
  *

test/dorkbox/messagebus/MethodDispatchTest.java

@@ -20,13 +20,13 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import org.junit.Test;
 
 import dorkbox.messageBus.MessageBus;
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.common.MessageBusTest;
+import dorkbox.messagebus.common.MessageBusTest;
 
 /**
  * Very simple test to verify dispatch to correct message handler
@@ -34,7 +34,7 @@ import dorkbox.util.messagebus.common.MessageBusTest;
  * @author bennidi
  *         Date: 1/17/13
  */
-public class MethodDispatchTest extends MessageBusTest{
+public class MethodDispatchTest extends MessageBusTest {
 
    private boolean listener1Called = false;
    private boolean listener2Called = false;

test/dorkbox/messagebus/MultiMessageTest.java

@@ -1,7 +1,7 @@
 /*
  * Copyright 2015 dorkbox, llc
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -11,7 +11,7 @@ import dorkbox.messageBus.DispatchMode;
 import dorkbox.messageBus.MessageBus;
 import dorkbox.messageBus.SubscriptionMode;
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.common.MessageBusTest;
+import dorkbox.messagebus.common.MessageBusTest;
 
 /**
  * @author dorkbox, llc

test/dorkbox/messagebus/MultiTreeTest.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import org.junit.Test;
 
 import dorkbox.messageBus.common.ClassTree;
 import dorkbox.messageBus.common.MultiClass;
-import dorkbox.util.messagebus.common.AssertSupport;
+import dorkbox.messagebus.common.AssertSupport;
 
 public class MultiTreeTest extends AssertSupport {
 

test/dorkbox/messagebus/SubscriptionManagerTest.java

@@ -20,32 +20,32 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import org.junit.Test;
 
 import dorkbox.messageBus.SubscriptionMode;
 import dorkbox.messageBus.subscription.SubscriptionManager;
-import dorkbox.util.messagebus.common.AssertSupport;
+import dorkbox.messagebus.messages.IMessage;
-import dorkbox.util.messagebus.common.ConcurrentExecutor;
+import dorkbox.messagebus.common.AssertSupport;
-import dorkbox.util.messagebus.common.ListenerFactory;
+import dorkbox.messagebus.common.ConcurrentExecutor;
-import dorkbox.util.messagebus.common.SubscriptionValidator;
+import dorkbox.messagebus.common.ListenerFactory;
-import dorkbox.util.messagebus.common.TestUtil;
+import dorkbox.messagebus.common.SubscriptionValidator;
-import dorkbox.util.messagebus.listeners.AbstractMessageListener;
+import dorkbox.messagebus.common.TestUtil;
-import dorkbox.util.messagebus.listeners.ICountableListener;
+import dorkbox.messagebus.listeners.AbstractMessageListener;
-import dorkbox.util.messagebus.listeners.IMessageListener;
+import dorkbox.messagebus.listeners.ICountableListener;
-import dorkbox.util.messagebus.listeners.IMultipartMessageListener;
+import dorkbox.messagebus.listeners.IMessageListener;
-import dorkbox.util.messagebus.listeners.MessageTypesListener;
+import dorkbox.messagebus.listeners.IMultipartMessageListener;
-import dorkbox.util.messagebus.listeners.MultipartMessageListener;
+import dorkbox.messagebus.listeners.MessageTypesListener;
-import dorkbox.util.messagebus.listeners.Overloading;
+import dorkbox.messagebus.listeners.MultipartMessageListener;
-import dorkbox.util.messagebus.listeners.StandardMessageListener;
+import dorkbox.messagebus.listeners.Overloading;
-import dorkbox.util.messagebus.messages.AbstractMessage;
+import dorkbox.messagebus.listeners.StandardMessageListener;
-import dorkbox.util.messagebus.messages.ICountable;
+import dorkbox.messagebus.messages.AbstractMessage;
-import dorkbox.util.messagebus.messages.IMessage;
+import dorkbox.messagebus.messages.ICountable;
-import dorkbox.util.messagebus.messages.IMultipartMessage;
+import dorkbox.messagebus.messages.IMultipartMessage;
-import dorkbox.util.messagebus.messages.MessageTypes;
+import dorkbox.messagebus.messages.MessageTypes;
-import dorkbox.util.messagebus.messages.MultipartMessage;
+import dorkbox.messagebus.messages.MultipartMessage;
-import dorkbox.util.messagebus.messages.StandardMessage;
+import dorkbox.messagebus.messages.StandardMessage;
 
 /**
  * Test the subscriptions as generated and organized by the subscription manager. Tests use different sets of listeners

test/dorkbox/messagebus/SyncBusTest.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -30,16 +30,16 @@ import org.junit.Test;
 import dorkbox.messageBus.MessageBus;
 import dorkbox.messageBus.error.IPublicationErrorHandler;
 import dorkbox.messageBus.error.PublicationError;
-import dorkbox.util.messagebus.common.ConcurrentExecutor;
+import dorkbox.messagebus.common.ConcurrentExecutor;
-import dorkbox.util.messagebus.common.ListenerFactory;
+import dorkbox.messagebus.common.ListenerFactory;
-import dorkbox.util.messagebus.common.MessageBusTest;
+import dorkbox.messagebus.common.MessageBusTest;
-import dorkbox.util.messagebus.common.TestUtil;
+import dorkbox.messagebus.common.TestUtil;
-import dorkbox.util.messagebus.listeners.ExceptionThrowingListener;
+import dorkbox.messagebus.listeners.ExceptionThrowingListener;
-import dorkbox.util.messagebus.listeners.IMessageListener;
+import dorkbox.messagebus.listeners.IMessageListener;
-import dorkbox.util.messagebus.listeners.MessageTypesListener;
+import dorkbox.messagebus.listeners.MessageTypesListener;
-import dorkbox.util.messagebus.messages.MessageTypes;
+import dorkbox.messagebus.messages.MessageTypes;
-import dorkbox.util.messagebus.messages.MultipartMessage;
+import dorkbox.messagebus.messages.MultipartMessage;
-import dorkbox.util.messagebus.messages.StandardMessage;
+import dorkbox.messagebus.messages.StandardMessage;
 
 /**
  * Test synchronous and asynchronous dispatch in single and multi-threaded scenario.

test/dorkbox/messagebus/SynchronizedHandlerTest.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus;
+package dorkbox.messagebus;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -30,7 +30,7 @@ import org.junit.Test;
 import dorkbox.messageBus.MessageBus;
 import dorkbox.messageBus.annotations.Subscribe;
 import dorkbox.messageBus.annotations.Synchronized;
-import dorkbox.util.messagebus.common.MessageBusTest;
+import dorkbox.messagebus.common.MessageBusTest;
 
 /**
  * Todo: Add javadoc

test/dorkbox/messagebus/common/AssertSupport.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.common;
+package dorkbox.messagebus.common;
 
 import org.junit.After;
 import org.junit.Assert;

test/dorkbox/messagebus/common/ConcurrentExecutor.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.common;
+package dorkbox.messagebus.common;
 
 import java.util.ArrayList;
 import java.util.List;

test/dorkbox/messagebus/common/ListenerFactory.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.common;
+package dorkbox.messagebus.common;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;

test/dorkbox/messagebus/common/MessageBusTest.java

@@ -20,14 +20,14 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.common;
+package dorkbox.messagebus.common;
 
 import org.junit.Before;
 
 import dorkbox.messageBus.MessageBus;
 import dorkbox.messageBus.error.IPublicationErrorHandler;
 import dorkbox.messageBus.error.PublicationError;
-import dorkbox.util.messagebus.messages.MessageTypes;
+import dorkbox.messagebus.messages.MessageTypes;
 
 /**
  * A base test that provides a factory for message bus that makes tests fail if any

test/dorkbox/messagebus/common/MessageManager.java

@@ -20,9 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.common;
+package dorkbox.messagebus.common;
+
+import dorkbox.messagebus.messages.IMessage;
 
-import dorkbox.util.messagebus.messages.IMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

test/dorkbox/messagebus/common/SubscriptionValidator.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.common;
+package dorkbox.messagebus.common;
 
 import java.util.ArrayDeque;
 import java.util.Arrays;

test/dorkbox/messagebus/common/TestUtil.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.common;
+package dorkbox.messagebus.common;
 
 import java.util.Iterator;
 import java.util.List;

test/dorkbox/messagebus/listeners/AbstractMessageListener.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.AbstractMessage;
+import dorkbox.messagebus.messages.AbstractMessage;
 
 /**
  * @author bennidi

test/dorkbox/messagebus/listeners/ExceptionThrowingListener.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.StandardMessage;
+import dorkbox.messagebus.messages.StandardMessage;
 
 /**
  * @author bennidi

test/dorkbox/messagebus/listeners/ICountableListener.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.ICountable;
+import dorkbox.messagebus.messages.ICountable;
 
 /**
  *

test/dorkbox/messagebus/listeners/IMessageListener.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.IMessage;
+import dorkbox.messagebus.messages.IMessage;
 
 /**
  *

test/dorkbox/messagebus/listeners/IMultipartMessageListener.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.IMultipartMessage;
+import dorkbox.messagebus.messages.IMultipartMessage;
 
 /**
  *

test/dorkbox/messagebus/listeners/Listeners.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import java.util.Arrays;
 import java.util.Collection;

test/dorkbox/messagebus/listeners/MessageTypesListener.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.MessageTypes;
+import dorkbox.messagebus.messages.MessageTypes;
 
 /**
  * @author bennidi

test/dorkbox/messagebus/listeners/MultipartMessageListener.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.MultipartMessage;
+import dorkbox.messagebus.messages.MultipartMessage;
 
 /**
  * @author bennidi

test/dorkbox/messagebus/listeners/ObjectListener.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import java.util.Collections;
 import java.util.LinkedList;

test/dorkbox/messagebus/listeners/Overloading.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.AbstractMessage;
+import dorkbox.messagebus.messages.AbstractMessage;
 
 /**
  * Some handlers and message types to test correct functioning of overloaded message handlers

test/dorkbox/messagebus/listeners/StandardMessageListener.java

@@ -20,10 +20,10 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.listeners;
+package dorkbox.messagebus.listeners;
 
 import dorkbox.messageBus.annotations.Subscribe;
-import dorkbox.util.messagebus.messages.StandardMessage;
+import dorkbox.messagebus.messages.StandardMessage;
 
 /**
  *

test/dorkbox/messagebus/messages/AbstractMessage.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 import java.util.HashMap;
 import java.util.Map;

test/dorkbox/messagebus/messages/CountableMessage.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 /**
  *

test/dorkbox/messagebus/messages/ICountable.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 /**
  * Interface analogous to IMessage. Exists to test more complex class/interface hierarchies

test/dorkbox/messagebus/messages/IMessage.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 /**
  *

test/dorkbox/messagebus/messages/IMultipartMessage.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 /**
  *

test/dorkbox/messagebus/messages/MessageTypes.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 import java.util.HashMap;
 import java.util.Map;

test/dorkbox/messagebus/messages/MultipartMessage.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 /**
  *

test/dorkbox/messagebus/messages/StandardMessage.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 /**
  * @author bennidi

test/dorkbox/messagebus/messages/SubTestMessage.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 /**
  *

test/dorkbox/messagebus/messages/TestMessage.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package dorkbox.util.messagebus.messages;
+package dorkbox.messagebus.messages;
 
 import java.util.concurrent.atomic.AtomicInteger;