JAMES-2169 Use MailboxPath::forUser more widely
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f15ff20b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f15ff20b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f15ff20b Branch: refs/heads/master Commit: f15ff20bc732d7d11e41cb7f2d9a6f4a09d3109c Parents: 3bb0259 Author: benwa <[email protected]> Authored: Mon Oct 2 11:14:47 2017 +0700 Committer: benwa <[email protected]> Committed: Wed Oct 4 16:24:11 2017 +0700 ---------------------------------------------------------------------- .../james/mailbox/MailboxManagerStressTest.java | 3 +- .../james/mailbox/MailboxManagerTest.java | 17 +- .../james/mailbox/fixture/MailboxFixture.java | 10 +- .../james/mailbox/mock/MockMailboxManager.java | 6 +- .../james/mailbox/model/MailboxPathTest.java | 20 +- .../james/mailbox/model/MailboxQueryTest.java | 4 +- ...istributedMailboxDelegatingListenerTest.java | 4 +- .../mail/CassandraIndexTableHandlerTest.java | 2 +- .../mail/CassandraMailboxCounterDAOTest.java | 2 +- .../cassandra/mail/CassandraMailboxDAOTest.java | 7 +- .../CassandraMailboxMapperConcurrencyTest.java | 2 +- .../mail/CassandraMailboxMapperTest.java | 2 +- .../mail/CassandraMailboxPathDAOTest.java | 7 +- .../ElasticSearchIntegrationTest.java | 11 +- .../mailbox/store/StoreMailboxManager.java | 2 +- .../AbstractMailboxManagerAttachmentTest.java | 5 +- .../mailbox/store/GroupFolderResolverTest.java | 3 +- .../store/MailboxEventDispatcherTest.java | 3 +- .../event/MailboxAnnotationListenerTest.java | 8 +- .../event/MailboxListenerRegistryTest.java | 4 +- ...elegatingMailboxListenerIntegrationTest.java | 4 +- .../mailbox/store/json/EventSerializerTest.java | 2 +- .../store/mail/model/ListMessageAssertTest.java | 2 +- .../store/mail/model/MailboxAssertTests.java | 18 +- .../store/mail/model/MailboxMapperACLTest.java | 2 +- .../store/mail/model/MailboxMapperTest.java | 16 +- .../store/mail/model/MessageIdMapperTest.java | 8 +- .../store/mail/model/MessageMapperTest.java | 8 +- .../store/mail/model/MessageMoveTest.java | 4 +- .../model/MessageWithAttachmentMapperTest.java | 2 +- .../quota/DefaultQuotaRootResolverTest.java | 8 +- .../quota/ListeningCurrentQuotaUpdaterTest.java | 2 +- .../mailbox/store/quota/QuotaCheckerTest.java | 2 +- .../search/AbstractMessageSearchIndexTest.java | 11 +- .../mailbox/indexer/ReIndexerImplTest.java | 5 +- .../registrations/GlobalRegistrationTest.java | 5 +- .../registrations/MailboxRegistrationTest.java | 2 +- .../mpt/imapmailbox/suite/ACLCommands.java | 2 +- .../mpt/imapmailbox/suite/ACLIntegration.java | 16 +- .../imapmailbox/suite/AuthenticatePlain.java | 5 +- .../imapmailbox/suite/AuthenticatedState.java | 12 +- .../imapmailbox/cyrus/host/CyrusHostSystem.java | 5 +- .../james/imap/processor/LSubProcessor.java | 2 +- .../james/imap/processor/ListProcessor.java | 2 +- .../james/imap/main/PathConverterTest.java | 12 +- .../imap/processor/DeleteACLProcessorTest.java | 3 +- .../imap/processor/GetACLProcessorTest.java | 2 +- .../processor/GetQuotaRootProcessorTest.java | 2 +- .../imap/processor/ListRightsProcessorTest.java | 2 +- .../imap/processor/SetACLProcessorTest.java | 2 +- .../processor/base/SelectedMailboxImplTest.java | 2 +- .../cli/ReindexCommandIntegrationTest.java | 2 +- .../apache/james/modules/MailboxProbeImpl.java | 3 +- .../mailbox/MailboxManagerManagement.java | 3 +- .../adapter/mailbox/MailboxManagementTest.java | 40 +-- .../mailets/delivery/LocalDeliveryTest.java | 6 +- .../mailets/delivery/MailboxAppenderTest.java | 8 +- .../mailets/delivery/SieveIntegrationTest.java | 8 +- .../mailets/delivery/ToRecipientFolderTest.java | 8 +- .../integration/GetMailboxesMethodTest.java | 4 +- .../integration/GetMessageListMethodTest.java | 260 +++++++++---------- .../integration/SetMessagesMethodTest.java | 28 +- .../integration/cucumber/DownloadStepdefs.java | 8 +- .../cucumber/GetMessagesMethodStepdefs.java | 8 +- .../cucumber/SetMailboxesMethodStepdefs.java | 3 +- .../jmap/utils/SystemMailboxesProviderImpl.java | 3 +- .../DefaultMailboxesProvisioningFilterTest.java | 5 +- .../jmap/methods/GetMailboxesMethodTest.java | 52 ++-- .../SetMessagesCreationProcessorTest.java | 5 +- .../james/jmap/model/MailboxFactoryTest.java | 26 +- .../jmap/send/PostDequeueDecoratorTest.java | 5 +- .../james/jmap/utils/MailboxUtilsTest.java | 6 +- .../apache/james/pop3server/POP3ServerTest.java | 8 +- .../routes/UserMailboxesRoutesTest.java | 10 +- 74 files changed, 392 insertions(+), 409 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java index 115f867..8b4e580 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java @@ -35,7 +35,6 @@ import javax.mail.Flags; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.ComposedMessageId; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.junit.Test; @@ -63,7 +62,7 @@ public abstract class MailboxManagerStressTest { final String username = "username"; MailboxSession session = mailboxManager.createSystemSession(username); mailboxManager.startProcessingRequest(session); - final MailboxPath path = new MailboxPath(MailboxConstants.USER_NAMESPACE, username, "INBOX"); + final MailboxPath path = MailboxPath.forUser(username, "INBOX"); mailboxManager.createMailbox(path, session); mailboxManager.addListener(path, new MailboxListener() { http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/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 226745c..0b70549 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 @@ -19,11 +19,13 @@ package org.apache.james.mailbox; import static org.assertj.core.api.Assertions.assertThat; + import java.io.ByteArrayInputStream; import java.io.UnsupportedEncodingException; import java.util.Date; import java.util.List; import java.util.Optional; + import javax.mail.Flags; import org.apache.james.mailbox.MailboxManager.MailboxCapabilities; @@ -33,7 +35,6 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.mock.MockMailboxManager; import org.apache.james.mailbox.model.MailboxAnnotation; import org.apache.james.mailbox.model.MailboxAnnotationKey; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxMetaData; import org.apache.james.mailbox.model.MailboxPath; @@ -111,7 +112,7 @@ public abstract class MailboxManagerTest { session = mailboxManager.createSystemSession(USER_1); mailboxManager.startProcessingRequest(session); - MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER_1, "name.subfolder"); + MailboxPath mailboxPath = MailboxPath.forUser(USER_1, "name.subfolder"); Optional<MailboxId> mailboxId = mailboxManager.createMailbox(mailboxPath, session); MessageManager retrievedMailbox = mailboxManager.getMailbox(mailboxPath, session); @@ -218,7 +219,7 @@ public abstract class MailboxManagerTest { @Test public void user2ShouldBeAbleToCreateRootlessFolder() throws BadCredentialsException, MailboxException { session = mailboxManager.createSystemSession(USER_2); - MailboxPath trash = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER_2, "Trash"); + MailboxPath trash = MailboxPath.forUser(USER_2, "Trash"); mailboxManager.createMailbox(trash, session); assertThat(mailboxManager.mailboxExists(trash, session)).isTrue(); @@ -227,7 +228,7 @@ public abstract class MailboxManagerTest { @Test public void user2ShouldBeAbleToCreateNestedFoldersWithoutTheirParents() throws BadCredentialsException, MailboxException { session = mailboxManager.createSystemSession(USER_2); - MailboxPath nestedFolder = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER_2, "INBOX.testfolder"); + MailboxPath nestedFolder = MailboxPath.forUser(USER_2, "INBOX.testfolder"); mailboxManager.createMailbox(nestedFolder, session); assertThat(mailboxManager.mailboxExists(nestedFolder, session)).isTrue(); @@ -238,9 +239,9 @@ public abstract class MailboxManagerTest { public void searchShouldNotReturnResultsFromOtherNamespaces() throws Exception { Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Namespace)); session = mailboxManager.createSystemSession(USER_1); - mailboxManager.createMailbox(new MailboxPath("#namespace", USER_1, "Other"), session); + mailboxManager.createMailbox(new MailboxPath("other_namespace", USER_1, "Other"), session); mailboxManager.createMailbox(MailboxPath.inbox(session), session); - List<MailboxMetaData> metaDatas = mailboxManager.search(new MailboxQuery(new MailboxPath("#private", USER_1, ""), "*", '.'), session); + List<MailboxMetaData> metaDatas = mailboxManager.search(new MailboxQuery(MailboxPath.forUser(USER_1, ""), "*", '.'), session); assertThat(metaDatas).hasSize(1); assertThat(metaDatas.get(0).getPath()).isEqualTo(MailboxPath.inbox(session)); } @@ -248,9 +249,9 @@ public abstract class MailboxManagerTest { @Test public void searchShouldNotReturnResultsFromOtherUsers() throws Exception { session = mailboxManager.createSystemSession(USER_1); - mailboxManager.createMailbox(new MailboxPath("#namespace", USER_2, "Other"), session); + mailboxManager.createMailbox(MailboxPath.forUser(USER_2, "Other"), session); mailboxManager.createMailbox(MailboxPath.inbox(session), session); - List<MailboxMetaData> metaDatas = mailboxManager.search(new MailboxQuery(new MailboxPath("#private", USER_1, ""), "*", '.'), session); + List<MailboxMetaData> metaDatas = mailboxManager.search(new MailboxQuery(MailboxPath.forUser(USER_1, ""), "*", '.'), session); assertThat(metaDatas).hasSize(1); assertThat(metaDatas.get(0).getPath()).isEqualTo(MailboxPath.inbox(session)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java b/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java index 90d2095..ea02227 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java @@ -22,14 +22,12 @@ package org.apache.james.mailbox.fixture; import org.apache.james.mailbox.model.MailboxPath; public class MailboxFixture { - public static final String PRIVATE_NAMESPACE = "#private"; - public static final String USER = "user"; public static final String OTHER_USER = "otheruser"; public static final String THIRD_USER = "thirdUser"; - public static final MailboxPath MAILBOX_PATH1 = new MailboxPath(PRIVATE_NAMESPACE, USER, "INBOX"); - public static final MailboxPath MAILBOX_PATH2 = new MailboxPath(PRIVATE_NAMESPACE, USER, "OUTBOX"); - public static final MailboxPath MAILBOX_PATH3 = new MailboxPath(PRIVATE_NAMESPACE, USER, "SENT"); - public static final MailboxPath MAILBOX_PATH4 = new MailboxPath(PRIVATE_NAMESPACE, OTHER_USER, "INBOX"); + public static final MailboxPath MAILBOX_PATH1 = MailboxPath.forUser(USER, "INBOX"); + public static final MailboxPath MAILBOX_PATH2 = MailboxPath.forUser(USER, "OUTBOX"); + public static final MailboxPath MAILBOX_PATH3 = MailboxPath.forUser(USER, "SENT"); + public static final MailboxPath MAILBOX_PATH4 = MailboxPath.forUser(OTHER_USER, "INBOX"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java index c0c4dd1..b4b5d39 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java @@ -114,19 +114,19 @@ public class MockMailboxManager { String folderName = "INBOX"; MailboxSession mailboxSession = getMockMailboxManager().createSystemSession(user); - mailboxPath = new MailboxPath("#private", user, folderName); + mailboxPath = MailboxPath.forUser(user, folderName); createMailbox(mailboxSession, mailboxPath); for (int k=0; k < SUB_MAILBOXES_COUNT; k++) { String subFolderName = folderName + ".SUB_FOLDER_" + k; - mailboxPath = new MailboxPath("#private", user, subFolderName); + mailboxPath = MailboxPath.forUser(user, subFolderName); createMailbox(mailboxSession, mailboxPath); for (int l=0; l < SUB_SUB_MAILBOXES_COUNT; l++) { String subSubfolderName = subFolderName + ".SUBSUB_FOLDER_" + l; - mailboxPath = new MailboxPath("#private", user, subSubfolderName); + mailboxPath = MailboxPath.forUser(user, subSubfolderName); createMailbox(mailboxSession, mailboxPath); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java index b474aac..d51608f 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java @@ -28,35 +28,35 @@ public class MailboxPathTest { @Test public void getHierarchyLevelsShouldBeOrdered() { - assertThat(new MailboxPath("#private", "user", "inbox.folder.subfolder") + assertThat(MailboxPath.forUser("user", "inbox.folder.subfolder") .getHierarchyLevels('.')) .containsExactly( - new MailboxPath("#private", "user", "inbox"), - new MailboxPath("#private", "user", "inbox.folder"), - new MailboxPath("#private", "user", "inbox.folder.subfolder")); + MailboxPath.forUser("user", "inbox"), + MailboxPath.forUser("user", "inbox.folder"), + MailboxPath.forUser("user", "inbox.folder.subfolder")); } @Test public void getHierarchyLevelsShouldReturnPathWhenOneLevel() { - assertThat(new MailboxPath("#private", "user", "inbox") + assertThat(MailboxPath.forUser("user", "inbox") .getHierarchyLevels('.')) .containsExactly( - new MailboxPath("#private", "user", "inbox")); + MailboxPath.forUser("user", "inbox")); } @Test public void getHierarchyLevelsShouldReturnPathWhenEmptyName() { - assertThat(new MailboxPath("#private", "user", "") + assertThat(MailboxPath.forUser("user", "") .getHierarchyLevels('.')) .containsExactly( - new MailboxPath("#private", "user", "")); + MailboxPath.forUser("user", "")); } @Test public void getHierarchyLevelsShouldReturnPathWhenNullName() { - assertThat(new MailboxPath("#private", "user", null) + assertThat(MailboxPath.forUser("user", null) .getHierarchyLevels('.')) .containsExactly( - new MailboxPath("#private", "user", null)); + MailboxPath.forUser("user", null)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxQueryTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxQueryTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxQueryTest.java index 854ff70..51db09a 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxQueryTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxQueryTest.java @@ -25,10 +25,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSession.User; import org.apache.james.mailbox.model.MailboxQuery.Builder; import org.junit.Before; import org.junit.Test; -import org.apache.james.mailbox.MailboxSession.User; public class MailboxQueryTest { @@ -1207,7 +1207,7 @@ public class MailboxQueryTest { @Test public void buildShouldConstructMailboxPathWhenPrivateUserMailboxes() throws Exception { //Given - MailboxPath expected = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", ""); + MailboxPath expected = MailboxPath.forUser("user", ""); //When MailboxQuery actual = MailboxQuery.builder() .username("user") http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java index 3585f27..f8304e7 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java @@ -60,8 +60,8 @@ import com.google.common.collect.ImmutableMap; */ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest { - public static final MailboxPath MAILBOX_PATH_1 = new MailboxPath("#private", "user", "mbx"); - public static final MailboxPath MAILBOX_PATH_2 = new MailboxPath("#private", "user", "mbx.other"); + public static final MailboxPath MAILBOX_PATH_1 = MailboxPath.forUser("user", "mbx"); + public static final MailboxPath MAILBOX_PATH_2 = MailboxPath.forUser("user", "mbx.other"); public static final int CASSANDRA_TIME_OUT_IN_S = 10; public static final int SCHEDULER_PERIOD_IN_S = 20; public static final ImmutableMap<MessageUid, MailboxMessage> EMPTY_MESSAGE_CACHE = ImmutableMap.of(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java index 33e8253..b42787e 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java @@ -94,7 +94,7 @@ public class CassandraIndexTableHandlerTest { applicableFlagDAO, deletedMessageDAO); - mailbox = new SimpleMailbox(new MailboxPath("#private", "user", "name"), + mailbox = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY, MAILBOX_ID); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java index 07d9cc6..6744a70 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java @@ -48,7 +48,7 @@ public class CassandraMailboxCounterDAOTest { cassandra = CassandraCluster.create(new CassandraMailboxCounterModule(), cassandraServer.getIp(), cassandraServer.getBindingPort()); testee = new CassandraMailboxCounterDAO(cassandra.getConf()); - mailbox = new SimpleMailbox(new MailboxPath("#private", "user", "name"), UID_VALIDITY, MAILBOX_ID); + mailbox = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY, MAILBOX_ID); } @After http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java index ba5ead9..b04b360 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java @@ -30,7 +30,6 @@ import org.apache.james.backends.cassandra.init.CassandraModuleComposite; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.junit.After; @@ -44,7 +43,7 @@ public class CassandraMailboxDAOTest { public static final int UID_VALIDITY_1 = 145; public static final int UID_VALIDITY_2 = 147; - public static final MailboxPath NEW_MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "xyz"); + public static final MailboxPath NEW_MAILBOX_PATH = MailboxPath.forUser("user", "xyz"); public static CassandraId CASSANDRA_ID_1 = CassandraId.timeBased(); public static CassandraId CASSANDRA_ID_2 = CassandraId.timeBased(); @@ -62,10 +61,10 @@ public class CassandraMailboxDAOTest { testee = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); - mailbox1 = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "abcd"), + mailbox1 = new SimpleMailbox(MailboxPath.forUser("user", "abcd"), UID_VALIDITY_1, CASSANDRA_ID_1); - mailbox2 = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "defg"), + mailbox2 = new SimpleMailbox(MailboxPath.forUser("user", "defg"), UID_VALIDITY_2, CASSANDRA_ID_2); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java index 8b3716f..2facbfa 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java @@ -42,7 +42,7 @@ import org.junit.Test; public class CassandraMailboxMapperConcurrencyTest { private static final int UID_VALIDITY = 52; - private static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "user", "name"); + private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("user", "name"); private static final int THREAD_COUNT = 10; private static final int OPERATION_COUNT = 10; http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java index f67ffc6..3cd7828 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java @@ -47,7 +47,7 @@ public class CassandraMailboxMapperTest { private static final Logger LOGGER = LoggerFactory.getLogger(CassandraMailboxMapperTest.class); private static final int UID_VALIDITY = 52; - private static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "user", "name"); + private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("user", "name"); @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java index 430c086..ce79b44 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java @@ -39,17 +39,16 @@ import com.github.steveash.guavate.Guavate; import nl.jqno.equalsverifier.EqualsVerifier; public class CassandraMailboxPathDAOTest { - private static final String PRIVATE_NAMESPACE = "#private"; private static final String USER = "user"; private static final String OTHER_USER = "other"; private static final CassandraId INBOX_ID = CassandraId.timeBased(); private static final CassandraId OUTBOX_ID = CassandraId.timeBased(); private static final CassandraId otherMailboxId = CassandraId.timeBased(); - public static final MailboxPath USER_INBOX_MAILBOXPATH = new MailboxPath(PRIVATE_NAMESPACE, USER, "INBOX"); + public static final MailboxPath USER_INBOX_MAILBOXPATH = MailboxPath.forUser(USER, "INBOX"); public static final CassandraIdAndPath INBOX_ID_AND_PATH = new CassandraIdAndPath(INBOX_ID, USER_INBOX_MAILBOXPATH); - public static final MailboxPath USER_OUTBOX_MAILBOXPATH = new MailboxPath(PRIVATE_NAMESPACE, USER, "OUTBOX"); - public static final MailboxPath OTHER_USER_MAILBOXPATH = new MailboxPath(PRIVATE_NAMESPACE, OTHER_USER, "INBOX"); + public static final MailboxPath USER_OUTBOX_MAILBOXPATH = MailboxPath.forUser(USER, "OUTBOX"); + public static final MailboxPath OTHER_USER_MAILBOXPATH = MailboxPath.forUser(OTHER_USER, "INBOX"); @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java index 13e1352..6efcaa7 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java @@ -49,7 +49,6 @@ import org.apache.james.mailbox.inmemory.InMemoryMessageId; import org.apache.james.mailbox.inmemory.InMemoryMessageIdManager; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.ComposedMessageId; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.SearchQuery; import org.apache.james.mailbox.store.FakeAuthenticator; @@ -142,7 +141,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void termsBetweenElasticSearchAndLuceneLimitDueTuNonAsciiCharsShouldBeTruncated() throws Exception { - MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, INBOX); + MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); MockMailboxSession session = new MockMailboxSession(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); @@ -159,7 +158,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void tooLongTermsShouldNotMakeIndexingFail() throws Exception { - MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, INBOX); + MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); MockMailboxSession session = new MockMailboxSession(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); @@ -176,7 +175,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void fieldsExceedingLuceneLimitShouldNotBeIgnored() throws Exception { - MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, INBOX); + MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); MockMailboxSession session = new MockMailboxSession(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); @@ -193,7 +192,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void fieldsWithTooLongTermShouldStillBeIndexed() throws Exception { - MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, INBOX); + MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); MockMailboxSession session = new MockMailboxSession(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); @@ -210,7 +209,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void reasonableLongTermShouldNotBeIgnored() throws Exception { - MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, INBOX); + MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); MockMailboxSession session = new MockMailboxSession(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index a277d04..7f50a8d 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -621,7 +621,7 @@ public class StoreMailboxManager implements MailboxManager { dispatcher.mailboxRenamed(session, from, mailbox); // rename submailboxes - MailboxPath children = new MailboxPath(MailboxConstants.USER_NAMESPACE, from.getUser(), from.getName() + getDelimiter() + "%"); + MailboxPath children = new MailboxPath(from.getNamespace(), from.getUser(), from.getName() + getDelimiter() + "%"); locker.executeWithLock(session, children, (LockAwareExecution<Void>) () -> { List<Mailbox> subMailboxes = mapper.findMailboxWithPathLike(children); for (Mailbox sub : subMailboxes) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java index 617d0e0..834ac2e 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java @@ -35,7 +35,6 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.mock.MockMailboxSession; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageAttachment; import org.apache.james.mailbox.model.MessageRange; @@ -70,7 +69,7 @@ public abstract class AbstractMailboxManagerAttachmentTest { mailboxSession = new MockMailboxSession(USERNAME); messageMapper = getMailboxSessionMapperFactory().getMessageMapper(mailboxSession); mailboxMapper = getMailboxSessionMapperFactory().getMailboxMapper(mailboxSession); - inboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, "INBOX"); + inboxPath = MailboxPath.forUser(USERNAME, "INBOX"); mailboxManager = getMailboxManager(); mailboxManager.createMailbox(inboxPath, mailboxSession); inbox = mailboxMapper.findMailboxByPath(inboxPath); @@ -180,7 +179,7 @@ public abstract class AbstractMailboxManagerAttachmentTest { MailboxSession user2MailboxSession = new MockMailboxSession(user2); MessageMapper user2MessageMapper = getMailboxSessionMapperFactory().getMessageMapper(user2MailboxSession); MailboxMapper user2MailboxMapper = getMailboxSessionMapperFactory().getMailboxMapper(user2MailboxSession); - MailboxPath user2InboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, user2, "INBOX"); + MailboxPath user2InboxPath = MailboxPath.forUser(user2, "INBOX"); mailboxManager.createMailbox(user2InboxPath, user2MailboxSession); Mailbox user2Inbox = user2MailboxMapper.findMailboxByPath(user2InboxPath); MessageManager user2InboxMessageManager = mailboxManager.getMailbox(user2InboxPath, user2MailboxSession); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java index 6f0cee6..2abbaa9 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Locale; import org.apache.james.mailbox.MailboxSession.SessionType; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.junit.Test; @@ -50,7 +49,7 @@ public class GroupFolderResolverTest { SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", localePreferences, sharedSpaces, null, pathSeparator, SessionType.User); GroupFolderResolver testee = new GroupFolderResolver(mailboxSession); - SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); assertThat(testee.isGroupFolder(mailbox)).isFalse(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java index 52d99be..9f45c77 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java @@ -31,7 +31,6 @@ import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.mock.MockMailboxSession; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageMetaData; import org.apache.james.mailbox.model.MessageResult; @@ -78,7 +77,7 @@ public class MailboxEventDispatcherTest { dispatcher = MailboxEventDispatcher.ofListener(collector); result = mock(MessageResult.class); - mailbox = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "name"), UID_VALIDITY, MAILBOX_ID); + mailbox = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY, MAILBOX_ID); when(result.getUid()).thenReturn(MessageUid.of(23)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java index da634b5..5442c0c 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java @@ -25,13 +25,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.google.common.collect.ImmutableList; +import java.util.List; + import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.MailboxAnnotation; import org.apache.james.mailbox.model.MailboxAnnotationKey; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.TestId; @@ -44,7 +44,7 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.util.List; +import com.google.common.collect.ImmutableList; public class MailboxAnnotationListenerTest { private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", "user", "name"); @@ -75,7 +75,7 @@ public class MailboxAnnotationListenerTest { mailboxSession = new MockMailboxSession("test"); listener = new MailboxAnnotationListener(mailboxSessionMapperFactory); eventFactory = new EventFactory(); - mailbox = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "name"), UID_VALIDITY, mailboxId); + mailbox = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY, mailboxId); deleteEvent = eventFactory.mailboxDeleted(mailboxSession, mailbox); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxListenerRegistryTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxListenerRegistryTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxListenerRegistryTest.java index 796e7aa..58b0e11 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxListenerRegistryTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxListenerRegistryTest.java @@ -30,8 +30,8 @@ import org.junit.Test; public class MailboxListenerRegistryTest { - private static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "user", "INBOX"); - private static final MailboxPath OTHER_MAILBOX_PATH = new MailboxPath("#private", "user", "other"); + private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("user", "INBOX"); + private static final MailboxPath OTHER_MAILBOX_PATH = MailboxPath.forUser("user", "other"); private MailboxListenerRegistry testee; private MailboxListener mailboxListener; private MailboxListener otherMailboxListener; http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java index adadc2d..b172a80 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java @@ -50,8 +50,8 @@ import com.google.common.collect.ImmutableMap; */ public class BroadcastDelegatingMailboxListenerIntegrationTest { - public static final MailboxPath MAILBOX_PATH_1 = new MailboxPath("#private", "user", "mbx"); - public static final MailboxPath MAILBOX_PATH_2 = new MailboxPath("#private", "user", "mbx.other"); + public static final MailboxPath MAILBOX_PATH_1 = MailboxPath.forUser("user", "mbx"); + public static final MailboxPath MAILBOX_PATH_2 = MailboxPath.forUser("user", "mbx.other"); public static final String TOPIC = "TOPIC"; public static final ImmutableMap<MessageUid, MailboxMessage> EMPTY_MESSAGE_CACHE = ImmutableMap.<MessageUid, MailboxMessage>of(); private BroadcastDelegatingMailboxListener broadcastDelegatingMailboxListener1; http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java index 6202d25..edc7dac 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java @@ -74,7 +74,7 @@ public abstract class EventSerializerTest { eventFactory = new EventFactory(); serializer = createSerializer(); mailboxSession = new MockMailboxSession("benwa"); - mailbox = new SimpleMailbox(new MailboxPath("#private", "benwa", "name"), 42); + mailbox = new SimpleMailbox(MailboxPath.forUser("benwa", "name"), 42); mailbox.setMailboxId(TestId.of(28L)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java index 2f1d3db..aadbe79 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java @@ -62,7 +62,7 @@ public class ListMessageAssertTest { @Before public void setUp() { - benwaInboxMailbox = createMailbox(new MailboxPath("#private", "user", "INBOX")); + benwaInboxMailbox = createMailbox(MailboxPath.forUser("user", "INBOX")); message1 = createMessage(benwaInboxMailbox, MESSAGE_ID, BODY_CONTENT1, BODY_START, new PropertyBuilder()); message2 = createMessage(benwaInboxMailbox, MESSAGE_ID, BODY_CONTENT2, BODY_START, new PropertyBuilder()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java index 7cbb9b3..552ab44 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java @@ -31,8 +31,8 @@ public class MailboxAssertTests { @Test public void isEqualToShouldNotFailWithEqualMailbox() { - SimpleMailbox mailbox1 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); - SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); MailboxAssert.assertThat(mailbox1).isEqualTo(mailbox2); @@ -40,7 +40,7 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualNamespace() { - SimpleMailbox mailbox1 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("other_namespace", "user", "name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); @@ -49,7 +49,7 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualUser() { - SimpleMailbox mailbox1 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("namespace", "other_user", "name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); @@ -58,7 +58,7 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualName() { - SimpleMailbox mailbox1 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("namespace", "user", "other_name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); @@ -67,8 +67,8 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualId() { - SimpleMailbox mailbox1 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); - SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(TestId.of(MAILBOX_ID.id + 1)); MailboxAssert.assertThat(mailbox1).isEqualTo(mailbox2); @@ -76,8 +76,8 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualUidValidity() { - SimpleMailbox mailbox1 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); - SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY + 1); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY + 1); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); MailboxAssert.assertThat(mailbox1).isEqualTo(mailbox2); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java index 321fd75..e4bf959 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java @@ -58,7 +58,7 @@ public abstract class MailboxMapperACLTest { this.mailboxMapper = mapperProvider.createMailboxMapper(); - MailboxPath benwaInboxPath = new MailboxPath("#private", "benwa", "INBOX"); + MailboxPath benwaInboxPath = MailboxPath.forUser("benwa", "INBOX"); benwaInboxMailbox = createMailbox(benwaInboxPath); mailboxMapper.save(benwaInboxMailbox); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java index 92ab5b8..d16925d 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java @@ -96,7 +96,7 @@ public abstract class MailboxMapperTest { @Test public void findMailboxByPathWhenAbsentShouldFail() throws MailboxException { expected.expect(MailboxNotFoundException.class); - mailboxMapper.findMailboxByPath(new MailboxPath("#private", "benwa", "INBOX")); + mailboxMapper.findMailboxByPath(MailboxPath.forUser("benwa", "INBOX")); } @Test @@ -261,13 +261,13 @@ public abstract class MailboxMapperTest { } private void initData() { - benwaInboxPath = new MailboxPath("#private", "benwa", "INBOX"); - benwaWorkPath = new MailboxPath("#private", "benwa", "INBOX"+DELIMITER+"work"); - benwaWorkTodoPath = new MailboxPath("#private", "benwa", "INBOX"+DELIMITER+"work"+DELIMITER+"todo"); - benwaPersoPath = new MailboxPath("#private", "benwa", "INBOX"+DELIMITER+"perso"); - benwaWorkDonePath = new MailboxPath("#private", "benwa", "INBOX"+DELIMITER+"work"+DELIMITER+"done"); - bobInboxPath = new MailboxPath("#private", "bob", "INBOX"); - bobyMailboxPath = new MailboxPath("#private", "boby", "INBOX.that.is.a.trick"); + benwaInboxPath = MailboxPath.forUser("benwa", "INBOX"); + benwaWorkPath = MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work"); + benwaWorkTodoPath = MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work"+DELIMITER+"todo"); + benwaPersoPath = MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"perso"); + benwaWorkDonePath = MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work"+DELIMITER+"done"); + bobInboxPath = MailboxPath.forUser("bob", "INBOX"); + bobyMailboxPath = MailboxPath.forUser("boby", "INBOX.that.is.a.trick"); bobDifferentNamespacePath = new MailboxPath("#private_bob", "bob", "INBOX.bob"); esnDevGroupInboxPath = new MailboxPath("#community_ESN_DEV", null, "INBOX"); esnDevGroupHublinPath = new MailboxPath("#community_ESN_DEV", null, "INBOX"+DELIMITER+"hublin"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java index 73d5a14..391cf51 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java @@ -89,8 +89,8 @@ public abstract class MessageIdMapperTest { this.messageMapper = mapperProvider.createMessageMapper(); this.mailboxMapper = mapperProvider.createMailboxMapper(); - benwaInboxMailbox = createMailbox(new MailboxPath("#private", "benwa", "INBOX")); - benwaWorkMailbox = createMailbox( new MailboxPath("#private", "benwa", "INBOX"+DELIMITER+"work")); + benwaInboxMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX")); + benwaWorkMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX" + DELIMITER + "work")); message1 = createMessage(benwaInboxMailbox, "Subject: Test1 \n\nBody1\n.\n", BODY_START, new PropertyBuilder()); message2 = createMessage(benwaInboxMailbox, "Subject: Test2 \n\nBody2\n.\n", BODY_START, new PropertyBuilder()); @@ -160,7 +160,7 @@ public abstract class MessageIdMapperTest { @Test public void saveShouldThrowWhenMailboxDoesntExist() throws Exception { - SimpleMailbox notPersistedMailbox = new SimpleMailbox(new MailboxPath("#private", "benwa", "mybox"), UID_VALIDITY); + SimpleMailbox notPersistedMailbox = new SimpleMailbox(MailboxPath.forUser("benwa", "mybox"), UID_VALIDITY); notPersistedMailbox.setMailboxId(mapperProvider.generateId()); SimpleMailboxMessage message = createMessage(notPersistedMailbox, "Subject: Test \n\nBody\n.\n", BODY_START, new PropertyBuilder()); message.setUid(mapperProvider.generateMessageUid()); @@ -205,7 +205,7 @@ public abstract class MessageIdMapperTest { message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); - SimpleMailbox notPersistedMailbox = new SimpleMailbox(new MailboxPath("#private", "benwa", "mybox"), UID_VALIDITY); + SimpleMailbox notPersistedMailbox = new SimpleMailbox(MailboxPath.forUser("benwa", "mybox"), UID_VALIDITY); notPersistedMailbox.setMailboxId(mapperProvider.generateId()); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(notPersistedMailbox.getMailboxId(), message1); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java index 16004a1..203bc78 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java @@ -23,12 +23,14 @@ import static org.apache.james.mailbox.store.mail.model.ListMessageAssert.assert import static org.apache.james.mailbox.store.mail.model.ListMessagePropertiesAssert.assertProperties; import static org.apache.james.mailbox.store.mail.model.MessageAssert.assertThat; import static org.assertj.core.api.Assertions.assertThat; + import java.io.IOException; import java.util.Date; import java.util.Iterator; import java.util.Map; import java.util.Optional; import java.util.concurrent.TimeUnit; + import javax.mail.Flags; import javax.mail.Flags.Flag; import javax.mail.util.SharedByteArrayInputStream; @@ -99,8 +101,8 @@ public abstract class MessageMapperTest { } private void initData() throws MailboxException { - benwaInboxMailbox = createMailbox(new MailboxPath("#private", "benwa", "INBOX")); - benwaWorkMailbox = createMailbox( new MailboxPath("#private", "benwa", "INBOX"+DELIMITER+"work")); + benwaInboxMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX")); + benwaWorkMailbox = createMailbox( MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work")); message1 = createMessage(benwaInboxMailbox, mapperProvider.generateMessageId(), "Subject: Test1 \n\nBody1\n.\n", BODY_START, new PropertyBuilder()); message2 = createMessage(benwaInboxMailbox, mapperProvider.generateMessageId(), "Subject: Test2 \n\nBody2\n.\n", BODY_START, new PropertyBuilder()); @@ -1035,7 +1037,7 @@ public abstract class MessageMapperTest { @Test public void getApplicableFlagShouldReturnDefaultApplicableFlagsWhenMailboxEmpty() throws Exception { - SimpleMailbox emptyMailbox = createMailbox(new MailboxPath("#private", "benwa", "EMPTY")); + SimpleMailbox emptyMailbox = createMailbox(MailboxPath.forUser("benwa", "EMPTY")); assertThat(messageMapper.getApplicableFlag(emptyMailbox)) .isEqualTo(new FlagsBuilder() http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java index 7efd7c8..91e4e7a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java @@ -68,8 +68,8 @@ public abstract class MessageMoveTest { this.messageMapper = mapperProvider.createMessageMapper(); Assume.assumeNotNull(messageMapper); - benwaInboxMailbox = createMailbox(new MailboxPath("#private", "benwa", "INBOX")); - benwaWorkMailbox = createMailbox( new MailboxPath("#private", "benwa", "INBOX"+DELIMITER+"work")); + benwaInboxMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX")); + benwaWorkMailbox = createMailbox( MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work")); message1 = createMessage(benwaInboxMailbox, mapperProvider.generateMessageId(), "Subject: Test1 \n\nBody1\n.\n", BODY_START, new PropertyBuilder()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java index 59e31c3..68b934c 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java @@ -81,7 +81,7 @@ public abstract class MessageWithAttachmentMapperTest { this.messageMapper = mapperProvider.createMessageMapper(); this.attachmentMapper = mapperProvider.createAttachmentMapper(); - attachmentsMailbox = createMailbox( new MailboxPath("#private", "benwa", "Attachments")); + attachmentsMailbox = createMailbox(MailboxPath.forUser("benwa", "Attachments")); Attachment attachment = Attachment.builder() .attachmentId(AttachmentId.from("123")) http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java index c6c6218..bc18ae8 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java @@ -36,10 +36,10 @@ import com.google.common.collect.Lists; public class DefaultQuotaRootResolverTest { - public static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "benwa", "INBOX"); + public static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("benwa", "INBOX"); public static final SimpleMailbox MAILBOX = new SimpleMailbox(MAILBOX_PATH, 10); - public static final MailboxPath PATH_LIKE = new MailboxPath("#private", "benwa", "%"); - public static final MailboxPath MAILBOX_PATH_2 = new MailboxPath("#private", "benwa", "test"); + public static final MailboxPath PATH_LIKE = MailboxPath.forUser("benwa", "%"); + public static final MailboxPath MAILBOX_PATH_2 = MailboxPath.forUser("benwa", "test"); public static final SimpleMailbox MAILBOX_2 = new SimpleMailbox(MAILBOX_PATH_2, 10); public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("#private&benwa"); @@ -64,7 +64,7 @@ public class DefaultQuotaRootResolverTest { @Test(expected = IllegalArgumentException.class) public void getQuotaRootShouldThrowWhenUserContainsSeparator() throws Exception { - testee.getQuotaRoot(new MailboxPath("#private", "ben&wa", "INBOX")); + testee.getQuotaRoot(MailboxPath.forUser("ben&wa", "INBOX")); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java index 63f483a..78179d3 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java @@ -43,7 +43,7 @@ import com.google.common.collect.Lists; public class ListeningCurrentQuotaUpdaterTest { public static final int SIZE = 45; - public static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "benwa", "INBOX"); + public static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("benwa", "INBOX"); public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("benwa"); private StoreCurrentQuotaManager mockedCurrentQuotaManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java index 625a8e1..55a8870 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java @@ -37,7 +37,7 @@ import org.junit.Test; public class QuotaCheckerTest { public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("benwa"); - public static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "benwa", "INBOX"); + public static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("benwa", "INBOX"); public static final SimpleMailbox MAILBOX = new SimpleMailbox(MAILBOX_PATH, 10); private QuotaRootResolver mockedQuotaRootResolver; http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java index ba74c82..9383df7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java @@ -36,7 +36,6 @@ import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.ComposedMessageId; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.MultimailboxesSearchQuery; @@ -105,8 +104,8 @@ public abstract class AbstractMessageSearchIndexTest { session = storeMailboxManager.createSystemSession(USERNAME); otherSession = storeMailboxManager.createSystemSession(OTHERUSER); - MailboxPath inboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, INBOX); - MailboxPath otherInboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, OTHERUSER, INBOX); + MailboxPath inboxPath = MailboxPath.forUser(USERNAME, INBOX); + MailboxPath otherInboxPath = MailboxPath.forUser(OTHERUSER, INBOX); storeMailboxManager.createMailbox(inboxPath, session); storeMailboxManager.createMailbox(otherInboxPath, otherSession); @@ -114,7 +113,7 @@ public abstract class AbstractMessageSearchIndexTest { StoreMessageManager inboxMessageManager = (StoreMessageManager) storeMailboxManager.getMailbox(inboxPath, session); StoreMessageManager otherInboxMessageManager = (StoreMessageManager) storeMailboxManager.getMailbox(otherInboxPath, otherSession); - MailboxPath myFolderPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, "MyFolder"); + MailboxPath myFolderPath = MailboxPath.forUser(USERNAME, "MyFolder"); storeMailboxManager.createMailbox(myFolderPath, session); myFolderMessageManager = (StoreMessageManager) storeMailboxManager.getMailbox(myFolderPath, session); mailbox = inboxMessageManager.getMailboxEntity(); @@ -1227,7 +1226,7 @@ public abstract class AbstractMessageSearchIndexTest { @Test public void searchShouldOrderByInternalDateWhenSortOnSentDateAndNoCorrespondingHeader() throws Exception { - MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, "sentDate"); + MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, "sentDate"); storeMailboxManager.createMailbox(mailboxPath, session); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); @@ -1253,7 +1252,7 @@ public abstract class AbstractMessageSearchIndexTest { @Test public void searchShouldOrderBySentDateThenInternalDateWhenSortOnSentDateAndNonHomogeneousCorrespondingHeader() throws Exception { - MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, "sentDate"); + MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, "sentDate"); storeMailboxManager.createMailbox(mailboxPath, session); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java index a74abe3..5f0acaa 100644 --- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java +++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java @@ -31,7 +31,6 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.mock.MockMailboxSession; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; @@ -50,7 +49,7 @@ import com.google.common.collect.ImmutableList; public class ReIndexerImplTest { - public static final MailboxPath INBOX = new MailboxPath("#private", "[email protected]", "INBOX"); + public static final MailboxPath INBOX = MailboxPath.forUser("[email protected]", "INBOX"); public static final int LIMIT = 0; private MailboxManager mailboxManager; private MailboxSessionMapperFactory mailboxSessionMapperFactory; @@ -108,7 +107,7 @@ public class ReIndexerImplTest { .thenReturn(mailboxMapper); String user1 = "[email protected]"; - MailboxPath user1MailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, user1, "Inbox"); + MailboxPath user1MailboxPath = MailboxPath.forUser(user1, "Inbox"); MockMailboxSession user1MailboxSession = new MockMailboxSession(user1); when(mailboxManager.createSystemSession(user1)) .thenReturn(user1MailboxSession); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java index 1fbda99..7523bd6 100644 --- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java +++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.indexer.registrations; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; import org.apache.james.mailbox.MailboxListener; @@ -31,8 +32,8 @@ import org.junit.Before; import org.junit.Test; public class GlobalRegistrationTest { - public static final MailboxPath INBOX = new MailboxPath("#private", "[email protected]", "INBOX"); - public static final MailboxPath NEW_PATH = new MailboxPath("#private", "[email protected]", "INBOX.new"); + public static final MailboxPath INBOX = MailboxPath.forUser("[email protected]", "INBOX"); + public static final MailboxPath NEW_PATH = MailboxPath.forUser("[email protected]", "INBOX.new"); public static final int UID_VALIDITY = 45; public static final SimpleMailbox MAILBOX = new SimpleMailbox(INBOX, UID_VALIDITY); public static final SimpleMailbox NEW_MAILBOX = new SimpleMailbox(NEW_PATH, UID_VALIDITY); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java index 7c15da8..da2e59c 100644 --- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java +++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java @@ -47,7 +47,7 @@ import com.google.common.collect.Lists; public class MailboxRegistrationTest { - public static final MailboxPath INBOX = new MailboxPath("#private", "[email protected]", "INBOX"); + public static final MailboxPath INBOX = MailboxPath.forUser("[email protected]", "INBOX"); public static final MessageUid UID = MessageUid.of(18); public static final int UID_VALIDITY = 45; public static final SimpleMailbox MAILBOX = new SimpleMailbox(INBOX, UID_VALIDITY); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java index 52ff7f4..c1493c3 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLCommands.java @@ -34,7 +34,7 @@ public abstract class ACLCommands implements ImapTestConstants { public static final String OTHER_USER_NAME = "Boby"; public static final String OTHER_USER_PASSWORD = "password"; - public static final MailboxPath OTHER_USER_MAILBOX = new MailboxPath("#private", OTHER_USER_NAME, "") ; + public static final MailboxPath OTHER_USER_MAILBOX = MailboxPath.forUser(OTHER_USER_NAME, "") ; protected abstract ImapHostSystem createImapHostSystem(); protected abstract GrantRightsOnHost createGrantRightsOnHost(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java index 5967f87..eae4889 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java @@ -33,8 +33,8 @@ import org.junit.Test; public abstract class ACLIntegration implements ImapTestConstants { public static final String OTHER_USER_NAME = "Boby"; public static final String OTHER_USER_PASSWORD = "password"; - public static final MailboxPath OTHER_USER_MAILBOX = new MailboxPath("#private", OTHER_USER_NAME, ""); - public static final MailboxPath MY_INBOX = new MailboxPath("#private", USER, ""); + public static final MailboxPath OTHER_USER_MAILBOX = MailboxPath.forUser( OTHER_USER_NAME, ""); + public static final MailboxPath MY_INBOX = MailboxPath.forUser( USER, ""); protected abstract ImapHostSystem createImapHostSystem(); protected abstract GrantRightsOnHost createGrantRightsOnHost(); @@ -102,22 +102,22 @@ public abstract class ACLIntegration implements ImapTestConstants { @Test public void rightXOnOriginShouldBeSufficientToRenameAMailboxUS() throws Exception { scriptedTestProtocol - .withMailbox(new MailboxPath("#private","Boby","test")) - .withGrantRights(new MailboxPath("#private", OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x")) + .withMailbox(MailboxPath.forUser("Boby","test")) + .withGrantRights(MailboxPath.forUser( OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x")) .run("aclIntegration/ACLIntegrationRightX"); } @Test public void rightXOnOriginShouldBeNeededToRenameAMailboxUS() throws Exception { scriptedTestProtocol - .withMailbox(new MailboxPath("#private","Boby","test")) - .withGrantRights(new MailboxPath("#private", OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("rswipktela")) + .withMailbox(MailboxPath.forUser("Boby","test")) + .withGrantRights(MailboxPath.forUser( OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("rswipktela")) .run("aclIntegration/ACLIntegrationWithoutRightX"); } @Test public void rightKOnDestinationShouldBeSufficientToRenameAMailboxUS() throws Exception { - MailboxPath newMailbox = new MailboxPath("#private", USER, "test"); + MailboxPath newMailbox = MailboxPath.forUser( USER, "test"); scriptedTestProtocol .withMailbox(newMailbox) .withGrantRights(newMailbox, USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x")) @@ -127,7 +127,7 @@ public abstract class ACLIntegration implements ImapTestConstants { @Test public void rightKOnDestinationShouldBeNeededToRenameAMailboxUS() throws Exception { - MailboxPath newMailbox = new MailboxPath("#private", USER, "test"); + MailboxPath newMailbox = MailboxPath.forUser( USER, "test"); scriptedTestProtocol .withMailbox(newMailbox) .withGrantRights(newMailbox, USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x")) http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatePlain.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatePlain.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatePlain.java index 84d068d..3729ca1 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatePlain.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatePlain.java @@ -21,7 +21,6 @@ package org.apache.james.mpt.imapmailbox.suite; import java.util.Locale; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.ImapTestConstants; @@ -43,8 +42,8 @@ public abstract class AuthenticatePlain implements ImapTestConstants { simpleScriptedTestProtocol = new ImapScriptedTestProtocol("/org/apache/james/imap/scripts/", system) .withUser(USER, PASSWORD) .withUser("delegate", "123456") - .withMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "delegate", "delegate")) - .withMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "imapuser", "imapuser")); + .withMailbox(MailboxPath.forUser("delegate", "delegate")) + .withMailbox(MailboxPath.forUser("imapuser", "imapuser")); BasicImapCommands.welcome(simpleScriptedTestProtocol); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f15ff20b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java index 3df2651..dd364e8 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java @@ -412,14 +412,14 @@ public abstract class AuthenticatedState extends BasicImapCommands { @Test public void listShouldNotListMailboxWithOtherNamspaceUS() throws Exception { Assume.assumeTrue(system.supports(Feature.NAMESPACE_SUPPORT)); - system.createMailbox(new MailboxPath("#namespace", USER, "Other")); + system.createMailbox(MailboxPath.forUser(USER, "Other")); simpleScriptedTestProtocol.run("ListMailboxes"); } @Test public void listShouldNotListMailboxWithOtherNamspaceITALY() throws Exception { Assume.assumeTrue(system.supports(Feature.NAMESPACE_SUPPORT)); - system.createMailbox(new MailboxPath("#namespace", USER, "Other")); + system.createMailbox(MailboxPath.forUser(USER, "Other")); simpleScriptedTestProtocol .withLocale(Locale.ITALY) .run("ListMailboxes"); @@ -428,7 +428,7 @@ public abstract class AuthenticatedState extends BasicImapCommands { @Test public void listShouldNotListMailboxWithOtherNamspaceKOREA() throws Exception { Assume.assumeTrue(system.supports(Feature.NAMESPACE_SUPPORT)); - system.createMailbox(new MailboxPath("#namespace", USER, "Other")); + system.createMailbox(MailboxPath.forUser(USER, "Other")); simpleScriptedTestProtocol .withLocale(Locale.KOREA) .run("ListMailboxes"); @@ -436,13 +436,13 @@ public abstract class AuthenticatedState extends BasicImapCommands { @Test public void listShouldNotListMailboxWithOtherUserUS() throws Exception { - system.createMailbox(new MailboxPath("#namespace", USER + "2", "Other")); + system.createMailbox(MailboxPath.forUser(USER + "2", "Other")); simpleScriptedTestProtocol.run("ListMailboxes"); } @Test public void listShouldNotListMailboxWithOtherUserITALY() throws Exception { - system.createMailbox(new MailboxPath("#namespace", USER + "2", "Other")); + system.createMailbox(MailboxPath.forUser(USER + "2", "Other")); simpleScriptedTestProtocol .withLocale(Locale.ITALY) .run("ListMailboxes"); @@ -450,7 +450,7 @@ public abstract class AuthenticatedState extends BasicImapCommands { @Test public void listShouldNotListMailboxWithOtherUserKOREA() throws Exception { - system.createMailbox(new MailboxPath("#namespace", USER + "2", "Other")); + system.createMailbox(MailboxPath.forUser(USER + "2", "Other")); simpleScriptedTestProtocol .withLocale(Locale.KOREA) .run("ListMailboxes"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
