This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 992e34b34d0d0d355225a850e81996b42f170cb4 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Mar 15 11:16:51 2019 +0700 JAMES-2687 MessageIdManager should be a field of IntegrationResources.Resources --- .../InMemoryMessageIdManagerTestSystem.java | 2 +- .../MessageIdManagerTestSystemProvider.java | 2 +- .../manager/InMemoryIntegrationResources.java | 21 ++++++++++++--------- .../james/vault/DeletedMessageVaultHookTest.java | 2 +- .../james/jmap/methods/GetMessagesMethodTest.java | 2 +- .../james/jmap/send/PostDequeueDecoratorTest.java | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java index fb660a1..0f73a04 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java @@ -29,7 +29,7 @@ public class InMemoryMessageIdManagerTestSystem { StoreMailboxManager mailboxManager = resources.getMailboxManager(); return new MessageIdManagerTestSystem( - resources.createMessageIdManager(), + resources.getMessageIdManager(), resources.getMessageIdFactory(), resources.getMailboxManager().getMapperFactory(), mailboxManager); diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java index 833f189..776a746 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java @@ -33,7 +33,7 @@ public class MessageIdManagerTestSystemProvider { return new InMemoryCombinationManagerTestSystem( resources.getMailboxManager(), - resources.createMessageIdManager()); + resources.getMessageIdManager()); } } 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 0c264d5..f5a241f 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 @@ -78,6 +78,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM private final DefaultUserQuotaRootResolver defaultUserQuotaRootResolver; private final InMemoryPerUserMaxQuotaManager maxQuotaManager; private final QuotaManager quotaManager; + private StoreMessageIdManager storeMessageIdManager; Resources(InMemoryMailboxManager mailboxManager, StoreRightManager storeRightManager, MessageId.Factory messageIdFactory, InMemoryCurrentQuotaManager currentQuotaManager, DefaultUserQuotaRootResolver defaultUserQuotaRootResolver, InMemoryPerUserMaxQuotaManager maxQuotaManager, QuotaManager quotaManager) { this.mailboxManager = mailboxManager; @@ -87,6 +88,15 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM this.defaultUserQuotaRootResolver = defaultUserQuotaRootResolver; this.maxQuotaManager = maxQuotaManager; this.quotaManager = quotaManager; + + this.storeMessageIdManager = new StoreMessageIdManager( + mailboxManager, + mailboxManager.getMapperFactory(), + mailboxManager.getEventBus(), + messageIdFactory, + quotaManager, + defaultUserQuotaRootResolver, + mailboxManager.getPreDeletionHooks()); } public DefaultUserQuotaRootResolver getDefaultUserQuotaRootResolver() { @@ -117,15 +127,8 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM return quotaManager; } - public MessageIdManager createMessageIdManager() { - return new StoreMessageIdManager( - mailboxManager, - mailboxManager.getMapperFactory(), - mailboxManager.getEventBus(), - messageIdFactory, - quotaManager, - defaultUserQuotaRootResolver, - mailboxManager.getPreDeletionHooks()); + public MessageIdManager getMessageIdManager() { + return storeMessageIdManager; } } diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java index 95a7409..59da472 100644 --- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java +++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java @@ -103,7 +103,7 @@ class DeletedMessageVaultHookTest { .create(); mailboxManager = resources.getMailboxManager(); - messageIdManager = resources.createMessageIdManager(); + messageIdManager = resources.getMessageIdManager(); mailContent = Message.Builder.of() .setSubject("test") diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java index 906c8bb..e910c20 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java @@ -112,7 +112,7 @@ public class GetMessagesMethodTest { customMailboxPath = new MailboxPath(inboxPath, "custom"); mailboxManager.createMailbox(inboxPath, session); mailboxManager.createMailbox(customMailboxPath, session); - messageIdManager = resources.createMessageIdManager(); + messageIdManager = resources.getMessageIdManager(); testee = new GetMessagesMethod(messageFactory, messageIdManager, new DefaultMetricFactory()); messageContent1 = org.apache.james.mime4j.dom.Message.Builder.of() diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java index a336d38..f440cd2 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java @@ -87,7 +87,7 @@ public class PostDequeueDecoratorTest { mail = FakeMail.defaultFakeMail(); when(mockedMailQueueItem.getMail()).thenReturn(mail); testee = new PostDequeueDecorator(mockedMailQueueItem, mailboxManager, new InMemoryMessageId.Factory(), - resources.createMessageIdManager(), new SystemMailboxesProviderImpl(mailboxManager)); + resources.getMessageIdManager(), new SystemMailboxesProviderImpl(mailboxManager)); message = Message.Builder.of() .setSubject("test") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
