MAILBOX-359 Remove MailboxEventDispatcher::ofMailboxListener
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1371fad6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1371fad6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1371fad6 Branch: refs/heads/master Commit: 1371fad66676f151dd349c6075b36823e3f488cc Parents: 4eb7990 Author: Benoit Tellier <btell...@linagora.com> Authored: Thu Dec 20 11:32:16 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Tue Jan 8 14:40:28 2019 +0700 ---------------------------------------------------------------------- .../cassandra/CassandraCombinationManagerTest.java | 8 ++++---- .../cassandra/CassandraMessageIdManagerStorageTest.java | 8 ++++---- .../mailbox/store/event/MailboxEventDispatcher.java | 12 +----------- .../james/mailbox/store/MailboxEventDispatcherTest.java | 5 ++++- 4 files changed, 13 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/1371fad6/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java index f20e7fc..b2d0850 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java @@ -19,14 +19,12 @@ package org.apache.james.mailbox.cassandra; -import static org.mockito.Mockito.mock; - import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; -import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule; import org.apache.james.mailbox.store.AbstractCombinationManagerTest; import org.apache.james.mailbox.store.CombinationManagerTestSystem; +import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.quota.NoQuotaManager; import org.junit.After; @@ -64,7 +62,9 @@ public class CassandraCombinationManagerTest extends AbstractCombinationManagerT @Override public CombinationManagerTestSystem createTestingData() throws Exception { - return CassandraCombinationManagerTestSystem.createTestingData(cassandra, new NoQuotaManager(), MailboxEventDispatcher.ofListener(mock(MailboxListener.class))); + DefaultDelegatingMailboxListener mailboxListener = new DefaultDelegatingMailboxListener(); + MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(mailboxListener); + return CassandraCombinationManagerTestSystem.createTestingData(cassandra, new NoQuotaManager(), mailboxEventDispatcher); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/1371fad6/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java index ae35def..6b9a519 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java @@ -19,14 +19,12 @@ package org.apache.james.mailbox.cassandra; -import static org.mockito.Mockito.mock; - import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; -import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule; import org.apache.james.mailbox.store.AbstractMessageIdManagerStorageTest; import org.apache.james.mailbox.store.MessageIdManagerTestSystem; +import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.quota.NoQuotaManager; import org.junit.After; @@ -64,6 +62,8 @@ public class CassandraMessageIdManagerStorageTest extends AbstractMessageIdManag @Override protected MessageIdManagerTestSystem createTestingData() throws Exception { - return CassandraMessageIdManagerTestSystem.createTestingData(cassandra, new NoQuotaManager(), MailboxEventDispatcher.ofListener(mock(MailboxListener.class))); + DefaultDelegatingMailboxListener mailboxListener = new DefaultDelegatingMailboxListener(); + MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(mailboxListener); + return CassandraMessageIdManagerTestSystem.createTestingData(cassandra, new NoQuotaManager(), mailboxEventDispatcher); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/1371fad6/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 f1deaab..5de959c 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 @@ -46,7 +46,6 @@ import org.apache.james.mailbox.model.UpdatedFlags; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; @@ -55,20 +54,11 @@ import com.google.common.collect.ImmutableSortedMap; * Helper class to dispatch {@link org.apache.james.mailbox.Event}'s to registerend MailboxListener */ public class MailboxEventDispatcher { - @VisibleForTesting - public static MailboxEventDispatcher ofListener(MailboxListener mailboxListener) { - return new MailboxEventDispatcher(mailboxListener); - } - private final MailboxListener listener; @Inject public MailboxEventDispatcher(DelegatingMailboxListener delegatingMailboxListener) { - this((MailboxListener) delegatingMailboxListener); - } - - private MailboxEventDispatcher(MailboxListener listener) { - this.listener = listener; + this.listener = delegatingMailboxListener; } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/1371fad6/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 955231b..24f5cab 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 @@ -35,6 +35,7 @@ import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageResult; import org.apache.james.mailbox.model.TestId; import org.apache.james.mailbox.model.UpdatedFlags; +import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; @@ -68,7 +69,9 @@ public class MailboxEventDispatcherTest { public void setUp() throws Exception { collector = new EventCollector(); - dispatcher = MailboxEventDispatcher.ofListener(collector); + DefaultDelegatingMailboxListener mailboxListener = new DefaultDelegatingMailboxListener(); + mailboxListener.addGlobalListener(collector, session); + dispatcher = new MailboxEventDispatcher(mailboxListener); result = mock(MessageResult.class); mailbox = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY, MAILBOX_ID); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
