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/01/15 03:21:59 UTC
[24/30] james-project git commit: JAMES-2641 Simplify slightly
InMemoryIntegrationResources
JAMES-2641 Simplify slightly InMemoryIntegrationResources
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/59910ec7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/59910ec7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/59910ec7
Branch: refs/heads/master
Commit: 59910ec7cad40bd4c2cc9ef5c40897d49d5b328c
Parents: 7a2bf1e
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Jan 9 10:17:56 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Jan 15 10:10:05 2019 +0700
----------------------------------------------------------------------
.../manager/InMemoryIntegrationResources.java | 25 ++++----------------
1 file changed, 5 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/59910ec7/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
----------------------------------------------------------------------
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 27f3c9d..45425cb 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
@@ -19,8 +19,6 @@
package org.apache.james.mailbox.inmemory.manager;
-import java.util.function.BiFunction;
-
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
@@ -33,6 +31,7 @@ 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;
import org.apache.james.mailbox.quota.QuotaManager;
@@ -94,26 +93,13 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
}
public Resources createResources(GroupMembershipResolver groupMembershipResolver) throws MailboxException {
- return createMailboxManager(groupMembershipResolver,
- ((storeRightManager, inMemoryMailboxSessionMapperFactory) ->
- new StoreMailboxAnnotationManager(
- inMemoryMailboxSessionMapperFactory,
- storeRightManager)));
+ return createResources(groupMembershipResolver,
+ MailboxConstants.DEFAULT_LIMIT_ANNOTATIONS_ON_MAILBOX,
+ MailboxConstants.DEFAULT_LIMIT_ANNOTATION_SIZE);
}
public Resources createResources(GroupMembershipResolver groupMembershipResolver,
int limitAnnotationCount, int limitAnnotationSize) throws MailboxException {
- return createMailboxManager(groupMembershipResolver,
- ((storeRightManager, inMemoryMailboxSessionMapperFactory) ->
- new StoreMailboxAnnotationManager(
- inMemoryMailboxSessionMapperFactory,
- storeRightManager,
- limitAnnotationCount,
- limitAnnotationSize)));
- }
-
- private Resources createMailboxManager(GroupMembershipResolver groupMembershipResolver,
- BiFunction<StoreRightManager, InMemoryMailboxSessionMapperFactory, StoreMailboxAnnotationManager> annotationManagerBiFunction) throws MailboxException {
FakeAuthenticator fakeAuthenticator = new FakeAuthenticator();
fakeAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS);
@@ -121,8 +107,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
DefaultDelegatingMailboxListener delegatingListener = new DefaultDelegatingMailboxListener();
StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(),
groupMembershipResolver, delegatingListener);
- StoreMailboxAnnotationManager annotationManager = annotationManagerBiFunction
- .apply(storeRightManager, mailboxSessionMapperFactory);
+ StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mailboxSessionMapperFactory, storeRightManager, limitAnnotationCount, limitAnnotationSize);
SessionProvider sessionProvider = new SessionProvider(fakeAuthenticator, FakeAuthorizator.defaultReject());
QuotaComponents quotaComponents = createQuotaComponents(mailboxSessionMapperFactory, delegatingListener, sessionProvider);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org