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 f6be42d2bce979f63102024d3d5b3949aa278d57 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Mar 15 10:26:34 2019 +0700 JAMES-2687 Remove some InMemoryIntegrationResources::createResources methods --- .../manager/InMemoryIntegrationResources.java | 19 ++++++------------- .../imapmailbox/inmemory/host/InMemoryHostSystem.java | 6 ++++-- 2 files changed, 10 insertions(+), 15 deletions(-) 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 83834fc..2ff7c2f 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 @@ -246,19 +246,12 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM } public StoreMailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver, Authenticator authenticator, Authorizator authorizator) { - return createResources(groupMembershipResolver, authenticator, authorizator).mailboxManager; - } - - public Resources createResources(GroupMembershipResolver groupMembershipResolver, Authenticator authenticator, Authorizator authorizator) { - return createResources(groupMembershipResolver, authenticator, authorizator, MailboxConstants.DEFAULT_LIMIT_ANNOTATIONS_ON_MAILBOX, MailboxConstants.DEFAULT_LIMIT_ANNOTATION_SIZE); - } - - private Resources createResources(GroupMembershipResolver groupMembershipResolver, - Authenticator authenticator, Authorizator authorizator, - int limitAnnotationCount, int limitAnnotationSize) { - - return createResources(new InVMEventBus(new InVmEventDelivery(new NoopMetricFactory())), - groupMembershipResolver, authenticator, authorizator, limitAnnotationCount, limitAnnotationSize, PreDeletionHook.NO_PRE_DELETION_HOOK); + return new InMemoryIntegrationResources.Factory() + .withGroupmembershipResolver(groupMembershipResolver) + .withAuthenticator(authenticator) + .withAuthorizator(authorizator) + .create() + .mailboxManager; } public Resources createResources(EventBus eventBus, Authenticator authenticator, Authorizator authorizator) { 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 952823f..0ca764d 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 @@ -27,7 +27,6 @@ import org.apache.james.imap.encode.main.DefaultImapEncoderFactory; import org.apache.james.imap.main.DefaultImapDecoderFactory; import org.apache.james.imap.processor.main.DefaultImapProcessorFactory; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager; import org.apache.james.mailbox.store.StoreMailboxManager; @@ -52,7 +51,10 @@ public class InMemoryHostSystem extends JamesImapHostSystem { @Override public void beforeTest() throws Exception { super.beforeTest(); - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources().createResources(new SimpleGroupMembershipResolver(), authenticator, authorizator); + InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory() + .withAuthenticator(authenticator) + .withAuthorizator(authorizator) + .create(); this.mailboxManager = resources.getMailboxManager(); this.perUserMaxQuotaManager = resources.getMaxQuotaManager(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
