From d230347584ab38b989320e591dbe873e43985392 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 10 Feb 2016 19:04:08 +0100 Subject: [PATCH] Code cleanup --- src/dorkbox/messagebus/MessageBus.java | 4 ++-- src/dorkbox/messagebus/common/ClassTree.java | 1 - src/dorkbox/messagebus/subscription/SubscriptionFactory.java | 2 +- src/dorkbox/messagebus/subscription/asm/AsmFactory.java | 2 +- src/dorkbox/messagebus/synchrony/AsyncABQ.java | 3 +-- src/dorkbox/messagebus/synchrony/AsyncABQ_noGc.java | 3 +-- src/dorkbox/messagebus/synchrony/AsyncDisruptor.java | 2 +- test/dorkbox/util/messagebus/DeadMessageTest.java | 1 - test/dorkbox/util/messagebus/MetadataReaderTest.java | 2 -- test/dorkbox/util/messagebus/MultiMessageTest.java | 1 - 10 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/dorkbox/messagebus/MessageBus.java b/src/dorkbox/messagebus/MessageBus.java index 69dd6ef..bf74be8 100644 --- a/src/dorkbox/messagebus/MessageBus.java +++ b/src/dorkbox/messagebus/MessageBus.java @@ -173,11 +173,11 @@ class MessageBus implements IMessageBus { } else { if (useZeroGarbageVersionOfABQ) { // no garbage is created, but this is slow (but faster than other messagebus implementations) - asyncPublication = new AsyncABQ_noGc(numberOfThreads, errorHandler, syncPublication); + asyncPublication = new AsyncABQ_noGc(numberOfThreads, errorHandler); } else { // garbage is created, but this is fast - asyncPublication = new AsyncABQ(numberOfThreads, errorHandler, syncPublication); + asyncPublication = new AsyncABQ(numberOfThreads, errorHandler); } } } diff --git a/src/dorkbox/messagebus/common/ClassTree.java b/src/dorkbox/messagebus/common/ClassTree.java index b0e4b17..755e0ff 100644 --- a/src/dorkbox/messagebus/common/ClassTree.java +++ b/src/dorkbox/messagebus/common/ClassTree.java @@ -114,7 +114,6 @@ public class ClassTree { * @param key the key for the new child * @return the existing (or new) leaf */ - @SuppressWarnings("unchecked") private ClassTree getOrCreateLeaf(KEY key) { if (key == null) { diff --git a/src/dorkbox/messagebus/subscription/SubscriptionFactory.java b/src/dorkbox/messagebus/subscription/SubscriptionFactory.java index e22dc0b..0557e6d 100644 --- a/src/dorkbox/messagebus/subscription/SubscriptionFactory.java +++ b/src/dorkbox/messagebus/subscription/SubscriptionFactory.java @@ -22,5 +22,5 @@ import dorkbox.messagebus.common.MessageHandler; */ public interface SubscriptionFactory { - Subscription create(final Class listenerClass, final MessageHandler handler); + Subscription create(final Class listenerClass, final MessageHandler handler); } diff --git a/src/dorkbox/messagebus/subscription/asm/AsmFactory.java b/src/dorkbox/messagebus/subscription/asm/AsmFactory.java index fc0f86a..9ec70fc 100644 --- a/src/dorkbox/messagebus/subscription/asm/AsmFactory.java +++ b/src/dorkbox/messagebus/subscription/asm/AsmFactory.java @@ -34,7 +34,7 @@ class AsmFactory implements SubscriptionFactory { @Override public - Subscription create(final Class listenerClass, final MessageHandler handler) { + Subscription create(final Class listenerClass, final MessageHandler handler) { // figure out what kind of references we want to use by default, as specified by MessageBus.useStrongReferencesByDefault final int referenceType = handler.getReferenceType(); if (referenceType == MessageHandler.UNDEFINED) { diff --git a/src/dorkbox/messagebus/synchrony/AsyncABQ.java b/src/dorkbox/messagebus/synchrony/AsyncABQ.java index 993191c..fca5edf 100644 --- a/src/dorkbox/messagebus/synchrony/AsyncABQ.java +++ b/src/dorkbox/messagebus/synchrony/AsyncABQ.java @@ -54,7 +54,7 @@ class AsyncABQ implements Synchrony { public - AsyncABQ(final int numberOfThreads, final ErrorHandler errorHandler, final Synchrony syncPublication) { + AsyncABQ(final int numberOfThreads, final ErrorHandler errorHandler) { this.errorHandler = errorHandler; this.dispatchQueue = new ArrayBlockingQueue(1024); @@ -66,7 +66,6 @@ class AsyncABQ implements Synchrony { public void run() { final ArrayBlockingQueue IN_QUEUE = AsyncABQ.this.dispatchQueue; - final Synchrony syncPublication1 = syncPublication; final ErrorHandler errorHandler1 = errorHandler; while (!AsyncABQ.this.shuttingDown) { diff --git a/src/dorkbox/messagebus/synchrony/AsyncABQ_noGc.java b/src/dorkbox/messagebus/synchrony/AsyncABQ_noGc.java index 03f4a7e..6aded60 100644 --- a/src/dorkbox/messagebus/synchrony/AsyncABQ_noGc.java +++ b/src/dorkbox/messagebus/synchrony/AsyncABQ_noGc.java @@ -58,7 +58,7 @@ class AsyncABQ_noGc implements Synchrony { public - AsyncABQ_noGc(final int numberOfThreads, final ErrorHandler errorHandler, final Synchrony syncPublication) { + AsyncABQ_noGc(final int numberOfThreads, final ErrorHandler errorHandler) { this.errorHandler = errorHandler; this.dispatchQueue = new ArrayBlockingQueue(1024); @@ -78,7 +78,6 @@ class AsyncABQ_noGc implements Synchrony { final ArrayBlockingQueue IN_QUEUE = AsyncABQ_noGc.this.dispatchQueue; final ArrayBlockingQueue OUT_QUEUE = AsyncABQ_noGc.this.gcQueue; - final Synchrony syncPublication1 = syncPublication; final ErrorHandler errorHandler1 = errorHandler; while (!AsyncABQ_noGc.this.shuttingDown) { diff --git a/src/dorkbox/messagebus/synchrony/AsyncDisruptor.java b/src/dorkbox/messagebus/synchrony/AsyncDisruptor.java index 1b3bed8..7d1a3c2 100644 --- a/src/dorkbox/messagebus/synchrony/AsyncDisruptor.java +++ b/src/dorkbox/messagebus/synchrony/AsyncDisruptor.java @@ -48,7 +48,7 @@ import java.util.concurrent.locks.LockSupport; public final class AsyncDisruptor implements Synchrony { - private final WorkProcessor[] workProcessors; + private final WorkProcessor[] workProcessors; private final MessageHandler[] handlers; private final RingBuffer ringBuffer; private final Sequence workSequence; diff --git a/test/dorkbox/util/messagebus/DeadMessageTest.java b/test/dorkbox/util/messagebus/DeadMessageTest.java index f48ef30..84093fd 100644 --- a/test/dorkbox/util/messagebus/DeadMessageTest.java +++ b/test/dorkbox/util/messagebus/DeadMessageTest.java @@ -125,7 +125,6 @@ public class DeadMessageTest extends MessageBusTest{ } public static class DeadMessagHandler { - @SuppressWarnings("unused") @Handler public void handle(DeadMessage message){ deadMessages.incrementAndGet(); diff --git a/test/dorkbox/util/messagebus/MetadataReaderTest.java b/test/dorkbox/util/messagebus/MetadataReaderTest.java index 6cf8e17..ece2636 100644 --- a/test/dorkbox/util/messagebus/MetadataReaderTest.java +++ b/test/dorkbox/util/messagebus/MetadataReaderTest.java @@ -164,7 +164,6 @@ public class MetadataReaderTest extends AssertSupport { } // a simple event listener - @SuppressWarnings("unused") public class MessageListener1 { @Handler(acceptSubtypes = false) @@ -231,7 +230,6 @@ public class MetadataReaderTest extends AssertSupport { validator.check(allHandlers); } - @SuppressWarnings("unused") public class MultiMessageListener1 { @Handler public void handleString1(String s) {} diff --git a/test/dorkbox/util/messagebus/MultiMessageTest.java b/test/dorkbox/util/messagebus/MultiMessageTest.java index 56e5b45..89c69f4 100644 --- a/test/dorkbox/util/messagebus/MultiMessageTest.java +++ b/test/dorkbox/util/messagebus/MultiMessageTest.java @@ -82,7 +82,6 @@ public class MultiMessageTest extends MessageBusTest { count.set(0); } - @SuppressWarnings("unused") public static class MultiListener { @Handler public void handleSync(Object o) {