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:11 UTC
[james-project] 03/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 772c237209aa967432aaa04df2abba1ef0ee0d80
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 15 10:24:09 2019 +0700
JAMES-2687 Remove some InMemoryIntegrationResources::createResources methods
---
.../mailbox/inmemory/MemoryMailboxManagerProvider.java | 8 ++++----
.../inmemory/manager/InMemoryIntegrationResources.java | 18 ------------------
2 files changed, 4 insertions(+), 22 deletions(-)
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 ba24881..9ee8b3e 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
@@ -21,7 +21,6 @@ package org.apache.james.mailbox.inmemory;
import java.util.Set;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.extension.PreDeletionHook;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
@@ -30,9 +29,10 @@ public class MemoryMailboxManagerProvider {
private static final int LIMIT_ANNOTATION_SIZE = 30;
public static InMemoryMailboxManager provideMailboxManager(Set<PreDeletionHook> preDeletionHooks) {
- return new InMemoryIntegrationResources()
- .createResources(new SimpleGroupMembershipResolver(),
- LIMIT_ANNOTATIONS, LIMIT_ANNOTATION_SIZE, preDeletionHooks)
+ return new InMemoryIntegrationResources.Factory()
+ .withAnnotationLimits(LIMIT_ANNOTATIONS, LIMIT_ANNOTATION_SIZE)
+ .withPreDeletionHooks(preDeletionHooks)
+ .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 f8ffcc3..83834fc 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
@@ -38,7 +38,6 @@ 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;
@@ -246,15 +245,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
.mailboxManager;
}
- public Resources createResources(GroupMembershipResolver groupMembershipResolver, int limitAnnotationCount, int limitAnnotationSize,
- Set<PreDeletionHook> preDeletionHooks) {
- FakeAuthenticator fakeAuthenticator = new FakeAuthenticator();
- fakeAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
- fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS);
-
- return createResources(groupMembershipResolver, fakeAuthenticator, FakeAuthorizator.defaultReject(), limitAnnotationCount, limitAnnotationSize, preDeletionHooks);
- }
-
public StoreMailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver, Authenticator authenticator, Authorizator authorizator) {
return createResources(groupMembershipResolver, authenticator, authorizator).mailboxManager;
}
@@ -271,14 +261,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
groupMembershipResolver, authenticator, authorizator, limitAnnotationCount, limitAnnotationSize, PreDeletionHook.NO_PRE_DELETION_HOOK);
}
- private Resources createResources(GroupMembershipResolver groupMembershipResolver,
- Authenticator authenticator, Authorizator authorizator,
- int limitAnnotationCount, int limitAnnotationSize, Set<PreDeletionHook> preDeletionHooks) {
-
- return createResources(new InVMEventBus(new InVmEventDelivery(new NoopMetricFactory())),
- groupMembershipResolver, authenticator, authorizator, limitAnnotationCount, limitAnnotationSize, preDeletionHooks);
- }
-
public Resources createResources(EventBus eventBus, Authenticator authenticator, Authorizator authorizator) {
return createResources(eventBus,
new SimpleGroupMembershipResolver(), authenticator, authorizator, MailboxConstants.DEFAULT_LIMIT_ANNOTATIONS_ON_MAILBOX, MailboxConstants.DEFAULT_LIMIT_ANNOTATION_SIZE,
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org