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 485d9ebb274f6f060dc611c302d0c5adb9d383a7 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Mar 15 10:28:09 2019 +0700 JAMES-2687 Remove some InMemoryIntegrationResources::createMailboxManager methods --- .../manager/InMemoryIntegrationResources.java | 9 --------- .../apache/james/pop3server/POP3ServerTest.java | 22 ++++++++++------------ 2 files changed, 10 insertions(+), 21 deletions(-) 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 2ff7c2f..0db979e 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 @@ -245,15 +245,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM .mailboxManager; } - public StoreMailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver, Authenticator authenticator, Authorizator authorizator) { - return new InMemoryIntegrationResources.Factory() - .withGroupmembershipResolver(groupMembershipResolver) - .withAuthenticator(authenticator) - .withAuthorizator(authorizator) - .create() - .mailboxManager; - } - 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, diff --git a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java index 8502d60..7625412 100644 --- a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java +++ b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java @@ -35,11 +35,9 @@ import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.mailbox.MailboxManager; 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.manager.InMemoryIntegrationResources; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.FakeAuthorizator; import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mime4j.dom.Message; import org.apache.james.pop3server.netty.POP3Server; @@ -713,16 +711,16 @@ public class POP3ServerTest { protocolHandlerChain = new MockProtocolHandlerLoader(); protocolHandlerChain.put("usersrepository", UsersRepository.class, usersRepository); - mailboxManager = new InMemoryIntegrationResources() - .createMailboxManager(new SimpleGroupMembershipResolver(), - (userid, passwd) -> { - try { - return usersRepository.test(userid, passwd.toString()); - } catch (UsersRepositoryException e) { - e.printStackTrace(); - return false; - } - }, FakeAuthorizator.defaultReject()); + mailboxManager = new InMemoryIntegrationResources.Factory() + .withAuthenticator((userid, passwd) -> { + try { + return usersRepository.test(userid, passwd.toString()); + } catch (UsersRepositoryException e) { + e.printStackTrace(); + return false; + } + }).create() + .getMailboxManager(); protocolHandlerChain.put("mailboxmanager", MailboxManager.class, mailboxManager); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
