JAMES-2641 Remove MailboxEventDispatcher Let's emmit on the Delegating listener
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/31ed391c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/31ed391c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/31ed391c Branch: refs/heads/master Commit: 31ed391c7b4594b102ab74bc76eca31bd80ae95e Parents: 9cdf4ba Author: Benoit Tellier <btell...@linagora.com> Authored: Mon Jan 7 11:55:18 2019 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Tue Jan 8 14:46:33 2019 +0700 ---------------------------------------------------------------------- .../cassandra/CassandraMailboxManager.java | 7 +-- .../cassandra/CassandraMessageManager.java | 8 ++-- .../CassandraCombinationManagerTest.java | 5 +-- .../CassandraCombinationManagerTestSystem.java | 6 +-- .../CassandraMailboxManagerProvider.java | 9 ++-- ...CassandraMessageIdManagerSideEffectTest.java | 6 +-- .../CassandraMessageIdManagerStorageTest.java | 5 +-- .../CassandraMessageIdManagerTestSystem.java | 10 ++--- .../cassandra/CassandraTestSystemFixture.java | 11 +++-- .../CassandraMailboxManagerAttachmentTest.java | 8 ++-- .../ElasticSearchIntegrationTest.java | 2 +- .../james/mailbox/jpa/JPAMailboxManager.java | 4 +- .../james/mailbox/jpa/JPAMessageManager.java | 6 +-- .../jpa/openjpa/OpenJPAMailboxManager.java | 6 +-- .../jpa/openjpa/OpenJPAMessageManager.java | 6 +-- .../resources/META-INF/spring/mailbox-jpa.xml | 5 +-- .../mailbox/jpa/JpaMailboxManagerProvider.java | 6 +-- .../search/LuceneMessageSearchIndexTest.java | 2 +- .../META-INF/spring/mailbox-maildir.xml | 5 +-- .../maildir/MaildirMailboxManagerProvider.java | 7 +-- .../inmemory/InMemoryMailboxManager.java | 8 ++-- .../inmemory/InMemoryMessageManager.java | 6 +-- .../META-INF/spring/mailbox-memory.xml | 7 ++- .../InMemoryMailboxManagerAttachmentTest.java | 8 ++-- .../manager/InMemoryIntegrationResources.java | 13 ++---- .../InMemoryMessageIdManagerSideEffectTest.java | 12 +++-- .../search/SimpleMessageSearchIndexTest.java | 2 +- .../main/resources/META-INF/spring/quota.xml | 2 +- .../META-INF/spring/spring-mailbox.xml | 6 +-- .../mailbox/store/StoreMailboxManager.java | 23 +++------- .../mailbox/store/StoreMessageIdManager.java | 18 ++++---- .../mailbox/store/StoreMessageManager.java | 46 ++++++-------------- .../james/mailbox/store/StoreRightManager.java | 12 ++--- .../store/event/MailboxEventDispatcher.java | 41 ----------------- .../quota/ListeningCurrentQuotaUpdater.java | 12 ++--- .../AbstractMessageIdManagerSideEffectTest.java | 6 +-- .../store/MessageIdManagerTestSystem.java | 2 +- .../mailbox/store/StoreMailboxManagerTest.java | 6 +-- .../mailbox/store/StoreRightManagerTest.java | 9 ++-- .../quota/ListeningCurrentQuotaUpdaterTest.java | 4 +- .../cassandra/host/CassandraHostSystem.java | 8 ++-- .../inmemory/host/InMemoryHostSystem.java | 2 +- .../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 9 ++-- .../host/LuceneSearchHostSystem.java | 7 +-- .../maildir/host/MaildirHostSystem.java | 7 +-- .../modules/mailbox/CassandraMailboxModule.java | 2 - .../modules/mailbox/MemoryMailboxModule.java | 2 - .../META-INF/org/apache/james/spring-server.xml | 4 -- 48 files changed, 134 insertions(+), 274 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java index 09c4c31..f963706 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java @@ -36,7 +36,6 @@ import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreMessageManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DelegatingMailboxListener; -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.MessageParser; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; @@ -61,8 +60,7 @@ public class CassandraMailboxManager extends StoreMailboxManager { @Inject public CassandraMailboxManager(CassandraMailboxSessionMapperFactory mapperFactory, Authenticator authenticator, Authorizator authorizator, MailboxPathLocker locker, MessageParser messageParser, - MessageId.Factory messageIdFactory, - MailboxEventDispatcher mailboxEventDispatcher, DelegatingMailboxListener delegatingMailboxListener, + MessageId.Factory messageIdFactory, DelegatingMailboxListener delegatingMailboxListener, StoreMailboxAnnotationManager annotationManager, StoreRightManager storeRightManager) { super(mapperFactory, authenticator, @@ -71,7 +69,6 @@ public class CassandraMailboxManager extends StoreMailboxManager { messageParser, messageIdFactory, annotationManager, - mailboxEventDispatcher, delegatingMailboxListener, storeRightManager); this.locker = locker; @@ -105,7 +102,7 @@ public class CassandraMailboxManager extends StoreMailboxManager { protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) { return new CassandraMessageManager(mapperFactory, getMessageSearchIndex(), - getEventDispatcher(), + getDelegationListener(), this.locker, mailboxRow, getQuotaManager(), http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java index fe00a3a..11b46c9 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java @@ -33,7 +33,7 @@ import org.apache.james.mailbox.quota.QuotaRootResolver; import org.apache.james.mailbox.store.BatchSizes; import org.apache.james.mailbox.store.StoreMessageManager; import org.apache.james.mailbox.store.StoreRightManager; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; @@ -50,11 +50,11 @@ public class CassandraMessageManager extends StoreMessageManager { private CassandraMailboxSessionMapperFactory mapperFactory; public CassandraMessageManager(CassandraMailboxSessionMapperFactory mapperFactory, MessageSearchIndex index, - MailboxEventDispatcher dispatcher, MailboxPathLocker locker, Mailbox mailbox, QuotaManager quotaManager, + DelegatingMailboxListener delegatingMailboxListener, MailboxPathLocker locker, Mailbox mailbox, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, MessageParser messageParser, MessageId.Factory messageIdFactory, BatchSizes batchSizes, StoreRightManager storeRightManager) { - super(CassandraMailboxManager.MESSAGE_CAPABILITIES, mapperFactory, index, dispatcher, locker, mailbox, + super(CassandraMailboxManager.MESSAGE_CAPABILITIES, mapperFactory, index, delegatingMailboxListener, locker, mailbox, quotaManager, quotaRootResolver, messageParser, messageIdFactory, batchSizes, storeRightManager); this.mapperFactory = mapperFactory; @@ -71,7 +71,7 @@ public class CassandraMessageManager extends StoreMessageManager { } @Override - protected void storeAttachment(final MailboxMessage message, final List<MessageAttachment> messageAttachments, final MailboxSession session) throws MailboxException { + protected void storeAttachment(MailboxMessage message, List<MessageAttachment> messageAttachments, MailboxSession session) throws MailboxException { mapperFactory.getAttachmentMapper(session) .storeAttachmentsForMessage( messageAttachments.stream() http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/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 b2d0850..65cc240 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 @@ -25,7 +25,6 @@ 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; import org.junit.AfterClass; @@ -62,9 +61,7 @@ public class CassandraCombinationManagerTest extends AbstractCombinationManagerT @Override public CombinationManagerTestSystem createTestingData() throws Exception { - DefaultDelegatingMailboxListener mailboxListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(mailboxListener); - return CassandraCombinationManagerTestSystem.createTestingData(cassandra, new NoQuotaManager(), mailboxEventDispatcher); + return CassandraCombinationManagerTestSystem.createTestingData(cassandra, new NoQuotaManager(), new DefaultDelegatingMailboxListener()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java index 373dc4d..9e1430c 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java @@ -28,7 +28,7 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.store.CombinationManagerTestSystem; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.model.Mailbox; public class CassandraCombinationManagerTestSystem extends CombinationManagerTestSystem { @@ -36,10 +36,10 @@ public class CassandraCombinationManagerTestSystem extends CombinationManagerTes private final CassandraMailboxSessionMapperFactory mapperFactory; private final CassandraMailboxManager cassandraMailboxManager; - public static CombinationManagerTestSystem createTestingData(CassandraCluster cassandra, QuotaManager quotaManager, MailboxEventDispatcher dispatcher) throws Exception { + public static CombinationManagerTestSystem createTestingData(CassandraCluster cassandra, QuotaManager quotaManager, DelegatingMailboxListener delegatingMailboxListener) throws Exception { CassandraMailboxSessionMapperFactory mapperFactory = CassandraTestSystemFixture.createMapperFactory(cassandra); - return new CassandraCombinationManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, dispatcher), + return new CassandraCombinationManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, delegatingMailboxListener), mapperFactory, CassandraTestSystemFixture.createMailboxManager(mapperFactory)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java index 8f66335..8656080 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java @@ -38,7 +38,6 @@ import org.apache.james.mailbox.store.NoMailboxPathLocker; import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater; @@ -62,8 +61,7 @@ public class CassandraMailboxManagerProvider { GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver(); MessageParser messageParser = new MessageParser(); DefaultDelegatingMailboxListener delegatingMailboxListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingMailboxListener); - StoreRightManager storeRightManager = new StoreRightManager(mapperFactory, aclResolver, groupMembershipResolver, mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mapperFactory, aclResolver, groupMembershipResolver, delegatingMailboxListener); Authenticator noAuthenticator = null; Authorizator noAuthorizator = null; @@ -71,8 +69,7 @@ public class CassandraMailboxManagerProvider { LIMIT_ANNOTATIONS, LIMIT_ANNOTATION_SIZE); CassandraMailboxManager manager = new CassandraMailboxManager(mapperFactory, noAuthenticator, noAuthorizator, new NoMailboxPathLocker(), - messageParser, messageIdFactory, mailboxEventDispatcher, delegatingMailboxListener, - annotationManager, storeRightManager); + messageParser, messageIdFactory, delegatingMailboxListener, annotationManager, storeRightManager); CassandraPerUserMaxQuotaManager maxQuotaManager = new CassandraPerUserMaxQuotaManager(new CassandraPerUserMaxQuotaDao(session), new CassandraPerDomainMaxQuotaDao(session), @@ -81,7 +78,7 @@ public class CassandraMailboxManagerProvider { StoreQuotaManager storeQuotaManager = new StoreQuotaManager(currentQuotaUpdater, maxQuotaManager); QuotaRootResolver quotaRootResolver = new DefaultUserQuotaRootResolver(manager, mapperFactory); - ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaUpdater, quotaRootResolver, mailboxEventDispatcher, storeQuotaManager); + ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaUpdater, quotaRootResolver, delegatingMailboxListener, storeQuotaManager); manager.setQuotaManager(storeQuotaManager); manager.setQuotaUpdater(quotaUpdater); manager.setQuotaRootResolver(quotaRootResolver); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java index 8553355..72ce1b4 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java @@ -25,7 +25,7 @@ import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.store.AbstractMessageIdManagerSideEffectTest; import org.apache.james.mailbox.store.MessageIdManagerTestSystem; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -60,7 +60,7 @@ public class CassandraMessageIdManagerSideEffectTest extends AbstractMessageIdMa } @Override - protected MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, MailboxEventDispatcher dispatcher) throws Exception { - return CassandraMessageIdManagerTestSystem.createTestingData(cassandra, quotaManager, dispatcher); + protected MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, DelegatingMailboxListener delegatingMailboxListener) throws Exception { + return CassandraMessageIdManagerTestSystem.createTestingData(cassandra, quotaManager, delegatingMailboxListener); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/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 6b9a519..8133113 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 @@ -25,7 +25,6 @@ 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; import org.junit.AfterClass; @@ -62,8 +61,6 @@ public class CassandraMessageIdManagerStorageTest extends AbstractMessageIdManag @Override protected MessageIdManagerTestSystem createTestingData() throws Exception { - DefaultDelegatingMailboxListener mailboxListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(mailboxListener); - return CassandraMessageIdManagerTestSystem.createTestingData(cassandra, new NoQuotaManager(), mailboxEventDispatcher); + return CassandraMessageIdManagerTestSystem.createTestingData(cassandra, new NoQuotaManager(), new DefaultDelegatingMailboxListener()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java index 31eefc2..34e6236 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java @@ -24,16 +24,16 @@ import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.quota.CurrentQuotaManager; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.store.MessageIdManagerTestSystem; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater; import org.apache.james.mailbox.store.quota.StoreCurrentQuotaManager; public class CassandraMessageIdManagerTestSystem { - public static MessageIdManagerTestSystem createTestingData(CassandraCluster cassandra, QuotaManager quotaManager, MailboxEventDispatcher dispatcher) throws Exception { + public static MessageIdManagerTestSystem createTestingData(CassandraCluster cassandra, QuotaManager quotaManager, DelegatingMailboxListener delegatingMailboxListener) throws Exception { CassandraMailboxSessionMapperFactory mapperFactory = CassandraTestSystemFixture.createMapperFactory(cassandra); - return new MessageIdManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, dispatcher), + return new MessageIdManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, delegatingMailboxListener), new CassandraMessageId.Factory(), mapperFactory, CassandraTestSystemFixture.createMailboxManager(mapperFactory)) { @@ -46,9 +46,9 @@ public class CassandraMessageIdManagerTestSystem { CassandraMailboxManager mailboxManager = CassandraTestSystemFixture.createMailboxManager(mapperFactory); ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater( (StoreCurrentQuotaManager) currentQuotaManager, - mailboxManager.getQuotaRootResolver(), mailboxManager.getEventDispatcher(), quotaManager); + mailboxManager.getQuotaRootResolver(), mailboxManager.getDelegationListener(), quotaManager); mailboxManager.addGlobalListener(listeningCurrentQuotaUpdater, mailboxManager.createSystemSession("System")); - return new MessageIdManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, mailboxManager.getEventDispatcher()), + return new MessageIdManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, mailboxManager.getDelegationListener()), new CassandraMessageId.Factory(), mapperFactory, mailboxManager); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java index 6e70274..916029a 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java @@ -40,7 +40,7 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreMessageIdManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; import org.apache.james.mailbox.store.quota.StoreQuotaManager; @@ -60,24 +60,23 @@ public class CassandraTestSystemFixture { public static CassandraMailboxManager createMailboxManager(CassandraMailboxSessionMapperFactory mapperFactory) throws Exception { DefaultDelegatingMailboxListener delegatingMailboxListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingMailboxListener); - StoreRightManager storeRightManager = new StoreRightManager(mapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), delegatingMailboxListener); StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mapperFactory, storeRightManager); CassandraMailboxManager cassandraMailboxManager = new CassandraMailboxManager(mapperFactory, mock(Authenticator.class), mock(Authorizator.class), new NoMailboxPathLocker(), new MessageParser(), new CassandraMessageId.Factory(), - mailboxEventDispatcher, delegatingMailboxListener, annotationManager, storeRightManager); + delegatingMailboxListener, annotationManager, storeRightManager); cassandraMailboxManager.init(); return cassandraMailboxManager; } - public static StoreMessageIdManager createMessageIdManager(CassandraMailboxSessionMapperFactory mapperFactory, QuotaManager quotaManager, MailboxEventDispatcher dispatcher) throws Exception { + public static StoreMessageIdManager createMessageIdManager(CassandraMailboxSessionMapperFactory mapperFactory, QuotaManager quotaManager, DelegatingMailboxListener delegatingMailboxListener) throws Exception { CassandraMailboxManager mailboxManager = createMailboxManager(mapperFactory); return new StoreMessageIdManager( mailboxManager, mapperFactory, - dispatcher, + delegatingMailboxListener, new CassandraMessageId.Factory(), quotaManager, new DefaultUserQuotaRootResolver(mailboxManager, mapperFactory)); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java index d850be4..be88f00 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java @@ -39,7 +39,6 @@ import org.apache.james.mailbox.store.NoMailboxPathLocker; import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.junit.After; @@ -88,20 +87,19 @@ public class CassandraMailboxManagerAttachmentTest extends AbstractMailboxManage Authenticator noAuthenticator = null; Authorizator noAuthorizator = null; DefaultDelegatingMailboxListener delegatingMailboxListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingMailboxListener); - StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), delegatingMailboxListener); StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mailboxSessionMapperFactory, storeRightManager); mailboxManager = new CassandraMailboxManager(mailboxSessionMapperFactory, noAuthenticator, noAuthorizator, new NoMailboxPathLocker(), new MessageParser(), - messageIdFactory, mailboxEventDispatcher, delegatingMailboxListener, annotationManager, storeRightManager); + messageIdFactory, delegatingMailboxListener, annotationManager, storeRightManager); mailboxManager.init(); MessageParser failingMessageParser = mock(MessageParser.class); when(failingMessageParser.retrieveAttachments(any())) .thenThrow(new RuntimeException("Message parser set to fail")); parseFailingMailboxManager = new CassandraMailboxManager(mailboxSessionMapperFactory, noAuthenticator, noAuthorizator, new NoMailboxPathLocker(), failingMessageParser, messageIdFactory, - mailboxEventDispatcher, delegatingMailboxListener, annotationManager, storeRightManager); + delegatingMailboxListener, annotationManager, storeRightManager); parseFailingMailboxManager.init(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java index bb8b1bf..f31e363 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java @@ -120,7 +120,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest messageIdManager = new StoreMessageIdManager( storeMailboxManager, storeMailboxManager.getMapperFactory(), - storeMailboxManager.getEventDispatcher(), + storeMailboxManager.getDelegationListener(), storeMailboxManager.getMessageIdFactory(), storeMailboxManager.getQuotaManager(), storeMailboxManager.getQuotaRootResolver()); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java index c3f7399..d8e9759 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java @@ -33,7 +33,6 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DelegatingMailboxListener; -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.MessageParser; import org.apache.james.mailbox.store.transaction.Mapper; @@ -55,12 +54,11 @@ public abstract class JPAMailboxManager extends StoreMailboxManager { MessageParser messageParser, MessageId.Factory messageIdFactory, DelegatingMailboxListener delegatingMailboxListener, - MailboxEventDispatcher mailboxEventDispatcher, StoreMailboxAnnotationManager annotationManager, StoreRightManager storeRightManager) { super(mailboxSessionMapperFactory, authenticator, authorizator, locker, messageParser, messageIdFactory, annotationManager, - mailboxEventDispatcher, delegatingMailboxListener, storeRightManager); + delegatingMailboxListener, storeRightManager); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java index bdfcb91..e718f95 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java @@ -37,7 +37,7 @@ import org.apache.james.mailbox.store.BatchSizes; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.StoreMessageManager; import org.apache.james.mailbox.store.StoreRightManager; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; @@ -51,7 +51,7 @@ public class JPAMessageManager extends StoreMessageManager { public JPAMessageManager(MailboxSessionMapperFactory mapperFactory, MessageSearchIndex index, - MailboxEventDispatcher dispatcher, + DelegatingMailboxListener delegatingMailboxListener, MailboxPathLocker locker, Mailbox mailbox, QuotaManager quotaManager, @@ -61,7 +61,7 @@ public class JPAMessageManager extends StoreMessageManager { BatchSizes batchSizes, StoreRightManager storeRightManager) { - super(JPAMailboxManager.DEFAULT_NO_MESSAGE_CAPABILITIES, mapperFactory, index, dispatcher, locker, mailbox, + super(JPAMailboxManager.DEFAULT_NO_MESSAGE_CAPABILITIES, mapperFactory, index, delegatingMailboxListener, locker, mailbox, quotaManager, quotaRootResolver, messageParser, messageIdFactory, batchSizes, storeRightManager); } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java index 8dfedfe..2d637f4 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java @@ -33,7 +33,6 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreMessageManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DelegatingMailboxListener; -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.MessageParser; @@ -50,11 +49,10 @@ public class OpenJPAMailboxManager extends JPAMailboxManager { MessageParser messageParser, MessageId.Factory messageIdFactory, DelegatingMailboxListener delegatingMailboxListener, - MailboxEventDispatcher mailboxEventDispatcher, StoreMailboxAnnotationManager annotationManager, StoreRightManager storeRightManager) { super(mapperFactory, authenticator, authorizator, new JVMMailboxPathLocker(), messageParser, - messageIdFactory, delegatingMailboxListener, mailboxEventDispatcher, annotationManager, storeRightManager); + messageIdFactory, delegatingMailboxListener, annotationManager, storeRightManager); } protected AdvancedFeature getAdvancedFeature() { @@ -65,7 +63,7 @@ public class OpenJPAMailboxManager extends JPAMailboxManager { protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) { return new OpenJPAMessageManager(getMapperFactory(), getMessageSearchIndex(), - getEventDispatcher(), + getDelegationListener(), getLocker(), mailboxRow, getAdvancedFeature(), http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java index d5ce35c..2e96d5c 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java @@ -38,7 +38,7 @@ import org.apache.james.mailbox.quota.QuotaRootResolver; import org.apache.james.mailbox.store.BatchSizes; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.StoreRightManager; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; @@ -59,13 +59,13 @@ public class OpenJPAMessageManager extends JPAMessageManager { } public OpenJPAMessageManager(MailboxSessionMapperFactory mapperFactory, - MessageSearchIndex index, MailboxEventDispatcher dispatcher, + MessageSearchIndex index, DelegatingMailboxListener delegatingMailboxListener, MailboxPathLocker locker, Mailbox mailbox, AdvancedFeature f, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, MessageParser messageParser, MessageId.Factory messageIdFactory, BatchSizes batchSizes, StoreRightManager storeRightManager) { - super(mapperFactory, index, dispatcher, locker, mailbox, quotaManager, quotaRootResolver, + super(mapperFactory, index, delegatingMailboxListener, locker, mailbox, quotaManager, quotaRootResolver, messageParser, messageIdFactory, batchSizes, storeRightManager); this.feature = f; } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml index cb0f321..6c0901f 100644 --- a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml +++ b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml @@ -39,9 +39,8 @@ <constructor-arg index="3" ref="messageParser"/> <constructor-arg index="4" ref="messageIdFactory"/> <constructor-arg index="5" ref="delegating-listener"/> - <constructor-arg index="6" ref="dispatcher"/> - <constructor-arg index="7" ref="storeMailboxAnnotationManager"/> - <constructor-arg index="8" ref="storeRightManager" /> + <constructor-arg index="6" ref="storeMailboxAnnotationManager"/> + <constructor-arg index="7" ref="storeRightManager" /> <property name="quotaManager" ref="quotaManager"/> <property name="quotaRootResolver" ref="quotaRootResolver"/> <property name="quotaUpdater" ref="quotaUpdater"/> http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java index 76555dc..c66a734 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java @@ -36,7 +36,6 @@ import org.apache.james.mailbox.store.JVMMailboxPathLocker; import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; @@ -57,13 +56,12 @@ public class JpaMailboxManagerProvider { Authenticator noAuthenticator = null; Authorizator noAuthorizator = null; DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingListener); - StoreRightManager storeRightManager = new StoreRightManager(mf, aclResolver, groupMembershipResolver, mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mf, aclResolver, groupMembershipResolver, delegatingListener); StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mf, storeRightManager, LIMIT_ANNOTATIONS, LIMIT_ANNOTATION_SIZE); OpenJPAMailboxManager openJPAMailboxManager = new OpenJPAMailboxManager(mf, noAuthenticator, noAuthorizator, messageParser, new DefaultMessageId.Factory(), - delegatingListener, mailboxEventDispatcher, annotationManager, + delegatingListener, annotationManager, storeRightManager); try { http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java index 45b5093..ac4ac1e 100644 --- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java +++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java @@ -43,7 +43,7 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest messageIdManager = new StoreMessageIdManager( storeMailboxManager, storeMailboxManager.getMapperFactory(), - storeMailboxManager.getEventDispatcher(), + storeMailboxManager.getDelegationListener(), storeMailboxManager.getMessageIdFactory(), storeMailboxManager.getQuotaManager(), storeMailboxManager.getQuotaRootResolver()); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml index ca75508..eb364f3 100644 --- a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml +++ b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml @@ -42,9 +42,8 @@ <constructor-arg index="4" ref="messageParser"/> <constructor-arg index="5" ref="messageIdFactory" /> <constructor-arg index="6" ref="storeMailboxAnnotationManager" /> - <constructor-arg index="7" ref="dispatcher" /> - <constructor-arg index="8" ref="delegating-listener" /> - <constructor-arg index="9" ref="storeRightManager" /> + <constructor-arg index="7" ref="delegating-listener" /> + <constructor-arg index="8" ref="storeRightManager" /> <!-- <property name="messageSearchIndex" ref="lazyIndex"/> --> <property name="quotaManager" ref="quotaManager"/> <property name="quotaRootResolver" ref="quotaRootResolver"/> http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java index 8b632bd..2d5165c 100644 --- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java +++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java @@ -34,7 +34,6 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.junit.rules.TemporaryFolder; @@ -52,16 +51,14 @@ public class MaildirMailboxManagerProvider { GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver(); MessageParser messageParser = new MessageParser(); DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingListener); - StoreRightManager storeRightManager = new StoreRightManager(mf, aclResolver, groupMembershipResolver, mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mf, aclResolver, groupMembershipResolver, delegatingListener); Authenticator noAuthenticator = null; Authorizator noAuthorizator = null; StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mf, storeRightManager); StoreMailboxManager manager = new StoreMailboxManager(mf, noAuthenticator, noAuthorizator, new JVMMailboxPathLocker(), - messageParser, new DefaultMessageId.Factory(), annotationManager, - mailboxEventDispatcher, delegatingListener, storeRightManager); + messageParser, new DefaultMessageId.Factory(), annotationManager, delegatingListener, storeRightManager); manager.init(); return manager; http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java index 3d27c79..821e4e3 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java @@ -34,7 +34,6 @@ import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreMessageManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DelegatingMailboxListener; -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.MessageParser; import org.apache.james.mailbox.store.search.MessageSearchIndex; @@ -51,13 +50,12 @@ public class InMemoryMailboxManager extends StoreMailboxManager { @Inject public InMemoryMailboxManager(MailboxSessionMapperFactory mailboxSessionMapperFactory, Authenticator authenticator, Authorizator authorizator, - MailboxPathLocker locker, MessageParser messageParser, MessageId.Factory messageIdFactory, MailboxEventDispatcher dispatcher, + MailboxPathLocker locker, MessageParser messageParser, MessageId.Factory messageIdFactory, DelegatingMailboxListener delegatingMailboxListener, StoreMailboxAnnotationManager annotationManager, StoreRightManager storeRightManager) { super(mailboxSessionMapperFactory, authenticator, authorizator, locker, messageParser, messageIdFactory, - annotationManager, dispatcher, - delegatingMailboxListener, storeRightManager); + annotationManager, delegatingMailboxListener, storeRightManager); } @Override @@ -80,7 +78,7 @@ public class InMemoryMailboxManager extends StoreMailboxManager { protected StoreMessageManager createMessageManager(Mailbox mailbox, MailboxSession session) { return new InMemoryMessageManager(getMapperFactory(), getMessageSearchIndex(), - getEventDispatcher(), + getDelegationListener(), getLocker(), mailbox, getQuotaManager(), http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java index 354f343..e2ef5cf 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java @@ -15,7 +15,7 @@ import org.apache.james.mailbox.store.BatchSizes; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.StoreMessageManager; import org.apache.james.mailbox.store.StoreRightManager; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; @@ -29,7 +29,7 @@ public class InMemoryMessageManager extends StoreMessageManager { public InMemoryMessageManager(MailboxSessionMapperFactory mapperFactory, MessageSearchIndex index, - MailboxEventDispatcher dispatcher, + DelegatingMailboxListener delegatingMailboxListener, MailboxPathLocker locker, Mailbox mailbox, QuotaManager quotaManager, @@ -39,7 +39,7 @@ public class InMemoryMessageManager extends StoreMessageManager { BatchSizes batchSizes, StoreRightManager storeRightManager) { - super(InMemoryMailboxManager.MESSAGE_CAPABILITIES, mapperFactory, index, dispatcher, locker, mailbox, quotaManager, quotaRootResolver, + super(InMemoryMailboxManager.MESSAGE_CAPABILITIES, mapperFactory, index, delegatingMailboxListener, locker, mailbox, quotaManager, quotaRootResolver, messageParser, messageIdFactory, batchSizes, storeRightManager); this.mapperFactory = (InMemoryMailboxSessionMapperFactory) mapperFactory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml index 7857d0f..db25210 100644 --- a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml +++ b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml @@ -38,10 +38,9 @@ <constructor-arg index="3" ref="memory-locker"/> <constructor-arg index="4" ref="messageParser"/> <constructor-arg index="5" ref="messageIdFactory" /> - <constructor-arg index="6" ref="dispatcher" /> - <constructor-arg index="7" ref="delegating-listener" /> - <constructor-arg index="8" ref="storeMailboxAnnotationManager" /> - <constructor-arg index="9" ref="storeRightManager" /> + <constructor-arg index="6" ref="delegating-listener" /> + <constructor-arg index="7" ref="storeMailboxAnnotationManager" /> + <constructor-arg index="8" ref="storeRightManager" /> <!-- <property name="messageSearchIndex" ref="lazyIndex"/> --> <property name="quotaManager" ref="quotaManager"/> <property name="quotaRootResolver" ref="quotaRootResolver"/> http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java index 51f993d..8217e54 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java @@ -40,7 +40,6 @@ import org.apache.james.mailbox.store.NoMailboxPathLocker; import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.junit.Before; @@ -59,21 +58,20 @@ public class InMemoryMailboxManagerAttachmentTest extends AbstractMailboxManager Authenticator noAuthenticator = null; Authorizator noAuthorizator = null; DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingListener); MessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); GroupMembershipResolver groupMembershipResolver = null; UnionMailboxACLResolver aclResolver = new UnionMailboxACLResolver(); - StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, aclResolver, groupMembershipResolver, mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, aclResolver, groupMembershipResolver, delegatingListener); StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mailboxSessionMapperFactory, storeRightManager); mailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, noAuthenticator, noAuthorizator, new NoMailboxPathLocker(), - new MessageParser(), messageIdFactory, mailboxEventDispatcher, delegatingListener, annotationManager, storeRightManager); + new MessageParser(), messageIdFactory, delegatingListener, annotationManager, storeRightManager); mailboxManager.init(); MessageParser failingMessageParser = mock(MessageParser.class); when(failingMessageParser.retrieveAttachments(any(InputStream.class))) .thenThrow(new RuntimeException("Message parser set to fail")); parseFailingMailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, noAuthenticator, noAuthorizator, new NoMailboxPathLocker(), - failingMessageParser, messageIdFactory, mailboxEventDispatcher, delegatingListener, annotationManager, storeRightManager); + failingMessageParser, messageIdFactory, delegatingListener, annotationManager, storeRightManager); parseFailingMailboxManager.init(); super.setUp(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java index 4255f82..829ef92 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java @@ -48,7 +48,6 @@ import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreMessageIdManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; @@ -141,9 +140,8 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS); InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory(); DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingListener); StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), - groupMembershipResolver, mailboxEventDispatcher); + groupMembershipResolver, delegatingListener); StoreMailboxAnnotationManager annotationManager = annotationManagerBiFunction .apply(storeRightManager, mailboxSessionMapperFactory); @@ -154,7 +152,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM new JVMMailboxPathLocker(), new MessageParser(), new InMemoryMessageId.Factory(), - mailboxEventDispatcher, delegatingListener, annotationManager, storeRightManager); @@ -179,8 +176,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM Authenticator authenticator, Authorizator authorizator) throws MailboxException { InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory(); DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingListener); - StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), groupMembershipResolver, mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), groupMembershipResolver, delegatingListener); StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mailboxSessionMapperFactory, storeRightManager); StoreMailboxManager manager = new InMemoryMailboxManager( @@ -190,7 +186,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM new NoMailboxPathLocker(), new MessageParser(), new InMemoryMessageId.Factory(), - mailboxEventDispatcher, delegatingListener, annotationManager, storeRightManager); @@ -207,7 +202,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM return new StoreMessageIdManager( mailboxManager, mailboxManager.getMapperFactory(), - mailboxManager.getEventDispatcher(), + mailboxManager.getDelegationListener(), factory, mailboxManager.getQuotaManager(), mailboxManager.getQuotaRootResolver()); @@ -221,7 +216,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM InMemoryCurrentQuotaManager currentQuotaManager = createCurrentQuotaManager(mailboxManager); StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, maxQuotaManager); - ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, mailboxManager.getEventDispatcher(), quotaManager); + ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, mailboxManager.getDelegationListener(), quotaManager); mailboxManager.setQuotaManager(quotaManager); mailboxManager.addGlobalListener(listeningCurrentQuotaUpdater, null); return quotaManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java index feba1f4..329181d 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java @@ -34,8 +34,7 @@ import org.apache.james.mailbox.store.MessageIdManagerTestSystem; import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreMessageIdManager; import org.apache.james.mailbox.store.StoreRightManager; -import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; import org.junit.Before; @@ -49,7 +48,7 @@ public class InMemoryMessageIdManagerSideEffectTest extends AbstractMessageIdMan } @Override - protected MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, MailboxEventDispatcher dispatcher) { + protected MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, DelegatingMailboxListener delegatingMailboxListener) { InMemoryMailboxSessionMapperFactory mapperFactory = new InMemoryMailboxSessionMapperFactory(); FakeAuthenticator fakeAuthenticator = new FakeAuthenticator(); @@ -57,7 +56,7 @@ public class InMemoryMessageIdManagerSideEffectTest extends AbstractMessageIdMan fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS); FakeAuthorizator fakeAuthorizator = FakeAuthorizator.defaultReject(); - StoreRightManager rightManager = new StoreRightManager(mapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), dispatcher); + StoreRightManager rightManager = new StoreRightManager(mapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), delegatingMailboxListener); JVMMailboxPathLocker locker = new JVMMailboxPathLocker(); InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); InMemoryMailboxManager mailboxManager = new InMemoryMailboxManager(mapperFactory, @@ -66,14 +65,13 @@ public class InMemoryMessageIdManagerSideEffectTest extends AbstractMessageIdMan locker, new MessageParser(), messageIdFactory, - dispatcher, - new DefaultDelegatingMailboxListener(), + delegatingMailboxListener, new StoreMailboxAnnotationManager(mapperFactory, rightManager), rightManager); StoreMessageIdManager messageIdManager = new StoreMessageIdManager( mailboxManager, mapperFactory, - dispatcher, + delegatingMailboxListener, messageIdFactory, quotaManager, new DefaultUserQuotaRootResolver(mailboxManager, mapperFactory)); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java b/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java index 437e292..3691e39 100644 --- a/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java +++ b/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java @@ -44,7 +44,7 @@ public class SimpleMessageSearchIndexTest extends AbstractMessageSearchIndexTest messageIdManager = new StoreMessageIdManager( storeMailboxManager, storeMailboxManager.getMapperFactory(), - storeMailboxManager.getEventDispatcher(), + storeMailboxManager.getDelegationListener(), storeMailboxManager.getMessageIdFactory(), storeMailboxManager.getQuotaManager(), storeMailboxManager.getQuotaRootResolver()); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/spring/src/main/resources/META-INF/spring/quota.xml ---------------------------------------------------------------------- diff --git a/mailbox/spring/src/main/resources/META-INF/spring/quota.xml b/mailbox/spring/src/main/resources/META-INF/spring/quota.xml index faae187..a284b14 100644 --- a/mailbox/spring/src/main/resources/META-INF/spring/quota.xml +++ b/mailbox/spring/src/main/resources/META-INF/spring/quota.xml @@ -54,7 +54,7 @@ <bean id="eventQuotaUpdater" class="org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater" lazy-init="true"> <constructor-arg index="0" ref="currentQuotaManager"/> <constructor-arg index="1" ref="quotaRootResolver"/> - <constructor-arg index="2" ref="dispatcher"/> + <constructor-arg index="2" ref="delegating-listener"/> <constructor-arg index="3" ref="storeQuotaManager"/> </bean> http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml ---------------------------------------------------------------------- diff --git a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml index eecd37c..b7ae58a 100644 --- a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml +++ b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml @@ -63,13 +63,9 @@ <constructor-arg index="0" ref="messageMapperFactory" /> <constructor-arg index="1" ref="aclResolver" /> <constructor-arg index="2" ref="groupMembershipResolver" /> - <constructor-arg index="3" ref="dispatcher" /> + <constructor-arg index="3" ref="delegating-listener" /> </bean> <alias name="default-delegating-listener" alias="delegating-listener"/> - <bean id="dispatcher" class="org.apache.james.mailbox.store.event.MailboxEventDispatcher"> - <constructor-arg index="0" ref="delegating-listener"/> - </bean> - </beans> http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index c281068..310fa05 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -71,7 +71,6 @@ import org.apache.james.mailbox.quota.QuotaRootResolver; import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.event.EventFactory; import org.apache.james.mailbox.store.event.MailboxAnnotationListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageMapper; @@ -110,7 +109,6 @@ public class StoreMailboxManager implements MailboxManager { public static final char SQL_WILDCARD_CHAR = '%'; public static final EnumSet<MessageCapabilities> DEFAULT_NO_MESSAGE_CAPABILITIES = EnumSet.noneOf(MessageCapabilities.class); - private final MailboxEventDispatcher dispatcher; private final DelegatingMailboxListener delegatingListener; private final MailboxSessionMapperFactory mailboxSessionMapperFactory; @@ -148,10 +146,8 @@ public class StoreMailboxManager implements MailboxManager { public StoreMailboxManager(MailboxSessionMapperFactory mailboxSessionMapperFactory, Authenticator authenticator, Authorizator authorizator, MailboxPathLocker locker, MessageParser messageParser, MessageId.Factory messageIdFactory, MailboxAnnotationManager annotationManager, - MailboxEventDispatcher mailboxEventDispatcher, DelegatingMailboxListener delegatingListener, StoreRightManager storeRightManager) { Preconditions.checkNotNull(delegatingListener); - Preconditions.checkNotNull(mailboxEventDispatcher); Preconditions.checkNotNull(mailboxSessionMapperFactory); this.annotationManager = annotationManager; @@ -162,7 +158,6 @@ public class StoreMailboxManager implements MailboxManager { this.messageParser = messageParser; this.messageIdFactory = messageIdFactory; this.delegatingListener = delegatingListener; - this.dispatcher = mailboxEventDispatcher; this.storeRightManager = storeRightManager; } @@ -290,14 +285,6 @@ public class StoreMailboxManager implements MailboxManager { return quotaManager; } - /** - * Return the {@link MailboxEventDispatcher} used by thei {@link MailboxManager} - * - * @return dispatcher - */ - public MailboxEventDispatcher getEventDispatcher() { - return dispatcher; - } /** * Return the {@link MailboxSessionMapperFactory} used by this {@link MailboxManager} @@ -430,7 +417,7 @@ public class StoreMailboxManager implements MailboxManager { * @return storeMailbox */ protected StoreMessageManager createMessageManager(Mailbox mailbox, MailboxSession session) throws MailboxException { - return new StoreMessageManager(DEFAULT_NO_MESSAGE_CAPABILITIES, getMapperFactory(), getMessageSearchIndex(), getEventDispatcher(), + return new StoreMessageManager(DEFAULT_NO_MESSAGE_CAPABILITIES, getMapperFactory(), getMessageSearchIndex(), getDelegationListener(), getLocker(), mailbox, getQuotaManager(), getQuotaRootResolver(), getMessageParser(), getMessageIdFactory(), getBatchSizes(), getStoreRightManager()); @@ -525,7 +512,7 @@ public class StoreMailboxManager implements MailboxManager { try { mapper.execute(Mapper.toTransaction(() -> mailboxIds.add(mapper.save(m)))); // notify listeners - dispatcher.event(EventFactory.mailboxAdded() + delegatingListener.event(EventFactory.mailboxAdded() .mailboxSession(mailboxSession) .mailbox(m) .build()); @@ -572,7 +559,7 @@ public class StoreMailboxManager implements MailboxManager { // mailbox once we remove it SimpleMailbox m = new SimpleMailbox(mailbox); mailboxMapper.delete(mailbox); - dispatcher.event(EventFactory.mailboxDeleted() + delegatingListener.event(EventFactory.mailboxDeleted() .mailboxSession(session) .mailbox(mailbox) .quotaRoot(quotaRoot) @@ -617,7 +604,7 @@ public class StoreMailboxManager implements MailboxManager { mailbox.setName(to.getName()); mapper.save(mailbox); - dispatcher.event(EventFactory.mailboxRenamed() + delegatingListener.event(EventFactory.mailboxRenamed() .mailboxSession(session) .mailboxId(mailbox.getMailboxId()) .oldPath(from) @@ -634,7 +621,7 @@ public class StoreMailboxManager implements MailboxManager { MailboxPath fromPath = new MailboxPath(children, subOriginalName); sub.setName(subNewName); mapper.save(sub); - dispatcher.event(EventFactory.mailboxRenamed() + delegatingListener.event(EventFactory.mailboxRenamed() .mailboxSession(session) .mailboxId(sub.getMailboxId()) .oldPath(fromPath) http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java index 8554380..7e01114 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java @@ -51,8 +51,8 @@ import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.model.UpdatedFlags; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.event.EventFactory; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageIdMapper; import org.apache.james.mailbox.store.mail.MessageMapper; @@ -101,18 +101,18 @@ public class StoreMessageIdManager implements MessageIdManager { private final MailboxManager mailboxManager; private final MailboxSessionMapperFactory mailboxSessionMapperFactory; - private final MailboxEventDispatcher dispatcher; + private final DelegatingMailboxListener delegatingMailboxListener; private final MessageId.Factory messageIdFactory; private final QuotaManager quotaManager; private final QuotaRootResolver quotaRootResolver; @Inject public StoreMessageIdManager(MailboxManager mailboxManager, MailboxSessionMapperFactory mailboxSessionMapperFactory, - MailboxEventDispatcher dispatcher, MessageId.Factory messageIdFactory, + DelegatingMailboxListener delegatingMailboxListener, MessageId.Factory messageIdFactory, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver) { this.mailboxManager = mailboxManager; this.mailboxSessionMapperFactory = mailboxSessionMapperFactory; - this.dispatcher = dispatcher; + this.delegatingMailboxListener = delegatingMailboxListener; this.messageIdFactory = messageIdFactory; this.quotaManager = quotaManager; this.quotaRootResolver = quotaRootResolver; @@ -218,7 +218,7 @@ public class StoreMessageIdManager implements MessageIdManager { MailboxMapper mailboxMapper = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession); for (MetadataWithMailboxId metadataWithMailboxId : metadataWithMailbox) { - dispatcher.event(EventFactory.expunged() + delegatingMailboxListener.event(EventFactory.expunged() .mailboxSession(mailboxSession) .mailbox(mailboxMapper.findMailboxById(metadataWithMailboxId.mailboxId)) .addMetaData(metadataWithMailboxId.messageMetaData) @@ -285,7 +285,7 @@ public class StoreMessageIdManager implements MessageIdManager { addMessageToMailboxes(mailboxMessage, messageMoves.addedMailboxIds(), mailboxSession); removeMessageFromMailboxes(mailboxMessage, messageMoves.removedMailboxIds(), mailboxSession); - dispatcher.event(EventFactory.moved() + delegatingMailboxListener.event(EventFactory.moved() .session(mailboxSession) .messageMoves(messageMoves) .messageId(mailboxMessage.getMessageId()) @@ -299,7 +299,7 @@ public class StoreMessageIdManager implements MessageIdManager { for (MailboxId mailboxId: mailboxesToRemove) { messageIdMapper.delete(message.getMessageId(), mailboxesToRemove); - dispatcher.event(EventFactory.expunged() + delegatingMailboxListener.event(EventFactory.expunged() .mailboxSession(mailboxSession) .mailbox(mailboxMapper.findMailboxById(mailboxId)) .addMetaData(eventPayload) @@ -315,7 +315,7 @@ public class StoreMessageIdManager implements MessageIdManager { if (updatedFlags.flagsChanged()) { Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxById(mailboxId); - dispatcher.event(EventFactory.flagsUpdated() + delegatingMailboxListener.event(EventFactory.flagsUpdated() .mailboxSession(mailboxSession) .mailbox(mailbox) .updatedFlag(updatedFlags) @@ -381,7 +381,7 @@ public class StoreMessageIdManager implements MessageIdManager { .build(); save(mailboxSession, messageIdMapper, copy); - dispatcher.event(EventFactory.added() + delegatingMailboxListener.event(EventFactory.added() .mailboxSession(mailboxSession) .mailbox(mailboxMapper.findMailboxById(mailboxId)) .addMessage(copy) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org