From 9eacace23039d93416bfd0bce8417447fa5d2fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Risti=C4=87?= Date: Thu, 13 Dec 2012 15:12:18 +0100 Subject: [PATCH 1/4] Update src/main/java/org/mbassy/MBassador.java Removing "unchecked call" warnings. --- src/main/java/org/mbassy/MBassador.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mbassy/MBassador.java b/src/main/java/org/mbassy/MBassador.java index ea5afeb..c021d6f 100644 --- a/src/main/java/org/mbassy/MBassador.java +++ b/src/main/java/org/mbassy/MBassador.java @@ -44,8 +44,8 @@ public class MBassador extends AbstractMessageBus> @Override - public SyncAsyncPostCommand post(T message) { - return new SyncAsyncPostCommand(this, message); + public SyncAsyncPostCommand post(T message) { + return new SyncAsyncPostCommand(this, message); } } From 11c337d512297085fc8baef3d06d3adbdb36ceb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Risti=C4=87?= Date: Thu, 13 Dec 2012 15:13:05 +0100 Subject: [PATCH 2/4] Update src/main/java/org/mbassy/SyncAsyncPostCommand.java Removing "unchecked call" warnings. --- src/main/java/org/mbassy/SyncAsyncPostCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mbassy/SyncAsyncPostCommand.java b/src/main/java/org/mbassy/SyncAsyncPostCommand.java index e1ae3cc..a750518 100644 --- a/src/main/java/org/mbassy/SyncAsyncPostCommand.java +++ b/src/main/java/org/mbassy/SyncAsyncPostCommand.java @@ -9,9 +9,9 @@ package org.mbassy; public class SyncAsyncPostCommand implements IMessageBus.IPostCommand { private T message; - private MBassador mBassador; + private MBassador mBassador; - public SyncAsyncPostCommand(MBassador mBassador, T message) { + public SyncAsyncPostCommand(MBassador mBassador, T message) { this.mBassador = mBassador; this.message = message; } From 87557a1a0d69fd2720fbf410540c38491ff0b69a Mon Sep 17 00:00:00 2001 From: Konstantin Larionov Date: Fri, 14 Dec 2012 14:10:37 +0400 Subject: [PATCH 3/4] Removed unused import Removed import com.sun.xml.internal.messaging.saaj.soap.Envelope from the org.mbassy.listener.MetadataReader. --- src/main/java/org/mbassy/listener/MetadataReader.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/mbassy/listener/MetadataReader.java b/src/main/java/org/mbassy/listener/MetadataReader.java index 6ac1b8f..015ce0c 100644 --- a/src/main/java/org/mbassy/listener/MetadataReader.java +++ b/src/main/java/org/mbassy/listener/MetadataReader.java @@ -1,6 +1,5 @@ package org.mbassy.listener; -import com.sun.xml.internal.messaging.saaj.soap.Envelope; import org.mbassy.common.IPredicate; import org.mbassy.common.ReflectionUtils; import org.mbassy.subscription.MessageEnvelope; From 4d617a2f854d8f6fa7aa3784d97858b43978d00a Mon Sep 17 00:00:00 2001 From: Konstantin Larionov Date: Sat, 15 Dec 2012 00:30:23 +0400 Subject: [PATCH 4/4] Organized imports to reduce number of warnings in some IDEs/CodeCheckers: removed unused, replaced several * imports with exact --- src/main/java/org/mbassy/MBassador.java | 6 +++--- .../java/org/mbassy/common/ConcurrentSet.java | 1 - .../org/mbassy/common/ReflectionUtils.java | 1 - .../AsynchronousHandlerInvocation.java | 5 ----- .../mbassy/dispatch/IMessageDispatcher.java | 1 - .../mbassy/dispatch/MessageDispatcher.java | 5 ++--- .../org/mbassy/subscription/Subscription.java | 16 ++++---------- .../SubscriptionDeliveryRequest.java | 1 - .../subscription/SubscriptionFactory.java | 14 +++++++------ src/test/java/org/mbassy/FilterTest.java | 8 +++---- src/test/java/org/mbassy/MBassadorTest.java | 21 +++++++++++-------- .../mbassy/listeners/MultiEventHandler.java | 7 +++++-- .../mbassy/listeners/NonListeningBean.java | 2 -- 13 files changed, 38 insertions(+), 50 deletions(-) diff --git a/src/main/java/org/mbassy/MBassador.java b/src/main/java/org/mbassy/MBassador.java index c021d6f..c0f3396 100644 --- a/src/main/java/org/mbassy/MBassador.java +++ b/src/main/java/org/mbassy/MBassador.java @@ -1,9 +1,9 @@ package org.mbassy; -import org.mbassy.subscription.*; +import java.util.Collection; -import java.util.*; -import java.util.concurrent.*; +import org.mbassy.subscription.Subscription; +import org.mbassy.subscription.SubscriptionDeliveryRequest; public class MBassador extends AbstractMessageBus>{ diff --git a/src/main/java/org/mbassy/common/ConcurrentSet.java b/src/main/java/org/mbassy/common/ConcurrentSet.java index 84c90a6..1e16449 100644 --- a/src/main/java/org/mbassy/common/ConcurrentSet.java +++ b/src/main/java/org/mbassy/common/ConcurrentSet.java @@ -3,7 +3,6 @@ package org.mbassy.common; import java.lang.ref.WeakReference; import java.util.Iterator; -import java.util.Set; import java.util.WeakHashMap; /** diff --git a/src/main/java/org/mbassy/common/ReflectionUtils.java b/src/main/java/org/mbassy/common/ReflectionUtils.java index f68c5e0..c855710 100644 --- a/src/main/java/org/mbassy/common/ReflectionUtils.java +++ b/src/main/java/org/mbassy/common/ReflectionUtils.java @@ -1,7 +1,6 @@ package org.mbassy.common; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/org/mbassy/dispatch/AsynchronousHandlerInvocation.java b/src/main/java/org/mbassy/dispatch/AsynchronousHandlerInvocation.java index fdbe5e7..90f1b88 100644 --- a/src/main/java/org/mbassy/dispatch/AsynchronousHandlerInvocation.java +++ b/src/main/java/org/mbassy/dispatch/AsynchronousHandlerInvocation.java @@ -1,11 +1,6 @@ package org.mbassy.dispatch; -import org.mbassy.IPublicationErrorHandler; -import org.mbassy.PublicationError; - -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Collection; /** * This invocation will schedule the wrapped (decorated) invocation to be executed asynchronously diff --git a/src/main/java/org/mbassy/dispatch/IMessageDispatcher.java b/src/main/java/org/mbassy/dispatch/IMessageDispatcher.java index 132eb05..b8309af 100644 --- a/src/main/java/org/mbassy/dispatch/IMessageDispatcher.java +++ b/src/main/java/org/mbassy/dispatch/IMessageDispatcher.java @@ -1,7 +1,6 @@ package org.mbassy.dispatch; import org.mbassy.common.ConcurrentSet; -import org.mbassy.subscription.Subscription; /** * A message dispatcher provides the functionality to deliver a single message diff --git a/src/main/java/org/mbassy/dispatch/MessageDispatcher.java b/src/main/java/org/mbassy/dispatch/MessageDispatcher.java index c9f133f..1124c9c 100644 --- a/src/main/java/org/mbassy/dispatch/MessageDispatcher.java +++ b/src/main/java/org/mbassy/dispatch/MessageDispatcher.java @@ -1,10 +1,9 @@ package org.mbassy.dispatch; -import org.mbassy.common.ConcurrentSet; -import org.mbassy.subscription.Subscription; - import java.lang.reflect.Method; +import org.mbassy.common.ConcurrentSet; + /** * Standard implementation for direct, unfiltered message delivery. * diff --git a/src/main/java/org/mbassy/subscription/Subscription.java b/src/main/java/org/mbassy/subscription/Subscription.java index f744701..84cd52a 100644 --- a/src/main/java/org/mbassy/subscription/Subscription.java +++ b/src/main/java/org/mbassy/subscription/Subscription.java @@ -1,20 +1,12 @@ package org.mbassy.subscription; -import org.mbassy.IMessageBus; -import org.mbassy.IPublicationErrorHandler; -import org.mbassy.common.ConcurrentSet; -import org.mbassy.PublicationError; -import org.mbassy.dispatch.IMessageDispatcher; -import org.mbassy.dispatch.MessagingContext; -import org.mbassy.listener.MessageHandlerMetadata; - -import javax.xml.ws.handler.MessageContext; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Collection; import java.util.Comparator; import java.util.UUID; +import org.mbassy.common.ConcurrentSet; +import org.mbassy.dispatch.IMessageDispatcher; +import org.mbassy.dispatch.MessagingContext; + /** * A subscription is a thread safe container for objects that contain message handlers */ diff --git a/src/main/java/org/mbassy/subscription/SubscriptionDeliveryRequest.java b/src/main/java/org/mbassy/subscription/SubscriptionDeliveryRequest.java index 2c58ad4..6c93588 100644 --- a/src/main/java/org/mbassy/subscription/SubscriptionDeliveryRequest.java +++ b/src/main/java/org/mbassy/subscription/SubscriptionDeliveryRequest.java @@ -1,7 +1,6 @@ package org.mbassy.subscription; import java.util.Collection; -import java.util.LinkedList; /** * @author bennidi diff --git a/src/main/java/org/mbassy/subscription/SubscriptionFactory.java b/src/main/java/org/mbassy/subscription/SubscriptionFactory.java index cfdf00d..b0f1514 100644 --- a/src/main/java/org/mbassy/subscription/SubscriptionFactory.java +++ b/src/main/java/org/mbassy/subscription/SubscriptionFactory.java @@ -1,11 +1,13 @@ package org.mbassy.subscription; -import org.mbassy.IMessageBus; -import org.mbassy.IPublicationErrorHandler; -import org.mbassy.dispatch.*; -import org.mbassy.listener.MessageHandlerMetadata; - -import java.util.Collection; +import org.mbassy.dispatch.AsynchronousHandlerInvocation; +import org.mbassy.dispatch.EnvelopedMessageDispatcher; +import org.mbassy.dispatch.FilteredMessageDispatcher; +import org.mbassy.dispatch.IHandlerInvocation; +import org.mbassy.dispatch.IMessageDispatcher; +import org.mbassy.dispatch.MessageDispatcher; +import org.mbassy.dispatch.MessagingContext; +import org.mbassy.dispatch.ReflectiveHandlerInvocation; /** * Created with IntelliJ IDEA. diff --git a/src/test/java/org/mbassy/FilterTest.java b/src/test/java/org/mbassy/FilterTest.java index cafa354..86e3e42 100644 --- a/src/test/java/org/mbassy/FilterTest.java +++ b/src/test/java/org/mbassy/FilterTest.java @@ -1,15 +1,15 @@ package org.mbassy; +import java.util.List; + import org.junit.Test; import org.mbassy.events.SubTestEvent; import org.mbassy.events.TestEvent; import org.mbassy.listener.Filter; import org.mbassy.listener.Filters; -import org.mbassy.listener.IMessageFilter; import org.mbassy.listener.Listener; -import org.mbassy.listeners.*; - -import java.util.List; +import org.mbassy.listeners.ListenerFactory; +import org.mbassy.listeners.NonListeningBean; /** * Testing of filter functionality diff --git a/src/test/java/org/mbassy/MBassadorTest.java b/src/test/java/org/mbassy/MBassadorTest.java index 5e74760..d15bd3e 100644 --- a/src/test/java/org/mbassy/MBassadorTest.java +++ b/src/test/java/org/mbassy/MBassadorTest.java @@ -1,19 +1,22 @@ package org.mbassy; -import org.junit.Before; -import org.junit.Test; -import org.mbassy.events.SubTestEvent; -import org.mbassy.events.TestEvent; -import org.mbassy.events.TestEvent2; -import org.mbassy.listeners.*; -import org.mbassy.subscription.Subscription; - -import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.junit.Test; +import org.mbassy.events.SubTestEvent; +import org.mbassy.events.TestEvent; +import org.mbassy.events.TestEvent2; +import org.mbassy.listeners.EventingTestBean; +import org.mbassy.listeners.EventingTestBean2; +import org.mbassy.listeners.EventingTestBean3; +import org.mbassy.listeners.ListenerFactory; +import org.mbassy.listeners.MultiEventHandler; +import org.mbassy.listeners.NonListeningBean; +import org.mbassy.subscription.Subscription; + /** * Test synchronous and asynchronous dispatch in single and multi-threaded scenario. * diff --git a/src/test/java/org/mbassy/listeners/MultiEventHandler.java b/src/test/java/org/mbassy/listeners/MultiEventHandler.java index fd032af..85cd38b 100644 --- a/src/test/java/org/mbassy/listeners/MultiEventHandler.java +++ b/src/test/java/org/mbassy/listeners/MultiEventHandler.java @@ -1,9 +1,12 @@ package org.mbassy.listeners; -import org.mbassy.events.SubTestEvent; import org.mbassy.events.TestEvent; import org.mbassy.events.TestEvent2; -import org.mbassy.listener.*; +import org.mbassy.listener.Enveloped; +import org.mbassy.listener.Filter; +import org.mbassy.listener.Filters; +import org.mbassy.listener.Listener; +import org.mbassy.listener.Mode; import org.mbassy.subscription.MessageEnvelope; /** diff --git a/src/test/java/org/mbassy/listeners/NonListeningBean.java b/src/test/java/org/mbassy/listeners/NonListeningBean.java index 2905590..dd2ecb3 100644 --- a/src/test/java/org/mbassy/listeners/NonListeningBean.java +++ b/src/test/java/org/mbassy/listeners/NonListeningBean.java @@ -2,8 +2,6 @@ package org.mbassy.listeners; import org.mbassy.events.SubTestEvent; import org.mbassy.events.TestEvent; -import org.mbassy.listener.Listener; -import org.mbassy.listener.Mode; /** * This bean overrides all the handlers defined in its superclass. Since it does not specify any annotations