MAILBOX-359 Implement MailboxMetaData::unselectableMailbox as a static method
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6000b488 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6000b488 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6000b488 Branch: refs/heads/master Commit: 6000b488d66ce1ac7771d9d0f6e6b2f53f28436e Parents: 86f03be Author: Benoit Tellier <[email protected]> Authored: Tue Dec 18 11:48:24 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Dec 19 10:55:21 2018 +0700 ---------------------------------------------------------------------- .../org/apache/james/mailbox/model/MailboxMetaData.java | 9 ++++----- .../org/apache/james/jmap/model/MailboxFactoryTest.java | 2 +- .../james/webadmin/routes/UserMailboxesRoutesTest.java | 10 +++++----- 3 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6000b488/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java index 3d014c5..040a8ef 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java @@ -61,18 +61,17 @@ public class MailboxMetaData implements Comparable<MailboxMetaData> { HAS_NO_CHILDREN } + public static MailboxMetaData unselectableMailbox(MailboxPath path, MailboxId mailboxId, char delimiter) { + return new MailboxMetaData(path, mailboxId, delimiter, Children.CHILDREN_ALLOWED_BUT_UNKNOWN, Selectability.NONE); + } + private final MailboxPath path; private final char delimiter; private final Children inferiors; private final Selectability selectability; private final MailboxId mailboxId; - public MailboxMetaData(MailboxPath path, MailboxId mailboxId, char delimiter) { - this(path, mailboxId, delimiter, Children.CHILDREN_ALLOWED_BUT_UNKNOWN, Selectability.NONE); - } - public MailboxMetaData(MailboxPath path, MailboxId mailboxId, char delimiter, Children inferiors, Selectability selectability) { - super(); this.path = path; this.mailboxId = mailboxId; this.delimiter = delimiter; http://git-wip-us.apache.org/repos/asf/james-project/blob/6000b488/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java index d213045..0f508a7 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java @@ -173,7 +173,7 @@ public class MailboxFactoryTest { mailboxManager.createMailbox(mailboxPath, mailboxSession); Optional<MailboxId> id = sut.getParentIdFromMailboxPath(mailboxPath, - Optional.of(ImmutableList.of(new MailboxMetaData(parentMailboxPath, parentId, DELIMITER))), + Optional.of(ImmutableList.of(MailboxMetaData.unselectableMailbox(parentMailboxPath, parentId, DELIMITER))), mailboxSession); assertThat(id).contains(parentId); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6000b488/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java index 1c60d93..562b293 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java @@ -774,7 +774,7 @@ class UserMailboxesRoutesTest { when(mailboxManager.search(any(MailboxQuery.class), any())) .thenReturn( ImmutableList.of( - new MailboxMetaData( + MailboxMetaData.unselectableMailbox( MailboxPath.forUser(USERNAME, MAILBOX_NAME), mailboxId, '.'))); doThrow(new RuntimeException()).when(mailboxManager).deleteMailbox(any(), any()); @@ -800,7 +800,7 @@ class UserMailboxesRoutesTest { when(mailboxManager.search(any(MailboxQuery.class), any())) .thenReturn( ImmutableList.of( - new MailboxMetaData(MailboxPath.forUser(USERNAME, MAILBOX_NAME), mailboxId, '.'))); + MailboxMetaData.unselectableMailbox(MailboxPath.forUser(USERNAME, MAILBOX_NAME), mailboxId, '.'))); doThrow(new MailboxException()).when(mailboxManager).deleteMailbox(any(), any()); when() @@ -856,7 +856,7 @@ class UserMailboxesRoutesTest { when(mailboxManager.search(any(MailboxQuery.class), any())) .thenReturn( ImmutableList.of( - new MailboxMetaData(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.'))); + MailboxMetaData.unselectableMailbox(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.'))); doThrow(new RuntimeException()).when(mailboxManager).deleteMailbox(any(), any()); when() @@ -870,7 +870,7 @@ class UserMailboxesRoutesTest { MailboxId mailboxId = InMemoryId.of(12); when(mailboxManager.search(any(MailboxQuery.class), any())) .thenReturn( - ImmutableList.of(new MailboxMetaData(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.'))); + ImmutableList.of(MailboxMetaData.unselectableMailbox(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.'))); doThrow(new MailboxNotFoundException("any")).when(mailboxManager).deleteMailbox(any(), any()); when() @@ -884,7 +884,7 @@ class UserMailboxesRoutesTest { MailboxId mailboxId = InMemoryId.of(12); when(mailboxManager.search(any(MailboxQuery.class), any())) .thenReturn( - ImmutableList.of(new MailboxMetaData(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.'))); + ImmutableList.of(MailboxMetaData.unselectableMailbox(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.'))); doThrow(new MailboxException()).when(mailboxManager).deleteMailbox(any(), any()); when() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
