http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java index 6ec668d..4b5e994 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java @@ -65,8 +65,8 @@ import org.apache.james.mailbox.model.SearchQuery; 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.MessageMapper; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; import org.apache.james.mailbox.store.mail.model.Mailbox; @@ -133,36 +133,25 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana private static final Logger LOG = LoggerFactory.getLogger(StoreMessageManager.class); private final EnumSet<MailboxManager.MessageCapabilities> messageCapabilities; - + private final DelegatingMailboxListener delegatingMailboxListener; private final Mailbox mailbox; - - private final MailboxEventDispatcher dispatcher; - private final MailboxSessionMapperFactory mapperFactory; - private final MessageSearchIndex index; - private final StoreRightManager storeRightManager; - private final QuotaManager quotaManager; - private final QuotaRootResolver quotaRootResolver; - private final MailboxPathLocker locker; - private final MessageParser messageParser; - private final Factory messageIdFactory; - - private BatchSizes batchSizes = BatchSizes.defaultValues(); + private final BatchSizes batchSizes; - public StoreMessageManager(EnumSet<MailboxManager.MessageCapabilities> messageCapabilities, MailboxSessionMapperFactory mapperFactory, MessageSearchIndex index, MailboxEventDispatcher dispatcher, + public StoreMessageManager(EnumSet<MailboxManager.MessageCapabilities> messageCapabilities, MailboxSessionMapperFactory mapperFactory, MessageSearchIndex index, DelegatingMailboxListener delegatingMailboxListener, MailboxPathLocker locker, Mailbox mailbox, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, MessageParser messageParser, MessageId.Factory messageIdFactory, BatchSizes batchSizes, StoreRightManager storeRightManager) { this.messageCapabilities = messageCapabilities; + this.delegatingMailboxListener = delegatingMailboxListener; this.mailbox = mailbox; - this.dispatcher = dispatcher; this.mapperFactory = mapperFactory; this.index = index; this.locker = locker; @@ -188,15 +177,6 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana } /** - * Return the {@link MailboxEventDispatcher} for this Mailbox - * - * @return dispatcher - */ - protected MailboxEventDispatcher getDispatcher() { - return dispatcher; - } - - /** * Return the underlying {@link Mailbox} * * @return mailbox @@ -276,7 +256,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana } Map<MessageUid, MessageMetaData> uids = deleteMarkedInMailbox(set, mailboxSession); - dispatcher.event(EventFactory.expunged() + delegatingMailboxListener.event(EventFactory.expunged() .mailboxSession(mailboxSession) .mailbox(getMailboxEntity()) .metaData(ImmutableSortedMap.copyOf(uids)) @@ -422,7 +402,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana Mailbox mailbox = getMailboxEntity(); MailboxMessage copy = copyMessage(message); - dispatcher.event(EventFactory.added() + delegatingMailboxListener.event(EventFactory.added() .mailboxSession(mailboxSession) .mailbox(mailbox) .addMessage(copy) @@ -583,7 +563,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana Iterator<UpdatedFlags> it = messageMapper.execute(() -> messageMapper.updateFlags(getMailboxEntity(), new FlagsUpdateCalculator(flags, flagsUpdateMode), set)); List<UpdatedFlags> updatedFlags = Iterators.toStream(it).collect(Guavate.toImmutableList()); - dispatcher.event(EventFactory.flagsUpdated() + delegatingMailboxListener.event(EventFactory.flagsUpdated() .mailboxSession(mailboxSession) .mailbox(getMailboxEntity()) .updatedFlags(updatedFlags) @@ -746,12 +726,12 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana messageIds.add(message.getMessageId()); } - dispatcher.event(EventFactory.added() + delegatingMailboxListener.event(EventFactory.added() .mailboxSession(session) .mailbox(to.getMailboxEntity()) .metaData(copiedUids) .build()); - dispatcher.event(EventFactory.moved() + delegatingMailboxListener.event(EventFactory.moved() .session(session) .messageMoves(MessageMoves.builder() .previousMailboxIds(getMailboxEntity().getMailboxId()) @@ -774,17 +754,17 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana messageIds.add(message.getMessageId()); } - dispatcher.event(EventFactory.added() + delegatingMailboxListener.event(EventFactory.added() .mailboxSession(session) .mailbox(to.getMailboxEntity()) .metaData(moveUids) .build()); - dispatcher.event(EventFactory.expunged() + delegatingMailboxListener.event(EventFactory.expunged() .mailboxSession(session) .mailbox(getMailboxEntity()) .addMetaData(moveResult.getOriginalMessages()) .build()); - dispatcher.event(EventFactory.moved() + delegatingMailboxListener.event(EventFactory.moved() .messageMoves(MessageMoves.builder() .previousMailboxIds(getMailboxEntity().getMailboxId()) .targetMailboxIds(to.getMailboxEntity().getMailboxId())
http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java index df0924c..bcd6959 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java @@ -43,8 +43,8 @@ import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights; import org.apache.james.mailbox.model.MailboxACL.Right; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; +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.model.Mailbox; @@ -55,7 +55,7 @@ import com.google.common.collect.ImmutableMap; public class StoreRightManager implements RightManager { public static final boolean GROUP_FOLDER = true; - private final MailboxEventDispatcher dispatcher; + private final DelegatingMailboxListener delegatingMailboxListener; private final MailboxSessionMapperFactory mailboxSessionMapperFactory; private final MailboxACLResolver aclResolver; private final GroupMembershipResolver groupMembershipResolver; @@ -64,11 +64,11 @@ public class StoreRightManager implements RightManager { public StoreRightManager(MailboxSessionMapperFactory mailboxSessionMapperFactory, MailboxACLResolver aclResolver, GroupMembershipResolver groupMembershipResolver, - MailboxEventDispatcher dispatcher) { + DelegatingMailboxListener delegatingMailboxListener) { this.mailboxSessionMapperFactory = mailboxSessionMapperFactory; this.aclResolver = aclResolver; this.groupMembershipResolver = groupMembershipResolver; - this.dispatcher = dispatcher; + this.delegatingMailboxListener = delegatingMailboxListener; } @Override @@ -139,7 +139,7 @@ public class StoreRightManager implements RightManager { Mailbox mailbox = mapper.findMailboxByPath(mailboxPath); ACLDiff aclDiff = mapper.updateACL(mailbox, mailboxACLCommand); - dispatcher.event(EventFactory.aclUpdated() + delegatingMailboxListener.event(EventFactory.aclUpdated() .mailboxSession(session) .mailbox(mailbox) .aclDiff(aclDiff) @@ -221,7 +221,7 @@ public class StoreRightManager implements RightManager { private void setRights(MailboxACL mailboxACL, MailboxMapper mapper, Mailbox mailbox, MailboxSession session) throws MailboxException { ACLDiff aclDiff = mapper.setACL(mailbox, mailboxACL); - dispatcher.event(EventFactory.aclUpdated() + delegatingMailboxListener.event(EventFactory.aclUpdated() .mailboxSession(session) .mailbox(mailbox) .aclDiff(aclDiff) http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/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 deleted file mode 100644 index d3d02ea..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.mailbox.store.event; - -import javax.inject.Inject; - -import org.apache.james.mailbox.Event; -import org.apache.james.mailbox.MailboxListener; - -/** - * Helper class to dispatch {@link org.apache.james.mailbox.Event}'s to registerend MailboxListener - */ -public class MailboxEventDispatcher { - private final MailboxListener listener; - - @Inject - public MailboxEventDispatcher(DelegatingMailboxListener delegatingMailboxListener) { - this.listener = delegatingMailboxListener; - } - - public void event(Event event) { - listener.event(event); - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/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 baa33fe..e27bccc 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 @@ -30,8 +30,8 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.QuotaRoot; 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,14 +41,14 @@ public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdat private final StoreCurrentQuotaManager currentQuotaManager; private final QuotaRootResolver quotaRootResolver; - private final MailboxEventDispatcher dispatcher; + private final DelegatingMailboxListener delegatingMailboxListener; private final QuotaManager quotaManager; @Inject - public ListeningCurrentQuotaUpdater(StoreCurrentQuotaManager currentQuotaManager, QuotaRootResolver quotaRootResolver, MailboxEventDispatcher dispatcher, QuotaManager quotaManager) { + public ListeningCurrentQuotaUpdater(StoreCurrentQuotaManager currentQuotaManager, QuotaRootResolver quotaRootResolver, DelegatingMailboxListener delegatingMailboxListener, QuotaManager quotaManager) { this.currentQuotaManager = currentQuotaManager; this.quotaRootResolver = quotaRootResolver; - this.dispatcher = dispatcher; + this.delegatingMailboxListener = delegatingMailboxListener; this.quotaManager = quotaManager; } @@ -89,7 +89,7 @@ public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdat if (addedCount != 0 && addedSize != 0) { currentQuotaManager.decrease(quotaRoot, addedCount, addedSize); } - dispatcher.event( + delegatingMailboxListener.event( EventFactory.quotaUpdated() .user(expunged.getUser()) .quotaRoot(quotaRoot) @@ -110,7 +110,7 @@ public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdat if (addedCount != 0 && addedSize != 0) { currentQuotaManager.increase(quotaRoot, addedCount, addedSize); } - dispatcher.event( + delegatingMailboxListener.event( EventFactory.quotaUpdated() .user(added.getUser()) .quotaRoot(quotaRoot) http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java index f1f2c2f..0ea9730 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java @@ -51,7 +51,7 @@ 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.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.Mailbox; import org.apache.james.mailbox.util.EventCollector; import org.assertj.core.api.AbstractListAssert; @@ -87,7 +87,7 @@ public abstract class AbstractMessageIdManagerSideEffectTest { private EventCollector eventCollector; private DefaultDelegatingMailboxListener delegatingMailboxListener; - protected abstract MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, MailboxEventDispatcher dispatcher) throws Exception; + protected abstract MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, DelegatingMailboxListener delegatingMailboxListener) throws Exception; public void setUp() throws Exception { delegatingMailboxListener = new DefaultDelegatingMailboxListener(); @@ -95,7 +95,7 @@ public abstract class AbstractMessageIdManagerSideEffectTest { quotaManager = mock(QuotaManager.class); session = MailboxSessionUtil.create(ALICE); - testingData = createTestSystem(quotaManager, new MailboxEventDispatcher(delegatingMailboxListener)); + testingData = createTestSystem(quotaManager, delegatingMailboxListener); messageIdManager = testingData.getMessageIdManager(); mailbox1 = testingData.createMailbox(MailboxFixture.INBOX_ALICE, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java index 0e549fe..fd31281 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java @@ -82,7 +82,7 @@ public class MessageIdManagerTestSystem { Mailbox mailbox = mapperFactory.getMailboxMapper(mailboxSession).findMailboxById(mailboxId); MailboxMessage message = createMessage(mailboxId, flags, messageId, uid); mapperFactory.getMessageMapper(mailboxSession).add(mailbox, message); - mailboxManager.getEventDispatcher().event(EventFactory.added() + mailboxManager.getDelegationListener().event(EventFactory.added() .mailboxSession(mailboxSession) .mailbox(mailbox) .addMessage(message) http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java index 1d29356..71e0e93 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java @@ -43,7 +43,6 @@ import org.apache.james.mailbox.model.TestId; import org.apache.james.mailbox.model.search.MailboxQuery; import org.apache.james.mailbox.model.search.PrefixedRegex; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; @@ -77,15 +76,14 @@ public class StoreMailboxManagerTest { authenticator.addUser(ADMIN, ADMIN_PASSWORD); DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingListener); StoreRightManager storeRightManager = new StoreRightManager(mockedMapperFactory, new UnionMailboxACLResolver(), - new SimpleGroupMembershipResolver(), mailboxEventDispatcher); + new SimpleGroupMembershipResolver(), delegatingListener); StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mockedMapperFactory, storeRightManager); storeMailboxManager = new StoreMailboxManager(mockedMapperFactory, authenticator, FakeAuthorizator.forUserAndAdmin(ADMIN, CURRENT_USER), new JVMMailboxPathLocker(), new MessageParser(), messageIdFactory, - annotationManager, mailboxEventDispatcher, delegatingListener, storeRightManager); + annotationManager, delegatingListener, storeRightManager); storeMailboxManager.init(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java index 0902262..5643181 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java @@ -46,7 +46,7 @@ import org.apache.james.mailbox.model.MailboxACL.ACLCommand; import org.apache.james.mailbox.model.MailboxACL.Right; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; @@ -69,14 +69,11 @@ public class StoreRightManagerTest { mockedMailboxMapper = mock(MailboxMapper.class); mailboxAclResolver = new UnionMailboxACLResolver(); groupMembershipResolver = new SimpleGroupMembershipResolver(); - MailboxEventDispatcher dispatcher = mock(MailboxEventDispatcher.class); + DelegatingMailboxListener delegatingMailboxListener = mock(DelegatingMailboxListener.class); when(mockedMapperFactory.getMailboxMapper(aliceSession)) .thenReturn(mockedMailboxMapper); - storeRightManager = new StoreRightManager(mockedMapperFactory, - mailboxAclResolver, - groupMembershipResolver, - dispatcher); + storeRightManager = new StoreRightManager(mockedMapperFactory, mailboxAclResolver, groupMembershipResolver, delegatingMailboxListener); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java index 0d62a90..27a38b2 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java @@ -42,7 +42,7 @@ import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.model.TestId; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; +import org.apache.james.mailbox.store.event.DelegatingMailboxListener; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.junit.Before; import org.junit.Test; @@ -66,7 +66,7 @@ public class ListeningCurrentQuotaUpdaterTest { mockedQuotaRootResolver = mock(QuotaRootResolver.class); mockedCurrentQuotaManager = mock(StoreCurrentQuotaManager.class); testee = new ListeningCurrentQuotaUpdater(mockedCurrentQuotaManager, mockedQuotaRootResolver, - mock(MailboxEventDispatcher.class), mock(QuotaManager.class)); + mock(DelegatingMailboxListener.class), mock(QuotaManager.class)); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java index 6df19d7..b78c89f 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java @@ -44,7 +44,6 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.StoreSubscriptionManager; 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; @@ -85,13 +84,12 @@ public class CassandraHostSystem extends JamesImapHostSystem { messageIdFactory); 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); mailboxManager = new CassandraMailboxManager(mapperFactory, authenticator, authorizator, new JVMMailboxPathLocker(), new MessageParser(), messageIdFactory, - mailboxEventDispatcher, delegatingMailboxListener, annotationManager, storeRightManager); + delegatingMailboxListener, annotationManager, storeRightManager); QuotaRootResolver quotaRootResolver = new DefaultUserQuotaRootResolver(mailboxManager, mapperFactory); perUserMaxQuotaManager = new CassandraPerUserMaxQuotaManager( @@ -103,7 +101,7 @@ public class CassandraHostSystem extends JamesImapHostSystem { StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, perUserMaxQuotaManager); - ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, mailboxEventDispatcher, quotaManager); + ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, delegatingMailboxListener, quotaManager); mailboxManager.setQuotaRootResolver(quotaRootResolver); mailboxManager.setQuotaManager(quotaManager); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java index 3e4f238..ff04b10 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java @@ -76,7 +76,7 @@ public class InMemoryHostSystem extends JamesImapHostSystem { StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, perUserMaxQuotaManager); - ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, mailboxManager.getEventDispatcher(), quotaManager); + ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, mailboxManager.getDelegationListener(), quotaManager); mailboxManager.setQuotaRootResolver(quotaRootResolver); mailboxManager.setQuotaManager(quotaManager); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java index c540145..641f0e3 100644 --- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java +++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java @@ -48,7 +48,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; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; @@ -97,18 +96,16 @@ public class JPAHostSystem extends JamesImapHostSystem { MessageParser messageParser = new MessageParser(); DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingListener); - StoreRightManager storeRightManager = new StoreRightManager(mapperFactory, aclResolver, groupMembershipResolver, mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mapperFactory, aclResolver, groupMembershipResolver, delegatingListener); StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mapperFactory, storeRightManager); mailboxManager = new OpenJPAMailboxManager(mapperFactory, authenticator, authorizator, - messageParser, new DefaultMessageId.Factory(), delegatingListener, - mailboxEventDispatcher, annotationManager, storeRightManager); + messageParser, new DefaultMessageId.Factory(), delegatingListener, annotationManager, storeRightManager); DefaultUserQuotaRootResolver quotaRootResolver = new DefaultUserQuotaRootResolver(mailboxManager, mapperFactory); JpaCurrentQuotaManager currentQuotaManager = new JpaCurrentQuotaManager(entityManagerFactory); maxQuotaManager = new JPAPerUserMaxQuotaManager(new JPAPerUserMaxQuotaDAO(entityManagerFactory)); StoreQuotaManager storeQuotaManager = new StoreQuotaManager(currentQuotaManager, maxQuotaManager); - ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, mailboxEventDispatcher, storeQuotaManager); + ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, delegatingListener, storeQuotaManager); mailboxManager.setQuotaManager(storeQuotaManager); mailboxManager.setQuotaUpdater(quotaUpdater); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java index b33b896..8a62e53 100644 --- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java +++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java @@ -46,7 +46,6 @@ import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.StoreSubscriptionManager; 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.NoQuotaManager; @@ -98,10 +97,9 @@ public class LuceneSearchHostSystem extends JamesImapHostSystem { try { DefaultDelegatingMailboxListener delegatingMailboxListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher dispatcher = new MailboxEventDispatcher(delegatingMailboxListener); - + InMemoryMailboxSessionMapperFactory mapperFactory = new InMemoryMailboxSessionMapperFactory(); - 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(); mailboxManager = new InMemoryMailboxManager(mapperFactory, @@ -110,7 +108,6 @@ public class LuceneSearchHostSystem extends JamesImapHostSystem { locker, new MessageParser(), messageIdFactory, - dispatcher, delegatingMailboxListener, new StoreMailboxAnnotationManager(mapperFactory, rightManager), rightManager); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java index a55cf7b..04ba896 100644 --- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java +++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java @@ -41,7 +41,6 @@ import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.StoreRightManager; import org.apache.james.mailbox.store.StoreSubscriptionManager; 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.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; @@ -76,12 +75,10 @@ public class MaildirHostSystem extends JamesImapHostSystem { MessageParser messageParser = new MessageParser(); DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener(); - MailboxEventDispatcher mailboxEventDispatcher = new MailboxEventDispatcher(delegatingListener); - StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, aclResolver, groupMembershipResolver, mailboxEventDispatcher); + StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, aclResolver, groupMembershipResolver, delegatingListener); StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mailboxSessionMapperFactory, storeRightManager); mailboxManager = new StoreMailboxManager(mailboxSessionMapperFactory, authenticator, authorizator, locker, - messageParser, new DefaultMessageId.Factory(), annotationManager, - mailboxEventDispatcher, delegatingListener, storeRightManager); + messageParser, new DefaultMessageId.Factory(), annotationManager, delegatingListener, storeRightManager); mailboxManager.init(); ImapProcessor defaultImapProcessorFactory = http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java index ca41b79..ebd268f 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java @@ -84,7 +84,6 @@ import org.apache.james.mailbox.store.StoreBlobManager; 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.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapperFactory; @@ -142,7 +141,6 @@ public class CassandraMailboxModule extends AbstractModule { bind(CassandraMessageId.Factory.class).in(Scopes.SINGLETON); bind(CassandraModSeqProvider.class).in(Scopes.SINGLETON); bind(CassandraUidProvider.class).in(Scopes.SINGLETON); - bind(MailboxEventDispatcher.class).in(Scopes.SINGLETON); bind(NoMailboxPathLocker.class).in(Scopes.SINGLETON); bind(UserRepositoryAuthenticator.class).in(Scopes.SINGLETON); bind(UserRepositoryAuthorizator.class).in(Scopes.SINGLETON); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java index 85c4c5f..1847203 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java @@ -53,7 +53,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.StoreSubscriptionManager; -import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapperFactory; @@ -117,7 +116,6 @@ public class MemoryMailboxModule extends AbstractModule { bind(InMemoryMailboxManager.class).in(Scopes.SINGLETON); bind(InMemoryMessageId.Factory.class).in(Scopes.SINGLETON); bind(StoreMessageIdManager.class).in(Scopes.SINGLETON); - bind(MailboxEventDispatcher.class).in(Scopes.SINGLETON); bind(StoreAttachmentManager.class).in(Scopes.SINGLETON); bind(StoreRightManager.class).in(Scopes.SINGLETON); http://git-wip-us.apache.org/repos/asf/james-project/blob/31ed391c/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml index aab5c34..9456080 100644 --- a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml +++ b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml @@ -149,10 +149,6 @@ </bean> <!-- Event system --> - <bean id="dispatcher" class="org.apache.james.mailbox.store.event.MailboxEventDispatcher"> - <constructor-arg index="0" ref="delegating-listener"/> - </bean> - <import resource="classpath:META-INF/spring/event-system.xml"/> <!-- Mailbox Copier --> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org