JAMES-1935 rename method's name to closer its purpose
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/31d8e4bc Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/31d8e4bc Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/31d8e4bc Branch: refs/heads/master Commit: 31d8e4bca08d6f34cfe04ace09f53858e8f3fa7e Parents: ff4fb30 Author: Quynh Nguyen <[email protected]> Authored: Fri Feb 10 14:35:57 2017 +0700 Committer: Antoine Duprat <[email protected]> Committed: Fri Feb 10 16:45:14 2017 +0100 ---------------------------------------------------------------------- .../methods/SetMessagesCreationProcessor.java | 2 +- .../jmap/utils/SystemMailboxesProvider.java | 4 ++-- .../jmap/utils/SystemMailboxesProviderImpl.java | 15 +++++++------- .../SetMessagesCreationProcessorTest.java | 2 +- .../utils/SystemMailboxesProviderImplTest.java | 21 +++----------------- 5 files changed, 15 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/31d8e4bc/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java index bf1c937..90d265e 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java @@ -245,7 +245,7 @@ public class SetMessagesCreationProcessor implements SetMessagesProcessor { } private Optional<MessageManager> getMailboxWithRole(MailboxSession mailboxSession, Role role) throws MailboxException { - return systemMailboxesProvider.listMailboxes(role, mailboxSession).findFirst(); + return systemMailboxesProvider.getMailboxByRole(role, mailboxSession).findFirst(); } private SetError buildSetErrorFromValidationResult(List<ValidationResult> validationErrors) { http://git-wip-us.apache.org/repos/asf/james-project/blob/31d8e4bc/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProvider.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProvider.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProvider.java index bc01d52..1b55c55 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProvider.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProvider.java @@ -28,10 +28,10 @@ import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.exception.MailboxException; public interface SystemMailboxesProvider { - Stream<MessageManager> listMailboxes(Role aRole, MailboxSession session) throws MailboxException; + Stream<MessageManager> getMailboxByRole(Role aRole, MailboxSession session) throws MailboxException; default MessageManager findMailbox(Role role, MailboxSession session) throws MailboxException { - return listMailboxes(role, session).findAny() + return getMailboxByRole(role, session).findAny() .orElseThrow(() -> new MailboxRoleNotFoundException(role)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/31d8e4bc/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProviderImpl.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProviderImpl.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProviderImpl.java index 3a804ba..d17dd84 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProviderImpl.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SystemMailboxesProviderImpl.java @@ -48,13 +48,8 @@ public class SystemMailboxesProviderImpl implements SystemMailboxesProvider { this.mailboxManager = mailboxManager; } - private boolean hasRole(Role aRole, MailboxPath mailBoxPath) { - return Role.from(mailBoxPath.getName()) - .map(aRole::equals) - .orElse(false); - } - - public Stream<MessageManager> listMailboxes(Role aRole, MailboxSession session) throws MailboxException { + @Override + public Stream<MessageManager> getMailboxByRole(Role aRole, MailboxSession session) throws MailboxException { MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, session.getUser().getUserName(), aRole.getDefaultMailbox()); try { return Stream.of(mailboxManager.getMailbox(mailboxPath, session)); @@ -63,6 +58,12 @@ public class SystemMailboxesProviderImpl implements SystemMailboxesProvider { } } + private boolean hasRole(Role aRole, MailboxPath mailBoxPath) { + return Role.from(mailBoxPath.getName()) + .map(aRole::equals) + .orElse(false); + } + private Stream<MessageManager> searchMessageManagerByMailboxRole(Role aRole, MailboxSession session) throws MailboxException { ThrowingFunction<MailboxPath, MessageManager> loadMailbox = path -> mailboxManager.getMailbox(path, session); MailboxQuery mailboxQuery = MailboxQuery.builder(session) http://git-wip-us.apache.org/repos/asf/james-project/blob/31d8e4bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java index 9abe642..2f3713e 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java @@ -299,7 +299,7 @@ public class SetMessagesCreationProcessorTest { } @Override - public Stream<MessageManager> listMailboxes(Role aRole, MailboxSession session) { + public Stream<MessageManager> getMailboxByRole(Role aRole, MailboxSession session) { if (aRole.equals(Role.OUTBOX)) { return outboxSupplier.get().map(o -> Stream.of(o)).orElse(Stream.empty()); } else if (aRole.equals(Role.DRAFTS)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/31d8e4bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java index 7ea5d9d..8b5b61c 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java @@ -20,7 +20,6 @@ package org.apache.james.jmap.utils; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -32,11 +31,6 @@ import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.manager.MailboxManagerFixture; import org.apache.james.mailbox.mock.MockMailboxSession; -import org.apache.james.mailbox.model.MailboxId; -import org.apache.james.mailbox.model.MailboxMetaData; -import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.model.TestId; -import org.apache.james.mailbox.store.SimpleMailboxMetaData; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -44,16 +38,6 @@ import org.junit.rules.ExpectedException; public class SystemMailboxesProviderImplTest { - private static final MailboxPath INBOX = MailboxManagerFixture.MAILBOX_PATH1; - private static final MailboxPath OUTBOX = MailboxManagerFixture.MAILBOX_PATH2; - private static final char DELIMITER = '.'; - - private static final MailboxId inboxId = TestId.of(1); - private static final MailboxId outboxId = TestId.of(2); - - private static final MailboxMetaData inboxMetadata = new SimpleMailboxMetaData(INBOX, inboxId, DELIMITER); - private static final MailboxMetaData outboxMetadata = new SimpleMailboxMetaData(OUTBOX, outboxId, DELIMITER); - private MailboxSession mailboxSession = new MockMailboxSession("user"); private SystemMailboxesProviderImpl systemMailboxProvider; @@ -73,17 +57,18 @@ public class SystemMailboxesProviderImplTest { } @Test + @SuppressWarnings("unchecked") public void getMailboxByRoleShouldReturnEmptyWhenNoMailbox() throws Exception { when(mailboxManager.getMailbox(eq(MailboxManagerFixture.MAILBOX_PATH1), eq(mailboxSession))).thenThrow(MailboxNotFoundException.class); - assertThat(systemMailboxProvider.listMailboxes(Role.INBOX, mailboxSession)).isEmpty(); + assertThat(systemMailboxProvider.getMailboxByRole(Role.INBOX, mailboxSession)).isEmpty(); } @Test public void getMailboxByRoleShouldReturnMailboxByRole() throws Exception { when(mailboxManager.getMailbox(eq(MailboxManagerFixture.MAILBOX_PATH1), eq(mailboxSession))).thenReturn(inboxMessageManager); - assertThat(systemMailboxProvider.listMailboxes(Role.INBOX, mailboxSession)) + assertThat(systemMailboxProvider.getMailboxByRole(Role.INBOX, mailboxSession)) .hasSize(1) .containsOnly(inboxMessageManager); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
