Merge remote-tracking branch 'origin/master'

This commit is contained in:
benni 2012-12-16 17:26:57 +01:00
commit bbc2004232
15 changed files with 42 additions and 55 deletions

View File

@ -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<T> extends AbstractMessageBus<T, SyncAsyncPostCommand<T>>{
@ -44,8 +44,8 @@ public class MBassador<T> extends AbstractMessageBus<T, SyncAsyncPostCommand<T>>
@Override
public SyncAsyncPostCommand post(T message) {
return new SyncAsyncPostCommand(this, message);
public SyncAsyncPostCommand<T> post(T message) {
return new SyncAsyncPostCommand<T>(this, message);
}
}

View File

@ -9,9 +9,9 @@ package org.mbassy;
public class SyncAsyncPostCommand<T> implements IMessageBus.IPostCommand {
private T message;
private MBassador mBassador;
private MBassador<T> mBassador;
public SyncAsyncPostCommand(MBassador mBassador, T message) {
public SyncAsyncPostCommand(MBassador<T> mBassador, T message) {
this.mBassador = mBassador;
this.message = message;
}

View File

@ -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;
/**

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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.
*

View File

@ -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;

View File

@ -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
*/

View File

@ -1,7 +1,6 @@
package org.mbassy.subscription;
import java.util.Collection;
import java.util.LinkedList;
/**
* @author bennidi

View File

@ -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.

View File

@ -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

View File

@ -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.
*

View File

@ -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;
/**

View File

@ -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