JAMES-2641 MailboxManager should not expose group registration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d35e8a64 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d35e8a64 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d35e8a64 Branch: refs/heads/master Commit: d35e8a64590ba14fd88af33f9667556fb4952849 Parents: f063b48 Author: Benoit Tellier <[email protected]> Authored: Thu Jan 10 15:21:10 2019 +0700 Committer: Benoit Tellier <[email protected]> Committed: Thu Jan 17 10:23:41 2019 +0700 ---------------------------------------------------------------------- .../apache/james/mailbox/MailboxManager.java | 2 -- .../james/mailbox/MailboxManagerTest.java | 29 +++++++++++--------- .../cassandra/CassandraMailboxManagerTest.java | 11 ++++++-- .../CassandraMessageIdManagerTestSystem.java | 2 +- .../mailbox/jpa/JPAMailboxManagerTest.java | 10 +++++-- .../DomainUserMaildirMailboxManagerTest.java | 11 ++++++-- .../FullUserMaildirMailboxManagerTest.java | 12 ++++++-- .../inmemory/MemoryMailboxManagerProvider.java | 4 +-- .../inmemory/MemoryMailboxManagerTest.java | 12 +++++--- ...ticSearchQuotaSearchTestSystemExtension.java | 2 +- .../org/apache/james/utils/JmapGuiceProbe.java | 7 +++-- .../event/PropagateLookupRightListenerTest.java | 2 +- .../ElasticSearchQuotaSearchExtension.java | 2 +- 13 files changed, 66 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java index 3b5f36c..e2d7cda 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java @@ -347,6 +347,4 @@ public interface MailboxManager extends RequestAware, RightManager, MailboxAnnot boolean hasChildren(MailboxPath mailboxPath, MailboxSession session) throws MailboxException; Registration register(MailboxListener listener, MailboxId registrationKey); - - Registration register(MailboxListener.GroupMailboxListener groupMailboxListener); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java index 0172ac7..57c1b34 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java @@ -35,6 +35,7 @@ import org.apache.james.core.quota.QuotaCount; import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.MailboxManager.MailboxCapabilities; import org.apache.james.mailbox.MessageManager.AppendCommand; +import org.apache.james.mailbox.events.EventBus; import org.apache.james.mailbox.exception.AnnotationException; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.TooLongMailboxNameException; @@ -74,16 +75,18 @@ import com.google.common.collect.ImmutableSet; * implement the test methods. * */ -public abstract class MailboxManagerTest { +public abstract class MailboxManagerTest<T extends MailboxManager> { public static final String USER_1 = "USER_1"; public static final String USER_2 = "USER_2"; private static final int DEFAULT_MAXIMUM_LIMIT = 256; - private MailboxManager mailboxManager; + private T mailboxManager; private MailboxSession session; private Message.Builder message; - protected abstract MailboxManager provideMailboxManager() throws MailboxException; + protected abstract T provideMailboxManager(); + + protected abstract EventBus retrieveEventBus(T mailboxManager); @BeforeEach void setUp() throws Exception { @@ -382,7 +385,7 @@ public abstract class MailboxManagerTest { @Test void deleteMailboxShouldFireMailboxDeletionEvent() throws Exception { assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Quota)); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); mailboxManager.deleteMailbox(inbox, session); @@ -400,7 +403,7 @@ public abstract class MailboxManagerTest { @Test void createMailboxShouldFireMailboxAddedEvent() throws Exception { assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Quota)); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); Optional<MailboxId> newId = mailboxManager.createMailbox(newPath, session); @@ -415,7 +418,7 @@ public abstract class MailboxManagerTest { @Test void addingMessageShouldFireQuotaUpdateEvent() throws Exception { assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Quota)); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); inboxManager.appendMessage(MessageManager.AppendCommand.builder() .build(message), session); @@ -438,7 +441,7 @@ public abstract class MailboxManagerTest { @Test void addingMessageShouldFireAddedEvent() throws Exception { - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); inboxManager.appendMessage(MessageManager.AppendCommand.builder() .build(message), session); @@ -456,7 +459,7 @@ public abstract class MailboxManagerTest { inboxManager.appendMessage(MessageManager.AppendCommand.builder().build(message), session); inboxManager.setFlags(new Flags(Flags.Flag.DELETED), MessageManager.FlagsUpdateMode.ADD, MessageRange.all(), session); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); inboxManager.expunge(MessageRange.all(), session); assertThat(listener.getEvents()) @@ -472,7 +475,7 @@ public abstract class MailboxManagerTest { void setFlagsShouldFireFlagsUpdatedEvent() throws Exception { inboxManager.appendMessage(MessageManager.AppendCommand.builder().build(message), session); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); inboxManager.setFlags(new Flags(Flags.Flag.FLAGGED), MessageManager.FlagsUpdateMode.ADD, MessageRange.all(), session); assertThat(listener.getEvents()) @@ -490,7 +493,7 @@ public abstract class MailboxManagerTest { Optional<MailboxId> targetMailboxId = mailboxManager.createMailbox(newPath, session); inboxManager.appendMessage(AppendCommand.builder().build(message), session); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); mailboxManager.moveMessages(MessageRange.all(), inbox, newPath, session); assertThat(listener.getEvents()) @@ -508,7 +511,7 @@ public abstract class MailboxManagerTest { mailboxManager.createMailbox(newPath, session); inboxManager.appendMessage(AppendCommand.builder().build(message), session); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); mailboxManager.moveMessages(MessageRange.all(), inbox, newPath, session); assertThat(listener.getEvents()) @@ -525,7 +528,7 @@ public abstract class MailboxManagerTest { Optional<MailboxId> targetMailboxId = mailboxManager.createMailbox(newPath, session); inboxManager.appendMessage(AppendCommand.builder().build(message), session); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); mailboxManager.copyMessages(MessageRange.all(), inbox, newPath, session); assertThat(listener.getEvents()) @@ -542,7 +545,7 @@ public abstract class MailboxManagerTest { mailboxManager.createMailbox(newPath, session); inboxManager.appendMessage(AppendCommand.builder().build(message), session); - mailboxManager.register(listener); + retrieveEventBus(mailboxManager).register(listener); mailboxManager.copyMessages(MessageRange.all(), inbox, newPath, session); assertThat(listener.getEvents()) http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java index b44e40d..0408aa6 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java @@ -19,19 +19,24 @@ package org.apache.james.mailbox.cassandra; import org.apache.james.backends.cassandra.CassandraClusterExtension; -import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManagerTest; import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule; +import org.apache.james.mailbox.events.EventBus; import org.junit.jupiter.api.extension.RegisterExtension; -public class CassandraMailboxManagerTest extends MailboxManagerTest { +public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMailboxManager> { @RegisterExtension static CassandraClusterExtension cassandra = new CassandraClusterExtension(MailboxAggregateModule.MODULE_WITH_QUOTA); @Override - protected MailboxManager provideMailboxManager() { + protected CassandraMailboxManager provideMailboxManager() { return CassandraMailboxManagerProvider.provideMailboxManager( cassandra.getCassandraCluster().getConf(), cassandra.getCassandraCluster().getTypesProvider()); } + + @Override + protected EventBus retrieveEventBus(CassandraMailboxManager mailboxManager) { + return mailboxManager.getEventBus(); + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/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 3cc5809..0bdeb45 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 @@ -47,7 +47,7 @@ class CassandraMessageIdManagerTestSystem { ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater( (StoreCurrentQuotaManager) currentQuotaManager, mailboxManager.getQuotaComponents().getQuotaRootResolver(), mailboxManager.getEventBus(), quotaManager); - mailboxManager.register(listeningCurrentQuotaUpdater); + mailboxManager.getEventBus().register(listeningCurrentQuotaUpdater); return new MessageIdManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, mailboxManager.getEventBus()), new CassandraMessageId.Factory(), mapperFactory, http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java index 8775a0e..b9e5073 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java @@ -21,20 +21,20 @@ package org.apache.james.mailbox.jpa; import java.util.Optional; import org.apache.james.backends.jpa.JpaTestCluster; -import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManagerTest; +import org.apache.james.mailbox.events.EventBus; import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -public class JPAMailboxManagerTest extends MailboxManagerTest { +public class JPAMailboxManagerTest extends MailboxManagerTest<OpenJPAMailboxManager> { private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES); private Optional<OpenJPAMailboxManager> openJPAMailboxManager = Optional.empty(); @Override - protected MailboxManager provideMailboxManager() { + protected OpenJPAMailboxManager provideMailboxManager() { if (!openJPAMailboxManager.isPresent()) { openJPAMailboxManager = Optional.of(JpaMailboxManagerProvider.provideMailboxManager(JPA_TEST_CLUSTER)); } @@ -53,4 +53,8 @@ public class JPAMailboxManagerTest extends MailboxManagerTest { } + @Override + protected EventBus retrieveEventBus(OpenJPAMailboxManager mailboxManager) { + return mailboxManager.getEventBus(); + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java index cc494f1..d5be3b6 100644 --- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java +++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java @@ -19,17 +19,18 @@ package org.apache.james.mailbox.maildir; import org.apache.james.junit.TemporaryFolderExtension; -import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManagerTest; +import org.apache.james.mailbox.events.EventBus; +import org.apache.james.mailbox.store.StoreMailboxManager; import org.junit.jupiter.api.extension.RegisterExtension; -public class DomainUserMaildirMailboxManagerTest extends MailboxManagerTest { +public class DomainUserMaildirMailboxManagerTest extends MailboxManagerTest<StoreMailboxManager> { @RegisterExtension TemporaryFolderExtension temporaryFolder = new TemporaryFolderExtension(); @Override - protected MailboxManager provideMailboxManager() { + protected StoreMailboxManager provideMailboxManager() { try { return MaildirMailboxManagerProvider.createMailboxManager("/%domain/%user", temporaryFolder.getTemporaryFolder().getTempDir()); } catch (Exception e) { @@ -37,4 +38,8 @@ public class DomainUserMaildirMailboxManagerTest extends MailboxManagerTest { } } + @Override + protected EventBus retrieveEventBus(StoreMailboxManager mailboxManager) { + return mailboxManager.getEventBus(); + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java index e08097f..08faae2 100644 --- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java +++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java @@ -19,20 +19,26 @@ package org.apache.james.mailbox.maildir; import org.apache.james.junit.TemporaryFolderExtension; -import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManagerTest; +import org.apache.james.mailbox.events.EventBus; +import org.apache.james.mailbox.store.StoreMailboxManager; import org.junit.jupiter.api.extension.RegisterExtension; -public class FullUserMaildirMailboxManagerTest extends MailboxManagerTest { +public class FullUserMaildirMailboxManagerTest extends MailboxManagerTest<StoreMailboxManager> { @RegisterExtension TemporaryFolderExtension temporaryFolder = new TemporaryFolderExtension(); @Override - protected MailboxManager provideMailboxManager() { + protected StoreMailboxManager provideMailboxManager() { try { return MaildirMailboxManagerProvider.createMailboxManager("/%fulluser", temporaryFolder.getTemporaryFolder().getTempDir()); } catch (Exception e) { throw new RuntimeException(e); } } + + @Override + protected EventBus retrieveEventBus(StoreMailboxManager mailboxManager) { + return mailboxManager.getEventBus(); + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerProvider.java index 4bcadff..7504574 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerProvider.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerProvider.java @@ -19,16 +19,14 @@ package org.apache.james.mailbox.inmemory; -import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; -import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; public class MemoryMailboxManagerProvider { private static final int LIMIT_ANNOTATIONS = 3; private static final int LIMIT_ANNOTATION_SIZE = 30; - public static MailboxManager provideMailboxManager() throws MailboxException { + public static InMemoryMailboxManager provideMailboxManager() { return new InMemoryIntegrationResources() .createResources(new SimpleGroupMembershipResolver(), LIMIT_ANNOTATIONS, LIMIT_ANNOTATION_SIZE) http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java index 1a5f78a..7ad8bcf 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java @@ -19,13 +19,17 @@ package org.apache.james.mailbox.inmemory; -import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManagerTest; -import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.events.EventBus; -public class MemoryMailboxManagerTest extends MailboxManagerTest { +public class MemoryMailboxManagerTest extends MailboxManagerTest<InMemoryMailboxManager> { @Override - protected MailboxManager provideMailboxManager() throws MailboxException { + protected InMemoryMailboxManager provideMailboxManager() { return MemoryMailboxManagerProvider.provideMailboxManager(); } + + @Override + protected EventBus retrieveEventBus(InMemoryMailboxManager mailboxManager) { + return mailboxManager.getEventBus(); + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java index 4cc91e0..33657b7 100644 --- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java +++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java @@ -78,7 +78,7 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes QuotaRatioElasticSearchConstants.QUOTA_RATIO_TYPE), new QuotaRatioToElasticSearchJson()); - resources.getMailboxManager().register(listener); + resources.getMailboxManager().getEventBus().register(listener); QuotaComponents quotaComponents = resources.getMailboxManager().getQuotaComponents(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java index 4c82971..247aa86 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java @@ -32,6 +32,7 @@ import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; +import org.apache.james.mailbox.events.EventBus; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; @@ -42,13 +43,15 @@ public class JmapGuiceProbe implements GuiceProbe { private final JMAPServer jmapServer; private final MessageIdManager messageIdManager; private final MailboxManager mailboxManager; + private final EventBus eventBus; @Inject - private JmapGuiceProbe(VacationRepository vacationRepository, JMAPServer jmapServer, MessageIdManager messageIdManager, MailboxManager mailboxManager) { + private JmapGuiceProbe(VacationRepository vacationRepository, JMAPServer jmapServer, MessageIdManager messageIdManager, MailboxManager mailboxManager, EventBus eventBus) { this.vacationRepository = vacationRepository; this.jmapServer = jmapServer; this.messageIdManager = messageIdManager; this.mailboxManager = mailboxManager; + this.eventBus = eventBus; } public int getJmapPort() { @@ -56,7 +59,7 @@ public class JmapGuiceProbe implements GuiceProbe { } public void addMailboxListener(MailboxListener.GroupMailboxListener listener) { - mailboxManager.register(listener); + eventBus.register(listener); } public void modifyVacation(AccountId accountId, VacationPatch vacationPatch) { http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java index f5f7787..60e9532 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java @@ -81,7 +81,7 @@ public class PropagateLookupRightListenerTest { mailboxMapper = storeMailboxManager.getMapperFactory(); testee = new PropagateLookupRightListener(storeRightManager, storeMailboxManager); - storeMailboxManager.register(testee); + storeMailboxManager.getEventBus().register(testee); parentMailboxId = storeMailboxManager.createMailbox(PARENT_MAILBOX, mailboxSession).get(); parentMailboxId1 = storeMailboxManager.createMailbox(PARENT_MAILBOX1, mailboxSession).get(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d35e8a64/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java index 59677e8..6928ac1 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java @@ -81,7 +81,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef QuotaRatioElasticSearchConstants.QUOTA_RATIO_TYPE), new QuotaRatioToElasticSearchJson()); - resources.getMailboxManager().register(listener); + resources.getMailboxManager().getEventBus().register(listener); QuotaComponents quotaComponents = resources.getMailboxManager().getQuotaComponents(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
