MAILBOX-365 Rely on MailboxSessionUtil for creating a MailboxSession in tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d1fdf8bc Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d1fdf8bc Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d1fdf8bc Branch: refs/heads/master Commit: d1fdf8bca8b779c0fdc341dfd3dd5656288b0b85 Parents: 780c38c Author: Benoit Tellier <[email protected]> Authored: Mon Dec 17 18:07:29 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Tue Dec 18 14:48:31 2018 +0700 ---------------------------------------------------------------------- .../apache/james/mailbox/MailboxSession.java | 20 -------- .../AbstractSubscriptionManagerTest.java | 2 +- .../james/mailbox/MailboxSessionUtil.java | 48 ++++++++++++++++++++ .../mailbox/backup/MailboxMessageFixture.java | 3 +- .../cassandra/mail/CassandraMapperProvider.java | 3 +- .../mail/CassandraMessageIdMapperTest.java | 3 +- .../ElasticSearchIntegrationTest.java | 13 +++--- ...icSearchListeningMessageSearchIndexTest.java | 3 +- .../mailbox/jpa/mail/JPAMapperProvider.java | 4 +- .../LuceneMailboxMessageSearchIndexTest.java | 3 +- .../search/LuceneMessageSearchIndexTest.java | 4 +- .../inmemory/mail/InMemoryMapperProvider.java | 5 +- .../QuotaThresholdListenersTestSystem.java | 3 +- ...ticSearchQuotaSearchTestSystemExtension.java | 4 +- .../spamassassin/SpamAssassinListenerTest.java | 3 +- .../store/AbstractCombinationManagerTest.java | 3 +- .../AbstractMailboxManagerAttachmentTest.java | 3 +- .../AbstractMessageIdManagerQuotaTest.java | 3 +- .../AbstractMessageIdManagerSideEffectTest.java | 3 +- .../AbstractMessageIdManagerStorageTest.java | 7 +-- .../store/AbstractMessageManagerTest.java | 5 +- .../store/MailboxEventDispatcherTest.java | 3 +- .../mailbox/store/StoreBlobManagerTest.java | 3 +- .../StoreMailboxManagerAnnotationTest.java | 3 +- .../mailbox/store/StoreMailboxManagerTest.java | 7 +-- .../mailbox/store/StoreRightManagerTest.java | 7 +-- .../store/SystemMailboxesProviderImplTest.java | 3 +- .../DefaultDelegatingMailboxListenerTest.java | 3 +- .../event/MailboxAnnotationListenerTest.java | 3 +- .../store/event/MessageMoveEventTest.java | 17 +++---- .../mailbox/store/mail/MessageUtilsTest.java | 3 +- .../host/ElasticSearchHostSystem.java | 4 +- .../inmemory/host/InMemoryHostSystem.java | 4 +- .../james/imap/api/ImapSessionUtilsTest.java | 3 +- .../decode/parser/CreateCommandParserTest.java | 3 +- .../james/imap/main/PathConverterTest.java | 3 +- .../james/imap/processor/CopyProcessorTest.java | 3 +- .../imap/processor/DeleteACLProcessorTest.java | 3 +- .../imap/processor/GetACLProcessorTest.java | 3 +- .../processor/GetAnnotationProcessorTest.java | 3 +- .../imap/processor/GetQuotaProcessorTest.java | 3 +- .../processor/GetQuotaRootProcessorTest.java | 3 +- .../james/imap/processor/LSubProcessorTest.java | 5 +- .../imap/processor/ListRightsProcessorTest.java | 3 +- .../james/imap/processor/MoveProcessorTest.java | 3 +- .../imap/processor/SearchProcessorTest.java | 3 +- .../imap/processor/SetACLProcessorTest.java | 3 +- .../processor/SetAnnotationProcessorTest.java | 3 +- .../imap/processor/SetQuotaProcessorTest.java | 3 +- .../base/MailboxEventAnalyserTest.java | 5 +- .../DefaultMailboxesProvisioningFilterTest.java | 3 +- ...ltMailboxesProvisioningFilterThreadTest.java | 3 +- .../apache/james/jmap/DownloadServletTest.java | 3 +- .../james/jmap/UserProvisioningFilterTest.java | 9 ++-- .../jmap/UserProvisioningFilterThreadTest.java | 3 +- .../event/PropagateLookupRightListenerTest.java | 3 +- .../jmap/methods/AttachmentCheckerTest.java | 3 +- .../jmap/methods/GetMailboxesMethodTest.java | 3 +- .../jmap/methods/GetMessagesMethodTest.java | 3 +- .../SetMessagesCreationProcessorTest.java | 3 +- .../apache/james/jmap/model/JmapMDNTest.java | 3 +- .../ElasticSearchQuotaSearchExtension.java | 4 +- .../routes/UserMailboxesRoutesTest.java | 4 +- 63 files changed, 193 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java index 933da12..1a39081 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java @@ -26,12 +26,10 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Objects; -import java.util.Random; import org.apache.james.core.User; import org.apache.james.mailbox.model.MailboxConstants; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; /** @@ -39,23 +37,6 @@ import com.google.common.base.MoreObjects; */ public class MailboxSession { - @VisibleForTesting - public static MailboxSession create(String username) { - return create(username, SessionId.of(RANDOM.nextLong())); - } - - @VisibleForTesting - public static MailboxSession create(String username, SessionId sessionId) { - ArrayList<Locale> locales = new ArrayList<>(); - - return new MailboxSession( - sessionId, - username, - locales, - MailboxConstants.DEFAULT_DELIMITER, - SessionType.User); - } - public static class SessionId { public static SessionId of(long sessionId) { @@ -99,7 +80,6 @@ public class MailboxSession { * Id which will be used for a System session */ public static long SYSTEM_SESSION_ID = 0L; - private static final Random RANDOM = new Random(); public enum SessionType { /** http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java index d42c34a..d482116 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractSubscriptionManagerTest.java @@ -40,7 +40,7 @@ public abstract class AbstractSubscriptionManagerTest { public void setup() { manager = createSubscriptionManager(); - session = MailboxSession.create(USER1); + session = MailboxSessionUtil.create(USER1); manager.startProcessingRequest(session); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxSessionUtil.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxSessionUtil.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxSessionUtil.java new file mode 100644 index 0000000..a307020 --- /dev/null +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxSessionUtil.java @@ -0,0 +1,48 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.mailbox; + +import java.util.ArrayList; +import java.util.Locale; +import java.util.Random; + +import org.apache.james.mailbox.model.MailboxConstants; + +import com.google.common.annotations.VisibleForTesting; + +public class MailboxSessionUtil { + private static final Random RANDOM = new Random(); + + public static MailboxSession create(String username) { + return create(username, MailboxSession.SessionId.of(RANDOM.nextLong())); + } + + @VisibleForTesting + public static MailboxSession create(String username, MailboxSession.SessionId sessionId) { + ArrayList<Locale> locales = new ArrayList<>(); + + return new MailboxSession( + sessionId, + username, + locales, + MailboxConstants.DEFAULT_DELIMITER, + MailboxSession.SessionType.User); + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java index 0933c31..098a858 100644 --- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java +++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java @@ -28,6 +28,7 @@ import javax.mail.Flags; import javax.mail.util.SharedByteArrayInputStream; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; @@ -63,7 +64,7 @@ public interface MailboxMessageFixture { MailboxId MAILBOX_ID_1 = TestId.of(1L); Flags flags1 = new Flags("myFlags"); - MailboxSession MAILBOX_SESSION = MailboxSession.create("user"); + MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create("user"); Mailbox MAILBOX_1 = new SimpleMailbox(MailboxPath.forUser("user", "mailbox1"), 42, TestId.of(1L)); Mailbox MAILBOX_1_SUB_1 = new SimpleMailbox(MailboxPath.forUser("user", "mailbox1" + MAILBOX_SESSION.getPathDelimiter() + "sub1"), 420, TestId.of(11L)); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java index 65f54b0..95df7fb 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java @@ -22,6 +22,7 @@ import java.util.List; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory; import org.apache.james.mailbox.cassandra.TestCassandraMailboxSessionMapperFactory; @@ -48,7 +49,7 @@ public class CassandraMapperProvider implements MapperProvider { private final CassandraCluster cassandra; private final MessageUidProvider messageUidProvider; private final CassandraModSeqProvider cassandraModSeqProvider; - private final MailboxSession mailboxSession = MailboxSession.create("benwa"); + private final MailboxSession mailboxSession = MailboxSessionUtil.create("benwa"); private CassandraMailboxSessionMapperFactory mapperFactory; public CassandraMapperProvider(CassandraCluster cassandra) { http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java index 24cbda4..7a47973 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java @@ -27,6 +27,7 @@ import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory; import org.apache.james.mailbox.cassandra.TestCassandraMailboxSessionMapperFactory; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; @@ -45,7 +46,7 @@ import com.google.common.collect.ImmutableList; public class CassandraMessageIdMapperTest extends MessageIdMapperTest { - private static final MailboxSession MAILBOX_SESSION = MailboxSession.create("benwa"); + private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create("benwa"); @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); private static CassandraCluster cassandra; http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/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 78d6a8d..bb8b1bf 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 @@ -31,6 +31,7 @@ import org.apache.james.backends.es.ElasticSearchIndexer; import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.backends.es.utils.TestingClientProvider; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.elasticsearch.events.ElasticSearchListeningMessageSearchIndex; @@ -124,14 +125,14 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest storeMailboxManager.getQuotaManager(), storeMailboxManager.getQuotaRootResolver()); storeMailboxManager.setMessageSearchIndex(elasticSearchListeningMessageSearchIndex); - storeMailboxManager.addGlobalListener(elasticSearchListeningMessageSearchIndex, MailboxSession.create("admin")); + storeMailboxManager.addGlobalListener(elasticSearchListeningMessageSearchIndex, MailboxSessionUtil.create("admin")); this.messageSearchIndex = elasticSearchListeningMessageSearchIndex; } @Test public void termsBetweenElasticSearchAndLuceneLimitDueTuNonAsciiCharsShouldBeTruncated() throws Exception { MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); - MailboxSession session = MailboxSession.create(USERNAME); + MailboxSession session = MailboxSessionUtil.create(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); String recipient = "[email protected]"; @@ -150,7 +151,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void tooLongTermsShouldNotMakeIndexingFail() throws Exception { MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); - MailboxSession session = MailboxSession.create(USERNAME); + MailboxSession session = MailboxSessionUtil.create(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); String recipient = "[email protected]"; @@ -169,7 +170,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void fieldsExceedingLuceneLimitShouldNotBeIgnored() throws Exception { MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); - MailboxSession session = MailboxSession.create(USERNAME); + MailboxSession session = MailboxSessionUtil.create(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); String recipient = "[email protected]"; @@ -188,7 +189,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void fieldsWithTooLongTermShouldStillBeIndexed() throws Exception { MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); - MailboxSession session = MailboxSession.create(USERNAME); + MailboxSession session = MailboxSessionUtil.create(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); String recipient = "[email protected]"; @@ -207,7 +208,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest @Test public void reasonableLongTermShouldNotBeIgnored() throws Exception { MailboxPath mailboxPath = MailboxPath.forUser(USERNAME, INBOX); - MailboxSession session = MailboxSession.create(USERNAME); + MailboxSession session = MailboxSessionUtil.create(USERNAME); MessageManager messageManager = storeMailboxManager.getMailbox(mailboxPath, session); String recipient = "[email protected]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java index 7c66ddb..2d6f18d 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java @@ -36,6 +36,7 @@ import org.apache.james.backends.es.UpdatedRepresentation; import org.apache.james.core.User; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.elasticsearch.json.MessageToElasticSearchJson; import org.apache.james.mailbox.elasticsearch.search.ElasticSearchSearcher; @@ -82,7 +83,7 @@ public class ElasticSearchListeningMessageSearchIndexTest { testee = new ElasticSearchListeningMessageSearchIndex(mapperFactory, elasticSearchIndexer, elasticSearchSearcher, messageToElasticSearchJson, mockMailboxManager); - session = MailboxSession.create(USERNAME); + session = MailboxSessionUtil.create(USERNAME); users = ImmutableList.of(User.fromUsername(USERNAME)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java index e73e2c0..64348ff 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java @@ -26,7 +26,7 @@ import javax.persistence.EntityManagerFactory; import org.apache.commons.lang3.NotImplementedException; import org.apache.james.backends.jpa.JpaTestCluster; -import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.jpa.JPAId; @@ -62,7 +62,7 @@ public class JPAMapperProvider implements MapperProvider { EntityManagerFactory entityManagerFactory = jpaTestCluster.getEntityManagerFactory(); JVMMailboxPathLocker locker = new JVMMailboxPathLocker(); - JPAMessageMapper messageMapper = new JPAMessageMapper(MailboxSession.create("benwa"), + JPAMessageMapper messageMapper = new JPAMessageMapper(MailboxSessionUtil.create("benwa"), new JPAUidProvider(locker, entityManagerFactory), new JPAModSeqProvider(locker, entityManagerFactory), entityManagerFactory); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java index 4c369f4..b891945 100644 --- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java +++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java @@ -33,6 +33,7 @@ import javax.mail.Flags; import javax.mail.Flags.Flag; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxId; @@ -94,7 +95,7 @@ public class LuceneMailboxMessageSearchIndexTest { @Before public void setUp() throws Exception { - session = MailboxSession.create("username"); + session = MailboxSessionUtil.create("username"); TestMessageId.Factory factory = new TestMessageId.Factory(); id1 = factory.generate(); id2 = factory.generate(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java index de6d66b..45b5093 100644 --- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java +++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java @@ -19,7 +19,7 @@ package org.apache.james.mailbox.lucene.search; -import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.InMemoryId; @@ -52,7 +52,7 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest storeMailboxManager.getMessageIdFactory(), storeMailboxManager); storeMailboxManager.setMessageSearchIndex(luceneMessageSearchIndex); - storeMailboxManager.addGlobalListener(luceneMessageSearchIndex, MailboxSession.create("admin")); + storeMailboxManager.addGlobalListener(luceneMessageSearchIndex, MailboxSessionUtil.create("admin")); this.messageSearchIndex = luceneMessageSearchIndex; } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java index 26eeb41..c6af73d 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Random; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.InMemoryId; @@ -42,7 +43,7 @@ import com.google.common.collect.ImmutableList; public class InMemoryMapperProvider implements MapperProvider { - private static final MailboxSession MAILBOX_SESSION = MailboxSession.create("user"); + private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create("user"); private final Random random; private final MessageId.Factory messageIdFactory; @@ -64,7 +65,7 @@ public class InMemoryMapperProvider implements MapperProvider { @Override public MessageMapper createMessageMapper() throws MailboxException { - return inMemoryMailboxSessionMapperFactory.createMessageMapper(MailboxSession.create("user")); + return inMemoryMailboxSessionMapperFactory.createMessageMapper(MailboxSessionUtil.create("user")); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdListenersTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdListenersTestSystem.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdListenersTestSystem.java index 62a4bdb..fc5f31c 100644 --- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdListenersTestSystem.java +++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdListenersTestSystem.java @@ -23,6 +23,7 @@ import org.apache.james.eventsourcing.eventstore.EventStore; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.mailbox.Event; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.quota.mailing.QuotaMailingListenerConfiguration; import org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener; @@ -43,7 +44,7 @@ public class QuotaThresholdListenersTestSystem { QuotaThresholdCrossingListener thresholdCrossingListener = new QuotaThresholdCrossingListener(mailetContext, MemoryUsersRepository.withVirtualHosting(), fileSystem, eventStore, configuration); - MailboxSession mailboxSession = MailboxSession.create("system"); + MailboxSession mailboxSession = MailboxSessionUtil.create("system"); delegatingListener.addGlobalListener(thresholdCrossingListener, mailboxSession); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java index 2477900..aba78c9 100644 --- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java +++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java @@ -30,7 +30,7 @@ import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.backends.es.utils.TestingClientProvider; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.memory.MemoryDomainList; -import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; import org.apache.james.quota.search.QuotaSearchTestSystem; @@ -79,7 +79,7 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes new QuotaRatioToElasticSearchJson()); resources.getMailboxManager() - .addGlobalListener(listener, MailboxSession.create("ANY")); + .addGlobalListener(listener, MailboxSessionUtil.create("ANY")); return new QuotaSearchTestSystem( resources.getMaxQuotaManager(), http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java index 3bbfd62..3fc4cd6 100644 --- a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java +++ b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java @@ -35,6 +35,7 @@ import javax.mail.util.SharedByteArrayInputStream; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.exception.MailboxException; @@ -64,7 +65,7 @@ import com.google.common.collect.ImmutableSortedMap; public class SpamAssassinListenerTest { public static final String USER = "user"; - private static final MailboxSession MAILBOX_SESSION = MailboxSession.create(USER); + private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER); private static final int UID_VALIDITY = 43; private static final MessageUid UID = MessageUid.of(45); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java index 1e20f59..0ed6dda 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java @@ -32,6 +32,7 @@ import org.apache.james.mailbox.ApplicableFlagBuilder; import org.apache.james.mailbox.FlagsBuilder; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageManager.FlagsUpdateMode; @@ -73,7 +74,7 @@ public abstract class AbstractCombinationManagerTest { public abstract CombinationManagerTestSystem createTestingData() throws Exception; public void setUp() throws Exception { - session = MailboxSession.create(MailboxFixture.ALICE); + session = MailboxSessionUtil.create(MailboxFixture.ALICE); testingData = createTestingData(); mailbox1 = testingData.createMailbox(MailboxFixture.INBOX_ALICE, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/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 b230fc1..637cc69 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 @@ -29,6 +29,7 @@ import java.util.Optional; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageAttachment; @@ -63,7 +64,7 @@ public abstract class AbstractMailboxManagerAttachmentTest { protected abstract AttachmentMapperFactory getAttachmentMapperFactory(); public void setUp() throws Exception { - mailboxSession = MailboxSession.create(USERNAME); + mailboxSession = MailboxSessionUtil.create(USERNAME); messageMapper = getMailboxSessionMapperFactory().getMessageMapper(mailboxSession); mailboxMapper = getMailboxSessionMapperFactory().getMailboxMapper(mailboxSession); inboxPath = MailboxPath.forUser(USERNAME, "INBOX"); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java index 78d48c8..067f445 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java @@ -26,6 +26,7 @@ import javax.mail.Flags; import org.apache.james.core.quota.QuotaCount; import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.OverQuotaException; @@ -72,7 +73,7 @@ public abstract class AbstractMessageIdManagerQuotaTest { CurrentQuotaManager currentQuotaManager = createCurrentQuotaManager(); QuotaManager quotaManager = createQuotaManager(maxQuotaManager, currentQuotaManager); - session = MailboxSession.create(ALICE); + session = MailboxSessionUtil.create(ALICE); testingData = createTestSystem(quotaManager, currentQuotaManager); messageIdManager = testingData.getMessageIdManager(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java index ab3527f..b2a3050 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java @@ -37,6 +37,7 @@ import javax.mail.Flags; import org.apache.james.core.quota.QuotaCount; import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageManager.FlagsUpdateMode; @@ -88,7 +89,7 @@ public abstract class AbstractMessageIdManagerSideEffectTest { dispatcher = mock(MailboxEventDispatcher.class); quotaManager = mock(QuotaManager.class); - session = MailboxSession.create(ALICE); + session = MailboxSessionUtil.create(ALICE); testingData = createTestSystem(quotaManager, dispatcher); messageIdManager = testingData.getMessageIdManager(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java index 2c3e7de..66e1cc0 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java @@ -30,6 +30,7 @@ import java.util.function.Predicate; import javax.mail.Flags; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageUid; @@ -74,9 +75,9 @@ public abstract class AbstractMessageIdManagerStorageTest { protected abstract MessageIdManagerTestSystem createTestingData() throws Exception; public void setUp() throws Exception { - aliceSession = MailboxSession.create(MailboxFixture.ALICE); - bobSession = MailboxSession.create(MailboxFixture.BOB); - systemSession = MailboxSession.create("systemuser"); + aliceSession = MailboxSessionUtil.create(MailboxFixture.ALICE); + bobSession = MailboxSessionUtil.create(MailboxFixture.BOB); + systemSession = MailboxSessionUtil.create("systemuser"); testingData = createTestingData(); messageIdManager = testingData.getMessageIdManager(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java index 0c677ec..0d517df 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java @@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.fixture.MailboxFixture; import org.apache.james.mailbox.model.MailboxACL; @@ -44,8 +45,8 @@ public abstract class AbstractMessageManagerTest { protected abstract MessageManagerTestSystem createTestSystem() throws Exception; public void setUp() throws Exception { - aliceSession = MailboxSession.create(ALICE); - bobSession = MailboxSession.create(BOB); + aliceSession = MailboxSessionUtil.create(ALICE); + bobSession = MailboxSessionUtil.create(BOB); testSystem = createTestSystem(); mailboxManager = testSystem.getMailboxManager(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/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 f5354f9..d681c9a 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 @@ -30,6 +30,7 @@ import org.apache.james.mailbox.Event; import org.apache.james.mailbox.FlagsBuilder; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageResult; @@ -63,7 +64,7 @@ public class MailboxEventDispatcherTest { private MessageResult result; private Mailbox mailbox; - private MailboxSession session = MailboxSession.create("test", SESSION_ID); + private MailboxSession session = MailboxSessionUtil.create("test", SESSION_ID); @Before public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreBlobManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreBlobManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreBlobManagerTest.java index db48237..7837d7e 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreBlobManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreBlobManagerTest.java @@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets; import org.apache.james.mailbox.AttachmentManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.exception.AttachmentNotFoundException; import org.apache.james.mailbox.exception.BlobNotFoundException; @@ -66,7 +67,7 @@ public class StoreBlobManagerTest { public void setUp() { attachmentManager = mock(AttachmentManager.class); messageIdManager = mock(MessageIdManager.class); - session = MailboxSession.create("user"); + session = MailboxSessionUtil.create("user"); blobManager = new StoreBlobManager(attachmentManager, messageIdManager, new TestMessageId.Factory()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java index 3732848..b2010bd 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Set; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxAnnotation; @@ -79,7 +80,7 @@ public class StoreMailboxManagerAnnotationTest { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - session = MailboxSession.create("userName"); + session = MailboxSessionUtil.create("userName"); when(mailboxSessionMapperFactory.getMailboxMapper(eq(session))).thenReturn(mailboxMapper); when(mailboxSessionMapperFactory.getAnnotationMapper(eq(session))).thenReturn(annotationMapper); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java index bd4fddf..1d29356 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.acl.UnionMailboxACLResolver; @@ -66,7 +67,7 @@ public class StoreMailboxManagerTest { @Before public void setUp() throws MailboxException { MailboxSessionMapperFactory mockedMapperFactory = mock(MailboxSessionMapperFactory.class); - mockedMailboxSession = MailboxSession.create(CURRENT_USER); + mockedMailboxSession = MailboxSessionUtil.create(CURRENT_USER); mockedMailboxMapper = mock(MailboxMapper.class); when(mockedMapperFactory.getMailboxMapper(mockedMailboxSession)) .thenReturn(mockedMailboxMapper); @@ -188,7 +189,7 @@ public class StoreMailboxManagerTest { @Test public void getPathLikeShouldReturnUserPathLikeWhenNoPrefixDefined() throws Exception { //Given - MailboxSession session = MailboxSession.create("user"); + MailboxSession session = MailboxSessionUtil.create("user"); MailboxQuery.Builder testee = MailboxQuery.builder() .expression(new PrefixedRegex(EMPTY_PREFIX, "abc", session.getPathDelimiter())); //When @@ -201,7 +202,7 @@ public class StoreMailboxManagerTest { @Test public void getPathLikeShouldReturnUserPathLikeWhenPrefixDefined() throws Exception { //Given - MailboxSession session = MailboxSession.create("user"); + MailboxSession session = MailboxSessionUtil.create("user"); MailboxQuery.Builder testee = MailboxQuery.builder() .expression(new PrefixedRegex("prefix.", "abc", session.getPathDelimiter())); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java index 52489d6..0902262 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java @@ -31,6 +31,7 @@ import static org.mockito.Mockito.when; import javax.mail.Flags; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; @@ -63,7 +64,7 @@ public class StoreRightManagerTest { @Before public void setup() throws MailboxException { - aliceSession = MailboxSession.create(MailboxFixture.ALICE); + aliceSession = MailboxSessionUtil.create(MailboxFixture.ALICE); MailboxSessionMapperFactory mockedMapperFactory = mock(MailboxSessionMapperFactory.class); mockedMailboxMapper = mock(MailboxMapper.class); mailboxAclResolver = new UnionMailboxACLResolver(); @@ -218,7 +219,7 @@ public class StoreRightManagerTest { .apply(MailboxACL.command().rights(Right.Read, Right.Write).forUser(BOB).asAddition()) .apply(MailboxACL.command().rights(Right.Read, Right.Write, Right.Administer).forUser(CEDRIC).asAddition()); MailboxACL actual = StoreRightManager.filteredForSession( - new SimpleMailbox(INBOX_ALICE, UID_VALIDITY), acl, MailboxSession.create(CEDRIC)); + new SimpleMailbox(INBOX_ALICE, UID_VALIDITY), acl, MailboxSessionUtil.create(CEDRIC)); assertThat(actual).isEqualTo(acl); } @@ -228,7 +229,7 @@ public class StoreRightManagerTest { .apply(MailboxACL.command().rights(Right.Read, Right.Write).forUser(BOB).asAddition()) .apply(MailboxACL.command().rights(Right.Read, Right.Write, Right.Administer).forUser(CEDRIC).asAddition()); MailboxACL actual = StoreRightManager.filteredForSession( - new SimpleMailbox(INBOX_ALICE, UID_VALIDITY), acl, MailboxSession.create(BOB)); + new SimpleMailbox(INBOX_ALICE, UID_VALIDITY), acl, MailboxSessionUtil.create(BOB)); assertThat(actual.getEntries()).containsKey(MailboxACL.EntryKey.createUserEntryKey(BOB)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/SystemMailboxesProviderImplTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SystemMailboxesProviderImplTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SystemMailboxesProviderImplTest.java index b8989ba..c83f1b1 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SystemMailboxesProviderImplTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SystemMailboxesProviderImplTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.Role; import org.apache.james.mailbox.exception.MailboxNotFoundException; @@ -37,7 +38,7 @@ import org.junit.rules.ExpectedException; public class SystemMailboxesProviderImplTest { - private MailboxSession mailboxSession = MailboxSession.create(MailboxFixture.ALICE); + private MailboxSession mailboxSession = MailboxSessionUtil.create(MailboxFixture.ALICE); private SystemMailboxesProviderImpl systemMailboxProvider; private MailboxManager mailboxManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java index 0a78e26..4f19fe9 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java @@ -28,6 +28,7 @@ import org.apache.james.core.quota.QuotaCount; import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; @@ -166,7 +167,7 @@ public class DefaultDelegatingMailboxListenerTest { @Test public void listenersErrorsShouldNotBePropageted() throws Exception { - MailboxSession session = MailboxSession.create("benwa"); + MailboxSession session = MailboxSessionUtil.create("benwa"); MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(session.getSessionId(), session.getUser(), MAILBOX_PATH, MAILBOX_ID) {}; MailboxListener mockedListener = mock(MailboxListener.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/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 84dac7f..f643cf4 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 @@ -33,6 +33,7 @@ import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.model.MailboxAnnotation; import org.apache.james.mailbox.model.MailboxAnnotationKey; import org.apache.james.mailbox.model.MailboxId; @@ -77,7 +78,7 @@ public class MailboxAnnotationListenerTest { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - mailboxSession = MailboxSession.create("test"); + mailboxSession = MailboxSessionUtil.create("test"); listener = new MailboxAnnotationListener(mailboxSessionMapperFactory, mailboxManager); eventFactory = new EventFactory(); mailbox = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY, mailboxId); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MessageMoveEventTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MessageMoveEventTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MessageMoveEventTest.java index 9c0c28a..5d4a68f 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MessageMoveEventTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MessageMoveEventTest.java @@ -26,6 +26,7 @@ import java.util.Map; import org.apache.james.core.User; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MessageMoves; import org.apache.james.mailbox.model.TestId; @@ -51,7 +52,7 @@ public class MessageMoveEventTest { @Test public void builderShouldThrowWhenMessageMovesIsNull() { assertThatThrownBy(() -> MessageMoveEvent.builder() - .session(MailboxSession.create("[email protected]")) + .session(MailboxSessionUtil.create("[email protected]")) .build()) .isInstanceOf(NullPointerException.class); } @@ -59,7 +60,7 @@ public class MessageMoveEventTest { @Test public void builderShouldReturnNoopWhenMessagesIsEmpty() { assertThat(MessageMoveEvent.builder() - .session(MailboxSession.create("[email protected]")) + .session(MailboxSessionUtil.create("[email protected]")) .messageMoves(MessageMoves.builder() .previousMailboxIds(TestId.of(1)) .targetMailboxIds(TestId.of(2)) @@ -70,7 +71,7 @@ public class MessageMoveEventTest { @Test public void builderShouldNotBeNoopWhenFieldsAreGiven() { - MailboxSession session = MailboxSession.create("[email protected]"); + MailboxSession session = MailboxSessionUtil.create("[email protected]"); MessageMoves messageMoves = MessageMoves.builder() .targetMailboxIds(TestId.of(2)) .previousMailboxIds(TestId.of(1)) @@ -89,7 +90,7 @@ public class MessageMoveEventTest { @Test public void builderShouldBuildWhenFieldsAreGiven() { String username = "[email protected]"; - MailboxSession session = MailboxSession.create(username); + MailboxSession session = MailboxSessionUtil.create(username); MessageMoves messageMoves = MessageMoves.builder() .targetMailboxIds(TestId.of(2)) .previousMailboxIds(TestId.of(1)) @@ -110,7 +111,7 @@ public class MessageMoveEventTest { @Test public void isMoveToShouldReturnFalseWhenMailboxIdIsNotInAddedMailboxIds() { MessageMoveEvent event = MessageMoveEvent.builder() - .session(MailboxSession.create("[email protected]")) + .session(MailboxSessionUtil.create("[email protected]")) .messageMoves(MessageMoves.builder() .previousMailboxIds(TestId.of(1)) .targetMailboxIds(TestId.of(2)) @@ -125,7 +126,7 @@ public class MessageMoveEventTest { public void isMoveToShouldReturnTrueWhenMailboxIdIsInAddedMailboxIds() { TestId mailboxId = TestId.of(123); MessageMoveEvent event = MessageMoveEvent.builder() - .session(MailboxSession.create("[email protected]")) + .session(MailboxSessionUtil.create("[email protected]")) .messageMoves(MessageMoves.builder() .previousMailboxIds(TestId.of(1)) .targetMailboxIds(TestId.of(2), mailboxId) @@ -139,7 +140,7 @@ public class MessageMoveEventTest { @Test public void isMoveFromShouldReturnFalseWhenMailboxIdIsNotInRemovedMailboxIds() { MessageMoveEvent event = MessageMoveEvent.builder() - .session(MailboxSession.create("[email protected]")) + .session(MailboxSessionUtil.create("[email protected]")) .messageMoves(MessageMoves.builder() .previousMailboxIds(TestId.of(1)) .targetMailboxIds(TestId.of(2)) @@ -154,7 +155,7 @@ public class MessageMoveEventTest { public void isMoveFromShouldReturnTrueWhenMailboxIdIsInRemovedMailboxIds() { TestId mailboxId = TestId.of(123); MessageMoveEvent event = MessageMoveEvent.builder() - .session(MailboxSession.create("[email protected]")) + .session(MailboxSessionUtil.create("[email protected]")) .messageMoves(MessageMoves.builder() .previousMailboxIds(TestId.of(1), mailboxId) .targetMailboxIds(TestId.of(2)) http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java index fa06038..0dc3c8d 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java @@ -30,6 +30,7 @@ import javax.mail.Flags; import javax.mail.util.SharedByteArrayInputStream; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.store.mail.model.DefaultMessageId; @@ -64,7 +65,7 @@ public class MessageUtilsTest { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - mailboxSession = MailboxSession.create("user"); + mailboxSession = MailboxSessionUtil.create("user"); messageUtils = new MessageUtils(mailboxSession, uidProvider, modSeqProvider); message = new SimpleMailboxMessage(MESSAGE_ID, new Date(), CONTENT.length(), BODY_START, new SharedByteArrayInputStream(CONTENT.getBytes()), new Flags(), new PropertyBuilder(), mailbox.getMailboxId()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java index 52a2de9..302a7f7 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java +++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java @@ -38,7 +38,7 @@ import org.apache.james.imap.encode.main.DefaultImapEncoderFactory; import org.apache.james.imap.main.DefaultImapDecoderFactory; import org.apache.james.imap.processor.main.DefaultImapProcessorFactory; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.elasticsearch.IndexAttachments; import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; @@ -116,7 +116,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem { mailboxManager); mailboxManager.setMessageSearchIndex(searchIndex); - mailboxManager.addGlobalListener(searchIndex, MailboxSession.create("admin")); + mailboxManager.addGlobalListener(searchIndex, MailboxSessionUtil.create("admin")); ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java index 6ae41c4..aa8bc22 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java @@ -26,7 +26,7 @@ import org.apache.james.imap.encode.main.DefaultImapEncoderFactory; import org.apache.james.imap.main.DefaultImapDecoderFactory; import org.apache.james.imap.processor.main.DefaultImapProcessorFactory; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; @@ -80,7 +80,7 @@ public class InMemoryHostSystem extends JamesImapHostSystem { mailboxManager.setQuotaRootResolver(quotaRootResolver); mailboxManager.setQuotaManager(quotaManager); mailboxManager.setQuotaUpdater(quotaUpdater); - mailboxManager.addGlobalListener(quotaUpdater, MailboxSession.create("admin")); + mailboxManager.addGlobalListener(quotaUpdater, MailboxSessionUtil.create("admin")); final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new StoreSubscriptionManager(mailboxManager.getMapperFactory()), quotaManager, quotaRootResolver, new DefaultMetricFactory()); configure(new DefaultImapDecoderFactory().buildImapDecoder(), http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/api/ImapSessionUtilsTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/api/ImapSessionUtilsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/api/ImapSessionUtilsTest.java index 8ec6e66..59999ba 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/api/ImapSessionUtilsTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/api/ImapSessionUtilsTest.java @@ -24,12 +24,13 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.imap.encode.FakeImapSession; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.junit.Before; import org.junit.Test; public class ImapSessionUtilsTest { private static final String USERNAME = "username"; - private static final MailboxSession MAILBOX_SESSION = MailboxSession.create(USERNAME); + private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USERNAME); private FakeImapSession fakeImapSession; @Before http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java index 6d698af..852dc16 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/CreateCommandParserTest.java @@ -35,6 +35,7 @@ import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.imap.message.request.CreateRequest; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.protocols.imap.DecodingException; import org.junit.Before; import org.junit.Test; @@ -51,7 +52,7 @@ public class CreateCommandParserTest { @Before public void setUp() throws Exception { mockImapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create("userName"); + mailboxSession = MailboxSessionUtil.create("userName"); when(mockImapSession.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY)).thenReturn(mailboxSession); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java b/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java index e959573..893e59b 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import org.apache.james.imap.api.ImapSessionUtils; import org.apache.james.imap.api.process.ImapSession; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.junit.Before; @@ -47,7 +48,7 @@ public class PathConverterTest { @Before public void setUp() { imapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create(USERNAME); + mailboxSession = MailboxSessionUtil.create(USERNAME); pathConverter = PathConverter.forSession(imapSession); when(imapSession.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY)).thenReturn(mailboxSession); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java index 5a097b3..fc17daa 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java @@ -43,6 +43,7 @@ import org.apache.james.imap.message.request.CopyRequest; import org.apache.james.imap.message.request.MoveRequest; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; @@ -75,7 +76,7 @@ public class CopyProcessorTest { mockStatusResponseFactory = mock(StatusResponseFactory.class); mockResponder = mock(ImapProcessor.Responder.class); mockImapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create(USER.asString()); + mailboxSession = MailboxSessionUtil.create(USER.asString()); testee = new CopyProcessor(mockNextProcessor, mockMailboxManager, mockStatusResponseFactory, new NoopMetricFactory()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java index fcc7cc4..a593290 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java @@ -40,6 +40,7 @@ import org.apache.james.imap.message.request.DeleteACLRequest; import org.apache.james.imap.message.response.UnpooledStatusResponseFactory; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageManager.MetaData; import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; @@ -81,7 +82,7 @@ public class DeleteACLProcessorTest { mailboxManager = mock(MailboxManager.class); subject = new DeleteACLProcessor(mock(ImapProcessor.class), mailboxManager, statusResponseFactory, new NoopMetricFactory()); imapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create(USER_1); + mailboxSession = MailboxSessionUtil.create(USER_1); MessageManager messageManager = mock(MessageManager.class); metaData = mock(MetaData.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java index a87d530..b9241a0 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java @@ -41,6 +41,7 @@ import org.apache.james.imap.message.response.ACLResponse; import org.apache.james.imap.message.response.UnpooledStatusResponseFactory; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageManager.MetaData; import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; @@ -78,7 +79,7 @@ public class GetACLProcessorTest { mailboxManager = mock(MailboxManager.class); subject = new GetACLProcessor(mock(ImapProcessor.class), mailboxManager, statusResponseFactory, new NoopMetricFactory()); imapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create(USER_1); + mailboxSession = MailboxSessionUtil.create(USER_1); MessageManager messageManager = mock(MessageManager.class); metaData = mock(MetaData.class); responder = mock(Responder.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java index 0523335..df6821f 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetAnnotationProcessorTest.java @@ -48,6 +48,7 @@ import org.apache.james.imap.message.request.GetAnnotationRequest.Depth; import org.apache.james.imap.message.response.AnnotationResponse; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.MailboxAnnotation; @@ -102,7 +103,7 @@ public class GetAnnotationProcessorTest { mockResponder = mock(ImapProcessor.Responder.class); mockImapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create("username"); + mailboxSession = MailboxSessionUtil.create("username"); inbox = MailboxPath.inbox(mailboxSession); keys = ImmutableSet.of(PRIVATE_KEY); annotationRequestBuilder = GetAnnotationRequest.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java index 6079b5e..dfca8d0 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java @@ -42,6 +42,7 @@ import org.apache.james.imap.message.response.QuotaResponse; import org.apache.james.imap.message.response.UnpooledStatusResponseFactory; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxPath; @@ -75,7 +76,7 @@ public class GetQuotaProcessorTest { @Before public void setUp() throws Exception { - mailboxSession = MailboxSession.create("plop"); + mailboxSession = MailboxSessionUtil.create("plop"); UnpooledStatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory(); mockedImapSession = mock(ImapSession.class); mockedQuotaManager = mock(QuotaManager.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java index 6558bf8..54ba87c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java @@ -45,6 +45,7 @@ import org.apache.james.imap.message.response.QuotaRootResponse; import org.apache.james.imap.message.response.UnpooledStatusResponseFactory; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxPath; @@ -76,7 +77,7 @@ public class GetQuotaRootProcessorTest { @Before public void setUp() { - mailboxSession = MailboxSession.create("plop"); + mailboxSession = MailboxSessionUtil.create("plop"); UnpooledStatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory(); mockedImapSession = mock(ImapSession.class); mockedQuotaManager = mock(QuotaManager.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java index bc29406..acb122c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java @@ -27,8 +27,6 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Collection; -import java.util.List; -import java.util.Locale; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapSessionUtils; @@ -41,6 +39,7 @@ import org.apache.james.imap.message.request.LsubRequest; import org.apache.james.imap.message.response.LSubResponse; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.SubscriptionManager; import org.apache.james.mailbox.model.MailboxMetaData; import org.apache.james.metrics.api.NoopMetricFactory; @@ -96,7 +95,7 @@ public class LSubProcessorTest { statusResponse = mock(StatusResponse.class); responderImpl = responder; manager = mock(SubscriptionManager.class); - mailboxSession = MailboxSession.create(USER); + mailboxSession = MailboxSessionUtil.create(USER); processor = new LSubProcessor(next, mock(MailboxManager.class), manager, serverResponseFactory, new NoopMetricFactory()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java index b61f2ae..fda80f7 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java @@ -41,6 +41,7 @@ import org.apache.james.imap.message.response.ListRightsResponse; import org.apache.james.imap.message.response.UnpooledStatusResponseFactory; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageManager.MetaData; import org.apache.james.mailbox.exception.MailboxException; @@ -83,7 +84,7 @@ public class ListRightsProcessorTest { mailboxManager = mock(MailboxManager.class); subject = new ListRightsProcessor(mock(ImapProcessor.class), mailboxManager, statusResponseFactory, new NoopMetricFactory()); imapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create(USER_1); + mailboxSession = MailboxSessionUtil.create(USER_1); MessageManager messageManager = mock(MessageManager.class); metaData = mock(MetaData.class); responder = mock(Responder.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java index 244115e..359ff60 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java @@ -46,6 +46,7 @@ import org.apache.james.imap.message.request.MoveRequest; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManager.MailboxCapabilities; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; @@ -77,7 +78,7 @@ public class MoveProcessorTest { mockStatusResponseFactory = mock(StatusResponseFactory.class); mockResponder = mock(ImapProcessor.Responder.class); mockImapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create(USER.asString()); + mailboxSession = MailboxSessionUtil.create(USER.asString()); when(mockMailboxManager.hasCapability(eq(MailboxCapabilities.Move))).thenReturn(true); testee = new MoveProcessor(mockNextProcessor, mockMailboxManager, mockStatusResponseFactory, new NoopMetricFactory()); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java index 38e0186..532a79a 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java @@ -55,6 +55,7 @@ import org.apache.james.imap.message.request.SearchRequest; import org.apache.james.imap.message.response.SearchResponse; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MailboxPath; @@ -122,7 +123,7 @@ public class SearchProcessorTest { statusResponse = mock(StatusResponse.class); mailbox = mock(MessageManager.class); mailboxManager = mock(MailboxManager.class); - mailboxSession = MailboxSession.create("user"); + mailboxSession = MailboxSessionUtil.create("user"); selectedMailbox = mock(SelectedMailbox.class); processor = new SearchProcessor(next, mailboxManager, serverResponseFactory, new NoopMetricFactory()); http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java index dccd747..621ae3d 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java @@ -40,6 +40,7 @@ import org.apache.james.imap.message.request.SetACLRequest; import org.apache.james.imap.message.response.UnpooledStatusResponseFactory; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageManager.MetaData; import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; @@ -85,7 +86,7 @@ public class SetACLProcessorTest { mailboxManager = mock(MailboxManager.class); subject = new SetACLProcessor(mock(ImapProcessor.class), mailboxManager, statusResponseFactory, new NoopMetricFactory()); imapSession = mock(ImapSession.class); - mailboxSession = MailboxSession.create(USER_1); + mailboxSession = MailboxSessionUtil.create(USER_1); MessageManager messageManager = mock(MessageManager.class); MetaData metaData = mock(MetaData.class); responder = mock(Responder.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
