Repository: james-project Updated Branches: refs/heads/master 6e153c4c3 -> 89ca3b8b4
Add hasCapability function into MailboxManager and refactor Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/89ca3b8b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/89ca3b8b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/89ca3b8b Branch: refs/heads/master Commit: 89ca3b8b4e6754a5eb5b5ba4be3bc8c987904023 Parents: 07127be Author: Quynh Nguyen <[email protected]> Authored: Thu Jun 16 17:29:48 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Thu Jun 23 11:35:54 2016 +0700 ---------------------------------------------------------------------- .../java/org/apache/james/mailbox/MailboxManagerTest.java | 2 +- .../james/imap/processor/DefaultProcessorChain.java | 2 +- .../org/apache/james/imap/processor/MoveProcessor.java | 2 +- .../apache/james/imap/processor/MoveProcessorTest.java | 10 +++++----- .../org/apache/james/JamesCapabilitiesServerTest.java | 3 +-- .../src/main/java/org/apache/james/jmap/JMAPModule.java | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/89ca3b8b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java index 8504123..756ddd9 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java @@ -223,7 +223,7 @@ public class MailboxManagerTest<T extends MailboxManager> { @ContractTest public void searchShouldNotReturnResultsFromOtherNamespaces() throws Exception { - Assume.assumeTrue(mailboxManager.getSupportedMailboxCapabilities().contains(MailboxManager.MailboxCapabilities.Namespace)); + Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Namespace)); session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock")); mailboxManager.createMailbox(new MailboxPath("#namespace", USER_1, "Other"), session); mailboxManager.createMailbox(MailboxPath.inbox(session), session); http://git-wip-us.apache.org/repos/asf/james-project/blob/89ca3b8b/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java index b9dcf69..edd71ac 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java @@ -58,7 +58,7 @@ public class DefaultProcessorChain { final SubscribeProcessor subscribeProcessor = new SubscribeProcessor(unsubscribeProcessor, mailboxManager, subscriptionManager, statusResponseFactory); final CopyProcessor copyProcessor = new CopyProcessor(subscribeProcessor, mailboxManager, statusResponseFactory); AuthenticateProcessor authenticateProcessor; - if (mailboxManager.getSupportedMailboxCapabilities().contains(MailboxManager.MailboxCapabilities.Move)) { + if (mailboxManager.hasCapability(MailboxManager.MailboxCapabilities.Move)) { final MoveProcessor moveProcessor = new MoveProcessor(copyProcessor, mailboxManager, statusResponseFactory); authenticateProcessor = new AuthenticateProcessor(moveProcessor, mailboxManager, statusResponseFactory); capabilityProcessor.addProcessor(moveProcessor); http://git-wip-us.apache.org/repos/asf/james-project/blob/89ca3b8b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java index d0f5332..b682ee1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java @@ -41,7 +41,7 @@ public class MoveProcessor extends AbstractMessageRangeProcessor<MoveRequest> im public MoveProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(MoveRequest.class, next, mailboxManager, factory); - moveCapabilitySupported = mailboxManager.getSupportedMailboxCapabilities().contains(MailboxManager.MailboxCapabilities.Move); + moveCapabilitySupported = mailboxManager.hasCapability(MailboxManager.MailboxCapabilities.Move); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/89ca3b8b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java index a016ace..7bc14b6 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java @@ -21,13 +21,12 @@ package org.apache.james.imap.processor; 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.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.EnumSet; - import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapSessionState; @@ -42,6 +41,7 @@ import org.apache.james.imap.api.process.SelectedMailbox; import org.apache.james.imap.message.request.CopyRequest; import org.apache.james.imap.message.request.MoveRequest; import org.apache.james.mailbox.MailboxManager; +import org.apache.james.mailbox.MailboxManager.MailboxCapabilities; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.exception.MailboxException; @@ -77,9 +77,9 @@ public class MoveProcessorTest { mockImapSession = mock(ImapSession.class); mockMailboxSession = mock(MailboxSession.class); - when(mockMailboxManager.getSupportedMailboxCapabilities()).thenReturn(EnumSet.allOf(MailboxManager.MailboxCapabilities.class)); + when(mockMailboxManager.hasCapability(eq(MailboxCapabilities.Move))).thenReturn(true); testee = new MoveProcessor(mockNextProcessor, mockMailboxManager, mockStatusResponseFactory); - verify(mockMailboxManager).getSupportedMailboxCapabilities(); + verify(mockMailboxManager).hasCapability(MailboxCapabilities.Move); } @Test @@ -89,7 +89,7 @@ public class MoveProcessorTest { @Test public void getImplementedCapabilitiesShouldNotContainMoveWhenUnSupportedByMailboxManager() { - when(mockMailboxManager.getSupportedMailboxCapabilities()).thenReturn(EnumSet.complementOf(EnumSet.of(MailboxManager.MailboxCapabilities.Move))); + when(mockMailboxManager.hasCapability(eq(MailboxCapabilities.Move))).thenReturn(false); assertThat(new MoveProcessor(mockNextProcessor, mockMailboxManager, mockStatusResponseFactory).getImplementedCapabilities(null)).isEmpty(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/89ca3b8b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 6c889e6..b0f9feb 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -110,8 +110,7 @@ public class JamesCapabilitiesServerTest { @Test public void startShouldSucceedWhenRequiredCapabilities() throws Exception { MailboxManager mailboxManager = mock(MailboxManager.class); - when(mailboxManager.getSupportedMailboxCapabilities()) - .thenReturn(EnumSet.of(MailboxManager.MailboxCapabilities.Move)); + when(mailboxManager.hasCapability(MailboxManager.MailboxCapabilities.Move)).thenReturn(true); when(mailboxManager.getSupportedMessageCapabilities()) .thenReturn(EnumSet.of(MailboxManager.MessageCapabilities.Attachment)); server = createCassandraJamesServer(mailboxManager); http://git-wip-us.apache.org/repos/asf/james-project/blob/89ca3b8b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java index 40acccb..9621cda 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java @@ -99,7 +99,7 @@ public class JMAPModule extends AbstractModule { @Override public void initModule() { - Preconditions.checkArgument(mailboxManager.getSupportedMailboxCapabilities().contains(MailboxManager.MailboxCapabilities.Move), + Preconditions.checkArgument(mailboxManager.hasCapability(MailboxManager.MailboxCapabilities.Move), "MOVE support in MailboxManager is required by JMAP Module"); Preconditions.checkArgument(mailboxManager.getSupportedMessageCapabilities().contains(MailboxManager.MessageCapabilities.Attachment), "Attachment support in MailboxManager is required by JMAP Module"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
