Renamed to MessageBus. Code cleanup
This commit is contained in:
parent
31e9fe84b3
commit
fa0319cdc3
|
@ -3,6 +3,7 @@ package dorkbox.util.messagebus.common;
|
|||
import com.esotericsoftware.reflectasm.MethodAccess;
|
||||
import dorkbox.util.messagebus.annotations.Handler;
|
||||
import dorkbox.util.messagebus.annotations.Synchronized;
|
||||
import dorkbox.util.messagebus.utils.ReflectionUtils;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
|
|
|
@ -44,10 +44,12 @@ public class NamedThreadFactory implements ThreadFactory {
|
|||
if (stackSize.endsWith("k")) {
|
||||
stackSize = stackSize.substring(4, stackSize.length() - 1);
|
||||
value = Integer.parseInt(stackSize) * 1024;
|
||||
} else if (stackSize.endsWith("m")) {
|
||||
}
|
||||
else if (stackSize.endsWith("m")) {
|
||||
stackSize = stackSize.substring(4, stackSize.length() - 1);
|
||||
value = Integer.parseInt(stackSize) * 1024 * 1024;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
try {
|
||||
value = Integer.parseInt(stackSize.substring(4));
|
||||
} catch (Exception e) {
|
||||
|
@ -55,7 +57,8 @@ public class NamedThreadFactory implements ThreadFactory {
|
|||
}
|
||||
|
||||
stackSizeForThreads = value;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
stackSizeForThreads = 8192;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,12 @@
|
|||
package dorkbox.util.messagebus.subscription;
|
||||
|
||||
import dorkbox.util.messagebus.common.*;
|
||||
import dorkbox.util.messagebus.common.ConcurrentHashMapV8;
|
||||
import dorkbox.util.messagebus.common.DeadMessage;
|
||||
import dorkbox.util.messagebus.common.HashMapTree;
|
||||
import dorkbox.util.messagebus.common.MessageHandler;
|
||||
import dorkbox.util.messagebus.utils.ClassUtils;
|
||||
import dorkbox.util.messagebus.utils.SubscriptionUtils;
|
||||
import dorkbox.util.messagebus.utils.VarArgUtils;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.util.ArrayList;
|
||||
|
|
|
@ -57,8 +57,7 @@ public class ReflectionUtils {
|
|||
while (!current.equals(overridingMethod.getDeclaringClass())) {
|
||||
try {
|
||||
return current.getDeclaredMethod(overridingMethod.getName(), overridingMethod.getParameterTypes());
|
||||
}
|
||||
catch ( NoSuchMethodException e ) {
|
||||
} catch (NoSuchMethodException e) {
|
||||
current = current.getSuperclass();
|
||||
}
|
||||
}
|
||||
|
@ -119,7 +118,8 @@ public class ReflectionUtils {
|
|||
* @param <A> Class of annotation type
|
||||
* @return Annotation instance or null
|
||||
*/
|
||||
private static <A extends Annotation> A getAnnotation(AnnotatedElement from, Class<A> annotationType, Collection<AnnotatedElement> visited) {
|
||||
private static <A extends Annotation> A getAnnotation(AnnotatedElement from, Class<A> annotationType,
|
||||
Collection<AnnotatedElement> visited) {
|
||||
if (visited.contains(from)) {
|
||||
return null;
|
||||
}
|
||||
|
@ -147,9 +147,9 @@ public class ReflectionUtils {
|
|||
// if the declaring classes are the same or the subclass method is not defined in the subclass
|
||||
// hierarchy of the given superclass method or the method names are not the same then
|
||||
// subclassMethod does not override superclassMethod
|
||||
if ( superclassMethod.getDeclaringClass().equals(subclassMethod.getDeclaringClass() )
|
||||
|| !superclassMethod.getDeclaringClass().isAssignableFrom( subclassMethod.getDeclaringClass() )
|
||||
|| !superclassMethod.getName().equals(subclassMethod.getName())) {
|
||||
if (superclassMethod.getDeclaringClass().equals(subclassMethod.getDeclaringClass()) ||
|
||||
!superclassMethod.getDeclaringClass().isAssignableFrom(subclassMethod.getDeclaringClass()) ||
|
||||
!superclassMethod.getName().equals(subclassMethod.getName())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@ import dorkbox.util.messagebus.common.HashMapTree;
|
|||
import dorkbox.util.messagebus.common.thread.ClassHolder;
|
||||
import dorkbox.util.messagebus.common.thread.SubscriptionHolder;
|
||||
import dorkbox.util.messagebus.subscription.Subscription;
|
||||
import dorkbox.util.messagebus.utils.ClassUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Map;
|
||||
|
|
|
@ -80,7 +80,6 @@ public final class VarArgUtils {
|
|||
|
||||
|
||||
|
||||
|
||||
// CAN NOT RETURN NULL
|
||||
// check to see if the messageType can convert/publish to the "array" superclass version, without the hit to JNI
|
||||
// and then, returns the array'd version superclass subscriptions
|
||||
|
|
|
@ -17,7 +17,7 @@ public class AsyncFIFOBusTest extends MessageBusTest {
|
|||
@Test
|
||||
public void testSingleThreadedSyncFIFO(){
|
||||
// create a fifo bus with 1000 concurrently subscribed listeners
|
||||
IMessageBus fifoBUs = new MultiMBassador();
|
||||
IMessageBus fifoBUs = new MessageBus();
|
||||
fifoBUs.start();
|
||||
|
||||
List<Listener> listeners = new LinkedList<Listener>();
|
||||
|
@ -53,7 +53,7 @@ public class AsyncFIFOBusTest extends MessageBusTest {
|
|||
@Test
|
||||
public void testSingleThreadedSyncAsyncFIFO(){
|
||||
// create a fifo bus with 1000 concurrently subscribed listeners
|
||||
IMessageBus fifoBUs = new MultiMBassador(1);
|
||||
IMessageBus fifoBUs = new MessageBus(1);
|
||||
|
||||
List<Listener> listeners = new LinkedList<Listener>();
|
||||
for(int i = 0; i < 1000 ; i++){
|
||||
|
|
|
@ -1,19 +1,13 @@
|
|||
package dorkbox.util.messagebus;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Inherited;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import dorkbox.util.messagebus.MultiMBassador;
|
||||
import dorkbox.util.messagebus.annotations.Handler;
|
||||
import dorkbox.util.messagebus.annotations.Synchronized;
|
||||
import dorkbox.util.messagebus.common.MessageBusTest;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Tests a custom handler annotation with a @Handler meta annotation and a default filter.
|
||||
|
@ -95,7 +89,7 @@ public class CustomHandlerAnnotationTest extends MessageBusTest
|
|||
|
||||
@Test
|
||||
public void testMetaHandlerFiltering() {
|
||||
MultiMBassador bus = createBus();
|
||||
MessageBus bus = createBus();
|
||||
|
||||
NamedMessageListener listener = new NamedMessageListener();
|
||||
bus.subscribe( listener );
|
||||
|
|
|
@ -1,20 +1,14 @@
|
|||
package dorkbox.util.messagebus;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import dorkbox.util.messagebus.MultiMBassador;
|
||||
import dorkbox.util.messagebus.annotations.Handler;
|
||||
import dorkbox.util.messagebus.common.ConcurrentExecutor;
|
||||
import dorkbox.util.messagebus.common.DeadMessage;
|
||||
import dorkbox.util.messagebus.common.ListenerFactory;
|
||||
import dorkbox.util.messagebus.common.MessageBusTest;
|
||||
import dorkbox.util.messagebus.common.TestUtil;
|
||||
import dorkbox.util.messagebus.common.*;
|
||||
import dorkbox.util.messagebus.listeners.IMessageListener;
|
||||
import dorkbox.util.messagebus.listeners.MessagesListener;
|
||||
import dorkbox.util.messagebus.listeners.ObjectListener;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
/**
|
||||
* Verify correct behaviour in case of message publications that do not have any matching subscriptions
|
||||
|
@ -35,7 +29,7 @@ public class DeadMessageTest extends MessageBusTest{
|
|||
|
||||
@Test
|
||||
public void testDeadMessage(){
|
||||
final MultiMBassador bus = createBus();
|
||||
final MessageBus bus = createBus();
|
||||
ListenerFactory listeners = new ListenerFactory()
|
||||
.create(InstancesPerListener, IMessageListener.DefaultListener.class)
|
||||
.create(InstancesPerListener, IMessageListener.DisabledListener.class)
|
||||
|
@ -71,7 +65,7 @@ public class DeadMessageTest extends MessageBusTest{
|
|||
|
||||
@Test
|
||||
public void testUnsubscribingAllListeners() {
|
||||
final MultiMBassador bus = createBus();
|
||||
final MessageBus bus = createBus();
|
||||
ListenerFactory deadMessageListener = new ListenerFactory()
|
||||
.create(InstancesPerListener, DeadMessagHandler.class);
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ public class MBassadorTest extends MessageBusTest {
|
|||
ListenerFactory listeners = new ListenerFactory()
|
||||
.create(InstancesPerListener, Listeners.synchronous())
|
||||
.create(InstancesPerListener, Listeners.noHandlers());
|
||||
final MultiMBassador bus = createBus(listeners);
|
||||
final MessageBus bus = createBus(listeners);
|
||||
|
||||
|
||||
Runnable publishAndCheck = new Runnable() {
|
||||
|
@ -63,7 +63,7 @@ public class MBassadorTest extends MessageBusTest {
|
|||
|
||||
ListenerFactory listeners = new ListenerFactory()
|
||||
.create(InstancesPerListener, Listeners.noHandlers());
|
||||
final MultiMBassador bus = createBus(listeners);
|
||||
final MessageBus bus = createBus(listeners);
|
||||
|
||||
|
||||
final MessageManager messageManager = new MessageManager();
|
||||
|
@ -100,7 +100,7 @@ public class MBassadorTest extends MessageBusTest {
|
|||
}
|
||||
};
|
||||
|
||||
final MultiMBassador bus = new MultiMBassador();
|
||||
final MessageBus bus = new MessageBus();
|
||||
bus.addErrorHandler(ExceptionCounter);
|
||||
bus.start();
|
||||
ListenerFactory listeners = new ListenerFactory()
|
||||
|
|
|
@ -19,7 +19,7 @@ public class MultiMessageTest extends MessageBusTest {
|
|||
|
||||
@Test
|
||||
public void testMultiMessageSending(){
|
||||
IMessageBus bus = new MultiMBassador();
|
||||
IMessageBus bus = new MessageBus();
|
||||
bus.start();
|
||||
|
||||
Listener listener1 = new Listener();
|
||||
|
|
|
@ -15,7 +15,7 @@ public class PerfTest_MBassador {
|
|||
final int warmupRuns = 4;
|
||||
final int runs = 5;
|
||||
|
||||
MultiMBassador bus = new MultiMBassador(2);
|
||||
MessageBus bus = new MessageBus(2);
|
||||
Listener listener1 = new Listener();
|
||||
bus.subscribe(listener1);
|
||||
|
||||
|
@ -24,7 +24,8 @@ public class PerfTest_MBassador {
|
|||
System.out.format("summary,PublishPerfTest, %,d\n", average);
|
||||
}
|
||||
|
||||
public static long averageRun(int warmUpRuns, int sumCount, MultiMBassador bus, boolean showStats, int concurrency, int repetitions) throws Exception {
|
||||
public static long averageRun(int warmUpRuns, int sumCount, MessageBus bus, boolean showStats, int concurrency, int repetitions)
|
||||
throws Exception {
|
||||
int runs = warmUpRuns + sumCount;
|
||||
final long[] results = new long[runs];
|
||||
for (int i = 0; i < runs; i++) {
|
||||
|
@ -40,7 +41,8 @@ public class PerfTest_MBassador {
|
|||
return sum/sumCount;
|
||||
}
|
||||
|
||||
private static long performanceRun(int runNumber, MultiMBassador bus, boolean showStats, int concurrency, int repetitions) throws Exception {
|
||||
private static long performanceRun(int runNumber, MessageBus bus, boolean showStats, int concurrency, int repetitions)
|
||||
throws Exception {
|
||||
|
||||
Producer[] producers = new Producer[concurrency];
|
||||
Thread[] threads = new Thread[concurrency*2];
|
||||
|
@ -82,19 +84,19 @@ public class PerfTest_MBassador {
|
|||
}
|
||||
|
||||
public static class Producer implements Runnable {
|
||||
private final MultiMBassador bus;
|
||||
private final MessageBus bus;
|
||||
volatile long start;
|
||||
volatile long end;
|
||||
private int repetitions;
|
||||
|
||||
public Producer(MultiMBassador bus, int repetitions) {
|
||||
public Producer(MessageBus bus, int repetitions) {
|
||||
this.bus = bus;
|
||||
this.repetitions = repetitions;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
MultiMBassador bus = this.bus;
|
||||
MessageBus bus = this.bus;
|
||||
int i = this.repetitions;
|
||||
this.start = System.nanoTime();
|
||||
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
*/
|
||||
package dorkbox.util.messagebus;
|
||||
|
||||
import junit.framework.Assert;
|
||||
import dorkbox.util.messagebus.annotations.Handler;
|
||||
import dorkbox.util.messagebus.common.ConcurrentExecutor;
|
||||
import dorkbox.util.messagebus.error.IPublicationErrorHandler;
|
||||
import dorkbox.util.messagebus.error.PublicationError;
|
||||
import junit.framework.Assert;
|
||||
|
||||
/**
|
||||
* @author dorkbox, llc Date: 2/2/15
|
||||
|
@ -29,7 +29,7 @@ public class PerformanceTest {
|
|||
};
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
final MultiMBassador bus = new MultiMBassador(CONCURRENCY_LEVEL);
|
||||
final MessageBus bus = new MessageBus(CONCURRENCY_LEVEL);
|
||||
bus.addErrorHandler(TestFailingHandler);
|
||||
|
||||
|
||||
|
@ -44,7 +44,8 @@ public class PerformanceTest {
|
|||
while (true) {
|
||||
bus.publish(num);
|
||||
}
|
||||
}}, CONCURRENCY_LEVEL);
|
||||
}
|
||||
}, CONCURRENCY_LEVEL);
|
||||
|
||||
|
||||
bus.shutdown();
|
||||
|
|
|
@ -28,7 +28,7 @@ public class SyncBusTest extends MessageBusTest {
|
|||
@Test
|
||||
public void testSynchronousMessagePublication() throws Exception {
|
||||
|
||||
final IMessageBus bus = new MultiMBassador();
|
||||
final IMessageBus bus = new MessageBus();
|
||||
bus.start();
|
||||
ListenerFactory listeners = new ListenerFactory()
|
||||
.create(InstancesPerListener, IMessageListener.DefaultListener.class)
|
||||
|
@ -82,7 +82,7 @@ public class SyncBusTest extends MessageBusTest {
|
|||
}
|
||||
};
|
||||
|
||||
final IMessageBus bus = new MultiMBassador();
|
||||
final IMessageBus bus = new MessageBus();
|
||||
bus.addErrorHandler(ExceptionCounter);
|
||||
bus.start();
|
||||
ListenerFactory listeners = new ListenerFactory()
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package dorkbox.util.messagebus.common;
|
||||
|
||||
import dorkbox.util.messagebus.MultiMBassador;
|
||||
import dorkbox.util.messagebus.MessageBus;
|
||||
import dorkbox.util.messagebus.error.IPublicationErrorHandler;
|
||||
import dorkbox.util.messagebus.error.PublicationError;
|
||||
import dorkbox.util.messagebus.messages.MessageTypes;
|
||||
|
@ -39,15 +39,15 @@ public abstract class MessageBusTest extends AssertSupport {
|
|||
}
|
||||
|
||||
|
||||
public MultiMBassador createBus() {
|
||||
MultiMBassador bus = new MultiMBassador();
|
||||
public MessageBus createBus() {
|
||||
MessageBus bus = new MessageBus();
|
||||
bus.addErrorHandler(TestFailingHandler);
|
||||
bus.start();
|
||||
return bus;
|
||||
}
|
||||
|
||||
public MultiMBassador createBus(ListenerFactory listeners) {
|
||||
MultiMBassador bus = new MultiMBassador();
|
||||
public MessageBus createBus(ListenerFactory listeners) {
|
||||
MessageBus bus = new MessageBus();
|
||||
bus.addErrorHandler(TestFailingHandler);
|
||||
ConcurrentExecutor.runConcurrent(TestUtil.subscriber(bus, listeners), ConcurrentUnits);
|
||||
bus.start();
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package dorkbox.util.messagebus.common;
|
||||
|
||||
import dorkbox.util.messagebus.MultiMBassador;
|
||||
import dorkbox.util.messagebus.MessageBus;
|
||||
import dorkbox.util.messagebus.PubSubSupport;
|
||||
import dorkbox.util.messagebus.subscription.SubscriptionManager;
|
||||
|
||||
|
@ -95,7 +95,7 @@ public class TestUtil {
|
|||
|
||||
}
|
||||
|
||||
public static void setup(MultiMBassador bus, ListenerFactory listeners, int numberOfThreads) {
|
||||
public static void setup(MessageBus bus, ListenerFactory listeners, int numberOfThreads) {
|
||||
setup(bus, listeners.getAll(), numberOfThreads);
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user