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:19 UTC
[james-project] 11/33: JAMES-2687
IntegrationResources::createMailboxManager has no reason to require a
GroupMembershipResolver
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 82576c7cb064d095aaa08ff361b4f82615bfd0ed
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 15 11:14:54 2019 +0700
JAMES-2687 IntegrationResources::createMailboxManager has no reason to require a GroupMembershipResolver
---
.../james/mailbox/manager/IntegrationResources.java | 5 +----
.../james/mailbox/manager/ManagerTestResources.java | 9 +--------
.../inmemory/manager/InMemoryIntegrationResources.java | 17 ++---------------
3 files changed, 4 insertions(+), 27 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 b3f78f7..1f31cde 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.manager;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.quota.QuotaManager;
@@ -31,7 +30,7 @@ import org.apache.james.mailbox.quota.QuotaRootResolver;
*/
public interface IntegrationResources<T extends MailboxManager> {
- T createMailboxManager(GroupMembershipResolver groupMembershipResolver) throws MailboxException;
+ T createMailboxManager() throws MailboxException;
QuotaManager retrieveQuotaManager(T mailboxManager) throws Exception;
@@ -39,6 +38,4 @@ public interface IntegrationResources<T extends MailboxManager> {
QuotaRootResolver retrieveQuotaRootResolver(T mailboxManager) throws Exception;
- GroupMembershipResolver createGroupMembershipResolver() throws Exception;
-
}
\ 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 f2fba0c..93d9eb7 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
@@ -33,7 +33,6 @@ import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
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.mock.MockMail;
import org.apache.james.mailbox.model.MailboxPath;
@@ -61,15 +60,13 @@ public class ManagerTestResources<T extends MailboxManager> {
private MaxQuotaManager maxQuotaManager;
private QuotaManager quotaManager;
- private GroupMembershipResolver groupMembershipResolver;
private QuotaRootResolver quotaRootResolver;
private IntegrationResources<T> integrationResources;
public ManagerTestResources(IntegrationResources<T> integrationResources) throws Exception {
this.integrationResources = integrationResources;
- groupMembershipResolver = integrationResources.createGroupMembershipResolver();
- mailboxManager = integrationResources.createMailboxManager(groupMembershipResolver);
+ mailboxManager = integrationResources.createMailboxManager();
maxQuotaManager = integrationResources.retrieveMaxQuotaManager(mailboxManager);
quotaRootResolver = integrationResources.retrieveQuotaRootResolver(mailboxManager);
@@ -89,10 +86,6 @@ public class ManagerTestResources<T extends MailboxManager> {
messageManager = mailboxManager.getMailbox(inbox, session);
}
- public GroupMembershipResolver getGroupMembershipResolver() {
- return groupMembershipResolver;
- }
-
public QuotaManager getQuotaManager() {
return quotaManager;
}
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 b89ad47..0c264d5 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
@@ -130,7 +130,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
}
public static class Factory {
- private Optional<GroupMembershipResolver> groupMembershipResolver;
private Optional<Authenticator> authenticator;
private Optional<Authorizator> authorizator;
private Optional<EventBus> eventBus;
@@ -139,7 +138,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
private ImmutableSet.Builder<BiFunction<SessionProvider, InMemoryMailboxSessionMapperFactory, PreDeletionHook>> preDeletionHooksInstanciators;
public Factory() {
- this.groupMembershipResolver = Optional.empty();
this.authenticator = Optional.empty();
this.authorizator = Optional.empty();
this.eventBus = Optional.empty();
@@ -163,11 +161,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
return this;
}
- public Factory withGroupmembershipResolver(GroupMembershipResolver groupmembershipResolver) {
- this.groupMembershipResolver = Optional.of(groupmembershipResolver);
- return this;
- }
-
public Factory withAnnotationLimits(int limitAnnotationCount, int limitAnnotationSize) {
this.limitAnnotationCount = Optional.of(limitAnnotationCount);
this.limitAnnotationSize = Optional.of(limitAnnotationSize);
@@ -193,7 +186,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
public Resources create() {
InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
EventBus eventBus = this.eventBus.orElseGet(() -> new InVMEventBus(new InVmEventDelivery(new NoopMetricFactory())));
- GroupMembershipResolver groupMembershipResolver = this.groupMembershipResolver.orElse(new SimpleGroupMembershipResolver());
+ GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), groupMembershipResolver, eventBus);
StoreMailboxAnnotationManager annotationManager = new StoreMailboxAnnotationManager(mailboxSessionMapperFactory,
storeRightManager, limitAnnotationCount.orElse(MailboxConstants.DEFAULT_LIMIT_ANNOTATIONS_ON_MAILBOX),
@@ -247,9 +240,8 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
}
@Override
- public InMemoryMailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver) {
+ public InMemoryMailboxManager createMailboxManager() {
return new Factory()
- .withGroupmembershipResolver(groupMembershipResolver)
.create()
.mailboxManager;
}
@@ -269,9 +261,4 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
return (DefaultUserQuotaRootResolver) mailboxManager.getQuotaComponents().getQuotaRootResolver();
}
- @Override
- public GroupMembershipResolver createGroupMembershipResolver() {
- return new SimpleGroupMembershipResolver();
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org