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 586bfec321a916d05279a33eb778cce525a4a017 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Mar 15 10:31:59 2019 +0700 JAMES-2687 Remove some InMemoryIntegrationResources::createResources methods --- .../manager/InMemoryIntegrationResources.java | 48 ++-------------------- .../rabbitmq/host/RabbitMQEventBusHostSystem.java | 9 ++-- 2 files changed, 10 insertions(+), 47 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 0db979e..ee62a5e 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 @@ -113,6 +113,10 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM return maxQuotaManager; } + public QuotaManager getQuotaManager() { + return quotaManager; + } + public MessageIdManager createMessageIdManager() { return new StoreMessageIdManager( mailboxManager, @@ -245,50 +249,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM .mailboxManager; } - public Resources createResources(EventBus eventBus, Authenticator authenticator, Authorizator authorizator) { - return createResources(eventBus, - new SimpleGroupMembershipResolver(), authenticator, authorizator, MailboxConstants.DEFAULT_LIMIT_ANNOTATIONS_ON_MAILBOX, MailboxConstants.DEFAULT_LIMIT_ANNOTATION_SIZE, - PreDeletionHook.NO_PRE_DELETION_HOOK); - } - - private Resources createResources(EventBus eventBus, GroupMembershipResolver groupMembershipResolver, Authenticator authenticator, Authorizator authorizator, - int limitAnnotationCount, int limitAnnotationSize, - Set<PreDeletionHook> preDeletionHooks) { - InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory(); - StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), - groupMembershipResolver, eventBus); - StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mailboxSessionMapperFactory, storeRightManager, limitAnnotationCount, limitAnnotationSize); - - SessionProvider sessionProvider = new SessionProvider(authenticator, authorizator); - - InMemoryPerUserMaxQuotaManager maxQuotaManager = new InMemoryPerUserMaxQuotaManager(); - DefaultUserQuotaRootResolver quotaRootResolver = new DefaultUserQuotaRootResolver(sessionProvider, mailboxSessionMapperFactory); - InMemoryCurrentQuotaManager currentQuotaManager = new InMemoryCurrentQuotaManager(new CurrentQuotaCalculator(mailboxSessionMapperFactory, quotaRootResolver), sessionProvider); - StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, maxQuotaManager); - ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, eventBus, quotaManager); - QuotaComponents quotaComponents = new QuotaComponents(maxQuotaManager, quotaManager, quotaRootResolver, listeningCurrentQuotaUpdater); - - MessageSearchIndex index = new SimpleMessageSearchIndex(mailboxSessionMapperFactory, mailboxSessionMapperFactory, new DefaultTextExtractor()); - - InMemoryMailboxManager manager = new InMemoryMailboxManager( - mailboxSessionMapperFactory, - sessionProvider, - new JVMMailboxPathLocker(), - new MessageParser(), - new InMemoryMessageId.Factory(), - eventBus, - annotationManager, - storeRightManager, - quotaComponents, - index, - new PreDeletionHooks(preDeletionHooks)); - - eventBus.register(listeningCurrentQuotaUpdater); - eventBus.register(new MailboxAnnotationListener(mailboxSessionMapperFactory, sessionProvider)); - - return new Resources(manager, storeRightManager, new InMemoryMessageId.Factory(), currentQuotaManager, quotaRootResolver, maxQuotaManager, quotaManager); - } - public Resources createResourcesForHooks(SessionProvider sessionProvider, InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory, Set<PreDeletionHook> preDeletionHooks) { EventBus eventBus = new InVMEventBus(new InVmEventDelivery(new NoopMetricFactory())); StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), diff --git a/mpt/impl/imap-mailbox/rabbitmq/src/test/java/org/apache/james/mpt/imapmailbox/rabbitmq/host/RabbitMQEventBusHostSystem.java b/mpt/impl/imap-mailbox/rabbitmq/src/test/java/org/apache/james/mpt/imapmailbox/rabbitmq/host/RabbitMQEventBusHostSystem.java index a74b8f1..8a3df80 100644 --- a/mpt/impl/imap-mailbox/rabbitmq/src/test/java/org/apache/james/mpt/imapmailbox/rabbitmq/host/RabbitMQEventBusHostSystem.java +++ b/mpt/impl/imap-mailbox/rabbitmq/src/test/java/org/apache/james/mpt/imapmailbox/rabbitmq/host/RabbitMQEventBusHostSystem.java @@ -75,15 +75,18 @@ public class RabbitMQEventBusHostSystem extends JamesImapHostSystem { eventBus = createEventBus(); eventBus.start(); - InMemoryIntegrationResources integrationResources = new InMemoryIntegrationResources(); - resources = integrationResources.createResources(eventBus, authenticator, authorizator); + resources = new InMemoryIntegrationResources.Factory() + .withEventBus(eventBus) + .withAuthenticator(authenticator) + .withAuthorizator(authorizator) + .create(); ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor( resources.getMailboxManager(), eventBus, new StoreSubscriptionManager(resources.getMailboxManager().getMapperFactory()), - integrationResources.retrieveQuotaManager(resources.getMailboxManager()), + resources.getQuotaManager(), resources.getDefaultUserQuotaRootResolver(), new DefaultMetricFactory()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
