JAMES-2342 Rename Event to MailboxEvent
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/66a58be9 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/66a58be9 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/66a58be9 Branch: refs/heads/master Commit: 66a58be9cf4ff311c9c3d367056be1b1fe8ebae0 Parents: 5283aac Author: Antoine Duprat <[email protected]> Authored: Tue Mar 6 11:19:28 2018 +0100 Committer: Antoine Duprat <[email protected]> Committed: Thu Mar 8 11:01:21 2018 +0100 ---------------------------------------------------------------------- .../apache/james/mailbox/MailboxListener.java | 18 +++++++-------- .../james/mailbox/MailboxManagerStressTest.java | 2 +- .../james/mailbox/util/EventCollector.java | 6 ++--- .../CacheInvalidatingMailboxListener.java | 6 ++--- .../MailboxOperationLoggingListener.java | 2 +- ...istributedMailboxDelegatingListenerTest.java | 4 ++-- .../spamassassin/SpamAssassinListener.java | 4 ++-- .../store/event/AsynchronousEventDelivery.java | 2 +- .../event/DefaultDelegatingMailboxListener.java | 8 +++---- .../mailbox/store/event/EventDelivery.java | 2 +- .../mailbox/store/event/EventSerializer.java | 4 ++-- .../store/event/MailboxAnnotationListener.java | 2 +- .../store/event/MailboxEventDispatcher.java | 2 +- .../mailbox/store/event/MixedEventDelivery.java | 2 +- .../store/event/SynchronousEventDelivery.java | 2 +- .../BroadcastDelegatingMailboxListener.java | 8 +++---- .../RegisteredDelegatingMailboxListener.java | 12 +++++----- .../store/json/JacksonEventSerializer.java | 4 ++-- .../store/json/event/EventConverter.java | 4 ++-- .../store/json/event/MailboxConverter.java | 2 +- .../quota/ListeningCurrentQuotaUpdater.java | 2 +- .../search/ListeningMessageSearchIndex.java | 4 ++-- .../store/MailboxEventDispatcherTest.java | 4 ++-- .../event/AsynchronousEventDeliveryTest.java | 6 ++--- .../DefaultDelegatingMailboxListenerTest.java | 22 +++++++++--------- .../event/MailboxAnnotationListenerTest.java | 4 ++-- .../store/event/MixedEventDeliveryTest.java | 6 ++--- .../event/SynchronousEventDeliveryTest.java | 4 ++-- ...elegatingMailboxListenerIntegrationTest.java | 6 ++--- .../BroadcastDelegatingMailboxListenerTest.java | 8 +++---- ...RegisteredDelegatingMailboxListenerTest.java | 10 ++++---- .../mailbox/store/json/EventSerializerTest.java | 24 ++++++++++---------- .../registrations/GlobalRegistration.java | 2 +- .../registrations/MailboxRegistration.java | 2 +- .../registrations/GlobalRegistrationTest.java | 6 ++--- .../registrations/MailboxRegistrationTest.java | 6 ++--- .../james/imap/processor/IdleProcessor.java | 2 +- .../processor/base/SelectedMailboxImpl.java | 2 +- .../base/MailboxEventAnalyserTest.java | 2 +- .../integration/SetMessagesMethodTest.java | 6 ++--- .../event/PropagateLookupRightListener.java | 2 +- 41 files changed, 113 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java index 4a8f07c..5f9cbce 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java @@ -55,22 +55,22 @@ public interface MailboxListener { * @param event * not null */ - void event(Event event); + void event(MailboxEvent event); /** * A mailbox event. */ - abstract class Event implements Serializable { + abstract class MailboxEvent implements Serializable { private final MailboxSession session; private final MailboxPath path; - public Event(MailboxSession session, MailboxPath path) { + public MailboxEvent(MailboxSession session, MailboxPath path) { this.session = session; this.path = path; } /** - * Gets the {@link MailboxSession} in which's context the {@link Event} + * Gets the {@link MailboxSession} in which's context the {@link MailboxEvent} * happened * * @return session @@ -92,7 +92,7 @@ public interface MailboxListener { /** * Indicates that mailbox has been deleted. */ - class MailboxDeletion extends Event { + class MailboxDeletion extends MailboxEvent { /** * @@ -107,7 +107,7 @@ public interface MailboxListener { /** * Indicates that a mailbox has been Added. */ - class MailboxAdded extends Event { + class MailboxAdded extends MailboxEvent { /** * */ @@ -121,7 +121,7 @@ public interface MailboxListener { /** * Indicates that a mailbox has been renamed. */ - abstract class MailboxRenamed extends Event { + abstract class MailboxRenamed extends MailboxEvent { /** * */ @@ -143,7 +143,7 @@ public interface MailboxListener { /** * A mailbox event related to updated ACL */ - class MailboxACLUpdated extends Event { + class MailboxACLUpdated extends MailboxEvent { private final ACLDiff aclDiff; private static final long serialVersionUID = 1L; @@ -161,7 +161,7 @@ public interface MailboxListener { /** * A mailbox event related to a message. */ - abstract class MessageEvent extends Event { + abstract class MessageEvent extends MailboxEvent { /** * http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java index 941d7a6..9c6cbaf 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java @@ -78,7 +78,7 @@ public abstract class MailboxManagerStressTest { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { MessageUid u = ((Added) event).getUids().get(0); uList.add(u); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java index 8a5a817..97b07fb 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java @@ -26,7 +26,7 @@ import org.apache.james.mailbox.MailboxListener; public class EventCollector implements MailboxListener { - private final List<Event> events = new ArrayList<>(); + private final List<MailboxEvent> events = new ArrayList<>(); private final ListenerType listenerType; @@ -48,11 +48,11 @@ public class EventCollector implements MailboxListener { return ExecutionMode.SYNCHRONOUS; } - public List<Event> getEvents() { + public List<MailboxEvent> getEvents() { return events; } - public void event(Event event) { + public void event(MailboxEvent event) { events.add(event); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java index 1cd463b..90fc351 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java @@ -44,7 +44,7 @@ public class CacheInvalidatingMailboxListener implements MailboxListener { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { // TODO this needs for sure to be smarter try { if (event instanceof MessageEvent) { @@ -58,13 +58,13 @@ public class CacheInvalidatingMailboxListener implements MailboxListener { } - private void invalidateMetadata(Event event) throws MailboxException { + private void invalidateMetadata(MailboxEvent event) throws MailboxException { //HMM, race conditions welcome? mailboxMetadataCache.invalidate(mailboxCacheByPath.findMailboxByPath(event.getMailboxPath(), null)); } - private void invalidateMailbox(Event event) { + private void invalidateMailbox(MailboxEvent event) { mailboxCacheByPath.invalidate(event.getMailboxPath()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java index f0b7226..9059288 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java @@ -44,7 +44,7 @@ public class MailboxOperationLoggingListener implements MailboxListener { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { if (event instanceof MailboxRenamed) { MailboxRenamed mailboxRenamed = (MailboxRenamed) event; GhostMailbox.logger() http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java index f8304e7..18d350a 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java @@ -153,7 +153,7 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest { SimpleMailbox simpleMailbox = new SimpleMailbox(MAILBOX_PATH_1, 42); simpleMailbox.setMailboxId(TestId.of(52)); TreeMap<MessageUid, MessageMetaData> uids = new TreeMap<>(); - final MailboxListener.Event event = new EventFactory().added(mailboxSession, uids, simpleMailbox, EMPTY_MESSAGE_CACHE); + final MailboxListener.MailboxEvent event = new EventFactory().added(mailboxSession, uids, simpleMailbox, EMPTY_MESSAGE_CACHE); registeredDelegatingMailboxListener1.event(event); @@ -167,7 +167,7 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest { SimpleMailbox simpleMailbox = new SimpleMailbox(MAILBOX_PATH_1, 42); simpleMailbox.setMailboxId(TestId.of(52)); TreeMap<MessageUid, MessageMetaData> uids = new TreeMap<>(); - final MailboxListener.Event event = new EventFactory().added(mailboxSession, uids, simpleMailbox, EMPTY_MESSAGE_CACHE); + final MailboxListener.MailboxEvent event = new EventFactory().added(mailboxSession, uids, simpleMailbox, EMPTY_MESSAGE_CACHE); registeredDelegatingMailboxListener1.event(event); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java index f2de03e..4462ed0 100644 --- a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java +++ b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java @@ -56,7 +56,7 @@ public class SpamAssassinListener implements SpamEventListener { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { LOGGER.debug("Event {} received in listener.", event); if (event instanceof EventFactory.AddedImpl) { EventFactory.AddedImpl addedToMailboxEvent = (EventFactory.AddedImpl) event; @@ -73,7 +73,7 @@ public class SpamAssassinListener implements SpamEventListener { } @VisibleForTesting - boolean isEventOnSpamMailbox(Event event) { + boolean isEventOnSpamMailbox(MailboxEvent event) { return Role.from(event.getMailboxPath().getName()) .filter(role -> role.equals(Role.SPAM)) .isPresent(); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/AsynchronousEventDelivery.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/AsynchronousEventDelivery.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/AsynchronousEventDelivery.java index 81c5793..3dfd113 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/AsynchronousEventDelivery.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/AsynchronousEventDelivery.java @@ -37,7 +37,7 @@ public class AsynchronousEventDelivery implements EventDelivery { } @Override - public void deliver(final MailboxListener mailboxListener, final MailboxListener.Event event) { + public void deliver(final MailboxListener mailboxListener, final MailboxListener.MailboxEvent event) { threadPoolExecutor.submit(() -> synchronousEventDelivery.deliver(mailboxListener, event)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java index 820ad3d..7a20207 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java @@ -29,7 +29,7 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; /** - * Receive a {@link org.apache.james.mailbox.MailboxListener.Event} and delegate it to an other + * Receive a {@link org.apache.james.mailbox.MailboxListener.MailboxEvent} and delegate it to an other * {@link MailboxListener} depending on the registered name * * This is a mono instance Thread safe implementation for DelegatingMailboxListener @@ -86,7 +86,7 @@ public class DefaultDelegatingMailboxListener implements DelegatingMailboxListen } @Override - public void event(Event event) { + public void event(MailboxEvent event) { Collection<MailboxListener> listenerSnapshot = registry.getLocalMailboxListeners(event.getMailboxPath()); if (event instanceof MailboxDeletion && listenerSnapshot.size() > 0) { registry.deleteRegistryFor(event.getMailboxPath()); @@ -98,13 +98,13 @@ public class DefaultDelegatingMailboxListener implements DelegatingMailboxListen deliverEventToGlobalListeners(event); } - protected void deliverEventToMailboxListeners(Event event, Collection<MailboxListener> listenerSnapshot) { + protected void deliverEventToMailboxListeners(MailboxEvent event, Collection<MailboxListener> listenerSnapshot) { for (MailboxListener listener : listenerSnapshot) { eventDelivery.deliver(listener, event); } } - protected void deliverEventToGlobalListeners(Event event) { + protected void deliverEventToGlobalListeners(MailboxEvent event) { for (MailboxListener mailboxListener : registry.getGlobalListeners()) { eventDelivery.deliver(mailboxListener, event); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventDelivery.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventDelivery.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventDelivery.java index ae36a61..e9a8d13 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventDelivery.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventDelivery.java @@ -23,6 +23,6 @@ import org.apache.james.mailbox.MailboxListener; public interface EventDelivery { - void deliver(MailboxListener mailboxListener, MailboxListener.Event event); + void deliver(MailboxListener mailboxListener, MailboxListener.MailboxEvent event); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventSerializer.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventSerializer.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventSerializer.java index 8ab49b7..c108edd 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventSerializer.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventSerializer.java @@ -23,7 +23,7 @@ import org.apache.james.mailbox.MailboxListener; public interface EventSerializer { - byte[] serializeEvent(MailboxListener.Event event) throws Exception; + byte[] serializeEvent(MailboxListener.MailboxEvent event) throws Exception; - MailboxListener.Event deSerializeEvent(byte[] serializedEvent) throws Exception; + MailboxListener.MailboxEvent deSerializeEvent(byte[] serializedEvent) throws Exception; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java index 89acfb7..c504f7c 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java @@ -48,7 +48,7 @@ public class MailboxAnnotationListener implements MailboxListener { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { if (event instanceof EventFactory.MailboxDeletionImpl) { try { AnnotationMapper annotationMapper = mailboxSessionMapperFactory.getAnnotationMapper(event.getSession()); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java index 2fea2f8..43d811b 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java @@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; /** - * Helper class to dispatch {@link org.apache.james.mailbox.MailboxListener.Event}'s to registerend MailboxListener + * Helper class to dispatch {@link org.apache.james.mailbox.MailboxListener.MailboxEvent}'s to registerend MailboxListener */ public class MailboxEventDispatcher { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MixedEventDelivery.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MixedEventDelivery.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MixedEventDelivery.java index 3ab3649..2086c5b 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MixedEventDelivery.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MixedEventDelivery.java @@ -33,7 +33,7 @@ public class MixedEventDelivery implements EventDelivery { } @Override - public void deliver(MailboxListener mailboxListener, MailboxListener.Event event) { + public void deliver(MailboxListener mailboxListener, MailboxListener.MailboxEvent event) { if (mailboxListener.getExecutionMode().equals(MailboxListener.ExecutionMode.SYNCHRONOUS)) { synchronousEventDelivery.deliver(mailboxListener, event); } else { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java index d791ec5..0d8960c 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java @@ -28,7 +28,7 @@ public class SynchronousEventDelivery implements EventDelivery { private static final Logger LOGGER = LoggerFactory.getLogger(SynchronousEventDelivery.class); @Override - public void deliver(MailboxListener mailboxListener, MailboxListener.Event event) { + public void deliver(MailboxListener mailboxListener, MailboxListener.MailboxEvent event) { try { mailboxListener.event(event); } catch (Throwable throwable) { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java index c591833..63fae03 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java @@ -97,7 +97,7 @@ public class BroadcastDelegatingMailboxListener implements DistributedDelegating } @Override - public void event(Event event) { + public void event(MailboxEvent event) { deliverEventToGlobalListeners(event, ListenerType.ONCE); try { publisher.publish(globalTopic, eventSerializer.serializeEvent(event)); @@ -108,7 +108,7 @@ public class BroadcastDelegatingMailboxListener implements DistributedDelegating public void receiveSerializedEvent(byte[] serializedEvent) { try { - Event event = eventSerializer.deSerializeEvent(serializedEvent); + MailboxEvent event = eventSerializer.deSerializeEvent(serializedEvent); deliverToMailboxPathRegisteredListeners(event); deliverEventToGlobalListeners(event, ListenerType.EACH_NODE); } catch (Exception e) { @@ -116,7 +116,7 @@ public class BroadcastDelegatingMailboxListener implements DistributedDelegating } } - private void deliverToMailboxPathRegisteredListeners(Event event) { + private void deliverToMailboxPathRegisteredListeners(MailboxEvent event) { Collection<MailboxListener> listenerSnapshot = mailboxListenerRegistry.getLocalMailboxListeners(event.getMailboxPath()); if (event instanceof MailboxDeletion) { mailboxListenerRegistry.deleteRegistryFor(event.getMailboxPath()); @@ -129,7 +129,7 @@ public class BroadcastDelegatingMailboxListener implements DistributedDelegating } } - private void deliverEventToGlobalListeners(Event event, ListenerType type) { + private void deliverEventToGlobalListeners(MailboxEvent event, ListenerType type) { for (MailboxListener mailboxListener : mailboxListenerRegistry.getGlobalListeners()) { if (mailboxListener.getType() == type) { eventDelivery.deliver(mailboxListener, event); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java index 16aafc9..3c2255c 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java @@ -103,7 +103,7 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin } @Override - public void event(Event event) { + public void event(MailboxEvent event) { try { deliverEventToOnceGlobalListeners(event); deliverToMailboxPathRegisteredListeners(event); @@ -115,14 +115,14 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin public void receiveSerializedEvent(byte[] serializedEvent) { try { - Event event = eventSerializer.deSerializeEvent(serializedEvent); + MailboxEvent event = eventSerializer.deSerializeEvent(serializedEvent); deliverToMailboxPathRegisteredListeners(event); } catch (Exception e) { LOGGER.error("Error while receiving serialized event", e); } } - private void deliverToMailboxPathRegisteredListeners(Event event) throws MailboxException { + private void deliverToMailboxPathRegisteredListeners(MailboxEvent event) throws MailboxException { Collection<MailboxListener> listenerSnapshot = mailboxListenerRegistry.getLocalMailboxListeners(event.getMailboxPath()); if (event instanceof MailboxDeletion && listenerSnapshot.size() > 0) { mailboxListenerRegistry.deleteRegistryFor(event.getMailboxPath()); @@ -137,7 +137,7 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin } } - private void deliverEventToOnceGlobalListeners(Event event) { + private void deliverEventToOnceGlobalListeners(MailboxEvent event) { for (MailboxListener mailboxListener : mailboxListenerRegistry.getGlobalListeners()) { if (mailboxListener.getType() == ListenerType.ONCE) { eventDelivery.deliver(mailboxListener, event); @@ -145,7 +145,7 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin } } - private void sendToRemoteJames(Event event) { + private void sendToRemoteJames(MailboxEvent event) { Set<Topic> topics = mailboxPathRegister.getTopics(event.getMailboxPath()); topics.remove(mailboxPathRegister.getLocalTopic()); if (topics.size() > 0) { @@ -153,7 +153,7 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin } } - private void sendEventToRemotesJamesByTopic(Event event, Set<Topic> topics) { + private void sendEventToRemotesJamesByTopic(MailboxEvent event, Set<Topic> topics) { byte[] serializedEvent; try { serializedEvent = eventSerializer.serializeEvent(event); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java index c594ce1..83161b7 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/JacksonEventSerializer.java @@ -50,11 +50,11 @@ public class JacksonEventSerializer implements EventSerializer { this.objectMapper = objectMapper; } - public byte[] serializeEvent(MailboxListener.Event event) throws Exception { + public byte[] serializeEvent(MailboxListener.MailboxEvent event) throws Exception { return objectMapper.writeValueAsBytes(eventConverter.convertToDataTransferObject(event)); } - public MailboxListener.Event deSerializeEvent(byte[] serializedEvent) throws Exception { + public MailboxListener.MailboxEvent deSerializeEvent(byte[] serializedEvent) throws Exception { EventDataTransferObject eventDataTransferObject = objectMapper.readValue(serializedEvent, EventDataTransferObject.class); return eventConverter.retrieveEvent(eventDataTransferObject); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java index 1414d45..12c54e8 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java @@ -60,7 +60,7 @@ public class EventConverter { this.mailboxConverter = mailboxConverter; } - public EventDataTransferObject convertToDataTransferObject(MailboxListener.Event event) throws Exception { + public EventDataTransferObject convertToDataTransferObject(MailboxListener.MailboxEvent event) throws Exception { MailboxDataTransferObject mailboxDataTransferObject = mailboxConverter.extractMailboxDataTransferObject(event); if (event instanceof MailboxListener.Added) { return constructMeteDataHoldingEventProxy(EventType.ADDED, @@ -95,7 +95,7 @@ public class EventConverter { } } - public MailboxListener.Event retrieveEvent(EventDataTransferObject eventDataTransferObject) throws Exception { + public MailboxListener.MailboxEvent retrieveEvent(EventDataTransferObject eventDataTransferObject) throws Exception { Mailbox mailbox = mailboxConverter.retrieveMailbox(eventDataTransferObject.getMailbox()); switch (eventDataTransferObject.getType()) { case ADDED: http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java index 7335f90..e2273fd 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/MailboxConverter.java @@ -72,7 +72,7 @@ public class MailboxConverter { .build(); } - public MailboxDataTransferObject extractMailboxDataTransferObject(MailboxListener.Event event) { + public MailboxDataTransferObject extractMailboxDataTransferObject(MailboxListener.MailboxEvent event) { if (event instanceof EventFactory.MailboxAware) { return convertMailboxDataTransferObject(((EventFactory.MailboxAware) event).getMailbox()); } else { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java index 1742e6c..0f1ea14 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java @@ -54,7 +54,7 @@ public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdat } @Override - public void event(Event event) { + public void event(MailboxEvent event) { try { QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(event.getMailboxPath()); if (event instanceof Added) { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java index 2918d0c..488bab2 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java @@ -67,11 +67,11 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex, /** - * Process the {@link org.apache.james.mailbox.MailboxListener.Event} and update the index if + * Process the {@link org.apache.james.mailbox.MailboxListener.MailboxEvent} and update the index if * something relevant is received */ @Override - public void event(Event event) { + public void event(MailboxEvent event) { final MailboxSession session = event.getSession(); try { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java index 48047b4..8c481b7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java @@ -49,9 +49,9 @@ import com.google.common.collect.ImmutableMap; public class MailboxEventDispatcherTest { private static final int sessionId = 10; private static final int MOD_SEQ = -1; - public static final Condition<MailboxListener.Event> INSTANCE_OF_EVENT_FLAGS_UPDATED = new Condition<MailboxListener.Event>() { + public static final Condition<MailboxListener.MailboxEvent> INSTANCE_OF_EVENT_FLAGS_UPDATED = new Condition<MailboxListener.MailboxEvent>() { @Override - public boolean matches(MailboxListener.Event event) { + public boolean matches(MailboxListener.MailboxEvent event) { return event instanceof MailboxListener.FlagsUpdated; } }; http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/AsynchronousEventDeliveryTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/AsynchronousEventDeliveryTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/AsynchronousEventDeliveryTest.java index 0b138c4..a072bbf 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/AsynchronousEventDeliveryTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/AsynchronousEventDeliveryTest.java @@ -51,14 +51,14 @@ public class AsynchronousEventDeliveryTest { @Test public void deliverShouldWork() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(null, null) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null) {}; asynchronousEventDelivery.deliver(mailboxListener, event); verify(mailboxListener, timeout(ONE_MINUTE)).event(event); } @Test public void deliverShouldNotPropagateException() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(new MockMailboxSession("test"), null) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(new MockMailboxSession("test"), null) {}; doThrow(new RuntimeException()).when(mailboxListener).event(event); asynchronousEventDelivery.deliver(mailboxListener, event); verify(mailboxListener, timeout(ONE_MINUTE)).event(event); @@ -66,7 +66,7 @@ public class AsynchronousEventDeliveryTest { @Test public void deliverShouldWorkWhenThePoolIsFull() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(new MockMailboxSession("test"), null) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(new MockMailboxSession("test"), null) {}; int operationCount = 10; for (int i = 0; i < operationCount; i++) { asynchronousEventDelivery.deliver(mailboxListener, event); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java index 44fde73..1e5d36d 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java @@ -74,7 +74,7 @@ public class DefaultDelegatingMailboxListenerTest { @Test public void eventShouldWork() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(null, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(event); assertThat(mailboxEventCollector.getEvents()).containsExactly(event); assertThat(eachNodeEventCollector.getEvents()).containsExactly(event); @@ -83,7 +83,7 @@ public class DefaultDelegatingMailboxListenerTest { @Test public void eventShouldOnlyTriggerMAILBOXListenerRelatedToTheEvent() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(null, OTHER_MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, OTHER_MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(event); assertThat(mailboxEventCollector.getEvents()).isEmpty(); assertThat(eachNodeEventCollector.getEvents()).containsExactly(event); @@ -99,7 +99,7 @@ public class DefaultDelegatingMailboxListenerTest { } }; defaultDelegatingMailboxListener.event(event); - MailboxListener.Event secondEvent = new MailboxListener.Event(null, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent secondEvent = new MailboxListener.MailboxEvent(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(secondEvent); assertThat(mailboxEventCollector.getEvents()).containsExactly(event); assertThat(eachNodeEventCollector.getEvents()).containsOnly(event, secondEvent); @@ -115,7 +115,7 @@ public class DefaultDelegatingMailboxListenerTest { } }; defaultDelegatingMailboxListener.event(event); - MailboxListener.Event secondEvent = new MailboxListener.Event(null, OTHER_MAILBOX_PATH) {}; + MailboxListener.MailboxEvent secondEvent = new MailboxListener.MailboxEvent(null, OTHER_MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(secondEvent); assertThat(mailboxEventCollector.getEvents()).containsOnly(event, secondEvent); assertThat(eachNodeEventCollector.getEvents()).containsOnly(event, secondEvent); @@ -126,7 +126,7 @@ public class DefaultDelegatingMailboxListenerTest { public void mailboxDeletionShouldUnregisterMAILBOXListeners() throws Exception { MailboxListener.MailboxDeletion event = new MailboxListener.MailboxDeletion(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(event); - MailboxListener.Event secondEvent = new MailboxListener.Event(null, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent secondEvent = new MailboxListener.MailboxEvent(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(secondEvent); assertThat(mailboxEventCollector.getEvents()).containsExactly(event); assertThat(eachNodeEventCollector.getEvents()).containsOnly(event, secondEvent); @@ -137,7 +137,7 @@ public class DefaultDelegatingMailboxListenerTest { public void mailboxDeletionShouldNotRegisterMAILBOXListenerToOtherPaths() throws Exception { MailboxListener.MailboxDeletion event = new MailboxListener.MailboxDeletion(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(event); - MailboxListener.Event secondEvent = new MailboxListener.Event(null, OTHER_MAILBOX_PATH) {}; + MailboxListener.MailboxEvent secondEvent = new MailboxListener.MailboxEvent(null, OTHER_MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(secondEvent); assertThat(mailboxEventCollector.getEvents()).containsExactly(event); assertThat(eachNodeEventCollector.getEvents()).containsOnly(event, secondEvent); @@ -147,7 +147,7 @@ public class DefaultDelegatingMailboxListenerTest { @Test public void removeListenerShouldWork() throws Exception { defaultDelegatingMailboxListener.removeListener(MAILBOX_PATH, mailboxEventCollector, null); - MailboxListener.Event event = new MailboxListener.Event(null, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(event); assertThat(mailboxEventCollector.getEvents()).isEmpty(); assertThat(eachNodeEventCollector.getEvents()).containsExactly(event); @@ -157,7 +157,7 @@ public class DefaultDelegatingMailboxListenerTest { @Test public void removeListenerShouldNotRemoveAListenerFromADifferentPath() throws Exception { defaultDelegatingMailboxListener.removeListener(OTHER_MAILBOX_PATH, mailboxEventCollector, null); - MailboxListener.Event event = new MailboxListener.Event(null, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(event); assertThat(mailboxEventCollector.getEvents()).containsExactly(event); assertThat(eachNodeEventCollector.getEvents()).containsExactly(event); @@ -167,7 +167,7 @@ public class DefaultDelegatingMailboxListenerTest { @Test public void removeGlobalListenerShouldWorkForONCE() throws Exception { defaultDelegatingMailboxListener.removeGlobalListener(eachNodeEventCollector, null); - MailboxListener.Event event = new MailboxListener.Event(null, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(event); assertThat(mailboxEventCollector.getEvents()).containsExactly(event); assertThat(eachNodeEventCollector.getEvents()).isEmpty(); @@ -177,7 +177,7 @@ public class DefaultDelegatingMailboxListenerTest { @Test public void removeGlobalListenerShouldWorkForEACH_NODE() throws Exception { defaultDelegatingMailboxListener.removeGlobalListener(onceEventCollector, null); - MailboxListener.Event event = new MailboxListener.Event(null, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, MAILBOX_PATH) {}; defaultDelegatingMailboxListener.event(event); assertThat(mailboxEventCollector.getEvents()).containsExactly(event); assertThat(eachNodeEventCollector.getEvents()).containsExactly(event); @@ -187,7 +187,7 @@ public class DefaultDelegatingMailboxListenerTest { @Test public void listenersErrorsShouldNotBePropageted() throws Exception { MailboxSession session = new MockMailboxSession("benwa"); - MailboxListener.Event event = new MailboxListener.Event(session, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(session, MAILBOX_PATH) {}; MailboxListener mockedListener = mock(MailboxListener.class); when(mockedListener.getType()).thenReturn(MailboxListener.ListenerType.ONCE); doThrow(new RuntimeException()).when(mockedListener).event(event); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java index 6b0a2ff..1319543 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java @@ -66,7 +66,7 @@ public class MailboxAnnotationListenerTest { private Mailbox mailbox; private EventFactory eventFactory; private MailboxAnnotationListener listener; - private MailboxListener.Event deleteEvent; + private MailboxListener.MailboxEvent deleteEvent; private MailboxSession mailboxSession; @Before @@ -84,7 +84,7 @@ public class MailboxAnnotationListenerTest { @Test public void eventShouldDoNothingIfDoNotHaveMailboxDeletionEvent() { - MailboxListener.Event event = new MailboxListener.Event(null, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, MAILBOX_PATH) {}; listener.event(event); verifyNoMoreInteractions(mailboxSessionMapperFactory); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MixedEventDeliveryTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MixedEventDeliveryTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MixedEventDeliveryTest.java index 5cb359e..08dacee 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MixedEventDeliveryTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MixedEventDeliveryTest.java @@ -55,14 +55,14 @@ public class MixedEventDeliveryTest { @Test public void deliverShouldWorkOnSynchronousListeners() throws Exception { when(listener.getExecutionMode()).thenReturn(MailboxListener.ExecutionMode.SYNCHRONOUS); - MailboxListener.Event event = new MailboxListener.Event(null, null) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null) {}; mixedEventDelivery.deliver(listener, event); verify(listener).event(event); } @Test public void deliverShouldEventuallyDeliverOnAsynchronousListeners() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(null, null) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null) {}; when(listener.getExecutionMode()).thenReturn(MailboxListener.ExecutionMode.ASYNCHRONOUS); mixedEventDelivery.deliver(listener, event); verify(listener, timeout(DELIVERY_DELAY * 10)).event(event); @@ -70,7 +70,7 @@ public class MixedEventDeliveryTest { @Test(timeout = ONE_MINUTE) public void deliverShouldNotBlockOnAsynchronousListeners() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(null, null) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null) {}; when(listener.getExecutionMode()).thenReturn(MailboxListener.ExecutionMode.ASYNCHRONOUS); final CountDownLatch latch = new CountDownLatch(1); doAnswer(invocation -> { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/SynchronousEventDeliveryTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/SynchronousEventDeliveryTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/SynchronousEventDeliveryTest.java index 8f3e288..5b5137a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/SynchronousEventDeliveryTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/SynchronousEventDeliveryTest.java @@ -41,14 +41,14 @@ public class SynchronousEventDeliveryTest { @Test public void deliverShouldWork() { - MailboxListener.Event event = new MailboxListener.Event(null, null) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null) {}; synchronousEventDelivery.deliver(mailboxListener, event); verify(mailboxListener).event(event); } @Test public void deliverShouldNotPropagateException() { - MailboxListener.Event event = new MailboxListener.Event(new MockMailboxSession("test"), null) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(new MockMailboxSession("test"), null) {}; doThrow(new RuntimeException()).when(mailboxListener).event(event); synchronousEventDelivery.deliver(mailboxListener, event); verify(mailboxListener).event(event); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java index b172a80..9eaca45 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java @@ -117,7 +117,7 @@ public class BroadcastDelegatingMailboxListenerIntegrationTest { public void mailboxEventListenersShouldBeTriggeredIfRegistered() throws Exception { SimpleMailbox simpleMailbox = new SimpleMailbox(MAILBOX_PATH_1, 42); simpleMailbox.setMailboxId(TestId.of(52)); - final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE); + final MailboxListener.MailboxEvent event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE); broadcastDelegatingMailboxListener1.event(event); @@ -130,7 +130,7 @@ public class BroadcastDelegatingMailboxListenerIntegrationTest { public void onceEventListenersShouldBeTriggeredOnceAcrossTheCluster() { SimpleMailbox simpleMailbox = new SimpleMailbox(MAILBOX_PATH_1, 42); simpleMailbox.setMailboxId(TestId.of(52)); - final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE); + final MailboxListener.MailboxEvent event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE); broadcastDelegatingMailboxListener1.event(event); @@ -143,7 +143,7 @@ public class BroadcastDelegatingMailboxListenerIntegrationTest { public void eachEventListenersShouldBeTriggeredOnEachNode() { SimpleMailbox simpleMailbox = new SimpleMailbox(MAILBOX_PATH_1, 42); simpleMailbox.setMailboxId(TestId.of(52)); - final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE); + final MailboxListener.MailboxEvent event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE); broadcastDelegatingMailboxListener1.event(event); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java index 547ab39..94460c7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java @@ -51,12 +51,12 @@ public class BroadcastDelegatingMailboxListenerTest { private EventCollector eachEventCollector; private EventCollector onceEventCollector; private MailboxSession mailboxSession; - private MailboxListener.Event event; + private MailboxListener.MailboxEvent event; @Before public void setUp() throws Exception { mailboxSession = new MockMailboxSession("benwa"); - event = new MailboxListener.Event(mailboxSession, MAILBOX_PATH) {}; + event = new MailboxListener.MailboxEvent(mailboxSession, MAILBOX_PATH) {}; mockedEventSerializer = mock(EventSerializer.class); mockedPublisher = mock(Publisher.class); @@ -166,7 +166,7 @@ public class BroadcastDelegatingMailboxListenerTest { @Test public void deletionDistantEventsShouldBeWellHandled() throws Exception { - final MailboxListener.Event event = new MailboxListener.MailboxDeletion(mailboxSession, MAILBOX_PATH); + final MailboxListener.MailboxEvent event = new MailboxListener.MailboxDeletion(mailboxSession, MAILBOX_PATH); broadcastDelegatingMailboxListener.addListener(MAILBOX_PATH, mailboxEventCollector, mailboxSession); when(mockedEventSerializer.deSerializeEvent(BYTES)).thenReturn(event); @@ -179,7 +179,7 @@ public class BroadcastDelegatingMailboxListenerTest { @Test public void renameDistantEventsShouldBeWellHandled() throws Exception { - final MailboxListener.Event event = new MailboxListener.MailboxRenamed(mailboxSession, MAILBOX_PATH) { + final MailboxListener.MailboxEvent event = new MailboxListener.MailboxRenamed(mailboxSession, MAILBOX_PATH) { @Override public MailboxPath getNewPath() { return MAILBOX_PATH_NEW; http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java index c01eda6..259174b 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java @@ -57,12 +57,12 @@ public class RegisteredDelegatingMailboxListenerTest { private EventCollector eachEventCollector; private EventCollector onceEventCollector; private MailboxSession mailboxSession; - private MailboxListener.Event event; + private MailboxListener.MailboxEvent event; @Before public void setUp() throws Exception { mailboxSession = new MockMailboxSession("benwa"); - event = new MailboxListener.Event(mailboxSession, MAILBOX_PATH) {}; + event = new MailboxListener.MailboxEvent(mailboxSession, MAILBOX_PATH) {}; mockedEventSerializer = mock(EventSerializer.class); mockedPublisher = mock(Publisher.class); @@ -109,7 +109,7 @@ public class RegisteredDelegatingMailboxListenerTest { @Test public void onceListenersShouldBeTriggered() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(mailboxSession, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(mailboxSession, MAILBOX_PATH) {}; testee.addGlobalListener(onceEventCollector, mailboxSession); when(mockedMailboxPathRegister.getTopics(MAILBOX_PATH)).thenReturn(Sets.newHashSet(TOPIC)); when(mockedMailboxPathRegister.getLocalTopic()).thenReturn(TOPIC); @@ -157,7 +157,7 @@ public class RegisteredDelegatingMailboxListenerTest { @Test public void deletionEventsShouldBeWellHandled() throws Exception { - MailboxListener.Event event = new MailboxListener.MailboxDeletion(mailboxSession, MAILBOX_PATH); + MailboxListener.MailboxEvent event = new MailboxListener.MailboxDeletion(mailboxSession, MAILBOX_PATH); testee.addListener(MAILBOX_PATH, mailboxEventCollector, mailboxSession); verify(mockedMailboxPathRegister).register(MAILBOX_PATH); when(mockedMailboxPathRegister.getTopics(MAILBOX_PATH)).thenReturn(Sets.newHashSet(TOPIC, TOPIC_2)); @@ -177,7 +177,7 @@ public class RegisteredDelegatingMailboxListenerTest { @Test public void renameEventsShouldBeWellHandled() throws Exception { - MailboxListener.Event event = new MailboxListener.MailboxRenamed(mailboxSession, MAILBOX_PATH) { + MailboxListener.MailboxEvent event = new MailboxListener.MailboxRenamed(mailboxSession, MAILBOX_PATH) { @Override public MailboxPath getNewPath() { return MAILBOX_PATH_NEW; http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java index edc7dac..629cced 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java @@ -82,9 +82,9 @@ public abstract class EventSerializerTest { public void addedEventShouldBeWellConverted() throws Exception { TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>(); treeMap.put(UID, MESSAGE_META_DATA); - MailboxListener.Event event = eventFactory.added(mailboxSession, treeMap, mailbox, ImmutableMap.<MessageUid, MailboxMessage>of()); + MailboxListener.MailboxEvent event = eventFactory.added(mailboxSession, treeMap, mailbox, ImmutableMap.<MessageUid, MailboxMessage>of()); byte[] serializedEvent = serializer.serializeEvent(event); - MailboxListener.Event deserializedEvent = serializer.deSerializeEvent(serializedEvent); + MailboxListener.MailboxEvent deserializedEvent = serializer.deSerializeEvent(serializedEvent); assertThat(deserializedEvent.getMailboxPath()).isEqualTo(event.getMailboxPath()); assertThat(deserializedEvent.getSession().getSessionId()).isEqualTo(event.getSession().getSessionId()); assertThat(deserializedEvent).isInstanceOf(MailboxListener.Added.class); @@ -98,9 +98,9 @@ public abstract class EventSerializerTest { public void expungedEventShouldBeWellConverted() throws Exception { TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>(); treeMap.put(UID, MESSAGE_META_DATA); - MailboxListener.Event event = eventFactory.expunged(mailboxSession, treeMap, mailbox); + MailboxListener.MailboxEvent event = eventFactory.expunged(mailboxSession, treeMap, mailbox); byte[] serializedEvent = serializer.serializeEvent(event); - MailboxListener.Event deserializedEvent = serializer.deSerializeEvent(serializedEvent); + MailboxListener.MailboxEvent deserializedEvent = serializer.deSerializeEvent(serializedEvent); assertThat(deserializedEvent.getMailboxPath()).isEqualTo(event.getMailboxPath()); assertThat(deserializedEvent.getSession().getSessionId()).isEqualTo(event.getSession().getSessionId()); assertThat(deserializedEvent).isInstanceOf(MailboxListener.Expunged.class); @@ -112,9 +112,9 @@ public abstract class EventSerializerTest { @Test public void flagsUpdatedEventShouldBeWellConverted() throws Exception { - MailboxListener.Event event = eventFactory.flagsUpdated(mailboxSession, Lists.newArrayList(UID), mailbox, Lists.newArrayList(UPDATED_FLAGS)); + MailboxListener.MailboxEvent event = eventFactory.flagsUpdated(mailboxSession, Lists.newArrayList(UID), mailbox, Lists.newArrayList(UPDATED_FLAGS)); byte[] serializedEvent = serializer.serializeEvent(event); - MailboxListener.Event deserializedEvent = serializer.deSerializeEvent(serializedEvent); + MailboxListener.MailboxEvent deserializedEvent = serializer.deSerializeEvent(serializedEvent); assertThat(deserializedEvent.getMailboxPath()).isEqualTo(event.getMailboxPath()); assertThat(deserializedEvent.getSession().getSessionId()).isEqualTo(event.getSession().getSessionId()); assertThat(deserializedEvent).isInstanceOf(MailboxListener.FlagsUpdated.class); @@ -123,9 +123,9 @@ public abstract class EventSerializerTest { @Test public void mailboxAddedShouldBeWellConverted() throws Exception { - MailboxListener.Event event = eventFactory.mailboxAdded(mailboxSession, mailbox); + MailboxListener.MailboxEvent event = eventFactory.mailboxAdded(mailboxSession, mailbox); byte[] serializedEvent = serializer.serializeEvent(event); - MailboxListener.Event deserializedEvent = serializer.deSerializeEvent(serializedEvent); + MailboxListener.MailboxEvent deserializedEvent = serializer.deSerializeEvent(serializedEvent); assertThat(deserializedEvent.getMailboxPath()).isEqualTo(event.getMailboxPath()); assertThat(deserializedEvent.getSession().getSessionId()).isEqualTo(event.getSession().getSessionId()); assertThat(deserializedEvent).isInstanceOf(MailboxListener.MailboxAdded.class); @@ -133,9 +133,9 @@ public abstract class EventSerializerTest { @Test public void mailboxDeletionShouldBeWellConverted() throws Exception { - MailboxListener.Event event = eventFactory.mailboxDeleted(mailboxSession, mailbox); + MailboxListener.MailboxEvent event = eventFactory.mailboxDeleted(mailboxSession, mailbox); byte[] serializedEvent = serializer.serializeEvent(event); - MailboxListener.Event deserializedEvent = serializer.deSerializeEvent(serializedEvent); + MailboxListener.MailboxEvent deserializedEvent = serializer.deSerializeEvent(serializedEvent); assertThat(deserializedEvent.getMailboxPath()).isEqualTo(event.getMailboxPath()); assertThat(deserializedEvent.getSession().getSessionId()).isEqualTo(event.getSession().getSessionId()); assertThat(deserializedEvent).isInstanceOf(MailboxListener.MailboxDeletion.class); @@ -143,9 +143,9 @@ public abstract class EventSerializerTest { @Test public void mailboxRenamedShouldBeWellConverted() throws Exception { - MailboxListener.Event event = eventFactory.mailboxRenamed(mailboxSession, FROM, mailbox); + MailboxListener.MailboxEvent event = eventFactory.mailboxRenamed(mailboxSession, FROM, mailbox); byte[] serializedEvent = serializer.serializeEvent(event); - MailboxListener.Event deserializedEvent = serializer.deSerializeEvent(serializedEvent); + MailboxListener.MailboxEvent deserializedEvent = serializer.deSerializeEvent(serializedEvent); assertThat(deserializedEvent.getMailboxPath()).isEqualTo(event.getMailboxPath()); assertThat(deserializedEvent.getSession().getSessionId()).isEqualTo(event.getSession().getSessionId()); assertThat(deserializedEvent).isInstanceOf(MailboxListener.MailboxRenamed.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java index 9e9a105..9eee6c5 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java @@ -54,7 +54,7 @@ public class GlobalRegistration implements MailboxListener { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { if (event instanceof MailboxDeletion) { isPathDeleted.put(event.getMailboxPath(), true); } else if (event instanceof MailboxRenamed) { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java index 6213afb..0f0b49a 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java @@ -59,7 +59,7 @@ public class MailboxRegistration implements MailboxListener { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { if (event instanceof FlagsUpdated) { for (UpdatedFlags updatedFlags : ((FlagsUpdated) event).getUpdatedFlags()) { impactingMessageEvents.put(updatedFlags.getUid(), new FlagsMessageEvent(mailboxPath, updatedFlags.getUid(), updatedFlags.getNewFlags())); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java index 7523bd6..86fe5b6 100644 --- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java +++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java @@ -56,21 +56,21 @@ public class GlobalRegistrationTest { @Test public void pathToIndexShouldNotBeChangedByAddedEvents() { - MailboxListener.Event event = eventFactory.mailboxAdded(session, MAILBOX); + MailboxListener.MailboxEvent event = eventFactory.mailboxAdded(session, MAILBOX); globalRegistration.event(event); assertThat(globalRegistration.getPathToIndex(INBOX).get()).isEqualTo(INBOX); } @Test public void pathToIndexShouldBeNullifiedByDeletedEvents() { - MailboxListener.Event event = eventFactory.mailboxDeleted(session, MAILBOX); + MailboxListener.MailboxEvent event = eventFactory.mailboxDeleted(session, MAILBOX); globalRegistration.event(event); assertThat(globalRegistration.getPathToIndex(INBOX)).isEqualTo(Optional.empty()); } @Test public void pathToIndexShouldBeModifiedByRenamedEvents() { - MailboxListener.Event event = eventFactory.mailboxRenamed(session, INBOX, NEW_MAILBOX); + MailboxListener.MailboxEvent event = eventFactory.mailboxRenamed(session, INBOX, NEW_MAILBOX); globalRegistration.event(event); assertThat(globalRegistration.getPathToIndex(INBOX).get()).isEqualTo(NEW_PATH); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java index 3d8c240..87ca2c9 100644 --- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java +++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java @@ -75,7 +75,7 @@ public class MailboxRegistrationTest { public void addedEventsShouldNotBeReported() { TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>(); treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId())); - MailboxListener.Event event = eventFactory.added(session, treeMap, MAILBOX, ImmutableMap.<MessageUid, MailboxMessage>of()); + MailboxListener.MailboxEvent event = eventFactory.added(session, treeMap, MAILBOX, ImmutableMap.<MessageUid, MailboxMessage>of()); mailboxRegistration.event(event); assertThat(mailboxRegistration.getImpactingEvents(UID)).isEmpty(); } @@ -84,14 +84,14 @@ public class MailboxRegistrationTest { public void expungedEventsShouldBeReported() { TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>(); treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId())); - MailboxListener.Event event = eventFactory.expunged(session, treeMap, MAILBOX); + MailboxListener.MailboxEvent event = eventFactory.expunged(session, treeMap, MAILBOX); mailboxRegistration.event(event); assertThat(mailboxRegistration.getImpactingEvents(UID)).containsExactly(new MessageDeletedEvent(INBOX, UID)); } @Test public void flagsEventsShouldBeReported() { - MailboxListener.Event event = eventFactory.flagsUpdated(session, + MailboxListener.MailboxEvent event = eventFactory.flagsUpdated(session, Lists.newArrayList(UID), MAILBOX, Lists.newArrayList(UpdatedFlags.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java index 2a0c0d2..bcd7807 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java @@ -188,7 +188,7 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme this.responder = responder; } - public void event(Event event) { + public void event(MailboxEvent event) { if (event instanceof Added || event instanceof Expunged || event instanceof FlagsUpdated) { unsolicitedResponses(session, responder, false); } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java index 6cf098e..c60c9b0 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java @@ -305,7 +305,7 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener { } - public synchronized void event(Event event) { + public synchronized void event(MailboxEvent event) { // Check if the event was for the mailbox we are observing if (event.getMailboxPath().equals(getPath())) { http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java index c1f66b8..5040ed2 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java @@ -116,7 +116,7 @@ public class MailboxEventAnalyserTest { @Test public void testShouldBeNoSizeChangeOnOtherEvent() throws Exception { - MailboxListener.Event event = new MailboxListener.Event(MAILBOX_SESSION, MAILBOX_PATH) {}; + MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(MAILBOX_SESSION, MAILBOX_PATH) {}; testee.event(event); http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index 1bf5afa..0ffe39b 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -2196,7 +2196,7 @@ public abstract class SetMessagesMethodTest { " ]" + "]"; - List<MailboxListener.Event> events = Lists.newArrayList(); + List<MailboxListener.MailboxEvent> events = Lists.newArrayList(); jmapServer.getProbe(JmapGuiceProbe.class).addMailboxListener(new MailboxListener() { @Override public ListenerType getType() { @@ -2209,7 +2209,7 @@ public abstract class SetMessagesMethodTest { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { events.add(event); } }); @@ -2230,7 +2230,7 @@ public abstract class SetMessagesMethodTest { .anyMatch(event -> isAddedToOutboxEvent(messageId, event))); } - private boolean isAddedToOutboxEvent(String messageId, MailboxListener.Event event) { + private boolean isAddedToOutboxEvent(String messageId, MailboxListener.MailboxEvent event) { if (!(event instanceof EventFactory.AddedImpl)) { return false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/66a58be9/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java index c22e9a4..8d901ba 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java @@ -58,7 +58,7 @@ public class PropagateLookupRightListener implements MailboxListener { } @Override - public void event(Event event) { + public void event(MailboxEvent event) { MailboxSession mailboxSession = event.getSession(); if (event instanceof MailboxACLUpdated) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
