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 f9655f7eb18c74fe887eb659dfae0d030c13acd0 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Mar 15 11:23:41 2019 +0700 JAMES-2687 Merge InMemoryIntegrationResources.Resources into InMemoryIntegrationResources --- .../mailbox/manager/IntegrationResources.java | 8 +- .../mailbox/manager/ManagerTestResources.java | 8 +- .../InMemoryMessageIdManagerTestSystem.java | 2 +- .../MessageIdManagerTestSystemProvider.java | 2 +- .../manager/InMemoryIntegrationResources.java | 139 +++++++++------------ .../InMemoryQuotaMailboxMessageManagerTest.java | 2 +- .../james/vault/DeletedMessageVaultHookTest.java | 2 +- ...lasticSearchQuotaSearchTestSystemExtension.java | 2 +- .../MemoryQuotaSearchTestSystemExtension.java | 2 +- .../inmemory/host/InMemoryHostSystem.java | 2 +- .../rabbitmq/host/RabbitMQEventBusHostSystem.java | 2 +- .../james/transport/matchers/IsOverQuotaTest.java | 2 +- .../event/PropagateLookupRightListenerTest.java | 2 +- .../james/jmap/methods/GetMessagesMethodTest.java | 2 +- .../james/jmap/send/PostDequeueDecoratorTest.java | 2 +- .../routes/DeletedMessagesVaultRoutesTest.java | 2 +- .../routes/ElasticSearchQuotaSearchExtension.java | 2 +- .../routes/ScanningQuotaSearchExtension.java | 2 +- 18 files changed, 82 insertions(+), 103 deletions(-) diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/IntegrationResources.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/IntegrationResources.java index 1f31cde..59f23ef 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/IntegrationResources.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/IntegrationResources.java @@ -30,12 +30,12 @@ import org.apache.james.mailbox.quota.QuotaRootResolver; */ public interface IntegrationResources<T extends MailboxManager> { - T createMailboxManager() throws MailboxException; + T getMailboxManager() throws MailboxException; - QuotaManager retrieveQuotaManager(T mailboxManager) throws Exception; + QuotaManager getQuotaManager(); - MaxQuotaManager retrieveMaxQuotaManager(T mailboxManager) throws Exception; + MaxQuotaManager getMaxQuotaManager(); - QuotaRootResolver retrieveQuotaRootResolver(T mailboxManager) throws Exception; + QuotaRootResolver getQuotaRootResolver(); } \ No newline at end of file diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java index 93d9eb7..ef48e66 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java @@ -66,11 +66,11 @@ public class ManagerTestResources<T extends MailboxManager> { public ManagerTestResources(IntegrationResources<T> integrationResources) throws Exception { this.integrationResources = integrationResources; - mailboxManager = integrationResources.createMailboxManager(); + mailboxManager = integrationResources.getMailboxManager(); - maxQuotaManager = integrationResources.retrieveMaxQuotaManager(mailboxManager); - quotaRootResolver = integrationResources.retrieveQuotaRootResolver(mailboxManager); - quotaManager = integrationResources.retrieveQuotaManager(mailboxManager); + maxQuotaManager = integrationResources.getMaxQuotaManager(); + quotaRootResolver = integrationResources.getQuotaRootResolver(); + quotaManager = integrationResources.getQuotaManager(); session = mailboxManager.login(USER, USER_PASS); inbox = MailboxPath.inbox(session); 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 0f73a04..faecd52 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 @@ -25,7 +25,7 @@ import org.apache.james.mailbox.store.StoreMailboxManager; public class InMemoryMessageIdManagerTestSystem { public static MessageIdManagerTestSystem create() { - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); StoreMailboxManager mailboxManager = resources.getMailboxManager(); return new MessageIdManagerTestSystem( 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 776a746..6d6ab17 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 @@ -29,7 +29,7 @@ public class MessageIdManagerTestSystemProvider { } public static CombinationManagerTestSystem createManagersTestingData() { - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); return new InMemoryCombinationManagerTestSystem( resources.getMailboxManager(), 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 f5a241f..603402e 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 @@ -40,8 +40,8 @@ import org.apache.james.mailbox.manager.IntegrationResources; import org.apache.james.mailbox.manager.ManagerTestResources; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MessageId; -import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.quota.QuotaManager; +import org.apache.james.mailbox.quota.QuotaRootResolver; import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.FakeAuthenticator; @@ -69,69 +69,6 @@ import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableSet; public class InMemoryIntegrationResources implements IntegrationResources<StoreMailboxManager> { - - public static class Resources { - private final InMemoryMailboxManager mailboxManager; - private final StoreRightManager storeRightManager; - private final MessageId.Factory messageIdFactory; - private final InMemoryCurrentQuotaManager currentQuotaManager; - 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; - this.storeRightManager = storeRightManager; - this.messageIdFactory = messageIdFactory; - this.currentQuotaManager = currentQuotaManager; - 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() { - return defaultUserQuotaRootResolver; - } - - public InMemoryMailboxManager getMailboxManager() { - return mailboxManager; - } - - public InMemoryCurrentQuotaManager getCurrentQuotaManager() { - return currentQuotaManager; - } - - public StoreRightManager getStoreRightManager() { - return storeRightManager; - } - - public MessageId.Factory getMessageIdFactory() { - return messageIdFactory; - } - - public InMemoryPerUserMaxQuotaManager getMaxQuotaManager() { - return maxQuotaManager; - } - - public QuotaManager getQuotaManager() { - return quotaManager; - } - - public MessageIdManager getMessageIdManager() { - return storeMessageIdManager; - } - } - public static class Factory { private Optional<Authenticator> authenticator; private Optional<Authorizator> authorizator; @@ -186,7 +123,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM return (a, b) -> preDeletionHook; } - public Resources create() { + public InMemoryIntegrationResources create() { InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory(); EventBus eventBus = this.eventBus.orElseGet(() -> new InVMEventBus(new InVmEventDelivery(new NoopMetricFactory()))); GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver(); @@ -224,7 +161,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM eventBus.register(listeningCurrentQuotaUpdater); eventBus.register(new MailboxAnnotationListener(mailboxSessionMapperFactory, sessionProvider)); - return new Resources(manager, storeRightManager, new InMemoryMessageId.Factory(), currentQuotaManager, quotaRootResolver, maxQuotaManager, quotaManager); + return new InMemoryIntegrationResources(manager, storeRightManager, new InMemoryMessageId.Factory(), currentQuotaManager, quotaRootResolver, maxQuotaManager, quotaManager); } FakeAuthenticator defaultAuthenticator() { @@ -242,26 +179,68 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM } } - @Override - public InMemoryMailboxManager createMailboxManager() { - return new Factory() - .create() - .mailboxManager; + private final InMemoryMailboxManager mailboxManager; + private final StoreRightManager storeRightManager; + private final MessageId.Factory messageIdFactory; + private final InMemoryCurrentQuotaManager currentQuotaManager; + private final DefaultUserQuotaRootResolver defaultUserQuotaRootResolver; + private final InMemoryPerUserMaxQuotaManager maxQuotaManager; + private final QuotaManager quotaManager; + private StoreMessageIdManager storeMessageIdManager; + + InMemoryIntegrationResources(InMemoryMailboxManager mailboxManager, StoreRightManager storeRightManager, MessageId.Factory messageIdFactory, InMemoryCurrentQuotaManager currentQuotaManager, DefaultUserQuotaRootResolver defaultUserQuotaRootResolver, InMemoryPerUserMaxQuotaManager maxQuotaManager, QuotaManager quotaManager) { + this.mailboxManager = mailboxManager; + this.storeRightManager = storeRightManager; + this.messageIdFactory = messageIdFactory; + this.currentQuotaManager = currentQuotaManager; + this.defaultUserQuotaRootResolver = defaultUserQuotaRootResolver; + this.maxQuotaManager = maxQuotaManager; + this.quotaManager = quotaManager; + + this.storeMessageIdManager = new StoreMessageIdManager( + mailboxManager, + mailboxManager.getMapperFactory(), + mailboxManager.getEventBus(), + messageIdFactory, + quotaManager, + defaultUserQuotaRootResolver, + mailboxManager.getPreDeletionHooks()); } - @Override - public QuotaManager retrieveQuotaManager(StoreMailboxManager mailboxManager) { - return mailboxManager.getQuotaComponents().getQuotaManager(); + public DefaultUserQuotaRootResolver getDefaultUserQuotaRootResolver() { + return defaultUserQuotaRootResolver; } - @Override - public MaxQuotaManager retrieveMaxQuotaManager(StoreMailboxManager mailboxManager) { - return mailboxManager.getQuotaComponents().getMaxQuotaManager(); + public InMemoryMailboxManager getMailboxManager() { + return mailboxManager; } - @Override - public DefaultUserQuotaRootResolver retrieveQuotaRootResolver(StoreMailboxManager mailboxManager) { - return (DefaultUserQuotaRootResolver) mailboxManager.getQuotaComponents().getQuotaRootResolver(); + public InMemoryCurrentQuotaManager getCurrentQuotaManager() { + return currentQuotaManager; + } + + public StoreRightManager getStoreRightManager() { + return storeRightManager; + } + + public MessageId.Factory getMessageIdFactory() { + return messageIdFactory; + } + + public InMemoryPerUserMaxQuotaManager getMaxQuotaManager() { + return maxQuotaManager; + } + + public QuotaManager getQuotaManager() { + return quotaManager; } + public MessageIdManager getMessageIdManager() { + return storeMessageIdManager; + } + + @Override + public QuotaRootResolver getQuotaRootResolver() { + return defaultUserQuotaRootResolver; + } } diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java index 4929584..a3499bd 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java @@ -32,7 +32,7 @@ public class InMemoryQuotaMailboxMessageManagerTest extends QuotaMessageManagerT @Override protected ManagerTestResources<StoreMailboxManager> createResources() throws Exception { - return new ManagerTestResources<>(new InMemoryIntegrationResources()); + return new ManagerTestResources<>(new InMemoryIntegrationResources.Factory().create()); } } \ No newline at end of file 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 59da472..ecb271b 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 resources = new InMemoryIntegrationResources.Factory() + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory() .withPreDeletionHook((sessionProvider, mapperFactory) -> new DeletedMessageVaultHook(sessionProvider, messageVault, deletedMessageConverter, mapperFactory, clock)) .create(); 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 2474ff2..31b4c04 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 @@ -62,7 +62,7 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes Client client = QuotaSearchIndexCreationUtil.prepareDefaultClient( new TestingClientProvider(embeddedElasticSearch.getNode()).get(), ElasticSearchConfiguration.DEFAULT_CONFIGURATION); - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(); diff --git a/mailbox/plugin/quota-search-scanning/src/test/java/org/apache/james/quota/search/scanning/MemoryQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-scanning/src/test/java/org/apache/james/quota/search/scanning/MemoryQuotaSearchTestSystemExtension.java index 21567d4..1be43df 100644 --- a/mailbox/plugin/quota-search-scanning/src/test/java/org/apache/james/quota/search/scanning/MemoryQuotaSearchTestSystemExtension.java +++ b/mailbox/plugin/quota-search-scanning/src/test/java/org/apache/james/quota/search/scanning/MemoryQuotaSearchTestSystemExtension.java @@ -44,7 +44,7 @@ public class MemoryQuotaSearchTestSystemExtension implements ParameterResolver { @Override public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException { try { - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(); 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 0ca764d..8608b89 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 resources = new InMemoryIntegrationResources.Factory() + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory() .withAuthenticator(authenticator) .withAuthorizator(authorizator) .create(); 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 8a3df80..078f006 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 @@ -60,8 +60,8 @@ public class RabbitMQEventBusHostSystem extends JamesImapHostSystem { private final DockerRabbitMQ dockerRabbitMQ; private RabbitMQEventBus eventBus; - private InMemoryIntegrationResources.Resources resources; private SimpleConnectionPool connectionPool; + private InMemoryIntegrationResources resources; RabbitMQEventBusHostSystem(DockerRabbitMQ dockerRabbitMQ) { this.dockerRabbitMQ = dockerRabbitMQ; diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java index e55a8d1..3a5bf9b 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java @@ -50,7 +50,7 @@ public class IsOverQuotaTest { @Before public void setUp() throws Exception { - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); mailboxManager = resources.getMailboxManager(); quotaRootResolver = resources.getDefaultUserQuotaRootResolver(); 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 116219c..637973d 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 @@ -72,7 +72,7 @@ public class PropagateLookupRightListenerTest { @Before public void setup() throws Exception { - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); storeMailboxManager = resources.getMailboxManager(); storeRightManager = resources.getStoreRightManager(); mailboxMapper = storeMailboxManager.getMapperFactory(); 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 e910c20..2745cfd 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 @@ -104,7 +104,7 @@ public class GetMessagesMethodTest { BlobManager blobManager = mock(BlobManager.class); when(blobManager.toBlobId(any(MessageId.class))).thenReturn(BlobId.fromString("fake")); MessageFactory messageFactory = new MessageFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor); - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); mailboxManager = resources.getMailboxManager(); session = MailboxSessionUtil.create(ROBERT.asString()); 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 f440cd2..3eb32d5 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 @@ -80,7 +80,7 @@ public class PostDequeueDecoratorTest { @Before public void init() throws Exception { - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); mailboxManager = resources.getMailboxManager(); mockedMailQueueItem = mock(MailQueueItem.class); diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java index 0325b0a..8d43961 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java @@ -109,7 +109,7 @@ class DeletedMessagesVaultRoutesTest { @BeforeEach void beforeEach() throws Exception { vault = spy(new MemoryDeletedMessagesVault()); - InMemoryIntegrationResources.Resources inMemoryResource = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources inMemoryResource = new InMemoryIntegrationResources.Factory().create(); mailboxManager = spy(inMemoryResource.getMailboxManager()); taskManager = new MemoryTaskManager(); 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 7b98e5d..205aef6 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 @@ -65,7 +65,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef new TestingClientProvider(embeddedElasticSearch.getNode()).get(), ElasticSearchConfiguration.DEFAULT_CONFIGURATION); - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(); diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java index 4412a8a..273402b 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java @@ -45,7 +45,7 @@ public class ScanningQuotaSearchExtension implements ParameterResolver, BeforeEa @Override public void beforeEach(ExtensionContext context) { try { - InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create(); + InMemoryIntegrationResources resources = new InMemoryIntegrationResources.Factory().create(); MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
