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 7a9abe33845e44d62d12c02daece8940b8a2fbf4 Author: Benoit Tellier <[email protected]> AuthorDate: Tue Mar 19 14:21:08 2019 +0700 JAMES-2684 InMemoryIntegrationResources is more a builder --- .../ElasticSearchIntegrationTest.java | 4 +-- .../search/LuceneMessageSearchIndexTest.java | 4 +-- .../inmemory/MemoryMailboxManagerProvider.java | 4 +-- .../mail/InMemoryMailboxManagerAttachmentTest.java | 4 +-- .../manager/InMemoryIntegrationResources.java | 34 +++++++++++----------- .../InMemoryMessageIdManagerSideEffectTest.java | 4 +-- .../james/vault/DeletedMessageVaultHookTest.java | 4 +-- .../store/search/SimpleMessageSearchIndexTest.java | 4 +-- .../host/ElasticSearchHostSystem.java | 4 +-- .../inmemory/host/InMemoryHostSystem.java | 4 +-- .../lucenesearch/host/LuceneSearchHostSystem.java | 4 +-- .../rabbitmq/host/RabbitMQEventBusHostSystem.java | 4 +-- .../apache/james/pop3server/POP3ServerTest.java | 4 +-- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java index 0599280..3286408 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java @@ -100,7 +100,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); ThreadFactory threadFactory = NamedThreadFactory.withClassName(getClass()); - InMemoryIntegrationResources resources = InMemoryIntegrationResources.factory() + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() .preProvisionnedFakeAuthenticator() .fakeAuthorizator() .inVmEventBus() @@ -121,7 +121,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest preInstanciationStage.getSessionProvider())) .noPreDeletionHooks() .storeQuotaManager() - .create(); + .build(); storeMailboxManager = resources.getMailboxManager(); messageIdManager = resources.getMessageIdManager(); diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java index ff34854..959965f 100644 --- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java +++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java @@ -37,7 +37,7 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest @Override protected void initializeMailboxManager() { - InMemoryIntegrationResources resources = InMemoryIntegrationResources.factory() + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() .preProvisionnedFakeAuthenticator() .fakeAuthorizator() .inVmEventBus() @@ -49,7 +49,7 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest preInstanciationStage.getSessionProvider()))) .noPreDeletionHooks() .storeQuotaManager() - .create(); + .build(); storeMailboxManager = resources.getMailboxManager(); messageIdManager = resources.getMessageIdManager(); 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 11b200d..e4e4178 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 @@ -29,7 +29,7 @@ public class MemoryMailboxManagerProvider { private static final int LIMIT_ANNOTATION_SIZE = 30; public static InMemoryMailboxManager provideMailboxManager(Set<PreDeletionHook> preDeletionHooks) { - return InMemoryIntegrationResources.factory() + return InMemoryIntegrationResources.builder() .preProvisionnedFakeAuthenticator() .fakeAuthorizator() .inVmEventBus() @@ -38,7 +38,7 @@ public class MemoryMailboxManagerProvider { .scanningSearchIndex() .preDeletionHooks(preDeletionHooks) .storeQuotaManager() - .create() + .build() .getMailboxManager(); } diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java index bfa9e32..7f21920 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java @@ -46,7 +46,7 @@ public class InMemoryMailboxManagerAttachmentTest extends AbstractMailboxManager .thenThrow(new RuntimeException("Message parser set to fail")); mailboxManager = InMemoryIntegrationResources.defaultResources().getMailboxManager(); - parseFailingMailboxManager = InMemoryIntegrationResources.factory() + parseFailingMailboxManager = InMemoryIntegrationResources.builder() .preProvisionnedFakeAuthenticator() .fakeAuthorizator() .inVmEventBus() @@ -55,7 +55,7 @@ public class InMemoryMailboxManagerAttachmentTest extends AbstractMailboxManager .scanningSearchIndex() .noPreDeletionHooks() .storeQuotaManager() - .create() + .build() .getMailboxManager(); super.setUp(); 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 df917f5..655d988 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 @@ -168,16 +168,16 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM } interface FinalStage { - InMemoryIntegrationResources create(); + InMemoryIntegrationResources build(); } } - public static Stages.RequireAuthenticator factory() { - return new Factory(); + public static Stages.RequireAuthenticator builder() { + return new Builder(); } public static InMemoryIntegrationResources defaultResources() { - return factory() + return builder() .preProvisionnedFakeAuthenticator() .fakeAuthorizator() .inVmEventBus() @@ -186,10 +186,10 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM .scanningSearchIndex() .noPreDeletionHooks() .storeQuotaManager() - .create(); + .build(); } - public static class Factory implements Stages.RequireAuthenticator, Stages.RequireAuthorizator, Stages.RequireEventBus, + public static class Builder implements Stages.RequireAuthenticator, Stages.RequireAuthorizator, Stages.RequireEventBus, Stages.RequireAnnotationLimits, Stages.RequireMessageParser, Stages.RequireSearchIndex, Stages.RequirePreDeletionHooks, Stages.RequireQuotaManager, Stages.FinalStage { @@ -204,7 +204,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM private ImmutableSet.Builder<Function<MailboxManagerPreInstanciationStage, PreDeletionHook>> preDeletionHooksFactories; private ImmutableList.Builder<MailboxListener.GroupMailboxListener> listenersToBeRegistered; - private Factory() { + private Builder() { this.authenticator = Optional.empty(); this.authorizator = Optional.empty(); this.eventBus = Optional.empty(); @@ -218,56 +218,56 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM } @Override - public Factory messageParser(MessageParser messageParser) { + public Builder messageParser(MessageParser messageParser) { this.messageParser = Optional.of(messageParser); return this; } @Override - public Factory quotaManager(Function<BaseQuotaComponentsStage, QuotaManager> quotaManager) { + public Builder quotaManager(Function<BaseQuotaComponentsStage, QuotaManager> quotaManager) { this.quotaManager = Optional.of(quotaManager); return this; } @Override - public Factory authenticator(Authenticator authenticator) { + public Builder authenticator(Authenticator authenticator) { this.authenticator = Optional.of(authenticator); return this; } @Override - public Factory authorizator(Authorizator authorizator) { + public Builder authorizator(Authorizator authorizator) { this.authorizator = Optional.of(authorizator); return this; } @Override - public Factory eventBus(EventBus eventBus) { + public Builder eventBus(EventBus eventBus) { this.eventBus = Optional.of(eventBus); return this; } @Override - public Factory annotationLimits(int limitAnnotationCount, int limitAnnotationSize) { + public Builder annotationLimits(int limitAnnotationCount, int limitAnnotationSize) { this.limitAnnotationCount = Optional.of(limitAnnotationCount); this.limitAnnotationSize = Optional.of(limitAnnotationSize); return this; } @Override - public Factory preDeletionHooksFactories(Collection<Function<MailboxManagerPreInstanciationStage, PreDeletionHook>> preDeletionHooks) { + public Builder preDeletionHooksFactories(Collection<Function<MailboxManagerPreInstanciationStage, PreDeletionHook>> preDeletionHooks) { this.preDeletionHooksFactories.addAll(preDeletionHooks); return this; } @Override - public Factory searchIndex(Function<MailboxManagerPreInstanciationStage, MessageSearchIndex> searchIndex) { + public Builder searchIndex(Function<MailboxManagerPreInstanciationStage, MessageSearchIndex> searchIndex) { this.searchIndexFactory = Optional.of(searchIndex); return this; } @Override - public Factory listeningSearchIndex(Function<MailboxManagerPreInstanciationStage, ListeningMessageSearchIndex> searchIndex) { + public Builder listeningSearchIndex(Function<MailboxManagerPreInstanciationStage, ListeningMessageSearchIndex> searchIndex) { this.searchIndexFactory = Optional.of(stage -> { ListeningMessageSearchIndex listeningMessageSearchIndex = searchIndex.apply(stage); listenersToBeRegistered.add(listeningMessageSearchIndex); @@ -277,7 +277,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM } @Override - public InMemoryIntegrationResources create() { + public InMemoryIntegrationResources build() { Preconditions.checkState(authenticator.isPresent()); Preconditions.checkState(authorizator.isPresent()); Preconditions.checkState(eventBus.isPresent()); diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java index 9595fbf..b0ea823 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java @@ -41,7 +41,7 @@ public class InMemoryMessageIdManagerSideEffectTest extends AbstractMessageIdMan protected MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, EventBus eventBus, Set<PreDeletionHook> preDeletionHooks) { InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); - InMemoryIntegrationResources resources = InMemoryIntegrationResources.factory() + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() .preProvisionnedFakeAuthenticator() .fakeAuthorizator() .eventBus(eventBus) @@ -50,7 +50,7 @@ public class InMemoryMessageIdManagerSideEffectTest extends AbstractMessageIdMan .scanningSearchIndex() .preDeletionHooks(preDeletionHooks) .quotaManager(quotaManager) - .create(); + .build(); return new MessageIdManagerTestSystem(resources.getMessageIdManager(), messageIdFactory, 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 6d6c479..20e2201 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 @@ -98,7 +98,7 @@ class DeletedMessageVaultHookTest { DeletedMessageConverter deletedMessageConverter = new DeletedMessageConverter(); - InMemoryIntegrationResources resources = InMemoryIntegrationResources.factory() + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() .preProvisionnedFakeAuthenticator() .fakeAuthorizator() .inVmEventBus() @@ -107,7 +107,7 @@ class DeletedMessageVaultHookTest { .scanningSearchIndex() .preDeletionHookFactory(preInstanciationStage -> new DeletedMessageVaultHook(preInstanciationStage.getSessionProvider(), messageVault, deletedMessageConverter, preInstanciationStage.getMapperFactory(), clock)) .storeQuotaManager() - .create(); + .build(); mailboxManager = resources.getMailboxManager(); messageIdManager = resources.getMessageIdManager(); diff --git a/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java b/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java index abb5c83..48ffb16 100644 --- a/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java +++ b/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java @@ -31,7 +31,7 @@ public class SimpleMessageSearchIndexTest extends AbstractMessageSearchIndexTest @Override protected void initializeMailboxManager() { - InMemoryIntegrationResources resources = InMemoryIntegrationResources.factory() + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() .preProvisionnedFakeAuthenticator() .fakeAuthorizator() .inVmEventBus() @@ -43,7 +43,7 @@ public class SimpleMessageSearchIndexTest extends AbstractMessageSearchIndexTest new PDFTextExtractor())) .noPreDeletionHooks() .storeQuotaManager() - .create(); + .build(); storeMailboxManager = resources.getMailboxManager(); messageIdManager = resources.getMessageIdManager(); diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java index e60030e..4bdb966 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java +++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java @@ -92,7 +92,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem { InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); ThreadFactory threadFactory = NamedThreadFactory.withClassName(getClass()); - InMemoryIntegrationResources resources = InMemoryIntegrationResources.factory() + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() .authenticator(authenticator) .authorizator(authorizator) .inVmEventBus() @@ -112,7 +112,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem { preInstanciationStage.getSessionProvider())) .noPreDeletionHooks() .storeQuotaManager() - .create(); + .build(); mailboxManager = resources.getMailboxManager(); 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 e1c2243..3dcd5b6 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 @@ -51,7 +51,7 @@ public class InMemoryHostSystem extends JamesImapHostSystem { @Override public void beforeTest() throws Exception { super.beforeTest(); - InMemoryIntegrationResources resources = InMemoryIntegrationResources.factory() + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() .authenticator(authenticator) .authorizator(authorizator) .inVmEventBus() @@ -60,7 +60,7 @@ public class InMemoryHostSystem extends JamesImapHostSystem { .scanningSearchIndex() .noPreDeletionHooks() .storeQuotaManager() - .create(); + .build(); this.mailboxManager = resources.getMailboxManager(); this.perUserMaxQuotaManager = resources.getMaxQuotaManager(); 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 4c10337..b8358af 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 @@ -89,7 +89,7 @@ public class LuceneSearchHostSystem extends JamesImapHostSystem { try { FSDirectory fsDirectory = FSDirectory.open(tempFile); - InMemoryIntegrationResources resources = InMemoryIntegrationResources.factory() + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() .authenticator(authenticator) .authorizator(authorizator) .inVmEventBus() @@ -101,7 +101,7 @@ public class LuceneSearchHostSystem extends JamesImapHostSystem { preInstanciationStage.getSessionProvider()))) .noPreDeletionHooks() .storeQuotaManager() - .create(); + .build(); mailboxManager = resources.getMailboxManager(); 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 63dfd74..5747243 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,7 +75,7 @@ public class RabbitMQEventBusHostSystem extends JamesImapHostSystem { eventBus = createEventBus(); eventBus.start(); - resources = InMemoryIntegrationResources.factory() + resources = InMemoryIntegrationResources.builder() .authenticator(authenticator) .authorizator(authorizator) .eventBus(eventBus) @@ -84,7 +84,7 @@ public class RabbitMQEventBusHostSystem extends JamesImapHostSystem { .scanningSearchIndex() .noPreDeletionHooks() .storeQuotaManager() - .create(); + .build(); ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor( diff --git a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java index cc6c66a..91265e1 100644 --- a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java +++ b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java @@ -711,7 +711,7 @@ public class POP3ServerTest { protocolHandlerChain = new MockProtocolHandlerLoader(); protocolHandlerChain.put("usersrepository", UsersRepository.class, usersRepository); - mailboxManager = InMemoryIntegrationResources.factory() + mailboxManager = InMemoryIntegrationResources.builder() .authenticator((userid, passwd) -> { try { return usersRepository.test(userid, passwd.toString()); @@ -727,7 +727,7 @@ public class POP3ServerTest { .scanningSearchIndex() .noPreDeletionHooks() .storeQuotaManager() - .create() + .build() .getMailboxManager(); protocolHandlerChain.put("mailboxmanager", MailboxManager.class, mailboxManager); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
