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:16 UTC
[james-project] 08/33: JAMES-2687 Limit calls to
IntegrationResource::createMailboxManager
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 6d73acbc15f144d2095c8449a472abb7f5abd7da
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 15 10:53:44 2019 +0700
JAMES-2687 Limit calls to IntegrationResource::createMailboxManager
---
.../mailbox/inmemory/InMemoryCombinationManagerTest.java | 3 +--
.../mailbox/inmemory/InMemoryMessageManagerTest.java | 3 +--
.../inmemory/MessageIdManagerTestSystemProvider.java | 15 ++++++---------
.../inmemory/MessageManagerTestSystemProvider.java | 12 ++----------
.../inmemory/manager/InMemoryIntegrationResources.java | 12 ++++++++++--
.../mailbox/spamassassin/SpamAssassinListenerTest.java | 3 +--
.../store/search/SimpleMessageSearchIndexTest.java | 4 +---
.../james/mailbox/tools/copier/MailboxCopierTest.java | 6 ++----
.../mailbox/tools/indexer/MessageIdReIndexerImplTest.java | 6 ++----
.../apache/mailbox/tools/indexer/ReIndexerImplTest.java | 6 ++----
.../james/adapter/mailbox/MailboxManagementTest.java | 4 +---
.../jmap/DefaultMailboxesProvisioningFilterTest.java | 4 +---
.../james/jmap/mailet/filter/JMAPFilteringExtension.java | 5 ++---
.../apache/james/jmap/methods/GetMailboxesMethodTest.java | 5 +----
.../apache/james/jmap/methods/GetMessagesMethodTest.java | 8 +++-----
.../org/apache/james/jmap/model/MailboxFactoryTest.java | 3 +--
.../apache/james/jmap/send/PostDequeueDecoratorTest.java | 8 +++-----
.../org/apache/james/jmap/utils/MailboxUtilsTest.java | 5 ++---
.../james/webadmin/routes/ReindexingRoutesTest.java | 3 +--
.../james/webadmin/routes/UserMailboxesRoutesTest.java | 5 +----
20 files changed, 44 insertions(+), 76 deletions(-)
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
index 4866f1f..7626b35 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.mailbox.inmemory;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.AbstractCombinationManagerTest;
import org.apache.james.mailbox.store.CombinationManagerTestSystem;
import org.junit.Before;
@@ -32,7 +31,7 @@ public class InMemoryCombinationManagerTest extends AbstractCombinationManagerTe
}
@Override
- public CombinationManagerTestSystem createTestingData() throws MailboxException {
+ public CombinationManagerTestSystem createTestingData() {
return MessageIdManagerTestSystemProvider.createManagersTestingData();
}
}
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java
index ea5a84e..3164610 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTest.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.mailbox.inmemory;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.AbstractMessageManagerTest;
import org.apache.james.mailbox.store.MessageManagerTestSystem;
import org.junit.Before;
@@ -32,7 +31,7 @@ public class InMemoryMessageManagerTest extends AbstractMessageManagerTest {
}
@Override
- protected MessageManagerTestSystem createTestSystem() throws MailboxException {
+ protected MessageManagerTestSystem createTestSystem() {
return MessageManagerTestSystemProvider.createTestSystem();
}
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 b4123bc..833f189 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
@@ -18,25 +18,22 @@
****************************************************************/
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.CombinationManagerTestSystem;
import org.apache.james.mailbox.store.MessageIdManagerTestSystem;
-import org.apache.james.mailbox.store.StoreMailboxManager;
public class MessageIdManagerTestSystemProvider {
- public static MessageIdManagerTestSystem createTestingData() throws MailboxException {
+ public static MessageIdManagerTestSystem createTestingData() {
return InMemoryMessageIdManagerTestSystem.create();
}
- public static CombinationManagerTestSystem createManagersTestingData() throws MailboxException {
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- StoreMailboxManager mailboxManager = inMemoryIntegrationResources.createMailboxManager(new SimpleGroupMembershipResolver());
+ public static CombinationManagerTestSystem createManagersTestingData() {
+ InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create();
- return new InMemoryCombinationManagerTestSystem(mailboxManager,
- inMemoryIntegrationResources.createMessageIdManager(mailboxManager));
+ return new InMemoryCombinationManagerTestSystem(
+ resources.getMailboxManager(),
+ resources.createMessageIdManager());
}
}
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageManagerTestSystemProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageManagerTestSystemProvider.java
index a7e1d16..ed865d2 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageManagerTestSystemProvider.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageManagerTestSystemProvider.java
@@ -18,19 +18,11 @@
****************************************************************/
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.MessageManagerTestSystem;
-import org.apache.james.mailbox.store.StoreMailboxManager;
public class MessageManagerTestSystemProvider {
-
-
- public static MessageManagerTestSystem createTestSystem() throws MailboxException {
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- StoreMailboxManager mailboxManager = inMemoryIntegrationResources.createMailboxManager(new SimpleGroupMembershipResolver());
-
- return new InMemoryMessageManagerTestSystem(mailboxManager);
+ public static MessageManagerTestSystem createTestSystem() {
+ return new InMemoryMessageManagerTestSystem(new InMemoryIntegrationResources.Factory().create().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 536a513..7129d8b 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
@@ -37,6 +37,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMessageId;
import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager;
import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
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;
@@ -199,7 +200,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
limitAnnotationSize.orElse(MailboxConstants.DEFAULT_LIMIT_ANNOTATION_SIZE));
SessionProvider sessionProvider = new SessionProvider(
- authenticator.orElse(new FakeAuthenticator()),
+ authenticator.orElse(defaultAuthenticator()),
authorizator.orElse(FakeAuthorizator.defaultReject()));
InMemoryPerUserMaxQuotaManager maxQuotaManager = new InMemoryPerUserMaxQuotaManager();
@@ -230,6 +231,13 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
return new Resources(manager, storeRightManager, new InMemoryMessageId.Factory(), currentQuotaManager, quotaRootResolver, maxQuotaManager, quotaManager);
}
+ FakeAuthenticator defaultAuthenticator() {
+ FakeAuthenticator fakeAuthenticator = new FakeAuthenticator();
+ fakeAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS);
+ return fakeAuthenticator;
+ }
+
PreDeletionHooks createHooks(SessionProvider sessionProvider, InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory) {
return new PreDeletionHooks(preDeletionHooksInstanciators.build()
.stream()
@@ -253,7 +261,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
return createMessageIdManager(mailboxManager, new InMemoryMessageId.Factory());
}
- public MessageIdManager createMessageIdManager(StoreMailboxManager mailboxManager, MessageId.Factory factory) {
+ private MessageIdManager createMessageIdManager(StoreMailboxManager mailboxManager, MessageId.Factory factory) {
QuotaComponents quotaComponents = mailboxManager.getQuotaComponents();
return new StoreMessageIdManager(
mailboxManager,
diff --git a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
index 8bcbf3c..2a8fe0f 100644
--- a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
+++ b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
@@ -35,7 +35,6 @@ import javax.mail.util.SharedByteArrayInputStream;
import org.apache.james.mailbox.DefaultMailboxes;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
-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.events.MessageMoveEvent;
@@ -78,7 +77,7 @@ public class SpamAssassinListenerTest {
@Before
public void setup() throws Exception {
- StoreMailboxManager mailboxManager = spy(new InMemoryIntegrationResources().createMailboxManager(new SimpleGroupMembershipResolver()));
+ StoreMailboxManager mailboxManager = spy(new InMemoryIntegrationResources.Factory().create().getMailboxManager());
SystemMailboxesProviderImpl systemMailboxesProvider = new SystemMailboxesProviderImpl(mailboxManager);
when(mailboxManager.createSystemSession(USER))
.thenReturn(MAILBOX_SESSION);
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 021cf82..f4d2c74 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
@@ -19,7 +19,6 @@
package org.apache.james.mailbox.store.search;
-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.PreDeletionHooks;
@@ -34,8 +33,7 @@ public class SimpleMessageSearchIndexTest extends AbstractMessageSearchIndexTest
@Override
protected void initializeMailboxManager() {
- storeMailboxManager = new InMemoryIntegrationResources()
- .createMailboxManager(new SimpleGroupMembershipResolver());
+ storeMailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
messageSearchIndex = new SimpleMessageSearchIndex(
storeMailboxManager.getMapperFactory(),
diff --git a/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java b/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java
index 1144b16..42ba3e5 100644
--- a/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java
+++ b/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java
@@ -27,7 +27,6 @@ import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.exception.BadCredentialsException;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
@@ -136,9 +135,8 @@ public class MailboxCopierTest {
*
* @return a new InMemoryMailboxManager
*/
- private MailboxManager newInMemoryMailboxManager() throws MailboxException {
- return new InMemoryIntegrationResources()
- .createMailboxManager(new SimpleGroupMembershipResolver());
+ private MailboxManager newInMemoryMailboxManager() {
+ return new InMemoryIntegrationResources.Factory().create().getMailboxManager();
}
}
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReIndexerImplTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReIndexerImplTest.java
index ff25d44..f1da941 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReIndexerImplTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReIndexerImplTest.java
@@ -27,8 +27,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
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.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.ComposedMessageId;
@@ -52,8 +50,8 @@ public class MessageIdReIndexerImplTest {
private MessageIdReIndexerImpl reIndexer;
@BeforeEach
- void setUp() throws MailboxException {
- mailboxManager = new InMemoryIntegrationResources().createMailboxManager(new SimpleGroupMembershipResolver());
+ void setUp() {
+ mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
MailboxSessionMapperFactory mailboxSessionMapperFactory = mailboxManager.getMapperFactory();
messageSearchIndex = mock(ListeningMessageSearchIndex.class);
reIndexer = new MessageIdReIndexerImpl(mailboxManager, mailboxSessionMapperFactory, messageSearchIndex);
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
index 4ada930..b01dcf5 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
@@ -30,8 +30,6 @@ import org.apache.james.core.User;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageUid;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
import org.apache.james.mailbox.indexer.ReIndexer;
import org.apache.james.mailbox.inmemory.InMemoryId;
@@ -58,8 +56,8 @@ public class ReIndexerImplTest {
private ReIndexer reIndexer;
@BeforeEach
- void setUp() throws MailboxException {
- mailboxManager = new InMemoryIntegrationResources().createMailboxManager(new SimpleGroupMembershipResolver());
+ void setUp() {
+ mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
MailboxSessionMapperFactory mailboxSessionMapperFactory = mailboxManager.getMapperFactory();
messageSearchIndex = mock(ListeningMessageSearchIndex.class);
reIndexer = new ReIndexerImpl(new ReIndexerPerformer(mailboxManager, messageSearchIndex, mailboxSessionMapperFactory),
diff --git a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index 2d16cec..3f72587 100644
--- a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -29,7 +29,6 @@ import java.util.Iterator;
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxExistsException;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -56,8 +55,7 @@ public class MailboxManagementTest {
@BeforeEach
void setUp() throws Exception {
- StoreMailboxManager mailboxManager = new InMemoryIntegrationResources()
- .createMailboxManager(new SimpleGroupMembershipResolver());
+ StoreMailboxManager mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
mapperFactory = mailboxManager.getMapperFactory();
mailboxManagerManagement = new MailboxManagerManagement();
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java
index 44509e8..054cb6e 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java
@@ -25,7 +25,6 @@ import java.time.Duration;
import org.apache.james.mailbox.DefaultMailboxes;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.MailboxPath;
@@ -50,8 +49,7 @@ public class DefaultMailboxesProvisioningFilterTest {
public void before() throws Exception {
session = MailboxSessionUtil.create(USERNAME);
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- mailboxManager = inMemoryIntegrationResources.createMailboxManager(new SimpleGroupMembershipResolver());
+ mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
subscriptionManager = new StoreSubscriptionManager(mailboxManager.getMapperFactory());
testee = new DefaultMailboxesProvisioningFilter(mailboxManager, subscriptionManager, new NoopMetricFactory());
}
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringExtension.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringExtension.java
index 1103a08..d94e3c2 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringExtension.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringExtension.java
@@ -37,7 +37,6 @@ import org.apache.james.jmap.api.filtering.FilteringManagement;
import org.apache.james.jmap.api.filtering.Rule;
import org.apache.james.jmap.api.filtering.impl.EventSourcingFilteringManagement;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
@@ -129,10 +128,10 @@ public class JMAPFilteringExtension implements BeforeEachCallback, ParameterReso
private JMAPFilteringTestSystem testSystem;
@Override
- public void beforeEach(ExtensionContext extensionContext) throws Exception {
+ public void beforeEach(ExtensionContext extensionContext) {
FilteringManagement filteringManagement = new EventSourcingFilteringManagement(new InMemoryEventStore());
MemoryUsersRepository usersRepository = MemoryUsersRepository.withoutVirtualHosting();
- InMemoryMailboxManager mailboxManager = new InMemoryIntegrationResources().createMailboxManager(new SimpleGroupMembershipResolver());
+ InMemoryMailboxManager mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
ActionApplier.Factory actionApplierFactory = ActionApplier.factory(mailboxManager, new InMemoryId.Factory());
JMAPFiltering jmapFiltering = new JMAPFiltering(filteringManagement, usersRepository, actionApplierFactory);
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
index 8ee3ec0..cf9c4d4 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
@@ -42,7 +42,6 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.Role;
-import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
@@ -71,9 +70,7 @@ public class GetMailboxesMethodTest {
@Before
public void setup() throws Exception {
clientId = ClientId.of("#0");
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver();
- mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver);
+ mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
QuotaRootResolver quotaRootResolver = mailboxManager.getQuotaComponents().getQuotaRootResolver();
QuotaManager quotaManager = mailboxManager.getQuotaComponents().getQuotaManager();
mailboxFactory = new MailboxFactory(mailboxManager, quotaManager, quotaRootResolver);
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 0bd939a..906c8bb 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
@@ -52,7 +52,6 @@ import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.AppendCommand;
-import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.BlobId;
import org.apache.james.mailbox.model.ComposedMessageId;
@@ -105,16 +104,15 @@ 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 inMemoryIntegrationResources = new InMemoryIntegrationResources();
- GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver();
- mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver);
+ InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create();
+ mailboxManager = resources.getMailboxManager();
session = MailboxSessionUtil.create(ROBERT.asString());
inboxPath = MailboxPath.inbox(session);
customMailboxPath = new MailboxPath(inboxPath, "custom");
mailboxManager.createMailbox(inboxPath, session);
mailboxManager.createMailbox(customMailboxPath, session);
- messageIdManager = inMemoryIntegrationResources.createMessageIdManager(mailboxManager);
+ messageIdManager = resources.createMessageIdManager();
testee = new GetMessagesMethod(messageFactory, messageIdManager, new DefaultMetricFactory());
messageContent1 = org.apache.james.mime4j.dom.Message.Builder.of()
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
index 013e3ed..3584179 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
@@ -57,8 +57,7 @@ public class MailboxFactoryTest {
@Before
public void setup() throws Exception {
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- mailboxManager = inMemoryIntegrationResources.createMailboxManager(inMemoryIntegrationResources.createGroupMembershipResolver());
+ mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
QuotaRootResolver quotaRootResolver = mailboxManager.getQuotaComponents().getQuotaRootResolver();
QuotaManager quotaManager = mailboxManager.getQuotaComponents().getQuotaManager();
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 9cae9ac..a336d38 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
@@ -38,7 +38,6 @@ import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.AppendCommand;
import org.apache.james.mailbox.MessageUid;
-import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxRoleNotFoundException;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
@@ -81,15 +80,14 @@ public class PostDequeueDecoratorTest {
@Before
public void init() throws Exception {
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver();
- mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver);
+ InMemoryIntegrationResources.Resources resources = new InMemoryIntegrationResources.Factory().create();
+ mailboxManager = resources.getMailboxManager();
mockedMailQueueItem = mock(MailQueueItem.class);
mail = FakeMail.defaultFakeMail();
when(mockedMailQueueItem.getMail()).thenReturn(mail);
testee = new PostDequeueDecorator(mockedMailQueueItem, mailboxManager, new InMemoryMessageId.Factory(),
- inMemoryIntegrationResources.createMessageIdManager(mailboxManager), new SystemMailboxesProviderImpl(mailboxManager));
+ resources.createMessageIdManager(), new SystemMailboxesProviderImpl(mailboxManager));
message = Message.Builder.of()
.setSubject("test")
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
index b94f89b..924222e 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
@@ -38,10 +38,9 @@ public class MailboxUtilsTest {
@Before
public void setup() throws Exception {
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
- mailboxManager = inMemoryIntegrationResources.createMailboxManager(inMemoryIntegrationResources.createGroupMembershipResolver());
+ mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
user = "user@domain.org";
- mailboxSession = mailboxManager.login(user, "pass");
+ mailboxSession = mailboxManager.createSystemSession(user);
sut = new MailboxUtils(mailboxManager);
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
index 86c2b52..f1f016d 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
@@ -33,7 +33,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.indexer.ReIndexer;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
@@ -77,7 +76,7 @@ class ReindexingRoutesTest {
@BeforeEach
void beforeEach() throws Exception {
- mailboxManager = new InMemoryIntegrationResources().createMailboxManager(new SimpleGroupMembershipResolver());
+ mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager();
MemoryTaskManager taskManager = new MemoryTaskManager();
InMemoryId.Factory mailboxIdFactory = new InMemoryId.Factory();
searchIndex = mock(ListeningMessageSearchIndex.class);
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 562b293..9b8634e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -36,7 +36,6 @@ import java.util.Map;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSessionUtil;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxExistsException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
@@ -96,9 +95,7 @@ class UserMailboxesRoutesTest {
@BeforeEach
void setUp() throws Exception {
- InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
-
- createServer(inMemoryIntegrationResources.createMailboxManager(new SimpleGroupMembershipResolver()));
+ createServer(new InMemoryIntegrationResources.Factory().create().getMailboxManager());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org