You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/03/20 11:54:10 UTC
[james-project] 02/33: JAMES-2687 Remove some
InMemoryIntegrationResources::createResources methods
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 77711345ec637c09b405d479439ee6994c37d8f3
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 15 10:20:14 2019 +0700
JAMES-2687 Remove some InMemoryIntegrationResources::createResources methods
Note: the resource POJO can supply a MessageIdManager by itself
---
.../InMemoryMessageIdManagerTestSystem.java | 10 +++---
.../manager/InMemoryIntegrationResources.java | 36 +++++++++++++---------
...lasticSearchQuotaSearchTestSystemExtension.java | 3 +-
.../MemoryQuotaSearchTestSystemExtension.java | 3 +-
.../james/transport/matchers/IsOverQuotaTest.java | 3 +-
.../event/PropagateLookupRightListenerTest.java | 6 +---
.../routes/DeletedMessagesVaultRoutesTest.java | 4 +--
.../routes/ElasticSearchQuotaSearchExtension.java | 3 +-
.../routes/ScanningQuotaSearchExtension.java | 3 +-
9 files changed, 32 insertions(+), 39 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 5447b59..fb660a1 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
@@ -18,20 +18,18 @@
****************************************************************/
package org.apache.james.mailbox.inmemory;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.MessageIdManagerTestSystem;
import org.apache.james.mailbox.store.StoreMailboxManager;
public class InMemoryMessageIdManagerTestSystem {
- public static MessageIdManagerTestSystem create() throws MailboxException {
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- InMemoryIntegrationResources.Resources resources = inMemoryIntegrationResources.createResources(new SimpleGroupMembershipResolver());
+ public static MessageIdManagerTestSystem create() {
+ InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create();
+
StoreMailboxManager mailboxManager = resources.getMailboxManager();
return new MessageIdManagerTestSystem(
- inMemoryIntegrationResources.createMessageIdManager(mailboxManager, resources.getMessageIdFactory()),
+ resources.createMessageIdManager(),
resources.getMessageIdFactory(),
resources.getMailboxManager().getMapperFactory(),
mailboxManager);
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 7afb9d3..f8ffcc3 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,14 +78,16 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
private final InMemoryCurrentQuotaManager currentQuotaManager;
private final DefaultUserQuotaRootResolver defaultUserQuotaRootResolver;
private final InMemoryPerUserMaxQuotaManager maxQuotaManager;
+ private final QuotaManager quotaManager;
- Resources(InMemoryMailboxManager mailboxManager, StoreRightManager storeRightManager, MessageId.Factory messageIdFactory, InMemoryCurrentQuotaManager currentQuotaManager, DefaultUserQuotaRootResolver defaultUserQuotaRootResolver, InMemoryPerUserMaxQuotaManager maxQuotaManager) {
+ 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;
}
public DefaultUserQuotaRootResolver getDefaultUserQuotaRootResolver() {
@@ -111,6 +113,17 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
public InMemoryPerUserMaxQuotaManager getMaxQuotaManager() {
return maxQuotaManager;
}
+
+ public MessageIdManager createMessageIdManager() {
+ return new StoreMessageIdManager(
+ mailboxManager,
+ mailboxManager.getMapperFactory(),
+ mailboxManager.getEventBus(),
+ messageIdFactory,
+ quotaManager,
+ defaultUserQuotaRootResolver,
+ mailboxManager.getPreDeletionHooks());
+ }
}
public static class Factory {
@@ -212,7 +225,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);
+ return new Resources(manager, storeRightManager, new InMemoryMessageId.Factory(), currentQuotaManager, quotaRootResolver, maxQuotaManager, quotaManager);
}
PreDeletionHooks createHooks(SessionProvider sessionProvider, InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory) {
@@ -227,17 +240,10 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
@Override
public InMemoryMailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver) {
- return createResources(groupMembershipResolver).mailboxManager;
- }
-
- public Resources createResources(GroupMembershipResolver groupMembershipResolver) {
- return createResources(groupMembershipResolver,
- MailboxConstants.DEFAULT_LIMIT_ANNOTATIONS_ON_MAILBOX,
- MailboxConstants.DEFAULT_LIMIT_ANNOTATION_SIZE);
- }
-
- public Resources createResources(GroupMembershipResolver groupMembershipResolver, int limitAnnotationCount, int limitAnnotationSize) {
- return createResources(groupMembershipResolver, limitAnnotationCount, limitAnnotationSize, PreDeletionHook.NO_PRE_DELETION_HOOK);
+ return new Factory()
+ .withGroupmembershipResolver(groupMembershipResolver)
+ .create()
+ .mailboxManager;
}
public Resources createResources(GroupMembershipResolver groupMembershipResolver, int limitAnnotationCount, int limitAnnotationSize,
@@ -314,7 +320,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);
+ return new Resources(manager, storeRightManager, new InMemoryMessageId.Factory(), currentQuotaManager, quotaRootResolver, maxQuotaManager, quotaManager);
}
public Resources createResourcesForHooks(SessionProvider sessionProvider, InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory, Set<PreDeletionHook> preDeletionHooks) {
@@ -349,7 +355,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);
+ return new Resources(manager, storeRightManager, new InMemoryMessageId.Factory(), currentQuotaManager, quotaRootResolver, maxQuotaManager, quotaManager);
}
@Override
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 33657b7..2474ff2 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
@@ -30,7 +30,6 @@ import org.apache.james.backends.es.EmbeddedElasticSearch;
import org.apache.james.backends.es.utils.TestingClientProvider;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.quota.search.QuotaSearchTestSystem;
@@ -63,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().createResources(new SimpleGroupMembershipResolver());
+ InMemoryIntegrationResources.Resources 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 65a5fa3..21567d4 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
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.mock;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.quota.search.QuotaSearchTestSystem;
@@ -45,7 +44,7 @@ public class MemoryQuotaSearchTestSystemExtension implements ParameterResolver {
@Override
public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
try {
- InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources().createResources(new SimpleGroupMembershipResolver());
+ InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create();
MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting();
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 5a043fa..e55a8d1 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
@@ -28,7 +28,6 @@ import java.util.Collection;
import org.apache.james.core.MailAddress;
import org.apache.james.core.quota.QuotaCount;
import org.apache.james.core.quota.QuotaSize;
-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.model.MailboxPath;
@@ -51,7 +50,7 @@ public class IsOverQuotaTest {
@Before
public void setUp() throws Exception {
- InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources().createResources(new SimpleGroupMembershipResolver());
+ InMemoryIntegrationResources.Resources 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 d38b37d..116219c 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
@@ -24,8 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.acl.GroupMembershipResolver;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.events.Group;
import org.apache.james.mailbox.events.MailboxListener;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
@@ -74,9 +72,7 @@ public class PropagateLookupRightListenerTest {
@Before
public void setup() throws Exception {
- GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
- InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources()
- .createResources(groupMembershipResolver);
+ InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create();
storeMailboxManager = resources.getMailboxManager();
storeRightManager = resources.getStoreRightManager();
mailboxMapper = storeMailboxManager.getMapperFactory();
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 1afa30d..0325b0a 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
@@ -57,7 +57,6 @@ import org.apache.james.core.MaybeSender;
import org.apache.james.core.User;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
@@ -110,8 +109,7 @@ class DeletedMessagesVaultRoutesTest {
@BeforeEach
void beforeEach() throws Exception {
vault = spy(new MemoryDeletedMessagesVault());
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- InMemoryIntegrationResources.Resources inMemoryResource = inMemoryIntegrationResources.createResources(new SimpleGroupMembershipResolver());
+ InMemoryIntegrationResources.Resources 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 6928ac1..7b98e5d 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
@@ -30,7 +30,6 @@ import org.apache.james.backends.es.EmbeddedElasticSearch;
import org.apache.james.backends.es.utils.TestingClientProvider;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.quota.search.QuotaSearchTestSystem;
@@ -66,7 +65,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef
new TestingClientProvider(embeddedElasticSearch.getNode()).get(),
ElasticSearchConfiguration.DEFAULT_CONFIGURATION);
- InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources().createResources(new SimpleGroupMembershipResolver());
+ InMemoryIntegrationResources.Resources 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 e55c34b..4412a8a 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
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.mock;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.quota.search.QuotaSearchTestSystem;
@@ -46,7 +45,7 @@ public class ScanningQuotaSearchExtension implements ParameterResolver, BeforeEa
@Override
public void beforeEach(ExtensionContext context) {
try {
- InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources().createResources(new SimpleGroupMembershipResolver());
+ InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create();
MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org