You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2020/10/12 07:40:11 UTC
[james-project] 04/12: JAMES-3408 Remove
MailboxMetaData::unselectableMailbox
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b773b67de63d86b8d401da782c50a0a617dcb3b6
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Oct 9 09:54:56 2020 +0700
JAMES-3408 Remove MailboxMetaData::unselectableMailbox
---
.../apache/james/mailbox/model/MailboxMetaData.java | 9 ---------
.../james/jmap/draft/model/MailboxFactoryTest.java | 8 +++++++-
.../webadmin/routes/UserMailboxesRoutesTest.java | 21 ++++++++++++++++-----
3 files changed, 23 insertions(+), 15 deletions(-)
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 0cd4dc8..dd78368 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
@@ -60,15 +60,6 @@ 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, new MailboxACL(),
- MailboxCounters.builder()
- .mailboxId(mailboxId)
- .count(0)
- .unseen(0)
- .build());
- }
-
public static final Comparator<MailboxMetaData> COMPARATOR = Comparator
.<MailboxMetaData, Boolean>comparing(metadata -> metadata.getPath().isInbox()).reversed()
.thenComparing(metadata -> metadata.getPath().getName());
diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
index bf7feb4..22e6c8f 100644
--- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
+++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
@@ -178,7 +178,13 @@ public class MailboxFactoryTest {
mailboxManager.createMailbox(mailboxPath, mailboxSession);
Optional<MailboxId> id = sut.getParentIdFromMailboxPath(mailboxPath,
- Optional.of(ImmutableList.of(MailboxMetaData.unselectableMailbox(parentMailboxPath, parentId, DELIMITER))),
+ Optional.of(ImmutableList.of(new MailboxMetaData(parentMailboxPath, parentId, DELIMITER,
+ MailboxMetaData.Children.CHILDREN_ALLOWED_BUT_UNKNOWN, MailboxMetaData.Selectability.NONE, new MailboxACL(),
+ MailboxCounters.builder()
+ .mailboxId(parentId)
+ .count(0)
+ .unseen(0)
+ .build()))),
mailboxSession);
assertThat(id).contains(parentId);
}
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 03daea8..d96f4d8 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
@@ -85,6 +85,8 @@ import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.FetchGroup;
import org.apache.james.mailbox.model.Mailbox;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxCounters;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxMetaData;
import org.apache.james.mailbox.model.MailboxPath;
@@ -127,6 +129,15 @@ import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
class UserMailboxesRoutesTest {
+ public static MailboxMetaData testMetadata(MailboxPath path, MailboxId mailboxId, char delimiter) {
+ return new MailboxMetaData(path, mailboxId, delimiter, MailboxMetaData.Children.CHILDREN_ALLOWED_BUT_UNKNOWN, MailboxMetaData.Selectability.NONE, new MailboxACL(),
+ MailboxCounters.builder()
+ .mailboxId(mailboxId)
+ .count(0)
+ .unseen(0)
+ .build());
+ }
+
private static final Username USERNAME = Username.of("username");
private static final String MAILBOX_NAME = "myMailboxName";
private static final String MAILBOX_NAME_WITH_DOTS = "my..MailboxName";
@@ -902,7 +913,7 @@ class UserMailboxesRoutesTest {
when(mailboxManager.search(any(MailboxQuery.class), any()))
.thenReturn(
Flux.just(
- MailboxMetaData.unselectableMailbox(
+ testMetadata(
MailboxPath.forUser(USERNAME, MAILBOX_NAME), mailboxId, '.')));
doThrow(new RuntimeException()).when(mailboxManager).deleteMailbox(any(MailboxPath.class), any());
@@ -928,7 +939,7 @@ class UserMailboxesRoutesTest {
when(mailboxManager.search(any(MailboxQuery.class), any()))
.thenReturn(
Flux.just(
- MailboxMetaData.unselectableMailbox(MailboxPath.forUser(USERNAME, MAILBOX_NAME), mailboxId, '.')));
+ testMetadata(MailboxPath.forUser(USERNAME, MAILBOX_NAME), mailboxId, '.')));
doThrow(new MailboxException()).when(mailboxManager).deleteMailbox(any(MailboxPath.class), any());
when()
@@ -988,7 +999,7 @@ class UserMailboxesRoutesTest {
when(mailboxManager.search(any(MailboxQuery.class), any()))
.thenReturn(
Flux.just(
- MailboxMetaData.unselectableMailbox(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.')));
+ testMetadata(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.')));
doThrow(new RuntimeException()).when(mailboxManager).deleteMailbox(any(MailboxPath.class), any());
when()
@@ -1002,7 +1013,7 @@ class UserMailboxesRoutesTest {
MailboxId mailboxId = InMemoryId.of(12);
when(mailboxManager.search(any(MailboxQuery.class), any(), any()))
.thenReturn(
- Flux.just(MailboxMetaData.unselectableMailbox(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.')));
+ Flux.just(testMetadata(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.')));
doThrow(new MailboxNotFoundException("any")).when(mailboxManager).deleteMailbox(any(MailboxPath.class), any());
when()
@@ -1016,7 +1027,7 @@ class UserMailboxesRoutesTest {
MailboxId mailboxId = InMemoryId.of(12);
when(mailboxManager.search(any(MailboxQuery.class), any()))
.thenReturn(
- Flux.just(MailboxMetaData.unselectableMailbox(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.')));
+ Flux.just(testMetadata(MailboxPath.forUser(USERNAME, "any"), mailboxId, '.')));
doThrow(new MailboxException()).when(mailboxManager).deleteMailbox(any(MailboxPath.class), any());
when()
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org