You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/11/18 02:50:34 UTC

[james-project] branch master updated (5887c6c -> efc3749)

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.


    from 5887c6c  JAMES-2981 update cassandra configuration documentation
     new 01411c5  JAMES-2949 add strong typing in UsersRepository API and more generally on Username concept
     new 733d51b  Request for comment: make UsersRepository case insensitive.
     new 42faa90  James-2949 Fix tokens with valid usernames when needed, regenerate public key
     new a7e583c  JAMES-2949 JWT authentication strategy should not accept invalid usernames
     new ff4d3e9  JAMES-2949 Remove some implicit calls to Username::toString
     new 01a4514  JAMES-2972 correct use of mailet attribute from 'matcher' to 'match', project-wide
     new 19f9b64  JAMES-2972 commented-out WithPriority mailet/matcher, added description/explanation for both
     new e52a8e5  JAMES-2972 log at debug level when matcher gets auto-configured to match all mails
     new 9e521d0  JAMES-2972 log at debug level when null mailet destroys a mail
     new 4caef14  [Refactoring] ResultUtils: Remove unused javadoc and constants
     new 5936fff  [Refactoring] ResultUtils: standardize method signature
     new 36488e7  [Refactoring] ResultUtils: avoid final variables
     new a08d632  [Refactoring] MailboxMessageResultImplTest: Do not declare unthrown exceptions
     new 710cf88  [Refactoring] MessageResultImpl: Remove never thrown exceptions
     new 195ab61  [Refactoring] MessageResultImpl: Remove redundant cast
     new 7b8fc36  [Refactoring] MessageResultImpl: partContent can never be null
     new 8675520  [Refactoring] MessageResultImpl: solve visibility issues
     new 61f0531  [Refactoring] MessageResultImpl: avoid final variable
     new 9230fb5  [Refactoring] MessageResultImpl: HeadersImpl can be static
     new fd8ef1c  [Refactoring] MessageResultImpl: Reorder fields
     new 7463a26  [Refactoring] MessageResultImpl: getPartContent computeIfAbsent
     new 9ded6a8  [Refactoring] MessageResultImpl: optimize import
     new 2de4080  [Refactoring] MimeDescriptorImpl: method declaration sanitizing
     new b653317  [Refactoring] MimeDescriptorImpl: avoid line break between fields
     new 8041b57  [Refactoring] MimeDescriptorImpl: Use StandardCharsets
     new ad5f84d  [Refactoring] MimeDescriptorImpl: Move isComposite to MessageResultImpl
     new 732e722  [Refactoring] MimeDescriptorImpl: Constructor should be private
     new 5362805  [Refactoring] MimeDescriptorImpl: Remove not thrown exception
     new 5aa1ebd  [Refactoring] ResultHeader: use StandardCharsets
     new 6fc4fca  [Refactoring] ResultHeader: avoid line breaks between fields
     new 3ab0bb8  [Refactoring] ResultHeader: remove not thrown exception
     new 49565e7  [Refactoring] ResultHeader: remove not thrown exception
     new 7708ca4  [Refactoring] ResultHeader: PartContentBuilder reindex switch
     new 3723093  [Refactoring] PartContentBuilder: remove unreachable switch case
     new 57da2c3  [Refactoring] MessageResultImpl: headers are never null
     new 5861d4d  JAMES-2632 MailboxMetaData could "cheaply" incorporate mailbox ACL
     new c8d7d24  JAMES-2632 Allow bulk mailbox counter retrieval
     new 3281e54  JAMES-2632 Add mailboxId in mailbox counter
     new c1b5058  JAMES-2632 Add MailboxCounters to mailbox metadata
     new f6670e9  JAMES-2632 Optimize get all mailboxes
     new c1b2357  JAMES-2632 concatMap for mailbox search
     new f0d13b5  JAMES-2632 Allow bulk mailbox counter retrieval
     new 6cce9bc  [Refactoring] Remove some unused methods in JPAMailboxMapper
     new efc3749  JAMES-2632 Fix typo in MailboxFactory

The 44 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/org/apache/james/core/Username.java  |   5 +
 .../listeners/SetCustomFlagOnBigMessages.java      |   2 +-
 .../listeners/SetCustomFlagOnBigMessagesTest.java  |   3 +-
 .../org/apache/james/mailbox/MailboxManager.java   |   9 +-
 .../org/apache/james/mailbox/MailboxSession.java   |  10 +-
 .../james/mailbox/acl/GroupMembershipResolver.java |   4 +-
 .../james/mailbox/acl/MailboxACLResolver.java      |   3 +-
 .../mailbox/acl/SimpleGroupMembershipResolver.java |  10 +-
 .../james/mailbox/acl/UnionMailboxACLResolver.java |   9 +-
 .../exception/UserDoesNotExistException.java       |  10 +-
 .../org/apache/james/mailbox/model/Mailbox.java    |   7 +-
 .../org/apache/james/mailbox/model/MailboxACL.java |  16 +-
 .../james/mailbox/model/MailboxCounters.java       |  22 +-
 .../james/mailbox/model/MailboxMetaData.java       |  20 +-
 .../apache/james/mailbox/model/MailboxPath.java    |  13 +-
 .../james/mailbox/model/search/MailboxQuery.java   |  20 +-
 .../mailbox/AbstractSubscriptionManagerTest.java   |   3 +-
 .../apache/james/mailbox/MailboxListenerTest.java  |   8 +-
 .../james/mailbox/MailboxManagerStressTest.java    |   3 +-
 .../apache/james/mailbox/MailboxManagerTest.java   |  47 +-
 .../apache/james/mailbox/MailboxSessionUtil.java   |   5 +-
 .../apache/james/mailbox/MessageMoveEventTest.java |  20 +-
 .../james/mailbox/acl/PositiveUserACLDiffTest.java |   6 +-
 .../acl/SimpleGroupMembershipResolverTest.java     |  14 +-
 .../mailbox/acl/UnionMailboxACLResolverTest.java   | 373 +++++++--------
 .../james/mailbox/events/EventBusTestFixture.java  |   2 +-
 .../mailbox/events/EventDeadLettersContract.java   |   2 +-
 .../apache/james/mailbox/events/GroupContract.java |   8 +-
 .../apache/james/mailbox/events/KeyContract.java   |   3 +-
 .../james/mailbox/fixture/MailboxFixture.java      |   7 +-
 .../mailbox/manager/ManagerTestProvisionner.java   |   5 +-
 .../apache/james/mailbox/mock/DataProvisioner.java |   6 +-
 .../apache/james/mailbox/model/MailboxACLTest.java |  15 +-
 .../james/mailbox/model/MailboxAssertTests.java    |  27 +-
 .../james/mailbox/model/MailboxPathTest.java       |  88 ++--
 .../mailbox/model/search/MailboxQueryTest.java     |  19 +-
 .../james/mailbox/backup/DefaultMailboxBackup.java |   8 +-
 .../mailbox/backup/ZipMailArchiveRestorer.java     |   4 +-
 .../mailbox/backup/MailboxMessageFixture.java      |   8 +-
 .../cassandra/mail/CassandraAttachmentMapper.java  |   2 +-
 .../mail/CassandraAttachmentOwnerDAO.java          |   6 +-
 .../cassandra/mail/CassandraMailboxCounterDAO.java |   6 +-
 .../cassandra/mail/CassandraMailboxDAO.java        |   3 +-
 .../cassandra/mail/CassandraMailboxMapper.java     |   5 +-
 .../cassandra/mail/CassandraMailboxPathDAO.java    |   3 +-
 .../mail/CassandraMailboxPathDAOImpl.java          |   5 +-
 .../cassandra/mail/CassandraMailboxPathV2DAO.java  |   9 +-
 .../cassandra/mail/CassandraMessageMapper.java     |  43 +-
 .../mail/CassandraUserMailboxRightsDAO.java        |   9 +-
 .../mail/task/MailboxMergingTaskRunner.java        |   3 +-
 .../cassandra/mail/utils/MailboxBaseTupleUtil.java |   5 +-
 .../mail/CassandraAttachmentOwnerDAOTest.java      |   9 +-
 .../mail/CassandraIndexTableHandlerTest.java       |   3 +-
 .../mail/CassandraMailboxCounterDAOTest.java       |  14 +-
 .../cassandra/mail/CassandraMailboxDAOTest.java    |   8 +-
 .../CassandraMailboxMapperConcurrencyTest.java     |   3 +-
 .../cassandra/mail/CassandraMailboxMapperTest.java |   3 +-
 .../mail/CassandraMailboxPathDAOTest.java          |   5 +-
 .../cassandra/mail/CassandraMapperProvider.java    |   3 +-
 .../mail/CassandraMessageIdMapperTest.java         |   3 +-
 .../mail/CassandraModSeqProviderTest.java          |   3 +-
 .../cassandra/mail/CassandraUidProviderTest.java   |   3 +-
 .../mail/CassandraUserMailboxRightsDAOTest.java    |   3 +-
 .../mail/migration/MailboxPathV2MigrationTest.java |   3 +-
 ...asticSearchListeningMessageSearchIndexTest.java |   3 +-
 .../scala/org/apache/james/event/json/DTOs.scala   |   3 +-
 .../james/event/json/AddedSerializationTest.java   |   2 +-
 .../event/json/ExpungedSerializationTest.java      |   2 +-
 .../event/json/FlagsUpdatedSerializationTest.java  |   2 +-
 .../MailboxACLUpdatedEventSerializationTest.java   |   4 +-
 .../event/json/MailboxAddedSerializationTest.java  |   2 +-
 .../json/MailboxDeletionSerializationTest.java     |   2 +-
 .../json/MailboxRenamedSerializationTest.java      |   4 +-
 .../james/event/json/dtos/MailboxPathTest.java     |  12 +-
 .../james/mailbox/jpa/mail/JPAMailboxMapper.java   |  63 +--
 .../james/mailbox/jpa/mail/JPAMessageMapper.java   |  26 +-
 .../james/mailbox/jpa/mail/model/JPAMailbox.java   |   7 +-
 .../model/openjpa/AbstractJPAMailboxMessage.java   |   4 +-
 .../james/mailbox/jpa/mail/JPAMapperProvider.java  |   3 +-
 .../jpa/mail/TransactionalMailboxMapper.java       |   3 +-
 .../jpa/mail/TransactionalMessageMapper.java       |   8 +
 .../LuceneMailboxMessageSearchIndexTest.java       |  10 +-
 .../apache/james/mailbox/maildir/MaildirStore.java |  17 +-
 .../mailbox/maildir/mail/MaildirMailboxMapper.java |   7 +-
 .../mailbox/maildir/mail/MaildirMessageMapper.java |   9 +
 .../maildir/user/MaildirSubscriptionMapper.java    |   9 +-
 .../inmemory/mail/InMemoryAttachmentMapper.java    |   2 +-
 .../inmemory/mail/InMemoryMailboxMapper.java       |   5 +-
 .../inmemory/mail/InMemoryMessageMapper.java       |  35 +-
 .../quota/InMemoryCurrentQuotaManager.java         |   3 +-
 .../inmemory/mail/InMemoryMapperProvider.java      |   6 +-
 .../james/vault/DeletedMessageVaultHook.java       |   6 +-
 .../james/vault/DeletedMessageVaultHookTest.java   |  20 +-
 .../ElasticSearchQuotaSearcherTest.java            |   2 +-
 .../search/scanning/ScanningQuotaSearcher.java     |   3 +-
 .../james/quota/search/QuotaSearcherContract.java  |  72 +--
 .../mailbox/spamassassin/SpamAssassinListener.java |   6 +-
 .../spamassassin/SpamAssassinListenerTest.java     |   3 +-
 .../mailbox/spring/AnonymousAuthenticator.java     |   3 +-
 .../james/mailbox/spring/NoAuthorizator.java       |   3 +-
 .../apache/james/mailbox/store/Authenticator.java  |   3 +-
 .../apache/james/mailbox/store/Authorizator.java   |   3 +-
 .../james/mailbox/store/FakeAuthenticator.java     |  10 +-
 .../james/mailbox/store/FakeAuthorizator.java      |  12 +-
 .../james/mailbox/store/MessageResultImpl.java     | 143 +++---
 .../james/mailbox/store/MimeDescriptorImpl.java    |  63 +--
 .../apache/james/mailbox/store/ResultHeader.java   |  11 +-
 .../apache/james/mailbox/store/ResultUtils.java    |  95 ++--
 .../james/mailbox/store/SessionProvider.java       |  11 +-
 .../mailbox/store/StoreAttachmentManager.java      |   6 +-
 .../james/mailbox/store/StoreMailboxManager.java   |  49 +-
 .../james/mailbox/store/StoreMessageManager.java   |  11 +-
 .../james/mailbox/store/StoreRightManager.java     |  16 +-
 .../mailbox/store/SystemMailboxesProviderImpl.java |   6 +-
 .../store/event/MailboxAnnotationListener.java     |   2 +-
 .../mailbox/store/mail/AbstractMessageMapper.java  |   1 +
 .../james/mailbox/store/mail/AttachmentMapper.java |   2 +-
 .../james/mailbox/store/mail/MailboxMapper.java    |   3 +-
 .../james/mailbox/store/mail/MessageMapper.java    |   3 +
 .../james/mailbox/store/mail/model/Username.java   |  74 ---
 .../store/quota/DefaultUserQuotaRootResolver.java  |  15 +-
 .../store/search/ListeningMessageSearchIndex.java  |   2 +-
 .../store/streaming/PartContentBuilder.java        |  25 +-
 .../AbstractMailboxManagerAttachmentTest.java      |   3 +-
 .../store/AbstractMessageIdManagerStorageTest.java |   3 +-
 .../store/MailboxMessageResultImplTest.java        |  26 +-
 .../james/mailbox/store/StoreBlobManagerTest.java  |   3 +-
 .../store/StoreMailboxManagerAnnotationTest.java   |   3 +-
 .../mailbox/store/StoreMailboxManagerTest.java     |  25 +-
 .../StoreMailboxMessageResultIteratorTest.java     |  13 +-
 .../james/mailbox/store/StoreRightManagerTest.java |  39 +-
 .../store/event/MailboxAnnotationListenerTest.java |  10 +-
 .../james/mailbox/store/mail/MessageUtilsTest.java |   3 +-
 .../store/mail/model/AttachmentMapperTest.java     |   5 +-
 .../store/mail/model/ListMailboxAssert.java        |   7 +-
 .../store/mail/model/ListMailboxAssertTest.java    |   3 +-
 .../store/mail/model/ListMessageAssertTest.java    |   3 +-
 .../store/mail/model/MailboxMapperACLTest.java     |  85 ++--
 .../store/mail/model/MailboxMapperTest.java        |  22 +-
 .../store/mail/model/MessageIdMapperTest.java      |  10 +-
 .../store/mail/model/MessageMapperTest.java        |  26 +-
 .../mailbox/store/mail/model/MessageMoveTest.java  |   6 +-
 .../model/MessageWithAttachmentMapperTest.java     |   3 +-
 .../mailbox/store/mail/model/UsernameTest.java     |  60 ---
 .../quota/DefaultUserQuotaRootResolverTest.java    |  12 +-
 .../mailbox/store/quota/QuotaCheckerTest.java      |   3 +-
 .../search/AbstractMessageSearchIndexTest.java     |   5 +-
 .../mailbox/tools/copier/MailboxCopierImpl.java    |   3 +-
 .../mailbox/tools/copier/MailboxCopierTest.java    |   3 +-
 .../mailbox/tools/indexer/ReIndexerImpl.java       |   2 +-
 .../mailbox/tools/indexer/ReIndexerPerformer.java  |  11 +-
 .../tools/indexer/CassandraReIndexerImplTest.java  |   3 +-
 .../tools/indexer/MessageIdReIndexerImplTest.java  |   3 +-
 .../mailbox/tools/indexer/ReIndexerImplTest.java   |   4 +-
 .../mailbox/store/mail/ZooUidProviderTest.java     |   6 +-
 .../james/transport/mailets/AbstractSign.java      |   7 +-
 .../james/transport/mailets/ICALToHeader.java      |   2 +-
 .../transport/mailets/ICALToJsonAttribute.java     |   2 +-
 .../org/apache/james/transport/mailets/Null.java   |   5 +
 .../apache/james/mpt/ant/MailProtocolTestTask.java |   3 +-
 .../java/org/apache/james/mpt/api/HostSystem.java  |   3 +-
 .../org/apache/james/mpt/api/ImapHostSystem.java   |   3 +-
 .../java/org/apache/james/mpt/api/UserAdder.java   |   4 +-
 .../apache/james/mpt/host/ExternalHostSystem.java  |   5 +-
 .../script/GenericSimpleScriptedTestProtocol.java  |  21 +-
 .../james/mpt/script/ImapScriptedTestProtocol.java |  13 +-
 .../apache/james/mpt/user/ScriptedUserAdder.java   |  11 +-
 .../apache/james/mpt/TestExternalHostSystem.java   |   3 +-
 .../apache/james/mpt/TestScriptedUserAdder.java    |   3 +-
 .../apache/james/mpt/host/JamesImapHostSystem.java |   9 +-
 .../james/mpt/imapmailbox/GrantRightsOnHost.java   |   3 +-
 .../james/mpt/imapmailbox/ImapTestConstants.java   |   4 +-
 .../james/mpt/imapmailbox/suite/ACLCommands.java   |   3 +-
 .../mpt/imapmailbox/suite/ACLIntegration.java      |   7 +-
 .../imapmailbox/suite/ACLScriptedTestProtocol.java |  18 +-
 .../mpt/imapmailbox/suite/AuthenticatePlain.java   |   5 +-
 .../mpt/imapmailbox/suite/AuthenticatedState.java  |  10 +-
 .../imapmailbox/suite/ListingWithSharingTest.java  |   3 +-
 .../imapmailbox/suite/base/BasicImapCommands.java  |   2 +-
 .../imapmailbox/cyrus/host/CyrusHostSystem.java    |   7 +-
 .../mpt/imapmailbox/cyrus/host/CyrusUserAdder.java |   5 +-
 .../cyrus/host/GrantRightsOnCyrusHost.java         |   5 +-
 .../DockerDeploymentValidationGuiceJPATest.java    |   3 +-
 .../DockerDeploymentValidationSpringJPATest.java   |   3 +-
 .../james/host/docker/CliProvisioningAPI.java      |   5 +-
 .../host/external/ExternalJamesImapHostSystem.java |   3 +-
 .../host/external/NoopDomainsAndUserAdder.java     |   3 +-
 .../james/mpt/host/JamesManageSieveHostSystem.java |   4 +-
 .../org/apache/james/mpt/smtp/SmtpTestRule.java    |   6 +-
 .../java/org/apache/james/mpt/maven/AddUser.java   |   7 +-
 protocols/api/pom.xml                              |   4 +
 .../james/protocols/api/ProtocolSession.java       |   7 +-
 .../james/protocols/api/ProtocolSessionImpl.java   |  11 +-
 .../apache/james/imap/api/ImapSessionUtils.java    |   5 +-
 .../org/apache/james/imap/main/PathConverter.java  |   5 +-
 .../imap/processor/AbstractAuthProcessor.java      |   7 +-
 .../imap/processor/AbstractMailboxProcessor.java   |   2 +-
 .../james/imap/api/ImapSessionUtilsTest.java       |   3 +-
 .../decode/parser/CreateCommandParserTest.java     |   3 +-
 .../apache/james/imap/main/PathConverterTest.java  |   3 +-
 .../james/imap/processor/CopyProcessorTest.java    |   2 +-
 .../imap/processor/DeleteACLProcessorTest.java     |   7 +-
 .../james/imap/processor/GetACLProcessorTest.java  |   3 +-
 .../imap/processor/GetAnnotationProcessorTest.java |   3 +-
 .../imap/processor/GetQuotaProcessorTest.java      |   6 +-
 .../imap/processor/GetQuotaRootProcessorTest.java  |   6 +-
 .../james/imap/processor/LSubProcessorTest.java    |   3 +-
 .../imap/processor/ListRightsProcessorTest.java    |   9 +-
 .../james/imap/processor/MoveProcessorTest.java    |   2 +-
 .../james/imap/processor/SearchProcessorTest.java  |  10 +-
 .../james/imap/processor/SetACLProcessorTest.java  |  12 +-
 .../imap/processor/SetAnnotationProcessorTest.java |   3 +-
 .../imap/processor/SetQuotaProcessorTest.java      |   3 +-
 .../processor/base/MailboxEventAnalyserTest.java   |   8 +-
 .../processor/base/SelectedMailboxImplTest.java    |   5 +-
 .../managesieve/api/AuthenticationProcessor.java   |   4 +-
 .../org/apache/james/managesieve/api/Session.java  |   5 +-
 .../james/managesieve/core/CoreProcessor.java      |  18 +-
 .../core/PlainAuthenticationProcessor.java         |   7 +-
 .../james/managesieve/util/SettableSession.java    |   7 +-
 .../james/protocols/netty/ProtocolMDCContext.java  |   2 +-
 .../pop3/core/AbstractApopCmdHandler.java          |  10 +-
 .../pop3/core/AbstractPassCmdHandler.java          |  16 +-
 .../james/protocols/pop3/core/UserCmdHandler.java  |   3 +-
 .../protocols/pop3/AbstractPOP3ServerTest.java     |   5 +-
 .../protocols/pop3/utils/TestPassCmdHandler.java   |   5 +-
 ...ractSenderAuthIdentifyVerificationRcptHook.java |  12 +-
 .../smtp/core/ReceivedDataLineFilter.java          |   2 +-
 .../protocols/smtp/core/esmtp/AuthCmdHandler.java  |  27 +-
 .../apache/james/protocols/smtp/hook/AuthHook.java |   3 +-
 .../fastfail/ResolvableEhloHeloHandlerTest.java    |   9 +-
 .../protocols/smtp/utils/BaseFakeSMTPSession.java  |   6 +-
 server/app/src/main/resources/mailetcontainer.xml  |  20 +-
 .../james/cli/ReindexCommandIntegrationTest.java   |   3 +-
 .../test/java/org/apache/james/ESReporterTest.java |   3 +-
 .../org/apache/james/FixingGhostMailboxTest.java   |   5 +-
 .../apache/james/CassandraLdapJamesServerTest.java |   4 +-
 .../CassandraRabbitMQLdapJmapJamesServerTest.java  |   2 +-
 .../java/org/apache/james/utils/DataProbeImpl.java |  12 +-
 .../org/apache/james/modules/ACLProbeImpl.java     |   5 +-
 .../org/apache/james/modules/MailboxProbeImpl.java |  26 +-
 .../org/apache/james/modules/QuotaProbesImpl.java  |   3 +-
 .../apache/james/jmap/draft/JmapGuiceProbe.java    |   3 +-
 .../apache/james/jmap/draft/MessageIdProbe.java    |   7 +-
 .../apache/james/modules/TestJMAPServerModule.java |  52 +-
 .../mailbox/store/UserRepositoryAuthenticator.java |   3 +-
 .../mailbox/store/UserRepositoryAuthorizator.java  |   3 +-
 .../store/UserRepositoryAuthenticatorTest.java     |   5 +-
 .../store/UserRepositoryAuthorizatorTest.java      |   5 +-
 .../adapter/mailbox/MailboxManagerManagement.java  |  20 +-
 .../james/adapter/mailbox/QuotaManagement.java     |   3 +-
 .../james/adapter/mailbox/ReIndexerManagement.java |   3 +-
 .../adapter/mailbox/MailboxManagementTest.java     |  43 +-
 .../adapter/mailbox/ReIndexerManagementTest.java   |   3 +-
 .../container/spring/tool/James23Importer.java     | 184 -------
 .../spring/tool/James23ImporterManagement.java     |  64 ---
 .../tool/James23ImporterManagementMBean.java       |  53 --
 .../org/apache/james/user/api/UsersRepository.java |  25 +-
 .../user/api/UsersRepositoryManagementMBean.java   |  10 +-
 .../java/org/apache/james/user/api/model/User.java |   8 +-
 .../user/cassandra/CassandraUsersRepository.java   |  36 +-
 .../sieverepository/file/SieveFileRepository.java  |   2 +-
 .../cassandra/access/CassandraAccessTokenDAO.java  |  11 +-
 .../access/CassandraAccessTokenRepository.java     |   9 +-
 .../jmap/api/access/AccessTokenRepository.java     |   5 +-
 .../apache/james/jmap/api/vacation/AccountId.java  |   6 +
 .../memory/access/MemoryAccessTokenRepository.java |  10 +-
 .../jmap/api/access/AccessTokenRepositoryTest.java |  10 +-
 .../apache/james/user/jpa/JPAUsersRepository.java  |  45 +-
 .../org/apache/james/user/jpa/model/JPAUser.java   |   7 +-
 .../user/ldap/LdapRepositoryConfiguration.java     |   7 +-
 .../apache/james/user/ldap/ReadOnlyLDAPUser.java   |   7 +-
 .../user/ldap/ReadOnlyUsersLDAPRepository.java     |  32 +-
 .../james/user/ldap/DockerLdapSingleton.java       |   4 +-
 .../user/ldap/ReadOnlyUsersLDAPRepositoryTest.java |  12 +-
 .../james/user/lib/AbstractUsersRepository.java    |  31 +-
 .../james/user/lib/UsersRepositoryManagement.java  |  33 +-
 .../james/user/lib/model/DefaultJamesUser.java     |   5 +-
 .../apache/james/user/lib/model/DefaultUser.java   |   9 +-
 .../user/lib/AbstractUsersRepositoryTest.java      |  47 +-
 .../james/user/memory/MemoryUsersRepository.java   |  32 +-
 .../user/memory/MemoryUsersRepositoryTest.java     |  66 ++-
 .../user/memory/UsersRepositoryManagementTest.java |  33 +-
 .../apache/james/smtp/SmtpRandomStoringTest.java   |   3 +-
 .../james/transport/mailets/AliasMappingTest.java  |   7 +-
 .../james/transport/mailets/DomainMappingTest.java |   5 +-
 .../james/transport/mailets/GroupMappingTest.java  |   5 +-
 .../lib/AbstractStateMailetProcessor.java          |   1 +
 .../impl/JamesMailetContextTest.java               |   9 +-
 .../james/transport/mailets/MetricsMailet.java     |   2 +-
 .../james/transport/mailets/RandomStoring.java     |   3 +-
 .../james/transport/mailets/SpamAssassin.java      |   3 +-
 .../mailets/ToSenderDomainRepository.java          |   2 +-
 .../james/transport/mailets/ToSenderFolder.java    |   5 +-
 .../james/transport/mailets/WhiteListManager.java  |   3 +-
 .../transport/mailets/WithStorageDirective.java    |   4 +-
 .../mailets/delivery/MailboxAppender.java          |   7 +-
 .../mailets/delivery/SimpleMailStore.java          |  11 +-
 .../transport/mailets/jsieve/ResourceLocator.java  |   2 +-
 .../mailets/jsieve/delivery/SievePoster.java       |   5 +-
 .../mailets/managesieve/ManageSieveMailet.java     |   3 +-
 .../matchers/AbstractSQLWhitelistMatcher.java      |   3 +-
 .../james/transport/matchers/IsOverQuota.java      |   3 +-
 .../transport/mailets/ResourceLocatorTest.java     |   4 +-
 .../mailets/delivery/LocalDeliveryTest.java        |  13 +-
 .../mailets/delivery/MailboxAppenderTest.java      |   3 +-
 .../mailets/delivery/SieveIntegrationTest.java     |  20 +-
 .../mailets/delivery/SimpleMailStoreTest.java      |  11 +-
 .../mailets/delivery/ToRecipientFolderTest.java    |  18 +-
 .../managesieve/ManageSieveMailetTestCase.java     |   2 +-
 .../james/transport/matchers/IsOverQuotaTest.java  |  13 +-
 .../java/org/apache/james/fetchmail/FetchMail.java |   5 +-
 .../jmap/cassandra/CassandraBulkOperationTest.java |   7 +-
 .../apache/james/jmap/HttpJmapAuthentication.java  |   9 +-
 .../apache/james/jmap/JMAPAuthenticationTest.java  |  18 +-
 .../org/apache/james/jmap/MessageAppender.java     |   3 +-
 .../org/apache/james/jmap/ProvisioningTest.java    |   7 +-
 .../org/apache/james/jmap/TestingConstants.java    |   8 +-
 .../apache/james/jmap/VacationIntegrationTest.java |  47 +-
 .../integration/DeletedMessagesVaultTest.java      |   7 +-
 .../jmap/draft/methods/integration/FilterTest.java | 168 +++----
 .../integration/ForwardIntegrationTest.java        |  46 +-
 .../integration/GetMailboxesMethodTest.java        | 152 +++---
 .../integration/GetMessageListMethodTest.java      | 531 ++++++++++-----------
 .../integration/GetVacationResponseTest.java       |  20 +-
 ...LinshareBlobExportMechanismIntegrationTest.java |   5 +-
 .../methods/integration/QuotaMailingTest.java      |  23 +-
 .../methods/integration/SendMDNMethodTest.java     |  32 +-
 .../integration/SetMailboxesMethodTest.java        | 175 +++----
 .../SetMessagesMethodReRoutingTest.java            |   5 +-
 .../methods/integration/SetMessagesMethodTest.java | 409 ++++++++--------
 .../SetMessagesOutboxFlagUpdateTest.java           |  13 +-
 .../integration/SetVacationResponseTest.java       |   3 +-
 .../methods/integration/SpamAssassinContract.java  |   3 +-
 .../integration/cucumber/DownloadStepdefs.java     |  15 +-
 .../cucumber/GetMessagesMethodStepdefs.java        |  11 +-
 .../cucumber/SetMailboxesMethodStepdefs.java       |   3 +-
 .../cucumber/SetMessagesMethodStepdefs.java        |   3 +-
 .../methods/integration/cucumber/UserStepdefs.java |   3 +-
 .../ReindexingWithEventDeadLettersTest.java        |   8 +-
 .../draft/AccessTokenAuthenticationStrategy.java   |   3 +-
 .../james/jmap/draft/AuthenticationServlet.java    |   7 +-
 .../draft/DefaultMailboxesProvisioningFilter.java  |   4 +-
 .../jmap/draft/JWTAuthenticationStrategy.java      |  25 +-
 ...ParameterAccessTokenAuthenticationStrategy.java |   4 +-
 .../james/jmap/draft/UserProvisioningFilter.java   |  13 +-
 .../james/jmap/draft/api/AccessTokenManager.java   |   5 +-
 .../jmap/draft/crypto/AccessTokenManagerImpl.java  |   7 +-
 .../james/jmap/draft/json/ObjectMapperFactory.java |  29 +-
 .../jmap/draft/methods/GetMailboxesMethod.java     |   5 +-
 .../draft/methods/GetVacationResponseMethod.java   |   2 +-
 .../methods/SetMailboxesCreationProcessor.java     |   4 +-
 .../draft/methods/SetMailboxesUpdateProcessor.java |   5 +-
 .../draft/methods/SetVacationResponseMethod.java   |   2 +-
 .../james/jmap/draft/model/MailboxFactory.java     |  82 +++-
 .../jmap/draft/model/mailbox/MailboxNamespace.java |  13 +-
 .../james/jmap/draft/model/mailbox/Rights.java     |  44 +-
 .../jmap/draft/send/PostDequeueDecorator.java      |   3 +-
 .../jmap/event/PropagateLookupRightListener.java   |   2 +-
 .../mailet/ExtractMDNOriginalJMAPMessageId.java    |  10 +-
 .../james/jmap/mailet/filter/ActionApplier.java    |   2 +-
 .../james/jmap/mailet/filter/JMAPFiltering.java    |   4 +-
 .../AccessTokenAuthenticationStrategyTest.java     |   8 +-
 .../james/jmap/draft/AuthenticationFilterTest.java |   8 +-
 .../DefaultMailboxesProvisioningFilterTest.java    |   3 +-
 ...faultMailboxesProvisioningFilterThreadTest.java |   3 +-
 .../james/jmap/draft/DownloadServletTest.java      |   3 +-
 .../jmap/draft/JWTAuthenticationStrategyTest.java  |  36 +-
 ...meterAccessTokenAuthenticationStrategyTest.java |   3 +-
 .../jmap/draft/UserProvisioningFilterTest.java     |  23 +-
 .../draft/UserProvisioningFilterThreadTest.java    |   3 +-
 .../draft/crypto/AccessTokenManagerImplTest.java   |  25 +-
 .../jmap/draft/json/ObjectMapperFactoryTest.java   |   9 +-
 .../jmap/draft/methods/AttachmentCheckerTest.java  |   3 +-
 .../jmap/draft/methods/GetMailboxesMethodTest.java |   7 +-
 .../jmap/draft/methods/GetMessagesMethodTest.java  |   2 +-
 .../methods/SetMessagesCreationProcessorTest.java  |   4 +-
 .../methods/SetVacationResponseMethodTest.java     |   2 +-
 .../apache/james/jmap/draft/model/JmapMDNTest.java |   3 +-
 .../james/jmap/draft/model/MailboxFactoryTest.java |  63 ++-
 .../draft/model/mailbox/MailboxNamespaceTest.java  |   8 +-
 .../james/jmap/draft/model/mailbox/RightsTest.java |  21 +-
 .../jmap/draft/send/PostDequeueDecoratorTest.java  |   6 +-
 .../james/jmap/draft/utils/MailboxUtilsTest.java   |   5 +-
 .../event/PropagateLookupRightListenerTest.java    |   7 +-
 .../ExtractMDNOriginalJMAPMessageIdTest.java       |  10 +-
 .../jmap/mailet/filter/JMAPFilteringExtension.java |   4 +-
 .../jmap/mailet/filter/JMAPFilteringFixture.java   |   3 +-
 .../jmap/mailet/filter/JMAPFilteringTest.java      |  16 +-
 .../hook/MailboxDeliverToRecipientHandler.java     |   3 +-
 .../james/pop3server/core/PassCmdHandler.java      |   7 +-
 .../apache/james/pop3server/POP3ServerTest.java    |  45 +-
 .../AddDefaultAttributesMessageHook.java           |   4 +-
 .../SenderAuthIdentifyVerificationRcptHook.java    |   7 +-
 .../james/smtpserver/UsersRepositoryAuthHook.java  |   5 +-
 .../smtpserver/fastfail/ValidRcptHandler.java      |   5 +-
 .../apache/james/smtpserver/SMTPServerTest.java    |   9 +-
 .../james/smtpserver/ValidRcptHandlerTest.java     |   5 +-
 .../EventDeadLettersIntegrationTest.java           |   7 +-
 ...dminServerTaskSerializationIntegrationTest.java |  10 +-
 .../apache/james/webadmin/routes/AliasRoutes.java  |   2 +-
 .../james/webadmin/routes/ForwardRoutes.java       |   2 +-
 .../apache/james/webadmin/routes/GroupsRoutes.java |   2 +-
 .../james/webadmin/routes/SieveQuotaRoutes.java    |   5 +-
 .../james/webadmin/routes/SieveScriptRoutes.java   |   5 +-
 .../apache/james/webadmin/service/UserService.java |  10 +-
 .../james/webadmin/routes/AliasRoutesTest.java     |   7 +-
 .../james/webadmin/routes/ForwardRoutesTest.java   |   9 +-
 .../james/webadmin/routes/GroupsRoutesTest.java    |   2 +-
 .../webadmin/routes/SieveQuotaRoutesTest.java      |   2 +-
 .../webadmin/routes/SieveScriptRoutesTest.java     |   2 +-
 .../james/webadmin/routes/UsersRoutesTest.java     |   5 +-
 .../vault/routes/DeletedMessagesVaultRoutes.java   |   2 +-
 .../webadmin/vault/routes/RestoreService.java      |   4 +-
 .../routes/DeletedMessagesVaultRoutesTest.java     |  12 +-
 .../james/webadmin/routes/UserMailboxesRoutes.java |  16 +-
 .../james/webadmin/routes/UserQuotaRoutes.java     |   6 +-
 .../webadmin/service/UserMailboxesService.java     |  25 +-
 .../routes/EventDeadLettersRoutesTest.java         |   6 +-
 .../webadmin/routes/MalformedUrlRoutesTest.java    |   5 +-
 .../webadmin/routes/ReindexingRoutesTest.java      |  15 +-
 .../webadmin/routes/UserMailboxesRoutesTest.java   |   5 +-
 .../james/webadmin/routes/UserQuotaRoutesTest.java |   8 +-
 .../org/apache/james/utils/IMAPMessageReader.java  |   5 +
 424 files changed, 3423 insertions(+), 3183 deletions(-)
 delete mode 100644 mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Username.java
 delete mode 100644 mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java
 delete mode 100644 server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
 delete mode 100644 server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
 delete mode 100644 server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagementMBean.java


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 08/44: JAMES-2972 log at debug level when matcher gets auto-configured to match all mails

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit e52a8e59e300b60f07ebcd50531a6cc8dea31d96
Author: Joerg Thomas <jo...@consol.de>
AuthorDate: Thu Nov 14 12:33:40 2019 +0100

    JAMES-2972 log at debug level when matcher gets auto-configured to match all mails
---
 .../apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index 86ebde8..b6cf1e0 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -342,6 +342,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
                 } else {
                     // default matcher is All
                     matcher = matcherLoader.getMatcher(createMatcherConfig("All"));
+                    LOGGER.debug("Mailet {} has no 'match' attribute. Defaulting to match all mails.", mailetClassName);
                 }
 
                 // The matcher itself should log that it's been inited.


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 15/44: [Refactoring] MessageResultImpl: Remove redundant cast

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 195ab61fadbb16bc3418388e4fb233f5ade4b991
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:09:45 2019 +0700

    [Refactoring] MessageResultImpl: Remove redundant cast
---
 .../src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 53f2201..775ae7a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -243,7 +243,7 @@ public class MessageResultImpl implements MessageResult {
     }
 
     private PartContent getPartContent(MimePath path) {
-        PartContent result = (PartContent) partsByPath.get(path);
+        PartContent result = partsByPath.get(path);
         if (result == null) {
             result = new PartContent();
             partsByPath.put(path, result);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 11/44: [Refactoring] ResultUtils: standardize method signature

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 5936fffcb6a1059c4f59c2668446c527c126e665
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 10:55:58 2019 +0700

    [Refactoring] ResultUtils: standardize method signature
---
 .../apache/james/mailbox/store/ResultUtils.java    | 31 ++++++++--------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
index 5c89c36..b2e6bc7 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
@@ -126,10 +126,8 @@ public class ResultUtils {
 
     }
 
-    private static void addPartContent(FetchGroup fetchGroup,
-                                       MailboxMessage message, MessageResultImpl messageResult)
-            throws MailboxException, IOException,
-            MimeException {
+    private static void addPartContent(FetchGroup fetchGroup, MailboxMessage message, MessageResultImpl messageResult)
+            throws MailboxException, IOException, MimeException {
         Collection<FetchGroup.PartContentDescriptor> partContent = fetchGroup.getPartContentDescriptors();
         if (partContent != null) {
             for (FetchGroup.PartContentDescriptor descriptor: partContent) {
@@ -138,10 +136,8 @@ public class ResultUtils {
         }
     }
 
-    private static void addPartContent(
-            FetchGroup.PartContentDescriptor descriptor, MailboxMessage message,
-            MessageResultImpl messageResult) throws 
-            MailboxException, IOException, MimeException {
+    private static void addPartContent(FetchGroup.PartContentDescriptor descriptor, MailboxMessage message, MessageResultImpl messageResult)
+            throws MailboxException, IOException, MimeException {
         final MimePath mimePath = descriptor.path();
         final int content = descriptor.content();
         if ((content & MessageResult.FetchGroup.FULL_CONTENT) > 0) {
@@ -190,8 +186,7 @@ public class ResultUtils {
         return result;
     }
 
-    private static void addHeaders(MailboxMessage message,
-            MessageResultImpl messageResult, MimePath mimePath)
+    private static void addHeaders(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
             throws IOException, MimeException {
         final int[] path = path(mimePath);
         if (path != null) {
@@ -202,8 +197,7 @@ public class ResultUtils {
         }
     }
 
-    private static void addMimeHeaders(MailboxMessage message,
-            MessageResultImpl messageResult, MimePath mimePath)
+    private static void addMimeHeaders(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
             throws IOException, MimeException {
         final int[] path = path(mimePath);
         if (path != null) {
@@ -213,8 +207,8 @@ public class ResultUtils {
         }
     }
 
-    private static void addBodyContent(MailboxMessage message,
-            MessageResultImpl messageResult, MimePath mimePath) throws IOException, MimeException {
+    private static void addBodyContent(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
+            throws IOException, MimeException {
         final int[] path = path(mimePath);
         if (path != null) {
             final PartContentBuilder builder = build(path, message);
@@ -223,8 +217,7 @@ public class ResultUtils {
         }
     }
 
-    private static void addMimeBodyContent(MailboxMessage message,
-            MessageResultImpl messageResult, MimePath mimePath)
+    private static void addMimeBodyContent(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
             throws IOException, MimeException {
         final int[] path = path(mimePath);
         final PartContentBuilder builder = build(path, message);
@@ -232,10 +225,8 @@ public class ResultUtils {
         messageResult.setMimeBodyContent(mimePath, content);
     }
 
-    private static void addFullContent(MailboxMessage message,
-            MessageResultImpl messageResult, MimePath mimePath)
-            throws MailboxException, IOException,
-            MimeException {
+    private static void addFullContent(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
+            throws MailboxException, IOException, MimeException {
         final int[] path = path(mimePath);
         if (path != null) {
             final PartContentBuilder builder = build(path, message);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 12/44: [Refactoring] ResultUtils: avoid final variables

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 36488e7b5748c0b82371172f9a20bf9e9c17e59d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 10:59:42 2019 +0700

    [Refactoring] ResultUtils: avoid final variables
---
 .../apache/james/mailbox/store/ResultUtils.java    | 51 ++++++++++------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
index b2e6bc7..0f1395a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
@@ -45,8 +45,8 @@ import org.apache.james.mime4j.util.ContentUtil;
 public class ResultUtils {
 
     public static List<MessageResult.Header> createHeaders(MailboxMessage document) throws IOException {
-        final List<MessageResult.Header> results = new ArrayList<>();
-        final MimeStreamParser parser = new MimeStreamParser(MimeConfig.PERMISSIVE);
+        List<MessageResult.Header> results = new ArrayList<>();
+        MimeStreamParser parser = new MimeStreamParser(MimeConfig.PERMISSIVE);
         parser.setContentHandler(new AbstractContentHandler() {
             @Override
             public void endHeader() {
@@ -76,7 +76,7 @@ public class ResultUtils {
                     fieldValue = fieldValue.substring(1);
                 }
                 
-                final ResultHeader resultHeader = new ResultHeader(field.getName(), fieldValue);
+                ResultHeader resultHeader = new ResultHeader(field.getName(), fieldValue);
                 results.add(resultHeader);
             }
         });
@@ -138,8 +138,8 @@ public class ResultUtils {
 
     private static void addPartContent(FetchGroup.PartContentDescriptor descriptor, MailboxMessage message, MessageResultImpl messageResult)
             throws MailboxException, IOException, MimeException {
-        final MimePath mimePath = descriptor.path();
-        final int content = descriptor.content();
+        MimePath mimePath = descriptor.path();
+        int content = descriptor.content();
         if ((content & MessageResult.FetchGroup.FULL_CONTENT) > 0) {
             addFullContent(message, messageResult, mimePath);
         }
@@ -159,7 +159,7 @@ public class ResultUtils {
 
     private static PartContentBuilder build(int[] path, MailboxMessage message)
             throws IOException, MimeException {
-        final InputStream stream = message.getFullContent();
+        InputStream stream = message.getFullContent();
         PartContentBuilder result = new PartContentBuilder();
         result.parse(stream);
         try {
@@ -173,64 +173,59 @@ public class ResultUtils {
         }
         return result;
     }
-   
-
   
     private static int[] path(MimePath mimePath) {
-        final int[] result;
         if (mimePath == null) {
-            result = null;
+            return null;
         } else {
-            result = mimePath.getPositions();
+            return mimePath.getPositions();
         }
-        return result;
     }
 
     private static void addHeaders(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
             throws IOException, MimeException {
-        final int[] path = path(mimePath);
+        int[] path = path(mimePath);
         if (path != null) {
-       
-            final PartContentBuilder builder = build(path, message);
-            final List<MessageResult.Header> headers = builder.getMessageHeaders();
+            PartContentBuilder builder = build(path, message);
+            List<MessageResult.Header> headers = builder.getMessageHeaders();
             messageResult.setHeaders(mimePath, headers.iterator());
         }
     }
 
     private static void addMimeHeaders(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
             throws IOException, MimeException {
-        final int[] path = path(mimePath);
+        int[] path = path(mimePath);
         if (path != null) {
-            final PartContentBuilder builder = build(path, message);
-            final List<MessageResult.Header> headers = builder.getMimeHeaders();
+            PartContentBuilder builder = build(path, message);
+            List<MessageResult.Header> headers = builder.getMimeHeaders();
             messageResult.setMimeHeaders(mimePath, headers.iterator());
         }
     }
 
     private static void addBodyContent(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
             throws IOException, MimeException {
-        final int[] path = path(mimePath);
+        int[] path = path(mimePath);
         if (path != null) {
-            final PartContentBuilder builder = build(path, message);
-            final Content content = builder.getMessageBodyContent();
+            PartContentBuilder builder = build(path, message);
+            Content content = builder.getMessageBodyContent();
             messageResult.setBodyContent(mimePath, content);
         }
     }
 
     private static void addMimeBodyContent(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
             throws IOException, MimeException {
-        final int[] path = path(mimePath);
-        final PartContentBuilder builder = build(path, message);
-        final Content content = builder.getMimeBodyContent();
+        int[] path = path(mimePath);
+        PartContentBuilder builder = build(path, message);
+        Content content = builder.getMimeBodyContent();
         messageResult.setMimeBodyContent(mimePath, content);
     }
 
     private static void addFullContent(MailboxMessage message, MessageResultImpl messageResult, MimePath mimePath)
             throws MailboxException, IOException, MimeException {
-        final int[] path = path(mimePath);
+        int[] path = path(mimePath);
         if (path != null) {
-            final PartContentBuilder builder = build(path, message);
-            final Content content = builder.getFullContent();
+            PartContentBuilder builder = build(path, message);
+            Content content = builder.getFullContent();
             messageResult.setFullContent(mimePath, content);
         }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 28/44: [Refactoring] MimeDescriptorImpl: Remove not thrown exception

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 53628059348fb5cfef41da9bcc86a6e13e83c0f9
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:34:41 2019 +0700

    [Refactoring] MimeDescriptorImpl: Remove not thrown exception
---
 .../main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index 8e600c0..7f4baae 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -301,7 +301,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
     }
 
     @Override
-    public InputStream getInputStream() throws IOException {
+    public InputStream getInputStream() {
         StringBuilder sb = new StringBuilder();
         for (MessageResult.Header header : headers) {
             sb.append(header.getName()).append(": ").append(header.getValue()).append("\r\n");


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 44/44: JAMES-2632 Fix typo in MailboxFactory

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit efc3749e56e1cddf2ad42bff9073a4b18cee6a32
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 15:06:16 2019 +0700

    JAMES-2632 Fix typo in MailboxFactory
---
 .../src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java
index 796cf59..3d520bb 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java
@@ -130,7 +130,7 @@ public class MailboxFactory {
 
         private MailboxId computeMailboxId() {
             int idCount = Booleans.countTrue(id.isPresent(), mailboxMetaData.isPresent());
-            Preconditions.checkState(idCount == 1, "You need exectly one 'id' 'mailboxMetaData'");
+            Preconditions.checkState(idCount == 1, "You need exactly one 'id' 'mailboxMetaData'");
             return OptionalUtils.or(
                 id,
                 mailboxMetaData.map(MailboxMetaData::getId))


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 23/44: [Refactoring] MimeDescriptorImpl: method declaration sanitizing

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 2de408013da876a6d1e7bde6ef7312b885dbc9c7
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:29:40 2019 +0700

    [Refactoring] MimeDescriptorImpl: method declaration sanitizing
---
 .../org/apache/james/mailbox/store/MimeDescriptorImpl.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index fe73c86..89980c2 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -71,8 +71,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
         return createDescriptor(parser);
     }
 
-    private static MimeDescriptorImpl createDescriptor(
-            final MimeTokenStream parser) throws IOException, MimeException {
+    private static MimeDescriptorImpl createDescriptor(MimeTokenStream parser) throws IOException, MimeException {
         EntityState next = parser.next();
         final Collection<MessageResult.Header> headers = new ArrayList<>();
         while (next != EntityState.T_BODY
@@ -101,8 +100,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
         return mimeDescriptorImpl;
     }
 
-    private static MimeDescriptorImpl compositePartDescriptor(
-            final MimeTokenStream parser, Collection<MessageResult.Header> headers)
+    private static MimeDescriptorImpl compositePartDescriptor(MimeTokenStream parser, Collection<MessageResult.Header> headers)
             throws IOException, MimeException {
         MaximalBodyDescriptor descriptor = (MaximalBodyDescriptor) parser
                 .getBodyDescriptor();
@@ -119,8 +117,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
         return mimeDescriptor;
     }
 
-    private static MimeDescriptorImpl simplePartDescriptor(
-            final MimeTokenStream parser, Collection<MessageResult.Header> headers)
+    private static MimeDescriptorImpl simplePartDescriptor(MimeTokenStream parser, Collection<MessageResult.Header> headers)
             throws IOException, MimeException {
         MaximalBodyDescriptor descriptor = (MaximalBodyDescriptor) parser
                 .getBodyDescriptor();
@@ -152,8 +149,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
         return mimeDescriptorImpl;
     }
 
-    private static MimeDescriptorImpl createDescriptor(long bodyOctets,
-            long lines, MaximalBodyDescriptor descriptor,
+    private static MimeDescriptorImpl createDescriptor(long bodyOctets, long lines, MaximalBodyDescriptor descriptor,
             MimeDescriptor embeddedMessage, Collection<MessageResult.Header> headers) {
         final String contentDescription = descriptor.getContentDescription();
         final String contentId = descriptor.getContentId();


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 42/44: JAMES-2632 Allow bulk mailbox counter retrieval

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit f0d13b5b65772a72d483798bf4a9a31ae1d1053d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Nov 8 13:22:04 2019 +0700

    JAMES-2632 Allow bulk mailbox counter retrieval
---
 .../cassandra/mail/CassandraMessageMapper.java     | 39 +++++++++-------------
 .../james/mailbox/jpa/mail/JPAMessageMapper.java   | 14 ++------
 .../jpa/mail/TransactionalMessageMapper.java       |  4 +--
 .../mailbox/maildir/mail/MaildirMessageMapper.java |  8 ++---
 .../inmemory/mail/InMemoryMessageMapper.java       |  5 +--
 .../james/mailbox/store/StoreMailboxManager.java   |  1 -
 .../james/mailbox/store/mail/MessageMapper.java    |  3 +-
 .../StoreMailboxMessageResultIteratorTest.java     |  2 +-
 .../store/mail/model/MessageMapperTest.java        |  2 +-
 9 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
index 675d648..b11c836 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -42,7 +42,6 @@ import org.apache.james.mailbox.model.ComposedMessageId;
 import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
-import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.UpdatedFlags;
@@ -115,41 +114,35 @@ public class CassandraMessageMapper implements MessageMapper {
     }
 
     @Override
-    public long countMessagesInMailbox(Mailbox mailbox) throws MailboxException {
-        return mailboxCounterDAO.countMessagesInMailbox(mailbox)
-                .defaultIfEmpty(0L)
-                .block();
+    public long countMessagesInMailbox(Mailbox mailbox) {
+        return getMailboxCounters(mailbox).getCount();
     }
 
     @Override
-    public long countUnseenMessagesInMailbox(Mailbox mailbox) throws MailboxException {
-        return mailboxCounterDAO.countUnseenMessagesInMailbox(mailbox)
-                .defaultIfEmpty(0L)
-                .block();
+    public long countUnseenMessagesInMailbox(Mailbox mailbox) {
+        return getMailboxCounters(mailbox).getUnseen();
     }
 
     @Override
-    public MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException {
-        CassandraId mailboxId = (CassandraId) mailbox.getMailboxId();
-        return getMailboxCounters(mailboxId)
-                .block();
+    public MailboxCounters getMailboxCounters(Mailbox mailbox) {
+        return getMailboxCountersAsMono(mailbox).block();
     }
 
-    private Mono<MailboxCounters> getMailboxCounters(CassandraId mailboxId) {
+    private Mono<MailboxCounters> getMailboxCountersAsMono(Mailbox mailbox) {
+        CassandraId mailboxId = (CassandraId) mailbox.getMailboxId();
         return mailboxCounterDAO.retrieveMailboxCounters(mailboxId)
-                .defaultIfEmpty(MailboxCounters.builder()
-                    .mailboxId(mailboxId)
-                    .count(0)
-                    .unseen(0)
-                    .build());
+            .defaultIfEmpty(MailboxCounters.builder()
+                .mailboxId(mailboxId)
+                .count(0)
+                .unseen(0)
+                .build());
     }
 
     @Override
-    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) {
-        return Flux.fromIterable(mailboxIds)
+    public List<MailboxCounters> getMailboxCounters(Collection<Mailbox> mailboxes) {
+        return Flux.fromIterable(mailboxes)
             .publishOn(Schedulers.boundedElastic())
-            .map(id -> (CassandraId) id)
-            .concatMap(this::getMailboxCounters)
+            .concatMap(this::getMailboxCountersAsMono)
             .toStream()
             .collect(Guavate.toImmutableList());
     }
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
index 6c88f59..a2475fe 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
@@ -42,7 +42,6 @@ import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
 import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
-import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MessageRange.Type;
@@ -154,16 +153,9 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
     }
 
     @Override
-    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) throws MailboxException {
-        return mailboxIds.stream()
-            .map(id -> (JPAId) id)
-            .map(Throwing.<JPAId, MailboxCounters>function(
-                id -> MailboxCounters.builder()
-                    .mailboxId(id)
-                    .count(countMessagesInMailbox(id))
-                    .unseen(countUnseenMessagesInMailbox(id))
-                    .build())
-                .sneakyThrow())
+    public List<MailboxCounters> getMailboxCounters(Collection<Mailbox> mailboxes) throws MailboxException {
+        return mailboxes.stream()
+            .map(Throwing.<Mailbox, MailboxCounters>function(this::getMailboxCounters).sneakyThrow())
             .collect(Guavate.toImmutableList());
     }
 
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
index 58d34a4..658547c 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
@@ -156,7 +156,7 @@ public class TransactionalMessageMapper implements MessageMapper {
     }
 
     @Override
-    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) throws MailboxException {
-        throw new NotImplementedException("not implemented");
+    public List<MailboxCounters> getMailboxCounters(Collection<Mailbox> mailboxes) throws MailboxException {
+        return messageMapper.getMailboxCounters(mailboxes);
     }
 }
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
index 17e6f44..2c9e427 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
@@ -36,7 +36,6 @@ import javax.mail.Flags;
 import javax.mail.Flags.Flag;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -46,7 +45,6 @@ import org.apache.james.mailbox.maildir.MaildirStore;
 import org.apache.james.mailbox.maildir.mail.model.MaildirMailboxMessage;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
-import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MessageRange.Type;
@@ -153,8 +151,10 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
     }
 
     @Override
-    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) {
-        throw new NotImplementedException("Not available as maildir relies on mailboxPath");
+    public List<MailboxCounters> getMailboxCounters(Collection<Mailbox> mailboxes) throws MailboxException {
+        return mailboxes.stream()
+            .map(Throwing.<Mailbox, MailboxCounters>function(this::getMailboxCounters).sneakyThrow())
+            .collect(Guavate.toImmutableList());
     }
 
     @Override
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
index 6ef7781..f87f946 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
@@ -99,8 +99,9 @@ public class InMemoryMessageMapper extends AbstractMessageMapper {
     }
 
     @Override
-    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) {
-        return mailboxIds.stream()
+    public List<MailboxCounters> getMailboxCounters(Collection<Mailbox> mailboxes) {
+        return mailboxes.stream()
+            .map(Mailbox::getMailboxId)
             .map(id -> MailboxCounters.builder()
                 .mailboxId(id)
                 .count(countMessagesInMailbox(id))
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 b80196b..671bc8c 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
@@ -794,7 +794,6 @@ public class StoreMailboxManager implements MailboxManager {
         MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(session);
         return messageMapper.getMailboxCounters(mailboxes.stream()
             .filter(Throwing.<Mailbox>predicate(mailbox -> storeRightManager.hasRight(mailbox, Right.Read, session)).sneakyThrow())
-            .map(Mailbox::getMailboxId)
             .collect(Guavate.toImmutableList()));
     }
 }
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
index 3fab26f..f01ddb0 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
@@ -30,7 +30,6 @@ import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
-import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.UpdatedFlags;
@@ -76,7 +75,7 @@ public interface MessageMapper extends Mapper {
 
     MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException;
 
-    List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) throws MailboxException;
+    List<MailboxCounters> getMailboxCounters(Collection<Mailbox> mailboxes) throws MailboxException;
 
     /**
      * Delete the given {@link MailboxMessage}
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
index 28e164c..b3f7528 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
@@ -99,7 +99,7 @@ public class StoreMailboxMessageResultIteratorTest {
         }
 
         @Override
-        public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) throws MailboxException {
+        public List<MailboxCounters> getMailboxCounters(Collection<Mailbox> mailboxes) {
             throw new UnsupportedOperationException();
         }
 
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 f57fde6..09323b8 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
@@ -131,7 +131,7 @@ public abstract class MessageMapperTest {
     @Test
     public void getMailboxCountersShouldReturnStoredValue() throws MailboxException {
         saveMessages();
-        assertThat(messageMapper.getMailboxCounters(ImmutableList.of(benwaInboxMailbox.getMailboxId(), benwaWorkMailbox.getMailboxId())))
+        assertThat(messageMapper.getMailboxCounters(ImmutableList.of(benwaInboxMailbox, benwaWorkMailbox)))
             .containsExactlyInAnyOrder(
                 MailboxCounters.builder()
                     .mailboxId(benwaInboxMailbox.getMailboxId())


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 29/44: [Refactoring] ResultHeader: use StandardCharsets

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 5aa1ebd8637661773bd3e8b386e0a915b38d562e
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:37:02 2019 +0700

    [Refactoring] ResultHeader: use StandardCharsets
---
 .../src/main/java/org/apache/james/mailbox/store/ResultHeader.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
index eb0ed8a..26ff409 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
@@ -22,10 +22,11 @@
  */
 package org.apache.james.mailbox.store;
 
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
 
 import org.apache.james.mailbox.model.MessageResult;
 
@@ -35,7 +36,6 @@ public final class ResultHeader implements MessageResult.Header {
     private final String value;
 
     private final long size;
-    private static final Charset US_ASCII = Charset.forName("US-ASCII");
 
     public ResultHeader(String name, String value) {
         this.name = name;


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 37/44: JAMES-2632 Allow bulk mailbox counter retrieval

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit c8d7d244260a72f49a9c2bb52b9e017037786e4c
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Oct 16 18:38:20 2019 +0700

    JAMES-2632 Allow bulk mailbox counter retrieval
    
    StoreMailboxManager should have the capacity to load
    mailboxCounters all at one.
---
 .../cassandra/mail/CassandraMailboxCounterDAO.java |  4 +--
 .../cassandra/mail/CassandraMessageMapper.java     | 28 ++++++++++++++++++
 .../mail/CassandraMailboxCounterDAOTest.java       |  8 ++---
 .../james/mailbox/jpa/mail/JPAMessageMapper.java   | 33 ++++++++++++++++++---
 .../jpa/mail/TransactionalMessageMapper.java       |  7 +++++
 .../mailbox/maildir/mail/MaildirMessageMapper.java |  9 ++++++
 .../inmemory/mail/InMemoryMessageMapper.java       | 34 ++++++++++++++++++++--
 .../james/mailbox/store/StoreMailboxManager.java   | 10 +++++++
 .../james/mailbox/store/mail/MessageMapper.java    |  4 +++
 .../StoreMailboxMessageResultIteratorTest.java     | 12 +++++---
 .../store/mail/model/MessageMapperTest.java        | 18 ++++++++++++
 11 files changed, 149 insertions(+), 18 deletions(-)

diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
index 1069bcc..d1c3180 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
@@ -74,9 +74,7 @@ public class CassandraMailboxCounterDAO {
                 .where(eq(CassandraMailboxCountersTable.MAILBOX_ID, bindMarker(CassandraMailboxCountersTable.MAILBOX_ID))));
     }
 
-    public Mono<MailboxCounters> retrieveMailboxCounters(Mailbox mailbox) throws MailboxException {
-        CassandraId mailboxId = (CassandraId) mailbox.getMailboxId();
-
+    public Mono<MailboxCounters> retrieveMailboxCounters(CassandraId mailboxId) {
         return cassandraAsyncExecutor.executeSingleRow(bindWithMailbox(mailboxId, readStatement))
             .map(row ->  MailboxCounters.builder()
                 .count(row.getLong(CassandraMailboxCountersTable.COUNT))
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
index 18ac059..de6407ff 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mailbox.cassandra.mail;
 
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
@@ -41,6 +42,7 @@ import org.apache.james.mailbox.model.ComposedMessageId;
 import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.UpdatedFlags;
@@ -60,6 +62,7 @@ import com.google.common.collect.ImmutableList;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 public class CassandraMessageMapper implements MessageMapper {
     public static final MailboxCounters INITIAL_COUNTERS =  MailboxCounters.builder()
@@ -131,9 +134,34 @@ public class CassandraMessageMapper implements MessageMapper {
 
     @Override
     public MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException {
+<<<<<<< HEAD
         return mailboxCounterDAO.retrieveMailboxCounters(mailbox)
                 .defaultIfEmpty(INITIAL_COUNTERS)
                 .block();
+=======
+        CassandraId mailboxId = (CassandraId) mailbox.getMailboxId();
+        return getMailboxCounters(mailboxId)
+                .block();
+    }
+
+    private Mono<MailboxCounters> getMailboxCounters(CassandraId mailboxId) {
+        return mailboxCounterDAO.retrieveMailboxCounters(mailboxId)
+                .defaultIfEmpty(MailboxCounters.builder()
+                    .mailboxId(mailboxId)
+                    .count(0)
+                    .unseen(0)
+                    .build());
+    }
+
+    @Override
+    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) {
+        return Flux.fromIterable(mailboxIds)
+            .publishOn(Schedulers.boundedElastic())
+            .map(id -> (CassandraId) id)
+            .concatMap(this::getMailboxCounters)
+            .toStream()
+            .collect(Guavate.toImmutableList());
+>>>>>>> f4ef8da35d... JAMES-2632 Allow bulk mailbox counter retrieval
     }
 
     @Override
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 a9fae36..073b4a2 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
@@ -65,7 +65,7 @@ class CassandraMailboxCounterDAOTest {
 
     @Test
     void retrieveMailboxCounterShouldReturnEmptyByDefault() throws Exception {
-        assertThat(testee.retrieveMailboxCounters(mailbox).hasElement().block()).isFalse();
+        assertThat(testee.retrieveMailboxCounters(MAILBOX_ID).hasElement().block()).isFalse();
     }
 
     @Test
@@ -86,7 +86,7 @@ class CassandraMailboxCounterDAOTest {
     void incrementUnseenShouldAddOneWhenAbsentOnMailboxCounters() throws Exception {
         testee.incrementUnseen(MAILBOX_ID).block();
 
-        assertThat(testee.retrieveMailboxCounters(mailbox).block())
+        assertThat(testee.retrieveMailboxCounters(MAILBOX_ID).block())
             .isEqualTo(MailboxCounters.builder()
                 .count(0L)
                 .unseen(1L)
@@ -97,7 +97,7 @@ class CassandraMailboxCounterDAOTest {
     void incrementCountShouldAddOneWhenAbsentOnMailboxCounters() throws Exception {
         testee.incrementCount(MAILBOX_ID).block();
 
-        assertThat(testee.retrieveMailboxCounters(mailbox).block())
+        assertThat(testee.retrieveMailboxCounters(MAILBOX_ID).block())
             .isEqualTo(MailboxCounters.builder()
                 .count(1L)
                 .unseen(0L)
@@ -109,7 +109,7 @@ class CassandraMailboxCounterDAOTest {
         testee.incrementCount(MAILBOX_ID).block();
         testee.incrementUnseen(MAILBOX_ID).block();
 
-        assertThat(testee.retrieveMailboxCounters(mailbox).block())
+        assertThat(testee.retrieveMailboxCounters(MAILBOX_ID).block())
             .isEqualTo(MailboxCounters.builder()
                 .count(1L)
                 .unseen(1L)
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
index f7fde59..a1ebacd 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.mailbox.jpa.mail;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -41,6 +42,7 @@ import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
 import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MessageRange.Type;
@@ -55,6 +57,7 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage;
 import org.apache.james.mailbox.store.mail.utils.ApplicableFlagCalculator;
 import org.apache.openjpa.persistence.ArgumentException;
 
+import com.github.fge.lambdas.Throwing;
 import com.github.steveash.guavate.Guavate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
@@ -121,27 +124,49 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
 
     @Override
     public long countMessagesInMailbox(Mailbox mailbox) throws MailboxException {
+        JPAId mailboxId = (JPAId) mailbox.getMailboxId();
+        return countMessagesInMailbox(mailboxId);
+    }
+
+    private long countMessagesInMailbox(JPAId mailboxId) throws MailboxException {
         try {
-            JPAId mailboxId = (JPAId) mailbox.getMailboxId();
             return (Long) getEntityManager().createNamedQuery("countMessagesInMailbox")
                     .setParameter("idParam", mailboxId.getRawId()).getSingleResult();
         } catch (PersistenceException e) {
-            throw new MailboxException("Count of messages failed in mailbox " + mailbox, e);
+            throw new MailboxException("Count of messages failed in mailbox " + mailboxId, e);
         }
     }
 
     @Override
     public long countUnseenMessagesInMailbox(Mailbox mailbox) throws MailboxException {
+        JPAId mailboxId = (JPAId) mailbox.getMailboxId();
+        return countUnseenMessagesInMailbox(mailboxId);
+    }
+
+    private long countUnseenMessagesInMailbox(JPAId mailboxId) throws MailboxException {
         try {
-            JPAId mailboxId = (JPAId) mailbox.getMailboxId();
             return (Long) getEntityManager().createNamedQuery("countUnseenMessagesInMailbox")
                     .setParameter("idParam", mailboxId.getRawId()).getSingleResult();
         } catch (PersistenceException e) {
-            throw new MailboxException("Count of useen messages failed in mailbox " + mailbox, e);
+            throw new MailboxException("Count of useen messages failed in mailbox " + mailboxId, e);
         }
     }
 
     @Override
+    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) throws MailboxException {
+        return mailboxIds.stream()
+            .map(id -> (JPAId) id)
+            .map(Throwing.<JPAId, MailboxCounters>function(
+                id -> MailboxCounters.builder()
+                    .mailboxId(id)
+                    .count(countMessagesInMailbox(id))
+                    .unseen(countUnseenMessagesInMailbox(id))
+                    .build())
+                .sneakyThrow())
+            .collect(Guavate.toImmutableList());
+    }
+
+    @Override
     public void delete(Mailbox mailbox, MailboxMessage message) throws MailboxException {
         try {
             AbstractJPAMailboxMessage jpaMessage = getEntityManager().find(AbstractJPAMailboxMessage.class, buildKey(mailbox, message));
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
index 6030d47..6b45c1d 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mailbox.jpa.mail;
 
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +32,7 @@ import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.UpdatedFlags;
@@ -151,4 +153,9 @@ public class TransactionalMessageMapper implements MessageMapper {
     public Flags getApplicableFlag(Mailbox mailbox) throws MailboxException {
         return messageMapper.getApplicableFlag(mailbox);
     }
+
+    @Override
+    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) throws MailboxException {
+        throw new NotImplementedException("not implemented");
+    }
 }
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
index a0295d4..17e6f44 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
@@ -24,6 +24,7 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -35,6 +36,7 @@ import javax.mail.Flags;
 import javax.mail.Flags.Flag;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -43,6 +45,8 @@ import org.apache.james.mailbox.maildir.MaildirMessageName;
 import org.apache.james.mailbox.maildir.MaildirStore;
 import org.apache.james.mailbox.maildir.mail.model.MaildirMailboxMessage;
 import org.apache.james.mailbox.model.Mailbox;
+import org.apache.james.mailbox.model.MailboxCounters;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MessageRange.Type;
@@ -149,6 +153,11 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
     }
 
     @Override
+    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) {
+        throw new NotImplementedException("Not available as maildir relies on mailboxPath");
+    }
+
+    @Override
     public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator flagsUpdateCalculator, MessageRange set) throws MailboxException {
         final List<UpdatedFlags> updatedFlags = new ArrayList<>();
         final MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
index 58e0613..6ef7781 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
@@ -20,6 +20,7 @@
 package org.apache.james.mailbox.inmemory.mail;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -34,6 +35,8 @@ import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.inmemory.InMemoryId;
 import org.apache.james.mailbox.model.Mailbox;
+import org.apache.james.mailbox.model.MailboxCounters;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.store.mail.AbstractMessageMapper;
@@ -56,7 +59,11 @@ public class InMemoryMessageMapper extends AbstractMessageMapper {
     }
 
     private Map<MessageUid, MailboxMessage> getMembershipByUidForMailbox(Mailbox mailbox) {
-        return getMembershipByUidForId((InMemoryId) mailbox.getMailboxId());
+        return getMembershipByUidForMailbox(mailbox.getMailboxId());
+    }
+
+    private Map<MessageUid, MailboxMessage> getMembershipByUidForMailbox(MailboxId mailboxId) {
+        return getMembershipByUidForId((InMemoryId) mailboxId);
     }
 
     private Map<MessageUid, MailboxMessage> getMembershipByUidForId(InMemoryId id) {
@@ -70,18 +77,39 @@ public class InMemoryMessageMapper extends AbstractMessageMapper {
 
     @Override
     public long countMessagesInMailbox(Mailbox mailbox) {
-        return getMembershipByUidForMailbox(mailbox).size();
+        MailboxId mailboxId = mailbox.getMailboxId();
+        return countMessagesInMailbox(mailboxId);
+    }
+
+    private int countMessagesInMailbox(MailboxId mailboxId) {
+        return getMembershipByUidForMailbox(mailboxId).size();
     }
 
     @Override
     public long countUnseenMessagesInMailbox(Mailbox mailbox) {
-        return getMembershipByUidForMailbox(mailbox).values()
+        MailboxId mailboxId = mailbox.getMailboxId();
+        return countUnseenMessagesInMailbox(mailboxId);
+    }
+
+    private long countUnseenMessagesInMailbox(MailboxId mailboxId) {
+        return getMembershipByUidForMailbox(mailboxId).values()
             .stream()
             .filter(member -> !member.isSeen())
             .count();
     }
 
     @Override
+    public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) {
+        return mailboxIds.stream()
+            .map(id -> MailboxCounters.builder()
+                .mailboxId(id)
+                .count(countMessagesInMailbox(id))
+                .unseen(countUnseenMessagesInMailbox(id))
+                .build())
+            .collect(Guavate.toImmutableList());
+    }
+
+    @Override
     public void delete(Mailbox mailbox, MailboxMessage message) {
         getMembershipByUidForMailbox(mailbox).remove(message.getUid());
     }
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 e11ab25..6d36a28 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
@@ -23,6 +23,7 @@ import static org.apache.james.mailbox.store.mail.AbstractMessageMapper.UNLIMITE
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
@@ -57,6 +58,7 @@ import org.apache.james.mailbox.model.MailboxACL.Right;
 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.MailboxCounters;
 import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MailboxMetaData;
 import org.apache.james.mailbox.model.MailboxMetaData.Selectability;
@@ -768,4 +770,12 @@ public class StoreMailboxManager implements MailboxManager {
         Mailbox mailbox = mapper.findMailboxByPath(mailboxPath);
         return mapper.hasChildren(mailbox, session.getPathDelimiter());
     }
+
+    private List<MailboxCounters> getMailboxCounters(Collection<Mailbox> mailboxes, MailboxSession session) throws MailboxException {
+        MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(session);
+        return messageMapper.getMailboxCounters(mailboxes.stream()
+            .filter(Throwing.<Mailbox>predicate(mailbox -> storeRightManager.hasRight(mailbox, Right.Read, session)).sneakyThrow())
+            .map(Mailbox::getMailboxId)
+            .collect(Guavate.toImmutableList()));
+    }
 }
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
index c17a018..3fab26f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.mailbox.store.mail;
 
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +30,7 @@ import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.UpdatedFlags;
@@ -74,6 +76,8 @@ public interface MessageMapper extends Mapper {
 
     MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException;
 
+    List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) throws MailboxException;
+
     /**
      * Delete the given {@link MailboxMessage}
      */
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
index 5587af4..053dc3d 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
@@ -22,6 +22,7 @@ package org.apache.james.mailbox.store;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -33,11 +34,11 @@ import java.util.Set;
 import javax.mail.Flags;
 import javax.mail.util.SharedByteArrayInputStream;
 
-import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MessageResult.FetchGroup;
@@ -67,8 +68,6 @@ public class StoreMailboxMessageResultIteratorTest {
     }
 
     private final class TestMessageMapper implements MessageMapper {
-        
-
         private final MessageRange messageRange;
 
         public TestMessageMapper(MessageRange messageRange) {
@@ -99,6 +98,11 @@ public class StoreMailboxMessageResultIteratorTest {
         }
 
         @Override
+        public List<MailboxCounters> getMailboxCounters(Collection<MailboxId> mailboxIds) throws MailboxException {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
         public Iterator<MailboxMessage> findInMailbox(Mailbox mailbox, MessageRange set,
                                                               org.apache.james.mailbox.store.mail.MessageMapper.FetchType type, int limit)
                 throws MailboxException {
@@ -190,7 +194,7 @@ public class StoreMailboxMessageResultIteratorTest {
 
         @Override
         public Flags getApplicableFlag(Mailbox mailbox) throws MailboxException {
-            throw new NotImplementedException("Not implemented");
+            throw new UnsupportedOperationException();
         }
     }
 
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 b223a79..f57fde6 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
@@ -42,6 +42,7 @@ import org.apache.james.mailbox.MessageManager.FlagsUpdateMode;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Mailbox;
+import org.apache.james.mailbox.model.MailboxCounters;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.model.MessageId;
 import org.apache.james.mailbox.model.MessageMetaData;
@@ -128,6 +129,23 @@ public abstract class MessageMapperTest {
     }
 
     @Test
+    public void getMailboxCountersShouldReturnStoredValue() throws MailboxException {
+        saveMessages();
+        assertThat(messageMapper.getMailboxCounters(ImmutableList.of(benwaInboxMailbox.getMailboxId(), benwaWorkMailbox.getMailboxId())))
+            .containsExactlyInAnyOrder(
+                MailboxCounters.builder()
+                    .mailboxId(benwaInboxMailbox.getMailboxId())
+                    .count(5)
+                    .unseen(5)
+                    .build(),
+                MailboxCounters.builder()
+                    .mailboxId(benwaWorkMailbox.getMailboxId())
+                    .count(1)
+                    .unseen(1)
+                    .build());
+    }
+
+    @Test
     public void mailboxCountShouldBeDecrementedAfterAMessageDelete() throws MailboxException {
         saveMessages();
         messageMapper.delete(benwaInboxMailbox, message1);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 34/44: [Refactoring] PartContentBuilder: remove unreachable switch case

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 372309325d900287ec4f0a41f7367f52d35b0cfb
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:40:52 2019 +0700

    [Refactoring] PartContentBuilder: remove unreachable switch case
    
    For loop stop condition
---
 .../org/apache/james/mailbox/store/streaming/PartContentBuilder.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
index f8e560f..d548d46 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
@@ -136,7 +136,6 @@ public class PartContentBuilder {
                 case T_END_BODYPART:
                 case T_END_HEADER:
                 case T_END_MESSAGE:
-                case T_END_MULTIPART:
                 case T_EPILOGUE:
                 case T_FIELD:
                 case T_PREAMBLE:


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 05/44: JAMES-2949 Remove some implicit calls to Username::toString

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit ff4d3e984cb403786d45923ba5c24070cc684387
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 16:53:13 2019 +0700

    JAMES-2949 Remove some implicit calls to Username::toString
---
 .../apache/james/jmap/VacationIntegrationTest.java |   6 +-
 .../jmap/draft/methods/integration/FilterTest.java | 162 ++++++++++-----------
 .../integration/ForwardIntegrationTest.java        |  40 ++---
 .../integration/GetMailboxesMethodTest.java        |   4 +-
 .../integration/GetMessageListMethodTest.java      |   2 +-
 .../integration/GetVacationResponseTest.java       |   8 +-
 .../methods/integration/QuotaMailingTest.java      |  12 +-
 .../methods/integration/SendMDNMethodTest.java     |  17 ++-
 .../methods/integration/SetMessagesMethodTest.java |   4 +-
 .../ReindexingWithEventDeadLettersTest.java        |   6 +-
 .../EventDeadLettersIntegrationTest.java           |   2 +-
 11 files changed, 132 insertions(+), 131 deletions(-)

diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
index 0cd225c..9798a79 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
@@ -44,13 +44,13 @@ import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.api.vacation.AccountId;
 import org.apache.james.jmap.api.vacation.VacationPatch;
 import org.apache.james.jmap.categories.BasicFeature;
+import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.mailbox.DefaultMailboxes;
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailbox.probe.MailboxProbe;
 import org.apache.james.modules.MailboxProbeImpl;
 import org.apache.james.probe.DataProbe;
 import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -328,8 +328,8 @@ public abstract class VacationIntegrationTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + mailId + "\" : {" +
-            "        \"from\": { \"email\": \"" + USER_2 + "\"}," +
-            "        \"to\": [{ \"name\": \"Benwa\", \"email\": \"" + USER_1 + "\"}]," +
+            "        \"from\": { \"email\": \"" + USER_2.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"Benwa\", \"email\": \"" + USER_1.asString() + "\"}]," +
             "        \"subject\": \"Thank you for joining example.com!\"," +
             "        \"textBody\": \"" + ORIGINAL_MESSAGE_TEXT_BODY + "\"," +
             "        \"mailboxIds\": [\"" + outboxId + "\"]" +
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java
index bdfe22d..bcdee6a 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java
@@ -48,12 +48,12 @@ import org.apache.james.GuiceJamesServer;
 import org.apache.james.jmap.JmapCommonRequests;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.categories.BasicFeature;
+import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.modules.MailboxProbeImpl;
 import org.apache.james.probe.DataProbe;
 import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -710,7 +710,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"from\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + BOB + "\"" +
+                "        \"value\": \"" + BOB.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -731,8 +731,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -763,7 +763,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"to\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC + "\"" +
+                "        \"value\": \"" + CEDRIC.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -784,8 +784,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -818,7 +818,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"cc\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC + "\"" +
+                "        \"value\": \"" + CEDRIC.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -839,9 +839,9 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
+            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -874,7 +874,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"recipient\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC + "\"" +
+                "        \"value\": \"" + CEDRIC.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -895,9 +895,9 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
+            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -930,7 +930,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"recipient\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC + "\"" +
+                "        \"value\": \"" + CEDRIC.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -951,9 +951,9 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + CEDRIC + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
+            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1007,8 +1007,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
             "      \"subject\": \"matchme\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1042,7 +1042,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"from\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC + "\"" +
+                "        \"value\": \"" + CEDRIC.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -1063,8 +1063,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1097,7 +1097,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"to\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC + "\"" +
+                "        \"value\": \"" + CEDRIC.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -1118,8 +1118,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1152,7 +1152,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"cc\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC + "\"" +
+                "        \"value\": \"" + CEDRIC.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -1173,9 +1173,9 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + BOB + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
+            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + BOB.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1208,7 +1208,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"recipient\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + CEDRIC + "\"" +
+                "        \"value\": \"" + CEDRIC.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -1229,9 +1229,9 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
-            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + BOB + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
+            "      \"cc\": [{ \"name\": \"Cedric\", \"email\": \"" + BOB.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1285,8 +1285,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
             "      \"subject\": \"nomatch\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1341,8 +1341,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"},{ \"name\": \"Cedric\", \"email\": \"" + CEDRIC.asString() + "\"}]," +
             "      \"subject\": \"DIFFERENT CASE VALUE\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1396,8 +1396,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1451,8 +1451,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1506,8 +1506,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1540,7 +1540,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"from\"," +
                 "        \"comparator\": \"exactly-equals\"," +
-                "        \"value\": \"" + BOB + "\"" +
+                "        \"value\": \"" + BOB.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -1561,8 +1561,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1595,7 +1595,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"from\"," +
                 "        \"comparator\": \"exactly-equals\"," +
-                "        \"value\": \"Bob <" + BOB + ">\"" +
+                "        \"value\": \"Bob <" + BOB.asString() + ">\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -1616,8 +1616,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1672,8 +1672,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1727,8 +1727,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1782,8 +1782,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1837,8 +1837,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1892,8 +1892,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1926,7 +1926,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"from\"," +
                 "        \"comparator\": \"not-exactly-equals\"," +
-                "        \"value\": \"" + BOB + "\"" +
+                "        \"value\": \"" + BOB.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -1947,8 +1947,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -1981,7 +1981,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"from\"," +
                 "        \"comparator\": \"not-exactly-equals\"," +
-                "        \"value\": \"Bob <" + BOB + ">\"" +
+                "        \"value\": \"Bob <" + BOB.asString() + ">\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -2002,8 +2002,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Bob\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -2057,8 +2057,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -2091,7 +2091,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"from\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + BOB + "\"" +
+                "        \"value\": \"" + BOB.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -2105,7 +2105,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"to\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + ALICE + "\"" +
+                "        \"value\": \"" + ALICE.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -2126,8 +2126,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -2172,7 +2172,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"to\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + ALICE + "\"" +
+                "        \"value\": \"" + ALICE.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -2193,8 +2193,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -2225,7 +2225,7 @@ public abstract class FilterTest {
                 "      \"condition\": {" +
                 "        \"field\": \"from\"," +
                 "        \"comparator\": \"contains\"," +
-                "        \"value\": \"" + BOB + "\"" +
+                "        \"value\": \"" + BOB.asString() + "\"" +
                 "      }," +
                 "      \"action\": {" +
                 "        \"appendIn\": {" +
@@ -2246,8 +2246,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
@@ -2300,8 +2300,8 @@ public abstract class FilterTest {
             "  \"setMessages\"," +
             "  {" +
             "    \"create\": { \"" + messageCreationId  + "\" : {" +
-            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB + "\"}," +
-            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "      \"from\": { \"name\": \"Me\", \"email\": \"" + BOB.asString() + "\"}," +
+            "      \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "      \"subject\": \"subject\"," +
             "      \"mailboxIds\": [\"" + getOutboxId(bobAccessToken) + "\"]" +
             "    }}" +
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/ForwardIntegrationTest.java
index 9f91387..4ddf25e 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/ForwardIntegrationTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/ForwardIntegrationTest.java
@@ -45,9 +45,9 @@ import java.util.concurrent.TimeUnit;
 import org.apache.james.GuiceJamesServer;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.categories.BasicFeature;
+import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.probe.DataProbe;
 import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.utils.SMTPMessageSender;
 import org.apache.james.utils.WebAdminGuiceProbe;
 import org.apache.james.webadmin.WebAdminUtils;
@@ -97,7 +97,7 @@ public abstract class ForwardIntegrationTest {
     @Category(BasicFeature.class)
     @Test
     public void messageShouldBeForwardedWhenDefinedInRESTAPI() {
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE.asString(), BOB.asString()));
 
         AccessToken cedricAccessToken = authenticateJamesUser(baseUri(jmapServer), CEDRIC, CEDRIC_PASSWORD);
         String messageCreationId = "creationId1337";
@@ -106,8 +106,8 @@ public abstract class ForwardIntegrationTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC + "\"}," +
-            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "        \"subject\": \"subject\"," +
             "        \"isUnread\": true," +
             "        \"isFlagged\": true," +
@@ -144,8 +144,8 @@ public abstract class ForwardIntegrationTest {
 
     @Test
     public void messageShouldBeForwardedWhenBaseRecipientWhenInDestination() {
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, ALICE));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE.asString(), BOB.asString()));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE.asString(), ALICE.asString()));
 
         AccessToken cedricAccessToken = authenticateJamesUser(baseUri(jmapServer), CEDRIC, CEDRIC_PASSWORD);
         AccessToken aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
@@ -155,8 +155,8 @@ public abstract class ForwardIntegrationTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC + "\"}," +
-            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "        \"subject\": \"subject\"," +
             "        \"isUnread\": true," +
             "        \"isFlagged\": true," +
@@ -204,8 +204,8 @@ public abstract class ForwardIntegrationTest {
 
     @Test
     public void recursiveForwardShouldWork() {
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, CEDRIC));
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", CEDRIC, BOB));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE.asString(), CEDRIC.asString()));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", CEDRIC.asString(), BOB.asString()));
 
         AccessToken cedricAccessToken = authenticateJamesUser(baseUri(jmapServer), CEDRIC, CEDRIC_PASSWORD);
         String messageCreationId = "creationId1337";
@@ -214,8 +214,8 @@ public abstract class ForwardIntegrationTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC + "\"}," +
-            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "        \"subject\": \"subject\"," +
             "        \"isUnread\": true," +
             "        \"isFlagged\": true," +
@@ -252,9 +252,9 @@ public abstract class ForwardIntegrationTest {
 
     @Test
     public void recursiveWithRecipientCopyForwardShouldWork() {
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, ALICE));
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", BOB, CEDRIC));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE.asString(), ALICE.asString()));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE.asString(), BOB.asString()));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", BOB.asString(), CEDRIC.asString()));
 
         AccessToken cedricAccessToken = authenticateJamesUser(baseUri(jmapServer), CEDRIC, CEDRIC_PASSWORD);
         AccessToken aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
@@ -264,8 +264,8 @@ public abstract class ForwardIntegrationTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC + "\"}," +
-            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "        \"subject\": \"subject\"," +
             "        \"isUnread\": true," +
             "        \"isFlagged\": true," +
@@ -301,7 +301,7 @@ public abstract class ForwardIntegrationTest {
 
     @Test
     public void baseRecipientShouldNotReceiveEmailOnDefaultForward() {
-        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
+        webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE.asString(), BOB.asString()));
 
         AccessToken cedricAccessToken = authenticateJamesUser(baseUri(jmapServer), CEDRIC, CEDRIC_PASSWORD);
         AccessToken aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
@@ -311,8 +311,8 @@ public abstract class ForwardIntegrationTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC + "\"}," +
-            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+            "        \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE.asString() + "\"}]," +
             "        \"subject\": \"subject\"," +
             "        \"isUnread\": true," +
             "        \"isFlagged\": true," +
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
index daa5fe1..ac18edf 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
@@ -59,6 +59,7 @@ import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.categories.BasicFeature;
+import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.jmap.draft.model.mailbox.MailboxNamespace;
 import org.apache.james.mailbox.DefaultMailboxes;
 import org.apache.james.mailbox.MessageManager.AppendCommand;
@@ -77,7 +78,6 @@ import org.apache.james.modules.QuotaProbesImpl;
 import org.apache.james.probe.DataProbe;
 import org.apache.james.utils.AllMatching;
 import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -701,7 +701,7 @@ public abstract class GetMailboxesMethodTest {
             .body(NAME, equalTo("mailboxes"))
             .body(ARGUMENTS + ".list", hasSize(1))
             .body(FIRST_MAILBOX + ".namespace.type", equalTo(MailboxNamespace.Type.Delegated.toString()))
-            .body(FIRST_MAILBOX + ".namespace.owner", equalTo(BOB));
+            .body(FIRST_MAILBOX + ".namespace.owner", equalTo(BOB.asString()));
     }
 
     @Test
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
index cf3400e..199c156 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
@@ -237,7 +237,7 @@ public abstract class GetMessageListMethodTest {
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
             "        \"from\": { \"name\": \"" + fromName + "\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB + "\"}]," +
+            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
             "        \"subject\": \"Thank you for joining example.com!\"," +
             "        \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
             "        \"mailboxIds\": [\"" + getOutboxId(aliceAccessToken) + "\"]" +
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java
index 13ac1bc..9e7c993 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java
@@ -41,10 +41,10 @@ import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.api.vacation.AccountId;
 import org.apache.james.jmap.api.vacation.VacationPatch;
 import org.apache.james.jmap.categories.BasicFeature;
+import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.probe.DataProbe;
 import org.apache.james.util.date.ZonedDateTimeProvider;
 import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -107,7 +107,7 @@ public abstract class GetVacationResponseTest {
         .then()
             .statusCode(200)
             .body(NAME, equalTo("vacationResponse"))
-            .body(ARGUMENTS + ".accountId", equalTo(ALICE))
+            .body(ARGUMENTS + ".accountId", equalTo(ALICE.asString()))
             .body(ARGUMENTS + ".list", hasSize(1))
             .body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
             .body(ARGUMENTS + ".list[0].fromDate", nullValue())
@@ -143,7 +143,7 @@ public abstract class GetVacationResponseTest {
         .then()
             .statusCode(200)
             .body(NAME, equalTo("vacationResponse"))
-            .body(ARGUMENTS + ".accountId", equalTo(ALICE))
+            .body(ARGUMENTS + ".accountId", equalTo(ALICE.asString()))
             .body(ARGUMENTS + ".list", hasSize(1))
             .body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
             .body(ARGUMENTS + ".list[0].fromDate", equalTo("2014-09-30T14:10:00Z"))
@@ -176,7 +176,7 @@ public abstract class GetVacationResponseTest {
         .then()
             .statusCode(200)
             .body(NAME, equalTo("vacationResponse"))
-            .body(ARGUMENTS + ".accountId", equalTo(ALICE))
+            .body(ARGUMENTS + ".accountId", equalTo(ALICE.asString()))
             .body(ARGUMENTS + ".list", hasSize(1))
             .body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
             .body(ARGUMENTS + ".list[0].fromDate", equalTo("2014-09-30T14:10:00+02:00"))
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java
index e148f78..2cd2734 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java
@@ -41,6 +41,7 @@ import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.categories.BasicFeature;
+import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.mailbox.DefaultMailboxes;
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailbox.model.SerializableQuotaValue;
@@ -49,7 +50,6 @@ import org.apache.james.modules.MailboxProbeImpl;
 import org.apache.james.modules.QuotaProbesImpl;
 import org.apache.james.probe.DataProbe;
 import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.awaitility.Duration;
 import org.awaitility.core.ConditionFactory;
 import org.junit.After;
@@ -104,7 +104,7 @@ public abstract class QuotaMailingTest {
     @Test
     public void shouldSendANoticeWhenThresholdExceeded() throws Exception {
         jmapServer.getProbe(QuotaProbesImpl.class)
-            .setMaxStorage(MailboxConstants.USER_NAMESPACE + "&" + HOMER,
+            .setMaxStorage(MailboxConstants.USER_NAMESPACE + "&" + HOMER.asString(),
                 new SerializableQuotaValue<>(QuotaSize.size(100 * 1000)));
 
         bartSendMessageToHomer();
@@ -130,7 +130,7 @@ public abstract class QuotaMailingTest {
     @Test
     public void configurationShouldBeWellLoaded() throws Exception {
         jmapServer.getProbe(QuotaProbesImpl.class)
-            .setMaxStorage(MailboxConstants.USER_NAMESPACE + "&" + HOMER,
+            .setMaxStorage(MailboxConstants.USER_NAMESPACE + "&" + HOMER.asString(),
                 new SerializableQuotaValue<>(QuotaSize.size(100 * 1000)));
 
         bartSendMessageToHomer();
@@ -167,9 +167,9 @@ public abstract class QuotaMailingTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"headers\":{\"Disposition-Notification-To\":\"" + BART + "\"}," +
-            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER + "\"}]," +
+            "        \"headers\":{\"Disposition-Notification-To\":\"" + BART.asString() + "\"}," +
+            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER.asString() + "\"}]," +
             "        \"subject\": \"Message without an attachment\"," +
             "        \"textBody\": \"" + bigEnoughBody + "\"," +
             "        \"htmlBody\": \"Test <b>body</b>, HTML version\"," +
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java
index d1c4e61..35f176b 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java
@@ -50,6 +50,7 @@ import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.jmap.MessageAppender;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.categories.BasicFeature;
+import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.mailbox.DefaultMailboxes;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.MailboxConstants;
@@ -61,12 +62,12 @@ import org.apache.james.modules.MailboxProbeImpl;
 import org.apache.james.modules.QuotaProbesImpl;
 import org.apache.james.probe.DataProbe;
 import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.Iterables;
+
 import io.restassured.RestAssured;
 import io.restassured.parsing.Parser;
 
@@ -109,9 +110,9 @@ public abstract class SendMDNMethodTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"headers\":{\"Disposition-Notification-To\":\"" + BART + "\"}," +
-            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER + "\"}]," +
+            "        \"headers\":{\"Disposition-Notification-To\":\"" + BART.asString() + "\"}," +
+            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER.asString() + "\"}]," +
             "        \"subject\": \"Message with an attachment\"," +
             "        \"textBody\": \"Test body, plain text version\"," +
             "        \"htmlBody\": \"Test <b>body</b>, HTML version\"," +
@@ -143,8 +144,8 @@ public abstract class SendMDNMethodTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART + "\"}," +
-            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER + "\"}]," +
+            "        \"from\": { \"name\": \"Bob\", \"email\": \"" + BART.asString() + "\"}," +
+            "        \"to\": [{ \"name\": \"User\", \"email\": \"" + HOMER.asString() + "\"}]," +
             "        \"subject\": \"Message with an attachment\"," +
             "        \"textBody\": \"Test body, plain text version\"," +
             "        \"htmlBody\": \"Test <b>body</b>, HTML version\"," +
@@ -309,8 +310,8 @@ public abstract class SendMDNMethodTest {
             .post("/jmap")
         .then()
             .statusCode(200)
-            .body(firstMessage + ".from.email", is(HOMER))
-            .body(firstMessage + ".to.email", contains(BART))
+            .body(firstMessage + ".from.email", is(HOMER.asString()))
+            .body(firstMessage + ".to.email", contains(BART.asString()))
             .body(firstMessage + ".hasAttachment", is(true))
             .body(firstMessage + ".textBody", is("Read confirmation"))
             .body(firstMessage + ".subject", is("subject"))
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
index 03a9868..f9eeea2 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
@@ -2116,7 +2116,7 @@ public abstract class SetMessagesMethodTest {
             "    {" +
             "      \"create\": { \"" + draftCreationId  + "\" : {" +
             "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB + "\"}]," +
+            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
             "        \"subject\": \"subject\"," +
             "        \"keywords\": {\"$Draft\": true}," +
             "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
@@ -2168,7 +2168,7 @@ public abstract class SetMessagesMethodTest {
             "    {" +
             "      \"create\": { \"" + draftCreationId  + "\" : {" +
             "        \"from\": { \"name\": \"Me\", \"email\": \"" + fromAddress + "\"}," +
-            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB + "\"}]," +
+            "        \"to\": [{ \"name\": \"BOB\", \"email\": \"" + BOB.asString() + "\"}]," +
             "        \"subject\": \"subject\"," +
             "        \"keywords\": {\"$Draft\": true}," +
             "        \"mailboxIds\": [\"" + getDraftId(accessToken) + "\"]" +
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java
index aded2dc..c7ebe8a 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java
@@ -39,14 +39,14 @@ import org.apache.james.DockerElasticSearchExtension;
 import org.apache.james.GuiceJamesServer;
 import org.apache.james.JamesServerBuilder;
 import org.apache.james.JamesServerExtension;
-import org.apache.james.jmap.draft.JmapJamesServerContract;
 import org.apache.james.jmap.api.access.AccessToken;
+import org.apache.james.jmap.draft.JmapGuiceProbe;
+import org.apache.james.jmap.draft.JmapJamesServerContract;
 import org.apache.james.modules.AwsS3BlobStoreExtension;
 import org.apache.james.modules.RabbitMQExtension;
 import org.apache.james.modules.TestJMAPServerModule;
 import org.apache.james.modules.objectstorage.PayloadCodecFactory;
 import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.jmap.draft.JmapGuiceProbe;
 import org.apache.james.utils.WebAdminGuiceProbe;
 import org.apache.james.webadmin.WebAdminConfiguration;
 import org.apache.james.webadmin.WebAdminUtils;
@@ -158,7 +158,7 @@ class ReindexingWithEventDeadLettersTest {
             "    \"setMessages\"," +
             "    {" +
             "      \"create\": { \"" + messageCreationId  + "\" : {" +
-            "        \"from\": { \"name\": \"Me\", \"email\": \"" + ALICE + "\"}," +
+            "        \"from\": { \"name\": \"Me\", \"email\": \"" + ALICE.asString() + "\"}," +
             "        \"to\": [{ \"name\": \"BOB\", \"email\": \"someone@example.com\"}]," +
             "        \"subject\": \"subject\"," +
             "        \"keywords\": {\"$Draft\": true}," +
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
index b9760e6..95fdd91 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
@@ -258,7 +258,7 @@ public class EventDeadLettersIntegrationTest {
             .body("MailboxAdded.mailboxId", is(mailboxId.serialize()))
             .body("MailboxAdded.user", is(BOB))
             .body("MailboxAdded.mailboxPath.namespace", is(BOB_INBOX_PATH.getNamespace()))
-            .body("MailboxAdded.mailboxPath.user", is(BOB_INBOX_PATH.getUser()))
+            .body("MailboxAdded.mailboxPath.user", is(BOB_INBOX_PATH.getUser().asString()))
             .body("MailboxAdded.mailboxPath.name", is(BOB_INBOX_PATH.getName()));
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 20/44: [Refactoring] MessageResultImpl: Reorder fields

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit fd8ef1c9553b65fb5e919ad02baa229c49bc7401
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:18:07 2019 +0700

    [Refactoring] MessageResultImpl: Reorder fields
    
    Final first
---
 .../main/java/org/apache/james/mailbox/store/MessageResultImpl.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 9350694..d67d32e 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -54,11 +54,9 @@ public class MessageResultImpl implements MessageResult {
     private static final String TAB = " ";
 
     private final Map<MimePath, PartContent> partsByPath = new HashMap<>();
-
-    private MimeDescriptor mimeDescriptor;
-
     private final MailboxMessage message;
 
+    private MimeDescriptor mimeDescriptor;
     private HeadersImpl headers;
     private Content fullContent;
     private Content bodyContent;


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 17/44: [Refactoring] MessageResultImpl: solve visibility issues

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 86755205005983de202fb4766f25c4590f4e4060
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:13:33 2019 +0700

    [Refactoring] MessageResultImpl: solve visibility issues
---
 .../james/mailbox/store/MessageResultImpl.java       | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 133415f..5302315 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -187,27 +187,27 @@ public class MessageResultImpl implements MessageResult {
         return partContent.getMimeHeaders();
     }
 
-    public void setBodyContent(MimePath path, Content content) {
+    void setBodyContent(MimePath path, Content content) {
         final PartContent partContent = getPartContent(path);
         partContent.setBody(content);
     }
 
-    public void setMimeBodyContent(MimePath path, Content content) {
+    void setMimeBodyContent(MimePath path, Content content) {
         final PartContent partContent = getPartContent(path);
         partContent.setMimeBody(content);
     }
 
-    public void setFullContent(MimePath path, Content content) {
+    void setFullContent(MimePath path, Content content) {
         final PartContent partContent = getPartContent(path);
         partContent.setFull(content);
     }
 
-    public void setHeaders(MimePath path, Iterator<Header> headers) {
+    void setHeaders(MimePath path, Iterator<Header> headers) {
         final PartContent partContent = getPartContent(path);
         partContent.setHeaders(headers);
     }
 
-    public void setMimeHeaders(MimePath path, Iterator<Header> headers) {
+    void setMimeHeaders(MimePath path, Iterator<Header> headers) {
         final PartContent partContent = getPartContent(path);
         partContent.setMimeHeaders(headers);
     }
@@ -243,11 +243,11 @@ public class MessageResultImpl implements MessageResult {
             this.body = body;
         }
 
-        public Content getMimeBody() {
+        Content getMimeBody() {
             return mimeBody;
         }
 
-        public void setMimeBody(Content mimeBody) {
+        void setMimeBody(Content mimeBody) {
             content = content | FetchGroup.MIME_CONTENT;
             this.mimeBody = mimeBody;
         }
@@ -270,11 +270,11 @@ public class MessageResultImpl implements MessageResult {
             this.headers = headers;
         }
 
-        public Iterator<Header> getMimeHeaders() {
+        Iterator<Header> getMimeHeaders() {
             return mimeHeaders;
         }
 
-        public void setMimeHeaders(Iterator<Header> mimeHeaders) {
+        void setMimeHeaders(Iterator<Header> mimeHeaders) {
             content = content | FetchGroup.MIME_HEADERS;
             this.mimeHeaders = mimeHeaders;
         }
@@ -317,7 +317,7 @@ public class MessageResultImpl implements MessageResult {
         private final Message msg;
         private List<Header> headers;
         
-        public HeadersImpl(Message msg) {
+        private HeadersImpl(Message msg) {
             this.msg = msg;
         }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 36/44: JAMES-2632 MailboxMetaData could "cheaply" incorporate mailbox ACL

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 5861d4d466ee03639e3acabf57d5bd435ac4d0d6
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Oct 16 18:57:17 2019 +0700

    JAMES-2632 MailboxMetaData could "cheaply" incorporate mailbox ACL
---
 .../org/apache/james/mailbox/model/MailboxACL.java |  5 ++++
 .../james/mailbox/model/MailboxMetaData.java       |  9 +++++--
 .../apache/james/mailbox/MailboxManagerTest.java   | 28 ++++++++++++++++++++++
 .../james/mailbox/store/StoreMailboxManager.java   |  8 ++++---
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
index e3f29fb..17378f0 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
@@ -531,6 +531,11 @@ public class MailboxACL {
                 return this;
             }
 
+            public Builder forOwner() {
+                key = OWNER_KEY;
+                return this;
+            }
+
             public Builder key(EntryKey key) {
                 this.key = key;
                 return this;
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java
index 0ec6c0f..004dfff 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java
@@ -61,7 +61,7 @@ public class MailboxMetaData implements Comparable<MailboxMetaData> {
     }
 
     public static MailboxMetaData unselectableMailbox(MailboxPath path, MailboxId mailboxId, char delimiter) {
-        return new MailboxMetaData(path, mailboxId, delimiter, Children.CHILDREN_ALLOWED_BUT_UNKNOWN, Selectability.NONE);
+        return new MailboxMetaData(path, mailboxId, delimiter, Children.CHILDREN_ALLOWED_BUT_UNKNOWN, Selectability.NONE, new MailboxACL());
     }
 
     public static  final Comparator<MailboxMetaData> COMPARATOR = Comparator
@@ -73,15 +73,20 @@ public class MailboxMetaData implements Comparable<MailboxMetaData> {
     private final Children inferiors;
     private final Selectability selectability;
     private final MailboxId mailboxId;
+    private final MailboxACL resolvedAcls;
 
-    public MailboxMetaData(MailboxPath path, MailboxId mailboxId, char delimiter, Children inferiors, Selectability selectability) {
+    public MailboxMetaData(MailboxPath path, MailboxId mailboxId, char delimiter, Children inferiors, Selectability selectability, MailboxACL resolvedAcls) {
         this.path = path;
         this.mailboxId = mailboxId;
         this.delimiter = delimiter;
         this.inferiors = inferiors;
         this.selectability = selectability;
+        this.resolvedAcls = resolvedAcls;
     }
 
+    public MailboxACL getResolvedAcls() {
+        return resolvedAcls;
+    }
 
     /**
      * Gets the inferiors status of this mailbox.
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 c3a81a1..5f634be 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
@@ -894,6 +894,34 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
         }
 
         @Test
+        void searchShouldReturnACL() throws Exception {
+            assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Namespace));
+            assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.ACL));
+            session = mailboxManager.createSystemSession(USER_1);
+            Optional<MailboxId> inboxId = mailboxManager.createMailbox(MailboxPath.inbox(session), session);
+
+            MailboxACL acl = MailboxACL.EMPTY.apply(MailboxACL.command()
+                .forUser(USER_2)
+                .rights(MailboxACL.Right.Read, MailboxACL.Right.Lookup)
+                .asAddition());
+            mailboxManager.setRights(inboxId.get(), acl, session);
+
+            List<MailboxMetaData> metaDatas = mailboxManager.search(
+                MailboxQuery.privateMailboxesBuilder(session)
+                    .matchesAllMailboxNames()
+                    .build(),
+                session);
+            assertThat(metaDatas)
+                .hasSize(1)
+                .first()
+                .extracting(MailboxMetaData::getResolvedAcls)
+                .isEqualTo(acl.apply(MailboxACL.command()
+                    .forOwner()
+                    .rights(MailboxACL.Rfc4314Rights.allExcept())
+                    .asAddition()));
+        }
+
+        @Test
         void searchShouldNotReturnResultsFromOtherUsers() throws Exception {
             session = mailboxManager.createSystemSession(USER_1);
             MailboxSession session2 = mailboxManager.createSystemSession(USER_2);
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 2f3ae29..e11ab25 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
@@ -48,6 +48,7 @@ import org.apache.james.mailbox.exception.InsufficientRightsException;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.exception.MailboxExistsException;
 import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.exception.UnsupportedRightException;
 import org.apache.james.mailbox.extension.PreDeletionHook;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxACL;
@@ -575,7 +576,7 @@ public class StoreMailboxManager implements MailboxManager {
         return mailboxes
             .stream()
             .filter(mailboxQuery::matches)
-            .map(mailbox -> toMailboxMetadata(session, mailboxes, mailbox))
+            .map(Throwing.<Mailbox, MailboxMetaData>function(mailbox -> toMailboxMetadata(session, mailboxes, mailbox)).sneakyThrow())
             .sorted(MailboxMetaData.COMPARATOR)
             .collect(Guavate.toImmutableList());
     }
@@ -598,13 +599,14 @@ public class StoreMailboxManager implements MailboxManager {
         return mailboxMapper.findNonPersonalMailboxes(session.getUser(), right).stream();
     }
 
-    private MailboxMetaData toMailboxMetadata(MailboxSession session, List<Mailbox> mailboxes, Mailbox mailbox) {
+    private MailboxMetaData toMailboxMetadata(MailboxSession session, List<Mailbox> mailboxes, Mailbox mailbox) throws UnsupportedRightException {
         return new MailboxMetaData(
             mailbox.generateAssociatedPath(),
             mailbox.getMailboxId(),
             getDelimiter(),
             computeChildren(session, mailboxes, mailbox),
-            Selectability.NONE);
+            Selectability.NONE,
+            storeRightManager.getResolvedMailboxACL(mailbox, session));
     }
 
     private MailboxMetaData.Children computeChildren(MailboxSession session, List<Mailbox> potentialChildren, Mailbox mailbox) {


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 40/44: JAMES-2632 Optimize get all mailboxes

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit f6670e96f631ef64a526aacf2cf72ab351d8f01c
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 7 14:46:45 2019 +0700

    JAMES-2632 Optimize get all mailboxes
---
 .../jmap/draft/methods/GetMailboxesMethod.java     |  5 +-
 .../james/jmap/draft/model/MailboxFactory.java     | 76 ++++++++++++++++++----
 .../james/jmap/draft/model/MailboxFactoryTest.java | 58 ++++++++++++++++-
 3 files changed, 122 insertions(+), 17 deletions(-)

diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/GetMailboxesMethod.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/GetMailboxesMethod.java
index b53565f..64623d1 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/GetMailboxesMethod.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/GetMailboxesMethod.java
@@ -151,9 +151,8 @@ public class GetMailboxesMethod implements Method {
 
         return userMailboxes
             .stream()
-            .map(MailboxMetaData::getId)
-            .map(mailboxId -> mailboxFactory.builder()
-                .id(mailboxId)
+            .map(mailboxMetaData -> mailboxFactory.builder()
+                .mailboxMetadata(mailboxMetaData)
                 .session(mailboxSession)
                 .usingPreloadedMailboxesMetadata(Optional.of(userMailboxes))
                 .quotaLoader(quotaLoader)
diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java
index a8f097d..796cf59 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MailboxFactory.java
@@ -37,16 +37,22 @@ import org.apache.james.mailbox.MessageManager;
 import org.apache.james.mailbox.Role;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxCounters;
 import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MailboxMetaData;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.quota.QuotaManager;
 import org.apache.james.mailbox.quota.QuotaRootResolver;
+import org.apache.james.util.OptionalUtils;
 
+import com.github.fge.lambdas.Throwing;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
+import com.google.common.primitives.Booleans;
+
+import reactor.core.publisher.Mono;
 
 public class MailboxFactory {
     private final MailboxManager mailboxManager;
@@ -57,7 +63,8 @@ public class MailboxFactory {
         private final MailboxFactory mailboxFactory;
         private QuotaLoader quotaLoader;
         private MailboxSession session;
-        private MailboxId id;
+        private Optional<MailboxId> id = Optional.empty();
+        private Optional<MailboxMetaData> mailboxMetaData = Optional.empty();
         private Optional<List<MailboxMetaData>> userMailboxesMetadata = Optional.empty();
 
         private MailboxBuilder(MailboxFactory mailboxFactory, QuotaLoader quotaLoader) {
@@ -66,7 +73,12 @@ public class MailboxFactory {
         }
 
         public MailboxBuilder id(MailboxId id) {
-            this.id = id;
+            this.id = Optional.of(id);
+            return this;
+        }
+
+        public MailboxBuilder mailboxMetadata(MailboxMetaData mailboxMetaData) {
+            this.mailboxMetaData = Optional.of(mailboxMetaData);
             return this;
         }
 
@@ -86,18 +98,55 @@ public class MailboxFactory {
         }
 
         public Optional<Mailbox> build() {
-            Preconditions.checkNotNull(id);
             Preconditions.checkNotNull(session);
 
             try {
-                MessageManager mailbox = mailboxFactory.mailboxManager.getMailbox(id, session);
-                return Optional.of(mailboxFactory.fromMessageManager(mailbox, userMailboxesMetadata, quotaLoader, session));
+                MailboxId mailboxId = computeMailboxId();
+                Mono<MessageManager> mailbox = mailbox(mailboxId).cache();
+
+                MailboxACL mailboxACL = mailboxMetaData.map(MailboxMetaData::getResolvedAcls)
+                    .orElseGet(Throwing.supplier(() -> retrieveCachedMailbox(mailboxId, mailbox).getResolvedAcl(session)).sneakyThrow());
+
+                MailboxPath mailboxPath = mailboxMetaData.map(MailboxMetaData::getPath)
+                    .orElseGet(Throwing.supplier(() -> retrieveCachedMailbox(mailboxId, mailbox).getMailboxPath()).sneakyThrow());
+
+                MailboxCounters mailboxCounters = mailboxMetaData.map(MailboxMetaData::getCounters)
+                    .orElseGet(Throwing.supplier(() -> retrieveCachedMailbox(mailboxId, mailbox).getMailboxCounters(session)).sneakyThrow());
+
+                return Optional.of(mailboxFactory.from(
+                    mailboxId,
+                    mailboxPath,
+                    mailboxCounters,
+                    mailboxACL,
+                    userMailboxesMetadata,
+                    quotaLoader,
+                    session));
             } catch (MailboxNotFoundException e) {
                 return Optional.empty();
             } catch (MailboxException e) {
                 throw new RuntimeException(e);
             }
         }
+
+        private MailboxId computeMailboxId() {
+            int idCount = Booleans.countTrue(id.isPresent(), mailboxMetaData.isPresent());
+            Preconditions.checkState(idCount == 1, "You need exectly one 'id' 'mailboxMetaData'");
+            return OptionalUtils.or(
+                id,
+                mailboxMetaData.map(MailboxMetaData::getId))
+                .get();
+        }
+
+        private Mono<MessageManager> mailbox(MailboxId mailboxId) {
+            return Mono.fromCallable(() -> mailboxFactory.mailboxManager.getMailbox(mailboxId, session));
+        }
+
+        private MessageManager retrieveCachedMailbox(MailboxId mailboxId, Mono<MessageManager> mailbox) throws MailboxNotFoundException {
+            return mailbox
+                .onErrorResume(MailboxNotFoundException.class, any -> Mono.empty())
+                .blockOptional()
+                .orElseThrow(() -> new MailboxNotFoundException(mailboxId));
+        }
     }
 
     @Inject
@@ -112,23 +161,24 @@ public class MailboxFactory {
         return new MailboxBuilder(this, defaultQuotaLoader);
     }
 
-    private Mailbox fromMessageManager(MessageManager messageManager,
-                                       Optional<List<MailboxMetaData>> userMailboxesMetadata,
-                                       QuotaLoader quotaLoader,
-                                       MailboxSession mailboxSession) throws MailboxException {
-        MailboxPath mailboxPath = messageManager.getMailboxPath();
+    private Mailbox from(MailboxId mailboxId,
+                         MailboxPath mailboxPath,
+                         MailboxCounters mailboxCounters,
+                         MailboxACL resolvedAcl,
+                         Optional<List<MailboxMetaData>> userMailboxesMetadata,
+                         QuotaLoader quotaLoader,
+                         MailboxSession mailboxSession) throws MailboxException {
         boolean isOwner = mailboxPath.belongsTo(mailboxSession);
         Optional<Role> role = Role.from(mailboxPath.getName());
-        MailboxCounters mailboxCounters = messageManager.getMailboxCounters(mailboxSession);
 
-        Rights rights = Rights.fromACL(messageManager.getResolvedAcl(mailboxSession))
+        Rights rights = Rights.fromACL(resolvedAcl)
             .removeEntriesFor(mailboxPath.getUser());
         Username username = mailboxSession.getUser();
 
         Quotas quotas = quotaLoader.getQuotas(mailboxPath);
 
         return Mailbox.builder()
-            .id(messageManager.getId())
+            .id(mailboxId)
             .name(getName(mailboxPath, mailboxSession))
             .parentId(getParentIdFromMailboxPath(mailboxPath, userMailboxesMetadata, mailboxSession).orElse(null))
             .role(role)
diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
index a082e7e..f9c437a 100644
--- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
+++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
@@ -18,13 +18,17 @@
  ****************************************************************/
 package org.apache.james.jmap.draft.model;
 
+import static org.apache.james.mailbox.manager.ManagerTestProvisionner.OTHER_USER;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
 
 import java.util.Optional;
 
 import org.apache.james.core.Username;
 import org.apache.james.jmap.draft.model.mailbox.Mailbox;
 import org.apache.james.jmap.draft.model.mailbox.MailboxNamespace;
+import org.apache.james.jmap.draft.model.mailbox.Rights;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.inmemory.InMemoryId;
 import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
@@ -34,6 +38,7 @@ 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;
+import org.apache.james.mailbox.model.search.MailboxQuery;
 import org.apache.james.mailbox.quota.QuotaManager;
 import org.apache.james.mailbox.quota.QuotaRootResolver;
 import org.apache.james.mailbox.store.StoreMailboxManager;
@@ -43,6 +48,7 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 
 public class MailboxFactoryTest {
     public static final char DELIMITER = '.';
@@ -64,7 +70,7 @@ public class MailboxFactoryTest {
         QuotaManager quotaManager = mailboxManager.getQuotaComponents().getQuotaManager();
 
         user = ManagerTestProvisionner.USER;
-        otherUser = ManagerTestProvisionner.OTHER_USER;
+        otherUser = OTHER_USER;
         mailboxSession = mailboxManager.login(user, ManagerTestProvisionner.USER_PASS);
         otherMailboxSession = mailboxManager.login(otherUser, ManagerTestProvisionner.OTHER_USER_PASS);
         sut = new MailboxFactory(mailboxManager, quotaManager, quotaRootResolver);
@@ -306,4 +312,54 @@ public class MailboxFactoryTest {
         softly.assertThat(retrievedMailbox.isMayRemoveItems()).isTrue();
         softly.assertThat(retrievedMailbox.isMayRename()).isFalse();
     }
+
+    @Test
+    public void mailboxFromMetaDataShouldReturnPresentStoredValue() throws Exception {
+        String name = "myBox";
+        MailboxPath mailboxPath = MailboxPath.forUser(user, name);
+        mailboxManager.createMailbox(mailboxPath, mailboxSession);
+        mailboxManager.setRights(mailboxPath, MailboxACL.EMPTY.apply(MailboxACL.command()
+                .forUser(OTHER_USER)
+                .rights(MailboxACL.Right.Lookup, MailboxACL.Right.Read)
+                .asAddition()),
+            mailboxSession);
+        MailboxMetaData metaData = mailboxManager.search(MailboxQuery.privateMailboxesBuilder(mailboxSession).build(), mailboxSession)
+            .stream()
+            .filter(metadata -> metadata.getPath().equals(mailboxPath))
+            .findFirst()
+            .get();
+
+        Optional<Mailbox> mailbox = sut.builder()
+            .mailboxMetadata(metaData)
+            .session(mailboxSession)
+            .build();
+
+        softly.assertThat(mailbox).isPresent();
+        softly.assertThat(mailbox).map(Mailbox::getId).contains(metaData.getId());
+        softly.assertThat(mailbox).map(Mailbox::getName).contains(name);
+        softly.assertThat(mailbox).map(Mailbox::getTotalMessages).contains(Number.ZERO);
+        softly.assertThat(mailbox).map(Mailbox::getUnreadMessages).contains(Number.ZERO);
+        softly.assertThat(mailbox).map(Mailbox::getSharedWith).contains(new Rights(ImmutableMap.of(
+            OTHER_USER, ImmutableList.of(Rights.Right.Lookup, Rights.Right.Read))));
+    }
+
+    @Test
+    public void buildShouldThrowWhenBothMetadataAndId() {
+        assertThatThrownBy(() ->
+            sut.builder()
+                .session(mailboxSession)
+                .id(mock(MailboxId.class))
+                .mailboxMetadata(mock(MailboxMetaData.class))
+                .build())
+            .isInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void buildShouldThrowWhenNoId() {
+        assertThatThrownBy(() ->
+            sut.builder()
+                .session(mailboxSession)
+                .build())
+            .isInstanceOf(IllegalStateException.class);
+    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 18/44: [Refactoring] MessageResultImpl: avoid final variable

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 61f0531cbff32a5d2b48fcbf4f5fde9a2014dd48
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:15:20 2019 +0700

    [Refactoring] MessageResultImpl: avoid final variable
---
 .../apache/james/mailbox/store/MessageResultImpl.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 5302315..520d04f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -51,6 +51,7 @@ import com.google.common.base.Objects;
  * Bean based implementation.
  */
 public class MessageResultImpl implements MessageResult {
+    private static final String TAB = " ";
 
     private final Map<MimePath, PartContent> partsByPath = new HashMap<>();
 
@@ -152,9 +153,8 @@ public class MessageResultImpl implements MessageResult {
      * @return a <code>String</code> representation of this object.
      */
     public String toString() {
-        final String TAB = " ";
-
-        return "MessageResultImpl ( " + "uid = " + getUid() + TAB + "flags = " + getFlags() + TAB + "size = " + getSize() + TAB + "internalDate = " + getInternalDate() + ")";
+        return "MessageResultImpl ( " + "uid = " + getUid() + TAB + "flags = " + getFlags() + TAB + "size = " + getSize()
+            + TAB + "internalDate = " + getInternalDate() + ")";
     }
 
     @Override
@@ -188,27 +188,27 @@ public class MessageResultImpl implements MessageResult {
     }
 
     void setBodyContent(MimePath path, Content content) {
-        final PartContent partContent = getPartContent(path);
+        PartContent partContent = getPartContent(path);
         partContent.setBody(content);
     }
 
     void setMimeBodyContent(MimePath path, Content content) {
-        final PartContent partContent = getPartContent(path);
+        PartContent partContent = getPartContent(path);
         partContent.setMimeBody(content);
     }
 
     void setFullContent(MimePath path, Content content) {
-        final PartContent partContent = getPartContent(path);
+        PartContent partContent = getPartContent(path);
         partContent.setFull(content);
     }
 
     void setHeaders(MimePath path, Iterator<Header> headers) {
-        final PartContent partContent = getPartContent(path);
+        PartContent partContent = getPartContent(path);
         partContent.setHeaders(headers);
     }
 
     void setMimeHeaders(MimePath path, Iterator<Header> headers) {
-        final PartContent partContent = getPartContent(path);
+        PartContent partContent = getPartContent(path);
         partContent.setMimeHeaders(headers);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 19/44: [Refactoring] MessageResultImpl: HeadersImpl can be static

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 9230fb5965b6b64cc949c019dadd0cbd14feed41
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:17:08 2019 +0700

    [Refactoring] MessageResultImpl: HeadersImpl can be static
---
 .../org/apache/james/mailbox/store/MessageResultImpl.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 520d04f..9350694 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -312,18 +312,18 @@ public class MessageResultImpl implements MessageResult {
         return message.getAttachments();
     }
     
-    private final class HeadersImpl implements Headers {
+    private static final class HeadersImpl implements Headers {
 
-        private final Message msg;
+        private final MailboxMessage msg;
         private List<Header> headers;
         
-        private HeadersImpl(Message msg) {
+        private HeadersImpl(MailboxMessage msg) {
             this.msg = msg;
         }
 
         @Override
         public int hashCode() {
-            return 39 * 19 + message.hashCode();
+            return 39 * 19 + msg.hashCode();
         }
 
         @Override
@@ -351,13 +351,12 @@ public class MessageResultImpl implements MessageResult {
         public Iterator<Header> headers() throws MailboxException {
             if (headers == null) {
                 try {
-                    headers = ResultUtils.createHeaders(message);
+                    headers = ResultUtils.createHeaders(msg);
                 } catch (IOException e) {
                     throw new MailboxException("Unable to parse headers", e);
                 }
             }
             return headers.iterator();
         }
-        
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 24/44: [Refactoring] MimeDescriptorImpl: avoid line break between fields

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit b653317ac1f8ddb09a2c942eab349621ed46c70f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:30:19 2019 +0700

    [Refactoring] MimeDescriptorImpl: avoid line break between fields
---
 .../apache/james/mailbox/store/MimeDescriptorImpl.java   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index 89980c2..4bf5917 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -186,38 +186,22 @@ public class MimeDescriptorImpl implements MimeDescriptor {
     }
 
     private final long bodyOctets;
-
     private final String contentDescription;
-
     private final String contentId;
-
     private final long lines;
-
     private final String subType;
-
     private final String type;
-
     private final String transferEncoding;
-
     private final List<String> languages;
-
     private final Collection<MessageResult.Header> headers;
-
     private final Map<String, String> contentTypeParameters;
-
     private final String disposition;
-
     private final Map<String, String> dispositionParams;
-
     private final MimeDescriptor embeddedMessage;
-
     private final Collection<MimeDescriptor> parts;
-
     private final String location;
-
     private final String md5;
 
-
     public MimeDescriptorImpl(long bodyOctets,
             String contentDescription, String contentId,
             long lines, String subType, String type,


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 10/44: [Refactoring] ResultUtils: Remove unused javadoc and constants

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 4caef1433ab8a6a64d2d1d1e76296b26a2f23ed3
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 10:54:42 2019 +0700

    [Refactoring] ResultUtils: Remove unused javadoc and constants
---
 .../java/org/apache/james/mailbox/store/ResultUtils.java     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
index 22bf394..5c89c36 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
@@ -42,17 +42,8 @@ import org.apache.james.mime4j.stream.RawField;
 import org.apache.james.mime4j.util.ByteSequence;
 import org.apache.james.mime4j.util.ContentUtil;
 
-/**
- *
- */
 public class ResultUtils {
 
-    public static final byte[] BYTES_NEW_LINE = { 0x0D, 0x0A };
-
-    public static final byte[] BYTES_HEADER_FIELD_VALUE_SEP = { 0x3A, 0x20 };
-
-    static final Charset US_ASCII = Charset.forName("US-ASCII");
-
     public static List<MessageResult.Header> createHeaders(MailboxMessage document) throws IOException {
         final List<MessageResult.Header> results = new ArrayList<>();
         final MimeStreamParser parser = new MimeStreamParser(MimeConfig.PERMISSIVE);
@@ -96,9 +87,6 @@ public class ResultUtils {
         }
         return results;
     }
-
-  
-  
     
     /**
      * Return the {@link MessageResult} for the given {@link MailboxMessage} and {@link FetchGroup}


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 30/44: [Refactoring] ResultHeader: avoid line breaks between fields

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 6fc4fcaa4bc5166a04a0572b85128511d0a4a512
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:37:28 2019 +0700

    [Refactoring] ResultHeader: avoid line breaks between fields
---
 .../src/main/java/org/apache/james/mailbox/store/ResultHeader.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
index 26ff409..fd0b619 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
@@ -32,15 +32,13 @@ import org.apache.james.mailbox.model.MessageResult;
 
 public final class ResultHeader implements MessageResult.Header {
     private final String name;
-
     private final String value;
-
     private final long size;
 
     public ResultHeader(String name, String value) {
         this.name = name;
         this.value = value;
-        size = name.length() + value.length() + 2;
+        this.size = name.length() + value.length() + 2;
     }
 
     @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 26/44: [Refactoring] MimeDescriptorImpl: Move isComposite to MessageResultImpl

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit ad5f84de6aa16acf85520d8dd29c3fbc4cef7e1e
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:32:57 2019 +0700

    [Refactoring] MimeDescriptorImpl: Move isComposite to MessageResultImpl
---
 .../org/apache/james/mailbox/store/MessageResultImpl.java  | 14 +++++++++++++-
 .../org/apache/james/mailbox/store/MimeDescriptorImpl.java | 12 ------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 4fcc707..fb3b9cb 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -279,7 +279,7 @@ public class MessageResultImpl implements MessageResult {
         // it can be relative expensive on big messages and slow mailbox implementations
         if (mimeDescriptor == null) {
             try {
-                if (MimeDescriptorImpl.isComposite(message.getMediaType())) {
+                if (isComposite(message.getMediaType())) {
                     mimeDescriptor = MimeDescriptorImpl.build(getFullContent().getInputStream());
                 } else {
                     mimeDescriptor = new LazyMimeDescriptor(this, message);
@@ -290,6 +290,18 @@ public class MessageResultImpl implements MessageResult {
         }
         return mimeDescriptor;
     }
+
+    /**
+     * Is this a composite media type (as per RFC2045)?
+     *
+     * TODO: Move to Mime4j
+     * @param mediaType possibly null
+     * @return true when the type is composite,
+     * false otherwise
+     */
+    private boolean isComposite(String mediaType) {
+        return "message".equalsIgnoreCase(mediaType) || "multipart".equalsIgnoreCase(mediaType);
+    }
     
     @Override
     public Headers getHeaders() {
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index a06e7ef..4c43e1f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -45,18 +45,6 @@ import org.apache.james.mime4j.stream.RecursionMode;
 
 public class MimeDescriptorImpl implements MimeDescriptor {
 
-    /**
-     * Is this a composite media type (as per RFC2045)?
-     * 
-     * TODO: Move to Mime4j
-     * @param mediaType possibly null
-     * @return true when the type is composite,
-     * false otherwise
-     */
-    public static boolean isComposite(String mediaType) {
-        return "message".equalsIgnoreCase(mediaType) || "multipart".equalsIgnoreCase(mediaType);
-    }
-
     public static MimeDescriptorImpl build(InputStream stream) throws IOException, MimeException {
         // Disable line length limit
         // See https://issues.apache.org/jira/browse/IMAP-132


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 04/44: JAMES-2949 JWT authentication strategy should not accept invalid usernames

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit a7e583ccb4fa04581786e5b65d0c8154cce530a5
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 14:16:58 2019 +0700

    JAMES-2949 JWT authentication strategy should not accept invalid usernames
    
    Before that we were creating mailbox session for:
     - domains that we do not handle
     - usernames with invalid virtualHosting
    
    Trusting external systems for Username validity is definitely a harmful strategy
    and we should enforce username validity before.
---
 .../org/apache/james/user/api/UsersRepository.java |  5 ++
 .../user/cassandra/CassandraUsersRepository.java   |  2 +-
 .../james/user/lib/AbstractUsersRepository.java    |  5 +-
 .../user/memory/MemoryUsersRepositoryTest.java     | 66 +++++++++++++++++++++-
 .../jmap/draft/JWTAuthenticationStrategy.java      | 19 +++++--
 .../jmap/draft/JWTAuthenticationStrategyTest.java  | 31 +++++++---
 .../jmap/draft/UserProvisioningFilterTest.java     | 10 ++--
 7 files changed, 117 insertions(+), 21 deletions(-)

diff --git a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java
index 263d9af..742fbc3 100644
--- a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java
+++ b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java
@@ -156,4 +156,9 @@ public interface UsersRepository {
      */
     boolean isReadOnly();
 
+    default void assertValid(Username username) throws UsersRepositoryException {
+        if (username.getDomainPart().isPresent() != supportVirtualHosting()) {
+            throw new UsersRepositoryException(username.asString() + " username candidate do not match the virtualHosting strategy");
+        }
+    }
 }
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
index cd8070b..2cdcc7c 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
@@ -184,7 +184,7 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
 
     @Override
     public void addUser(Username username, String password) throws UsersRepositoryException {
-        isValidUsername(username);
+        assertValid(username);
         doAddUser(username, password);
     }
 
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
index 55b9ab9..2e26359 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
@@ -70,7 +70,8 @@ public abstract class AbstractUsersRepository implements UsersRepository, Config
         this.domainList = domainList;
     }
 
-    protected void isValidUsername(Username username) throws UsersRepositoryException {
+    @Override
+    public void assertValid(Username username) throws UsersRepositoryException {
         if (supportVirtualHosting()) {
             // need a @ in the username
             if (!username.hasDomainPart()) {
@@ -97,7 +98,7 @@ public abstract class AbstractUsersRepository implements UsersRepository, Config
     public void addUser(Username username, String password) throws UsersRepositoryException {
 
         if (!contains(username)) {
-            isValidUsername(username);
+            assertValid(username);
             doAddUser(username, password);
         } else {
             throw new AlreadyExistInUsersRepositoryException("User with username " + username + " already exists!");
diff --git a/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java b/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
index 7aa49cb..c0a0aa6 100644
--- a/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
+++ b/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
@@ -19,9 +19,18 @@
 
 package org.apache.james.user.memory;
 
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.apache.james.core.Domain;
+import org.apache.james.core.Username;
+import org.apache.james.dnsservice.api.InMemoryDNSService;
+import org.apache.james.domainlist.memory.MemoryDomainList;
+import org.apache.james.user.api.UsersRepositoryException;
 import org.apache.james.user.lib.AbstractUsersRepository;
 import org.apache.james.user.lib.AbstractUsersRepositoryTest;
 import org.junit.Before;
+import org.junit.Test;
 
 public class MemoryUsersRepositoryTest extends AbstractUsersRepositoryTest {
 
@@ -32,7 +41,62 @@ public class MemoryUsersRepositoryTest extends AbstractUsersRepositoryTest {
     }
     
     @Override
-    protected AbstractUsersRepository getUsersRepository() throws Exception {
+    protected AbstractUsersRepository getUsersRepository() {
         return MemoryUsersRepository.withVirtualHosting();
     }
+
+    @Test
+    public void assertValidShouldThrowWhenDomainPartAndNoVirtualHosting() {
+        MemoryUsersRepository memoryUsersRepository = MemoryUsersRepository.withoutVirtualHosting();
+
+        assertThatThrownBy(() -> memoryUsersRepository.assertValid(Username.of("user@domain.tld")))
+            .isInstanceOf(UsersRepositoryException.class);
+    }
+
+    @Test
+    public void assertValidShouldThrowWhenNoDomainPartAndVirtualHosting() {
+        MemoryUsersRepository memoryUsersRepository = MemoryUsersRepository.withVirtualHosting();
+
+        assertThatThrownBy(() -> memoryUsersRepository.assertValid(Username.of("user")))
+            .isInstanceOf(UsersRepositoryException.class);
+    }
+
+    @Test
+    public void assertValidShouldNotThrowWhenDomainPartAndVirtualHosting() throws Exception {
+        MemoryUsersRepository memoryUsersRepository = MemoryUsersRepository.withVirtualHosting();
+
+        MemoryDomainList domainList = new MemoryDomainList(new InMemoryDNSService()
+            .registerMxRecord("localhost", "127.0.0.1")
+            .registerMxRecord("127.0.0.1", "127.0.0.1"));
+        domainList.setAutoDetect(false);
+        domainList.setAutoDetectIP(false);
+        domainList.addDomain(Domain.of("domain.tld"));
+        memoryUsersRepository.setDomainList(domainList);
+
+        assertThatCode(() -> memoryUsersRepository.assertValid(Username.of("user@domain.tld")))
+            .doesNotThrowAnyException();
+    }
+
+    @Test
+    public void assertValidShouldNotThrowWhenDomainPartAndDomainNotFound() throws Exception {
+        MemoryUsersRepository memoryUsersRepository = MemoryUsersRepository.withVirtualHosting();
+
+        MemoryDomainList domainList = new MemoryDomainList(new InMemoryDNSService()
+            .registerMxRecord("localhost", "127.0.0.1")
+            .registerMxRecord("127.0.0.1", "127.0.0.1"));
+        domainList.setAutoDetect(false);
+        domainList.setAutoDetectIP(false);
+        memoryUsersRepository.setDomainList(domainList);
+
+        assertThatThrownBy(() -> memoryUsersRepository.assertValid(Username.of("user@domain.tld")))
+            .isInstanceOf(UsersRepositoryException.class);
+    }
+
+    @Test
+    public void assertValidShouldNotThrowWhenNoDomainPartAndNoVirtualHosting() {
+        MemoryUsersRepository memoryUsersRepository = MemoryUsersRepository.withoutVirtualHosting();
+
+        assertThatCode(() -> memoryUsersRepository.assertValid(Username.of("user")))
+            .doesNotThrowAnyException();
+    }
 }
diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JWTAuthenticationStrategy.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JWTAuthenticationStrategy.java
index 2c7063b..7a6dfa3 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JWTAuthenticationStrategy.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JWTAuthenticationStrategy.java
@@ -31,6 +31,8 @@ import org.apache.james.jwt.JwtTokenVerifier;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersRepositoryException;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -40,22 +42,31 @@ public class JWTAuthenticationStrategy implements AuthenticationStrategy {
     private final JwtTokenVerifier tokenManager;
     private final MailboxManager mailboxManager;
     private final HeadersAuthenticationExtractor authenticationExtractor;
+    private final UsersRepository usersRepository;
 
     @Inject
     @VisibleForTesting
-    JWTAuthenticationStrategy(JwtTokenVerifier tokenManager, MailboxManager mailboxManager, HeadersAuthenticationExtractor authenticationExtractor) {
+    JWTAuthenticationStrategy(JwtTokenVerifier tokenManager, MailboxManager mailboxManager, HeadersAuthenticationExtractor authenticationExtractor, UsersRepository usersRepository) {
         this.tokenManager = tokenManager;
         this.mailboxManager = mailboxManager;
         this.authenticationExtractor = authenticationExtractor;
+        this.usersRepository = usersRepository;
     }
 
     @Override
     public MailboxSession createMailboxSession(HttpServletRequest httpRequest) throws MailboxSessionCreationException, NoValidAuthHeaderException {
 
         Stream<Username> userLoginStream = extractTokensFromAuthHeaders(authenticationExtractor.authHeaders(httpRequest))
-                .filter(tokenManager::verify)
-                .map(tokenManager::extractLogin)
-                .map(Username::of);
+            .filter(tokenManager::verify)
+            .map(tokenManager::extractLogin)
+            .map(Username::of)
+            .peek(username -> {
+                try {
+                    usersRepository.assertValid(username);
+                } catch (UsersRepositoryException e) {
+                    throw new MailboxSessionCreationException(e);
+                }
+            });
 
         Stream<MailboxSession> mailboxSessionStream = userLoginStream
                 .map(login -> {
diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JWTAuthenticationStrategyTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JWTAuthenticationStrategyTest.java
index 47db962..08110c0 100644
--- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JWTAuthenticationStrategyTest.java
+++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JWTAuthenticationStrategyTest.java
@@ -29,7 +29,6 @@ import java.util.stream.Stream;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.james.core.Username;
-import org.apache.james.jmap.draft.JWTAuthenticationStrategy;
 import org.apache.james.jmap.draft.exceptions.MailboxSessionCreationException;
 import org.apache.james.jmap.draft.exceptions.NoValidAuthHeaderException;
 import org.apache.james.jmap.draft.utils.HeadersAuthenticationExtractor;
@@ -37,12 +36,10 @@ import org.apache.james.jwt.JwtTokenVerifier;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.user.api.model.User;
-
+import org.apache.james.user.memory.MemoryUsersRepository;
 import org.junit.Before;
 import org.junit.Test;
 
-
 public class JWTAuthenticationStrategyTest {
 
     private JWTAuthenticationStrategy testee;
@@ -57,13 +54,14 @@ public class JWTAuthenticationStrategyTest {
         mockedMailboxManager = mock(MailboxManager.class);
         mockAuthenticationExtractor = mock(HeadersAuthenticationExtractor.class);
         request = mock(HttpServletRequest.class);
+        MemoryUsersRepository usersRepository = MemoryUsersRepository.withoutVirtualHosting();
 
-        testee = new JWTAuthenticationStrategy(stubTokenVerifier, mockedMailboxManager, mockAuthenticationExtractor);
+        testee = new JWTAuthenticationStrategy(stubTokenVerifier, mockedMailboxManager, mockAuthenticationExtractor, usersRepository);
     }
 
 
     @Test
-    public void createMailboxSessionShouldThrowWhenAuthHeaderIsEmpty() throws Exception {
+    public void createMailboxSessionShouldThrowWhenAuthHeaderIsEmpty() {
         when(mockAuthenticationExtractor.authHeaders(request))
             .thenReturn(Stream.empty());
 
@@ -91,7 +89,7 @@ public class JWTAuthenticationStrategyTest {
     }
 
     @Test
-    public void createMailboxSessionShouldReturnEmptyWhenAuthHeaderIsInvalid() throws Exception {
+    public void createMailboxSessionShouldReturnEmptyWhenAuthHeaderIsInvalid() {
         when(mockAuthenticationExtractor.authHeaders(request))
             .thenReturn(Stream.of("bad"));
 
@@ -134,4 +132,23 @@ public class JWTAuthenticationStrategyTest {
         MailboxSession result = testee.createMailboxSession(request);
         assertThat(result).isEqualTo(fakeMailboxSession);
     }
+
+    @Test
+    public void createMailboxSessionShouldThrowUponInvalidVirtualHosting() throws Exception {
+        String username = "123456789@domain.tld";
+        String validAuthHeader = "valid";
+        String fakeAuthHeaderWithPrefix = JWTAuthenticationStrategy.AUTHORIZATION_HEADER_PREFIX + validAuthHeader;
+        MailboxSession fakeMailboxSession = mock(MailboxSession.class);
+
+        when(stubTokenVerifier.verify(validAuthHeader)).thenReturn(true);
+        when(stubTokenVerifier.extractLogin(validAuthHeader)).thenReturn(username);
+        when(mockedMailboxManager.createSystemSession(eq(Username.of(username))))
+                .thenReturn(fakeMailboxSession);
+        when(mockAuthenticationExtractor.authHeaders(request))
+            .thenReturn(Stream.of(fakeAuthHeaderWithPrefix));
+
+
+        assertThatThrownBy(() -> testee.createMailboxSession(request))
+            .isInstanceOf(MailboxSessionCreationException.class);
+    }
 }
\ No newline at end of file
diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/UserProvisioningFilterTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/UserProvisioningFilterTest.java
index aa6e6a5..5b03808 100644
--- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/UserProvisioningFilterTest.java
+++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/UserProvisioningFilterTest.java
@@ -19,6 +19,7 @@
 package org.apache.james.jmap.draft;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -86,17 +87,14 @@ public class UserProvisioningFilterTest {
     }
 
     @Test
-    public void filterShouldAddUsernameWhenNoVirtualHostingAndMailboxSessionContainsMail() throws Exception {
+    public void filterShouldFailOnInvalidVirtualHosting() {
         usersRepository.setEnableVirtualHosting(false);
         MailboxSession mailboxSession = MailboxSessionUtil.create(USERNAME_WITH_DOMAIN);
         when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
             .thenReturn(mailboxSession);
 
-        sut.doFilter(request, response, chain);
-
-        verify(chain).doFilter(request, response);
-        assertThat(usersRepository.list()).toIterable()
-            .contains(USERNAME);
+        assertThatThrownBy(() -> sut.doFilter(request, response, chain))
+            .hasCauseInstanceOf(UsersRepositoryException.class);
     }
 
     @Test


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 21/44: [Refactoring] MessageResultImpl: getPartContent computeIfAbsent

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 7463a26da791c54e3fae662cfa73d39dcd434a3d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:24:51 2019 +0700

    [Refactoring] MessageResultImpl: getPartContent computeIfAbsent
---
 .../java/org/apache/james/mailbox/store/MessageResultImpl.java    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index d67d32e..4fcc707 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -40,7 +40,6 @@ import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageResult;
 import org.apache.james.mailbox.model.MimeDescriptor;
 import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.mailbox.store.mail.model.Message;
 import org.apache.james.mailbox.store.streaming.InputStreamContent;
 import org.apache.james.mailbox.store.streaming.InputStreamContent.Type;
 import org.apache.james.mime4j.MimeException;
@@ -211,12 +210,7 @@ public class MessageResultImpl implements MessageResult {
     }
 
     private PartContent getPartContent(MimePath path) {
-        PartContent result = partsByPath.get(path);
-        if (result == null) {
-            result = new PartContent();
-            partsByPath.put(path, result);
-        }
-        return result;
+        return partsByPath.computeIfAbsent(path, any -> new PartContent());
     }
 
     private static final class PartContent {


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 16/44: [Refactoring] MessageResultImpl: partContent can never be null

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 7b8fc368f93315dcf3830a51e846c1749c7d4d4d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:12:35 2019 +0700

    [Refactoring] MessageResultImpl: partContent can never be null
    
    IntelliJ asserted
---
 .../james/mailbox/store/MessageResultImpl.java     | 50 +++++-----------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 775ae7a..133415f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -159,62 +159,32 @@ public class MessageResultImpl implements MessageResult {
 
     @Override
     public Content getBody(MimePath path) {
-        final Content result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getBody();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getBody();
     }
 
     @Override
     public Content getMimeBody(MimePath path) {
-        final Content result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getMimeBody();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getMimeBody();
     }
 
     @Override
     public Content getFullContent(MimePath path) {
-        final Content result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getFull();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getFull();
     }
 
     @Override
     public Iterator<Header> iterateHeaders(MimePath path) {
-        final Iterator<Header> result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getHeaders();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getHeaders();
     }
 
     @Override
     public Iterator<Header> iterateMimeHeaders(MimePath path) {
-        final Iterator<Header> result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getMimeHeaders();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getMimeHeaders();
     }
 
     public void setBodyContent(MimePath path, Content content) {


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 31/44: [Refactoring] ResultHeader: remove not thrown exception

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 3ab0bb82761cb25f1efa16598ec936f483d45a4a
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:37:54 2019 +0700

    [Refactoring] ResultHeader: remove not thrown exception
---
 .../src/main/java/org/apache/james/mailbox/store/ResultHeader.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
index fd0b619..860bce9 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
@@ -61,7 +61,7 @@ public final class ResultHeader implements MessageResult.Header {
     }
 
     @Override
-    public InputStream getInputStream() throws IOException {
+    public InputStream getInputStream() {
         return new ByteArrayInputStream((name + ": " + value).getBytes(US_ASCII));
     }
 }
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 03/44: James-2949 Fix tokens with valid usernames when needed, regenerate public key

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 42faa90d2e31f562c5a3a2f21480635ac98042a7
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Thu Nov 14 16:32:15 2019 +0100

    James-2949 Fix tokens with valid usernames when needed, regenerate public key
---
 .../apache/james/modules/TestJMAPServerModule.java | 52 +++++++++++++++++-----
 .../apache/james/jmap/JMAPAuthenticationTest.java  | 18 ++++----
 .../integration/GetMailboxesMethodTest.java        | 12 ++---
 3 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java b/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java
index 6c5e5ec..8252360 100644
--- a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java
+++ b/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java
@@ -34,16 +34,48 @@ import com.google.inject.name.Names;
 
 public class TestJMAPServerModule extends AbstractModule {
 
-    private static final String PUBLIC_PEM_KEY = 
-        "-----BEGIN PUBLIC KEY-----\n" 
-        + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlChO/nlVP27MpdkG0Bh\n"
-        + "16XrMRf6M4NeyGa7j5+1UKm42IKUf3lM28oe82MqIIRyvskPc11NuzSor8HmvH8H\n"
-        + "lhDs5DyJtx2qp35AT0zCqfwlaDnlDc/QDlZv1CoRZGpQk1Inyh6SbZwYpxxwh0fi\n"
-        + "+d/4RpE3LBVo8wgOaXPylOlHxsDizfkL8QwXItyakBfMO6jWQRrj7/9WDhGf4Hi+\n"
-        + "GQur1tPGZDl9mvCoRHjFrD5M/yypIPlfMGWFVEvV5jClNMLAQ9bYFuOc7H1fEWw6\n"
-        + "U1LZUUbJW9/CH45YXz82CYqkrfbnQxqRb2iVbVjs/sHopHd1NTiCfUtwvcYJiBVj\n"
-        + "kwIDAQAB\n"
-        + "-----END PUBLIC KEY-----";
+    private static final String PUBLIC_PEM_KEY =
+        "-----BEGIN PUBLIC KEY-----\n" +
+        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RfttZlaFNar/3GcU9RG\n" +
+        "3/2ZGi7PMI8B75XaX3AG2J1Mvl30Dl+yZ8tQKGGd/eelQsQAQboGXCHB/wCHR7n8\n" +
+        "CSF/E0hjRu6FK/2D6VTnn5BMiiPWPcEpLGT7CsGQPFZ54R0e5vJcGTty9Da/3Z+C\n" +
+        "YvrpupecrmJXCXwBwhm4WPb1woTfv9gVtTMpKOhfzmrGURy8nJ+1s4Lli46/UBIu\n" +
+        "fzTmzng4rXouLMvkq7eS4jIWtB0ifXHmPwRN/YhGmuq+GYG59KQ1iStSxVi9Nuzy\n" +
+        "Ik8eH3KeLx/2BuSshSwnnnYbxHEfR+p6H4oqKjTGutvLNamBRFKpj7CcryKbgVG0\n" +
+        "zwIDAQAB\n" +
+        "-----END PUBLIC KEY-----\n";
+
+    // For commodity, here is the matching private key, allowing to generate easily token if needed
+    // for example using jwt.io.
+    @SuppressWarnings("unused")
+    private static final String UNUSED_PRIVATE_KEY =
+        "-----BEGIN RSA PRIVATE KEY-----\n" +
+            "MIIEogIBAAKCAQEA8RfttZlaFNar/3GcU9RG3/2ZGi7PMI8B75XaX3AG2J1Mvl30\n" +
+            "Dl+yZ8tQKGGd/eelQsQAQboGXCHB/wCHR7n8CSF/E0hjRu6FK/2D6VTnn5BMiiPW\n" +
+            "PcEpLGT7CsGQPFZ54R0e5vJcGTty9Da/3Z+CYvrpupecrmJXCXwBwhm4WPb1woTf\n" +
+            "v9gVtTMpKOhfzmrGURy8nJ+1s4Lli46/UBIufzTmzng4rXouLMvkq7eS4jIWtB0i\n" +
+            "fXHmPwRN/YhGmuq+GYG59KQ1iStSxVi9NuzyIk8eH3KeLx/2BuSshSwnnnYbxHEf\n" +
+            "R+p6H4oqKjTGutvLNamBRFKpj7CcryKbgVG0zwIDAQABAoIBADGzIxeag01ka5R/\n" +
+            "ESDe07V9C8CwAZobAOUo2RlveJnS420i5RrJc3eeG+oXJYCf7htzWDI0bPc1Jk6x\n" +
+            "BzIsDt66/v00oPKQXPeSjUzeadkk4AJiHNoiJaC3OGEhQeCOWxWi8SnesEmrTak2\n" +
+            "WBsRtMk+vEvw0SXJs/OKkro2nyAHcm7qOkm/EDeyZFqXGyWlkx4iLiVgmhe33X62\n" +
+            "WxrLqAhKSqwwta3df3RQ1lPSlOxe1Jikg39NI57AblJ9VqQBdyVJRcMbVmZXBlan\n" +
+            "uFFHRBOnVR5Fg6DJZaFXAsXweduvw9N5mRMEIXX3YiLRsOdKTKm6bBCorfSi5QNa\n" +
+            "aQZhmrECgYEA/0iXxv5GxI5Ycv3yQni/Qu4GSE5qLFeFAfXhWiv73WZlqjNONgq7\n" +
+            "y2uBTojnI93yNGp8rcbI+9t+MTr0eIkKzo7ftYt0SsDshjLcO/pxuT4qWXfDO87b\n" +
+            "AGgfyuAugAE67KMuwxqQuT6NpGgYVhRn6JUYjVzT13kKzEPv7IOw7aUCgYEA8cUk\n" +
+            "EE4uVBfpObsFd9u9KL2tSFCBuKZZH8FqDdcj3lfdizwqd7D4kmVr4vFDtG1rtqOm\n" +
+            "qyNqI6eMr6wvqExPrLaf1lHlpYyHeW4t2S2iHh4tKriwcoPMUpuJHUcYHHzzCSux\n" +
+            "Kbk1cDFGphTOt4AnLk8HAivZWNQLieLaOQmhNmMCgYAYLogyEWQiulkmi2enZEi5\n" +
+            "zlJKByOHj8LJrMDsCb6R+mEm/jUqaVngqw5UoiNDAoMu8+dbjrj7Io+RmkQOJu0f\n" +
+            "I+mNCOi7LAs7qxWxmMetBHZ+gxm7UJzuLO7WCOZeub8bK1oCoUGUSpigOjwT61rs\n" +
+            "bTMmMOTgRFcBgm33uYHJAQKBgA8uNLR9ZDVNhwxj7NT4zCjJuB6pR2vjrgbraxBR\n" +
+            "aOQmGjgK4BPB3em7SonmYjzq/e9q2SU3xQtWEuRY6Gkl2X7bvK+FVukNKNh8DY7s\n" +
+            "aZiAho9/Jz0Zf3PUZkibVS08vzndL3OSOIPB5FC7T7t/5XXn6mW9gRktv0e6Ib+h\n" +
+            "FilHAoGAMA32OsmvG+tHam8FjrUgNNyBrdO2yfFNOWLDVt9CYIYSQa4dVpUKAyOH\n" +
+            "CF52SG6Ki1L0z001yrJ7gBk/i6KD9h+7izzs+16DSbWTPB3R16BVjRVoXgmg0vh5\n" +
+            "ICQil1aaN7/2au+p7E4n7nzfYG7nRX5syDoqgBbdhpJxV8/5ohA=\n" +
+            "-----END RSA PRIVATE KEY-----\n";
 
     public static JMAPConfiguration.Builder jmapConfigurationBuilder() {
         return JMAPConfiguration.builder()
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
index 6d8a5212..acb2973 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
@@ -335,11 +335,10 @@ public abstract class JMAPAuthenticationTest {
     @Category(BasicFeature.class)
     @Test
     public void getMustReturnEndpointsWhenValidJwtAuthorizationHeader() throws Exception {
-        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIn0.T04BTk" +
-                "LXkJj24coSZkK13RfG25lpvmSl2MJ7N10KpBk9_-95EGYZdog-BDAn3PJzqVw52z-Bwjh4VOj1-j7cURu0cT4jXehhUrlCxS4n7QHZ" +
-                "DN_bsEYGu7KzjWTpTsUiHe-rN7izXVFxDGG1TGwlmBCBnPW-EFCf9ylUsJi0r2BKNdaaPRfMIrHptH1zJBkkUziWpBN1RNLjmvlAUf" +
-                "49t1Tbv21ZqYM5Ht2vrhJWczFbuC-TD-8zJkXhjTmA1GVgomIX5dx1cH-dZX1wANNmshUJGHgepWlPU-5VIYxPEhb219RMLJIELMY2" +
-                "qNOR8Q31ydinyqzXvCSzVJOf6T60-w";
+        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VyQGRvbWFpbi50bGQifQ.U-dUPv6OU6KO5N7CooHUfMkCd" +
+            "FJHx2F3H4fm7Q79g1BPfBSkifPj5xyVlZ0JwEGXypC4zBw9ay3l4DxzX7D_6p1Hx_ihXsoLx1Ca-WUo44x-XRSpPfgxiZjHCJkGBLMV3RZlA" +
+            "jip-d18mxkcX3JGplX_sCQkFisduAOAHuKSUg9wI6VBgUQi_0B35FYv6tP_bD6eFtvaAUN9QyXXh8UQjEp8CO12lRz6enfLx_V6BG_fEMkee" +
+            "6vRqdEqx_F9OF3eWTe1giMp_JhQ7_l1OXXtbd4TndVvTeuVy4irPbsRc-M8x_-qTDpFp6saRRsyOcFspxPp5n3yIhEK7B3UZiseXw";
 
         given()
                 .header("Authorization", "Bearer " + token)
@@ -351,11 +350,10 @@ public abstract class JMAPAuthenticationTest {
 
     @Test
     public void getMustReturnEndpointsWhenValidUnkwnonUserJwtAuthorizationHeader() throws Exception {
-        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMzM3IiwibmFtZSI6Ik5ldyBVc2VyIn0.ci8U04EOWKpi_y"
-                + "faKs8fnCBcu1mWs8fvf-t9SDP2kkvDDfD-ya4sEGn4ueCp2dA2ndefZfVu_IfvdlVtxqzSf0tQ-dFKrIe-OtSKhI2otjWctLtk9A"
-                + "G7jpWkXoDgr5IOVmsqg37Zxc2bgkLkC5FJqV6oCp51TNQTH6zZbXIUeuGFbHj2-iJeX8sACKTQB0llwc6TFm7GYUF03rv4DfJjqp"
-                + "Kd0g8RdnlevSOjV-gGzvKEItugtexS5pgOZ2GYcvqEUDb9EnQR7Qe2EzPAX_FCJfGhlv7bDQlTgOHHAjqw2lD4-zeAznw-3wlYLS"
-                + "zhi4ivvPjT-y2T5wnnhzeeYOpYOQ";
+        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1bmtub3duQGRvbWFpbi50bGQifQ.hr8AhlNIpiA3Mv_A5ZLyL" +
+            "f1BHeBSaRDfdR_GLV_hlPdIrWv1xtwjBH86E1YnTPx2tTpr_NWTbHcR1OCkuVCpgloEnUNbE3U2l0WrGOX2Eh9dWCXOCtrNvCeSHQuvx5_8W" +
+            "nSVENYidk7o2icE8_gz_Giwf0Z3bHJJYXfAxupv__tCkmhqt3E888VZPjs26AsqxQ29YyX0Fjx8UwKbPrH5-tnyftX-kLjjZNtahVIVtbW4v" +
+            "b8rEEZ4nzqxHqtI2co6yCXjgyoFMdDAKCOU-Bq35Gdo-Qiu8l7a0kQGhuhkjoaVWvw4bcSvunxAnh_0W5g3Lw-rwljNu2JrJS0gAH6NDA";
         
         given()
             .header("Authorization", "Bearer " + token)
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
index aeb2286..daa5fe1 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
@@ -351,12 +351,12 @@ public abstract class GetMailboxesMethodTest {
     @Category(BasicFeature.class)
     @Test
     public void getMailboxesShouldReturnDefaultMailboxesWhenAuthenticatedUserDoesntHaveAnAccountYet() {
-        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMzM3QGRvbWFpbi50bGQiLCJuYW1lIjoiTmV3IFVzZXIif"
-                + "Q.fxNWNzksXyCij2ooVi-QfGe9vTicF2N9FDtWSJdjWTjhwoQ_i0dgiT8clp4dtOJzy78hB2UkAW-iq7z3PR_Gz0qFah7EbYoEs"
-                + "5lQs1UlhNGCRTvIsyR8qHUXtA6emw9x0nuMnswtyXhzoA-cEHCArrMxMeWhTYi2l4od3G8Irrvu1Yc5hKLwLgPdnImbKyB5a89T"
-                + "vzuZE8-FVyMmhlaJA2T1GpbsaUnfE1ki_bBzqMHTD_Ob7oSVzz2UOiOeL-ombn1X9GbYQ2I-Ob4V84WHONYxw0VjPHlj9saZ2n7"
-                + "2RJTBsIo6flJT-MchaEvTYBvuV_wlCCQYjI1g7mdeD6aXfw";
-        
+        String token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMzM3QGRvbWFpbi50bGQiLCJuYW1lIjoiTmV3IFVzZXIif" +
+            "Q.bPeoAWAOyu4teilj27cL4uZ9jBO9zJOus3mJdqZYEeDe9OZeweopqkIE7ljuh-iTxBDE-f3OqaEqGa_mi6eOYT7XXAEPolcEAe4EooU" +
+            "lI8anYMrSlbMPBKGymH-QTWIcPS5P8XNFnIn94XheuEIXeaRHNvO5-SgENbFYS19kgyzOV54umQtIAewLyMdvG6aooLSk6lEy3AhVPIfl" +
+            "QJm6MLOsNzHMj7F7mM0Wm6QBfYeWIHzQLtEgGFFLyqeSXyzbgbbec2WYpVjXHNyWhAFcq7OMjOb2UEmb9gKr1fkL_XZgXna2CW46hzwaG" +
+            "jNO-6ZWpHjLfDEP7oHui51Hn_wJfw";
+
         given()
             .header("Authorization", "Bearer " + token)
             .body("[[\"getMailboxes\", {}, \"#0\"]]")


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 14/44: [Refactoring] MessageResultImpl: Remove never thrown exceptions

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 710cf8872c336f1aa7273c79630ef7c4bedd9606
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:08:35 2019 +0700

    [Refactoring] MessageResultImpl: Remove never thrown exceptions
---
 .../apache/james/mailbox/store/MessageResultImpl.java   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 03caa8c..53f2201 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -62,8 +62,7 @@ public class MessageResultImpl implements MessageResult {
     private Content fullContent;
     private Content bodyContent;
 
-    
-    public MessageResultImpl(MailboxMessage message) throws IOException {
+    public MessageResultImpl(MailboxMessage message) {
         this.message = message;
         this.headers = new HeadersImpl(message);
     }
@@ -159,7 +158,7 @@ public class MessageResultImpl implements MessageResult {
     }
 
     @Override
-    public Content getBody(MimePath path) throws MailboxException {
+    public Content getBody(MimePath path) {
         final Content result;
         final PartContent partContent = getPartContent(path);
         if (partContent == null) {
@@ -171,7 +170,7 @@ public class MessageResultImpl implements MessageResult {
     }
 
     @Override
-    public Content getMimeBody(MimePath path) throws MailboxException {
+    public Content getMimeBody(MimePath path) {
         final Content result;
         final PartContent partContent = getPartContent(path);
         if (partContent == null) {
@@ -183,7 +182,7 @@ public class MessageResultImpl implements MessageResult {
     }
 
     @Override
-    public Content getFullContent(MimePath path) throws MailboxException {
+    public Content getFullContent(MimePath path) {
         final Content result;
         final PartContent partContent = getPartContent(path);
         if (partContent == null) {
@@ -195,7 +194,7 @@ public class MessageResultImpl implements MessageResult {
     }
 
     @Override
-    public Iterator<Header> iterateHeaders(MimePath path) throws MailboxException {
+    public Iterator<Header> iterateHeaders(MimePath path) {
         final Iterator<Header> result;
         final PartContent partContent = getPartContent(path);
         if (partContent == null) {
@@ -207,7 +206,7 @@ public class MessageResultImpl implements MessageResult {
     }
 
     @Override
-    public Iterator<Header> iterateMimeHeaders(MimePath path) throws MailboxException {
+    public Iterator<Header> iterateMimeHeaders(MimePath path) {
         final Iterator<Header> result;
         final PartContent partContent = getPartContent(path);
         if (partContent == null) {
@@ -331,7 +330,7 @@ public class MessageResultImpl implements MessageResult {
     }
     
     @Override
-    public Headers getHeaders() throws MailboxException {
+    public Headers getHeaders() {
         if (headers == null) {
             headers = new HeadersImpl(message);
         }
@@ -339,7 +338,7 @@ public class MessageResultImpl implements MessageResult {
     }
     
     @Override
-    public List<MessageAttachment> getAttachments() throws MailboxException {
+    public List<MessageAttachment> getAttachments() {
         return message.getAttachments();
     }
     


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 25/44: [Refactoring] MimeDescriptorImpl: Use StandardCharsets

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 8041b57cfeeea2ed6d43917fd66ca2c7f90beb81
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:31:56 2019 +0700

    [Refactoring] MimeDescriptorImpl: Use StandardCharsets
---
 .../main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index 4bf5917..a06e7ef 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -19,10 +19,11 @@
 
 package org.apache.james.mailbox.store;
 
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -44,8 +45,6 @@ import org.apache.james.mime4j.stream.RecursionMode;
 
 public class MimeDescriptorImpl implements MimeDescriptor {
 
-    private static final Charset US_ASCII = Charset.forName("US-ASCII");
-
     /**
      * Is this a composite media type (as per RFC2045)?
      * 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 13/44: [Refactoring] MailboxMessageResultImplTest: Do not declare unthrown exceptions

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit a08d632a38311ac394dbd5acf9c25adfb977c292
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:01:43 2019 +0700

    [Refactoring] MailboxMessageResultImplTest: Do not declare unthrown exceptions
---
 .../store/MailboxMessageResultImplTest.java        | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java
index 12d2171..e8baaac 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java
@@ -60,45 +60,45 @@ public class MailboxMessageResultImplTest {
 
 
     @Test
-    public void testEqualsNull() throws Exception {
+    public void testEqualsNull() {
         assertThat(msgResultA).isNotNull();
     }
 
 
     @Test
-    public void testEqualsReflexive() throws Exception {
+    public void testEqualsReflexive() {
         assertThat(msgResultA).isEqualTo(msgResultA);
     }
 
 
     @Test
-    public void testCompareToReflexive() throws Exception {
+    public void testCompareToReflexive() {
         assertThat(msgResultA.compareTo(msgResultA)).isEqualTo(0);
     }
 
 
     @Test
-    public void testHashCodeReflexive() throws Exception {
+    public void testHashCodeReflexive() {
         assertThat(msgResultA.hashCode()).isEqualTo(msgResultA.hashCode());
     }
 
 
     @Test
-    public void testEqualsSymmetric() throws Exception {
+    public void testEqualsSymmetric() {
         assertThat(msgResultACopy).isEqualTo(msgResultA);
         assertThat(msgResultA).isEqualTo(msgResultACopy);
     }
 
 
     @Test
-    public void testHashCodeSymmetric() throws Exception {
+    public void testHashCodeSymmetric() {
         assertThat(msgResultACopy.hashCode()).isEqualTo(msgResultA.hashCode());
         assertThat(msgResultA.hashCode()).isEqualTo(msgResultACopy.hashCode());
     }
 
 
     @Test
-    public void testEqualsTransitive() throws Exception {
+    public void testEqualsTransitive() {
         assertThat(msgResultACopy).isEqualTo(msgResultA);
         assertThat(msgResultB).isEqualTo(msgResultACopy);
         assertThat(msgResultB).isEqualTo(msgResultA);
@@ -106,7 +106,7 @@ public class MailboxMessageResultImplTest {
 
 
     @Test
-    public void testCompareToTransitive() throws Exception {
+    public void testCompareToTransitive() {
         assertThat(msgResultA.compareTo(msgResultACopy)).isEqualTo(0);
         assertThat(msgResultACopy.compareTo(msgResultB)).isEqualTo(0);
         assertThat(msgResultA.compareTo(msgResultB)).isEqualTo(0);
@@ -114,7 +114,7 @@ public class MailboxMessageResultImplTest {
 
 
     @Test
-    public void testHashCodeTransitive() throws Exception {
+    public void testHashCodeTransitive() {
         assertThat(msgResultACopy.hashCode()).isEqualTo(msgResultA.hashCode());
         assertThat(msgResultB.hashCode()).isEqualTo(msgResultACopy.hashCode());
         assertThat(msgResultB.hashCode()).isEqualTo(msgResultA.hashCode());
@@ -122,20 +122,18 @@ public class MailboxMessageResultImplTest {
 
 
     @Test
-    public void testNotEqualDiffValue() throws Exception {
+    public void testNotEqualDiffValue() {
         assertThat(msgResultA).isNotEqualTo(msgResultC);
         assertThat(msgResultC).isNotEqualTo(msgResultA);
     }
 
     @Test
-    public void testShouldReturnPositiveWhenFirstGreaterThanSecond()
-            throws Exception {
+    public void testShouldReturnPositiveWhenFirstGreaterThanSecond() {
         assertThat(msgResultC.compareTo(msgResultB) > 0).isTrue();
     }
 
     @Test
-    public void testShouldReturnNegativeWhenFirstLessThanSecond()
-            throws Exception {
+    public void testShouldReturnNegativeWhenFirstLessThanSecond() {
         assertThat(msgResultB.compareTo(msgResultC) < 0).isTrue();
     }
 }
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 41/44: JAMES-2632 concatMap for mailbox search

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit c1b2357a52e3f3b36cd5ea935d0612596b7665a1
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 7 16:59:39 2019 +0700

    JAMES-2632 concatMap for mailbox search
    
    This slighlty decrease average performance of GetMailboxes but
    allows a much lower p99 and completly get rid of errors.
    
    Scenario: 13.706 req/s (GetMailboxes)
    
    Before:
      Average: 414 ms
      p99: 2104 ms
      Errors: 54
    
    After:
      Average: 470 ms
      p99: 1723 ms
      Errors: 0
---
 .../org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
index 56b32d3..09ed684 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
@@ -155,7 +155,7 @@ public class CassandraMailboxMapper implements MailboxMapper {
     private List<Mailbox> toMailboxes(MailboxQuery.UserBound query, Flux<CassandraIdAndPath> listUserMailboxes) {
         return listUserMailboxes
                 .filter(idAndPath -> query.isPathMatch(idAndPath.getMailboxPath()))
-                .flatMap(this::retrieveMailbox)
+                .concatMap(this::retrieveMailbox)
                 .collectList()
                 .block();
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 01/44: JAMES-2949 add strong typing in UsersRepository API and more generally on Username concept

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 01411c50b62a8308d26980bb23d9a31fb7241cf9
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Thu Oct 31 12:04:59 2019 +0100

    JAMES-2949 add strong typing in UsersRepository API and more generally on Username concept
---
 .../listeners/SetCustomFlagOnBigMessages.java      |   2 +-
 .../listeners/SetCustomFlagOnBigMessagesTest.java  |   3 +-
 .../org/apache/james/mailbox/MailboxManager.java   |   9 +-
 .../org/apache/james/mailbox/MailboxSession.java   |  10 +-
 .../james/mailbox/acl/GroupMembershipResolver.java |   4 +-
 .../james/mailbox/acl/MailboxACLResolver.java      |   3 +-
 .../mailbox/acl/SimpleGroupMembershipResolver.java |  10 +-
 .../james/mailbox/acl/UnionMailboxACLResolver.java |   9 +-
 .../exception/UserDoesNotExistException.java       |  10 +-
 .../org/apache/james/mailbox/model/Mailbox.java    |   7 +-
 .../org/apache/james/mailbox/model/MailboxACL.java |  11 +-
 .../apache/james/mailbox/model/MailboxPath.java    |  13 +-
 .../james/mailbox/model/search/MailboxQuery.java   |  20 +-
 .../mailbox/AbstractSubscriptionManagerTest.java   |   3 +-
 .../apache/james/mailbox/MailboxListenerTest.java  |   8 +-
 .../james/mailbox/MailboxManagerStressTest.java    |   3 +-
 .../apache/james/mailbox/MailboxManagerTest.java   |   9 +-
 .../apache/james/mailbox/MailboxSessionUtil.java   |   5 +-
 .../apache/james/mailbox/MessageMoveEventTest.java |  20 +-
 .../james/mailbox/acl/PositiveUserACLDiffTest.java |   6 +-
 .../acl/SimpleGroupMembershipResolverTest.java     |  14 +-
 .../mailbox/acl/UnionMailboxACLResolverTest.java   | 373 +++++++--------
 .../james/mailbox/events/EventBusTestFixture.java  |   2 +-
 .../mailbox/events/EventDeadLettersContract.java   |   2 +-
 .../apache/james/mailbox/events/GroupContract.java |   8 +-
 .../apache/james/mailbox/events/KeyContract.java   |   3 +-
 .../james/mailbox/fixture/MailboxFixture.java      |   7 +-
 .../mailbox/manager/ManagerTestProvisionner.java   |   5 +-
 .../apache/james/mailbox/mock/DataProvisioner.java |   6 +-
 .../apache/james/mailbox/model/MailboxACLTest.java |  15 +-
 .../james/mailbox/model/MailboxAssertTests.java    |  27 +-
 .../james/mailbox/model/MailboxPathTest.java       |  88 ++--
 .../mailbox/model/search/MailboxQueryTest.java     |  19 +-
 .../james/mailbox/backup/DefaultMailboxBackup.java |   8 +-
 .../mailbox/backup/ZipMailArchiveRestorer.java     |   4 +-
 .../mailbox/backup/MailboxMessageFixture.java      |   8 +-
 .../cassandra/mail/CassandraAttachmentMapper.java  |   2 +-
 .../mail/CassandraAttachmentOwnerDAO.java          |   6 +-
 .../cassandra/mail/CassandraMailboxDAO.java        |   3 +-
 .../cassandra/mail/CassandraMailboxMapper.java     |   3 +-
 .../cassandra/mail/CassandraMailboxPathDAO.java    |   3 +-
 .../mail/CassandraMailboxPathDAOImpl.java          |   5 +-
 .../cassandra/mail/CassandraMailboxPathV2DAO.java  |   9 +-
 .../mail/CassandraUserMailboxRightsDAO.java        |   9 +-
 .../mail/task/MailboxMergingTaskRunner.java        |   3 +-
 .../cassandra/mail/utils/MailboxBaseTupleUtil.java |   5 +-
 .../mail/CassandraAttachmentOwnerDAOTest.java      |   9 +-
 .../mail/CassandraIndexTableHandlerTest.java       |   3 +-
 .../mail/CassandraMailboxCounterDAOTest.java       |   3 +-
 .../cassandra/mail/CassandraMailboxDAOTest.java    |   8 +-
 .../CassandraMailboxMapperConcurrencyTest.java     |   3 +-
 .../cassandra/mail/CassandraMailboxMapperTest.java |   3 +-
 .../mail/CassandraMailboxPathDAOTest.java          |   5 +-
 .../cassandra/mail/CassandraMapperProvider.java    |   3 +-
 .../mail/CassandraMessageIdMapperTest.java         |   3 +-
 .../mail/CassandraModSeqProviderTest.java          |   3 +-
 .../cassandra/mail/CassandraUidProviderTest.java   |   3 +-
 .../mail/CassandraUserMailboxRightsDAOTest.java    |   3 +-
 .../mail/migration/MailboxPathV2MigrationTest.java |   3 +-
 ...asticSearchListeningMessageSearchIndexTest.java |   3 +-
 .../scala/org/apache/james/event/json/DTOs.scala   |   3 +-
 .../james/event/json/AddedSerializationTest.java   |   2 +-
 .../event/json/ExpungedSerializationTest.java      |   2 +-
 .../event/json/FlagsUpdatedSerializationTest.java  |   2 +-
 .../MailboxACLUpdatedEventSerializationTest.java   |   4 +-
 .../event/json/MailboxAddedSerializationTest.java  |   2 +-
 .../json/MailboxDeletionSerializationTest.java     |   2 +-
 .../json/MailboxRenamedSerializationTest.java      |   4 +-
 .../james/event/json/dtos/MailboxPathTest.java     |  12 +-
 .../james/mailbox/jpa/mail/JPAMailboxMapper.java   |  18 +-
 .../james/mailbox/jpa/mail/model/JPAMailbox.java   |   5 +-
 .../james/mailbox/jpa/mail/JPAMapperProvider.java  |   3 +-
 .../jpa/mail/TransactionalMailboxMapper.java       |   3 +-
 .../LuceneMailboxMessageSearchIndexTest.java       |  10 +-
 .../apache/james/mailbox/maildir/MaildirStore.java |  17 +-
 .../mailbox/maildir/mail/MaildirMailboxMapper.java |   7 +-
 .../maildir/user/MaildirSubscriptionMapper.java    |   9 +-
 .../inmemory/mail/InMemoryAttachmentMapper.java    |   2 +-
 .../inmemory/mail/InMemoryMailboxMapper.java       |   5 +-
 .../quota/InMemoryCurrentQuotaManager.java         |   3 +-
 .../inmemory/mail/InMemoryMapperProvider.java      |   6 +-
 .../james/vault/DeletedMessageVaultHook.java       |   6 +-
 .../james/vault/DeletedMessageVaultHookTest.java   |  20 +-
 .../ElasticSearchQuotaSearcherTest.java            |   2 +-
 .../search/scanning/ScanningQuotaSearcher.java     |   3 +-
 .../james/quota/search/QuotaSearcherContract.java  |  72 +--
 .../mailbox/spamassassin/SpamAssassinListener.java |   6 +-
 .../spamassassin/SpamAssassinListenerTest.java     |   3 +-
 .../mailbox/spring/AnonymousAuthenticator.java     |   3 +-
 .../james/mailbox/spring/NoAuthorizator.java       |   3 +-
 .../apache/james/mailbox/store/Authenticator.java  |   3 +-
 .../apache/james/mailbox/store/Authorizator.java   |   3 +-
 .../james/mailbox/store/FakeAuthenticator.java     |  10 +-
 .../james/mailbox/store/FakeAuthorizator.java      |  12 +-
 .../james/mailbox/store/SessionProvider.java       |  11 +-
 .../mailbox/store/StoreAttachmentManager.java      |   6 +-
 .../james/mailbox/store/StoreMailboxManager.java   |  11 +-
 .../james/mailbox/store/StoreRightManager.java     |  16 +-
 .../mailbox/store/SystemMailboxesProviderImpl.java |   6 +-
 .../store/event/MailboxAnnotationListener.java     |   2 +-
 .../james/mailbox/store/mail/AttachmentMapper.java |   2 +-
 .../james/mailbox/store/mail/MailboxMapper.java    |   3 +-
 .../james/mailbox/store/mail/model/Username.java   |  74 ---
 .../store/quota/DefaultUserQuotaRootResolver.java  |  15 +-
 .../store/search/ListeningMessageSearchIndex.java  |   2 +-
 .../AbstractMailboxManagerAttachmentTest.java      |   3 +-
 .../store/AbstractMessageIdManagerStorageTest.java |   3 +-
 .../james/mailbox/store/StoreBlobManagerTest.java  |   3 +-
 .../store/StoreMailboxManagerAnnotationTest.java   |   3 +-
 .../mailbox/store/StoreMailboxManagerTest.java     |  25 +-
 .../james/mailbox/store/StoreRightManagerTest.java |  39 +-
 .../store/event/MailboxAnnotationListenerTest.java |  10 +-
 .../james/mailbox/store/mail/MessageUtilsTest.java |   3 +-
 .../store/mail/model/AttachmentMapperTest.java     |   5 +-
 .../store/mail/model/ListMailboxAssert.java        |   7 +-
 .../store/mail/model/ListMailboxAssertTest.java    |   3 +-
 .../store/mail/model/ListMessageAssertTest.java    |   3 +-
 .../store/mail/model/MailboxMapperACLTest.java     |  85 ++--
 .../store/mail/model/MailboxMapperTest.java        |  22 +-
 .../store/mail/model/MessageIdMapperTest.java      |  10 +-
 .../store/mail/model/MessageMapperTest.java        |   8 +-
 .../mailbox/store/mail/model/MessageMoveTest.java  |   6 +-
 .../model/MessageWithAttachmentMapperTest.java     |   3 +-
 .../mailbox/store/mail/model/UsernameTest.java     |  60 ---
 .../quota/DefaultUserQuotaRootResolverTest.java    |  12 +-
 .../mailbox/store/quota/QuotaCheckerTest.java      |   3 +-
 .../search/AbstractMessageSearchIndexTest.java     |   5 +-
 .../mailbox/tools/copier/MailboxCopierImpl.java    |   3 +-
 .../mailbox/tools/copier/MailboxCopierTest.java    |   3 +-
 .../mailbox/tools/indexer/ReIndexerImpl.java       |   2 +-
 .../mailbox/tools/indexer/ReIndexerPerformer.java  |  11 +-
 .../tools/indexer/CassandraReIndexerImplTest.java  |   3 +-
 .../tools/indexer/MessageIdReIndexerImplTest.java  |   3 +-
 .../mailbox/tools/indexer/ReIndexerImplTest.java   |   4 +-
 .../mailbox/store/mail/ZooUidProviderTest.java     |   6 +-
 .../james/transport/mailets/AbstractSign.java      |   7 +-
 .../apache/james/mpt/ant/MailProtocolTestTask.java |   3 +-
 .../java/org/apache/james/mpt/api/HostSystem.java  |   3 +-
 .../org/apache/james/mpt/api/ImapHostSystem.java   |   3 +-
 .../java/org/apache/james/mpt/api/UserAdder.java   |   4 +-
 .../apache/james/mpt/host/ExternalHostSystem.java  |   5 +-
 .../script/GenericSimpleScriptedTestProtocol.java  |  21 +-
 .../james/mpt/script/ImapScriptedTestProtocol.java |  13 +-
 .../apache/james/mpt/user/ScriptedUserAdder.java   |  11 +-
 .../apache/james/mpt/TestExternalHostSystem.java   |   3 +-
 .../apache/james/mpt/TestScriptedUserAdder.java    |   3 +-
 .../apache/james/mpt/host/JamesImapHostSystem.java |   9 +-
 .../james/mpt/imapmailbox/GrantRightsOnHost.java   |   3 +-
 .../james/mpt/imapmailbox/ImapTestConstants.java   |   4 +-
 .../james/mpt/imapmailbox/suite/ACLCommands.java   |   3 +-
 .../mpt/imapmailbox/suite/ACLIntegration.java      |   7 +-
 .../imapmailbox/suite/ACLScriptedTestProtocol.java |  18 +-
 .../mpt/imapmailbox/suite/AuthenticatePlain.java   |   5 +-
 .../mpt/imapmailbox/suite/AuthenticatedState.java  |  10 +-
 .../imapmailbox/suite/ListingWithSharingTest.java  |   3 +-
 .../imapmailbox/suite/base/BasicImapCommands.java  |   2 +-
 .../imapmailbox/cyrus/host/CyrusHostSystem.java    |   7 +-
 .../mpt/imapmailbox/cyrus/host/CyrusUserAdder.java |   5 +-
 .../cyrus/host/GrantRightsOnCyrusHost.java         |   5 +-
 .../DockerDeploymentValidationGuiceJPATest.java    |   3 +-
 .../DockerDeploymentValidationSpringJPATest.java   |   3 +-
 .../james/host/docker/CliProvisioningAPI.java      |   5 +-
 .../host/external/ExternalJamesImapHostSystem.java |   3 +-
 .../host/external/NoopDomainsAndUserAdder.java     |   3 +-
 .../james/mpt/host/JamesManageSieveHostSystem.java |   4 +-
 .../org/apache/james/mpt/smtp/SmtpTestRule.java    |   6 +-
 .../java/org/apache/james/mpt/maven/AddUser.java   |   7 +-
 protocols/api/pom.xml                              |   4 +
 .../james/protocols/api/ProtocolSession.java       |   7 +-
 .../james/protocols/api/ProtocolSessionImpl.java   |  11 +-
 .../apache/james/imap/api/ImapSessionUtils.java    |   5 +-
 .../org/apache/james/imap/main/PathConverter.java  |   5 +-
 .../imap/processor/AbstractAuthProcessor.java      |   7 +-
 .../imap/processor/AbstractMailboxProcessor.java   |   2 +-
 .../james/imap/api/ImapSessionUtilsTest.java       |   3 +-
 .../decode/parser/CreateCommandParserTest.java     |   3 +-
 .../apache/james/imap/main/PathConverterTest.java  |   3 +-
 .../james/imap/processor/CopyProcessorTest.java    |   2 +-
 .../imap/processor/DeleteACLProcessorTest.java     |   7 +-
 .../james/imap/processor/GetACLProcessorTest.java  |   3 +-
 .../imap/processor/GetAnnotationProcessorTest.java |   3 +-
 .../imap/processor/GetQuotaProcessorTest.java      |   6 +-
 .../imap/processor/GetQuotaRootProcessorTest.java  |   6 +-
 .../james/imap/processor/LSubProcessorTest.java    |   3 +-
 .../imap/processor/ListRightsProcessorTest.java    |   9 +-
 .../james/imap/processor/MoveProcessorTest.java    |   2 +-
 .../james/imap/processor/SearchProcessorTest.java  |  10 +-
 .../james/imap/processor/SetACLProcessorTest.java  |  12 +-
 .../imap/processor/SetAnnotationProcessorTest.java |   3 +-
 .../imap/processor/SetQuotaProcessorTest.java      |   3 +-
 .../processor/base/MailboxEventAnalyserTest.java   |   8 +-
 .../processor/base/SelectedMailboxImplTest.java    |   5 +-
 .../managesieve/api/AuthenticationProcessor.java   |   4 +-
 .../org/apache/james/managesieve/api/Session.java  |   5 +-
 .../james/managesieve/core/CoreProcessor.java      |  18 +-
 .../core/PlainAuthenticationProcessor.java         |   7 +-
 .../james/managesieve/util/SettableSession.java    |   7 +-
 .../james/protocols/netty/ProtocolMDCContext.java  |   2 +-
 .../pop3/core/AbstractApopCmdHandler.java          |  10 +-
 .../pop3/core/AbstractPassCmdHandler.java          |  16 +-
 .../james/protocols/pop3/core/UserCmdHandler.java  |   3 +-
 .../protocols/pop3/AbstractPOP3ServerTest.java     |   5 +-
 .../protocols/pop3/utils/TestPassCmdHandler.java   |   5 +-
 ...ractSenderAuthIdentifyVerificationRcptHook.java |  12 +-
 .../smtp/core/ReceivedDataLineFilter.java          |   2 +-
 .../protocols/smtp/core/esmtp/AuthCmdHandler.java  |  27 +-
 .../apache/james/protocols/smtp/hook/AuthHook.java |   3 +-
 .../fastfail/ResolvableEhloHeloHandlerTest.java    |   9 +-
 .../protocols/smtp/utils/BaseFakeSMTPSession.java  |   6 +-
 .../james/cli/ReindexCommandIntegrationTest.java   |   3 +-
 .../test/java/org/apache/james/ESReporterTest.java |   3 +-
 .../org/apache/james/FixingGhostMailboxTest.java   |   5 +-
 .../apache/james/CassandraLdapJamesServerTest.java |   4 +-
 .../CassandraRabbitMQLdapJmapJamesServerTest.java  |   2 +-
 .../java/org/apache/james/utils/DataProbeImpl.java |  12 +-
 .../org/apache/james/modules/ACLProbeImpl.java     |   5 +-
 .../org/apache/james/modules/MailboxProbeImpl.java |  26 +-
 .../org/apache/james/modules/QuotaProbesImpl.java  |   3 +-
 .../apache/james/jmap/draft/JmapGuiceProbe.java    |   3 +-
 .../apache/james/jmap/draft/MessageIdProbe.java    |   7 +-
 .../mailbox/store/UserRepositoryAuthenticator.java |   3 +-
 .../mailbox/store/UserRepositoryAuthorizator.java  |   3 +-
 .../store/UserRepositoryAuthenticatorTest.java     |   5 +-
 .../store/UserRepositoryAuthorizatorTest.java      |   5 +-
 .../adapter/mailbox/MailboxManagerManagement.java  |  20 +-
 .../james/adapter/mailbox/QuotaManagement.java     |   3 +-
 .../james/adapter/mailbox/ReIndexerManagement.java |   3 +-
 .../adapter/mailbox/MailboxManagementTest.java     |  43 +-
 .../adapter/mailbox/ReIndexerManagementTest.java   |   3 +-
 .../container/spring/tool/James23Importer.java     | 184 -------
 .../spring/tool/James23ImporterManagement.java     |  64 ---
 .../tool/James23ImporterManagementMBean.java       |  53 ---
 .../org/apache/james/user/api/UsersRepository.java |  20 +-
 .../user/api/UsersRepositoryManagementMBean.java   |  10 +-
 .../java/org/apache/james/user/api/model/User.java |   8 +-
 .../user/cassandra/CassandraUsersRepository.java   |  32 +-
 .../sieverepository/file/SieveFileRepository.java  |   2 +-
 .../cassandra/access/CassandraAccessTokenDAO.java  |  11 +-
 .../access/CassandraAccessTokenRepository.java     |   9 +-
 .../jmap/api/access/AccessTokenRepository.java     |   5 +-
 .../apache/james/jmap/api/vacation/AccountId.java  |   6 +
 .../memory/access/MemoryAccessTokenRepository.java |  10 +-
 .../jmap/api/access/AccessTokenRepositoryTest.java |  10 +-
 .../apache/james/user/jpa/JPAUsersRepository.java  |  47 +-
 .../org/apache/james/user/jpa/model/JPAUser.java   |   5 +-
 .../user/ldap/LdapRepositoryConfiguration.java     |   7 +-
 .../apache/james/user/ldap/ReadOnlyLDAPUser.java   |   7 +-
 .../user/ldap/ReadOnlyUsersLDAPRepository.java     |  32 +-
 .../james/user/ldap/DockerLdapSingleton.java       |   4 +-
 .../user/ldap/ReadOnlyUsersLDAPRepositoryTest.java |  12 +-
 .../james/user/lib/AbstractUsersRepository.java    |  28 +-
 .../james/user/lib/UsersRepositoryManagement.java  |  33 +-
 .../james/user/lib/model/DefaultJamesUser.java     |   5 +-
 .../apache/james/user/lib/model/DefaultUser.java   |   9 +-
 .../user/lib/AbstractUsersRepositoryTest.java      |  38 +-
 .../james/user/memory/MemoryUsersRepository.java   |  35 +-
 .../user/memory/UsersRepositoryManagementTest.java |  33 +-
 .../apache/james/smtp/SmtpRandomStoringTest.java   |   3 +-
 .../james/transport/mailets/AliasMappingTest.java  |   7 +-
 .../james/transport/mailets/DomainMappingTest.java |   5 +-
 .../james/transport/mailets/GroupMappingTest.java  |   5 +-
 .../impl/JamesMailetContextTest.java               |   9 +-
 .../james/transport/mailets/RandomStoring.java     |   3 +-
 .../james/transport/mailets/SpamAssassin.java      |   3 +-
 .../james/transport/mailets/ToSenderFolder.java    |   5 +-
 .../james/transport/mailets/WhiteListManager.java  |   3 +-
 .../transport/mailets/WithStorageDirective.java    |   2 +-
 .../mailets/delivery/MailboxAppender.java          |   7 +-
 .../mailets/delivery/SimpleMailStore.java          |  11 +-
 .../transport/mailets/jsieve/ResourceLocator.java  |   2 +-
 .../mailets/jsieve/delivery/SievePoster.java       |   5 +-
 .../mailets/managesieve/ManageSieveMailet.java     |   3 +-
 .../matchers/AbstractSQLWhitelistMatcher.java      |   3 +-
 .../james/transport/matchers/IsOverQuota.java      |   3 +-
 .../transport/mailets/ResourceLocatorTest.java     |   4 +-
 .../mailets/delivery/LocalDeliveryTest.java        |  13 +-
 .../mailets/delivery/MailboxAppenderTest.java      |   3 +-
 .../mailets/delivery/SieveIntegrationTest.java     |  20 +-
 .../mailets/delivery/SimpleMailStoreTest.java      |  11 +-
 .../mailets/delivery/ToRecipientFolderTest.java    |  18 +-
 .../managesieve/ManageSieveMailetTestCase.java     |   2 +-
 .../james/transport/matchers/IsOverQuotaTest.java  |  13 +-
 .../java/org/apache/james/fetchmail/FetchMail.java |   5 +-
 .../jmap/cassandra/CassandraBulkOperationTest.java |   7 +-
 .../apache/james/jmap/HttpJmapAuthentication.java  |   9 +-
 .../org/apache/james/jmap/MessageAppender.java     |   3 +-
 .../org/apache/james/jmap/ProvisioningTest.java    |   7 +-
 .../org/apache/james/jmap/TestingConstants.java    |   8 +-
 .../apache/james/jmap/VacationIntegrationTest.java |  41 +-
 .../integration/DeletedMessagesVaultTest.java      |   7 +-
 .../jmap/draft/methods/integration/FilterTest.java |   6 +-
 .../integration/ForwardIntegrationTest.java        |   6 +-
 .../integration/GetMailboxesMethodTest.java        | 136 +++---
 .../integration/GetMessageListMethodTest.java      | 529 ++++++++++-----------
 .../integration/GetVacationResponseTest.java       |  12 +-
 ...LinshareBlobExportMechanismIntegrationTest.java |   5 +-
 .../methods/integration/QuotaMailingTest.java      |  11 +-
 .../methods/integration/SendMDNMethodTest.java     |  15 +-
 .../integration/SetMailboxesMethodTest.java        | 175 +++----
 .../SetMessagesMethodReRoutingTest.java            |   5 +-
 .../methods/integration/SetMessagesMethodTest.java | 405 ++++++++--------
 .../SetMessagesOutboxFlagUpdateTest.java           |  13 +-
 .../integration/SetVacationResponseTest.java       |   3 +-
 .../methods/integration/SpamAssassinContract.java  |   3 +-
 .../integration/cucumber/DownloadStepdefs.java     |  15 +-
 .../cucumber/GetMessagesMethodStepdefs.java        |  11 +-
 .../cucumber/SetMailboxesMethodStepdefs.java       |   3 +-
 .../cucumber/SetMessagesMethodStepdefs.java        |   3 +-
 .../methods/integration/cucumber/UserStepdefs.java |   3 +-
 .../ReindexingWithEventDeadLettersTest.java        |   2 +-
 .../draft/AccessTokenAuthenticationStrategy.java   |   3 +-
 .../james/jmap/draft/AuthenticationServlet.java    |   7 +-
 .../draft/DefaultMailboxesProvisioningFilter.java  |   4 +-
 .../jmap/draft/JWTAuthenticationStrategy.java      |  10 +-
 ...ParameterAccessTokenAuthenticationStrategy.java |   4 +-
 .../james/jmap/draft/UserProvisioningFilter.java   |  13 +-
 .../james/jmap/draft/api/AccessTokenManager.java   |   5 +-
 .../jmap/draft/crypto/AccessTokenManagerImpl.java  |   7 +-
 .../james/jmap/draft/json/ObjectMapperFactory.java |  29 +-
 .../draft/methods/GetVacationResponseMethod.java   |   2 +-
 .../methods/SetMailboxesCreationProcessor.java     |   4 +-
 .../draft/methods/SetMailboxesUpdateProcessor.java |   5 +-
 .../draft/methods/SetVacationResponseMethod.java   |   2 +-
 .../james/jmap/draft/model/MailboxFactory.java     |   6 +-
 .../jmap/draft/model/mailbox/MailboxNamespace.java |  13 +-
 .../james/jmap/draft/model/mailbox/Rights.java     |  44 +-
 .../jmap/draft/send/PostDequeueDecorator.java      |   3 +-
 .../jmap/event/PropagateLookupRightListener.java   |   2 +-
 .../mailet/ExtractMDNOriginalJMAPMessageId.java    |  10 +-
 .../james/jmap/mailet/filter/ActionApplier.java    |   2 +-
 .../james/jmap/mailet/filter/JMAPFiltering.java    |   2 +-
 .../AccessTokenAuthenticationStrategyTest.java     |   8 +-
 .../james/jmap/draft/AuthenticationFilterTest.java |   8 +-
 .../DefaultMailboxesProvisioningFilterTest.java    |   3 +-
 ...faultMailboxesProvisioningFilterThreadTest.java |   3 +-
 .../james/jmap/draft/DownloadServletTest.java      |   3 +-
 .../jmap/draft/JWTAuthenticationStrategyTest.java  |   9 +-
 ...meterAccessTokenAuthenticationStrategyTest.java |   3 +-
 .../jmap/draft/UserProvisioningFilterTest.java     |  13 +-
 .../draft/UserProvisioningFilterThreadTest.java    |   3 +-
 .../draft/crypto/AccessTokenManagerImplTest.java   |  25 +-
 .../jmap/draft/json/ObjectMapperFactoryTest.java   |   9 +-
 .../jmap/draft/methods/AttachmentCheckerTest.java  |   3 +-
 .../jmap/draft/methods/GetMailboxesMethodTest.java |   7 +-
 .../jmap/draft/methods/GetMessagesMethodTest.java  |   2 +-
 .../methods/SetMessagesCreationProcessorTest.java  |   4 +-
 .../methods/SetVacationResponseMethodTest.java     |   2 +-
 .../apache/james/jmap/draft/model/JmapMDNTest.java |   3 +-
 .../james/jmap/draft/model/MailboxFactoryTest.java |   5 +-
 .../draft/model/mailbox/MailboxNamespaceTest.java  |   8 +-
 .../james/jmap/draft/model/mailbox/RightsTest.java |  21 +-
 .../jmap/draft/send/PostDequeueDecoratorTest.java  |   6 +-
 .../james/jmap/draft/utils/MailboxUtilsTest.java   |   5 +-
 .../event/PropagateLookupRightListenerTest.java    |   7 +-
 .../ExtractMDNOriginalJMAPMessageIdTest.java       |  10 +-
 .../jmap/mailet/filter/JMAPFilteringExtension.java |   4 +-
 .../jmap/mailet/filter/JMAPFilteringFixture.java   |   3 +-
 .../jmap/mailet/filter/JMAPFilteringTest.java      |  16 +-
 .../hook/MailboxDeliverToRecipientHandler.java     |   3 +-
 .../james/pop3server/core/PassCmdHandler.java      |   7 +-
 .../apache/james/pop3server/POP3ServerTest.java    |  45 +-
 .../AddDefaultAttributesMessageHook.java           |   4 +-
 .../SenderAuthIdentifyVerificationRcptHook.java    |   7 +-
 .../james/smtpserver/UsersRepositoryAuthHook.java  |   5 +-
 .../smtpserver/fastfail/ValidRcptHandler.java      |   5 +-
 .../apache/james/smtpserver/SMTPServerTest.java    |   9 +-
 .../james/smtpserver/ValidRcptHandlerTest.java     |   5 +-
 .../EventDeadLettersIntegrationTest.java           |   5 +-
 ...dminServerTaskSerializationIntegrationTest.java |  10 +-
 .../apache/james/webadmin/routes/AliasRoutes.java  |   2 +-
 .../james/webadmin/routes/ForwardRoutes.java       |   2 +-
 .../apache/james/webadmin/routes/GroupsRoutes.java |   2 +-
 .../james/webadmin/routes/SieveQuotaRoutes.java    |   5 +-
 .../james/webadmin/routes/SieveScriptRoutes.java   |   5 +-
 .../apache/james/webadmin/service/UserService.java |  10 +-
 .../james/webadmin/routes/AliasRoutesTest.java     |   7 +-
 .../james/webadmin/routes/ForwardRoutesTest.java   |   9 +-
 .../james/webadmin/routes/GroupsRoutesTest.java    |   2 +-
 .../webadmin/routes/SieveQuotaRoutesTest.java      |   2 +-
 .../webadmin/routes/SieveScriptRoutesTest.java     |   2 +-
 .../james/webadmin/routes/UsersRoutesTest.java     |   5 +-
 .../vault/routes/DeletedMessagesVaultRoutes.java   |   2 +-
 .../webadmin/vault/routes/RestoreService.java      |   4 +-
 .../routes/DeletedMessagesVaultRoutesTest.java     |  12 +-
 .../james/webadmin/routes/UserMailboxesRoutes.java |  16 +-
 .../james/webadmin/routes/UserQuotaRoutes.java     |   6 +-
 .../webadmin/service/UserMailboxesService.java     |  25 +-
 .../routes/EventDeadLettersRoutesTest.java         |   6 +-
 .../webadmin/routes/MalformedUrlRoutesTest.java    |   5 +-
 .../webadmin/routes/ReindexingRoutesTest.java      |  15 +-
 .../webadmin/routes/UserMailboxesRoutesTest.java   |   5 +-
 .../james/webadmin/routes/UserQuotaRoutesTest.java |   8 +-
 .../org/apache/james/utils/IMAPMessageReader.java  |   5 +
 393 files changed, 2574 insertions(+), 2646 deletions(-)

diff --git a/examples/custom-listeners/src/main/java/org/apache/james/examples/custom/listeners/SetCustomFlagOnBigMessages.java b/examples/custom-listeners/src/main/java/org/apache/james/examples/custom/listeners/SetCustomFlagOnBigMessages.java
index 274ec02..1d1b08d 100644
--- a/examples/custom-listeners/src/main/java/org/apache/james/examples/custom/listeners/SetCustomFlagOnBigMessages.java
+++ b/examples/custom-listeners/src/main/java/org/apache/james/examples/custom/listeners/SetCustomFlagOnBigMessages.java
@@ -77,7 +77,7 @@ class SetCustomFlagOnBigMessages implements MailboxListener.GroupMailboxListener
 
     private void setBigMessageFlag(Added addedEvent, MessageUid messageUid) {
         try {
-            MailboxSession session = mailboxManager.createSystemSession(addedEvent.getUsername().asString());
+            MailboxSession session = mailboxManager.createSystemSession(addedEvent.getUsername());
             MessageManager messageManager = mailboxManager.getMailbox(addedEvent.getMailboxId(), session);
 
             messageManager.setFlags(
diff --git a/examples/custom-listeners/src/test/java/org/apache/james/examples/custom/listeners/SetCustomFlagOnBigMessagesTest.java b/examples/custom-listeners/src/test/java/org/apache/james/examples/custom/listeners/SetCustomFlagOnBigMessagesTest.java
index 7075759..b1ce0bd 100644
--- a/examples/custom-listeners/src/test/java/org/apache/james/examples/custom/listeners/SetCustomFlagOnBigMessagesTest.java
+++ b/examples/custom-listeners/src/test/java/org/apache/james/examples/custom/listeners/SetCustomFlagOnBigMessagesTest.java
@@ -28,6 +28,7 @@ import java.util.stream.Stream;
 
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.DefaultMailboxes;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
@@ -53,7 +54,7 @@ import com.google.common.collect.Streams;
 
 class SetCustomFlagOnBigMessagesTest {
 
-    private static final String USER = "user";
+    private static final Username USER = Username.of("user");
     private static final Event.EventId RANDOM_EVENT_ID = Event.EventId.random();
     private static final MailboxPath INBOX_PATH = MailboxPath.forUser(USER, DefaultMailboxes.INBOX);
 
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java
index c298a8f..a69a60c 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java
@@ -23,6 +23,7 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.BadCredentialsException;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.exception.MailboxExistsException;
@@ -262,7 +263,7 @@ public interface MailboxManager extends RequestAware, RightManager, MailboxAnnot
     /**
      * Creates a new system session.<br>
      * A system session is intended to be used for programmatic access.<br>
-     * Use {@link #login(String, String)} when accessing this API from a
+     * Use {@link #login(Username, String)} when accessing this API from a
      * protocol.
      * 
      * @param userName
@@ -273,7 +274,7 @@ public interface MailboxManager extends RequestAware, RightManager, MailboxAnnot
      * @throws MailboxException
      *            when the creation fails for other reasons
      */
-    MailboxSession createSystemSession(String userName) throws BadCredentialsException, MailboxException;
+    MailboxSession createSystemSession(Username userName) throws BadCredentialsException, MailboxException;
 
     /**
      * Autenticates the given user against the given password.<br>
@@ -290,7 +291,7 @@ public interface MailboxManager extends RequestAware, RightManager, MailboxAnnot
      * @throws MailboxException
      *            when the creation fails for other reasons
      */
-    MailboxSession login(String userid, String passwd) throws BadCredentialsException, MailboxException;
+    MailboxSession login(Username userid, String passwd) throws BadCredentialsException, MailboxException;
 
     /**
      * Autenticates the given administrator against the given password,
@@ -310,7 +311,7 @@ public interface MailboxManager extends RequestAware, RightManager, MailboxAnnot
      * @throws MailboxException
      *             when the creation fails for other reasons
      */
-    MailboxSession loginAsOtherUser(String adminUserId, String passwd, String otherUserId) throws BadCredentialsException, MailboxException;
+    MailboxSession loginAsOtherUser(Username adminUserId, String passwd, Username otherUserId) throws BadCredentialsException, MailboxException;
 
     /**
      * <p>
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 79770c6..25df2f4 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
@@ -97,20 +97,20 @@ public class MailboxSession {
     private final String otherUsersSpace;
     private final String personalSpace;
     private final SessionId sessionId;
-    private final String userName;
+    private final Username userName;
     private boolean open = true;
     private final List<Locale> localePreferences;
     private final Map<Object, Object> attributes;
     private final char pathSeparator;
     private final SessionType type;
 
-    public MailboxSession(SessionId sessionId, String userName,
+    public MailboxSession(SessionId sessionId, Username userName,
                                 List<Locale> localePreferences, char pathSeparator, SessionType type) {
         this(sessionId, userName, localePreferences, new ArrayList<>(), null, pathSeparator, type);
     }
 
-    public MailboxSession(SessionId sessionId, String userName,
-                                List<Locale> localePreferences, List<String> sharedSpaces, String otherUsersSpace, char pathSeparator, SessionType type) {
+    public MailboxSession(SessionId sessionId, Username userName,
+                          List<Locale> localePreferences, List<String> sharedSpaces, String otherUsersSpace, char pathSeparator, SessionType type) {
         this.sessionId = sessionId;
         this.userName = userName;
         this.otherUsersSpace = otherUsersSpace;
@@ -163,7 +163,7 @@ public class MailboxSession {
      * @return not null
      */
     public Username getUser() {
-        return Username.of(userName);
+        return userName;
     }
 
     /**
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java
index 8f5a285..caab6d5 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java
@@ -18,6 +18,8 @@
  ****************************************************************/
 package org.apache.james.mailbox.acl;
 
+import org.apache.james.core.Username;
+
 /**
  * An interface for querying group memberships.  
  */
@@ -26,6 +28,6 @@ public interface GroupMembershipResolver {
     /**
      * Tests if the given user is a member of the given group.
      */
-    boolean isMember(String user, String group);
+    boolean isMember(Username user, String group);
 
 }
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java
index e913ba2..0677c99 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java
@@ -20,6 +20,7 @@
 
 package org.apache.james.mailbox.acl;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.UnsupportedRightException;
 import org.apache.james.mailbox.model.MailboxACL;
 
@@ -91,6 +92,6 @@ public interface MailboxACLResolver {
      *            otherwise.
      * @return the rights applicable for the given user and resource.
      */
-    MailboxACL.Rfc4314Rights resolveRights(String requestUser, GroupMembershipResolver groupMembershipResolver, MailboxACL resourceACL, String resourceOwner, boolean resourceOwnerIsGroup) throws UnsupportedRightException;
+    MailboxACL.Rfc4314Rights resolveRights(Username requestUser, GroupMembershipResolver groupMembershipResolver, MailboxACL resourceACL, String resourceOwner, boolean resourceOwnerIsGroup) throws UnsupportedRightException;
 
 }
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java
index 95890bf..0fd8659 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java
@@ -23,6 +23,8 @@ package org.apache.james.mailbox.acl;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.james.core.Username;
+
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
@@ -34,9 +36,9 @@ public class SimpleGroupMembershipResolver implements GroupMembershipResolver {
 
     public static class Membership {
         private final String group;
-        private final String user;
+        private final Username user;
 
-        public Membership(String user, String group) {
+        public Membership(Username user, String group) {
             this.group = group;
             this.user = user;
         }
@@ -68,12 +70,12 @@ public class SimpleGroupMembershipResolver implements GroupMembershipResolver {
 
     private final Set<Membership> memberships = new HashSet<>(32);
 
-    public void addMembership(String group, String user) {
+    public void addMembership(String group, Username user) {
         memberships.add(new Membership(user, group));
     }
 
     @Override
-    public boolean isMember(String user, String group) {
+    public boolean isMember(Username user, String group) {
         return memberships.contains(new Membership(user, group));
     }
 
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
index 498686e..204381f 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.UnsupportedRightException;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxACL.EntryKey;
@@ -144,7 +145,7 @@ public class UnionMailboxACLResolver implements MailboxACLResolver {
                         /* non null query user is viewed as authenticated */
                         return true;
                     } else if (SpecialName.owner.name().equals(aclKeyName)) {
-                        return (!resourceOwnerIsGroup && queryUserOrGroupName.equals(resourceOwner)) || (resourceOwnerIsGroup && groupMembershipResolver.isMember(queryUserOrGroupName, resourceOwner));
+                        return (!resourceOwnerIsGroup && queryUserOrGroupName.equals(resourceOwner)) || (resourceOwnerIsGroup && groupMembershipResolver.isMember(Username.of(queryUserOrGroupName), resourceOwner));
                     } else {
                         /* should not happen unless the parent if is changed */
                         throw new IllegalStateException("Unexpected " + SpecialName.class.getName() + "." + aclKeyName);
@@ -152,7 +153,7 @@ public class UnionMailboxACLResolver implements MailboxACLResolver {
                 case user:
                     return aclKeyName.equals(queryUserOrGroupName);
                 case group:
-                    return groupMembershipResolver.isMember(queryUserOrGroupName, aclKeyName);
+                    return groupMembershipResolver.isMember(Username.of(queryUserOrGroupName), aclKeyName);
                 default:
                     throw new IllegalStateException("Unexpected " + NameType.class.getName() + "." + aclKeyNameType);
                 }
@@ -290,9 +291,9 @@ public class UnionMailboxACLResolver implements MailboxACLResolver {
     }
 
     @Override
-    public Rfc4314Rights resolveRights(String requestUser, GroupMembershipResolver groupMembershipResolver, MailboxACL resourceACL, String resourceOwner, boolean resourceOwnerIsGroup) throws UnsupportedRightException {
+    public Rfc4314Rights resolveRights(Username requestUser, GroupMembershipResolver groupMembershipResolver, MailboxACL resourceACL, String resourceOwner, boolean resourceOwnerIsGroup) throws UnsupportedRightException {
         Rfc4314Rights[] positiveNegativePair = { MailboxACL.NO_RIGHTS, MailboxACL.NO_RIGHTS };
-        final EntryKey queryKey = requestUser == null ? null : new EntryKey(requestUser, NameType.user, false);
+        final EntryKey queryKey = requestUser == null ? null : EntryKey.createUserEntryKey(requestUser);
         MailboxACL userACL = resourceOwnerIsGroup ? groupGlobalACL : userGlobalACL;
         resolveRights(queryKey, groupMembershipResolver, userACL.getEntries(), resourceOwner, resourceOwnerIsGroup, positiveNegativePair);
 
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UserDoesNotExistException.java b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UserDoesNotExistException.java
index 0c5ddf2..1d7be1f 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UserDoesNotExistException.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/UserDoesNotExistException.java
@@ -19,16 +19,18 @@
 
 package org.apache.james.mailbox.exception;
 
+import org.apache.james.core.Username;
+
 public class UserDoesNotExistException extends MailboxException {
 
-    private final String name;
+    private final Username name;
 
-    public UserDoesNotExistException(String name) {
-        super("User " + name + "does not exist");
+    public UserDoesNotExistException(Username name) {
+        super("User " + name.asString() + "does not exist");
         this.name = name;
     }
 
-    public String getName() {
+    public Username getName() {
         return name;
     }
 }
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Mailbox.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Mailbox.java
index 913a401..fef8088 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Mailbox.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Mailbox.java
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.mailbox.model;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxUtil;
 
@@ -30,7 +31,7 @@ import com.google.common.base.Objects;
 public class Mailbox {
     private MailboxId id = null;
     private String namespace;
-    private String user;
+    private Username user;
     private String name;
     private final long uidValidity;
     private MailboxACL acl = MailboxACL.EMPTY;
@@ -84,7 +85,7 @@ public class Mailbox {
      * Gets the current user for this mailbox.
      * @return not null
      */
-    public String getUser() {
+    public Username getUser() {
         return user;
     }
 
@@ -92,7 +93,7 @@ public class Mailbox {
      * Sets the current user for this mailbox.
      * @param user not null
      */
-    public void setUser(String user) {
+    public void setUser(Username user) {
         this.user = user;
     }
 
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
index aceeada..e3f29fb 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
@@ -33,6 +33,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.UnsupportedRightException;
 
 import com.github.fge.lambdas.Throwing;
@@ -367,12 +368,12 @@ public class MailboxACL {
             return new EntryKey(name, NameType.group, negative);
         }
 
-        public static EntryKey createUserEntryKey(String name) {
-            return new EntryKey(name, NameType.user, false);
+        public static EntryKey createUserEntryKey(Username name) {
+            return new EntryKey(name.asString(), NameType.user, false);
         }
 
-        public static EntryKey createUserEntryKey(String name, boolean negative) {
-            return new EntryKey(name, NameType.user, negative);
+        public static EntryKey createUserEntryKey(Username name, boolean negative) {
+            return new EntryKey(name.asString(), NameType.user, negative);
         }
 
         private final String name;
@@ -520,7 +521,7 @@ public class MailboxACL {
             private Builder() {
             }
 
-            public Builder forUser(String user) {
+            public Builder forUser(Username user) {
                 key = EntryKey.createUserEntryKey(user);
                 return this;
             }
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java
index 27051e3..5edc9b1 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.DefaultMailboxes;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.exception.HasEmptyMailboxNameInHierarchyException;
@@ -42,13 +43,13 @@ public class MailboxPath {
      * session
      */
     public static MailboxPath inbox(MailboxSession session) {
-        return MailboxPath.forUser(session.getUser().asString(), MailboxConstants.INBOX);
+        return MailboxPath.forUser(session.getUser(), MailboxConstants.INBOX);
     }
 
     /**
      * Create a {@link MailboxPath} in the prive namespace of the specified user
      */
-    public static MailboxPath forUser(String username, String mailboxName) {
+    public static MailboxPath forUser(Username username, String mailboxName) {
         return new MailboxPath(MailboxConstants.USER_NAMESPACE, username, mailboxName);
     }
 
@@ -58,10 +59,10 @@ public class MailboxPath {
     public  static final int MAX_MAILBOX_NAME_LENGTH = 200;
 
     private final String namespace;
-    private final String user;
+    private final Username user;
     private final String name;
     
-    public MailboxPath(String namespace, String user, String name) {
+    public MailboxPath(String namespace, Username user, String name) {
         this.namespace = Optional.ofNullable(namespace)
             .filter(s -> !s.isEmpty())
             .orElse(MailboxConstants.USER_NAMESPACE);
@@ -87,7 +88,7 @@ public class MailboxPath {
     /**
      * Get the name of the user who owns the mailbox.
      */
-    public String getUser() {
+    public Username getUser() {
         return user;
     }
 
@@ -100,7 +101,7 @@ public class MailboxPath {
     }
 
     public boolean belongsTo(MailboxSession mailboxSession) {
-        return user.equalsIgnoreCase(mailboxSession.getUser().asString());
+        return user.asString().equalsIgnoreCase(mailboxSession.getUser().asString());//FIXME-USERNAME
     }
 
     /**
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/search/MailboxQuery.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/search/MailboxQuery.java
index f4ed134..a149d2e 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/search/MailboxQuery.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/search/MailboxQuery.java
@@ -45,14 +45,14 @@ public class MailboxQuery {
     public static Builder privateMailboxesBuilder(MailboxSession session) {
         return builder()
             .namespace(MailboxConstants.USER_NAMESPACE)
-            .username(session.getUser().asString())
+            .username(session.getUser())
             .matchesAllMailboxNames();
     }
 
     public static class Builder {
         private static final Wildcard DEFAULT_WILDCARD = Wildcard.INSTANCE;
 
-        Optional<String> username;
+        Optional<Username> username;
         Optional<String> namespace;
         Optional<MailboxNameExpression> mailboxNameExpression;
         
@@ -71,7 +71,7 @@ public class MailboxQuery {
             return this;
         }
 
-        public Builder username(String username) {
+        public Builder username(Username username) {
             Preconditions.checkState(!this.username.isPresent());
 
             this.username = Optional.of(username);
@@ -79,7 +79,7 @@ public class MailboxQuery {
         }
 
         public Builder user(Username username) {
-            this.username(username.asString());
+            this.username(username);
             return this;
         }
 
@@ -113,7 +113,7 @@ public class MailboxQuery {
     }
 
     public static class UserBound extends MailboxQuery {
-        private UserBound(String namespace, String user, MailboxNameExpression mailboxNameExpression) {
+        private UserBound(String namespace, Username user, MailboxNameExpression mailboxNameExpression) {
             super(Optional.of(namespace), Optional.of(user), mailboxNameExpression);
             Preconditions.checkNotNull(namespace);
             Preconditions.checkNotNull(user);
@@ -123,19 +123,19 @@ public class MailboxQuery {
             return namespace.get();
         }
 
-        public String getFixedUser() {
+        public Username getFixedUser() {
             return user.get();
         }
     }
 
     protected final Optional<String> namespace;
-    protected final Optional<String> user;
+    protected final Optional<Username> user;
     private final MailboxNameExpression mailboxNameExpression;
 
     /**
      * Constructs an expression determining a set of mailbox names.
      */
-    private MailboxQuery(Optional<String> namespace, Optional<String> user, MailboxNameExpression mailboxNameExpression) {
+    private MailboxQuery(Optional<String> namespace, Optional<Username> user, MailboxNameExpression mailboxNameExpression) {
         this.namespace = namespace;
         this.user = user;
         this.mailboxNameExpression = mailboxNameExpression;
@@ -145,7 +145,7 @@ public class MailboxQuery {
         return namespace;
     }
 
-    public Optional<String> getUser() {
+    public Optional<Username> getUser() {
         return user;
     }
 
@@ -156,7 +156,7 @@ public class MailboxQuery {
     public boolean isPrivateMailboxes(MailboxSession session) {
         Username sessionUsername = session.getUser();
         return namespace.map(MailboxConstants.USER_NAMESPACE::equals).orElse(false)
-            && user.map(Username::of).map(sessionUsername::equals).orElse(false);
+            && user.map(sessionUsername::equals).orElse(false);
     }
 
     @VisibleForTesting
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 8d76f06..f997204 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
@@ -20,6 +20,7 @@ package org.apache.james.mailbox;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.SubscriptionException;
 import org.junit.jupiter.api.Test;
 
@@ -30,7 +31,7 @@ import org.junit.jupiter.api.Test;
  */
 public abstract class AbstractSubscriptionManagerTest {
 
-    private static final String USER1 = "test";
+    private static final Username USER1 = Username.of("test");
     private static final String MAILBOX1 = "test1";
     private static final String MAILBOX2 = "test2";
     private SubscriptionManager manager;
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxListenerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxListenerTest.java
index 29f5b3e..f58f049 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxListenerTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxListenerTest.java
@@ -50,8 +50,8 @@ import com.google.common.collect.ImmutableSortedMap;
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 class MailboxListenerTest {
-    private static final MailboxPath PATH = MailboxPath.forUser("bob", "mailbox");
-    private static final MailboxPath OTHER_PATH = MailboxPath.forUser("bob", "mailbox.other");
+    private static final MailboxPath PATH = MailboxPath.forUser(Username.of("bob"), "mailbox");
+    private static final MailboxPath OTHER_PATH = MailboxPath.forUser(Username.of("bob"), "mailbox.other");
     private static final Username BOB = Username.of("bob");
     private static final MailboxSession.SessionId SESSION_ID = MailboxSession.SessionId.of(42);
     private static final TestId MAILBOX_ID = TestId.of(18);
@@ -59,9 +59,9 @@ class MailboxListenerTest {
     private static final QuotaCount QUOTA_COUNT = QuotaCount.count(34);
     private static final QuotaSize QUOTA_SIZE = QuotaSize.size(48);
     private static final MailboxACL ACL_1 = new MailboxACL(
-        Pair.of(MailboxACL.EntryKey.createUserEntryKey("Bob"), new MailboxACL.Rfc4314Rights(MailboxACL.Right.Administer)));
+        Pair.of(MailboxACL.EntryKey.createUserEntryKey(Username.of("Bob")), new MailboxACL.Rfc4314Rights(MailboxACL.Right.Administer)));
     private static final MailboxACL ACL_2 = new MailboxACL(
-        Pair.of(MailboxACL.EntryKey.createUserEntryKey("Bob"), new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read)));
+        Pair.of(MailboxACL.EntryKey.createUserEntryKey(Username.of("Bob")), new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read)));
     private static final MessageUid UID = MessageUid.of(85);
     private static final MessageMetaData META_DATA = new MessageMetaData(UID, 45, new Flags(), 45, new Date(), TestMessageId.of(75));
 
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 92041e2..da25c06 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
@@ -31,6 +31,7 @@ import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.events.EventBus;
 import org.apache.james.mailbox.events.MailboxIdRegistrationKey;
 import org.apache.james.mailbox.events.MailboxListener;
@@ -65,7 +66,7 @@ public abstract class MailboxManagerStressTest<T extends MailboxManager> {
         CountDownLatch latch = new CountDownLatch(APPEND_OPERATIONS);
         ExecutorService pool = Executors.newFixedThreadPool(APPEND_OPERATIONS / 20, threadFactory);
         Collection<MessageUid> uList = new ConcurrentLinkedDeque<>();
-        String username = "username";
+        Username username = Username.of("username");
         MailboxSession session = mailboxManager.createSystemSession(username);
         mailboxManager.startProcessingRequest(session);
         MailboxPath path = MailboxPath.forUser(username, "INBOX");
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 c68a380..c3a81a1 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
@@ -39,6 +39,7 @@ import java.util.concurrent.CountDownLatch;
 
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.MailboxManager.MailboxCapabilities;
@@ -98,8 +99,8 @@ import reactor.core.publisher.Mono;
  * 
  */
 public abstract class MailboxManagerTest<T extends MailboxManager> {
-    public static final String USER_1 = "USER_1";
-    public static final String USER_2 = "USER_2";
+    public static final Username USER_1 = Username.of("USER_1");
+    public static final Username USER_2 = Username.of("USER_2");
     private static final int DEFAULT_MAXIMUM_LIMIT = 256;
 
     private T mailboxManager;
@@ -1476,7 +1477,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
 
         @Test
         void listShouldReturnMailboxes() throws Exception {
-            session = mailboxManager.createSystemSession("manager");
+            session = mailboxManager.createSystemSession(Username.of("manager"));
             mailboxManager.startProcessingRequest(session);
 
             DataProvisioner.feedMailboxManager(mailboxManager);
@@ -1551,7 +1552,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
         void createUser1SystemSessionShouldReturnValidSession() throws Exception {
             session = mailboxManager.createSystemSession(USER_1);
 
-            assertThat(session.getUser().asString()).isEqualTo(USER_1);
+            assertThat(session.getUser()).isEqualTo(USER_1);
         }
 
         @Test
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
index 82e3013..7b9734f 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxSessionUtil.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxSessionUtil.java
@@ -23,17 +23,18 @@ import java.util.ArrayList;
 import java.util.Locale;
 import java.util.concurrent.ThreadLocalRandom;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxConstants;
 
 import com.google.common.annotations.VisibleForTesting;
 
 public class MailboxSessionUtil {
-    public static MailboxSession create(String username) {
+    public static MailboxSession create(Username username) {
         return create(username, MailboxSession.SessionId.of(ThreadLocalRandom.current().nextLong()));
     }
 
     @VisibleForTesting
-    public static MailboxSession create(String username, MailboxSession.SessionId sessionId) {
+    public static MailboxSession create(Username username, MailboxSession.SessionId sessionId) {
         ArrayList<Locale> locales = new ArrayList<>();
 
         return new MailboxSession(
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MessageMoveEventTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MessageMoveEventTest.java
index 4a591c3..0069e62 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MessageMoveEventTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MessageMoveEventTest.java
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.Test;
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 class MessageMoveEventTest {
+    private static final Username USER = Username.of("user@james.org");
 
     @Test
     void shouldRespectBeanContract() {
@@ -48,7 +49,7 @@ class MessageMoveEventTest {
     @Test
     void builderShouldThrowWhenMessageMovesIsNull() {
         assertThatThrownBy(() -> MessageMoveEvent.builder()
-                .session(MailboxSessionUtil.create("user@james.org"))
+                .session(MailboxSessionUtil.create(USER))
                 .build())
             .isInstanceOf(NullPointerException.class);
     }
@@ -56,7 +57,7 @@ class MessageMoveEventTest {
     @Test
     void builderShouldReturnNoopWhenMessagesIsEmpty() {
         assertThat(MessageMoveEvent.builder()
-                .session(MailboxSessionUtil.create("user@james.org"))
+                .session(MailboxSessionUtil.create(USER))
                 .messageMoves(MessageMoves.builder()
                     .previousMailboxIds(TestId.of(1))
                     .targetMailboxIds(TestId.of(2))
@@ -67,7 +68,7 @@ class MessageMoveEventTest {
 
     @Test
     void builderShouldNotBeNoopWhenFieldsAreGiven() {
-        MailboxSession session = MailboxSessionUtil.create("user@james.org");
+        MailboxSession session = MailboxSessionUtil.create(USER);
         MessageMoves messageMoves = MessageMoves.builder()
             .targetMailboxIds(TestId.of(2))
             .previousMailboxIds(TestId.of(1))
@@ -84,8 +85,7 @@ class MessageMoveEventTest {
 
     @Test
     void builderShouldBuildWhenFieldsAreGiven() {
-        String username = "user@james.org";
-        MailboxSession session = MailboxSessionUtil.create(username);
+        MailboxSession session = MailboxSessionUtil.create(USER);
         MessageMoves messageMoves = MessageMoves.builder()
             .targetMailboxIds(TestId.of(2))
             .previousMailboxIds(TestId.of(1))
@@ -99,7 +99,7 @@ class MessageMoveEventTest {
             .build();
 
         SoftAssertions.assertSoftly(softly -> {
-            softly.assertThat(event.getUsername()).isEqualTo(Username.of(username));
+            softly.assertThat(event.getUsername()).isEqualTo(USER);
             softly.assertThat(event.getMessageMoves()).isEqualTo(messageMoves);
             softly.assertThat(event.getMessageIds()).containsExactly(messageId);
         });
@@ -108,7 +108,7 @@ class MessageMoveEventTest {
     @Test
     void isMoveToShouldReturnFalseWhenMailboxIdIsNotInAddedMailboxIds() {
         MessageMoveEvent event = MessageMoveEvent.builder()
-            .session(MailboxSessionUtil.create("user@james.org"))
+            .session(MailboxSessionUtil.create(USER))
             .messageMoves(MessageMoves.builder()
                     .previousMailboxIds(TestId.of(1))
                     .targetMailboxIds(TestId.of(2))
@@ -122,7 +122,7 @@ class MessageMoveEventTest {
     void isMoveToShouldReturnTrueWhenMailboxIdIsInAddedMailboxIds() {
         TestId mailboxId = TestId.of(123);
         MessageMoveEvent event = MessageMoveEvent.builder()
-            .session(MailboxSessionUtil.create("user@james.org"))
+            .session(MailboxSessionUtil.create(USER))
             .messageMoves(MessageMoves.builder()
                 .previousMailboxIds(TestId.of(1))
                 .targetMailboxIds(TestId.of(2), mailboxId)
@@ -135,7 +135,7 @@ class MessageMoveEventTest {
     @Test
     void isMoveFromShouldReturnFalseWhenMailboxIdIsNotInRemovedMailboxIds() {
         MessageMoveEvent event = MessageMoveEvent.builder()
-            .session(MailboxSessionUtil.create("user@james.org"))
+            .session(MailboxSessionUtil.create(USER))
             .messageMoves(MessageMoves.builder()
                     .previousMailboxIds(TestId.of(1))
                     .targetMailboxIds(TestId.of(2))
@@ -149,7 +149,7 @@ class MessageMoveEventTest {
     void isMoveFromShouldReturnTrueWhenMailboxIdIsInRemovedMailboxIds() {
         TestId mailboxId = TestId.of(123);
         MessageMoveEvent event = MessageMoveEvent.builder()
-            .session(MailboxSessionUtil.create("user@james.org"))
+            .session(MailboxSessionUtil.create(USER))
             .messageMoves(MessageMoves.builder()
                 .previousMailboxIds(TestId.of(1), mailboxId)
                 .targetMailboxIds(TestId.of(2))
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLDiffTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLDiffTest.java
index 257a1a6..eaeef00 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLDiffTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLDiffTest.java
@@ -20,6 +20,7 @@ package org.apache.james.mailbox.acl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.UnsupportedRightException;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxACL.Entry;
@@ -30,8 +31,9 @@ import org.junit.jupiter.api.Test;
 
 class PositiveUserACLDiffTest {
 
-    private static final EntryKey USER_ENTRY_KEY = EntryKey.createUserEntryKey("user");
-    private static final EntryKey NEGATIVE_USER_ENTRY_KEY = EntryKey.createUserEntryKey("user", true);
+    private static final Username USER = Username.of("user");
+    private static final EntryKey USER_ENTRY_KEY = EntryKey.createUserEntryKey(USER);
+    private static final EntryKey NEGATIVE_USER_ENTRY_KEY = EntryKey.createUserEntryKey(USER, true);
     private static final EntryKey GROUP_ENTRY_KEY = EntryKey.createGroupEntryKey("group");
     private static final Rfc4314Rights RIGHTS = new Rfc4314Rights(Right.Administer);
 
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolverTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolverTest.java
index ece7ff9..4a255b8 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolverTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolverTest.java
@@ -22,10 +22,12 @@ package org.apache.james.mailbox.acl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.apache.james.core.Username;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class SimpleGroupMembershipResolverTest {
+    private static final Username USER = Username.of("user");
 
     private SimpleGroupMembershipResolver simpleGroupMembershipResolver;
 
@@ -37,7 +39,7 @@ class SimpleGroupMembershipResolverTest {
     @Test
     void isMemberShouldReturnFalseWhenEmptyResolver() {
         //When
-        boolean actual = simpleGroupMembershipResolver.isMember("user", "group");
+        boolean actual = simpleGroupMembershipResolver.isMember(USER, "group");
         //Then
         assertThat(actual).isFalse();
     }
@@ -45,9 +47,9 @@ class SimpleGroupMembershipResolverTest {
     @Test
     void isMemberShouldReturnTrueWhenTheSearchedMembershipIsPresent() {
         //Given
-        simpleGroupMembershipResolver.addMembership("group", "user");
+        simpleGroupMembershipResolver.addMembership("group", USER);
         //When
-        boolean actual = simpleGroupMembershipResolver.isMember("user", "group");
+        boolean actual = simpleGroupMembershipResolver.isMember(USER, "group");
         //Then
         assertThat(actual).isTrue();
     }
@@ -55,8 +57,8 @@ class SimpleGroupMembershipResolverTest {
     @Test
     void addMembershipShouldAddAMembershipWhenNonNullUser() {
         //When
-        simpleGroupMembershipResolver.addMembership("group", "user");
-        boolean actual = simpleGroupMembershipResolver.isMember("user", "group");
+        simpleGroupMembershipResolver.addMembership("group", USER);
+        boolean actual = simpleGroupMembershipResolver.isMember(USER, "group");
         //Then
         assertThat(actual).isTrue();
     }
@@ -64,7 +66,7 @@ class SimpleGroupMembershipResolverTest {
     @Test
     void addMembershipShouldAddAMembershipWithANullUser() {
         //Given
-        String userAdded = null;
+        Username userAdded = null;
         //When
         simpleGroupMembershipResolver.addMembership("group", userAdded);
         boolean actual = simpleGroupMembershipResolver.isMember(userAdded, "group");
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java
index b133994..5961f87 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java
@@ -22,6 +22,7 @@ package org.apache.james.mailbox.acl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.UnsupportedRightException;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxACL.Entry;
@@ -36,8 +37,8 @@ class UnionMailboxACLResolverTest {
     private static final String GROUP_1 = "group1";
     private static final String GROUP_2 = "group2";
 
-    private static final String USER_1 = "user1";
-    private static final String USER_2 = "user2";
+    private static final Username USER_1 = Username.of("user1");
+    private static final Username USER_2 = Username.of("user2");
 
     private MailboxACL anybodyRead;
     private MailboxACL anybodyReadNegative;
@@ -101,34 +102,34 @@ class UnionMailboxACLResolverTest {
     @Test
     void testAppliesNullUser() throws UnsupportedRightException {
 
-        assertThat(UnionMailboxACLResolver.applies(user1Key, null, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(user2Key, null, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(group1Key, null, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(group2Key, null, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.ANYBODY_KEY, null, groupMembershipResolver, USER_1, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.AUTHENTICATED_KEY, null, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, null, groupMembershipResolver, USER_1, false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(user1Key, null, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(user2Key, null, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(group1Key, null, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(group2Key, null, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.ANYBODY_KEY, null, groupMembershipResolver, USER_1.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.AUTHENTICATED_KEY, null, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, null, groupMembershipResolver, USER_1.asString(), false)).isFalse();
     }
 
     @Test
     void testAppliesUser() throws UnsupportedRightException {
         /* requester is the resource owner */
-        assertThat(UnionMailboxACLResolver.applies(user1Key, user1Key, groupMembershipResolver, USER_1, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(user2Key, user1Key, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(group1Key, user1Key, groupMembershipResolver, USER_1, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(group2Key, user1Key, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.ANYBODY_KEY, user1Key, groupMembershipResolver, USER_1, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.AUTHENTICATED_KEY, user1Key, groupMembershipResolver, USER_1, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, user1Key, groupMembershipResolver, USER_1, false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(user1Key, user1Key, groupMembershipResolver, USER_1.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(user2Key, user1Key, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(group1Key, user1Key, groupMembershipResolver, USER_1.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(group2Key, user1Key, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.ANYBODY_KEY, user1Key, groupMembershipResolver, USER_1.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.AUTHENTICATED_KEY, user1Key, groupMembershipResolver, USER_1.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, user1Key, groupMembershipResolver, USER_1.asString(), false)).isTrue();
 
         /* requester is not the resource user */
-        assertThat(UnionMailboxACLResolver.applies(user1Key, user1Key, groupMembershipResolver, USER_2, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(user2Key, user1Key, groupMembershipResolver, USER_2, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(group1Key, user1Key, groupMembershipResolver, USER_2, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(group2Key, user1Key, groupMembershipResolver, USER_2, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.ANYBODY_KEY, user1Key, groupMembershipResolver, USER_2, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.AUTHENTICATED_KEY, user1Key, groupMembershipResolver, USER_2, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, user1Key, groupMembershipResolver, USER_2, false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(user1Key, user1Key, groupMembershipResolver, USER_2.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(user2Key, user1Key, groupMembershipResolver, USER_2.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(group1Key, user1Key, groupMembershipResolver, USER_2.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(group2Key, user1Key, groupMembershipResolver, USER_2.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.ANYBODY_KEY, user1Key, groupMembershipResolver, USER_2.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.AUTHENTICATED_KEY, user1Key, groupMembershipResolver, USER_2.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, user1Key, groupMembershipResolver, USER_2.asString(), false)).isFalse();
 
         /* requester member of owner group */
         assertThat(UnionMailboxACLResolver.applies(user1Key, user1Key, groupMembershipResolver, GROUP_1, true)).isTrue();
@@ -149,13 +150,13 @@ class UnionMailboxACLResolverTest {
         assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, user1Key, groupMembershipResolver, GROUP_2, true)).isFalse();
 
         /* owner query */
-        assertThat(UnionMailboxACLResolver.applies(user1Key, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(user2Key, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(group1Key, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(group2Key, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1, false)).isFalse();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.ANYBODY_KEY, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.AUTHENTICATED_KEY, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1, false)).isTrue();
-        assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1, false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(user1Key, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(user2Key, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(group1Key, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(group2Key, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1.asString(), false)).isFalse();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.ANYBODY_KEY, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.AUTHENTICATED_KEY, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1.asString(), false)).isTrue();
+        assertThat(UnionMailboxACLResolver.applies(MailboxACL.OWNER_KEY, MailboxACL.OWNER_KEY, groupMembershipResolver, USER_1.asString(), false)).isTrue();
 
     }
 
@@ -163,236 +164,236 @@ class UnionMailboxACLResolverTest {
     void testResolveRightsNullUser() throws UnsupportedRightException {
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, user1Read, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, group1Read, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, group1Read, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, group1Read, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, group1Read, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, group1Read, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, ownerRead, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, ownerRead, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, ownerRead, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, ownerRead, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, ownerRead, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
@@ -401,23 +402,23 @@ class UnionMailboxACLResolverTest {
     @Test
     void testResolveRightsNullUserGlobals() throws UnsupportedRightException {
         assertThat(
-            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_2, false)
+            anyoneReadListGlobal.resolveRights(null, groupMembershipResolver, user1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, MailboxACL.EMPTY, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(null, groupMembershipResolver, MailboxACL.EMPTY, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            ownerFullGlobal.resolveRights(null, groupMembershipResolver, MailboxACL.EMPTY, USER_2, false)
+            ownerFullGlobal.resolveRights(null, groupMembershipResolver, MailboxACL.EMPTY, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            noGlobals.resolveRights(null, groupMembershipResolver, MailboxACL.EMPTY, USER_2, false)
+            noGlobals.resolveRights(null, groupMembershipResolver, MailboxACL.EMPTY, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, MailboxACL.EMPTY, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(null, groupMembershipResolver, MailboxACL.EMPTY, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
     }
@@ -427,231 +428,231 @@ class UnionMailboxACLResolverTest {
     void testResolveRightsUserSelfOwner() throws UnsupportedRightException {
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_1.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
@@ -662,231 +663,231 @@ class UnionMailboxACLResolverTest {
     void testResolveRightsUserNotOwner() throws UnsupportedRightException {
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, user1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, user1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, group1Read, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, group1ReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, anybodyReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, authenticatedReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
 
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2, false)
+            anyoneReadListGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
 
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
         assertThat(
-            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2, false)
+            authenticatedReadListWriteGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isTrue();
 
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2, false)
+            ownerFullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            noGlobals.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2, false)
+            noGlobals.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerRead, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
         assertThat(
-            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2, false)
+            negativeGroup2FullGlobal.resolveRights(USER_1, groupMembershipResolver, ownerReadNegative, USER_2.asString(), false)
                 .contains(MailboxACL.Right.Read))
             .isFalse();
 
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java
index a106367..a071583 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java
@@ -94,7 +94,7 @@ public interface EventBusTestFixture {
 
     MailboxSession.SessionId SESSION_ID = MailboxSession.SessionId.of(42);
     Username USERNAME = Username.of("user");
-    MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "mailboxName");
+    MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, "mailboxName");
     TestId TEST_ID = TestId.of(18);
     Event.EventId EVENT_ID = Event.EventId.of("6e0dd59d-660e-4d9b-b22f-0354479f47b4");
     Event.EventId EVENT_ID_2 = Event.EventId.of("5a7a9f3f-5f03-44be-b457-a51e93760645");
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersContract.java
index b1508f0..d218e8e 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersContract.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersContract.java
@@ -102,8 +102,8 @@ interface EventDeadLettersContract {
     int THREAD_COUNT = 10;
     int OPERATION_COUNT = 50;
 
-    MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "mailboxName");
     Username USERNAME = Username.of("user");
+    MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, "mailboxName");
     MailboxSession.SessionId SESSION_ID = MailboxSession.SessionId.of(235);
     TestId MAILBOX_ID = TestId.of(563);
     Event.EventId EVENT_ID_1 = Event.EventId.of("6e0dd59d-660e-4d9b-b22f-0354479f47b4");
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java
index 48952cf..a919e0f 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupContract.java
@@ -50,10 +50,10 @@ import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.model.TestId;
-import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
+import org.junit.jupiter.api.Test;
 
 public interface GroupContract {
 
@@ -141,7 +141,8 @@ public interface GroupContract {
 
             eventBus().register(listener, GROUP_A);
 
-            MailboxListener.Added noopEvent = new MailboxListener.Added(MailboxSession.SessionId.of(18), Username.of("bob"), MailboxPath.forUser("bob", "mailbox"), TestId.of(58), ImmutableSortedMap.of(), Event.EventId.random());
+            Username bob = Username.of("bob");
+            MailboxListener.Added noopEvent = new MailboxListener.Added(MailboxSession.SessionId.of(18), bob, MailboxPath.forUser(bob, "mailbox"), TestId.of(58), ImmutableSortedMap.of(), Event.EventId.random());
             eventBus().dispatch(noopEvent, NO_KEYS).block();
 
             verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never())
@@ -351,7 +352,8 @@ public interface GroupContract {
 
             eventBus().register(listener, GROUP_A);
 
-            MailboxListener.Added noopEvent = new MailboxListener.Added(MailboxSession.SessionId.of(18), Username.of("bob"), MailboxPath.forUser("bob", "mailbox"), TestId.of(58), ImmutableSortedMap.of(), Event.EventId.random());
+            Username bob = Username.of("bob");
+            MailboxListener.Added noopEvent = new MailboxListener.Added(MailboxSession.SessionId.of(18), bob, MailboxPath.forUser(bob, "mailbox"), TestId.of(58), ImmutableSortedMap.of(), Event.EventId.random());
             eventBus().reDeliver(GROUP_A, noopEvent).block();
 
             verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never()).event(any());
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java
index 4ce11b5..6f2ab58 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/KeyContract.java
@@ -90,7 +90,8 @@ public interface KeyContract extends EventBusContract {
 
             eventBus().register(listener, KEY_1);
 
-            MailboxListener.Added noopEvent = new MailboxListener.Added(MailboxSession.SessionId.of(18), Username.of("bob"), MailboxPath.forUser("bob", "mailbox"), TestId.of(58), ImmutableSortedMap.of(), Event.EventId.random());
+            Username bob = Username.of("bob");
+            MailboxListener.Added noopEvent = new MailboxListener.Added(MailboxSession.SessionId.of(18), bob, MailboxPath.forUser(bob, "mailbox"), TestId.of(58), ImmutableSortedMap.of(), Event.EventId.random());
             eventBus().dispatch(noopEvent, KEY_1).block();
 
             verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never())
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 ea04390..7f164ba 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
@@ -19,12 +19,13 @@
 
 package org.apache.james.mailbox.fixture;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxPath;
 
 public class MailboxFixture {
-    public static final String ALICE = "alice";
-    public static final String BOB = "bob";
-    public static final String CEDRIC = "cedric";
+    public static final Username ALICE = Username.of("alice");
+    public static final Username BOB = Username.of("bob");
+    public static final Username CEDRIC = Username.of("cedric");
 
     public static final MailboxPath INBOX_ALICE = MailboxPath.forUser(ALICE, "INBOX");
     public static final MailboxPath OUTBOX_ALICE = MailboxPath.forUser(ALICE, "OUTBOX");
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java
index 1d793bf..26d36af 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java
@@ -26,6 +26,7 @@ import java.util.Calendar;
 
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.FlagsBuilder;
@@ -41,9 +42,9 @@ import org.apache.james.mailbox.quota.MaxQuotaManager;
  * Provide an initialized Mailbox environment where we can run managers tests
  */
 public class ManagerTestProvisionner {
-    public static final String USER = "user@domain.org";
+    public static final Username USER = Username.of("user@domain.org");
     public static final String USER_PASS = "pass";
-    public static final String OTHER_USER = "otherUser@domain.org";
+    public static final Username OTHER_USER = Username.of("otherUser@domain.org");
     public static final String OTHER_USER_PASS = "otherPass";
 
     private IntegrationResources<?> integrationResources;
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/DataProvisioner.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/DataProvisioner.java
index 674c324..ec59bee 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/DataProvisioner.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/DataProvisioner.java
@@ -22,6 +22,7 @@ import java.util.stream.IntStream;
 
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
@@ -79,10 +80,11 @@ public class DataProvisioner {
     public static void provisionDomain(MailboxManager mailboxManager, String domain) {
         IntStream.range(0, USER_COUNT)
             .mapToObj(i -> "user" + i + "@" + domain)
+            .map(Username::of)
             .forEach(Throwing.consumer(user -> provisionUser(mailboxManager, user)));
     }
 
-    private static void provisionUser(MailboxManager mailboxManager, String user) throws MailboxException {
+    private static void provisionUser(MailboxManager mailboxManager, Username user) throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(user);
         mailboxManager.startProcessingRequest(mailboxSession);
 
@@ -100,7 +102,7 @@ public class DataProvisioner {
     private static void createSubSubMailboxes(MailboxManager mailboxManager,MailboxSession mailboxSession, String subFolderName) {
         IntStream.range(0, SUB_SUB_MAILBOXES_COUNT)
             .mapToObj(i -> subFolderName + ".SUBSUB_FOLDER_" + i)
-            .forEach(name -> createMailbox(mailboxManager, mailboxSession, MailboxPath.forUser(mailboxSession.getUser().asString(), name)));
+            .forEach(name -> createMailbox(mailboxManager, mailboxSession, MailboxPath.forUser(mailboxSession.getUser(), name)));
 
     }
 
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java
index 8282c9d..f299efa 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.UnsupportedRightException;
 import org.apache.james.mailbox.model.MailboxACL.Entry;
 import org.apache.james.mailbox.model.MailboxACL.EntryKey;
@@ -41,6 +42,8 @@ class MailboxACLTest {
 
     private static final String USER_1 = "user1";
     private static final String USER_2 = "user2";
+    private static final Username USERNAME_1 = Username.of("user1");
+    private static final Username USERNAME_2 = Username.of("user2");
     private static final boolean NEGATIVE = true;
 
     private static final String ae = "ae";
@@ -221,7 +224,7 @@ class MailboxACLTest {
     @Test
     void applyShouldNotThrowWhenRemovingANonExistingEntry() throws Exception {
         assertThat(MailboxACL.EMPTY
-            .apply(MailboxACL.command().forUser("bob").noRights().asReplacement()))
+            .apply(MailboxACL.command().forUser(Username.of("bob")).noRights().asReplacement()))
             .isEqualTo(MailboxACL.EMPTY);
     }
 
@@ -244,20 +247,20 @@ class MailboxACLTest {
     void usersACLShouldReturnOnlyUsersMapWhenSomeUserEntries() throws Exception {
         MailboxACL.Rfc4314Rights rights = MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("aei");
         MailboxACL mailboxACL = new MailboxACL(
-            ImmutableMap.of(EntryKey.createUserEntryKey("user1"), MailboxACL.FULL_RIGHTS,
+            ImmutableMap.of(EntryKey.createUserEntryKey(USERNAME_1), MailboxACL.FULL_RIGHTS,
                 EntryKey.createGroupEntryKey("group"), MailboxACL.FULL_RIGHTS,
-                EntryKey.createUserEntryKey("user2"), rights,
+                EntryKey.createUserEntryKey(USERNAME_2), rights,
                 EntryKey.createGroupEntryKey("group2"), MailboxACL.NO_RIGHTS));
         assertThat(mailboxACL.ofPositiveNameType(NameType.user))
             .containsOnly(
-                MapEntry.entry(EntryKey.createUserEntryKey("user1"), MailboxACL.FULL_RIGHTS),
-                MapEntry.entry(EntryKey.createUserEntryKey("user2"), rights));
+                MapEntry.entry(EntryKey.createUserEntryKey(USERNAME_1), MailboxACL.FULL_RIGHTS),
+                MapEntry.entry(EntryKey.createUserEntryKey(USERNAME_2), rights));
     }
 
     @Test
     void ofPositiveNameTypeShouldFilterOutNegativeEntries() throws Exception {
         MailboxACL mailboxACL = new MailboxACL(
-            ImmutableMap.of(EntryKey.createUserEntryKey("user1", NEGATIVE), MailboxACL.FULL_RIGHTS));
+            ImmutableMap.of(EntryKey.createUserEntryKey(Username.of("user1"), NEGATIVE), MailboxACL.FULL_RIGHTS));
         assertThat(mailboxACL.ofPositiveNameType(NameType.user))
             .isEmpty();
     }
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertTests.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertTests.java
index 62f8bae..b3d4ecf 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertTests.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertTests.java
@@ -21,17 +21,20 @@ package org.apache.james.mailbox.model;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.apache.james.core.Username;
 import org.junit.jupiter.api.Test;
 
+
 class MailboxAssertTests {
+    private static final Username USER = Username.of("user");
 
     private static final long UID_VALIDITY = 42;
     private static final TestId MAILBOX_ID = TestId.of(24);
 
     @Test
     void isEqualToShouldNotFailWithEqualMailbox() {
-        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY);
-        Mailbox mailbox2 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY);
+        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY);
+        Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY);
         mailbox1.setMailboxId(MAILBOX_ID);
         mailbox2.setMailboxId(MAILBOX_ID);
 
@@ -40,8 +43,8 @@ class MailboxAssertTests {
 
     @Test
     void isEqualToShouldFailWithNotEqualNamespace() {
-        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY);
-        Mailbox mailbox2 = new Mailbox(new MailboxPath("other_namespace", "user", "name"), UID_VALIDITY);
+        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY);
+        Mailbox mailbox2 = new Mailbox(new MailboxPath("other_namespace", USER, "name"), UID_VALIDITY);
         mailbox1.setMailboxId(MAILBOX_ID);
         mailbox2.setMailboxId(MAILBOX_ID);
 
@@ -51,8 +54,8 @@ class MailboxAssertTests {
 
     @Test
     void isEqualToShouldFailWithNotEqualUser() {
-        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY);
-        Mailbox mailbox2 = new Mailbox(new MailboxPath("namespace", "other_user", "name"), UID_VALIDITY);
+        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY);
+        Mailbox mailbox2 = new Mailbox(new MailboxPath("namespace", Username.of("other_user"), "name"), UID_VALIDITY);
         mailbox1.setMailboxId(MAILBOX_ID);
         mailbox2.setMailboxId(MAILBOX_ID);
 
@@ -62,8 +65,8 @@ class MailboxAssertTests {
 
     @Test
     void isEqualToShouldFailWithNotEqualName() {
-        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY);
-        Mailbox mailbox2 = new Mailbox(new MailboxPath("namespace", "user", "other_name"), UID_VALIDITY);
+        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY);
+        Mailbox mailbox2 = new Mailbox(new MailboxPath("namespace", USER, "other_name"), UID_VALIDITY);
         mailbox1.setMailboxId(MAILBOX_ID);
         mailbox2.setMailboxId(MAILBOX_ID);
 
@@ -73,8 +76,8 @@ class MailboxAssertTests {
 
     @Test
     void isEqualToShouldFailWithNotEqualId() {
-        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY);
-        Mailbox mailbox2 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY);
+        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY);
+        Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY);
         mailbox1.setMailboxId(MAILBOX_ID);
         mailbox2.setMailboxId(TestId.of(MAILBOX_ID.id + 1));
 
@@ -84,8 +87,8 @@ class MailboxAssertTests {
 
     @Test
     void isEqualToShouldFailWithNotEqualUidValidity() {
-        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY);
-        Mailbox mailbox2 = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY + 1);
+        Mailbox mailbox1 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY);
+        Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY + 1);
         mailbox1.setMailboxId(MAILBOX_ID);
         mailbox2.setMailboxId(MAILBOX_ID);
 
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 321f58f..0e5e887 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
@@ -24,17 +24,19 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.DefaultMailboxes;
-import org.junit.jupiter.api.Test;
 import org.apache.james.mailbox.exception.HasEmptyMailboxNameInHierarchyException;
 import org.apache.james.mailbox.exception.MailboxNameException;
 import org.apache.james.mailbox.exception.TooLongMailboxNameException;
+import org.junit.jupiter.api.Test;
 
 import com.google.common.base.Strings;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 class MailboxPathTest {
+    private static final Username USER = Username.of("user");
 
     @Test
     void shouldMatchBeanContract() {
@@ -44,214 +46,214 @@ class MailboxPathTest {
 
     @Test
     void getHierarchyLevelsShouldBeOrdered() {
-        assertThat(MailboxPath.forUser("user", "inbox.folder.subfolder")
+        assertThat(MailboxPath.forUser(USER, "inbox.folder.subfolder")
             .getHierarchyLevels('.'))
             .containsExactly(
-                MailboxPath.forUser("user", "inbox"),
-                MailboxPath.forUser("user", "inbox.folder"),
-                MailboxPath.forUser("user", "inbox.folder.subfolder"));
+                MailboxPath.forUser(USER, "inbox"),
+                MailboxPath.forUser(USER, "inbox.folder"),
+                MailboxPath.forUser(USER, "inbox.folder.subfolder"));
     }
 
     @Test
     void getHierarchyLevelsShouldReturnPathWhenOneLevel() {
-        assertThat(MailboxPath.forUser("user", "inbox")
+        assertThat(MailboxPath.forUser(USER, "inbox")
             .getHierarchyLevels('.'))
             .containsExactly(
-                MailboxPath.forUser("user", "inbox"));
+                MailboxPath.forUser(USER, "inbox"));
     }
 
     @Test
     void getHierarchyLevelsShouldReturnPathWhenEmptyName() {
-        assertThat(MailboxPath.forUser("user", "")
+        assertThat(MailboxPath.forUser(USER, "")
             .getHierarchyLevels('.'))
             .containsExactly(
-                MailboxPath.forUser("user", ""));
+                MailboxPath.forUser(USER, ""));
     }
 
     @Test
     void getHierarchyLevelsShouldReturnPathWhenNullName() {
-        assertThat(MailboxPath.forUser("user", null)
+        assertThat(MailboxPath.forUser(USER, null)
             .getHierarchyLevels('.'))
             .containsExactly(
-                MailboxPath.forUser("user", null));
+                MailboxPath.forUser(USER, null));
     }
 
     @Test
     void sanitizeShouldNotThrowOnNullMailboxName() {
-        assertThat(MailboxPath.forUser("user", null)
+        assertThat(MailboxPath.forUser(USER, null)
             .sanitize('.'))
             .isEqualTo(
-                MailboxPath.forUser("user", null));
+                MailboxPath.forUser(USER, null));
     }
 
     @Test
     void sanitizeShouldReturnEmptyWhenEmpty() {
-        assertThat(MailboxPath.forUser("user", "")
+        assertThat(MailboxPath.forUser(USER, "")
             .sanitize('.'))
             .isEqualTo(
-                MailboxPath.forUser("user", ""));
+                MailboxPath.forUser(USER, ""));
     }
 
     @Test
     void sanitizeShouldRemoveMaximumOneTrailingDelimiterWhenAlone() {
-        assertThat(MailboxPath.forUser("user", ".")
+        assertThat(MailboxPath.forUser(USER, ".")
             .sanitize('.'))
             .isEqualTo(
-                MailboxPath.forUser("user", ""));
+                MailboxPath.forUser(USER, ""));
     }
 
     @Test
     void sanitizeShouldPreserveHeadingDelimiter() {
-        assertThat(MailboxPath.forUser("user", ".a")
+        assertThat(MailboxPath.forUser(USER, ".a")
             .sanitize('.'))
             .isEqualTo(
-                MailboxPath.forUser("user", ".a"));
+                MailboxPath.forUser(USER, ".a"));
     }
 
     @Test
     void sanitizeShouldRemoveTrailingDelimiter() {
-        assertThat(MailboxPath.forUser("user", "a.")
+        assertThat(MailboxPath.forUser(USER, "a.")
             .sanitize('.'))
             .isEqualTo(
-                MailboxPath.forUser("user", "a"));
+                MailboxPath.forUser(USER, "a"));
     }
 
     @Test
     void sanitizeShouldRemoveMaximumOneTrailingDelimiter() {
-        assertThat(MailboxPath.forUser("user", "a..")
+        assertThat(MailboxPath.forUser(USER, "a..")
             .sanitize('.'))
             .isEqualTo(
-                MailboxPath.forUser("user", "a."));
+                MailboxPath.forUser(USER, "a."));
     }
 
     @Test
     void sanitizeShouldPreserveRedundantDelimiters() {
-        assertThat(MailboxPath.forUser("user", "a..a")
+        assertThat(MailboxPath.forUser(USER, "a..a")
             .sanitize('.'))
             .isEqualTo(
-                MailboxPath.forUser("user", "a..a"));
+                MailboxPath.forUser(USER, "a..a"));
     }
 
     @Test
     void hasEmptyNameInHierarchyShouldBeFalseIfSingleLevelPath() {
-        assertThat(MailboxPath.forUser("user", "a")
+        assertThat(MailboxPath.forUser(USER, "a")
             .hasEmptyNameInHierarchy('.'))
             .isFalse();
     }
 
     @Test
     void hasEmptyNameInHierarchyShouldBeFalseIfNestedLevelWithNonEmptyNames() {
-        assertThat(MailboxPath.forUser("user", "a.b.c")
+        assertThat(MailboxPath.forUser(USER, "a.b.c")
             .hasEmptyNameInHierarchy('.'))
             .isFalse();
     }
 
     @Test
     void hasEmptyNameInHierarchyShouldBeTrueIfEmptyPath() {
-        assertThat(MailboxPath.forUser("user", "")
+        assertThat(MailboxPath.forUser(USER, "")
             .hasEmptyNameInHierarchy('.'))
             .isTrue();
     }
 
     @Test
     void hasEmptyNameInHierarchyShouldBeTrueIfPathWithTwoEmptyNames() {
-        assertThat(MailboxPath.forUser("user", ".")
+        assertThat(MailboxPath.forUser(USER, ".")
             .hasEmptyNameInHierarchy('.'))
             .isTrue();
     }
 
     @Test
     void hasEmptyNameInHierarchyShouldBeTrueIfPathWithAnEmptyNameBetweenTwoNames() {
-        assertThat(MailboxPath.forUser("user", "a..b")
+        assertThat(MailboxPath.forUser(USER, "a..b")
             .hasEmptyNameInHierarchy('.'))
             .isTrue();
     }
 
     @Test
     void hasEmptyNameInHierarchyShouldBeTrueIfPathWithHeadingEmptyNames() {
-        assertThat(MailboxPath.forUser("user", "..a")
+        assertThat(MailboxPath.forUser(USER, "..a")
             .hasEmptyNameInHierarchy('.'))
             .isTrue();
     }
 
     @Test
     void hasEmptyNameInHierarchyShouldBeTrueIfPathWithATrailingEmptyName() {
-        assertThat(MailboxPath.forUser("user", "a.")
+        assertThat(MailboxPath.forUser(USER, "a.")
             .hasEmptyNameInHierarchy('.'))
             .isTrue();
     }
 
     @Test
     void hasEmptyNameInHierarchyShouldBeTrueIfPathWithTrailingEmptyNames() {
-        assertThat(MailboxPath.forUser("user", "a..")
+        assertThat(MailboxPath.forUser(USER, "a..")
             .hasEmptyNameInHierarchy('.'))
             .isTrue();
     }
 
     @Test
     void assertAcceptableShouldThrowOnDoubleSeparator() {
-        assertThatThrownBy(() -> MailboxPath.forUser("user", "a..b")
+        assertThatThrownBy(() -> MailboxPath.forUser(USER, "a..b")
                 .assertAcceptable('.'))
             .isInstanceOf(HasEmptyMailboxNameInHierarchyException.class);
     }
 
     @Test
     void assertAcceptableShouldThrowOnAnd() {
-        assertThatThrownBy(() -> MailboxPath.forUser("user", "a&b")
+        assertThatThrownBy(() -> MailboxPath.forUser(USER, "a&b")
                 .assertAcceptable('.'))
             .isInstanceOf(MailboxNameException.class);
     }
 
     @Test
     void assertAcceptableShouldThrowOnSharp() {
-        assertThatThrownBy(() -> MailboxPath.forUser("user", "a#b")
+        assertThatThrownBy(() -> MailboxPath.forUser(USER, "a#b")
                 .assertAcceptable('.'))
             .isInstanceOf(MailboxNameException.class);
     }
 
     @Test
     void assertAcceptableShouldThrowOnPercent() {
-        assertThatThrownBy(() -> MailboxPath.forUser("user", "a%b")
+        assertThatThrownBy(() -> MailboxPath.forUser(USER, "a%b")
                 .assertAcceptable('.'))
             .isInstanceOf(MailboxNameException.class);
     }
 
     @Test
     void assertAcceptableShouldThrowOnWildcard() {
-        assertThatThrownBy(() -> MailboxPath.forUser("user", "a*b")
+        assertThatThrownBy(() -> MailboxPath.forUser(USER, "a*b")
                 .assertAcceptable('.'))
             .isInstanceOf(MailboxNameException.class);
     }
 
     @Test
     void assertAcceptableShouldThrowOnTooLongMailboxName() {
-        assertThatThrownBy(() -> MailboxPath.forUser("user", Strings.repeat("a", 201))
+        assertThatThrownBy(() -> MailboxPath.forUser(USER, Strings.repeat("a", 201))
                 .assertAcceptable('.'))
             .isInstanceOf(TooLongMailboxNameException.class);
     }
 
     @Test
     void assertAcceptableShouldNotThrowOnNotTooLongMailboxName() {
-        assertThatCode(() -> MailboxPath.forUser("user", Strings.repeat("a", 200))
+        assertThatCode(() -> MailboxPath.forUser(USER, Strings.repeat("a", 200))
                 .assertAcceptable('.'))
             .doesNotThrowAnyException();
     }
 
     @Test
     void isInboxShouldReturnTrueWhenINBOX() {
-        MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", DefaultMailboxes.INBOX);
+        MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, DefaultMailboxes.INBOX);
         assertThat(mailboxPath.isInbox()).isTrue();
     }
 
     @Test
     void isInboxShouldReturnTrueWhenINBOXWithOtherCase() {
-        MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "InBoX");
+        MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, "InBoX");
         assertThat(mailboxPath.isInbox()).isTrue();
     }
 
     @Test
     void isInboxShouldReturnFalseWhenOtherThanInbox() {
-        MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", DefaultMailboxes.ARCHIVE);
+        MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, DefaultMailboxes.ARCHIVE);
         assertThat(mailboxPath.isInbox()).isFalse();
     }
 }
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java
index 664fa4c..b3d6a89 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.model.search.MailboxQuery.Builder;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,13 +33,13 @@ import org.junit.jupiter.api.Test;
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 class MailboxQueryTest {
-    private static final String CURRENT_USER = "user";
+    private static final Username CURRENT_USER = Username.of("user");
 
     private MailboxPath mailboxPath;
 
     @BeforeEach
     void setUp() {
-        mailboxPath = new MailboxPath("namespace", "user", "name");
+        mailboxPath = new MailboxPath("namespace", CURRENT_USER, "name");
     }
 
     @Test
@@ -59,10 +60,10 @@ class MailboxQueryTest {
 
     @Test
     void buildShouldConstructMailboxPathWhenPrivateUserMailboxes() {
-        MailboxPath expected = MailboxPath.forUser("user", "");
+        MailboxPath expected = MailboxPath.forUser(CURRENT_USER, "");
 
         MailboxQuery actual = MailboxQuery.builder()
-                .username("user")
+                .username(CURRENT_USER)
                 .privateNamespace()
                 .build();
 
@@ -74,7 +75,7 @@ class MailboxQueryTest {
     @Test
     void buildShouldMatchAllValuesWhenPrivateUserMailboxes() {
         Builder testee = MailboxQuery.builder()
-                .username("user")
+                .username(CURRENT_USER)
                 .privateNamespace();
 
         MailboxQuery actual = testee.build();
@@ -95,7 +96,7 @@ class MailboxQueryTest {
     void builderShouldThrowWhenBaseAndUsernameGiven() {
         assertThatThrownBy(() -> MailboxQuery.builder()
                 .userAndNamespaceFrom(mailboxPath)
-                .username("user"))
+                .username(CURRENT_USER))
             .isInstanceOf(IllegalStateException.class);
     }
 
@@ -139,7 +140,7 @@ class MailboxQueryTest {
 
     @Test
     void belongsToNamespaceAndUserShouldReturnTrueWithIdenticalMailboxesWithNullNamespace() {
-        MailboxPath mailboxPath = new MailboxPath(null, "user", "name");
+        MailboxPath mailboxPath = new MailboxPath(null, CURRENT_USER, "name");
 
         MailboxQuery mailboxQuery = MailboxQuery.builder()
             .userAndNamespaceFrom(mailboxPath)
@@ -175,7 +176,7 @@ class MailboxQueryTest {
             .userAndNamespaceFrom(new MailboxPath("namespace", CURRENT_USER, "name"))
             .build();
 
-        assertThat(mailboxQuery.belongsToRequestedNamespaceAndUser(new MailboxPath("namespace", CURRENT_USER + "2", "name")))
+        assertThat(mailboxQuery.belongsToRequestedNamespaceAndUser(new MailboxPath("namespace", Username.of("user2"), "name")))
             .isFalse();
     }
 
@@ -185,7 +186,7 @@ class MailboxQueryTest {
             .userAndNamespaceFrom(new MailboxPath("namespace", CURRENT_USER, "name"))
             .build();
 
-        assertThat(mailboxQuery.belongsToRequestedNamespaceAndUser(new MailboxPath("namespace", "other", "name")))
+        assertThat(mailboxQuery.belongsToRequestedNamespaceAndUser(new MailboxPath("namespace", Username.of("other"), "name")))
             .isFalse();
     }
 }
diff --git a/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/DefaultMailboxBackup.java b/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/DefaultMailboxBackup.java
index 8a5cf6d..61a699d 100644
--- a/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/DefaultMailboxBackup.java
+++ b/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/DefaultMailboxBackup.java
@@ -85,7 +85,7 @@ public class DefaultMailboxBackup implements MailboxBackup {
 
     @Override
     public void backupAccount(Username username, OutputStream destination) throws IOException, MailboxException {
-        MailboxSession session = mailboxManager.createSystemSession(username.asString());
+        MailboxSession session = mailboxManager.createSystemSession(username);
         List<MailAccountContent> accountContents = getAccountContentForUser(session);
         List<MailboxWithAnnotations> mailboxes = accountContents.stream()
             .map(MailAccountContent::getMailboxWithAnnotations)
@@ -96,7 +96,7 @@ public class DefaultMailboxBackup implements MailboxBackup {
     }
 
     private boolean isAccountNonEmpty(Username username) throws BadCredentialsException, MailboxException, IOException {
-        MailboxSession session = mailboxManager.createSystemSession(username.asString());
+        MailboxSession session = mailboxManager.createSystemSession(username);
         return getAccountContentForUser(session)
             .stream()
             .findFirst()
@@ -110,13 +110,13 @@ public class DefaultMailboxBackup implements MailboxBackup {
                 return Mono.just(BackupStatus.NON_EMPTY_RECEIVER_ACCOUNT);
             }
         } catch (Exception e) {
-            LOGGER.error("Error during account restoration for user : " + username, e);
+            LOGGER.error("Error during account restoration for user : " + username.asString(), e);
             return Mono.just(BackupStatus.FAILED);
         }
 
         return Mono.fromRunnable(Throwing.runnable(() -> archiveRestorer.restore(username, source)).sneakyThrow())
             .subscribeOn(Schedulers.boundedElastic())
-            .doOnError(e -> LOGGER.error("Error during account restoration for user : " + username, e))
+            .doOnError(e -> LOGGER.error("Error during account restoration for user : " + username.asString(), e))
             .doOnTerminate(Throwing.runnable(source::close).sneakyThrow())
             .thenReturn(BackupStatus.DONE)
             .onErrorReturn(BackupStatus.FAILED);
diff --git a/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/ZipMailArchiveRestorer.java b/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/ZipMailArchiveRestorer.java
index 3197fb4..07c0e82 100644
--- a/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/ZipMailArchiveRestorer.java
+++ b/mailbox/backup/src/main/java/org/apache/james/mailbox/backup/ZipMailArchiveRestorer.java
@@ -54,7 +54,7 @@ public class ZipMailArchiveRestorer implements MailArchiveRestorer {
     }
 
     public void restore(Username username, InputStream source) throws MailboxException, IOException {
-        MailboxSession session = mailboxManager.createSystemSession(username.asString());
+        MailboxSession session = mailboxManager.createSystemSession(username);
         restoreEntries(source, session);
     }
 
@@ -95,7 +95,7 @@ public class ZipMailArchiveRestorer implements MailArchiveRestorer {
 
     private Optional<ImmutablePair<SerializedMailboxId, MessageManager>> restoreMailboxEntry(MailboxSession session,
                                                                                              MailboxWithAnnotationsArchiveEntry mailboxWithAnnotationsArchiveEntry) throws MailboxException {
-        MailboxPath mailboxPath = MailboxPath.forUser(session.getUser().asString(), mailboxWithAnnotationsArchiveEntry.getMailboxName());
+        MailboxPath mailboxPath = MailboxPath.forUser(session.getUser(), mailboxWithAnnotationsArchiveEntry.getMailboxName());
         Optional<MailboxId> newMailboxId = mailboxManager.createMailbox(mailboxPath, session);
         mailboxManager.updateAnnotations(mailboxPath, session, mailboxWithAnnotationsArchiveEntry.getAnnotations());
         return newMailboxId.map(Throwing.<MailboxId, ImmutablePair<SerializedMailboxId, MessageManager>>function(newId ->
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 fb70c2d..ec97990 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
@@ -47,11 +47,11 @@ import com.google.common.collect.ImmutableList;
 
 public interface MailboxMessageFixture {
 
-    String USER = "user";
-    String OTHER_USER = "otherUser";
+    Username USER = Username.of("user");
+    Username OTHER_USER = Username.of("otherUser");
 
-    Username USERNAME_1 = Username.of(USER);
-    Username USERNAME_2 = Username.of(OTHER_USER);
+    Username USERNAME_1 = USER;
+    Username USERNAME_2 = OTHER_USER;
 
     String DATE_STRING_1 = "2018-02-15T15:54:02Z";
     String DATE_STRING_2 = "2018-03-15T15:54:02Z";
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
index 449a639..fddf40f 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
@@ -25,6 +25,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import org.apache.james.blob.api.BlobStore;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAOV2.DAOAttachment;
 import org.apache.james.mailbox.exception.AttachmentNotFoundException;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -32,7 +33,6 @@ import org.apache.james.mailbox.model.Attachment;
 import org.apache.james.mailbox.model.AttachmentId;
 import org.apache.james.mailbox.model.MessageId;
 import org.apache.james.mailbox.store.mail.AttachmentMapper;
-import org.apache.james.mailbox.store.mail.model.Username;
 import org.apache.james.util.ReactorUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java
index d994881..8e94a2b 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java
@@ -31,8 +31,8 @@ import static org.apache.james.mailbox.cassandra.table.CassandraAttachmentOwnerT
 import javax.inject.Inject;
 
 import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.AttachmentId;
-import org.apache.james.mailbox.store.mail.model.Username;
 
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Row;
@@ -72,7 +72,7 @@ public class CassandraAttachmentOwnerDAO {
         return executor.executeVoid(
             addStatement.bind()
                 .setUUID(ID, attachmentId.asUUID())
-                .setString(OWNER, owner.getValue()));
+                .setString(OWNER, owner.asString()));
     }
 
     public Flux<Username> retrieveOwners(AttachmentId attachmentId) {
@@ -83,6 +83,6 @@ public class CassandraAttachmentOwnerDAO {
     }
 
     private Username toOwner(Row row) {
-        return Username.fromRawValue(row.getString(OWNER));
+        return Username.of(row.getString(OWNER));
     }
 }
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
index daa9a9e..1fd07a7 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
@@ -37,6 +37,7 @@ import javax.inject.Inject;
 import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
 import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
 import org.apache.james.backends.cassandra.utils.CassandraUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.mail.utils.MailboxBaseTupleUtil;
 import org.apache.james.mailbox.cassandra.table.CassandraMailboxTable;
@@ -147,7 +148,7 @@ public class CassandraMailboxDAO {
         return new Mailbox(
             new MailboxPath(
                 row.getUDTValue(MAILBOX_BASE).getString(CassandraMailboxTable.MailboxBase.NAMESPACE),
-                row.getUDTValue(MAILBOX_BASE).getString(CassandraMailboxTable.MailboxBase.USER),
+                Username.of(row.getUDTValue(MAILBOX_BASE).getString(CassandraMailboxTable.MailboxBase.USER)),
                 row.getString(NAME)),
             row.getLong(UIDVALIDITY));
     }
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
index 06d5246..56b32d3 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
@@ -29,6 +29,7 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -260,7 +261,7 @@ public class CassandraMailboxMapper implements MailboxMapper {
     }
 
     @Override
-    public List<Mailbox> findNonPersonalMailboxes(String userName, Right right) {
+    public List<Mailbox> findNonPersonalMailboxes(Username userName, Right right) {
         return userMailboxRightsDAO.listRightsForUser(userName)
             .filter(mailboxId -> authorizedMailbox(mailboxId.getRight(), right))
             .map(Pair::getLeft)
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
index 1eee863..72e7d78 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mailbox.cassandra.mail;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.model.MailboxPath;
 
@@ -29,7 +30,7 @@ public interface CassandraMailboxPathDAO {
 
     Mono<CassandraIdAndPath> retrieveId(MailboxPath mailboxPath);
 
-    Flux<CassandraIdAndPath> listUserMailboxes(String namespace, String user);
+    Flux<CassandraIdAndPath> listUserMailboxes(String namespace, Username user);
 
     void logGhostMailboxSuccess(CassandraIdAndPath value);
 
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOImpl.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOImpl.java
index 48a245c..a10d94c 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOImpl.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOImpl.java
@@ -36,6 +36,7 @@ import javax.inject.Inject;
 import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
 import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
 import org.apache.james.backends.cassandra.utils.CassandraUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.GhostMailbox;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.mail.utils.MailboxBaseTupleUtil;
@@ -134,7 +135,7 @@ public class CassandraMailboxPathDAOImpl implements CassandraMailboxPathDAO {
     }
 
     @Override
-    public Flux<CassandraIdAndPath> listUserMailboxes(String namespace, String user) {
+    public Flux<CassandraIdAndPath> listUserMailboxes(String namespace, Username user) {
         return cassandraAsyncExecutor.execute(
             selectAllForUser.bind()
                 .setUDTValue(NAMESPACE_AND_USER, mailboxBaseTupleUtil.createMailboxBaseUDT(namespace, user)))
@@ -181,7 +182,7 @@ public class CassandraMailboxPathDAOImpl implements CassandraMailboxPathDAO {
         return new CassandraIdAndPath(
             CassandraId.of(row.getUUID(MAILBOX_ID)),
             new MailboxPath(row.getUDTValue(NAMESPACE_AND_USER).getString(CassandraMailboxTable.MailboxBase.NAMESPACE),
-                row.getUDTValue(NAMESPACE_AND_USER).getString(CassandraMailboxTable.MailboxBase.USER),
+                Username.of(row.getUDTValue(NAMESPACE_AND_USER).getString(CassandraMailboxTable.MailboxBase.USER)),
                 row.getString(MAILBOX_NAME)));
     }
 
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathV2DAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathV2DAO.java
index eb47783..f736ef0 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathV2DAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathV2DAO.java
@@ -35,6 +35,7 @@ import javax.inject.Inject;
 
 import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
 import org.apache.james.backends.cassandra.utils.CassandraUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.GhostMailbox;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.model.MailboxPath;
@@ -114,7 +115,7 @@ public class CassandraMailboxPathV2DAO implements CassandraMailboxPathDAO {
     }
 
     @Override
-    public Flux<CassandraIdAndPath> listUserMailboxes(String namespace, String user) {
+    public Flux<CassandraIdAndPath> listUserMailboxes(String namespace, Username user) {
         return cassandraAsyncExecutor.execute(
             selectAll.bind()
                 .setString(NAMESPACE, namespace)
@@ -161,7 +162,7 @@ public class CassandraMailboxPathV2DAO implements CassandraMailboxPathDAO {
         return new CassandraIdAndPath(
             CassandraId.of(row.getUUID(MAILBOX_ID)),
             new MailboxPath(row.getString(NAMESPACE),
-                row.getString(USER),
+                Username.of(row.getString(USER)),
                 row.getString(MAILBOX_NAME)));
     }
 
@@ -182,10 +183,10 @@ public class CassandraMailboxPathV2DAO implements CassandraMailboxPathDAO {
             .setString(MAILBOX_NAME, mailboxPath.getName()));
     }
 
-    private String sanitizeUser(String user) {
+    private String sanitizeUser(Username user) {
         if (user == null) {
             return "";
         }
-        return user;
+        return user.asString();
     }
 }
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java
index ff54813..035fd9e 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java
@@ -35,6 +35,7 @@ import javax.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
 import org.apache.james.backends.cassandra.utils.CassandraUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.acl.PositiveUserACLDiff;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
@@ -124,19 +125,19 @@ public class CassandraUserMailboxRightsDAO {
             .then();
     }
 
-    public Mono<Optional<Rfc4314Rights>> retrieve(String userName, CassandraId mailboxId) {
+    public Mono<Optional<Rfc4314Rights>> retrieve(Username userName, CassandraId mailboxId) {
         return cassandraAsyncExecutor.executeSingleRowOptional(
             select.bind()
-                .setString(USER_NAME, userName)
+                .setString(USER_NAME, userName.asString())
                 .setUUID(MAILBOX_ID, mailboxId.asUuid()))
             .map(rowOptional ->
                 rowOptional.map(Throwing.function(row -> Rfc4314Rights.fromSerializedRfc4314Rights(row.getString(RIGHTS)))));
     }
 
-    public Flux<Pair<CassandraId, Rfc4314Rights>> listRightsForUser(String userName) {
+    public Flux<Pair<CassandraId, Rfc4314Rights>> listRightsForUser(Username userName) {
         return cassandraAsyncExecutor.execute(
             selectUser.bind()
-                .setString(USER_NAME, userName))
+                .setString(USER_NAME, userName.asString()))
             .flatMapMany(cassandraUtils::convertToFlux)
             .map(Throwing.function(this::toPair));
     }
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskRunner.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskRunner.java
index 4ce86ea..794c2e6 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskRunner.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskRunner.java
@@ -21,6 +21,7 @@ package org.apache.james.mailbox.cassandra.mail.task;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.acl.ACLDiff;
@@ -51,7 +52,7 @@ public class MailboxMergingTaskRunner {
 
     @Inject
     public MailboxMergingTaskRunner(MailboxManager mailboxManager, StoreMessageIdManager messageIdManager, CassandraMessageIdDAO cassandraMessageIdDAO, CassandraMailboxDAO mailboxDAO, CassandraUserMailboxRightsDAO rightsDAO, CassandraACLMapper cassandraACLMapper) throws MailboxException {
-        this.mailboxSession = mailboxManager.createSystemSession("task");
+        this.mailboxSession = mailboxManager.createSystemSession(Username.of("task"));
         this.messageIdManager = messageIdManager;
         this.cassandraMessageIdDAO = cassandraMessageIdDAO;
         this.mailboxDAO = mailboxDAO;
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MailboxBaseTupleUtil.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MailboxBaseTupleUtil.java
index 3e65457..4a1bba8 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MailboxBaseTupleUtil.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MailboxBaseTupleUtil.java
@@ -20,6 +20,7 @@
 package org.apache.james.mailbox.cassandra.mail.utils;
 
 import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.table.CassandraMailboxTable;
 
 import com.datastax.driver.core.UDTValue;
@@ -31,10 +32,10 @@ public class MailboxBaseTupleUtil {
         this.typesProvider = typesProvider;
     }
 
-    public UDTValue createMailboxBaseUDT(String namespace, String user) {
+    public UDTValue createMailboxBaseUDT(String namespace, Username user) {
         return typesProvider.getDefinedUserType(CassandraMailboxTable.MAILBOX_BASE)
             .newValue()
             .setString(CassandraMailboxTable.MailboxBase.NAMESPACE, namespace)
-            .setString(CassandraMailboxTable.MailboxBase.USER, user);
+            .setString(CassandraMailboxTable.MailboxBase.USER, user.asString());
     }
 }
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java
index 1ae2c67..820fdd5 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java
@@ -24,9 +24,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 import org.apache.james.backends.cassandra.CassandraCluster;
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.modules.CassandraAttachmentModule;
 import org.apache.james.mailbox.model.AttachmentId;
-import org.apache.james.mailbox.store.mail.model.Username;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -37,8 +38,8 @@ import reactor.core.publisher.Flux;
 @ExtendWith(CassandraRestartExtension.class)
 class CassandraAttachmentOwnerDAOTest {
     private static final AttachmentId ATTACHMENT_ID = AttachmentId.from("id1");
-    private static final Username OWNER_1 = Username.fromRawValue("owner1");
-    private static final Username OWNER_2 = Username.fromRawValue("owner2");
+    private static final Username OWNER_1 = Username.of("owner1");
+    private static final Username OWNER_2 = Username.of("owner2");
 
     @RegisterExtension
     static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraAttachmentModule.MODULE);
@@ -80,7 +81,7 @@ class CassandraAttachmentOwnerDAOTest {
         int referenceCountExceedingPaging = 5050;
 
         Flux.range(0, referenceCountExceedingPaging)
-            .flatMap(i -> testee.addOwner(ATTACHMENT_ID, Username.fromRawValue("owner" + i)), concurrency)
+            .flatMap(i -> testee.addOwner(ATTACHMENT_ID, Username.of("owner" + i)), concurrency)
             .blockLast();
 
         assertThat(testee.retrieveOwners(ATTACHMENT_ID).toIterable())
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 3a1ddca..d7ff535 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
@@ -29,6 +29,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
 import org.apache.james.backends.cassandra.components.CassandraModule;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.FlagsBuilder;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
@@ -90,7 +91,7 @@ class CassandraIndexTableHandlerTest {
                                                 applicableFlagDAO,
                                                 deletedMessageDAO);
 
-        mailbox = new Mailbox(MailboxPath.forUser("user", "name"),
+        mailbox = new Mailbox(MailboxPath.forUser(Username.of("user"), "name"),
             UID_VALIDITY,
             MAILBOX_ID);
     }
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 7aa56b1..a9fae36 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
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import org.apache.james.backends.cassandra.CassandraCluster;
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.modules.CassandraMailboxCounterModule;
 import org.apache.james.mailbox.model.Mailbox;
@@ -49,7 +50,7 @@ class CassandraMailboxCounterDAOTest {
     void setUp(CassandraCluster cassandra) {
         testee = new CassandraMailboxCounterDAO(cassandra.getConf());
 
-        mailbox = new Mailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY, MAILBOX_ID);
+        mailbox = new Mailbox(MailboxPath.forUser(Username.of("user"), "name"), UID_VALIDITY, MAILBOX_ID);
     }
 
     @Test
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 738b564..7d8cf78 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
@@ -29,6 +29,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
 import org.apache.james.backends.cassandra.components.CassandraModule;
 import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
 import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
@@ -43,7 +44,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class CassandraMailboxDAOTest {
     private static final int UID_VALIDITY_1 = 145;
     private static final int UID_VALIDITY_2 = 147;
-    private static final MailboxPath NEW_MAILBOX_PATH = MailboxPath.forUser("user", "xyz");
+    private static final Username USER = Username.of("user");
+    private static final MailboxPath NEW_MAILBOX_PATH = MailboxPath.forUser(USER, "xyz");
     private static CassandraId CASSANDRA_ID_1 = CassandraId.timeBased();
     private static CassandraId CASSANDRA_ID_2 = CassandraId.timeBased();
 
@@ -63,10 +65,10 @@ class CassandraMailboxDAOTest {
     void setUp(CassandraCluster cassandra) {
         testee = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider());
 
-        mailbox1 = new Mailbox(MailboxPath.forUser("user", "abcd"),
+        mailbox1 = new Mailbox(MailboxPath.forUser(USER, "abcd"),
             UID_VALIDITY_1,
             CASSANDRA_ID_1);
-        mailbox2 = new Mailbox(MailboxPath.forUser("user", "defg"),
+        mailbox2 = new Mailbox(MailboxPath.forUser(USER, "defg"),
             UID_VALIDITY_2,
             CASSANDRA_ID_2);
     }
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 97d71cb..ddfd33a 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
@@ -29,6 +29,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
 import org.apache.james.backends.cassandra.components.CassandraModule;
 import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.mail.utils.GuiceUtils;
 import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
 import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
@@ -44,7 +45,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class CassandraMailboxMapperConcurrencyTest {
 
     private static final int UID_VALIDITY = 52;
-    private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("user", "name");
+    private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(Username.of("user"), "name");
     private static final int THREAD_COUNT = 10;
     private static final int OPERATION_COUNT = 10;
 
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 e408fb7..60e8036 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
@@ -31,6 +31,7 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
 import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
 import org.apache.james.backends.cassandra.utils.CassandraUtils;
 import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
 import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
@@ -49,7 +50,7 @@ import org.junit.Test;
 public class CassandraMailboxMapperTest {
     
     private static final int UID_VALIDITY = 52;
-    private static final String USER = "user";
+    private static final Username USER = Username.of("user");
     private static final CassandraId MAILBOX_ID = CassandraId.timeBased();
     private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(USER, "name");
     private static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UID_VALIDITY, MAILBOX_ID);
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 61e4bc1..68b3351 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
@@ -28,6 +28,7 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
 import org.apache.james.backends.cassandra.components.CassandraModule;
 import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
 import org.apache.james.mailbox.model.MailboxPath;
@@ -40,8 +41,8 @@ import nl.jqno.equalsverifier.EqualsVerifier;
 
 @ExtendWith(CassandraRestartExtension.class)
 public abstract class CassandraMailboxPathDAOTest {
-    private static final String USER = "user";
-    private static final String OTHER_USER = "other";
+    private static final Username USER = Username.of("user");
+    private static final Username OTHER_USER = Username.of("other");
 
     static final CassandraId INBOX_ID = CassandraId.timeBased();
     static final CassandraId OUTBOX_ID = CassandraId.timeBased();
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 d1934fd..0e3a48c 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.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.MessageUid;
@@ -49,7 +50,7 @@ public class CassandraMapperProvider implements MapperProvider {
     private final CassandraCluster cassandra;
     private final MessageUidProvider messageUidProvider;
     private final CassandraModSeqProvider cassandraModSeqProvider;
-    private final MailboxSession mailboxSession = MailboxSessionUtil.create("benwa");
+    private final MailboxSession mailboxSession = MailboxSessionUtil.create(Username.of("benwa"));
     private CassandraMailboxSessionMapperFactory mapperFactory;
 
     public CassandraMapperProvider(CassandraCluster cassandra) {
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 7222793..62ce79f 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
@@ -26,6 +26,7 @@ import java.util.List;
 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.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory;
@@ -44,7 +45,7 @@ import com.google.common.collect.ImmutableList;
 
 public class CassandraMessageIdMapperTest extends MessageIdMapperTest {
 
-    private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create("benwa");
+    private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(Username.of("benwa"));
 
     @Rule public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
 
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
index 33c5d5f..f956fd3 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
@@ -29,6 +29,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
 import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule;
 import org.apache.james.mailbox.model.Mailbox;
@@ -55,7 +56,7 @@ class CassandraModSeqProviderTest {
     @BeforeEach
     void setUp(CassandraCluster cassandra) {
         modSeqProvider = new CassandraModSeqProvider(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION);
-        MailboxPath path = new MailboxPath("gsoc", "ieugen", "Trash");
+        MailboxPath path = new MailboxPath("gsoc", Username.of("ieugen"), "Trash");
         mailbox = new Mailbox(path, 1234);
         mailbox.setMailboxId(CASSANDRA_ID);
     }
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
index 19586a6..8a3a6a5 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
@@ -30,6 +30,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
 import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.modules.CassandraUidModule;
@@ -56,7 +57,7 @@ class CassandraUidProviderTest {
     @BeforeEach
     void setUp(CassandraCluster cassandra) {
         uidProvider = new CassandraUidProvider(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION);
-        MailboxPath path = new MailboxPath("gsoc", "ieugen", "Trash");
+        MailboxPath path = new MailboxPath("gsoc", Username.of("ieugen"), "Trash");
         mailbox = new Mailbox(path, 1234);
         mailbox.setMailboxId(CASSANDRA_ID);
     }
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAOTest.java
index a7fc2bd..167d352 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAOTest.java
@@ -24,6 +24,7 @@ import org.apache.james.backends.cassandra.CassandraCluster;
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.CassandraRestartExtension;
 import org.apache.james.backends.cassandra.utils.CassandraUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
@@ -39,7 +40,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 @ExtendWith(CassandraRestartExtension.class)
 class CassandraUserMailboxRightsDAOTest {
-    private static final String USER_NAME = "userName";
+    private static final Username USER_NAME = Username.of("userName");
     private static final EntryKey ENTRY_KEY = EntryKey.createUserEntryKey(USER_NAME);
     private static final CassandraId MAILBOX_ID = CassandraId.timeBased();
     private static final Rfc4314Rights RIGHTS = MailboxACL.FULL_RIGHTS;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
index 6fce3c2..959fda3 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
@@ -28,6 +28,7 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
 import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
 import org.apache.james.backends.cassandra.utils.CassandraUtils;
 import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.mail.CassandraACLMapper;
 import org.apache.james.mailbox.cassandra.mail.CassandraIdAndPath;
@@ -50,7 +51,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 @ExtendWith(CassandraRestartExtension.class)
 class MailboxPathV2MigrationTest {
 
-    private static final MailboxPath MAILBOX_PATH_1 = MailboxPath.forUser("bob", "Important");
+    private static final MailboxPath MAILBOX_PATH_1 = MailboxPath.forUser(Username.of("bob"), "Important");
     private static final int UID_VALIDITY_1 = 452;
     private static final Mailbox MAILBOX_1 = new Mailbox(MAILBOX_PATH_1, UID_VALIDITY_1);
     private static final CassandraId MAILBOX_ID_1 = CassandraId.timeBased();
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 a126eb9..670177e 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
@@ -33,6 +33,7 @@ import javax.mail.util.SharedByteArrayInputStream;
 
 import org.apache.james.backends.es.DockerElasticSearchRule;
 import org.apache.james.backends.es.ElasticSearchIndexer;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.DefaultMailboxes;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageUid;
@@ -83,7 +84,7 @@ public class ElasticSearchListeningMessageSearchIndexTest {
     private static final int BODY_START_OCTET = 100;
     private static final TestId MAILBOX_ID = TestId.of(1L);
     private static final long MOD_SEQ = 42L;
-    private static final String USERNAME = "user";
+    private static final Username USERNAME = Username.of("user");
     private static final MessageUid MESSAGE_UID_1 = MessageUid.of(25);
     private static final MessageUid MESSAGE_UID_2 = MessageUid.of(26);
     private static final MessageUid MESSAGE_UID_3 = MessageUid.of(27);
diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala
index ec8bea4..9917073 100644
--- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala
+++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala
@@ -24,6 +24,7 @@ import java.util.Date
 
 import javax.mail.Flags.Flag
 import javax.mail.{Flags => JavaMailFlags}
+import org.apache.james.core.Username
 import org.apache.james.core.quota.QuotaValue
 import org.apache.james.event.json.DTOs.SystemFlag.SystemFlag
 import org.apache.james.mailbox.acl.{ACLDiff => JavaACLDiff}
@@ -59,7 +60,7 @@ object DTOs {
     def toJava: JavaACLDiff = new JavaACLDiff(new MailboxACL(oldACL.asJava), new MailboxACL(newACL.asJava))
   }
 
-  case class MailboxPath(namespace: Option[String], user: Option[String], name: String) {
+  case class MailboxPath(namespace: Option[String], user: Option[Username], name: String) {
     def toJava: JavaMailboxPath = new JavaMailboxPath(namespace.orNull, user.orNull, name)
   }
 
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java
index 087bf37..0bad42a 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/AddedSerializationTest.java
@@ -54,7 +54,7 @@ class AddedSerializationTest {
     private static final MailboxSession.SessionId SESSION_ID = MailboxSession.SessionId.of(42);
     private static final MailboxId MAILBOX_ID = TestId.of(18);
     private static final String MAILBOX_NAME = "mailboxName";
-    private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", MAILBOX_NAME);
+    private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, Username.of("user"), MAILBOX_NAME);
     private static final MessageUid MESSAGE_UID = MessageUid.of(123456);
     private static final Instant INSTANT = Instant.parse("2018-12-14T09:41:51.541Z");
     private static final TestMessageId MESSAGE_ID = TestMessageId.of(42);
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java
index 4b190a2..921fd07 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/ExpungedSerializationTest.java
@@ -54,7 +54,7 @@ class ExpungedSerializationTest {
     private static final MailboxSession.SessionId SESSION_ID = MailboxSession.SessionId.of(42);
     private static final MailboxId MAILBOX_ID = TestId.of(18);
     private static final String MAILBOX_NAME = "mailboxName";
-    private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", MAILBOX_NAME);
+    private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, Username.of("user"), MAILBOX_NAME);
     private static final MessageUid MESSAGE_UID = MessageUid.of(123456);
     private static final Instant INSTANT = Instant.parse("2018-12-14T09:41:51.541Z");
     private static final TestMessageId MESSAGE_ID = TestMessageId.of(42);
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java
index 90e5aa9..3140c62 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java
@@ -53,7 +53,7 @@ class FlagsUpdatedSerializationTest {
     private static final MailboxSession.SessionId SESSION_ID = MailboxSession.SessionId.of(42);
     private static final MailboxId MAILBOX_ID = TestId.of(18);
     private static final String MAILBOX_NAME = "mailboxName";
-    private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", MAILBOX_NAME);
+    private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, Username.of("user"), MAILBOX_NAME);
     private static final MessageUid MESSAGE_UID_1 = MessageUid.of(123456);
     private static final MessageUid MESSAGE_UID_2 = MessageUid.of(654321);
 
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java
index 85768d3..d80c0ec 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxACLUpdatedEventSerializationTest.java
@@ -45,13 +45,13 @@ class MailboxACLUpdatedEventSerializationTest {
     private static final MailboxACL.Rfc4314Rights RIGHTS = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Administer, MailboxACL.Right.Read);
     private static final MailboxACL MAILBOX_ACL = new MailboxACL(
         new MailboxACL.Entry(ENTRY_KEY, RIGHTS),
-        new MailboxACL.Entry(MailboxACL.EntryKey.createUserEntryKey("alice", true),
+        new MailboxACL.Entry(MailboxACL.EntryKey.createUserEntryKey(Username.of("alice"), true),
             new MailboxACL.Rfc4314Rights(MailboxACL.Right.Insert)));
 
     private static final MailboxListener.MailboxACLUpdated MAILBOX_ACL_UPDATED = new MailboxListener.MailboxACLUpdated(
                 MailboxSession.SessionId.of(6),
         USERNAME,
-                new MailboxPath(MailboxConstants.USER_NAMESPACE, "bob", "mailboxName"),
+                new MailboxPath(MailboxConstants.USER_NAMESPACE, Username.of("bob"), "mailboxName"),
                 ACLDiff.computeDiff(MailboxACL.EMPTY, MAILBOX_ACL),
                 TestId.of(23),
                 EVENT_ID);
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java
index ae77ee5..082237d 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxAddedSerializationTest.java
@@ -41,7 +41,7 @@ class MailboxAddedSerializationTest {
     private static final MailboxListener.MailboxAdded EVENT_1 = new MailboxListener.MailboxAdded(
         MailboxSession.SessionId.of(42),
         USERNAME,
-        new MailboxPath(MailboxConstants.USER_NAMESPACE, "bob", "mailboxName"),
+        new MailboxPath(MailboxConstants.USER_NAMESPACE, Username.of("bob"), "mailboxName"),
         TestId.of(18),
         EVENT_ID);
     private static final String JSON_1 = "{" +
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java
index 00ac67d..e5d0e95 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxDeletionSerializationTest.java
@@ -46,7 +46,7 @@ class MailboxDeletionSerializationTest {
 
     private static final MailboxSession.SessionId SESSION_ID = MailboxSession.SessionId.of(3652);
     private static final Username USERNAME = Username.of("user");
-    private static final MailboxPath MAILBOX_PATH = new MailboxPath(USER_NAMESPACE, USERNAME.asString(), "mailboxName");
+    private static final MailboxPath MAILBOX_PATH = new MailboxPath(USER_NAMESPACE, USERNAME, "mailboxName");
     private static final MailboxId MAILBOX_ID = TestId.of(789);
     private static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("#private&user@domain", Optional.of(Domain.of("domain")));
     private static final QuotaCount DELETED_MESSAGE_COUNT = QuotaCount.count(60);
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java
index 4565fa1..4de9225 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/MailboxRenamedSerializationTest.java
@@ -41,9 +41,9 @@ class MailboxRenamedSerializationTest {
 
     private static final Username DEFAULT_USERNAME = Username.of("user");
     private static final String OLD_MAILBOX_NAME = "oldMailboxName";
-    private static final MailboxPath DEFAULT_OLD_MAILBOX_PATH = new MailboxPath(USER_NAMESPACE, DEFAULT_USERNAME.asString(), OLD_MAILBOX_NAME);
+    private static final MailboxPath DEFAULT_OLD_MAILBOX_PATH = new MailboxPath(USER_NAMESPACE, DEFAULT_USERNAME, OLD_MAILBOX_NAME);
     private static final String NEW_MAILBOX_NAME = "newMailboxName";
-    private static final MailboxPath DEFAULT_NEW_MAILBOX_PATH = new MailboxPath(USER_NAMESPACE, DEFAULT_USERNAME.asString(), NEW_MAILBOX_NAME);
+    private static final MailboxPath DEFAULT_NEW_MAILBOX_PATH = new MailboxPath(USER_NAMESPACE, DEFAULT_USERNAME, NEW_MAILBOX_NAME);
     private static final MailboxSession.SessionId DEFAULT_SESSION_ID = MailboxSession.SessionId.of(123456789);
     private static final MailboxId DEFAULT_MAILBOX_ID = TestId.of(123456);
     private static final MailboxListener.MailboxRenamed DEFAULT_MAILBOX_RENAMED_EVENT = new MailboxListener.MailboxRenamed(
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/dtos/MailboxPathTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/dtos/MailboxPathTest.java
index a35e664..33d28ed 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/dtos/MailboxPathTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/dtos/MailboxPathTest.java
@@ -23,6 +23,7 @@ import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
 import static org.apache.james.event.json.SerializerFixture.DTO_JSON_SERIALIZE;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.apache.james.core.Username;
 import org.apache.james.event.json.DTOs;
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailbox.model.MailboxPath;
@@ -33,7 +34,8 @@ import play.api.libs.json.Json;
 
 class MailboxPathTest {
     private static final String MAILBOX_NAME = "mailboxName";
-    private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", MAILBOX_NAME);
+    public static final Username USER = Username.of("user");
+    private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, MAILBOX_NAME);
 
     @Test
     void mailboxPathShouldBeWellSerialized() {
@@ -49,7 +51,7 @@ class MailboxPathTest {
     @Test
     void mailboxPathWithEmptyNamespaceShouldBeWellSerialized() {
         assertThatJson(DTO_JSON_SERIALIZE.mailboxPathWrites().writes(DTOs.MailboxPath$.MODULE$.fromJava(
-            new MailboxPath("", "user", MAILBOX_NAME))).toString())
+            new MailboxPath("", USER, MAILBOX_NAME))).toString())
             .isEqualTo(
                 "{" +
                 "  \"namespace\":\"#private\"," +
@@ -66,7 +68,7 @@ class MailboxPathTest {
             "  \"name\":\"mailboxName\"" +
             "}")).get())
             .isEqualTo(DTOs.MailboxPath$.MODULE$.fromJava(
-                new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", MAILBOX_NAME)));
+                new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, MAILBOX_NAME)));
     }
 
     @Test
@@ -76,7 +78,7 @@ class MailboxPathTest {
             "  \"name\":\"mailboxName\"" +
             "}"))
             .get().toJava())
-            .isEqualTo(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", MAILBOX_NAME));
+            .isEqualTo(new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, MAILBOX_NAME));
     }
 
     @Test
@@ -87,7 +89,7 @@ class MailboxPathTest {
             "  \"name\":\"mailboxName\"" +
             "}"))
             .get().toJava())
-            .isEqualTo(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", MAILBOX_NAME));
+            .isEqualTo(new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, MAILBOX_NAME));
     }
 
     @Test
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
index 43a9295..29114b5 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
@@ -28,6 +28,7 @@ import javax.persistence.PersistenceException;
 import javax.persistence.RollbackException;
 import javax.persistence.TypedQuery;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.exception.MailboxExistsException;
@@ -107,7 +108,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         try {
             JPAMailbox result = loadJpaMailbox(mailbox.getMailboxId());
             result.setNamespace(mailbox.getNamespace());
-            result.setUser(mailbox.getUser());
+            result.setUser(mailbox.getUser().asString());
             result.setName(mailbox.getName());
             return result;
         } catch (MailboxNotFoundException e) {
@@ -205,11 +206,11 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         }
     }
 
-    private TypedQuery<JPAMailbox> findMailboxWithPathLikeTypedQuery(String namespace, String user, String pathLike) {
+    private TypedQuery<JPAMailbox> findMailboxWithPathLikeTypedQuery(String namespace, Username username, String pathLike) {
         return getEntityManager().createNamedQuery("findMailboxWithNameLikeWithUser", JPAMailbox.class)
             .setParameter("nameParam", pathLike)
             .setParameter("namespaceParam", namespace)
-            .setParameter("userParam", user);
+            .setParameter("userParam", username.asString());
     }
 
     public void deleteAllMemberships() throws MailboxException {
@@ -232,7 +233,14 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
     public boolean hasChildren(Mailbox mailbox, char delimiter) throws MailboxException, MailboxNotFoundException {
         final String name = mailbox.getName() + delimiter + SQL_WILDCARD_CHAR; 
         final Long numberOfChildMailboxes;
-        numberOfChildMailboxes = (Long) getEntityManager().createNamedQuery("countMailboxesWithNameLikeWithUser").setParameter("nameParam", name).setParameter("namespaceParam", mailbox.getNamespace()).setParameter("userParam", mailbox.getUser()).getSingleResult();
+
+        numberOfChildMailboxes = (Long) getEntityManager()
+            .createNamedQuery("countMailboxesWithNameLikeWithUser")
+            .setParameter("nameParam", name)
+            .setParameter("namespaceParam", mailbox.getNamespace())
+            .setParameter("userParam", mailbox.getUser().asString())
+            .getSingleResult();
+
         return numberOfChildMailboxes != null && numberOfChildMailboxes > 0;
     }
 
@@ -264,7 +272,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
     }
 
     @Override
-    public List<Mailbox> findNonPersonalMailboxes(String userName, Right right) throws MailboxException {
+    public List<Mailbox> findNonPersonalMailboxes(Username userName, Right right) throws MailboxException {
         return ImmutableList.of();
     }
 }
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
index 7feb8e6..8ff4992 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
@@ -27,6 +27,7 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.jpa.JPAId;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxId;
@@ -107,7 +108,7 @@ public class JPAMailbox {
     
     public JPAMailbox(MailboxPath path, long uidValidity) {
         this.name = path.getName();
-        this.user = path.getUser();
+        this.user = path.getUser().asString();
         this.namespace = path.getNamespace();
         this.uidValidity = uidValidity;
     }
@@ -137,7 +138,7 @@ public class JPAMailbox {
     }
 
     public MailboxPath generateAssociatedPath() {
-        return new MailboxPath(namespace, user, name);
+        return new MailboxPath(namespace, Username.of(user), name);
     }
 
     public void setMailboxId(long mailboxId) {
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 775dfc1..b35a402 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,6 +26,7 @@ import javax.persistence.EntityManagerFactory;
 
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.backends.jpa.JpaTestCluster;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -61,7 +62,7 @@ public class JPAMapperProvider implements MapperProvider {
         EntityManagerFactory entityManagerFactory = jpaTestCluster.getEntityManagerFactory();
         JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
 
-        JPAMessageMapper messageMapper = new JPAMessageMapper(MailboxSessionUtil.create("benwa"),
+        JPAMessageMapper messageMapper = new JPAMessageMapper(MailboxSessionUtil.create(Username.of("benwa")),
             new JPAUidProvider(locker, entityManagerFactory), 
             new JPAModSeqProvider(locker, entityManagerFactory), 
             entityManagerFactory);
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
index 45c8706..4285f59 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
@@ -22,6 +22,7 @@ package org.apache.james.mailbox.jpa.mail;
 import java.util.List;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.exception.MailboxNotFoundException;
@@ -97,7 +98,7 @@ public class TransactionalMailboxMapper implements MailboxMapper {
     }
 
     @Override
-    public List<Mailbox> findNonPersonalMailboxes(String userName, Right right) throws MailboxException {
+    public List<Mailbox> findNonPersonalMailboxes(Username userName, Right right) throws MailboxException {
         return wrapped.findNonPersonalMailboxes(userName, right);
     }
 
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 d407a8e..69e28c6 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
@@ -32,6 +32,7 @@ import java.util.stream.Stream;
 import javax.mail.Flags;
 import javax.mail.Flags.Flag;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.MessageUid;
@@ -57,11 +58,12 @@ import com.google.common.collect.ImmutableList;
 public class LuceneMailboxMessageSearchIndexTest {
 
     public static final long LIMIT = 100L;
+    private static final Username BOB = Username.of("bob");
     private LuceneMessageSearchIndex index;
     
-    private Mailbox mailbox = new Mailbox(MailboxPath.forUser("bob", "box"), 18, TestId.of(0));
-    private Mailbox mailbox2 = new Mailbox(MailboxPath.forUser("bob", "box"), 19, TestId.of(1));
-    private Mailbox mailbox3 = new Mailbox(MailboxPath.forUser("bob", "box"), 12, TestId.of(2));
+    private Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, "box"), 18, TestId.of(0));
+    private Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(BOB, "box"), 19, TestId.of(1));
+    private Mailbox mailbox3 = new Mailbox(MailboxPath.forUser(BOB, "box"), 12, TestId.of(2));
     private MailboxSession session;
 
     private static final String FROM_ADDRESS = "Harry <ha...@example.org>";
@@ -93,7 +95,7 @@ public class LuceneMailboxMessageSearchIndexTest {
     
     @Before
     public void setUp() throws Exception {
-        session = MailboxSessionUtil.create("username");
+        session = MailboxSessionUtil.create(Username.of("username"));
         TestMessageId.Factory factory = new TestMessageId.Factory();
         id1 = factory.generate();
         id2 = factory.generate();
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
index b23f917..fe07f53 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
@@ -24,6 +24,7 @@ import java.util.Locale;
 import java.util.Optional;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxPathLocker;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageUid;
@@ -96,7 +97,7 @@ public class MaildirStore implements UidProvider, ModSeqProvider {
      * @return The Mailbox object populated with data from the file system
      * @throws MailboxException If the mailbox folder doesn't exist or can't be read
      */
-    public Mailbox loadMailbox(MailboxSession session, File root, String namespace, String user, String folderName) throws MailboxException {
+    public Mailbox loadMailbox(MailboxSession session, File root, String namespace, Username user, String folderName) throws MailboxException {
         String mailboxName = getMailboxNameFromFolderName(folderName);
         return loadMailbox(session, new File(root, folderName), new MailboxPath(namespace, user, mailboxName));
     }
@@ -143,10 +144,10 @@ public class MaildirStore implements UidProvider, ModSeqProvider {
      * @param user The user to get the root for.
      * @return The name of the folder which contains the specified user's mailbox
      */
-    public String userRoot(String user) {
-        String path = maildirLocation.replace(PATH_FULLUSER, user);
-        String[] userParts = user.split("@");
-        String userName = user;
+    public String userRoot(Username user) {
+        String userName = user.asString();
+        String path = maildirLocation.replace(PATH_FULLUSER, userName);
+        String[] userParts = userName.split("@");
         if (userParts.length == 2) {
             userName = userParts[0];
             // At least the domain part should not handled in a case-sensitive manner
@@ -163,7 +164,7 @@ public class MaildirStore implements UidProvider, ModSeqProvider {
      * @return A File object referencing the main maildir folder
      * @throws MailboxException If the folder does not exist or is no directory
      */
-    public File getMailboxRootForUser(String user) throws MailboxException {
+    public File getMailboxRootForUser(Username user) throws MailboxException {
         String path = userRoot(user);
         File root = new File(path);
         if (!root.isDirectory()) {
@@ -214,7 +215,7 @@ public class MaildirStore implements UidProvider, ModSeqProvider {
      * @param name The name of the mailbox
      * @return absolute name
      */
-    public String getFolderName(String namespace, String user, String name) {
+    public String getFolderName(String namespace, Username user, String name) {
         String root = userRoot(user);
         // if INBOX => location == maildirLocation
         if (name.equals(MailboxConstants.INBOX)) {
@@ -235,7 +236,7 @@ public class MaildirStore implements UidProvider, ModSeqProvider {
      * @return The absolute path to the folder containing the mailbox
      */
     public String getFolderName(Mailbox mailbox) {
-        return getFolderName(mailbox.getNamespace(), mailbox.getUser(), mailbox.getName());
+        return getFolderName(mailbox.generateAssociatedPath());
     }
     
     /**
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
index fe75ff1..9e0510f 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
@@ -27,6 +27,7 @@ import java.util.Optional;
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -292,7 +293,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
             }
             
             // Special case for INBOX: Let's use the user's folder.
-            MailboxPath inboxMailboxPath = MailboxPath.forUser(userName, MailboxConstants.INBOX);
+            MailboxPath inboxMailboxPath = MailboxPath.forUser(Username.of(userName), MailboxConstants.INBOX);
             mailboxList.add(maildirStore.loadMailbox(session, inboxMailboxPath));
             
             // List all INBOX sub folders.
@@ -303,7 +304,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
                
                 
                 MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, 
-                        userName, 
+                        Username.of(userName),
                         mailbox.getName().substring(1));
                 mailboxList.add(maildirStore.loadMailbox(session, mailboxPath));
 
@@ -333,7 +334,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
     }
 
     @Override
-    public List<Mailbox> findNonPersonalMailboxes(String userName, Right right) throws MailboxException {
+    public List<Mailbox> findNonPersonalMailboxes(Username userName, Right right) throws MailboxException {
         return ImmutableList.of();
     }
 }
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
index e06901a..55fceb3 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
@@ -29,6 +29,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.SubscriptionException;
 import org.apache.james.mailbox.maildir.MaildirStore;
 import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
@@ -57,7 +58,7 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
         boolean changed = subscriptionNames.size() != newSubscriptions.size();
         if (changed) {
             try {
-                writeSubscriptions(new File(store.userRoot(subscription.getUser())), newSubscriptions);
+                writeSubscriptions(new File(store.userRoot(Username.of(subscription.getUser()))), newSubscriptions);
             } catch (IOException e) {
                 throw new SubscriptionException(e);
             }
@@ -74,7 +75,7 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
 
     @Override
     public Subscription findMailboxSubscriptionForUser(String user, String mailbox) throws SubscriptionException {
-        File userRoot = new File(store.userRoot(user));
+        File userRoot = new File(store.userRoot(Username.of(user)));
         Set<String> subscriptionNames;
         try {
             subscriptionNames = readSubscriptions(userRoot);
@@ -98,7 +99,7 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
         boolean changed = subscriptionNames.size() != newSubscriptions.size();
         if (changed) {
             try {
-                writeSubscriptions(new File(store.userRoot(subscription.getUser())), newSubscriptions);
+                writeSubscriptions(new File(store.userRoot(Username.of(subscription.getUser()))), newSubscriptions);
             } catch (IOException e) {
                 throw new SubscriptionException(e);
             }
@@ -117,7 +118,7 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
      * @return A Set of names of subscribed mailboxes of the user
      */
     private Set<String> readSubscriptionsForUser(String user) throws SubscriptionException { 
-        File userRoot = new File(store.userRoot(user));
+        File userRoot = new File(store.userRoot(Username.of(user)));
         try {
             return readSubscriptions(userRoot);
         } catch (IOException e) {
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java
index e97e65f..54d040c 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java
@@ -23,13 +23,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.AttachmentNotFoundException;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Attachment;
 import org.apache.james.mailbox.model.AttachmentId;
 import org.apache.james.mailbox.model.MessageId;
 import org.apache.james.mailbox.store.mail.AttachmentMapper;
-import org.apache.james.mailbox.store.mail.model.Username;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
index 3c9fceb..748e0ff 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
@@ -24,6 +24,7 @@ import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.exception.MailboxExistsException;
@@ -155,14 +156,14 @@ public class InMemoryMailboxMapper implements MailboxMapper {
     }
 
     @Override
-    public List<Mailbox> findNonPersonalMailboxes(String userName, Right right) throws MailboxException {
+    public List<Mailbox> findNonPersonalMailboxes(Username userName, Right right) throws MailboxException {
         return mailboxesByPath.values()
             .stream()
             .filter(mailbox -> hasRightOn(mailbox, userName, right))
             .collect(Guavate.toImmutableList());
     }
 
-    private Boolean hasRightOn(Mailbox mailbox, String userName, Right right) {
+    private Boolean hasRightOn(Mailbox mailbox, Username userName, Right right) {
         return Optional.ofNullable(
             mailbox.getACL()
                 .ofPositiveNameType(NameType.user)
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
index 85d914d..02ef7b6 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -46,7 +47,7 @@ public class InMemoryCurrentQuotaManager implements StoreCurrentQuotaManager {
         this.quotaCache = CacheBuilder.newBuilder().build(new CacheLoader<QuotaRoot, Entry>() {
             @Override
             public Entry load(QuotaRoot quotaRoot) throws Exception {
-                return new Entry(quotaCalculator.recalculateCurrentQuotas(quotaRoot, sessionProvider.createSystemSession(quotaRoot.getValue())));
+                return new Entry(quotaCalculator.recalculateCurrentQuotas(quotaRoot, sessionProvider.createSystemSession(Username.of(quotaRoot.getValue()))));
             }
         });
     }
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 765751c..a15ecd1 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
@@ -22,6 +22,7 @@ package org.apache.james.mailbox.inmemory.mail;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.MessageUid;
@@ -42,7 +43,8 @@ import com.google.common.collect.ImmutableList;
 
 public class InMemoryMapperProvider implements MapperProvider {
 
-    private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create("user");
+    private static final Username USER = Username.of("user");
+    private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER);
 
     private final MessageId.Factory messageIdFactory;
     private final MessageUidProvider messageUidProvider;
@@ -62,7 +64,7 @@ public class InMemoryMapperProvider implements MapperProvider {
 
     @Override
     public MessageMapper createMessageMapper() throws MailboxException {
-        return inMemoryMailboxSessionMapperFactory.createMessageMapper(MailboxSessionUtil.create("user"));
+        return inMemoryMailboxSessionMapperFactory.createMessageMapper(MailboxSessionUtil.create(USER));
     }
 
     @Override
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java
index 43b5910..36b60e9 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java
@@ -117,7 +117,7 @@ public class DeletedMessageVaultHook implements PreDeletionHook {
                             DeletedMessageConverter deletedMessageConverter,
                             MailboxSessionMapperFactory mapperFactory,
                             Clock clock) {
-        this.session = sessionProvider.createSystemSession(getClass().getName());
+        this.session = sessionProvider.createSystemSession(Username.of(getClass().getName()));
         this.deletedMessageVault = deletedMessageVault;
         this.deletedMessageConverter = deletedMessageConverter;
         this.mapperFactory = mapperFactory;
@@ -164,8 +164,8 @@ public class DeletedMessageVaultHook implements PreDeletionHook {
     }
 
     private Username retrieveMailboxUser(MailboxId mailboxId) throws MailboxException {
-        return Username.of(mapperFactory.getMailboxMapper(session)
+        return mapperFactory.getMailboxMapper(session)
             .findMailboxById(mailboxId)
-            .getUser());
+            .getUser();
     }
 }
\ No newline at end of file
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java
index bbabc89..bfe285c 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultHookTest.java
@@ -71,8 +71,8 @@ class DeletedMessageVaultHookTest {
     private static final Username BOB = Username.of(BOB_ADDRESS);
     private static final String MESSAGE_BODY = "testmail";
 
-    private static final MailboxPath MAILBOX_ALICE_ONE = MailboxPath.forUser(ALICE_ADDRESS, "ALICE_ONE");
-    private static final MailboxPath MAILBOX_BOB_ONE = MailboxPath.forUser(BOB_ADDRESS, "BOB_ONE");
+    private static final MailboxPath MAILBOX_ALICE_ONE = MailboxPath.forUser(ALICE, "ALICE_ONE");
+    private static final MailboxPath MAILBOX_BOB_ONE = MailboxPath.forUser(BOB, "BOB_ONE");
 
     private MailboxManager mailboxManager;
     private MessageIdManager messageIdManager;
@@ -138,8 +138,8 @@ class DeletedMessageVaultHookTest {
         searchQuery = new SearchQuery();
         searchQuery.andCriteria(SearchQuery.internalDateOn(INTERNAL_DATE, SearchQuery.DateResolution.Second));
 
-        aliceSession = mailboxManager.createSystemSession(ALICE_ADDRESS);
-        bobSession = mailboxManager.createSystemSession(BOB_ADDRESS);
+        aliceSession = mailboxManager.createSystemSession(ALICE);
+        bobSession = mailboxManager.createSystemSession(BOB);
     }
 
     @Test
@@ -164,7 +164,7 @@ class DeletedMessageVaultHookTest {
 
         mailboxManager.setRights(MAILBOX_ALICE_ONE,
             MailboxACL.EMPTY.apply(MailboxACL.command()
-                .forUser(BOB_ADDRESS)
+                .forUser(BOB)
                 .rights(MailboxACL.Right.Lookup, MailboxACL.Right.Read, MailboxACL.Right.DeleteMessages, MailboxACL.Right.PerformExpunge)
                 .asAddition()),
             aliceSession);
@@ -188,7 +188,7 @@ class DeletedMessageVaultHookTest {
 
         mailboxManager.setRights(MAILBOX_ALICE_ONE,
             MailboxACL.EMPTY.apply(MailboxACL.command()
-                .forUser(BOB_ADDRESS)
+                .forUser(BOB)
                 .rights(MailboxACL.Right.Lookup, MailboxACL.Right.Read, MailboxACL.Right.DeleteMessages, MailboxACL.Right.PerformExpunge)
                 .asAddition()),
             aliceSession);
@@ -213,7 +213,7 @@ class DeletedMessageVaultHookTest {
 
         mailboxManager.setRights(MAILBOX_ALICE_ONE,
             MailboxACL.EMPTY.apply(MailboxACL.command()
-                .forUser(BOB_ADDRESS)
+                .forUser(BOB)
                 .rights(MailboxACL.Right.Lookup, MailboxACL.Right.Read, MailboxACL.Right.DeleteMessages, MailboxACL.Right.PerformExpunge)
                 .asAddition()),
             aliceSession);
@@ -239,7 +239,7 @@ class DeletedMessageVaultHookTest {
 
         mailboxManager.setRights(MAILBOX_ALICE_ONE,
             MailboxACL.EMPTY.apply(MailboxACL.command()
-                .forUser(BOB_ADDRESS)
+                .forUser(BOB)
                 .rights(MailboxACL.Right.Lookup, MailboxACL.Right.Read, MailboxACL.Right.DeleteMessages, MailboxACL.Right.PerformExpunge)
                 .asAddition()),
             aliceSession);
@@ -263,7 +263,7 @@ class DeletedMessageVaultHookTest {
 
         mailboxManager.setRights(MAILBOX_ALICE_ONE,
             MailboxACL.EMPTY.apply(MailboxACL.command()
-                .forUser(BOB_ADDRESS)
+                .forUser(BOB)
                 .rights(MailboxACL.Right.Lookup, MailboxACL.Right.Read, MailboxACL.Right.DeleteMessages, MailboxACL.Right.PerformExpunge)
                 .asAddition()),
             aliceSession);
@@ -289,7 +289,7 @@ class DeletedMessageVaultHookTest {
 
         mailboxManager.setRights(MAILBOX_ALICE_ONE,
             MailboxACL.EMPTY.apply(MailboxACL.command()
-                .forUser(BOB_ADDRESS)
+                .forUser(BOB)
                 .rights(MailboxACL.Right.Lookup, MailboxACL.Right.Read, MailboxACL.Right.DeleteMessages, MailboxACL.Right.PerformExpunge)
                 .asAddition()),
             aliceSession);
diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcherTest.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcherTest.java
index 0209a3b..373a069 100644
--- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcherTest.java
+++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcherTest.java
@@ -79,7 +79,7 @@ class ElasticSearchQuotaSearcherTest implements QuotaSearcherContract {
 
     private void provisionUser(QuotaSearchTestSystem testSystem, Username username) {
         try {
-            testSystem.getUsersRepository().addUser(username.asString(), PASSWORD);
+            testSystem.getUsersRepository().addUser(username, PASSWORD);
             appendMessage(testSystem, username, withSize(49));
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/mailbox/plugin/quota-search-scanning/src/main/java/org/apache/james/quota/search/scanning/ScanningQuotaSearcher.java b/mailbox/plugin/quota-search-scanning/src/main/java/org/apache/james/quota/search/scanning/ScanningQuotaSearcher.java
index 6d49985..1226302 100644
--- a/mailbox/plugin/quota-search-scanning/src/main/java/org/apache/james/quota/search/scanning/ScanningQuotaSearcher.java
+++ b/mailbox/plugin/quota-search-scanning/src/main/java/org/apache/james/quota/search/scanning/ScanningQuotaSearcher.java
@@ -49,7 +49,6 @@ public class ScanningQuotaSearcher implements QuotaSearcher {
     @Override
     public List<Username> search(QuotaQuery query) {
         Stream<Username> results = Iterators.toStream(listUsers())
-            .map(Username::of)
             .filter(clauseConverter.andToPredicate(query.getClause()))
             .sorted(Comparator.comparing(Username::asString))
             .skip(query.getOffset().getValue());
@@ -64,7 +63,7 @@ public class ScanningQuotaSearcher implements QuotaSearcher {
             .orElse(results);
     }
 
-    private Iterator<String> listUsers() {
+    private Iterator<Username> listUsers() {
         try {
             return usersRepository.list();
         } catch (UsersRepositoryException e) {
diff --git a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaSearcherContract.java b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaSearcherContract.java
index a79a7f3..9fbac9a 100644
--- a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaSearcherContract.java
+++ b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaSearcherContract.java
@@ -51,9 +51,9 @@ public interface QuotaSearcherContract {
     @Test
     default void moreThanShouldFilterOutTooSmallValues(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(SIMPSON_COM);
-        testSystem.getUsersRepository().addUser(Simpson.BART.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.HOMER.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.LISA.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.BART, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.HOMER, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.LISA, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Simpson.BART, withSize(49));
@@ -71,9 +71,9 @@ public interface QuotaSearcherContract {
     @Test
     default void lessThanShouldFilterOutTooBigValues(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(SIMPSON_COM);
-        testSystem.getUsersRepository().addUser(Simpson.BART.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.HOMER.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.LISA.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.BART, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.HOMER, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.LISA, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Simpson.BART, withSize(49));
@@ -91,9 +91,9 @@ public interface QuotaSearcherContract {
     @Test
     default void rangeShouldFilterValuesOutOfRange(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(SIMPSON_COM);
-        testSystem.getUsersRepository().addUser(Simpson.BART.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.HOMER.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.LISA.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.BART, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.HOMER, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.LISA, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Simpson.BART, withSize(40));
@@ -114,9 +114,9 @@ public interface QuotaSearcherContract {
     default void hasDomainShouldFilterOutValuesWithDifferentDomains(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(SIMPSON_COM);
         testSystem.getDomainList().addDomain(DOMAIN_TLD);
-        testSystem.getUsersRepository().addUser(Simpson.BART.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.LISA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(BENOIT_AT_DOMAIN_TLD.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.BART, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.LISA, PASSWORD);
+        testSystem.getUsersRepository().addUser(BENOIT_AT_DOMAIN_TLD, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Simpson.BART, withSize(49));
@@ -135,9 +135,9 @@ public interface QuotaSearcherContract {
     default void andShouldCombineClauses(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(SIMPSON_COM);
         testSystem.getDomainList().addDomain(DOMAIN_TLD);
-        testSystem.getUsersRepository().addUser(Simpson.BART.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.LISA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(BENOIT_AT_DOMAIN_TLD.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.BART, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.LISA, PASSWORD);
+        testSystem.getUsersRepository().addUser(BENOIT_AT_DOMAIN_TLD, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Simpson.BART, withSize(49));
@@ -156,10 +156,10 @@ public interface QuotaSearcherContract {
     @Test
     default void resultShouldBeAlphabeticallyOrdered(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(ALPHABET_TLD);
-        testSystem.getUsersRepository().addUser(Alphabet.AAA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ABA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ABB.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ACB.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.AAA, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ABA, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ABB, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ACB, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Alphabet.AAA, withSize(49));
@@ -177,10 +177,10 @@ public interface QuotaSearcherContract {
     @Test
     default void limitShouldBeTheMaximumValueOfReturnedResults(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(ALPHABET_TLD);
-        testSystem.getUsersRepository().addUser(Alphabet.AAA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ABA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ABB.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ACB.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.AAA, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ABA, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ABB, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ACB, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Alphabet.AAA, withSize(49));
@@ -199,10 +199,10 @@ public interface QuotaSearcherContract {
     @Test
     default void offsetShouldSkipSomeResults(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(ALPHABET_TLD);
-        testSystem.getUsersRepository().addUser(Alphabet.AAA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ABA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ABB.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ACB.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.AAA, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ABA, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ABB, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ACB, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Alphabet.AAA, withSize(49));
@@ -222,10 +222,10 @@ public interface QuotaSearcherContract {
     default void searchShouldReturnEmptyOnTooBigOffset(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(SIMPSON_COM);
         testSystem.getDomainList().addDomain(DOMAIN_TLD);
-        testSystem.getUsersRepository().addUser(Simpson.BART.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.HOMER.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Simpson.LISA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(BENOIT_AT_DOMAIN_TLD.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.BART, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.HOMER, PASSWORD);
+        testSystem.getUsersRepository().addUser(Simpson.LISA, PASSWORD);
+        testSystem.getUsersRepository().addUser(BENOIT_AT_DOMAIN_TLD, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Simpson.BART, withSize(49));
@@ -244,10 +244,10 @@ public interface QuotaSearcherContract {
     @Test
     default void pagingShouldBeSupported(QuotaSearchTestSystem testSystem) throws Exception {
         testSystem.getDomainList().addDomain(ALPHABET_TLD);
-        testSystem.getUsersRepository().addUser(Alphabet.AAA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ABA.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ABB.asString(), PASSWORD);
-        testSystem.getUsersRepository().addUser(Alphabet.ACB.asString(), PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.AAA, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ABA, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ABB, PASSWORD);
+        testSystem.getUsersRepository().addUser(Alphabet.ACB, PASSWORD);
         testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSize.size(100));
 
         appendMessage(testSystem, Alphabet.AAA, withSize(49));
@@ -266,7 +266,7 @@ public interface QuotaSearcherContract {
 
     default void appendMessage(QuotaSearchTestSystem testSystem, Username username, MessageManager.AppendCommand appendCommand) throws MailboxException, UsersRepositoryException, DomainListException {
         MailboxManager mailboxManager = testSystem.getMailboxManager();
-        MailboxSession session = mailboxManager.createSystemSession(username.asString());
+        MailboxSession session = mailboxManager.createSystemSession(username);
 
         MailboxPath mailboxPath = MailboxPath.inbox(session);
         mailboxManager.createMailbox(mailboxPath, session);
diff --git a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
index 45a1685..cbaf551 100644
--- a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
+++ b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
@@ -24,6 +24,7 @@ import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.Role;
@@ -90,12 +91,13 @@ public class SpamAssassinListener implements SpamEventListener {
 
     @Override
     public void event(Event event) throws MailboxException {
+        Username username = Username.of(getClass().getCanonicalName());
         if (event instanceof MessageMoveEvent) {
-            MailboxSession session = mailboxManager.createSystemSession(getClass().getCanonicalName());
+            MailboxSession session = mailboxManager.createSystemSession(username);
             handleMessageMove(event, session, (MessageMoveEvent) event);
         }
         if (event instanceof Added) {
-            MailboxSession session = mailboxManager.createSystemSession(getClass().getCanonicalName());
+            MailboxSession session = mailboxManager.createSystemSession(username);
             handleAdded(event, session, (Added) event);
         }
     }
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 72d8b39..245a8ec 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
@@ -32,6 +32,7 @@ import java.util.Date;
 import javax.mail.Flags;
 import javax.mail.util.SharedByteArrayInputStream;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.DefaultMailboxes;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
@@ -57,7 +58,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class SpamAssassinListenerTest {
-    public static final String USER = "user";
+    public static final Username USER = Username.of("user");
     private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER);
     private static final int UID_VALIDITY = 43;
     private static final TestMessageId MESSAGE_ID = TestMessageId.of(45);
diff --git a/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/AnonymousAuthenticator.java b/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/AnonymousAuthenticator.java
index 7706e72..4b99c0f 100644
--- a/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/AnonymousAuthenticator.java
+++ b/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/AnonymousAuthenticator.java
@@ -18,12 +18,13 @@
  ****************************************************************/
 package org.apache.james.mailbox.spring;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.store.Authenticator;
 
 public class AnonymousAuthenticator implements Authenticator {
 
     @Override
-    public boolean isAuthentic(String userid, CharSequence passwd) {
+    public boolean isAuthentic(Username userid, CharSequence passwd) {
         return true;
     }
 
diff --git a/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/NoAuthorizator.java b/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/NoAuthorizator.java
index f98e331..8418ece 100644
--- a/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/NoAuthorizator.java
+++ b/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/NoAuthorizator.java
@@ -18,12 +18,13 @@
  ****************************************************************/
 package org.apache.james.mailbox.spring;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.store.Authorizator;
 
 public class NoAuthorizator implements Authorizator {
 
     @Override
-    public AuthorizationState canLoginAsOtherUser(String userId, String otherUserId) {
+    public AuthorizationState canLoginAsOtherUser(Username userId, Username otherUserId) {
         return AuthorizationState.NOT_ADMIN;
     }
 
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java
index f0587b3..1dd7857 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mailbox.store;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 
 /**
@@ -34,5 +35,5 @@ public interface Authenticator {
      * @return true when the user is authentic,
      * false otherwise
      */
-    boolean isAuthentic(String userid, CharSequence passwd) throws MailboxException;
+    boolean isAuthentic(Username userid, CharSequence passwd) throws MailboxException;
 }
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authorizator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authorizator.java
index 2b01aa8..f83ab06 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authorizator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authorizator.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mailbox.store;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 
 /**
@@ -32,6 +33,6 @@ public interface Authorizator {
         UNKNOWN_USER
     }
 
-    AuthorizationState canLoginAsOtherUser(String userId, String otherUserId) throws MailboxException;
+    AuthorizationState canLoginAsOtherUser(Username userId, Username otherUserId) throws MailboxException;
 }
 
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
index 79224c5..a5eefda 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
@@ -21,20 +21,22 @@ package org.apache.james.mailbox.store;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.james.core.Username;
+
 public class FakeAuthenticator implements Authenticator {
 
     private final Map<String, String> users = new HashMap<>();
 
     @Override
-    public boolean isAuthentic(String userid, CharSequence passwd) {
-        String pass = users.get(userid);
+    public boolean isAuthentic(Username userid, CharSequence passwd) {
+        String pass = users.get(userid.asString());
         if (pass != null) {
             return passwd.toString().equals(pass);
         }
         return false;
     }
     
-    public void addUser(String user, String password) {
-        users.put(user, password);
+    public void addUser(Username user, String password) {
+        users.put(user.asString(), password);
     }
 }
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthorizator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthorizator.java
index 556affe..7bbc7f6 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthorizator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthorizator.java
@@ -20,26 +20,28 @@ package org.apache.james.mailbox.store;
 
 import java.util.Optional;
 
+import org.apache.james.core.Username;
+
 public class FakeAuthorizator implements Authorizator {
 
     public static FakeAuthorizator defaultReject() {
         return new FakeAuthorizator(Optional.empty(), Optional.empty());
     }
 
-    public static FakeAuthorizator forUserAndAdmin(String admin, String user) {
+    public static FakeAuthorizator forUserAndAdmin(Username admin, Username user) {
         return new FakeAuthorizator(Optional.of(admin), Optional.of(user));
     }
 
-    private final Optional<String> adminId;
-    private final Optional<String> delegatedUserId;
+    private final Optional<Username> adminId;
+    private final Optional<Username> delegatedUserId;
 
-    private FakeAuthorizator(Optional<String> adminId, Optional<String> userId) {
+    private FakeAuthorizator(Optional<Username> adminId, Optional<Username> userId) {
         this.adminId = adminId;
         this.delegatedUserId = userId;
     }
 
     @Override
-    public AuthorizationState canLoginAsOtherUser(String userId, String otherUserId) {
+    public AuthorizationState canLoginAsOtherUser(Username userId, Username otherUserId) {
         if (!adminId.isPresent() || !this.delegatedUserId.isPresent()) {
             return AuthorizationState.NOT_ADMIN;
         }
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProvider.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProvider.java
index 992ad15..368f367 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProvider.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProvider.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionIdGenerator;
 import org.apache.james.mailbox.exception.BadCredentialsException;
@@ -47,11 +48,11 @@ public class SessionProvider {
         return MailboxConstants.DEFAULT_DELIMITER;
     }
 
-    public MailboxSession createSystemSession(String userName) {
+    public MailboxSession createSystemSession(Username userName) {
         return createSession(userName, MailboxSession.SessionType.System);
     }
 
-    public MailboxSession login(String userid, String passwd) throws MailboxException {
+    public MailboxSession login(Username userid, String passwd) throws MailboxException {
         if (isValidLogin(userid, passwd)) {
             return createSession(userid, MailboxSession.SessionType.User);
         } else {
@@ -59,7 +60,7 @@ public class SessionProvider {
         }
     }
 
-    public MailboxSession loginAsOtherUser(String adminUserid, String passwd, String otherUserId) throws MailboxException {
+    public MailboxSession loginAsOtherUser(Username adminUserid, String passwd, Username otherUserId) throws MailboxException {
         if (! isValidLogin(adminUserid, passwd)) {
             throw new BadCredentialsException();
         }
@@ -82,7 +83,7 @@ public class SessionProvider {
         }
     }
 
-    private MailboxSession createSession(String userName, MailboxSession.SessionType type) {
+    private MailboxSession createSession(Username userName, MailboxSession.SessionType type) {
         return new MailboxSession(newSessionId(), userName, new ArrayList<>(), getDelimiter(), type);
     }
 
@@ -101,7 +102,7 @@ public class SessionProvider {
      * @param passwd the password
      * @return success true if login success false otherwise
      */
-    private boolean isValidLogin(String userid, String passwd) throws MailboxException {
+    private boolean isValidLogin(Username userid, String passwd) throws MailboxException {
         return authenticator.isAuthentic(userid, passwd);
     }
 }
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreAttachmentManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreAttachmentManager.java
index db73f37..0ac9959 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreAttachmentManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreAttachmentManager.java
@@ -77,7 +77,7 @@ public class StoreAttachmentManager implements AttachmentManager {
     @Override
     public void storeAttachment(Attachment attachment, MailboxSession mailboxSession) throws MailboxException {
         attachmentMapperFactory.getAttachmentMapper(mailboxSession)
-            .storeAttachmentForOwner(attachment, org.apache.james.mailbox.store.mail.model.Username.fromMailboxSession(mailboxSession));
+            .storeAttachmentForOwner(attachment, mailboxSession.getUser());
     }
 
     @Override
@@ -103,10 +103,10 @@ public class StoreAttachmentManager implements AttachmentManager {
     }
 
     private boolean isExplicitlyAOwner(AttachmentId attachmentId, MailboxSession mailboxSession) throws MailboxException {
-        Collection<org.apache.james.mailbox.store.mail.model.Username> explicitOwners = attachmentMapperFactory.getAttachmentMapper(mailboxSession)
+        Collection<Username> explicitOwners = attachmentMapperFactory.getAttachmentMapper(mailboxSession)
             .getOwners(attachmentId);
         return explicitOwners.stream()
-            .anyMatch(username -> mailboxSession.getUser().equals(Username.of(username.getValue())));
+            .anyMatch(username -> mailboxSession.getUser().equals(username));
     }
 
     private Collection<MessageId> getRelatedMessageIds(AttachmentId attachmentId, MailboxSession mailboxSession) throws MailboxException {
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 d334fa2..2f3ae29 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
@@ -31,6 +31,7 @@ import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.MailboxAnnotationManager;
@@ -215,7 +216,7 @@ public class StoreMailboxManager implements MailboxManager {
     }
 
     @Override
-    public MailboxSession createSystemSession(String userName) {
+    public MailboxSession createSystemSession(Username userName) {
         return sessionProvider.createSystemSession(userName);
     }
 
@@ -225,12 +226,12 @@ public class StoreMailboxManager implements MailboxManager {
     }
 
     @Override
-    public MailboxSession login(String userid, String passwd) throws MailboxException {
+    public MailboxSession login(Username userid, String passwd) throws MailboxException {
         return sessionProvider.login(userid, passwd);
     }
 
     @Override
-    public MailboxSession loginAsOtherUser(String adminUserid, String passwd, String otherUserId) throws MailboxException {
+    public MailboxSession loginAsOtherUser(Username adminUserid, String passwd, Username otherUserId) throws MailboxException {
         return sessionProvider.loginAsOtherUser(adminUserid, passwd, otherUserId);
     }
 
@@ -582,7 +583,7 @@ public class StoreMailboxManager implements MailboxManager {
     public static MailboxQuery.UserBound toSingleUserQuery(MailboxQuery mailboxQuery, MailboxSession mailboxSession) {
         return MailboxQuery.builder()
             .namespace(mailboxQuery.getNamespace().orElse(MailboxConstants.USER_NAMESPACE))
-            .username(mailboxQuery.getUser().orElse(mailboxSession.getUser().asString()))
+            .username(mailboxQuery.getUser().orElse(mailboxSession.getUser()))
             .expression(mailboxQuery.getMailboxNameExpression()
                 .includeChildren())
             .build()
@@ -594,7 +595,7 @@ public class StoreMailboxManager implements MailboxManager {
         if (mailboxQuery.isPrivateMailboxes(session)) {
             return Stream.of();
         }
-        return mailboxMapper.findNonPersonalMailboxes(session.getUser().asString(), right).stream();
+        return mailboxMapper.findNonPersonalMailboxes(session.getUser(), right).stream();
     }
 
     private MailboxMetaData toMailboxMetadata(MailboxSession session, List<Mailbox> mailboxes, Mailbox mailbox) {
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
index d109b3f..7db8dba 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
@@ -106,10 +106,10 @@ public class StoreRightManager implements RightManager {
         return Optional.ofNullable(username)
             .map(Throwing.function(value ->
                 aclResolver.resolveRights(
-                    username.asString(),
+                    username,
                     groupMembershipResolver,
                     mailbox.getACL(),
-                    mailbox.getUser(),
+                    mailbox.getUser().asString(),
                     !GROUP_FOLDER))
                 .sneakyThrow())
             .orElse(MailboxACL.NO_RIGHTS);
@@ -122,7 +122,7 @@ public class StoreRightManager implements RightManager {
 
         return aclResolver.listRights(key,
             groupMembershipResolver,
-            mailbox.getUser(),
+            mailbox.getUser().asString(),
             !GROUP_FOLDER);
     }
 
@@ -150,7 +150,7 @@ public class StoreRightManager implements RightManager {
             .block();
     }
 
-    private void assertSharesBelongsToUserDomain(String user, ACLCommand mailboxACLCommand) throws DifferentDomainException {
+    private void assertSharesBelongsToUserDomain(Username user, ACLCommand mailboxACLCommand) throws DifferentDomainException {
         assertSharesBelongsToUserDomain(user, ImmutableMap.of(mailboxACLCommand.getEntryKey(), mailboxACLCommand.getRights()));
     }
 
@@ -206,7 +206,7 @@ public class StoreRightManager implements RightManager {
     }
 
     @VisibleForTesting
-    void assertSharesBelongsToUserDomain(String user, Map<EntryKey, Rfc4314Rights> entries) throws DifferentDomainException {
+    void assertSharesBelongsToUserDomain(Username user, Map<EntryKey, Rfc4314Rights> entries) throws DifferentDomainException {
         if (entries.keySet().stream()
             .filter(entry -> !entry.getNameType().equals(NameType.special))
             .map(EntryKey::getName)
@@ -216,9 +216,9 @@ public class StoreRightManager implements RightManager {
     }
 
     @VisibleForTesting
-    boolean areDomainsDifferent(String user, String otherUser) {
+    boolean areDomainsDifferent(String user, Username otherUser) {
         Optional<Domain> domain = Username.of(user).getDomainPart();
-        Optional<Domain> otherDomain = Username.of(otherUser).getDomainPart();
+        Optional<Domain> otherDomain = otherUser.getDomainPart();
         return !domain.equals(otherDomain);
     }
 
@@ -260,7 +260,7 @@ public class StoreRightManager implements RightManager {
             return acl;
         }
 
-        MailboxACL.EntryKey userAsKey = MailboxACL.EntryKey.createUserEntryKey(mailboxSession.getUser().asString());
+        MailboxACL.EntryKey userAsKey = MailboxACL.EntryKey.createUserEntryKey(mailboxSession.getUser());
         Rfc4314Rights rights = acl.getEntries().getOrDefault(userAsKey, new Rfc4314Rights());
         if (rights.contains(MailboxACL.Right.Administer)) {
             return acl;
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SystemMailboxesProviderImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SystemMailboxesProviderImpl.java
index 9cbc59c..235c04c 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SystemMailboxesProviderImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SystemMailboxesProviderImpl.java
@@ -52,8 +52,8 @@ public class SystemMailboxesProviderImpl implements SystemMailboxesProvider {
 
     @Override
     public Stream<MessageManager> getMailboxByRole(Role aRole, Username username) throws MailboxException {
-        MailboxSession session = mailboxManager.createSystemSession(username.asString());
-        MailboxPath mailboxPath = MailboxPath.forUser(username.asString(), aRole.getDefaultMailbox());
+        MailboxSession session = mailboxManager.createSystemSession(username);
+        MailboxPath mailboxPath = MailboxPath.forUser(username, aRole.getDefaultMailbox());
         try {
             return Stream.of(mailboxManager.getMailbox(mailboxPath, session));
         } catch (MailboxNotFoundException e) {
@@ -68,7 +68,7 @@ public class SystemMailboxesProviderImpl implements SystemMailboxesProvider {
     }
 
     private Stream<MessageManager> searchMessageManagerByMailboxRole(Role aRole, Username username) throws MailboxException {
-        MailboxSession session = mailboxManager.createSystemSession(username.asString());
+        MailboxSession session = mailboxManager.createSystemSession(username);
         ThrowingFunction<MailboxPath, MessageManager> loadMailbox = path -> mailboxManager.getMailbox(path, session);
         MailboxQuery mailboxQuery = MailboxQuery.privateMailboxesBuilder(session)
             .expression(new PrefixedWildcard(aRole.getDefaultMailbox()))
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
index 1b6cd37..a058294 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
@@ -57,7 +57,7 @@ public class MailboxAnnotationListener implements MailboxListener.GroupMailboxLi
     @Override
     public void event(Event event) throws MailboxException {
         if (event instanceof MailboxDeletion) {
-            MailboxSession mailboxSession = sessionProvider.createSystemSession(event.getUsername().asString());
+            MailboxSession mailboxSession = sessionProvider.createSystemSession(event.getUsername());
             AnnotationMapper annotationMapper = mailboxSessionMapperFactory.getAnnotationMapper(mailboxSession);
             MailboxId mailboxId = ((MailboxDeletion) event).getMailboxId();
 
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AttachmentMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AttachmentMapper.java
index 09b444d..8b411b3 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AttachmentMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AttachmentMapper.java
@@ -21,12 +21,12 @@ package org.apache.james.mailbox.store.mail;
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.AttachmentNotFoundException;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Attachment;
 import org.apache.james.mailbox.model.AttachmentId;
 import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.store.mail.model.Username;
 import org.apache.james.mailbox.store.transaction.Mapper;
 
 public interface AttachmentMapper extends Mapper {
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
index 6b73444..3ca9c5f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
@@ -20,6 +20,7 @@ package org.apache.james.mailbox.store.mail;
 
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.exception.MailboxNotFoundException;
@@ -64,7 +65,7 @@ public interface MailboxMapper extends Mapper {
     /**
      * Return a List of {@link Mailbox} for the given userName and matching the right
      */
-    List<Mailbox> findNonPersonalMailboxes(String userName, Right right) throws MailboxException;
+    List<Mailbox> findNonPersonalMailboxes(Username userName, Right right) throws MailboxException;
 
     /**
      * Return a List of {@link Mailbox} which name is like the given name
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Username.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Username.java
deleted file mode 100644
index e2346d8..0000000
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Username.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************
- * 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.store.mail.model;
-
-import java.util.Objects;
-
-import org.apache.james.mailbox.MailboxSession;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
-
-public class Username {
-    public static Username fromMailboxSession(MailboxSession mailboxSession) {
-        Preconditions.checkNotNull(mailboxSession);
-        Preconditions.checkNotNull(mailboxSession.getUser());
-
-        return fromRawValue(mailboxSession.getUser().asString());
-    }
-
-    public static Username fromRawValue(String value) {
-        return new Username(value);
-    }
-
-    private final String value;
-
-    private Username(final String value) {
-        Preconditions.checkNotNull(value);
-
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public final boolean equals(final Object o) {
-        if (o instanceof Username) {
-            Username username = (Username) o;
-
-            return Objects.equals(this.value, username.value);
-        }
-        return false;
-    }
-
-    @Override
-    public final int hashCode() {
-        return Objects.hash(value);
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-            .add("value", value)
-            .toString();
-    }
-}
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java
index 7bcd0e9..6f5ed08 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java
@@ -84,8 +84,8 @@ public class DefaultUserQuotaRootResolver implements UserQuotaRootResolver {
         Preconditions.checkArgument(!mailboxPath.getNamespace().contains(SEPARATOR), "Namespace should not contain " + SEPARATOR);
         return Optional.ofNullable(mailboxPath.getUser())
                 .map(user -> {
-                    Preconditions.checkArgument(!mailboxPath.getUser().contains(SEPARATOR), "Username should not contain " + SEPARATOR);
-                    return Username.of(mailboxPath.getUser());
+                    Preconditions.checkArgument(!mailboxPath.getUser().asString().contains(SEPARATOR), "Username should not contain " + SEPARATOR);
+                    return mailboxPath.getUser();
                 })
                 .map(user -> QuotaRoot.quotaRoot(mailboxPath.getNamespace() + SEPARATOR + user.asString(), user.getDomainPart()))
                 .orElseGet(() -> QuotaRoot.quotaRoot(mailboxPath.getNamespace(), Optional.empty()));
@@ -93,12 +93,11 @@ public class DefaultUserQuotaRootResolver implements UserQuotaRootResolver {
 
     @Override
     public QuotaRoot getQuotaRoot(MailboxId mailboxId) throws MailboxException {
-        MailboxSession session = sessionProvider.createSystemSession("DefaultUserQuotaRootResolver");
-        Username username = Username.of(
-            factory.getMailboxMapper(session)
-                .findMailboxById(mailboxId)
-                .generateAssociatedPath()
-                .getUser());
+        MailboxSession session = sessionProvider.createSystemSession(Username.of("DefaultUserQuotaRootResolver"));
+        Username username = factory.getMailboxMapper(session)
+            .findMailboxById(mailboxId)
+            .generateAssociatedPath()
+            .getUser();
 
         return forUser(username);
     }
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
index 06dfecf..a04f94a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
@@ -70,7 +70,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
     @Override
     public void event(Event event) throws Exception {
         handleMailboxEvent(event,
-            sessionProvider.createSystemSession(event.getUsername().asString()),
+            sessionProvider.createSystemSession(event.getUsername()),
             (MailboxEvent) event);
     }
 
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 ec2d036..8727d45 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 java.util.stream.Stream;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
@@ -50,7 +51,7 @@ import com.github.fge.lambdas.Throwing;
 import com.google.common.collect.ImmutableList;
 
 public abstract class AbstractMailboxManagerAttachmentTest {
-    private static final String USERNAME = "user@domain.tld";
+    private static final Username USERNAME = Username.of("user@domain.tld");
 
     private MailboxManager mailboxManager;
     private MessageMapper messageMapper;
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 661edb7..3ea3167 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
@@ -29,6 +29,7 @@ import java.util.function.Predicate;
 
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.MessageIdManager;
@@ -77,7 +78,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
     public void setUp() throws Exception {
         aliceSession = MailboxSessionUtil.create(MailboxFixture.ALICE);
         bobSession = MailboxSessionUtil.create(MailboxFixture.BOB);
-        systemSession = MailboxSessionUtil.create("systemuser");
+        systemSession = MailboxSessionUtil.create(Username.of("systemuser"));
         testingData = createTestingData();
         messageIdManager = testingData.getMessageIdManager();
 
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 7837d7e..33a3a32 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
@@ -29,6 +29,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.AttachmentManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
@@ -67,7 +68,7 @@ public class StoreBlobManagerTest {
     public void setUp() {
         attachmentManager = mock(AttachmentManager.class);
         messageIdManager = mock(MessageIdManager.class);
-        session = MailboxSessionUtil.create("user");
+        session = MailboxSessionUtil.create(Username.of("user"));
 
         blobManager = new StoreBlobManager(attachmentManager, messageIdManager, new TestMessageId.Factory());
     }
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 e22ac6e..2753748 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
@@ -32,6 +32,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -80,7 +81,7 @@ public class StoreMailboxManagerAnnotationTest {
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
 
-        session = MailboxSessionUtil.create("userName");
+        session = MailboxSessionUtil.create(Username.of("userName"));
 
         when(mailboxSessionMapperFactory.getMailboxMapper(eq(session))).thenReturn(mailboxMapper);
         when(mailboxSessionMapperFactory.getAnnotationMapper(eq(session))).thenReturn(annotationMapper);
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 85834fd..45e922c 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
@@ -24,6 +24,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.MessageManager;
@@ -57,12 +58,12 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class StoreMailboxManagerTest {
-    private static final String CURRENT_USER = "user";
+    private static final Username CURRENT_USER = Username.of("user");
     private static final String CURRENT_USER_PASSWORD = "secret";
-    private static final String ADMIN = "admin";
+    private static final Username ADMIN = Username.of("admin");
     private static final String ADMIN_PASSWORD = "adminsecret";
     private static final MailboxId MAILBOX_ID = TestId.of(123);
-    private static final String UNKNOWN_USER = "otheruser";
+    private static final Username UNKNOWN_USER = Username.of("otheruser");
     private static final String BAD_PASSWORD = "badpassword";
     private static final String EMPTY_PREFIX = "";
 
@@ -122,7 +123,7 @@ public class StoreMailboxManagerTest {
     public void getMailboxShouldReturnMailboxManagerWhenKnownIdAndDifferentCaseUser() throws Exception {
         Mailbox mockedMailbox = mock(Mailbox.class);
         when(mockedMailbox.generateAssociatedPath())
-            .thenReturn(MailboxPath.forUser("uSEr", "mailboxName"));
+            .thenReturn(MailboxPath.forUser(Username.of("uSEr"), "mailboxName"));
         when(mockedMailbox.getMailboxId()).thenReturn(MAILBOX_ID);
         when(mockedMailboxMapper.findMailboxById(MAILBOX_ID)).thenReturn(mockedMailbox);
 
@@ -133,11 +134,13 @@ public class StoreMailboxManagerTest {
 
     @Test(expected = MailboxNotFoundException.class)
     public void getMailboxShouldThrowWhenMailboxDoesNotMatchUserWithoutRight() throws Exception {
+        Username otherUser = Username.of("other.user");
         Mailbox mockedMailbox = mock(Mailbox.class);
         when(mockedMailbox.getACL()).thenReturn(new MailboxACL());
         when(mockedMailbox.generateAssociatedPath())
-            .thenReturn(MailboxPath.forUser("other.user", "mailboxName"));
+            .thenReturn(MailboxPath.forUser(otherUser, "mailboxName"));
         when(mockedMailbox.getMailboxId()).thenReturn(MAILBOX_ID);
+        when(mockedMailbox.getUser()).thenReturn(otherUser);
         when(mockedMailboxMapper.findMailboxById(MAILBOX_ID)).thenReturn(mockedMailbox);
         when(mockedMailboxMapper.findMailboxByPath(any())).thenReturn(mockedMailbox);
 
@@ -150,7 +153,7 @@ public class StoreMailboxManagerTest {
     public void loginShouldCreateSessionWhenGoodPassword() throws Exception {
         MailboxSession expected = storeMailboxManager.login(CURRENT_USER, CURRENT_USER_PASSWORD);
 
-        assertThat(expected.getUser().asString()).isEqualTo(CURRENT_USER);
+        assertThat(expected.getUser()).isEqualTo(CURRENT_USER);
     }
 
     @Test(expected = BadCredentialsException.class)
@@ -192,13 +195,13 @@ public class StoreMailboxManagerTest {
     public void loginAsOtherUserShouldCreateUserSessionWhenAdminWithGoodPassword() throws Exception {
         MailboxSession expected = storeMailboxManager.loginAsOtherUser(ADMIN, ADMIN_PASSWORD, CURRENT_USER);
 
-        assertThat(expected.getUser().asString()).isEqualTo(CURRENT_USER);
+        assertThat(expected.getUser()).isEqualTo(CURRENT_USER);
     }
 
     @Test
     public void getPathLikeShouldReturnUserPathLikeWhenNoPrefixDefined() {
         //Given
-        MailboxSession session = MailboxSessionUtil.create("user");
+        MailboxSession session = MailboxSessionUtil.create(CURRENT_USER);
         MailboxQuery.Builder testee = MailboxQuery.builder()
             .expression(new PrefixedRegex(EMPTY_PREFIX, "abc", session.getPathDelimiter()));
         //When
@@ -207,7 +210,7 @@ public class StoreMailboxManagerTest {
         assertThat(StoreMailboxManager.toSingleUserQuery(mailboxQuery, session))
             .isEqualTo(MailboxQuery.builder()
                 .namespace(MailboxConstants.USER_NAMESPACE)
-                .username("user")
+                .username(Username.of("user"))
                 .expression(new PrefixedRegex(EMPTY_PREFIX, "abc*", session.getPathDelimiter()))
                 .build()
                 .asUserBound());
@@ -216,7 +219,7 @@ public class StoreMailboxManagerTest {
     @Test
     public void getPathLikeShouldReturnUserPathLikeWhenPrefixDefined() {
         //Given
-        MailboxSession session = MailboxSessionUtil.create("user");
+        MailboxSession session = MailboxSessionUtil.create(CURRENT_USER);
         MailboxQuery.Builder testee = MailboxQuery.builder()
             .expression(new PrefixedRegex("prefix.", "abc", session.getPathDelimiter()));
 
@@ -226,7 +229,7 @@ public class StoreMailboxManagerTest {
         assertThat(StoreMailboxManager.toSingleUserQuery(mailboxQuery, session))
             .isEqualTo(MailboxQuery.builder()
                 .namespace(MailboxConstants.USER_NAMESPACE)
-                .username("user")
+                .username(Username.of("user"))
                 .expression(new PrefixedRegex("prefix.", "abc*", session.getPathDelimiter()))
                 .build()
                 .asUserBound());
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 7479b95..5de12a3 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
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.when;
 
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.acl.GroupMembershipResolver;
@@ -97,7 +98,7 @@ public class StoreRightManagerTest {
     @Test
     public void hasRightShouldReturnTrueWhenTheUserDoesNotOwnTheMailboxButHaveTheCorrectRightOnIt() throws MailboxException {
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.Write)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.Write)));
 
         assertThat(storeRightManager.hasRight(mailbox, Right.Write, aliceSession))
             .isTrue();
@@ -106,7 +107,7 @@ public class StoreRightManagerTest {
     @Test
     public void hasRightShouldReturnTrueWhenTheUserDoesNotOwnTheMailboxButHasAtLeastTheCorrectRightOnIt() throws MailboxException {
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.Write, Right.Lookup)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.Write, Right.Lookup)));
 
         assertThat(storeRightManager.hasRight(mailbox, Right.Write, aliceSession))
             .isTrue();
@@ -124,7 +125,7 @@ public class StoreRightManagerTest {
     public void isReadWriteShouldReturnTrueWhenUserHasInsertRightOnMailbox() throws Exception {
         Flags flags = new Flags();
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.Insert)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.Insert)));
 
         assertThat(storeRightManager.isReadWrite(aliceSession, mailbox, flags))
             .isTrue();
@@ -134,7 +135,7 @@ public class StoreRightManagerTest {
     public void isReadWriteShouldReturnTrueWhenUserHasPerformExpungeRightOnMailbox() throws Exception {
         Flags flags = new Flags();
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.PerformExpunge)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.PerformExpunge)));
 
         assertThat(storeRightManager.isReadWrite(aliceSession, mailbox, flags))
             .isTrue();
@@ -144,7 +145,7 @@ public class StoreRightManagerTest {
     public void isReadWriteShouldReturnTrueWhenUserHasDeleteMessagesRightOnMailboxAndFlagsContainDeletedFlag() throws Exception {
         Flags flags = new Flags(Flags.Flag.DELETED);
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.DeleteMessages)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.DeleteMessages)));
 
         assertThat(storeRightManager.isReadWrite(aliceSession, mailbox, flags))
             .isTrue();
@@ -154,7 +155,7 @@ public class StoreRightManagerTest {
     public void isReadWriteShouldReturnFalseWhenUserHasDeleteMessagesRightOnMailboxButFlagsDoesNotContainDeletedFlag() throws Exception {
         Flags flags = new Flags();
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.DeleteMessages)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.DeleteMessages)));
 
         assertThat(storeRightManager.isReadWrite(aliceSession, mailbox, flags))
             .isFalse();
@@ -164,7 +165,7 @@ public class StoreRightManagerTest {
     public void isReadWriteShouldReturnTrueWhenUserHasWriteSeenFlagRightOnMailboxAndFlagsContainSeenFlag() throws Exception {
         Flags flags = new Flags(Flags.Flag.SEEN);
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.WriteSeenFlag)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.WriteSeenFlag)));
 
         assertThat(storeRightManager.isReadWrite(aliceSession, mailbox, flags))
             .isTrue();
@@ -174,7 +175,7 @@ public class StoreRightManagerTest {
     public void isReadWriteShouldReturnFalseWhenUserHasWriteSeenFlagRightOnMailboxAndFlagsDoesNotContainSeenFlag() throws Exception {
         Flags flags = new Flags();
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.WriteSeenFlag)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.WriteSeenFlag)));
 
         assertThat(storeRightManager.isReadWrite(aliceSession, mailbox, flags))
             .isFalse();
@@ -184,7 +185,7 @@ public class StoreRightManagerTest {
     public void isReadWriteShouldReturnTrueWhenUserHasWriteRightOnMailboxAndFlagsContainAnsweredFlag() throws Exception {
         Flags flags = new Flags(Flags.Flag.ANSWERED);
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.Write)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.Write)));
 
         assertThat(storeRightManager.isReadWrite(aliceSession, mailbox, flags))
             .isTrue();
@@ -193,7 +194,7 @@ public class StoreRightManagerTest {
     @Test
     public void isReadWriteShouldReturnFalseWhenUserDoesNotHaveInsertOrPerformExpungeRightOnMailboxAndNullFlag() throws Exception {
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, MailboxConstants.INBOX), UID_VALIDITY);
-        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE, Right.Administer)));
+        mailbox.setACL(new MailboxACL(new MailboxACL.Entry(MailboxFixture.ALICE.asString(), Right.Administer)));
 
         assertThat(storeRightManager.isReadWrite(aliceSession, mailbox, new Flags()))
             .isFalse();
@@ -231,27 +232,27 @@ public class StoreRightManagerTest {
 
     @Test
     public void areDomainsDifferentShouldReturnTrueWhenOneHasDomainNotTheOther() {
-        assertThat(storeRightManager.areDomainsDifferent("user@domain.org", "otherUser")).isTrue();
+        assertThat(storeRightManager.areDomainsDifferent("user@domain.org", Username.of("otherUser"))).isTrue();
     }
 
     @Test
     public void areDomainsDifferentShouldReturnTrueWhenOtherHasDomainNotTheOne() {
-        assertThat(storeRightManager.areDomainsDifferent("user", "otherUser@domain.org")).isTrue();
+        assertThat(storeRightManager.areDomainsDifferent("user", Username.of("otherUser@domain.org"))).isTrue();
     }
 
     @Test
     public void areDomainsDifferentShouldReturnFalseWhenNoDomain() {
-        assertThat(storeRightManager.areDomainsDifferent("user", "otherUser")).isFalse();
+        assertThat(storeRightManager.areDomainsDifferent("user", Username.of("otherUser"))).isFalse();
     }
 
     @Test
     public void areDomainsDifferentShouldReturnTrueWhenDomainsAreDifferent() {
-        assertThat(storeRightManager.areDomainsDifferent("user@domain.org", "otherUser@otherdomain.org")).isTrue();
+        assertThat(storeRightManager.areDomainsDifferent("user@domain.org", Username.of("otherUser@otherdomain.org"))).isTrue();
     }
 
     @Test
     public void areDomainsDifferentShouldReturnFalseWhenDomainsAreIdentical() {
-        assertThat(storeRightManager.areDomainsDifferent("user@domain.org", "otherUser@domain.org")).isFalse();
+        assertThat(storeRightManager.areDomainsDifferent("user@domain.org", Username.of("otherUser@domain.org"))).isFalse();
     }
 
     @Test
@@ -260,7 +261,7 @@ public class StoreRightManagerTest {
                 new MailboxACL.Entry("b@otherdomain.org", Right.Write), 
                 new MailboxACL.Entry("c@domain.org", Right.Write));
         
-        assertThatThrownBy(() -> storeRightManager.assertSharesBelongsToUserDomain("user@domain.org", mailboxACL.getEntries()))
+        assertThatThrownBy(() -> storeRightManager.assertSharesBelongsToUserDomain(Username.of("user@domain.org"), mailboxACL.getEntries()))
             .isInstanceOf(DifferentDomainException.class);
     }
 
@@ -270,14 +271,14 @@ public class StoreRightManagerTest {
                 new MailboxACL.Entry("b@domain.org", Right.Write), 
                 new MailboxACL.Entry("c@domain.org", Right.Write));
         
-        storeRightManager.assertSharesBelongsToUserDomain("user@domain.org", mailboxACL.getEntries());
+        storeRightManager.assertSharesBelongsToUserDomain(Username.of("user@domain.org"), mailboxACL.getEntries());
     }
 
     @Test
     public void applyRightsCommandShouldThrowWhenDomainsAreDifferent() {
-        MailboxPath mailboxPath = MailboxPath.forUser("user@domain.org", "mailbox");
+        MailboxPath mailboxPath = MailboxPath.forUser(Username.of("user@domain.org"), "mailbox");
         ACLCommand aclCommand = MailboxACL.command()
-            .forUser("otherUser@otherdomain.org")
+            .forUser(Username.of("otherUser@otherdomain.org"))
             .rights(MailboxACL.FULL_RIGHTS)
             .asAddition();
        
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 0f97e65..b7feb4d 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
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.when;
 import java.util.List;
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.MailboxSession;
@@ -54,7 +55,8 @@ import org.mockito.MockitoAnnotations;
 import com.google.common.collect.ImmutableList;
 
 public class MailboxAnnotationListenerTest {
-    private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", "user", "name");
+    private static final Username USER = Username.of("user");
+    private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", USER, "name");
 
     private static final MailboxAnnotationKey PRIVATE_KEY = new MailboxAnnotationKey("/private/comment");
     private static final MailboxAnnotationKey SHARED_KEY = new MailboxAnnotationKey("/shared/comment");
@@ -78,20 +80,20 @@ public class MailboxAnnotationListenerTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mailboxSession = MailboxSessionUtil.create("test");
+        mailboxSession = MailboxSessionUtil.create(Username.of("test"));
         listener = new MailboxAnnotationListener(mailboxSessionMapperFactory, sessionProvider);
 
         deleteEvent = EventFactory.mailboxDeleted()
             .randomEventId()
             .mailboxSession(mailboxSession)
             .mailboxId(mailboxId)
-            .mailboxPath(MailboxPath.forUser("user", "name"))
+            .mailboxPath(MailboxPath.forUser(USER, "name"))
             .quotaRoot(QuotaRoot.quotaRoot("root", Optional.empty()))
             .quotaCount(QuotaCount.count(123))
             .quotaSize(QuotaSize.size(456))
             .build();
 
-        when(sessionProvider.createSystemSession(deleteEvent.getUsername().asString()))
+        when(sessionProvider.createSystemSession(deleteEvent.getUsername()))
             .thenReturn(mailboxSession);
         when(mailboxSessionMapperFactory.getAnnotationMapper(eq(mailboxSession))).thenReturn(annotationMapper);
     }
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 bf1a65f..840890b 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
@@ -29,6 +29,7 @@ import java.util.Date;
 import javax.mail.Flags;
 import javax.mail.util.SharedByteArrayInputStream;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
 import org.apache.james.mailbox.MessageUid;
@@ -65,7 +66,7 @@ public class MessageUtilsTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mailboxSession = MailboxSessionUtil.create("user");
+        mailboxSession = MailboxSessionUtil.create(Username.of("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());
     }
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java
index 63f50c2..7312bc7 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java
@@ -25,6 +25,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.AttachmentNotFoundException;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Attachment;
@@ -39,8 +40,8 @@ import com.google.common.collect.ImmutableList;
 
 public abstract class AttachmentMapperTest {
     private static final AttachmentId UNKNOWN_ATTACHMENT_ID = AttachmentId.from("unknown");
-    public static final Username OWNER = Username.fromRawValue("owner");
-    public static final Username ADDITIONAL_OWNER = Username.fromRawValue("additionalOwner");
+    public static final Username OWNER = Username.of("owner");
+    public static final Username ADDITIONAL_OWNER = Username.of("additionalOwner");
 
     private AttachmentMapper attachmentMapper;
 
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java
index 334ee02..39842c5 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxId;
 
@@ -55,11 +56,11 @@ public class ListMailboxAssert {
 
     private final class InnerMailbox {
         private final MailboxId id;
-        private final String user;
+        private final Username user;
         private final String name;
         private final String namespace;
 
-        public InnerMailbox(MailboxId id, String user, String name, String namespace) {
+        public InnerMailbox(MailboxId id, Username user, String name, String namespace) {
             this.id = id;
             this.user = user;
             this.name = name;
@@ -70,7 +71,7 @@ public class ListMailboxAssert {
             return id;
         }
 
-        public String getUser() {
+        public Username getUser() {
             return user;
         }
 
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
index 49082aa..ad4c5c0 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.junit.Before;
@@ -34,7 +35,7 @@ import com.google.common.collect.ImmutableList;
 public class ListMailboxAssertTest {
     private static final String OTHER_NAMESPACE = "other_namespace";
     private static final String NAME = "name";
-    private static final String USER = "user";
+    private static final Username USER = Username.of("user");
     private static final String NAMESPACE = "namespace";
     private static final long UID_VALIDITY = 42;
     private static final Mailbox mailbox1 = new Mailbox(new MailboxPath(NAMESPACE, USER, NAME), UID_VALIDITY);
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 ee42ac9..516f39e 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
@@ -29,6 +29,7 @@ import java.util.List;
 import javax.mail.Flags;
 import javax.mail.util.SharedByteArrayInputStream;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.model.ComposedMessageId;
 import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData;
@@ -62,7 +63,7 @@ public class ListMessageAssertTest {
     
     @Before
     public void setUp() {
-        benwaInboxMailbox = createMailbox(MailboxPath.forUser("user", "INBOX"));
+        benwaInboxMailbox = createMailbox(MailboxPath.forUser(Username.of("user"), "INBOX"));
 
         message1 = createMessage(benwaInboxMailbox, MESSAGE_ID, BODY_CONTENT1, BODY_START, new PropertyBuilder());
         message2 = createMessage(benwaInboxMailbox, MESSAGE_ID, BODY_CONTENT2, BODY_START, new PropertyBuilder());
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 4989cf1..9e9d07a 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
@@ -21,12 +21,12 @@ package org.apache.james.mailbox.store.mail.model;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.acl.ACLDiff;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxACL.EntryKey;
-import org.apache.james.mailbox.model.MailboxACL.NameType;
 import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights;
 import org.apache.james.mailbox.model.MailboxACL.Right;
 import org.apache.james.mailbox.model.MailboxId;
@@ -42,6 +42,9 @@ public abstract class MailboxMapperACLTest {
     private static final long UID_VALIDITY = 42;
     public static final boolean POSITIVE = true;
     public static final boolean NEGATIVE = !POSITIVE;
+    private static final Username USER = Username.of("user");
+    private static final Username USER_1 = Username.of("user1");
+    private static final Username USER_2 = Username.of("user2");
 
     private Mailbox benwaInboxMailbox;
 
@@ -56,7 +59,7 @@ public abstract class MailboxMapperACLTest {
 
     public void setUp() throws Exception {
         mailboxMapper = createMailboxMapper();
-        MailboxPath benwaInboxPath = MailboxPath.forUser("benwa", "INBOX");
+        MailboxPath benwaInboxPath = MailboxPath.forUser(Username.of("benwa"), "INBOX");
         benwaInboxMailbox = createMailbox(benwaInboxPath);
         mailboxMapper.save(benwaInboxMailbox);
     }
@@ -72,7 +75,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void updateAclShouldSaveAclWhenReplace() throws MailboxException {
-        EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         mailboxMapper.updateACL(benwaInboxMailbox, MailboxACL.command().key(key).rights(rights).asReplacement());
 
@@ -86,7 +89,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void updateAclShouldOverwriteStoredAclWhenReplace() throws MailboxException {
-        EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
 
@@ -103,8 +106,8 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void updateAclShouldTreatNegativeAndPositiveRightSeparately() throws MailboxException {
-        EntryKey key1 = new EntryKey("user", NameType.user, NEGATIVE);
-        EntryKey key2 = new EntryKey("user", NameType.user, POSITIVE);
+        EntryKey key1 = EntryKey.createUserEntryKey(USER, NEGATIVE);
+        EntryKey key2 = EntryKey.createUserEntryKey(USER, POSITIVE);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
         mailboxMapper.updateACL(benwaInboxMailbox, MailboxACL.command().key(key1).rights(rights).asReplacement());
@@ -121,8 +124,8 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void updateAclShouldTreatNameTypesRightSeparately() throws MailboxException {
-        EntryKey key1 = new EntryKey("user", NameType.user, NEGATIVE);
-        EntryKey key2 = new EntryKey("user", NameType.group, NEGATIVE);
+        EntryKey key1 = EntryKey.createUserEntryKey(USER);
+        EntryKey key2 = EntryKey.createGroupEntryKey(USER.asString());
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
         mailboxMapper.updateACL(benwaInboxMailbox, MailboxACL.command().key(key1).rights(rights).asReplacement());
@@ -139,7 +142,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void updateAclShouldCleanAclEntryWhenEmptyReplace() throws MailboxException {
-        EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         Rfc4314Rights newRights = new Rfc4314Rights();
         mailboxMapper.updateACL(benwaInboxMailbox, MailboxACL.command().key(key).rights(rights).asReplacement());
@@ -154,7 +157,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void updateAclShouldCombineStoredAclWhenAdd() throws MailboxException {
-        EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
         Rfc4314Rights bothRights = new Rfc4314Rights(Right.Administer, Right.WriteSeenFlag, Right.PerformExpunge, Right.Write, Right.CreateMailbox, Right.DeleteMessages);
@@ -171,7 +174,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void removeAclShouldRemoveSomeStoredAclWhenAdd() throws MailboxException {
-        EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         Rfc4314Rights removedRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.PerformExpunge);
         Rfc4314Rights finalRights = new Rfc4314Rights(Right.Administer, Right.Write);
@@ -188,7 +191,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void removeAclShouldNotFailWhenRemovingNonExistingRight() throws MailboxException {
-        EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         Rfc4314Rights removedRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.PerformExpunge, Right.Lookup);
         Rfc4314Rights finalRights = new Rfc4314Rights(Right.Administer, Right.Write);
@@ -205,7 +208,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void resetAclShouldReplaceStoredAcl() throws MailboxException {
-        EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
         Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
         mailboxMapper.updateACL(benwaInboxMailbox, MailboxACL.command().key(key).rights(rights).asReplacement());
@@ -221,7 +224,7 @@ public abstract class MailboxMapperACLTest {
     
     @Test
     public void resetAclShouldInitializeStoredAcl() throws MailboxException {
-        EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
         mailboxMapper.setACL(benwaInboxMailbox,
             new MailboxACL(ImmutableMap.of(key, rights)));
@@ -242,12 +245,12 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void findMailboxesShouldReturnEmptyWhenNone() throws MailboxException {
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user", Right.Administer)).isEmpty();
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER, Right.Administer)).isEmpty();
     }
 
     @Test
     public void findMailboxesShouldReturnEmptyWhenRightDoesntMatch() throws MailboxException {
-        EntryKey key = EntryKey.createUserEntryKey("user");
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer);
         mailboxMapper.updateACL(benwaInboxMailbox,
             MailboxACL.command()
@@ -255,7 +258,7 @@ public abstract class MailboxMapperACLTest {
                 .rights(rights)
                 .asReplacement());
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user", Right.Read)).isEmpty();
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER, Right.Read)).isEmpty();
     }
 
     @Test
@@ -263,17 +266,17 @@ public abstract class MailboxMapperACLTest {
         Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge);
         mailboxMapper.updateACL(benwaInboxMailbox,
             MailboxACL.command()
-                .key(EntryKey.createUserEntryKey("user"))
+                .key(EntryKey.createUserEntryKey(USER))
                 .rights(rights)
                 .asAddition());
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user", Right.Administer))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER, Right.Administer))
             .containsOnly(benwaInboxMailbox);
     }
 
     @Test
     public void updateACLShouldOverwriteUsersRights() throws MailboxException {
-        EntryKey key = EntryKey.createUserEntryKey("user");
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights initialRights = new Rfc4314Rights(Right.Administer);
         mailboxMapper.updateACL(benwaInboxMailbox,
             MailboxACL.command()
@@ -287,16 +290,16 @@ public abstract class MailboxMapperACLTest {
                 .rights(newRights)
                 .asReplacement());
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user", Right.Read))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER, Right.Read))
             .containsOnly(benwaInboxMailbox);
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user", Right.Administer))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER, Right.Administer))
             .isEmpty();
     }
 
     @Test
     public void findMailboxesShouldNotReportDeletedACLViaReplace() throws MailboxException {
-        EntryKey key = EntryKey.createUserEntryKey("user");
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights initialRights = new Rfc4314Rights(Right.Administer);
         mailboxMapper.updateACL(benwaInboxMailbox,
             MailboxACL.command()
@@ -311,13 +314,13 @@ public abstract class MailboxMapperACLTest {
                 .rights(new Rfc4314Rights())
                 .build());
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user", Right.Administer))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER, Right.Administer))
             .isEmpty();
     }
 
     @Test
     public void findMailboxesShouldNotReportDeletedACLViaRemove() throws MailboxException {
-        EntryKey key = EntryKey.createUserEntryKey("user");
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights initialRights = new Rfc4314Rights(Right.Administer);
         mailboxMapper.updateACL(benwaInboxMailbox,
             MailboxACL.command()
@@ -330,13 +333,13 @@ public abstract class MailboxMapperACLTest {
                 .rights(initialRights)
                 .asRemoval());
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user", Right.Administer))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER, Right.Administer))
             .isEmpty();
     }
 
     @Test
     public void findMailboxesShouldNotReportDeletedMailboxes() throws MailboxException {
-        EntryKey key = EntryKey.createUserEntryKey("user");
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights initialRights = new Rfc4314Rights(Right.Administer);
         mailboxMapper.updateACL(benwaInboxMailbox,
             MailboxACL.command()
@@ -345,29 +348,29 @@ public abstract class MailboxMapperACLTest {
                 .asReplacement());
         mailboxMapper.delete(benwaInboxMailbox);
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user", Right.Administer))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER, Right.Administer))
             .isEmpty();
     }
 
     @Test
     public void setACLShouldStoreMultipleUsersRights() throws MailboxException {
-        EntryKey user1 = EntryKey.createUserEntryKey("user1");
-        EntryKey user2 = EntryKey.createUserEntryKey("user2");
+        EntryKey user1 = EntryKey.createUserEntryKey(USER_1);
+        EntryKey user2 = EntryKey.createUserEntryKey(USER_2);
 
         mailboxMapper.setACL(benwaInboxMailbox, new MailboxACL(
             new MailboxACL.Entry(user1, new Rfc4314Rights(Right.Administer)),
             new MailboxACL.Entry(user2, new Rfc4314Rights(Right.Read))));
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user1", Right.Administer))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER_1, Right.Administer))
             .containsOnly(benwaInboxMailbox);
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user2", Right.Read))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER_2, Right.Read))
             .containsOnly(benwaInboxMailbox);
     }
 
     @Test
     public void findMailboxesShouldNotReportRightsRemovedViaSetAcl() throws MailboxException {
-        EntryKey user1 = EntryKey.createUserEntryKey("user1");
-        EntryKey user2 = EntryKey.createUserEntryKey("user2");
+        EntryKey user1 = EntryKey.createUserEntryKey(USER_1);
+        EntryKey user2 = EntryKey.createUserEntryKey(USER_2);
 
         mailboxMapper.setACL(benwaInboxMailbox, new MailboxACL(
             new MailboxACL.Entry(user1, new Rfc4314Rights(Right.Administer)),
@@ -376,14 +379,14 @@ public abstract class MailboxMapperACLTest {
         mailboxMapper.setACL(benwaInboxMailbox, new MailboxACL(
             new MailboxACL.Entry(user2, new Rfc4314Rights(Right.Read))));
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user1", Right.Administer))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER_1, Right.Administer))
             .isEmpty();
     }
 
     @Test
     public void findMailboxesShouldReportRightsUpdatedViaSetAcl() throws MailboxException {
-        EntryKey user1 = EntryKey.createUserEntryKey("user1");
-        EntryKey user2 = EntryKey.createUserEntryKey("user2");
+        EntryKey user1 = EntryKey.createUserEntryKey(USER_1);
+        EntryKey user2 = EntryKey.createUserEntryKey(USER_2);
 
         mailboxMapper.setACL(benwaInboxMailbox, new MailboxACL(
             new MailboxACL.Entry(user1, new Rfc4314Rights(Right.Administer)),
@@ -392,13 +395,13 @@ public abstract class MailboxMapperACLTest {
         mailboxMapper.setACL(benwaInboxMailbox, new MailboxACL(
             new MailboxACL.Entry(user2, new Rfc4314Rights(Right.Write))));
 
-        assertThat(mailboxMapper.findNonPersonalMailboxes("user2", Right.Write))
+        assertThat(mailboxMapper.findNonPersonalMailboxes(USER_2, Right.Write))
             .containsOnly(benwaInboxMailbox);
     }
 
     @Test
     public void findMailboxByPathShouldReturnMailboxWithACL() throws MailboxException {
-        EntryKey key = EntryKey.createUserEntryKey("user");
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
         mailboxMapper.setACL(benwaInboxMailbox,
             new MailboxACL(ImmutableMap.of(key, rights)));
@@ -413,7 +416,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void setACLShouldReturnACLDiff() throws MailboxException {
-        EntryKey key = EntryKey.createUserEntryKey("user");
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
 
         ACLDiff expectAclDiff = ACLDiff.computeDiff(MailboxACL.EMPTY, MailboxACL.EMPTY.apply(
@@ -428,7 +431,7 @@ public abstract class MailboxMapperACLTest {
 
     @Test
     public void updateACLShouldReturnACLDiff() throws MailboxException {
-        EntryKey key = EntryKey.createUserEntryKey("user");
+        EntryKey key = EntryKey.createUserEntryKey(USER);
         Rfc4314Rights rights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
 
         MailboxACL.ACLCommand aclCommand = MailboxACL.command()
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 739d1bd..2c4efef 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
@@ -25,6 +25,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.exception.MailboxExistsException;
 import org.apache.james.mailbox.exception.MailboxNotFoundException;
@@ -44,10 +45,11 @@ import org.junit.Test;
  * You then just need to instantiate your mailbox mapper and an IdGenerator.
  */
 public abstract class MailboxMapperTest {
-    
+
     private static final char DELIMITER = '.';
     private static final char WILDCARD = '%';
     private static final long UID_VALIDITY = 42;
+    private static final Username BENWA = Username.of("benwa");
 
     private MailboxPath benwaInboxPath;
     private Mailbox benwaInboxMailbox;
@@ -80,7 +82,7 @@ public abstract class MailboxMapperTest {
 
     @Test
     public void findMailboxByPathWhenAbsentShouldFail() throws MailboxException {
-        assertThatThrownBy(() -> mailboxMapper.findMailboxByPath(MailboxPath.forUser("benwa", "INBOX")))
+        assertThatThrownBy(() -> mailboxMapper.findMailboxByPath(MailboxPath.forUser(BENWA, "INBOX")))
             .isInstanceOf(MailboxNotFoundException.class);
     }
 
@@ -209,14 +211,14 @@ public abstract class MailboxMapperTest {
     }
 
     private void initData() {
-        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");
+        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(Username.of("bob"), "INBOX");
+        bobyMailboxPath = MailboxPath.forUser(Username.of("boby"), "INBOX.that.is.a.trick");
+        bobDifferentNamespacePath = new MailboxPath("#private_bob", Username.of("bob"), "INBOX.bob");
 
         benwaInboxMailbox = createMailbox(benwaInboxPath);
         benwaWorkMailbox = createMailbox(benwaWorkPath);
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 1144443..264f2bc 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
@@ -31,6 +31,7 @@ import javax.mail.Flags.Flag;
 import javax.mail.util.SharedByteArrayInputStream;
 
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.FlagsBuilder;
 import org.apache.james.mailbox.MessageManager.FlagsUpdateMode;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -58,6 +59,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 
 public abstract class MessageIdMapperTest {
+    private static final Username BENWA = Username.of("benwa");
 
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
@@ -92,8 +94,8 @@ public abstract class MessageIdMapperTest {
         this.messageMapper = mapperProvider.createMessageMapper();
         this.mailboxMapper = mapperProvider.createMailboxMapper();
 
-        benwaInboxMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX"));
-        benwaWorkMailbox = createMailbox(MailboxPath.forUser("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());
@@ -163,7 +165,7 @@ public abstract class MessageIdMapperTest {
 
     @Test
     public void saveShouldThrowWhenMailboxDoesntExist() throws Exception {
-        Mailbox notPersistedMailbox = new Mailbox(MailboxPath.forUser("benwa", "mybox"), UID_VALIDITY);
+        Mailbox notPersistedMailbox = new Mailbox(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());
@@ -208,7 +210,7 @@ public abstract class MessageIdMapperTest {
         message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox));
         sut.save(message1);
 
-        Mailbox notPersistedMailbox = new Mailbox(MailboxPath.forUser("benwa", "mybox"), UID_VALIDITY);
+        Mailbox notPersistedMailbox = new Mailbox(MailboxPath.forUser(BENWA, "mybox"), UID_VALIDITY);
         notPersistedMailbox.setMailboxId(mapperProvider.generateId());
 
         SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(notPersistedMailbox.getMailboxId(), message1);
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 762c410..b223a79 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
@@ -36,6 +36,7 @@ import javax.mail.Flags;
 import javax.mail.Flags.Flag;
 import javax.mail.util.SharedByteArrayInputStream;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.FlagsBuilder;
 import org.apache.james.mailbox.MessageManager.FlagsUpdateMode;
 import org.apache.james.mailbox.MessageUid;
@@ -71,6 +72,7 @@ public abstract class MessageMapperTest {
     private static final String USER_FLAG = "userFlag";
 
     private static final String CUSTOMS_USER_FLAGS_VALUE = "CustomsFlags";
+    private static final Username BENWA = Username.of("benwa");
 
     private MapperProvider mapperProvider;
     private MessageMapper messageMapper;
@@ -103,8 +105,8 @@ public abstract class MessageMapperTest {
     }
 
     private void initData() throws MailboxException {
-        benwaInboxMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX"));
-        benwaWorkMailbox = createMailbox(MailboxPath.forUser("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());
@@ -1103,7 +1105,7 @@ public abstract class MessageMapperTest {
 
     @Test
     public void getApplicableFlagShouldReturnDefaultApplicableFlagsWhenMailboxEmpty() throws Exception {
-        Mailbox emptyMailbox = createMailbox(MailboxPath.forUser("benwa", "EMPTY"));
+        Mailbox emptyMailbox = createMailbox(MailboxPath.forUser(BENWA, "EMPTY"));
 
         assertThat(messageMapper.getApplicableFlag(emptyMailbox))
             .isEqualTo(new FlagsBuilder()
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 27c34fd..8658d50 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
@@ -26,6 +26,7 @@ import java.util.Date;
 import javax.mail.Flags;
 import javax.mail.util.SharedByteArrayInputStream;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxId;
@@ -72,8 +73,9 @@ public abstract class MessageMoveTest {
         this.mailboxMapper = mapperProvider.createMailboxMapper();
         Assume.assumeNotNull(mailboxMapper);
 
-        benwaInboxMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX"));
-        benwaWorkMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX" + DELIMITER + "work"));
+        Username benwa = Username.of("benwa");
+        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());
     }
 
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 2c8d794..7ab9137 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
@@ -30,6 +30,7 @@ import java.util.List;
 import javax.mail.Flags;
 import javax.mail.util.SharedByteArrayInputStream;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Attachment;
 import org.apache.james.mailbox.model.AttachmentId;
@@ -81,7 +82,7 @@ public abstract class MessageWithAttachmentMapperTest {
         this.messageMapper = mapperProvider.createMessageMapper();
         this.attachmentMapper = mapperProvider.createAttachmentMapper();
 
-        attachmentsMailbox = createMailbox(MailboxPath.forUser("benwa", "Attachments"));
+        attachmentsMailbox = createMailbox(MailboxPath.forUser(Username.of("benwa"), "Attachments"));
 
         Attachment attachment = Attachment.builder()
                 .attachmentId(AttachmentId.from("123"))
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java
deleted file mode 100644
index 1f34d74..0000000
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************
- * 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.store.mail.model;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.apache.james.mailbox.MailboxSession;
-import org.junit.Test;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-public class UsernameTest {
-
-    @Test
-    public void shouldRespectBeanContract() {
-        EqualsVerifier.forClass(Username.class)
-            .verify();
-    }
-
-    @Test
-    public void fromRawValueShouldThrowOnNull() {
-        assertThatThrownBy(() -> Username.fromRawValue(null))
-            .isInstanceOf(NullPointerException.class);
-    }
-
-    @Test
-    public void fromMailboxSessionShouldThrowOnNull() {
-        assertThatThrownBy(() -> Username.fromMailboxSession(null))
-            .isInstanceOf(NullPointerException.class);
-    }
-
-    @Test
-    public void fromMailboxSessionShouldThrowOnNullUser() {
-        MailboxSession mailboxSession = mock(MailboxSession.class);
-        when(mailboxSession.getUser()).thenReturn(null);
-
-        assertThatThrownBy(() -> Username.fromMailboxSession(mailboxSession))
-            .isInstanceOf(NullPointerException.class);
-    }
-
-}
\ No newline at end of file
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
index 97bb334..91aaeb3 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
 
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.Mailbox;
@@ -43,10 +44,11 @@ import com.google.common.collect.Lists;
 
 public class DefaultUserQuotaRootResolverTest {
 
-    private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("benwa", "INBOX");
+    private static final Username BENWA = Username.of("benwa");
+    private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(BENWA, "INBOX");
     public static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, 10);
-    private static final MailboxPath PATH_LIKE = MailboxPath.forUser("benwa", "%");
-    private static final MailboxPath MAILBOX_PATH_2 = MailboxPath.forUser("benwa", "test");
+    private static final MailboxPath PATH_LIKE = MailboxPath.forUser(BENWA, "%");
+    private static final MailboxPath MAILBOX_PATH_2 = MailboxPath.forUser(BENWA, "test");
     private static final Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_2, 10);
     private static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("#private&benwa", Optional.empty());
     private static final MailboxId MAILBOX_ID = TestId.of(42);
@@ -68,12 +70,12 @@ public class DefaultUserQuotaRootResolverTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void getQuotaRootShouldThrowWhenNamespaceContainsSeparator() {
-        testee.getQuotaRoot(new MailboxPath("#pr&ivate", "benwa", "INBOX"));
+        testee.getQuotaRoot(new MailboxPath("#pr&ivate", BENWA, "INBOX"));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void getQuotaRootShouldThrowWhenUserContainsSeparator() {
-        testee.getQuotaRoot(MailboxPath.forUser("ben&wa", "INBOX"));
+        testee.getQuotaRoot(MailboxPath.forUser(Username.of("ben&wa"), "INBOX"));
     }
 
     @Test
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 86d5cc1..81ca0d6 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
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.when;
 
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -41,7 +42,7 @@ import org.junit.Test;
 public class QuotaCheckerTest {
 
     public static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("benwa", Optional.empty());
-    public static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("benwa", "INBOX");
+    public static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(Username.of("benwa"), "INBOX");
     public static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, 10);
 
     private QuotaRootResolver mockedQuotaRootResolver;
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 6447070..0133465 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
@@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageIdManager;
@@ -68,8 +69,8 @@ import com.google.common.collect.ImmutableList;
 public abstract class AbstractMessageSearchIndexTest {
 
     protected static final String INBOX = "INBOX";
-    protected static final String OTHERUSER = "otheruser";
-    protected static final String USERNAME = "benwa";
+    protected static final Username OTHERUSER = Username.of("otheruser");
+    protected static final Username USERNAME = Username.of("benwa");
 
     public static final long LIMIT = 100L;
     public static final boolean RECENT = true;
diff --git a/mailbox/tools/copier/src/main/java/org/apache/james/mailbox/tools/copier/MailboxCopierImpl.java b/mailbox/tools/copier/src/main/java/org/apache/james/mailbox/tools/copier/MailboxCopierImpl.java
index 88adef4..4f04f4b 100644
--- a/mailbox/tools/copier/src/main/java/org/apache/james/mailbox/tools/copier/MailboxCopierImpl.java
+++ b/mailbox/tools/copier/src/main/java/org/apache/james/mailbox/tools/copier/MailboxCopierImpl.java
@@ -27,6 +27,7 @@ import java.util.Set;
 
 import javax.mail.Flags.Flag;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
@@ -72,7 +73,7 @@ public class MailboxCopierImpl implements MailboxCopier {
 
         List<MailboxPath> mailboxPathList = null;
 
-        srcMailboxSession = srcMailboxManager.createSystemSession("manager");
+        srcMailboxSession = srcMailboxManager.createSystemSession(Username.of("manager"));
         srcMailboxManager.startProcessingRequest(srcMailboxSession);
         mailboxPathList = srcMailboxManager.list(srcMailboxSession);
         srcMailboxManager.endProcessingRequest(srcMailboxSession);
diff --git a/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java b/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java
index 54a170d..e51ce03 100644
--- a/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java
+++ b/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
@@ -110,7 +111,7 @@ public class MailboxCopierTest {
      * @throws BadCredentialsException
      */
     private void assertMailboxManagerSize(MailboxManager mailboxManager, int multiplicationFactor) throws BadCredentialsException, MailboxException {
-        MailboxSession mailboxSession = mailboxManager.createSystemSession("manager");
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(Username.of("manager"));
         mailboxManager.startProcessingRequest(mailboxSession);
 
         List<MailboxPath> mailboxPathList = mailboxManager.list(mailboxSession);
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerImpl.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerImpl.java
index f2b57cb..bb08369 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerImpl.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerImpl.java
@@ -103,7 +103,7 @@ public class ReIndexerImpl implements ReIndexer {
     }
 
     private void validateIdExists(MailboxId mailboxId) throws MailboxException {
-        MailboxSession mailboxSession = mailboxManager.createSystemSession("ReIndexingImap");
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(Username.of("ReIndexingImap"));
         mapperFactory.getMailboxMapper(mailboxSession).findMailboxById(mailboxId);
     }
 }
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
index d1a0941..390c557 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
@@ -55,6 +55,7 @@ public class ReIndexerPerformer {
     private static final int NO_LIMIT = 0;
     private static final int SINGLE_MESSAGE = 1;
     private static final String RE_INDEXING = "re-indexing";
+    private static final Username RE_INDEXER_PERFORMER_USER = Username.of(RE_INDEXING);
 
     private final MailboxManager mailboxManager;
     private final ListeningMessageSearchIndex messageSearchIndex;
@@ -71,7 +72,7 @@ public class ReIndexerPerformer {
 
     Task.Result reIndex(MailboxId mailboxId, ReprocessingContext reprocessingContext) throws Exception {
         LOGGER.info("Intend to reindex mailbox with mailboxId {}", mailboxId.serialize());
-        MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXING);
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXER_PERFORMER_USER);
         Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxById(mailboxId);
         messageSearchIndex.deleteAll(mailboxSession, mailboxId);
         try {
@@ -108,7 +109,7 @@ public class ReIndexerPerformer {
     }
 
     Task.Result reIndex(ReprocessingContext reprocessingContext) throws MailboxException {
-        MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXING);
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXER_PERFORMER_USER);
         LOGGER.info("Starting a full reindex");
         Stream<MailboxId> mailboxIds = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).list()
             .stream()
@@ -122,7 +123,7 @@ public class ReIndexerPerformer {
     }
 
     Task.Result reIndex(Username username, ReprocessingContext reprocessingContext) throws MailboxException {
-        MailboxSession mailboxSession = mailboxManager.createSystemSession(username.asString());
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
         LOGGER.info("Starting a reindex for user {}", username.asString());
 
         Stream<MailboxId> mailboxIds = mailboxManager.search(MailboxQuery.privateMailboxesBuilder(mailboxSession).build(), mailboxSession)
@@ -137,7 +138,7 @@ public class ReIndexerPerformer {
     }
 
     Task.Result handleMessageReIndexing(MailboxId mailboxId, MessageUid uid, ReprocessingContext reprocessingContext) throws MailboxException {
-        MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXING);
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXER_PERFORMER_USER);
 
         Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxById(mailboxId);
         return handleMessageReIndexing(mailboxSession, mailbox, uid, reprocessingContext);
@@ -145,7 +146,7 @@ public class ReIndexerPerformer {
 
     Task.Result handleMessageIdReindexing(MessageId messageId) {
         try {
-            MailboxSession session = mailboxManager.createSystemSession("MessageIdReIndexerImpl");
+            MailboxSession session = mailboxManager.createSystemSession(RE_INDEXER_PERFORMER_USER);
 
             return mailboxSessionMapperFactory.getMessageIdMapper(session)
                 .find(ImmutableList.of(messageId), MessageMapper.FetchType.Full)
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java
index a862423..42a3d5d 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java
@@ -30,6 +30,7 @@ import java.time.Duration;
 
 import org.apache.james.backends.cassandra.CassandraCluster;
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
 import org.apache.james.mailbox.cassandra.CassandraMailboxManager;
@@ -51,7 +52,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 import com.google.common.base.Strings;
 
 public class CassandraReIndexerImplTest {
-    private static final String USERNAME = "benwa@apache.org";
+    private static final Username USERNAME = Username.of("benwa@apache.org");
     public static final MailboxPath INBOX = MailboxPath.forUser(USERNAME, "INBOX");
     private CassandraMailboxManager mailboxManager;
     private ListeningMessageSearchIndex messageSearchIndex;
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReIndexerImplTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReIndexerImplTest.java
index 8263a93..3dfe4cb 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReIndexerImplTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReIndexerImplTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
 import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
@@ -41,7 +42,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 public class MessageIdReIndexerImplTest {
-    private static final String USERNAME = "benwa@apache.org";
+    private static final Username USERNAME = Username.of("benwa@apache.org");
     public static final MailboxPath INBOX = MailboxPath.forUser(USERNAME, "INBOX");
 
     private InMemoryMailboxManager mailboxManager;
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
index 07fd1a4..d554aed 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
@@ -48,7 +48,7 @@ import org.mockito.ArgumentCaptor;
 
 public class ReIndexerImplTest {
 
-    private static final String USERNAME = "benwa@apache.org";
+    private static final Username USERNAME = Username.of("benwa@apache.org");
     public static final MailboxPath INBOX = MailboxPath.forUser(USERNAME, "INBOX");
     private InMemoryMailboxManager mailboxManager;
     private ListeningMessageSearchIndex messageSearchIndex;
@@ -126,7 +126,7 @@ public class ReIndexerImplTest {
                 MessageManager.AppendCommand.builder().build("header: value\r\n\r\nbody"),
                 systemSession);
 
-        reIndexer.reIndex(Username.of(USERNAME)).run();
+        reIndexer.reIndex(USERNAME).run();
         ArgumentCaptor<MailboxMessage> messageCaptor = ArgumentCaptor.forClass(MailboxMessage.class);
         ArgumentCaptor<MailboxId> mailboxCaptor1 = ArgumentCaptor.forClass(MailboxId.class);
         ArgumentCaptor<Mailbox> mailboxCaptor2 = ArgumentCaptor.forClass(Mailbox.class);
diff --git a/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java b/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java
index 660a288..9ef11eb 100644
--- a/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java
+++ b/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java
@@ -29,6 +29,7 @@ import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.RetryOneTime;
 import org.apache.curator.test.TestingServer;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxId;
@@ -156,8 +157,9 @@ public class ZooUidProviderTest {
         client.start();
         uuidProvider = new ZooUidProvider(client, retryPolicy);
         longProvider = new ZooUidProvider(client, retryPolicy);
-        MailboxPath path1 = new MailboxPath("namespacetest", "namespaceuser", "UUID");
-        MailboxPath path2 = new MailboxPath("namespacetest", "namespaceuser", "Long");
+        Username namespaceuser = Username.of("namespaceuser");
+        MailboxPath path1 = new MailboxPath("namespacetest", namespaceuser, "UUID");
+        MailboxPath path2 = new MailboxPath("namespacetest", namespaceuser, "Long");
         mailboxUUID = new Mailbox(path1, 1L);
         mailboxUUID.setMailboxId(UUIDId.of(randomUUID));
         mailboxLong = new Mailbox(path2, 2L);
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java
index 15ccec4..d8f0dc6 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java
@@ -36,6 +36,7 @@ import javax.mail.internet.MimeMultipart;
 import javax.mail.internet.ParseException;
 
 import org.apache.james.core.MailAddress;
+import org.apache.james.core.Username;
 import org.apache.james.transport.KeyHolder;
 import org.apache.james.transport.SMIMEAttributeNames;
 import org.apache.james.user.api.UsersRepository;
@@ -584,8 +585,8 @@ public abstract class AbstractSign extends GenericMailet {
             }
         } else {
             // is the reverse-path user different from the SMTP authorized user?
-            String username = getUsername(reversePath);
-            if (!username.equals(authUser)) {
+            Username username = getUsername(reversePath);
+            if (!username.asString().equals(authUser)) { //FIXME-USERNAME
                 LOGGER.info("SMTP logged in as <{}> but pretend to be sender <{}>", authUser, username);
                 return false;
             }
@@ -607,7 +608,7 @@ public abstract class AbstractSign extends GenericMailet {
 
     }
 
-    private String getUsername(MailAddress mailAddress) {
+    private Username getUsername(MailAddress mailAddress) {
         try {
             return usersRepository.getUser(mailAddress);
         } catch (UsersRepositoryException e) {
diff --git a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
index 85904bb..24c8570 100644
--- a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
+++ b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
@@ -30,6 +30,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.Runner;
 import org.apache.james.mpt.api.ImapFeatures;
 import org.apache.james.mpt.api.ImapFeatures.Feature;
@@ -388,7 +389,7 @@ public class MailProtocolTestTask extends Task implements Monitor {
                 final File scriptFile = getScript();
                 final ScriptedUserAdder adder = new ScriptedUserAdder(getHost(), port, MailProtocolTestTask.this);
                 try (Reader reader = newReader(scriptFile)) {
-                    adder.addUser(getUser(), getPasswd(), reader);
+                    adder.addUser(Username.of(getUser()), getPasswd(), reader);
                 }
             } catch (Exception e) {
                 log(e.getMessage(), Project.MSG_ERR);
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
index 70176ff..c514e42 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mpt.api;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.host.ExternalHostSystem;
 
 /**
@@ -44,7 +45,7 @@ public interface HostSystem extends SessionFactory {
      *            user password
      * @throws Exception
      */
-    boolean addUser(String user, String password) throws Exception;
+    boolean addUser(Username user, String password) throws Exception;
 
     /**
      * Creates a new session for functional testing.
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/api/ImapHostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/api/ImapHostSystem.java
index 0ce9b0c..2f6482f 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/api/ImapHostSystem.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/api/ImapHostSystem.java
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.mpt.api;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.model.MailboxACL;
@@ -32,5 +33,5 @@ public interface ImapHostSystem extends HostSystem {
 
     void setQuotaLimits(QuotaCount maxMessageQuota, QuotaSize maxStorageQuota) throws Exception;
 
-    void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception;
+    void grantRights(MailboxPath mailboxPath, Username userName, MailboxACL.Rfc4314Rights rights) throws Exception;
 }
\ No newline at end of file
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java b/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java
index 4311deb..f32a0c6 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java
@@ -19,6 +19,8 @@
 
 package org.apache.james.mpt.api;
 
+import org.apache.james.core.Username;
+
 /**
  * Adds users on demand.
  */
@@ -28,5 +30,5 @@ public interface UserAdder {
      * @param user not null
      * @param password not null
      */
-    void addUser(String user, String password) throws Exception;
+    void addUser(Username user, String password) throws Exception;
 }
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
index 081de7a..0b4e6fe 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
@@ -20,6 +20,7 @@
 package org.apache.james.mpt.host;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.model.MailboxACL;
@@ -82,7 +83,7 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo
     }
     
     @Override
-    public boolean addUser(String user, String password) throws Exception {
+    public boolean addUser(Username user, String password) throws Exception {
         if (userAdder == null) {
             monitor.note("Please ensure user '" + user + "' with password '" + password + "' exists.");
             return false;
@@ -122,7 +123,7 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo
     }
 
     @Override
-    public void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception {
+    public void grantRights(MailboxPath mailboxPath, Username userName, MailboxACL.Rfc4314Rights rights) throws Exception {
         throw new NotImplementedException("Not implemented");
     }
 }
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
index b4569b4..7036061 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.api.Continuation;
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.api.Session;
@@ -42,20 +43,20 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SelfT exten
     
     private static class CreateUser implements PrepareCommand<HostSystem> {
         
-        final String user;
+        final Username username;
         final String password;
 
-        CreateUser(String user, String password) {
-            this.user = user;
+        CreateUser(Username username, String password) {
+            this.username = username;
             this.password = password;
         }
         
         @Override
         public void prepare(HostSystem system) throws Exception {
             try {
-                system.addUser(user, password);
+                system.addUser(username, password);
             } catch (Exception e) {
-                LOGGER.info("User {} already exists", user, e);
+                LOGGER.info("User {} already exists", username, e);
             }
         }
     }
@@ -88,10 +89,14 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SelfT exten
         this.locale = locale;
         return (SelfT) this;
     }
-    
-    @SuppressWarnings("unchecked")
+
     public SelfT withUser(String user, String password) {
-        prepareCommands.add(new CreateUser(user, password));
+        return withUser(Username.of(user), password);
+    }
+
+    @SuppressWarnings("unchecked")
+    public SelfT withUser(Username username, String password) {
+        prepareCommands.add(new CreateUser(username, password));
         return (SelfT) this;
     }
     
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java
index f968a32..5a5f8b3 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/script/ImapScriptedTestProtocol.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mpt.script;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.api.ImapHostSystem;
@@ -42,18 +43,18 @@ public class ImapScriptedTestProtocol extends GenericSimpleScriptedTestProtocol<
     private static class CreateRights implements PrepareCommand<ImapHostSystem> {
 
         final MailboxPath mailboxPath;
-        final String userName;
+        final Username username;
         final MailboxACL.Rfc4314Rights rights;
 
-        public CreateRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) {
+        public CreateRights(MailboxPath mailboxPath, Username username, MailboxACL.Rfc4314Rights rights) {
             this.mailboxPath = mailboxPath;
-            this.userName = userName;
+            this.username = username;
             this.rights = rights;
         }
 
         @Override
         public void prepare(ImapHostSystem system) throws Exception {
-            system.grantRights(mailboxPath, userName, rights);
+            system.grantRights(mailboxPath, username, rights);
         }
     }
 
@@ -66,7 +67,7 @@ public class ImapScriptedTestProtocol extends GenericSimpleScriptedTestProtocol<
         return withPreparedCommand(new CreateMailbox(mailboxPath));
     }
 
-    public ImapScriptedTestProtocol withRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) {
-        return withPreparedCommand(new CreateRights(mailboxPath, userName, rights));
+    public ImapScriptedTestProtocol withRights(MailboxPath mailboxPath, Username username, MailboxACL.Rfc4314Rights rights) {
+        return withPreparedCommand(new CreateRights(mailboxPath, username, rights));
     }
 }
\ No newline at end of file
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
index 51c0485..606a7c8 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
@@ -22,6 +22,7 @@ package org.apache.james.mpt.user;
 import java.io.Reader;
 import java.io.StringReader;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.Runner;
 import org.apache.james.mpt.api.Monitor;
 import org.apache.james.mpt.api.UserAdder;
@@ -48,7 +49,7 @@ public class ScriptedUserAdder implements UserAdder {
     
     /**
      * Constructs an adder without a script.
-     * Note that {@link #addUser(String, String)} will not be available
+     * Note that {@link #addUser(Username, String)} will not be available
      * @param host connect to this host
      * @param port connect to this port
      */
@@ -61,7 +62,7 @@ public class ScriptedUserAdder implements UserAdder {
     }
     
     /**
-     * Note that {@link #addUser(String, String)} will not be available
+     * Note that {@link #addUser(Username, String)} will not be available
      * @param host connect to this host
      * @param port connect to this port
      * @param monitor not null
@@ -85,7 +86,7 @@ public class ScriptedUserAdder implements UserAdder {
      * @throws NullPointerException when script has not been set
      */
     @Override
-    public void addUser(String user, String password) throws Exception {
+    public void addUser(Username user, String password) throws Exception {
         final StringReader reader = new StringReader(script);
         addUser(user, password, reader);
     }
@@ -97,9 +98,9 @@ public class ScriptedUserAdder implements UserAdder {
      * @param reader reader for script, not null
      * @throws Exception upon failure
      */
-    public void addUser(String user, String password, Reader reader) throws Exception {
+    public void addUser(Username user, String password, Reader reader) throws Exception {
         final ProtocolSessionBuilder builder = new ProtocolSessionBuilder();
-        builder.setVariable(USER_VARIABLE_NAME, user);
+        builder.setVariable(USER_VARIABLE_NAME, user.asString());
         builder.setVariable(PASSWORD_VARIABLE_NAME, password);
         
         final Runner runner = new Runner();
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java b/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
index 8705a6b..72360dd 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.api.Continuation;
 import org.apache.james.mpt.api.ImapFeatures;
 import org.apache.james.mpt.api.ImapFeatures.Feature;
@@ -39,7 +40,7 @@ import org.junit.Test;
 
 public class TestExternalHostSystem {
     
-    private static final String USER = "USER NAME";
+    private static final Username USER = Username.of("USERNAME");
 
     private static final String PASSWORD = "SOME PASSWORD";
 
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java b/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
index eb1373c..75528fc 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
@@ -21,6 +21,7 @@ package org.apache.james.mpt;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.user.ScriptedUserAdder;
 import org.junit.After;
 import org.junit.Before;
@@ -47,7 +48,7 @@ public class TestScriptedUserAdder {
     @Test
     public void testShouldExecuteScriptAgainstPort() throws Exception {
         ScriptedUserAdder adder = new ScriptedUserAdder("localhost", protocol.getPort(), "C: USER='${user}' password='${password}'");
-        adder.addUser("A User", "Some Password");
+        adder.addUser(Username.of("A User"), "Some Password");
         assertThat(record.complete()).isEqualTo("USER='A User' password='Some Password'\r\n");
     }
 }
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
index 3398559..1f5a3b9 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
@@ -25,6 +25,7 @@ import org.apache.commons.configuration2.plist.PropertyListConfiguration;
 import org.apache.commons.configuration2.tree.ImmutableNode;
 import org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator;
 import org.apache.james.adapter.mailbox.store.UserRepositoryAuthorizator;
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapConfiguration;
 import org.apache.james.imap.api.process.ImapProcessor;
 import org.apache.james.imap.decode.ImapDecoder;
@@ -80,7 +81,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights
     }
 
     @Override
-    public boolean addUser(String user, String password) throws Exception {
+    public boolean addUser(Username user, String password) throws Exception {
         memoryUsersRepository.addUser(user, password);
         return true;
     }
@@ -106,16 +107,16 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights
     }
 
     @Override
-    public void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception {
+    public void grantRights(MailboxPath mailboxPath, Username username, MailboxACL.Rfc4314Rights rights) throws Exception {
         MailboxManager mailboxManager = getMailboxManager();
         MailboxSession mailboxSession = mailboxManager.createSystemSession(mailboxPath.getUser());
         mailboxManager.startProcessingRequest(mailboxSession);
         mailboxManager.setRights(mailboxPath,
             MailboxACL.EMPTY.apply(MailboxACL.command()
-                .forUser(userName)
+                .forUser(username)
                 .rights(rights)
                 .asAddition()),
-            mailboxManager.createSystemSession(userName));
+            mailboxManager.createSystemSession(username));
         mailboxManager.logout(mailboxSession, true);
         mailboxManager.endProcessingRequest(mailboxSession);
     }
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/GrantRightsOnHost.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/GrantRightsOnHost.java
index 5ae7b14..46a729f 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/GrantRightsOnHost.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/GrantRightsOnHost.java
@@ -19,11 +19,12 @@
 
 package org.apache.james.mpt.imapmailbox;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxPath;
 
 public interface GrantRightsOnHost {
 
-    void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception;
+    void grantRights(MailboxPath mailboxPath, Username userName, MailboxACL.Rfc4314Rights rights) throws Exception;
 
 }
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/ImapTestConstants.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/ImapTestConstants.java
index da20795..ad4c600 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/ImapTestConstants.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/ImapTestConstants.java
@@ -19,6 +19,8 @@
 
 package org.apache.james.mpt.imapmailbox;
 
+import org.apache.james.core.Username;
+
 /**
  * Some constants to use when running Imap tests.
  */
@@ -27,7 +29,7 @@ public interface ImapTestConstants {
 
     String HOST = "localhost";
 
-    String USER = "imapuser";
+    Username USER = Username.of("imapuser");
 
     String PASSWORD = "password";
 
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 a597742..df03477 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
@@ -21,6 +21,7 @@ package org.apache.james.mpt.imapmailbox.suite;
 
 import java.util.Locale;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.api.ImapHostSystem;
@@ -32,7 +33,7 @@ import org.junit.Test;
 
 public abstract class ACLCommands implements ImapTestConstants {
     
-    public static final String OTHER_USER_NAME = "Boby";
+    public static final Username OTHER_USER_NAME = Username.of("Boby");
     public static final String OTHER_USER_PASSWORD = "password";
     public static final MailboxPath OTHER_USER_MAILBOX = MailboxPath.forUser(OTHER_USER_NAME, "");
 
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 c108a82..114be87 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
@@ -21,6 +21,7 @@ package org.apache.james.mpt.imapmailbox.suite;
 
 import java.util.Locale;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.api.ImapHostSystem;
@@ -31,7 +32,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public abstract class ACLIntegration implements ImapTestConstants {
-    public static final String OTHER_USER_NAME = "Boby";
+    public static final Username OTHER_USER_NAME = Username.of("Boby");
     public static final String OTHER_USER_PASSWORD = "password";
     public static final MailboxPath OTHER_USER_MAILBOX = MailboxPath.forUser(OTHER_USER_NAME, "");
     public static final MailboxPath MY_INBOX = MailboxPath.forUser(USER, "");
@@ -104,7 +105,7 @@ public abstract class ACLIntegration implements ImapTestConstants {
     @Test
     public void rightXOnOriginShouldBeSufficientToRenameAMailboxUS() throws Exception {
         scriptedTestProtocol
-            .withMailbox(MailboxPath.forUser("Boby","test"))
+            .withMailbox(MailboxPath.forUser(OTHER_USER_NAME,"test"))
             .withGrantRights(MailboxPath.forUser(OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x"))
             .run("aclIntegration/ACLIntegrationRightX");
     }
@@ -112,7 +113,7 @@ public abstract class ACLIntegration implements ImapTestConstants {
     @Test
     public void rightXOnOriginShouldBeNeededToRenameAMailboxUS() throws Exception {
         scriptedTestProtocol
-            .withMailbox(MailboxPath.forUser("Boby","test"))
+            .withMailbox(MailboxPath.forUser(OTHER_USER_NAME,"test"))
             .withGrantRights(MailboxPath.forUser(OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("rswipktela"))
             .run("aclIntegration/ACLIntegrationWithoutRightX");
     }
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLScriptedTestProtocol.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLScriptedTestProtocol.java
index 137cecf..ac863dd 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLScriptedTestProtocol.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLScriptedTestProtocol.java
@@ -2,6 +2,7 @@ package org.apache.james.mpt.imapmailbox.suite;
 
 import java.util.Locale;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.api.HostSystem;
@@ -16,19 +17,19 @@ public class ACLScriptedTestProtocol extends ImapScriptedTestProtocol {
     private static class GrantRightsCommand implements SimpleScriptedTestProtocol.PrepareCommand<HostSystem> {
         GrantRightsOnHost grantRightsOnHost;
         MailboxPath mailboxPath;
-        String userName;
+        Username username;
         MailboxACL.Rfc4314Rights rights;
 
-        GrantRightsCommand(GrantRightsOnHost grantRightsOnHost, MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) {
+        GrantRightsCommand(GrantRightsOnHost grantRightsOnHost, MailboxPath mailboxPath, Username username, MailboxACL.Rfc4314Rights rights) {
             this.grantRightsOnHost = grantRightsOnHost;
             this.mailboxPath = mailboxPath;
-            this.userName = userName;
+            this.username = username;
             this.rights = rights;
         }
 
         @Override
         public void prepare(HostSystem system) throws Exception {
-            grantRightsOnHost.grantRights(mailboxPath, userName, rights);
+            grantRightsOnHost.grantRights(mailboxPath, username, rights);
         }
     }
     
@@ -56,8 +57,8 @@ public class ACLScriptedTestProtocol extends ImapScriptedTestProtocol {
         this.mailboxMessageAppender = mailboxMessageAppender;
     }
 
-    public ACLScriptedTestProtocol withGrantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) {
-        return (ACLScriptedTestProtocol) withPreparedCommand(new GrantRightsCommand(grantRightsOnHost, mailboxPath, userName, rights));
+    public ACLScriptedTestProtocol withGrantRights(MailboxPath mailboxPath, Username username, MailboxACL.Rfc4314Rights rights) {
+        return (ACLScriptedTestProtocol) withPreparedCommand(new GrantRightsCommand(grantRightsOnHost, mailboxPath, username, rights));
     }
     
     public ACLScriptedTestProtocol withFilledMailbox(MailboxPath otherUserMailbox) {
@@ -68,6 +69,11 @@ public class ACLScriptedTestProtocol extends ImapScriptedTestProtocol {
     public ACLScriptedTestProtocol withUser(String user, String password) {
         return (ACLScriptedTestProtocol) super.withUser(user, password);
     }
+
+    @Override
+    public ACLScriptedTestProtocol withUser(Username user, String password) {
+        return (ACLScriptedTestProtocol) super.withUser(user, password);
+    }
     
     @Override
     public ACLScriptedTestProtocol withLocale(Locale locale) {
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 3729ca1..0ca8d11 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,6 +21,7 @@ package org.apache.james.mpt.imapmailbox.suite;
 
 import java.util.Locale;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.api.ImapHostSystem;
 import org.apache.james.mpt.imapmailbox.ImapTestConstants;
@@ -42,8 +43,8 @@ public abstract class AuthenticatePlain implements ImapTestConstants {
         simpleScriptedTestProtocol = new ImapScriptedTestProtocol("/org/apache/james/imap/scripts/", system)
                 .withUser(USER, PASSWORD)
                 .withUser("delegate", "123456")
-                .withMailbox(MailboxPath.forUser("delegate", "delegate"))
-                .withMailbox(MailboxPath.forUser("imapuser", "imapuser"));
+                .withMailbox(MailboxPath.forUser(Username.of("delegate"), "delegate"))
+                .withMailbox(MailboxPath.forUser(Username.of("imapuser"), "imapuser"));
         BasicImapCommands.welcome(simpleScriptedTestProtocol);
     }
     
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 d2b2f2b..b11fd73 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
@@ -21,6 +21,7 @@ package org.apache.james.mpt.imapmailbox.suite;
 
 import java.util.Locale;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.api.ImapFeatures.Feature;
 import org.apache.james.mpt.api.ImapHostSystem;
@@ -31,7 +32,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 public abstract class AuthenticatedState extends BasicImapCommands {
-    
+    private static final Username USER_2 = Username.of("imapuser2");
+
     protected abstract ImapHostSystem createImapHostSystem();
     
     private ImapHostSystem system;
@@ -436,13 +438,13 @@ public abstract class AuthenticatedState extends BasicImapCommands {
 
     @Test
     public void listShouldNotListMailboxWithOtherUserUS() throws Exception {
-        system.createMailbox(MailboxPath.forUser(USER + "2", "Other"));
+        system.createMailbox(MailboxPath.forUser(USER_2, "Other"));
         simpleScriptedTestProtocol.run("ListMailboxes");
     }
 
     @Test
     public void listShouldNotListMailboxWithOtherUserITALY() throws Exception {
-        system.createMailbox(MailboxPath.forUser(USER + "2", "Other"));
+        system.createMailbox(MailboxPath.forUser(USER_2, "Other"));
         simpleScriptedTestProtocol
             .withLocale(Locale.ITALY)
             .run("ListMailboxes");
@@ -450,7 +452,7 @@ public abstract class AuthenticatedState extends BasicImapCommands {
 
     @Test
     public void listShouldNotListMailboxWithOtherUserKOREA() throws Exception {
-        system.createMailbox(MailboxPath.forUser(USER + "2", "Other"));
+        system.createMailbox(MailboxPath.forUser(USER_2, "Other"));
         simpleScriptedTestProtocol
             .withLocale(Locale.KOREA)
             .run("ListMailboxes");
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java
index 12f9f1d..08a746e 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java
@@ -21,6 +21,7 @@ package org.apache.james.mpt.imapmailbox.suite;
 
 import java.util.Locale;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.api.ImapHostSystem;
@@ -31,7 +32,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public abstract class ListingWithSharingTest implements ImapTestConstants {
-    public static final String OTHER_USER_NAME = "Boby";
+    public static final Username OTHER_USER_NAME = Username.of("Boby");
     public static final String OTHER_USER_PASSWORD = "password";
     public static final MailboxPath OTHER_USER_SHARED_MAILBOX = MailboxPath.forUser(OTHER_USER_NAME, "sharedMailbox");
     public static final MailboxPath OTHER_USER_SHARED_MAILBOX_CHILD = MailboxPath.forUser(OTHER_USER_NAME, "sharedMailbox.child");
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
index 5f48067..0590606 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
@@ -32,7 +32,7 @@ public class BasicImapCommands implements ImapTestConstants {
     }
     
     public static void authenticate(GenericSimpleScriptedTestProtocol<?, ?> scriptedTestProtocol) {
-        addLogin(scriptedTestProtocol.preElements(), USER, PASSWORD);
+        addLogin(scriptedTestProtocol.preElements(), USER.asString(), PASSWORD);
     }
 
 
diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java
index 1ff7819..c644e30 100644
--- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java
+++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusHostSystem.java
@@ -22,6 +22,7 @@ import java.net.InetSocketAddress;
 import java.util.function.Supplier;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.model.MailboxPath;
@@ -64,12 +65,12 @@ public class CyrusHostSystem extends ExternalHostSystem implements Provider<Cont
     }
     
     @Override
-    public boolean addUser(String user, String password) throws Exception {
+    public boolean addUser(Username user, String password) throws Exception {
         return super.addUser(user, password) && createUserInbox(user);
     }
 
-    private boolean createUserInbox(String user) {
-        createMailbox(MailboxPath.forUser(user, ""));
+    private boolean createUserInbox(Username username) {
+        createMailbox(MailboxPath.forUser(username, ""));
         return true;
     }
     
diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusUserAdder.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusUserAdder.java
index fc2eb0b..da937d1 100644
--- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusUserAdder.java
+++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/CyrusUserAdder.java
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.mpt.imapmailbox.cyrus.host;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.api.UserAdder;
 
 import com.google.inject.Inject;
@@ -38,7 +39,7 @@ public class CyrusUserAdder implements UserAdder {
     }
 
     @Override
-    public void addUser(String user, String password) throws Exception {
-        this.docker.createUser(container.get(), user, password);
+    public void addUser(Username user, String password) throws Exception {
+        this.docker.createUser(container.get(), user.asString(), password);
     }
 }
\ No newline at end of file
diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java
index e49a89b..a6f56c8 100644
--- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java
+++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/GrantRightsOnCyrusHost.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mpt.imapmailbox.cyrus.host;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.imapmailbox.GrantRightsOnHost;
@@ -37,11 +38,11 @@ public class GrantRightsOnCyrusHost implements GrantRightsOnHost {
     }
 
     @Override
-    public void grantRights(MailboxPath mailboxPath, String userName, MailboxACL.Rfc4314Rights rights) throws Exception {
+    public void grantRights(MailboxPath mailboxPath, Username username, MailboxACL.Rfc4314Rights rights) throws Exception {
         ProtocolSession protocolSession = system.logAndGetAdminProtocolSession(new ProtocolSession());
         protocolSession.cl(String.format("A1 SETACL %s %s %s",
             system.createMailboxStringFromMailboxPath(mailboxPath),
-            userName,
+            username.asString(),
             rights.serialize()));
         protocolSession.sl("A1 OK .*", GRANT_RIGHTS_LOCATION);
         system.executeProtocolSession(system.logoutAndGetProtocolSession(protocolSession));
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerDeploymentValidationGuiceJPATest.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerDeploymentValidationGuiceJPATest.java
index c9e74c7..268f8db 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerDeploymentValidationGuiceJPATest.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerDeploymentValidationGuiceJPATest.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mpt.imapmailbox.external.james;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.api.ImapHostSystem;
 import org.apache.james.mpt.imapmailbox.external.james.host.ProvisioningAPI;
 import org.apache.james.mpt.imapmailbox.external.james.host.SmtpHostSystem;
@@ -50,7 +51,7 @@ public class DockerDeploymentValidationGuiceJPATest extends DeploymentValidation
         ProvisioningAPI provisioningAPI = dockerJamesRule.cliJarDomainsAndUsersAdder();
         Injector injector = Guice.createInjector(new ExternalJamesModule(getConfiguration(), provisioningAPI));
         provisioningAPI.addDomain(DOMAIN);
-        provisioningAPI.addUser(USER_ADDRESS, PASSWORD);
+        provisioningAPI.addUser(Username.of(USER_ADDRESS), PASSWORD);
         system = injector.getInstance(ImapHostSystem.class);
         smtpHostSystem = injector.getInstance(SmtpHostSystem.class);
         system.beforeTest();
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerDeploymentValidationSpringJPATest.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerDeploymentValidationSpringJPATest.java
index d99e546..a40e763 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerDeploymentValidationSpringJPATest.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerDeploymentValidationSpringJPATest.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.mpt.imapmailbox.external.james;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.api.ImapHostSystem;
 import org.apache.james.mpt.imapmailbox.external.james.host.ProvisioningAPI;
 import org.apache.james.mpt.imapmailbox.external.james.host.SmtpHostSystem;
@@ -51,7 +52,7 @@ public class DockerDeploymentValidationSpringJPATest extends DeploymentValidatio
         Injector injector = Guice.createInjector(new ExternalJamesModule(getConfiguration(), provisioningAPI));
         system = injector.getInstance(ImapHostSystem.class);
         provisioningAPI.addDomain(DOMAIN);
-        provisioningAPI.addUser(USER_ADDRESS, PASSWORD);
+        provisioningAPI.addUser(Username.of(USER_ADDRESS), PASSWORD);
         smtpHostSystem = injector.getInstance(SmtpHostSystem.class);
         system.beforeTest();
 
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/docker/CliProvisioningAPI.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/docker/CliProvisioningAPI.java
index 2817fe8..f64f0f4 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/docker/CliProvisioningAPI.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/docker/CliProvisioningAPI.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mpt.imapmailbox.external.james.ProvisioningException;
 import org.apache.james.mpt.imapmailbox.external.james.host.ProvisioningAPI;
 import org.apache.james.util.docker.DockerContainer;
@@ -66,8 +67,8 @@ public class CliProvisioningAPI implements ProvisioningAPI {
     }
 
     @Override
-    public void addUser(String user, String password) throws Exception {
-        Container.ExecResult execResult = exec("adduser", user, password);
+    public void addUser(Username user, String password) throws Exception {
+        Container.ExecResult execResult = exec("adduser", user.asString(), password);
 
         if (execResult.getExitCode() != 0) {
             throw new ProvisioningException("Failed to add user" + executionResultToString(execResult));
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/external/ExternalJamesImapHostSystem.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/external/ExternalJamesImapHostSystem.java
index 6f9c4c7..10c6bf9 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/external/ExternalJamesImapHostSystem.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/external/ExternalJamesImapHostSystem.java
@@ -22,6 +22,7 @@ import java.net.InetSocketAddress;
 import java.util.function.Supplier;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.model.MailboxPath;
@@ -53,7 +54,7 @@ public class ExternalJamesImapHostSystem extends ExternalHostSystem {
     }
     
     @Override
-    public boolean addUser(String user, String password) throws Exception {
+    public boolean addUser(Username user, String password) throws Exception {
         return super.addUser(user, password);
     }
     
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/external/NoopDomainsAndUserAdder.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/external/NoopDomainsAndUserAdder.java
index 38fdfad..1654a7d 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/external/NoopDomainsAndUserAdder.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/external/NoopDomainsAndUserAdder.java
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.mpt.imapmailbox.external.james.host.external;
 
+import org.apache.james.core.Username;
 import org.apache.james.mpt.imapmailbox.external.james.host.ProvisioningAPI;
 
 public class NoopDomainsAndUserAdder implements ProvisioningAPI {
@@ -27,7 +28,7 @@ public class NoopDomainsAndUserAdder implements ProvisioningAPI {
     }
 
     @Override
-    public void addUser(String user, String password) throws Exception {
+    public void addUser(Username user, String password) throws Exception {
         // User should already be configured
         // We do not throw an exception in order to use BaseImapProtocol based tests
     }
diff --git a/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/JamesManageSieveHostSystem.java b/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/JamesManageSieveHostSystem.java
index 857bf99..202fa0c 100644
--- a/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/JamesManageSieveHostSystem.java
+++ b/mpt/impl/managesieve/core/src/main/java/org/apache/james/mpt/host/JamesManageSieveHostSystem.java
@@ -53,8 +53,8 @@ public abstract class JamesManageSieveHostSystem implements ManageSieveHostSyste
     protected abstract UsersRepository createUsersRepository();
 
     @Override
-    public boolean addUser(String user, String password) throws Exception {
-        usersRepository.addUser(user, password);
+    public boolean addUser(Username username, String password) throws Exception {
+        usersRepository.addUser(username, password);
         return true;
     }
 
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpTestRule.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpTestRule.java
index 245ee74..9162099 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpTestRule.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpTestRule.java
@@ -82,11 +82,11 @@ public class SmtpTestRule implements TestRule, SmtpHostSystem {
     }
 
     @Override
-    public boolean addUser(String userAtDomain, String password) throws Exception {
-        Optional<Domain> domain = Username.of(userAtDomain).getDomainPart();
+    public boolean addUser(Username userAtDomain, String password) throws Exception {
+        Optional<Domain> domain = userAtDomain.getDomainPart();
         Preconditions.checkArgument(domain.isPresent(), "The 'user' should contain the 'domain'");
         createDomainIfNeeded(domain.get().asString());
-        jamesServer.getProbe(DataProbeImpl.class).addUser(userAtDomain, password);
+        jamesServer.getProbe(DataProbeImpl.class).addUser(userAtDomain.asString(), password);
         return true;
     }
 
diff --git a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/AddUser.java b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/AddUser.java
index e8c2e2c..05e02ac 100644
--- a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/AddUser.java
+++ b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/AddUser.java
@@ -22,6 +22,7 @@ package org.apache.james.mpt.maven;
 import java.io.File;
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.util.Port;
 
 
@@ -31,7 +32,7 @@ import org.apache.james.util.Port;
 public class AddUser {
     
     private Optional<Port> port = Optional.empty();
-    private String user;
+    private Username user;
     private String passwd;
     private String scriptText;
     private String host;
@@ -89,7 +90,7 @@ public class AddUser {
      * Gets the name of the user to be created.
      * @return user name, not null
      */
-    public String getUser() {
+    public Username getUser() {
         return user;
     }
 
@@ -97,7 +98,7 @@ public class AddUser {
      * Sets the name of the user to be created.
      * @param user not null
      */
-    public void setUser(String user) {
+    public void setUser(Username user) {
         this.user = user;
     }
     
diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml
index 3349126..e1b8b49 100644
--- a/protocols/api/pom.xml
+++ b/protocols/api/pom.xml
@@ -35,6 +35,10 @@
     <dependencies>
         <dependency>
             <groupId>${james.groupId}</groupId>
+            <artifactId>james-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${james.groupId}</groupId>
             <artifactId>testing-base</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
index fbcb830..0937b4b 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
@@ -23,6 +23,7 @@ import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
 import java.util.Map;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.handler.LineHandler;
 
 /**
@@ -116,14 +117,14 @@ public interface ProtocolSession {
      *
      * @return the user name
      */
-    String getUser();
+    Username getUsername();
 
     /**
      * Sets the user name associated with this interaction.
      *
-     * @param user the user name
+     * @param username the user name
      */
-    void setUser(String user);
+    void setUsername(Username username);
 
     /**
      * Return true if StartTLS is supported by the configuration
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
index 8f32966..266aeba 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
@@ -24,6 +24,7 @@ import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.handler.LineHandler;
 
 /**
@@ -35,7 +36,7 @@ public class ProtocolSessionImpl implements ProtocolSession {
     private final ProtocolTransport transport;
     private final Map<String, Object> connectionState;
     private final Map<String, Object> sessionState;
-    private String user;
+    private Username username;
     protected final ProtocolConfiguration config;
     private static final Charset CHARSET = Charset.forName("US-ASCII");
     private static final String DELIMITER = "\r\n";
@@ -58,13 +59,13 @@ public class ProtocolSessionImpl implements ProtocolSession {
     }
 
     @Override
-    public String getUser() {
-        return user;
+    public Username getUsername() {
+        return username;
     }
 
     @Override
-    public void setUser(String user) {
-        this.user = user;
+    public void setUsername(Username username) {
+        this.username = username;
     }
 
     /**
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
index 6d4e25a..532eb49 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
@@ -21,6 +21,7 @@ package org.apache.james.imap.api;
 
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.process.ImapSession;
 import org.apache.james.mailbox.MailboxSession;
 
@@ -36,10 +37,10 @@ public class ImapSessionUtils {
         return (MailboxSession) session.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY);
     }
 
-    public static String getUserName(ImapSession imapSession) {
+    public static Username getUserName(ImapSession imapSession) {
         Preconditions.checkNotNull(imapSession);
         return Optional.ofNullable(getMailboxSession(imapSession))
-            .map(mailboxSession -> mailboxSession.getUser().asString())
+            .map(mailboxSession -> mailboxSession.getUser())
             .orElse(null);
     }
 }
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/main/PathConverter.java b/protocols/imap/src/main/java/org/apache/james/imap/main/PathConverter.java
index e7d5ff6..8f97bd7 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/main/PathConverter.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/main/PathConverter.java
@@ -21,6 +21,7 @@ package org.apache.james.imap.main;
 
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapSessionUtils;
 import org.apache.james.imap.api.process.ImapSession;
 import org.apache.james.mailbox.model.MailboxConstants;
@@ -74,14 +75,14 @@ public class PathConverter {
         return buildMailboxPath(namespace, retrieveUserName(namespace), mailboxName);
     }
 
-    private String retrieveUserName(String namespace) {
+    private Username retrieveUserName(String namespace) {
         if (namespace.equals(MailboxConstants.USER_NAMESPACE)) {
             return ImapSessionUtils.getUserName(session);
         }
         throw new DeniedAccessOnSharedMailboxException();
     }
 
-    private MailboxPath buildMailboxPath(String namespace, String user, String mailboxName) {
+    private MailboxPath buildMailboxPath(String namespace, Username user, String mailboxName) {
         if (!namespace.equals(MailboxConstants.USER_NAMESPACE)) {
             throw new DeniedAccessOnSharedMailboxException();
         }
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
index 7d8ba6a..77416a8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
@@ -20,6 +20,7 @@ package org.apache.james.imap.processor;
 
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapSessionUtils;
 import org.apache.james.imap.api.display.HumanReadableText;
 import org.apache.james.imap.api.message.request.ImapRequest;
@@ -67,7 +68,7 @@ public abstract class AbstractAuthProcessor<R extends ImapRequest> extends Abstr
             if (!authFailure) {
                 final MailboxManager mailboxManager = getMailboxManager();
                 try {
-                    final MailboxSession mailboxSession = mailboxManager.login(authenticationAttempt.getAuthenticationId(),
+                    final MailboxSession mailboxSession = mailboxManager.login(Username.of(authenticationAttempt.getAuthenticationId()),
                         authenticationAttempt.getPassword());
                     session.authenticated();
                     session.setAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY, mailboxSession);
@@ -96,9 +97,9 @@ public abstract class AbstractAuthProcessor<R extends ImapRequest> extends Abstr
             if (!authFailure) {
                 final MailboxManager mailboxManager = getMailboxManager();
                 try {
-                    final MailboxSession mailboxSession = mailboxManager.loginAsOtherUser(authenticationAttempt.getAuthenticationId(),
+                    final MailboxSession mailboxSession = mailboxManager.loginAsOtherUser(Username.of(authenticationAttempt.getAuthenticationId()),
                         authenticationAttempt.getPassword(),
-                        authenticationAttempt.getDelegateUserName().get());
+                        Username.of(authenticationAttempt.getDelegateUserName().get()));
                     session.authenticated();
                     session.setAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY, mailboxSession);
                     provisionInbox(session, mailboxManager, mailboxSession);
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
index f4d1479..712925e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
@@ -369,7 +369,7 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab
             if (sb.length() > 0) {
                 sb.append(delimiter);
             }
-            sb.append(mailboxPath.getUser());
+            sb.append(mailboxPath.getUser().asString());
         }
         if (mailboxPath.getName() != null && !mailboxPath.getName().equals("")) {
             if (sb.length() > 0) {
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 59999ba..57a82eb 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
@@ -22,6 +22,7 @@ package org.apache.james.imap.api;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.encode.FakeImapSession;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSessionUtil;
@@ -29,7 +30,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class ImapSessionUtilsTest {
-    private static final String USERNAME = "username";
+    private static final Username USERNAME = Username.of("username");
     private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USERNAME);
     private FakeImapSession fakeImapSession;
 
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 526cf28..a7a8e04 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
@@ -30,6 +30,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapSessionUtils;
 import org.apache.james.imap.api.process.ImapSession;
@@ -52,7 +53,7 @@ public class CreateCommandParserTest {
     @Before
     public void setUp() throws Exception {
         mockImapSession = mock(ImapSession.class);
-        mailboxSession = MailboxSessionUtil.create("userName");
+        mailboxSession = MailboxSessionUtil.create(Username.of("userName"));
 
         when(mockImapSession.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY)).thenReturn(mailboxSession);
 
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 6395098..657722f 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
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapSessionUtils;
 import org.apache.james.imap.api.process.ImapSession;
 import org.apache.james.mailbox.MailboxSession;
@@ -36,7 +37,7 @@ import org.junit.rules.ExpectedException;
 
 public class PathConverterTest {
 
-    private static final String USERNAME = "username";
+    private static final Username USERNAME = Username.of("username");
     private static final char PATH_DELIMITER = '.';
 
     private ImapSession imapSession;
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 d9714a8..c4ff836 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
@@ -76,7 +76,7 @@ public class CopyProcessorTest {
         mockStatusResponseFactory = mock(StatusResponseFactory.class);
         mockResponder = mock(ImapProcessor.Responder.class);
         mockImapSession = mock(ImapSession.class);
-        mailboxSession = MailboxSessionUtil.create(USERNAME.asString());
+        mailboxSession = MailboxSessionUtil.create(USERNAME);
 
         testee = new CopyProcessor(mockNextProcessor, mockMailboxManager, mockStatusResponseFactory, new NoopMetricFactory());
     }
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 84c637e..d43a94b 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
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapSessionState;
@@ -61,7 +62,7 @@ import org.mockito.ArgumentCaptor;
 public class DeleteACLProcessorTest {
 
     private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME;
-    private static final String USER_1 = "user1";
+    private static final Username USER_1 = Username.of("user1");
 
     private ImapSession imapSession;
     private MailboxManager mailboxManager;
@@ -99,9 +100,9 @@ public class DeleteACLProcessorTest {
         deleteACLRequest = new DeleteACLRequest(TAG,
             ImapCommand.anyStateCommand("Name"),
             MAILBOX_NAME,
-            USER_1);
+            USER_1.asString());
 
-        user1Key = EntryKey.deserialize(USER_1);
+        user1Key = EntryKey.deserialize(USER_1.asString());
 
         argumentCaptor = ArgumentCaptor.forClass(ImapResponseMessage.class);
     }
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 381b18d..4f5a58e 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
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapSessionState;
@@ -61,7 +62,7 @@ import org.mockito.ArgumentCaptor;
 public class GetACLProcessorTest {
 
     private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME;
-    private static final String USER_1 = "user1";
+    private static final Username USER_1 = Username.of("user1");
 
     private ImapSession imapSession;
     private MailboxManager mailboxManager;
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 8e5e7e0..5061360 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
@@ -33,6 +33,7 @@ import static org.mockito.Mockito.when;
 import java.util.Optional;
 import java.util.Set;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapSessionState;
@@ -104,7 +105,7 @@ public class GetAnnotationProcessorTest {
         mockResponder = mock(ImapProcessor.Responder.class);
         mockImapSession = mock(ImapSession.class);
 
-        mailboxSession = MailboxSessionUtil.create("username");
+        mailboxSession = MailboxSessionUtil.create(Username.of("username"));
         inbox = MailboxPath.inbox(mailboxSession);
         keys = ImmutableSet.of(PRIVATE_KEY);
         annotationRequestBuilder = GetAnnotationRequest.builder()
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 5c76ef7..46ff00c 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
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.when;
 
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.imap.api.ImapCommand;
@@ -62,7 +63,8 @@ import com.google.common.collect.ImmutableList;
 public class GetQuotaProcessorTest {
 
     private static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("plop", Optional.empty());
-    private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", "plop", "INBOX");
+    private static final Username PLOP = Username.of("plop");
+    private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", PLOP, "INBOX");
     private static final Quota<QuotaCount> MESSAGE_QUOTA =
         Quota.<QuotaCount>builder().used(QuotaCount.count(24)).computedLimit(QuotaCount.count(1589)).build();
     private static final Quota<QuotaSize> STORAGE_QUOTA =
@@ -79,7 +81,7 @@ public class GetQuotaProcessorTest {
 
     @Before
     public void setUp() throws Exception {
-        mailboxSession = MailboxSessionUtil.create("plop");
+        mailboxSession = MailboxSessionUtil.create(PLOP);
         UnpooledStatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory();
         mockedImapSession = mock(ImapSession.class);
         mockedQuotaManager = mock(QuotaManager.class);
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 4510fa6..4ac151d 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
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
 import java.util.List;
 import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.imap.api.ImapCommand;
@@ -62,7 +63,8 @@ import org.mockito.ArgumentCaptor;
 public class GetQuotaRootProcessorTest {
 
     private static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("plop", Optional.empty());
-    private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("plop", "INBOX");
+    private static final Username PLOP = Username.of("plop");
+    private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(PLOP, "INBOX");
     private static final Quota<QuotaCount> MESSAGE_QUOTA =
         Quota.<QuotaCount>builder().used(QuotaCount.count(24)).computedLimit(QuotaCount.count(1589)).build();
     private static final Quota<QuotaSize> STORAGE_QUOTA =
@@ -78,7 +80,7 @@ public class GetQuotaRootProcessorTest {
 
     @Before
     public void setUp() {
-        mailboxSession = MailboxSessionUtil.create("plop");
+        mailboxSession = MailboxSessionUtil.create(PLOP);
         UnpooledStatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory();
         mockedImapSession = mock(ImapSession.class);
         mockedQuotaManager = mock(QuotaManager.class);
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 f6b0243..75c6424 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
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.when;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapSessionUtils;
 import org.apache.james.imap.api.display.HumanReadableText;
@@ -68,7 +69,7 @@ public class LSubProcessorTest {
 
     private static final String MAILBOX_A = "A.MAILBOX";
 
-    public static final String USER = "test";
+    public static final Username USER = Username.of("test");
 
     LSubProcessor processor;
     ImapProcessor next;
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 375256a..43a80c2 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
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapSessionState;
@@ -62,7 +63,7 @@ import org.mockito.ArgumentCaptor;
 public class ListRightsProcessorTest {
 
     private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME;
-    private static final String USER_1 = "user1";
+    private static final Username USER_1 = Username.of("user1");
 
     private ImapSession imapSession;
     private MailboxManager mailboxManager;
@@ -99,9 +100,9 @@ public class ListRightsProcessorTest {
         when(mailboxManager.getMailbox(any(MailboxPath.class), any(MailboxSession.class)))
             .thenReturn(messageManager);
 
-        listRightsRequest = new ListRightsRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1);
+        listRightsRequest = new ListRightsRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1.asString());
 
-        user1Key = EntryKey.deserialize(USER_1);
+        user1Key = EntryKey.deserialize(USER_1.asString());
         listRights = new Rfc4314Rights[] {Rfc4314Rights.fromSerializedRfc4314Rights("ae"), Rfc4314Rights.fromSerializedRfc4314Rights("i"), Rfc4314Rights.fromSerializedRfc4314Rights("k")};
     }
     
@@ -171,7 +172,7 @@ public class ListRightsProcessorTest {
 
         subject.doProcess(listRightsRequest, responder, imapSession);
 
-        ListRightsResponse response = new ListRightsResponse(MAILBOX_NAME, USER_1, listRights);
+        ListRightsResponse response = new ListRightsResponse(MAILBOX_NAME, USER_1.asString(), listRights);
         verify(responder, times(2)).respond(argumentCaptor.capture());
         verifyNoMoreInteractions(responder);
 
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 34f96a4..22296e8 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
@@ -79,7 +79,7 @@ public class MoveProcessorTest {
         mockStatusResponseFactory = mock(StatusResponseFactory.class);
         mockResponder = mock(ImapProcessor.Responder.class);
         mockImapSession = mock(ImapSession.class);
-        mailboxSession = MailboxSessionUtil.create(USERNAME.asString());
+        mailboxSession = MailboxSessionUtil.create(USERNAME);
 
         when(mockMailboxManager.hasCapability(eq(MailboxCapabilities.Move))).thenReturn(true);
         testee = new MoveProcessor(mockNextProcessor, mockMailboxManager, mockStatusResponseFactory, new NoopMetricFactory());
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 f4689bf..1653c0d 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
@@ -39,6 +39,7 @@ import java.util.stream.Stream;
 import javax.mail.Flags;
 import javax.mail.Flags.Flag;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapSessionUtils;
@@ -100,8 +101,9 @@ public class SearchProcessorTest {
     private static final SearchQuery.UidRange[] RANGES = {
             new SearchQuery.UidRange(MessageUid.of(1)),
             new SearchQuery.UidRange(MessageUid.of(42), MessageUid.of(1048)) };
-    
-    private static final MailboxPath mailboxPath = new MailboxPath("namespace", "user", "name");
+
+    private static final Username USER = Username.of("user");
+    private static final MailboxPath mailboxPath = new MailboxPath("namespace", USER, "name");
     private static final MailboxId mailboxId = TestId.of(18);
 
     SearchProcessor processor;
@@ -126,7 +128,7 @@ public class SearchProcessorTest {
         statusResponse = mock(StatusResponse.class);
         mailbox = mock(MessageManager.class);
         mailboxManager = mock(MailboxManager.class);
-        mailboxSession = MailboxSessionUtil.create("user");
+        mailboxSession = MailboxSessionUtil.create(USER);
         selectedMailbox = mock(SelectedMailbox.class);
         when(selectedMailbox.getMailboxId()).thenReturn(mailboxId);
         
@@ -140,7 +142,7 @@ public class SearchProcessorTest {
     }
 
     private void allowUnsolicitedResponses() {
-        when(session.getAttribute(ImapSessionUtils.MAILBOX_USER_ATTRIBUTE_SESSION_KEY)).thenReturn("user");
+        when(session.getAttribute(ImapSessionUtils.MAILBOX_USER_ATTRIBUTE_SESSION_KEY)).thenReturn(USER);
         when(session.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY)).thenReturn(mailboxSession);
     }
 
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 25e2b79..dcb4629 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
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapSessionState;
@@ -63,7 +64,7 @@ import org.mockito.ArgumentCaptor;
 public class SetACLProcessorTest {
 
     private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME;
-    private static final String USER_1 = "user1";
+    private static final Username USER_1 = Username.of("user1");
     private static final String SET_RIGHTS = "aw";
     private static final String UNSUPPORTED_RIGHT = "W";
 
@@ -101,15 +102,15 @@ public class SetACLProcessorTest {
         when(mailboxManager.getMailbox(any(MailboxPath.class), any(MailboxSession.class)))
             .thenReturn(messageManager);
 
-        replaceAclRequest = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1, SET_RIGHTS);
+        replaceAclRequest = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1.asString(), SET_RIGHTS);
 
-        user1Key = EntryKey.deserialize(USER_1);
+        user1Key = EntryKey.deserialize(USER_1.asString());
         setRights = Rfc4314Rights.fromSerializedRfc4314Rights(SET_RIGHTS);
     }
     
     @Test
     public void testUnsupportedRight() throws Exception {
-        SetACLRequest setACLRequest = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1, UNSUPPORTED_RIGHT);
+        SetACLRequest setACLRequest = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1.asString(), UNSUPPORTED_RIGHT);
 
         when(mailboxManager.hasRight(path, MailboxACL.Right.Lookup, mailboxSession))
             .thenReturn(false);
@@ -180,8 +181,7 @@ public class SetACLProcessorTest {
         when(mailboxManager.hasRight(path, MailboxACL.Right.Administer, mailboxSession))
             .thenReturn(true);
 
-
-        SetACLRequest r = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1, prefix + SET_RIGHTS);
+        SetACLRequest r = new SetACLRequest(TAG, ImapCommand.anyStateCommand("Name"), MAILBOX_NAME, USER_1.asString(), prefix + SET_RIGHTS);
         subject.doProcess(r, responder, imapSession);
 
         verify(mailboxManager).applyRightsCommand(path,
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
index 63b1bb6..daeba27 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
 
 import java.util.List;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapSessionState;
@@ -91,7 +92,7 @@ public class SetAnnotationProcessorTest {
         mockResponder = mock(ImapProcessor.Responder.class);
         mockImapSession = mock(ImapSession.class);
 
-        mockMailboxSession = MailboxSessionUtil.create("username");
+        mockMailboxSession = MailboxSessionUtil.create(Username.of("username"));
         inbox = MailboxPath.inbox(mockMailboxSession);
         mailboxAnnotations = ImmutableList.of(MailboxAnnotation.newInstance(new MailboxAnnotationKey("/private/key"), "anyValue"));
         request = new SetAnnotationRequest(TAG, ImapCommand.anyStateCommand("Name"), ImapConstants.INBOX_NAME, mailboxAnnotations);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
index 62b80c5..89c7773 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapSessionState;
 import org.apache.james.imap.api.ImapSessionUtils;
@@ -51,7 +52,7 @@ public class SetQuotaProcessorTest {
 
     @Before
     public void setUp() {
-        mailboxSession = MailboxSessionUtil.create("plop");
+        mailboxSession = MailboxSessionUtil.create(Username.of("plop"));
         UnpooledStatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory();
         mockedImapSession = mock(ImapSession.class);
         mockedResponder = mock(ImapProcessor.Responder.class);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
index 4f63da0..b6e2419 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
@@ -30,6 +30,7 @@ import java.util.stream.Stream;
 import javax.mail.Flags;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapSessionState;
 import org.apache.james.imap.api.ImapSessionUtils;
 import org.apache.james.imap.api.process.ImapSession;
@@ -110,10 +111,11 @@ public class MailboxEventAnalyserTest {
     }
 
     private static final MessageUid MESSAGE_UID = MessageUid.of(1);
-    private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create("user");
-    private static final MailboxSession OTHER_MAILBOX_SESSION = MailboxSessionUtil.create("user");
+    private static final Username USER = Username.of("user");
+    private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER);
+    private static final MailboxSession OTHER_MAILBOX_SESSION = MailboxSessionUtil.create(USER);
     private static final char PATH_DELIMITER = '.';
-    private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", "user", "name");
+    private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", USER, "name");
     private static final TestId MAILBOX_ID = TestId.of(36);
     private static final int UID_VALIDITY = 1024;
     private static final Mailbox DEFAULT_MAILBOX = new Mailbox(MAILBOX_PATH, UID_VALIDITY, MAILBOX_ID);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
index 7d7df56..ba8fd4f 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
@@ -36,6 +36,7 @@ import java.util.stream.Stream;
 
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.imap.api.ImapSessionUtils;
 import org.apache.james.imap.api.process.ImapSession;
 import org.apache.james.mailbox.MailboxManager;
@@ -84,7 +85,7 @@ public class SelectedMailboxImplTest {
     public void setUp() throws Exception {
         ThreadFactory threadFactory = NamedThreadFactory.withClassName(getClass());
         executorService = Executors.newFixedThreadPool(1, threadFactory);
-        mailboxPath = MailboxPath.forUser("tellier@linagora.com", MailboxConstants.INBOX);
+        mailboxPath = MailboxPath.forUser(Username.of("tellier@linagora.com"), MailboxConstants.INBOX);
         mailboxManager = mock(MailboxManager.class);
         messageManager = mock(MessageManager.class);
         imapSession = mock(ImapSession.class);
@@ -171,7 +172,7 @@ public class SelectedMailboxImplTest {
     private void emitEvent(MailboxListener mailboxListener) throws Exception {
         mailboxListener.event(EventFactory.added()
             .randomEventId()
-            .mailboxSession(MailboxSessionUtil.create("user"))
+            .mailboxSession(MailboxSessionUtil.create(Username.of("user")))
             .mailbox(mailbox)
             .addMetaData(new MessageMetaData(EMITTED_EVENT_UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId()))
             .build());
diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/AuthenticationProcessor.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/AuthenticationProcessor.java
index 89994d8..50edcbb 100644
--- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/AuthenticationProcessor.java
+++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/AuthenticationProcessor.java
@@ -20,6 +20,8 @@
 
 package org.apache.james.managesieve.api;
 
+import org.apache.james.core.Username;
+
 public interface AuthenticationProcessor {
 
     String initialServerResponse(Session session);
@@ -27,6 +29,6 @@ public interface AuthenticationProcessor {
     /**
      * @return Null if authentication failed, the authenticated username if authentication is successful
      */
-    String isAuthenticationSuccesfull(Session session, String suppliedClientData) throws SyntaxException, AuthenticationException;
+    Username isAuthenticationSuccesfull(Session session, String suppliedClientData) throws SyntaxException, AuthenticationException;
 
 }
diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/Session.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/Session.java
index 5f71129..c33293d 100644
--- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/Session.java
+++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/Session.java
@@ -20,6 +20,7 @@
 
 package org.apache.james.managesieve.api;
 
+import org.apache.james.core.Username;
 import org.apache.james.managesieve.api.commands.Authenticate;
 
 public interface Session {
@@ -34,9 +35,9 @@ public interface Session {
 
     boolean isAuthenticated();
 
-    String getUser();
+    Username getUser();
 
-    void setUser(String user);
+    void setUser(Username user);
 
     State getState();
 
diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java
index 6a75d32..ef1e78e 100644
--- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java
+++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java
@@ -101,7 +101,7 @@ public class CoreProcessor implements CoreCommands {
     private Map<Capabilities, String> computeCapabilityMap(Session session) {
         Map<Capabilities, String> capabilities = Maps.newHashMap(capabilitiesBase);
         if (session.isAuthenticated()) {
-            capabilities.put(Capabilities.OWNER, session.getUser());
+            capabilities.put(Capabilities.OWNER, session.getUser().asString());
         }
         return capabilities;
     }
@@ -131,7 +131,7 @@ public class CoreProcessor implements CoreCommands {
     public String deleteScript(Session session, String name) {
         return handleCommandExecution(() -> {
             authenticationCheck(session);
-            sieveRepository.deleteScript(Username.of(session.getUser()), new ScriptName(name));
+            sieveRepository.deleteScript(session.getUser(), new ScriptName(name));
             return "OK";
         }, session);
     }
@@ -140,7 +140,7 @@ public class CoreProcessor implements CoreCommands {
     public String getScript(Session session, String name) {
         return handleCommandExecution(() -> {
             authenticationCheck(session);
-            String scriptContent = IOUtils.toString(sieveRepository.getScript(Username.of(session.getUser()), new ScriptName(name)), StandardCharsets.UTF_8);
+            String scriptContent = IOUtils.toString(sieveRepository.getScript(session.getUser(), new ScriptName(name)), StandardCharsets.UTF_8);
             return "{" + scriptContent.length() + "}" + "\r\n" + scriptContent + "\r\nOK";
         }, session);
     }
@@ -149,7 +149,7 @@ public class CoreProcessor implements CoreCommands {
     public String haveSpace(Session session, String name, long size) {
         return handleCommandExecution(() -> {
             authenticationCheck(session);
-            sieveRepository.haveSpace(Username.of(session.getUser()), new ScriptName(name), size);
+            sieveRepository.haveSpace(session.getUser(), new ScriptName(name), size);
             return "OK";
         }, session);
     }
@@ -162,7 +162,7 @@ public class CoreProcessor implements CoreCommands {
     private String listScriptsInternals(Session session) throws AuthenticationRequiredException, StorageException {
         authenticationCheck(session);
         String list = Joiner.on("\r\n").join(
-            Iterables.transform(sieveRepository.listScripts(Username.of(session.getUser())),
+            Iterables.transform(sieveRepository.listScripts(session.getUser()),
                 scriptSummary -> '"' + scriptSummary.getName().getValue() + '"' + (scriptSummary.isActive() ? " ACTIVE" : "")));
         if (Strings.isNullOrEmpty(list)) {
             return "OK";
@@ -175,7 +175,7 @@ public class CoreProcessor implements CoreCommands {
     public String putScript(Session session, String name, String content) {
         return handleCommandExecution(() -> {
             authenticationCheck(session);
-            sieveRepository.putScript(Username.of(session.getUser()), new ScriptName(name), new ScriptContent(content));
+            sieveRepository.putScript(session.getUser(), new ScriptName(name), new ScriptContent(content));
             return manageWarnings(parser.parse(content));
         }, session);
     }
@@ -184,7 +184,7 @@ public class CoreProcessor implements CoreCommands {
     public String renameScript(Session session, String oldName, String newName) {
         return handleCommandExecution(() -> {
             authenticationCheck(session);
-            sieveRepository.renameScript(Username.of(session.getUser()), new ScriptName(oldName), new ScriptName(newName));
+            sieveRepository.renameScript(session.getUser(), new ScriptName(oldName), new ScriptName(newName));
             return "OK";
         }, session);
     }
@@ -193,7 +193,7 @@ public class CoreProcessor implements CoreCommands {
     public String setActive(Session session, String name) {
         return handleCommandExecution(() -> {
             authenticationCheck(session);
-            sieveRepository.setActive(Username.of(session.getUser()), new ScriptName(name));
+            sieveRepository.setActive(session.getUser(), new ScriptName(name));
             return "OK";
         }, session);
     }
@@ -229,7 +229,7 @@ public class CoreProcessor implements CoreCommands {
         try {
             SupportedMechanism currentAuthenticationMechanism = session.getChoosedAuthenticationMechanism();
             AuthenticationProcessor authenticationProcessor = authenticationProcessorMap.get(currentAuthenticationMechanism);
-            String authenticatedUsername = authenticationProcessor.isAuthenticationSuccesfull(session, suppliedData);
+            Username authenticatedUsername = authenticationProcessor.isAuthenticationSuccesfull(session, suppliedData);
             if (authenticatedUsername != null) {
                 session.setUser(authenticatedUsername);
                 session.setState(Session.State.AUTHENTICATED);
diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java
index c2d1798..f0d4f03 100644
--- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java
+++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java
@@ -22,6 +22,7 @@ package org.apache.james.managesieve.core;
 
 import java.util.Iterator;
 
+import org.apache.james.core.Username;
 import org.apache.james.managesieve.api.AuthenticationException;
 import org.apache.james.managesieve.api.AuthenticationProcessor;
 import org.apache.james.managesieve.api.Session;
@@ -52,7 +53,7 @@ public class PlainAuthenticationProcessor implements AuthenticationProcessor {
 
 
     @Override
-    public String isAuthenticationSuccesfull(Session session, String suppliedClientData) throws SyntaxException, AuthenticationException {
+    public Username isAuthenticationSuccesfull(Session session, String suppliedClientData) throws SyntaxException, AuthenticationException {
         if (suppliedClientData.contains("\u0000")) {
             return authenticateWithSeparator(session, suppliedClientData, '\u0000');
         } else {
@@ -60,12 +61,12 @@ public class PlainAuthenticationProcessor implements AuthenticationProcessor {
         }
     }
 
-    private String authenticateWithSeparator(Session session, String suppliedClientData, char c) throws SyntaxException, AuthenticationException {
+    private Username authenticateWithSeparator(Session session, String suppliedClientData, char c) throws SyntaxException, AuthenticationException {
         Iterator<String> it = Splitter.on(c).split(suppliedClientData).iterator();
         if (!it.hasNext()) {
             throw new SyntaxException("You must supply a username for the authentication mechanism. Formal syntax : <NULL>username<NULL>password");
         }
-        String userName = it.next();
+        Username userName = Username.of(it.next());
         if (!it.hasNext()) {
             throw new SyntaxException("You must supply a password for the authentication mechanism. Formal syntax : <NULL>username<NULL>password");
         }
diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java
index 5955b35..09b49de 100644
--- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java
+++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java
@@ -20,12 +20,13 @@
 
 package org.apache.james.managesieve.util;
 
+import org.apache.james.core.Username;
 import org.apache.james.managesieve.api.Session;
 import org.apache.james.managesieve.api.commands.Authenticate;
 
 public class SettableSession implements Session {
 
-    private String user;
+    private Username user;
     private State state;
     private Authenticate.SupportedMechanism choosedAuthenticationMechanism;
     private boolean sslEnabled;
@@ -36,7 +37,7 @@ public class SettableSession implements Session {
     }
 
     @Override
-    public String getUser() {
+    public Username getUser() {
         return user;
     }
 
@@ -46,7 +47,7 @@ public class SettableSession implements Session {
     }
 
     @Override
-    public void setUser(String user) {
+    public void setUser(Username user) {
         this.user = user;
     }
 
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContext.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContext.java
index f5d76a6..810a448 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContext.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContext.java
@@ -64,7 +64,7 @@ public class ProtocolMDCContext {
             .map(protocolSession -> MDCBuilder.create()
                 .addContext(MDCBuilder.SESSION_ID, protocolSession.getSessionID())
                 .addContext(MDCBuilder.CHARSET, protocolSession.getCharset().displayName())
-                .addContext(MDCBuilder.USER, protocolSession.getUser()))
+                .addContext(MDCBuilder.USER, protocolSession.getUsername()))
             .orElse(MDCBuilder.create());
     }
 
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java
index 990562c..656339a 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java
@@ -21,6 +21,7 @@ package org.apache.james.protocols.pop3.core;
 
 import java.util.Collection;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.ProtocolSession.State;
 import org.apache.james.protocols.api.Request;
 import org.apache.james.protocols.api.Response;
@@ -57,11 +58,12 @@ public abstract class AbstractApopCmdHandler extends AbstractPassCmdHandler {
         }
         if (!syntaxError && session.getHandlerState() == POP3Session.AUTHENTICATION_READY) {
 
-            Response response = doAuth(session, parts[0], parts[1]);
+            Username username = Username.of(parts[0]);
+            Response response = doAuth(session, username, parts[1]);
             
             if (POP3Response.OK_RESPONSE.equals(response.getRetCode())) {
                 // the auth was successful so set the user
-                session.setUser(parts[0]);
+                session.setUsername(username);
             }
             return response;
         } else {
@@ -78,7 +80,7 @@ public abstract class AbstractApopCmdHandler extends AbstractPassCmdHandler {
 
     
     @Override
-    protected final Mailbox auth(POP3Session session, String username, String password) throws Exception {
+    protected final Mailbox auth(POP3Session session, Username username, String password) throws Exception {
         return auth(session, (String)session.getAttachment(POP3Session.APOP_TIMESTAMP, State.Connection), username, password);
     }
 
@@ -88,5 +90,5 @@ public abstract class AbstractApopCmdHandler extends AbstractPassCmdHandler {
      *
      * @return mailbox
      */
-    protected abstract Mailbox auth(POP3Session session, String apopTimestamp, String user, String digest) throws Exception;
+    protected abstract Mailbox auth(POP3Session session, String apopTimestamp, Username user, String digest) throws Exception;
 }
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
index 915b455..9358025 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
@@ -20,7 +20,9 @@
 package org.apache.james.protocols.pop3.core;
 
 import java.util.Collection;
+import java.util.Optional;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.Request;
 import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.pop3.POP3Response;
@@ -48,7 +50,7 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler {
     public Response onCommand(POP3Session session, Request request) {
         String parameters = request.getArgument();
         if (session.getHandlerState() == POP3Session.AUTHENTICATION_USERSET && parameters != null) {
-            return doAuth(session, session.getUser(), parameters);
+            return doAuth(session, session.getUsername(), parameters);
         } else {
             session.setHandlerState(POP3Session.AUTHENTICATION_READY);
             return AUTH_FAILED;
@@ -59,7 +61,7 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler {
     /**
      * Authenticate a user and return the {@link Response}
      */
-    protected final Response doAuth(POP3Session session, String user, String pass) {
+    protected final Response doAuth(POP3Session session, Username user, String pass) {
         try {
             Mailbox mailbox = auth(session, user, pass);
 
@@ -68,16 +70,18 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler {
                 stat(session);
 
                 session.setHandlerState(POP3Session.TRANSACTION);
-                
 
-                StringBuilder responseBuffer = new StringBuilder(64).append("Welcome ").append(session.getUser());
+                StringBuilder responseBuffer = new StringBuilder(64).append("Welcome ")
+                    .append(Optional.ofNullable(session.getUsername())
+                        .map(Username::asString)
+                        .orElse(null));
                 return  new POP3Response(POP3Response.OK_RESPONSE, responseBuffer.toString());
             } else {
                 session.setHandlerState(POP3Session.AUTHENTICATION_READY);
                 return AUTH_FAILED;
             }
         } catch (Exception e) {
-            LOGGER.error("Unexpected error accessing mailbox for {}", session.getUser(), e);
+            LOGGER.error("Unexpected error accessing mailbox for {}", session.getUsername(), e);
             session.setHandlerState(POP3Session.AUTHENTICATION_READY);
             return UNEXPECTED_ERROR;
         }
@@ -94,5 +98,5 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler {
      *
      * @return mailbox
      */
-    protected abstract Mailbox auth(POP3Session session, String username, String password) throws Exception;
+    protected abstract Mailbox auth(POP3Session session, Username username, String password) throws Exception;
 }
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
index 427ba96..c4ded58 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java
@@ -22,6 +22,7 @@ package org.apache.james.protocols.pop3.core;
 import java.util.Collection;
 import java.util.Set;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.Request;
 import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.api.handler.CommandHandler;
@@ -46,7 +47,7 @@ public class UserCmdHandler implements CommandHandler<POP3Session>, CapaCapabili
     public Response onCommand(POP3Session session, Request request) {
         String parameters = request.getArgument();
         if (session.getHandlerState() == POP3Session.AUTHENTICATION_READY && parameters != null) {
-            session.setUser(parameters);
+            session.setUsername(Username.of(parameters));
             session.setHandlerState(POP3Session.AUTHENTICATION_USERSET);
             return POP3Response.OK;
         } else {
diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
index e253464..3aa9c15 100644
--- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
+++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.net.pop3.POP3Client;
 import org.apache.commons.net.pop3.POP3MessageInfo;
 import org.apache.commons.net.pop3.POP3Reply;
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.Protocol;
 import org.apache.james.protocols.api.ProtocolServer;
 import org.apache.james.protocols.api.handler.WiringException;
@@ -520,8 +521,8 @@ public abstract class AbstractPOP3ServerTest {
         }
 
         @Override
-        protected Mailbox auth(POP3Session session, String apopTimestamp, String user, String digest) throws Exception {
-            return mailboxes.get(user);
+        protected Mailbox auth(POP3Session session, String apopTimestamp, Username user, String digest) throws Exception {
+            return mailboxes.get(user.asString());
         }
         
         
diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java
index b3cf2b7..fdaa284 100644
--- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java
+++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java
@@ -21,6 +21,7 @@ package org.apache.james.protocols.pop3.utils;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.pop3.POP3Session;
 import org.apache.james.protocols.pop3.core.AbstractPassCmdHandler;
 import org.apache.james.protocols.pop3.mailbox.Mailbox;
@@ -33,8 +34,8 @@ public class TestPassCmdHandler extends AbstractPassCmdHandler {
     }
     
     @Override
-    protected Mailbox auth(POP3Session session, String username, String password) throws Exception {
-        return mailboxes.get(username);
+    protected Mailbox auth(POP3Session session, Username username, String password) throws Exception {
+        return mailboxes.get(username.asString());
     }
 
 }
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
index 8351806..487ec8c 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
@@ -21,6 +21,7 @@ package org.apache.james.protocols.smtp.core;
 import org.apache.james.core.Domain;
 import org.apache.james.core.MailAddress;
 import org.apache.james.core.MaybeSender;
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.ProtocolSession;
 import org.apache.james.protocols.smtp.SMTPRetCode;
 import org.apache.james.protocols.smtp.SMTPSession;
@@ -44,7 +45,7 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements
     
     @Override
     public HookResult doRcpt(SMTPSession session, MaybeSender sender, MailAddress rcpt) {
-        if (session.getUser() != null) {
+        if (session.getUsername() != null) {
             MaybeSender senderAddress = (MaybeSender) session.getAttachment(SMTPSession.SENDER, ProtocolSession.State.Transaction);
             
             // Check if the sender address is the same as the user which was used to authenticate.
@@ -66,8 +67,9 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements
     private boolean senderMatchSessionUser(MaybeSender maybeSender, SMTPSession session) {
         Preconditions.checkArgument(!maybeSender.isNullSender());
 
-        String authUser = session.getUser();
-        String sender = getUser(maybeSender.get());
+        Username authUser = session.getUsername();
+        Username sender = getUser(maybeSender.get());
+        Username username = getUser(maybeSender.get());
 
         return isSenderAllowed(authUser, sender);
     }
@@ -89,10 +91,10 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements
      * 
      * @return username corresponding to the mail address
      */
-    protected abstract String getUser(MailAddress mailAddress);
+    protected abstract Username getUser(MailAddress mailAddress);
 
     /**
      * Is a given sender allowed for a user
      */
-    protected abstract boolean isSenderAllowed(String user, String sender);
+    protected abstract boolean isSenderAllowed(Username user, Username sender);
 }
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
index c0f19f9..48b0a73 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
@@ -51,7 +51,7 @@ public class ReceivedDataLineFilter extends AbstractAddHeadersFilter {
         // Check if EHLO was used
         if (EHLO.equals(heloMode)) {
             // Not successful auth
-            if (session.getUser() == null) {
+            if (session.getUsername() == null) {
                 return ESMTP;
             } else {
                 // See RFC3848
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index 84e0b57..622eea9 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -33,6 +33,7 @@ import java.util.Locale;
 import java.util.Optional;
 import java.util.StringTokenizer;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.Request;
 import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.api.handler.CommandHandler;
@@ -156,7 +157,7 @@ public class AuthCmdHandler
      * @param argument the argument passed in with the command by the SMTP client
      */
     private Response doAUTH(SMTPSession session, String argument) {
-        if (session.getUser() != null) {
+        if (session.getUsername() != null) {
             return ALREADY_AUTH;
         } else if (argument == null) {
             return SYNTAX_ERROR;
@@ -267,7 +268,7 @@ public class AuthCmdHandler
             // with in the if clause below
         }
         // Authenticate user
-        Response response = doAuthTest(session, user, pass, "PLAIN");
+        Response response = doAuthTest(session, Username.of(user), pass, "PLAIN");
         
         session.popLineHandler();
 
@@ -303,22 +304,22 @@ public class AuthCmdHandler
         
         session.pushLineHandler(new AbstractSMTPLineHandler() {
 
-            private String user;
+            private Username username;
 
-            public LineHandler<SMTPSession> setUser(String user) {
-                this.user = user;
+            public LineHandler<SMTPSession> setUsername(Username username) {
+                this.username = username;
                 return this;
             }
 
             @Override
             protected Response onCommand(SMTPSession session, String l) {
-                return doLoginAuthPassCheck(session, user, l);
+                return doLoginAuthPassCheck(session, username, l);
             }
-        }.setUser(user));
+        }.setUsername(Username.of(user)));
         return AUTH_READY_PASSWORD_LOGIN;
     }
     
-    private Response doLoginAuthPassCheck(SMTPSession session, String user, String pass) {
+    private Response doLoginAuthPassCheck(SMTPSession session, Username username, String pass) {
         if (pass != null) {
             try {
                 pass = decodeBase64(pass);
@@ -332,11 +333,11 @@ public class AuthCmdHandler
         session.popLineHandler();
 
         // Authenticate user
-        return doAuthTest(session, user, pass, "LOGIN");
+        return doAuthTest(session, username, pass, "LOGIN");
     }
 
-    protected Response doAuthTest(SMTPSession session, String user, String pass, String authType) {
-        if ((user == null) || (pass == null)) {
+    protected Response doAuthTest(SMTPSession session, Username username, String pass, String authType) {
+        if ((username == null) || (pass == null)) {
             return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,"Could not decode parameters for AUTH " + authType);
         }
 
@@ -349,7 +350,7 @@ public class AuthCmdHandler
                 LOGGER.debug("executing  hook {}", rawHook);
 
                 long start = System.currentTimeMillis();
-                HookResult hRes = rawHook.doAuth(session, user, pass);
+                HookResult hRes = rawHook.doAuth(session, username, pass);
                 long executionTime = System.currentTimeMillis() - start;
 
                 if (rHooks != null) {
@@ -374,7 +375,7 @@ public class AuthCmdHandler
         }
 
         res = AUTH_FAILED;
-        LOGGER.error("AUTH method {} failed from {}@{}", authType, user, session.getRemoteAddress().getAddress().getHostAddress());
+        LOGGER.error("AUTH method {} failed from {}@{}", authType, username, session.getRemoteAddress().getAddress().getHostAddress());
         return res;
     }
 
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java
index 952c98b..60cc5a3 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.protocols.smtp.hook;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.smtp.SMTPSession;
 
 /**
@@ -33,5 +34,5 @@ public interface AuthHook extends Hook {
      * @param password the password
      * @return HockResult
      */
-    HookResult doAuth(SMTPSession session, String username, String password);
+    HookResult doAuth(SMTPSession session, Username username, String password);
 }
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
index df2d274..320f6a1 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
@@ -30,6 +30,7 @@ import java.util.Map;
 
 import org.apache.james.core.MailAddress;
 import org.apache.james.core.MaybeSender;
+import org.apache.james.core.Username;
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.apache.james.protocols.smtp.hook.HookReturnCode;
 import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
@@ -43,7 +44,7 @@ public class ResolvableEhloHeloHandlerTest {
 
 
     private SMTPSession setupMockSession(String argument,
-             final boolean relaying, final boolean authRequired, final String user, MailAddress recipient) {
+             final boolean relaying, final boolean authRequired, final Username username, MailAddress recipient) {
 
         return new BaseFakeSMTPSession() {
 
@@ -56,8 +57,8 @@ public class ResolvableEhloHeloHandlerTest {
             }
 
             @Override
-            public String getUser() {
-                return user;
+            public Username getUsername() {
+                return username;
             }
 
             @Override
@@ -148,7 +149,7 @@ public class ResolvableEhloHeloHandlerTest {
     @Test
     public void testRejectInvalidHeloAuthUser() throws Exception {
         MailAddress mailAddress = new MailAddress("test@localhost");
-        SMTPSession session = setupMockSession(INVALID_HOST,false,true,"valid@user",mailAddress);
+        SMTPSession session = setupMockSession(INVALID_HOST, false, true, Username.of("valid@user"), mailAddress);
         ResolvableEhloHeloHandler handler = createHandler();
 
 
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
index e16b4bc..a6c8af1 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
@@ -24,6 +24,7 @@ import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
 import java.util.Map;
 
+import org.apache.james.core.Username;
 import org.apache.james.protocols.api.ProtocolSession;
 import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.api.handler.LineHandler;
@@ -71,7 +72,7 @@ public class BaseFakeSMTPSession implements SMTPSession {
     }
 
     @Override
-    public String getUser() {
+    public Username getUsername() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
@@ -96,11 +97,10 @@ public class BaseFakeSMTPSession implements SMTPSession {
     }
 
     @Override
-    public void setUser(String user) {
+    public void setUsername(Username username) {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
-
     @Override
     public void popLineHandler() {
         throw new UnsupportedOperationException("Unimplemented Stub Method");
diff --git a/server/container/cli-integration/src/test/java/org/apache/james/cli/ReindexCommandIntegrationTest.java b/server/container/cli-integration/src/test/java/org/apache/james/cli/ReindexCommandIntegrationTest.java
index c1ff23f..665521b 100644
--- a/server/container/cli-integration/src/test/java/org/apache/james/cli/ReindexCommandIntegrationTest.java
+++ b/server/container/cli-integration/src/test/java/org/apache/james/cli/ReindexCommandIntegrationTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
 
 import org.apache.james.GuiceJamesServer;
 import org.apache.james.MemoryJmapTestRule;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.indexer.ReIndexer;
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailbox.model.MailboxPath;
@@ -77,7 +78,7 @@ public class ReindexCommandIntegrationTest {
         String mailbox = "mailbox";
         ServerCmd.doMain(new String[] {"-h", "127.0.0.1", "-p", "9999", "reindexmailbox", MailboxConstants.USER_NAMESPACE, USER, mailbox});
 
-        verify(reIndexer).reIndex(MailboxPath.forUser(USER, mailbox));
+        verify(reIndexer).reIndex(MailboxPath.forUser(Username.of(USER), mailbox));
     }
 
 }
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
index ef7ff8d..a1c1189 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
@@ -34,6 +34,7 @@ import java.util.TimerTask;
 import java.util.stream.Collectors;
 
 import org.apache.commons.net.imap.IMAPClient;
+import org.apache.james.core.Username;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.mailbox.extractor.TextExtractor;
 import org.apache.james.mailbox.store.search.PDFTextExtractor;
@@ -98,7 +99,7 @@ class ESReporterTest {
                 .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
                 .setPort(server.getProbe(JmapGuiceProbe.class).getJmapPort())
                 .build();
-        accessToken = authenticateJamesUser(baseUri(server), USERNAME, PASSWORD);
+        accessToken = authenticateJamesUser(baseUri(server), Username.of(USERNAME), PASSWORD);
 
         timer = new Timer();
     }
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
index ffd8e4f..5c88a39 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
@@ -41,6 +41,7 @@ import static org.hamcrest.Matchers.nullValue;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.james.core.Username;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.mailbox.MessageManager.AppendCommand;
 import org.apache.james.mailbox.cassandra.mail.task.MailboxMergingTask;
@@ -137,7 +138,7 @@ public class FixingGhostMailboxTest {
             .addDomain(DOMAIN)
             .addUser(ALICE, ALICE_SECRET)
             .addUser(BOB, BOB_SECRET);
-        accessToken = authenticateJamesUser(baseUri(server), ALICE, ALICE_SECRET);
+        accessToken = authenticateJamesUser(baseUri(server), Username.of(ALICE), ALICE_SECRET);
 
         Host cassandraHost = dockerCassandra.getCassandra().getHost();
         session = Cluster.builder()
@@ -153,7 +154,7 @@ public class FixingGhostMailboxTest {
     private void simulateGhostMailboxBug() throws MailboxException, IOException {
         // State before ghost mailbox bug
         // Alice INBOX is delegated to Bob and contains one message
-        aliceInboxPath = MailboxPath.forUser(ALICE, MailboxConstants.INBOX);
+        aliceInboxPath = MailboxPath.forUser(Username.of(ALICE), MailboxConstants.INBOX);
         aliceGhostInboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, MailboxConstants.INBOX);
         aclProbe.addRights(aliceInboxPath, BOB, MailboxACL.FULL_RIGHTS);
         message1 = mailboxProbe.appendMessage(ALICE, aliceInboxPath, AppendCommand.from(generateMessageContent()));
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
index 5c91b17..971c47e 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
+++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
@@ -68,13 +68,13 @@ class CassandraLdapJamesServerTest implements JamesServerContract {
     void userFromLdapShouldLoginViaImapProtocol(GuiceJamesServer server) throws Exception {
         imapClient.connect(JAMES_SERVER_HOST, server.getProbe(ImapGuiceProbe.class).getImapPort());
 
-        assertThat(imapClient.login(JAMES_USER, PASSWORD)).isTrue();
+        assertThat(imapClient.login(JAMES_USER.asString(), PASSWORD)).isTrue();
     }
 
     @Test
     void mailsShouldBeWellReceivedBeforeFirstUserConnectionWithLdap(GuiceJamesServer server) throws Exception {
         messageSender.connect(JAMES_SERVER_HOST, server.getProbe(SmtpGuiceProbe.class).getSmtpPort())
-            .sendMessage("bob@any.com", JAMES_USER + "@localhost");
+            .sendMessage("bob@any.com", JAMES_USER.asString() + "@localhost");
 
         calmlyAwait.until(() -> server.getProbe(SpoolerProbe.class).processingFinished());
 
diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
index c4ed73c..bdff8d8 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
@@ -49,7 +49,7 @@ class CassandraRabbitMQLdapJmapJamesServerTest {
             IMAPClient imapClient = new IMAPClient();
             imapClient.connect(JAMES_SERVER_HOST, server.getProbe(ImapGuiceProbe.class).getImapPort());
 
-            assertThat(imapClient.login(JAMES_USER, PASSWORD)).isTrue();
+            assertThat(imapClient.login(JAMES_USER.asString(), PASSWORD)).isTrue();
         }
     }
 
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
index 3f07581..7e7b4c1 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
@@ -26,16 +26,16 @@ import javax.inject.Inject;
 
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.core.Domain;
+import org.apache.james.core.Username;
 import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.probe.DataProbe;
 import org.apache.james.rrt.api.RecipientRewriteTable;
 import org.apache.james.rrt.lib.MappingSource;
 import org.apache.james.rrt.lib.Mappings;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.util.streams.Iterators;
 
 import com.github.steveash.guavate.Guavate;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 
 public class DataProbeImpl implements GuiceProbe, DataProbe {
     
@@ -55,12 +55,12 @@ public class DataProbeImpl implements GuiceProbe, DataProbe {
 
     @Override
     public void addUser(String userName, String password) throws Exception {
-        usersRepository.addUser(userName, password);
+        usersRepository.addUser(Username.of(userName), password);
     }
 
     @Override
     public void removeUser(String username) throws Exception {
-        usersRepository.removeUser(username);
+        usersRepository.removeUser(Username.of(username));
     }
 
     @Override
@@ -70,7 +70,9 @@ public class DataProbeImpl implements GuiceProbe, DataProbe {
 
     @Override
     public String[] listUsers() throws Exception {
-        return Iterables.toArray(ImmutableList.copyOf(usersRepository.list()), String.class);
+        return Iterators.toStream(usersRepository.list())
+            .map(Username::asString)
+            .toArray(String[]::new);
     }
 
     @Override
diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java
index 3182b8e..02362dd 100644
--- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java
+++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java
@@ -21,6 +21,7 @@ package org.apache.james.modules;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
@@ -45,14 +46,14 @@ public class ACLProbeImpl implements GuiceProbe, ACLProbe {
     public void replaceRights(MailboxPath mailboxPath, String targetUser, Rfc4314Rights rights) throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(mailboxPath.getUser());
 
-        ACLCommand command = MailboxACL.command().forUser(targetUser).rights(rights).asReplacement();
+        ACLCommand command = MailboxACL.command().forUser(Username.of(targetUser)).rights(rights).asReplacement();
         mailboxManager.applyRightsCommand(mailboxPath, command, mailboxSession);
     }
 
     @Override
     public void addRights(MailboxPath mailboxPath, String targetUser, Rfc4314Rights rights) throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(mailboxPath.getUser());
-        ACLCommand command = MailboxACL.command().forUser(targetUser).rights(rights).asAddition();
+        ACLCommand command = MailboxACL.command().forUser(Username.of(targetUser)).rights(rights).asAddition();
 
         mailboxManager.applyRightsCommand(mailboxPath, command, mailboxSession);
     }
diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java
index df0e819..3f49929 100644
--- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java
+++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java
@@ -30,6 +30,7 @@ import javax.inject.Inject;
 import javax.mail.Flags;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
@@ -61,7 +62,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
 
     @Override
     public MailboxId createMailbox(String namespace, String user, String name) {
-        return createMailbox(new MailboxPath(namespace, user, name));
+        return createMailbox(new MailboxPath(namespace, Username.of(user), name));
     }
 
     public MailboxId createMailbox(MailboxPath mailboxPath) {
@@ -80,11 +81,12 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
 
     @Override
     public MailboxId getMailboxId(String namespace, String user, String name) {
+        Username username = Username.of(user);
         MailboxSession mailboxSession = null;
         try {
-            mailboxSession = mailboxManager.createSystemSession(user);
+            mailboxSession = mailboxManager.createSystemSession(username);
             MailboxMapper mailboxMapper = mailboxMapperFactory.getMailboxMapper(mailboxSession);
-            return mailboxMapper.findMailboxByPath(new MailboxPath(namespace, user, name)).getMailboxId();
+            return mailboxMapper.findMailboxByPath(new MailboxPath(namespace, username, name)).getMailboxId();
         } catch (MailboxException e) {
             throw new RuntimeException(e);
         } finally {
@@ -107,7 +109,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
     public Collection<String> listUserMailboxes(String user) {
         MailboxSession mailboxSession = null;
         try {
-            mailboxSession = mailboxManager.createSystemSession(user);
+            mailboxSession = mailboxManager.createSystemSession(Username.of(user));
             mailboxManager.startProcessingRequest(mailboxSession);
             return searchUserMailboxes(mailboxSession)
                     .stream()
@@ -133,10 +135,11 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
     @Override
     public void deleteMailbox(String namespace, String user, String name) {
         MailboxSession mailboxSession = null;
+        Username username = Username.of(user);
         try {
-            mailboxSession = mailboxManager.createSystemSession(user);
+            mailboxSession = mailboxManager.createSystemSession(username);
             mailboxManager.startProcessingRequest(mailboxSession);
-            mailboxManager.deleteMailbox(new MailboxPath(namespace, user, name), mailboxSession);
+            mailboxManager.deleteMailbox(new MailboxPath(namespace, username, name), mailboxSession);
         } catch (MailboxException e) {
             throw new RuntimeException(e);
         } finally {
@@ -146,10 +149,11 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
 
     @Override
     public void importEmlFileToMailbox(String namespace, String user, String name, String emlPath) throws Exception {
-        MailboxSession mailboxSession = mailboxManager.createSystemSession(user);
+        Username username = Username.of(user);
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
         mailboxManager.startProcessingRequest(mailboxSession);
 
-        MessageManager messageManager = mailboxManager.getMailbox(new MailboxPath(namespace, user, name), mailboxSession);
+        MessageManager messageManager = mailboxManager.getMailbox(new MailboxPath(namespace, username, name), mailboxSession);
         InputStream emlFileAsStream = new FileInputStream(emlPath);
         messageManager.appendMessage(MessageManager.AppendCommand.builder()
             .recent()
@@ -163,7 +167,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
     public ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, InputStream message, Date internalDate, boolean isRecent, Flags flags)
             throws MailboxException {
 
-        MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(Username.of(username));
         MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
         return messageManager.appendMessage(message, internalDate, mailboxSession, isRecent, flags);
     }
@@ -171,7 +175,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
     public ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, MessageManager.AppendCommand appendCommand)
             throws MailboxException {
 
-        MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(Username.of(username));
         MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
         return messageManager.appendMessage(appendCommand, mailboxSession);
     }
@@ -198,7 +202,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
 
     @Override
     public Collection<String> listSubscriptions(String user) throws Exception {
-        MailboxSession mailboxSession = mailboxManager.createSystemSession(user);
+        MailboxSession mailboxSession = mailboxManager.createSystemSession(Username.of(user));
         return subscriptionManager.subscriptions(mailboxSession);
     }
 
diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java
index 1a88992..5b66e67 100644
--- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java
+++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java
@@ -21,6 +21,7 @@ package org.apache.james.modules;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -50,7 +51,7 @@ public class QuotaProbesImpl implements QuotaProbe, GuiceProbe {
 
     @Override
     public String getQuotaRoot(String namespace, String user, String name) throws MailboxException {
-        return quotaRootResolver.getQuotaRoot(new MailboxPath(namespace, user, name)).getValue();
+        return quotaRootResolver.getQuotaRoot(new MailboxPath(namespace, Username.of(user), name)).getValue();
     }
 
     @Override
diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java b/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java
index c02de9d..434b41b 100644
--- a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java
+++ b/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.jmap.api.vacation.AccountId;
 import org.apache.james.jmap.api.vacation.Vacation;
 import org.apache.james.jmap.api.vacation.VacationPatch;
@@ -70,7 +71,7 @@ public class JmapGuiceProbe implements GuiceProbe {
         return vacationRepository.retrieveVacation(accountId).block();
     }
 
-    public void setInMailboxes(MessageId messageId, String username, MailboxId... mailboxIds) throws MailboxException {
+    public void setInMailboxes(MessageId messageId, Username username, MailboxId... mailboxIds) throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
         messageIdManager.setInMailboxes(messageId, Arrays.asList(mailboxIds), mailboxSession);
     }
diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java b/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java
index 69268d0..6240733 100644
--- a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java
+++ b/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java
@@ -24,6 +24,7 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.mail.Flags;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageIdManager;
@@ -51,19 +52,19 @@ public class MessageIdProbe implements GuiceProbe {
         this.messageIdManager = messageIdManager;
     }
 
-    public List<MessageResult> getMessages(MessageId messageId, String user) throws MailboxException {
+    public List<MessageResult> getMessages(MessageId messageId, Username user) throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(user);
 
         return messageIdManager.getMessages(ImmutableList.of(messageId), FetchGroupImpl.FULL_CONTENT, mailboxSession);
     }
 
-    public void updateNewFlags(String user, Flags newFlags, MessageId messageId, List<MailboxId> mailboxIds) throws MailboxException {
+    public void updateNewFlags(Username user, Flags newFlags, MessageId messageId, List<MailboxId> mailboxIds) throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(user);
 
         messageIdManager.setFlags(newFlags, FlagsUpdateMode.REPLACE, messageId, mailboxIds, mailboxSession);
     }
 
-    public List<AttachmentId> retrieveAttachmentIds(MessageId messageId, String username) throws MailboxException {
+    public List<AttachmentId> retrieveAttachmentIds(MessageId messageId, Username username) throws MailboxException {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
         List<MessageResult> messages = messageIdManager.getMessages(
             ImmutableList.of(messageId),
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
index 64d975a..f8b35bd 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
@@ -21,6 +21,7 @@ package org.apache.james.adapter.mailbox.store;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.store.Authenticator;
 import org.apache.james.user.api.UsersRepository;
@@ -40,7 +41,7 @@ public class UserRepositoryAuthenticator implements Authenticator {
     }
 
     @Override
-    public boolean isAuthentic(String userid, CharSequence passwd) throws MailboxException {
+    public boolean isAuthentic(Username userid, CharSequence passwd) throws MailboxException {
         try {
             return repos.test(userid, passwd.toString());
         } catch (UsersRepositoryException e) {
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthorizator.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthorizator.java
index cda4fa9..85110ae 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthorizator.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthorizator.java
@@ -21,6 +21,7 @@ package org.apache.james.adapter.mailbox.store;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.store.Authorizator;
 import org.apache.james.user.api.UsersRepository;
@@ -39,7 +40,7 @@ public class UserRepositoryAuthorizator implements Authorizator {
     }
 
     @Override
-    public AuthorizationState canLoginAsOtherUser(String userId, String otherUserId) throws MailboxException {
+    public AuthorizationState canLoginAsOtherUser(Username userId, Username otherUserId) throws MailboxException {
         try {
             if (!repos.isAdministrator(userId)) {
                 return AuthorizationState.NOT_ADMIN;
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticatorTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticatorTest.java
index 48c8333..7ec82b1 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticatorTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticatorTest.java
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.UsersRepositoryException;
@@ -34,9 +35,9 @@ import org.junit.rules.ExpectedException;
 public class UserRepositoryAuthenticatorTest {
 
     public static final String PASSWORD = "password";
-    public static final String USER = "user";
+    public static final Username USER = Username.of("user");
     public static final String BAD_PASSWORD = "badPassword";
-    public static final String BAD_USER = "badUser";
+    public static final Username BAD_USER = Username.of("badUser");
     private UsersRepository usersRepository;
     private UserRepositoryAuthenticator testee;
 
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthorizatorTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthorizatorTest.java
index 84e499e..cfb2750 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthorizatorTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthorizatorTest.java
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.store.Authorizator;
 import org.apache.james.user.api.UsersRepository;
@@ -33,8 +34,8 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 public class UserRepositoryAuthorizatorTest {
-    private static final String ADMIN = "admin";
-    private static final String USER = "user";
+    private static final Username ADMIN = Username.of("admin");
+    private static final Username USER = Username.of("user");
 
     private UsersRepository usersRepository;
     private UserRepositoryAuthorizator testee;
diff --git a/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java b/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
index 79d68db..dddfa29 100644
--- a/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
+++ b/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
@@ -30,6 +30,7 @@ import javax.inject.Named;
 import javax.management.NotCompliantMBeanException;
 import javax.management.StandardMBean;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
@@ -72,7 +73,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
                      .addContext(MDCBuilder.ACTION, "deleteMailboxes")
                      .addContext("concernedUser", username)
                      .build()) {
-            session = mailboxManager.createSystemSession(username);
+            session = mailboxManager.createSystemSession(Username.of(username));
             mailboxManager.startProcessingRequest(session);
             List<MailboxMetaData> mList = retrieveAllUserMailboxes(session);
             for (MailboxMetaData aMList : mList) {
@@ -100,7 +101,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
                      .addContext(MDCBuilder.ACTION, "listMailboxes")
                      .addContext("concernedUser", username)
                      .build()) {
-            session = mailboxManager.createSystemSession(username);
+            session = mailboxManager.createSystemSession(Username.of(username));
             mailboxManager.startProcessingRequest(session);
             List<MailboxMetaData> mList = retrieveAllUserMailboxes(session);
             boxes = mList.stream()
@@ -120,15 +121,16 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
     @Override
     public MailboxId createMailbox(String namespace, String user, String name) {
         checkMailboxArguments(namespace, user, name);
+        Username username = Username.of(user);
         MailboxSession session = null;
-        MailboxPath mailboxPath = new MailboxPath(namespace, user, name);
+        MailboxPath mailboxPath = new MailboxPath(namespace, username, name);
         try (Closeable closeable =
                  MDCBuilder.create()
                      .addContext(MDCBuilder.PROTOCOL, "CLI")
                      .addContext(MDCBuilder.ACTION, "createMailbox")
                      .addContext("mailboxPath", mailboxPath.asString())
                      .build()) {
-            session = mailboxManager.createSystemSession(user);
+            session = mailboxManager.createSystemSession(username);
             mailboxManager.startProcessingRequest(session);
             return mailboxManager.createMailbox(mailboxPath, session)
                 .orElseThrow(() -> new MailboxException("mailbox name is probably empty"));
@@ -143,15 +145,16 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
     @Override
     public void deleteMailbox(String namespace, String user, String name) {
         checkMailboxArguments(namespace, user, name);
+        Username username = Username.of(user);
         MailboxSession session = null;
-        MailboxPath mailboxPath = new MailboxPath(namespace, user, name);
+        MailboxPath mailboxPath = new MailboxPath(namespace, username, name);
         try (Closeable closeable =
                  MDCBuilder.create()
                      .addContext(MDCBuilder.PROTOCOL, "CLI")
                      .addContext(MDCBuilder.ACTION, "deleteMailbox")
                      .addContext("mailboxPath", mailboxPath.asString())
                      .build()) {
-            session = mailboxManager.createSystemSession(user);
+            session = mailboxManager.createSystemSession(username);
             mailboxManager.startProcessingRequest(session);
             mailboxManager.deleteMailbox(mailboxPath, session);
         } catch (Exception e) {
@@ -165,9 +168,10 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
     public void importEmlFileToMailbox(String namespace, String user, String name, String emlPath) {
         checkMailboxArguments(namespace, user, name);
         checkString(emlPath, "email file path name");
+        Username username = Username.of(user);
 
         MailboxSession session = null;
-        MailboxPath mailboxPath = new MailboxPath(namespace, user, name);
+        MailboxPath mailboxPath = new MailboxPath(namespace, username, name);
         try (Closeable closeable =
                  MDCBuilder.create()
                      .addContext(MDCBuilder.PROTOCOL, "CLI")
@@ -175,7 +179,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
                      .addContext("mailboxPath", mailboxPath.asString())
                      .addContext("emlPath", emlPath)
                      .build()) {
-            session = mailboxManager.createSystemSession(user);
+            session = mailboxManager.createSystemSession(username);
             mailboxManager.startProcessingRequest(session);
             MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, session);
             InputStream emlFileAsStream = new FileInputStream(emlPath);
diff --git a/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java b/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java
index a2bed78..c0ff902 100644
--- a/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java
+++ b/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 
 import javax.inject.Inject;
 
+import org.apache.james.core.Username;
 import org.apache.james.core.quota.QuotaCount;
 import org.apache.james.core.quota.QuotaSize;
 import org.apache.james.mailbox.exception.MailboxException;
@@ -57,7 +58,7 @@ public class QuotaManagement implements QuotaManagementMBean {
                      .addContext(MDCBuilder.PROTOCOL, "CLI")
                      .addContext(MDCBuilder.ACTION, "getQuotaRoot")
                      .build()) {
-            return quotaRootResolver.getQuotaRoot(new MailboxPath(namespace, user, name)).getValue();
+            return quotaRootResolver.getQuotaRoot(new MailboxPath(namespace, Username.of(user), name)).getValue();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/ReIndexerManagement.java b/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/ReIndexerManagement.java
index 6696d54..2b621b5 100644
--- a/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/ReIndexerManagement.java
+++ b/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/ReIndexerManagement.java
@@ -26,6 +26,7 @@ import java.time.Duration;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.indexer.ReIndexer;
 import org.apache.james.mailbox.model.MailboxPath;
@@ -51,7 +52,7 @@ public class ReIndexerManagement implements ReIndexerManagementMBean {
                      .addContext(MDCBuilder.PROTOCOL, "CLI")
                      .addContext(MDCBuilder.ACTION, "reIndex")
                      .build()) {
-            TaskId taskId = taskManager.submit(reIndexer.reIndex(new MailboxPath(namespace, user, name)));
+            TaskId taskId = taskManager.submit(reIndexer.reIndex(new MailboxPath(namespace, Username.of(user), name)));
             taskManager.await(taskId, Duration.ofMillis(Long.MAX_VALUE));
         } catch (IOException | TaskManager.ReachedTimeoutException e) {
             throw new RuntimeException(e);
diff --git a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index 84eaaae..c3f1348 100644
--- a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -28,6 +28,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.exception.MailboxExistsException;
 import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
@@ -44,7 +45,7 @@ import org.junit.jupiter.api.Test;
 
 public class MailboxManagementTest {
 
-    public static final String USER = "user";
+    public static final Username USER = Username.of("user");
     public static final int UID_VALIDITY = 10;
     public static final int LIMIT = 1;
 
@@ -59,27 +60,27 @@ public class MailboxManagementTest {
 
         mailboxManagerManagement = new MailboxManagerManagement();
         mailboxManagerManagement.setMailboxManager(mailboxManager);
-        session = mailboxManager.createSystemSession("TEST");
+        session = mailboxManager.createSystemSession(Username.of("TEST"));
     }
 
     @Test
     void deleteMailboxesShouldDeleteMailboxes() throws Exception {
         mapperFactory.createMailboxMapper(session).save(new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY));
-        mailboxManagerManagement.deleteMailboxes(USER);
+        mailboxManagerManagement.deleteMailboxes(USER.asString());
         assertThat(mapperFactory.createMailboxMapper(session).list()).isEmpty();
     }
 
     @Test
     void deleteMailboxesShouldDeleteInbox() throws Exception {
         mapperFactory.createMailboxMapper(session).save(new Mailbox(MailboxPath.forUser(USER, "INBOX"), UID_VALIDITY));
-        mailboxManagerManagement.deleteMailboxes(USER);
+        mailboxManagerManagement.deleteMailboxes(USER.asString());
         assertThat(mapperFactory.createMailboxMapper(session).list()).isEmpty();
     }
 
     @Test
     void deleteMailboxesShouldDeleteMailboxesChildren() throws Exception {
         mapperFactory.createMailboxMapper(session).save(new Mailbox(MailboxPath.forUser(USER, "INBOX.test"), UID_VALIDITY));
-        mailboxManagerManagement.deleteMailboxes(USER);
+        mailboxManagerManagement.deleteMailboxes(USER.asString());
         assertThat(mapperFactory.createMailboxMapper(session).list()).isEmpty();
     }
 
@@ -87,22 +88,22 @@ public class MailboxManagementTest {
     void deleteMailboxesShouldNotDeleteMailboxesBelongingToNotPrivateNamespace() throws Exception {
         Mailbox mailbox = new Mailbox(new MailboxPath("#top", USER, "name"), UID_VALIDITY);
         mapperFactory.createMailboxMapper(session).save(mailbox);
-        mailboxManagerManagement.deleteMailboxes(USER);
+        mailboxManagerManagement.deleteMailboxes(USER.asString());
         assertThat(mapperFactory.createMailboxMapper(session).list()).containsExactly(mailbox);
     }
 
     @Test
     void deleteMailboxesShouldNotDeleteMailboxesBelongingToOtherUsers() throws Exception {
-        Mailbox mailbox = new Mailbox(MailboxPath.forUser("userbis", "name"), UID_VALIDITY);
+        Mailbox mailbox = new Mailbox(MailboxPath.forUser(Username.of("userbis"), "name"), UID_VALIDITY);
         mapperFactory.createMailboxMapper(session).save(mailbox);
-        mailboxManagerManagement.deleteMailboxes(USER);
+        mailboxManagerManagement.deleteMailboxes(USER.asString());
         assertThat(mapperFactory.createMailboxMapper(session).list()).containsExactly(mailbox);
     }
 
     @Test
     void deleteMailboxesShouldDeleteMailboxesWithEmptyNames() throws Exception {
         mapperFactory.createMailboxMapper(session).save(new Mailbox(MailboxPath.forUser(USER, ""), UID_VALIDITY));
-        mailboxManagerManagement.deleteMailboxes(USER);
+        mailboxManagerManagement.deleteMailboxes(USER.asString());
         assertThat(mapperFactory.createMailboxMapper(session).list()).isEmpty();
     }
 
@@ -123,13 +124,13 @@ public class MailboxManagementTest {
         mapperFactory.createMailboxMapper(session).save(new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY));
         mapperFactory.createMailboxMapper(session).save(new Mailbox(MailboxPath.forUser(USER, "INBOX"), UID_VALIDITY));
         mapperFactory.createMailboxMapper(session).save(new Mailbox(MailboxPath.forUser(USER, "INBOX.test"), UID_VALIDITY));
-        mailboxManagerManagement.deleteMailboxes(USER);
+        mailboxManagerManagement.deleteMailboxes(USER.asString());
         assertThat(mapperFactory.createMailboxMapper(session).list()).isEmpty();
     }
 
     @Test
     void createMailboxShouldCreateAMailbox() throws Exception {
-        mailboxManagerManagement.createMailbox(MailboxConstants.USER_NAMESPACE, USER, "name");
+        mailboxManagerManagement.createMailbox(MailboxConstants.USER_NAMESPACE, USER.asString(), "name");
         assertThat(mapperFactory.createMailboxMapper(session).list()).hasSize(1);
         assertThat(mapperFactory.createMailboxMapper(session).findMailboxByPath(MailboxPath.forUser(USER, "name"))).isNotNull();
     }
@@ -140,7 +141,7 @@ public class MailboxManagementTest {
         Mailbox mailbox = new Mailbox(path, UID_VALIDITY);
         mapperFactory.createMailboxMapper(session).save(mailbox);
 
-        assertThatThrownBy(() -> mailboxManagerManagement.createMailbox(MailboxConstants.USER_NAMESPACE, USER, "name"))
+        assertThatThrownBy(() -> mailboxManagerManagement.createMailbox(MailboxConstants.USER_NAMESPACE, USER.asString(), "name"))
             .isInstanceOf(RuntimeException.class)
             .hasCauseInstanceOf(MailboxExistsException.class);
     }
@@ -194,7 +195,7 @@ public class MailboxManagementTest {
     void listMailboxesShouldReturnUserMailboxes() throws Exception {
         Mailbox mailbox1 = new Mailbox(new MailboxPath("#top", USER, "name1"), UID_VALIDITY);
         Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(USER, "name2"), UID_VALIDITY);
-        Mailbox mailbox3 = new Mailbox(MailboxPath.forUser("other_user", "name3"), UID_VALIDITY);
+        Mailbox mailbox3 = new Mailbox(MailboxPath.forUser(Username.of("other_user"), "name3"), UID_VALIDITY);
         Mailbox mailbox4 = new Mailbox(MailboxPath.forUser(USER, "name4"), UID_VALIDITY);
         Mailbox mailbox5 = new Mailbox(MailboxPath.forUser(USER, "INBOX"), UID_VALIDITY);
         Mailbox mailbox6 = new Mailbox(MailboxPath.forUser(USER, "INBOX.toto"), UID_VALIDITY);
@@ -204,7 +205,7 @@ public class MailboxManagementTest {
         mapperFactory.createMailboxMapper(session).save(mailbox4);
         mapperFactory.createMailboxMapper(session).save(mailbox5);
         mapperFactory.createMailboxMapper(session).save(mailbox6);
-        assertThat(mailboxManagerManagement.listMailboxes(USER)).containsOnly("name2", "name4", "INBOX", "INBOX.toto");
+        assertThat(mailboxManagerManagement.listMailboxes(USER.asString())).containsOnly("name2", "name4", "INBOX", "INBOX.toto");
     }
 
     @Test
@@ -222,7 +223,7 @@ public class MailboxManagementTest {
     @Test
     void deleteMailboxShouldDeleteGivenMailbox() throws Exception {
         mapperFactory.createMailboxMapper(session).save(new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY));
-        mailboxManagerManagement.deleteMailbox(MailboxConstants.USER_NAMESPACE, USER, "name");
+        mailboxManagerManagement.deleteMailbox(MailboxConstants.USER_NAMESPACE, USER.asString(), "name");
         assertThat(mapperFactory.createMailboxMapper(session).list()).isEmpty();
     }
 
@@ -230,15 +231,15 @@ public class MailboxManagementTest {
     void deleteMailboxShouldNotDeleteGivenMailboxIfWrongNamespace() throws Exception {
         Mailbox mailbox = new Mailbox(new MailboxPath("#top", USER, "name"), UID_VALIDITY);
         mapperFactory.createMailboxMapper(session).save(mailbox);
-        mailboxManagerManagement.deleteMailbox(MailboxConstants.USER_NAMESPACE, USER, "name");
+        mailboxManagerManagement.deleteMailbox(MailboxConstants.USER_NAMESPACE, USER.asString(), "name");
         assertThat(mapperFactory.createMailboxMapper(session).list()).containsOnly(mailbox);
     }
 
     @Test
     void deleteMailboxShouldNotDeleteGivenMailboxIfWrongUser() throws Exception {
-        Mailbox mailbox = new Mailbox(MailboxPath.forUser("userbis", "name"), UID_VALIDITY);
+        Mailbox mailbox = new Mailbox(MailboxPath.forUser(Username.of("userbis"), "name"), UID_VALIDITY);
         mapperFactory.createMailboxMapper(session).save(mailbox);
-        mailboxManagerManagement.deleteMailbox(MailboxConstants.USER_NAMESPACE, USER, "name");
+        mailboxManagerManagement.deleteMailbox(MailboxConstants.USER_NAMESPACE, USER.asString(), "name");
         assertThat(mapperFactory.createMailboxMapper(session).list()).containsOnly(mailbox);
     }
 
@@ -246,7 +247,7 @@ public class MailboxManagementTest {
     void deleteMailboxShouldNotDeleteGivenMailboxIfWrongName() throws Exception {
         Mailbox mailbox = new Mailbox(MailboxPath.forUser(USER, "wrong_name"), UID_VALIDITY);
         mapperFactory.createMailboxMapper(session).save(mailbox);
-        mailboxManagerManagement.deleteMailbox(MailboxConstants.USER_NAMESPACE, USER, "name");
+        mailboxManagerManagement.deleteMailbox(MailboxConstants.USER_NAMESPACE, USER.asString(), "name");
         assertThat(mapperFactory.createMailboxMapper(session).list()).containsOnly(mailbox);
     }
 
@@ -256,7 +257,7 @@ public class MailboxManagementTest {
                 UID_VALIDITY);
         mapperFactory.createMailboxMapper(session).save(mailbox);
         String emlpath = ClassLoader.getSystemResource("eml/frnog.eml").getFile();
-        mailboxManagerManagement.importEmlFileToMailbox(MailboxConstants.USER_NAMESPACE, USER, "name", emlpath);
+        mailboxManagerManagement.importEmlFileToMailbox(MailboxConstants.USER_NAMESPACE, USER.asString(), "name", emlpath);
 
         assertThat(mapperFactory.getMessageMapper(session).countMessagesInMailbox(mailbox)).isEqualTo(1);
         Iterator<MailboxMessage> iterator = mapperFactory.getMessageMapper(session).findInMailbox(mailbox,
@@ -273,7 +274,7 @@ public class MailboxManagementTest {
                 UID_VALIDITY);
         mapperFactory.createMailboxMapper(session).save(mailbox);
         String emlpath = ClassLoader.getSystemResource("eml/frnog.eml").getFile();
-        mailboxManagerManagement.importEmlFileToMailbox(MailboxConstants.USER_NAMESPACE, USER, "name", "wrong_path" + emlpath);
+        mailboxManagerManagement.importEmlFileToMailbox(MailboxConstants.USER_NAMESPACE, USER.asString(), "name", "wrong_path" + emlpath);
 
         assertThat(mapperFactory.getMessageMapper(session).countMessagesInMailbox(mailbox)).isEqualTo(0);
         Iterator<MailboxMessage> iterator = mapperFactory.getMessageMapper(session).findInMailbox(mailbox,
diff --git a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/ReIndexerManagementTest.java b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/ReIndexerManagementTest.java
index 6d567e6..946d6a3 100644
--- a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/ReIndexerManagementTest.java
+++ b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/ReIndexerManagementTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.apache.james.core.Username;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.indexer.ReIndexer;
 import org.apache.james.mailbox.model.MailboxPath;
@@ -57,7 +58,7 @@ public class ReIndexerManagementTest {
 
         assertThat(taskManager.list()).isEmpty();
         testee.reIndex(namespace, user, name);
-        verify(reIndexer).reIndex(new MailboxPath(namespace, user, name));
+        verify(reIndexer).reIndex(new MailboxPath(namespace, Username.of(user), name));
         assertThat(taskManager.list()).hasSize(1);
     }
 
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
deleted file mode 100644
index c3bccbe..0000000
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/****************************************************************
- * 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.container.spring.tool;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.mail.MessagingException;
-
-import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.domainlist.api.DomainListException;
-import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.exception.MailboxExistsException;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailrepository.api.MailKey;
-import org.apache.james.mailrepository.api.MailRepository;
-import org.apache.james.mailrepository.api.MailRepositoryStore;
-import org.apache.james.mailrepository.api.MailRepositoryStore.MailRepositoryStoreException;
-import org.apache.james.mailrepository.api.MailRepositoryUrl;
-import org.apache.james.server.core.MimeMessageInputStream;
-import org.apache.james.user.api.UsersRepository;
-import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.mailet.Mail;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Tool to import James 2.3 users and mails into James 3.0.
- */
-public class James23Importer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(James23Importer.class);
-
-    /**
-     * James 3.0 users repository.
-     */
-    @Inject
-    private UsersRepository james30UsersRepository;
-
-    /**
-     * James 3.0 users repository.
-     */
-    @Inject
-    private MailRepositoryStore mailRepositoryStore;
-
-    /**
-     * James 3.0 domain list.
-     */
-    @Inject
-    private DomainList domainList;
-
-    /**
-     * The mailbox manager needed to copy the mails to.
-     */
-    @Inject
-    @Named("mailboxmanager")
-    private MailboxManager mailboxManager;
-
-    /**
-     * James 2.3 user repository defined by configuration.
-     */
-    @Inject
-    @Named("usersrepository23")
-    private UsersRepository james23UsersRepository;
-
-    /**
-     * Import 2.3 users to 3.0 users (taking virtualDomains into account)<br>
-     * Import 2.3 mails to 3.0 mails.
-     * 
-     * @throws MailRepositoryStoreException
-     * @throws MessagingException
-     * @throws UsersRepositoryException
-     * @throws DomainListException
-     * @throws IOException
-     * @throws MailboxException
-     */
-    public void importUsersAndMailsFromJames23(String james23MailRepositoryPath, String defaultPassword) throws MailRepositoryStoreException, MessagingException, UsersRepositoryException, DomainListException, MailboxException, IOException {
-        importUsersFromJames23(defaultPassword);
-        importMailsFromJames23(james23MailRepositoryPath);
-    }
-
-    /**
-     * Import 2.3 users to 3.0 users (taking virtualDomains into account)
-     * 
-     * @param defaultPassword
-     * @throws MessagingException
-     * @throws UsersRepositoryException
-     * @throws DomainListException
-     */
-    public void importUsersFromJames23(String defaultPassword) throws MessagingException, UsersRepositoryException, DomainListException {
-        Iterator<String> j23uIt = james23UsersRepository.list();
-        while (j23uIt.hasNext()) {
-            String userName23 = j23uIt.next();
-            String userName30 = convert23UserTo30(userName23);
-            james30UsersRepository.addUser(userName30, defaultPassword);
-            LOGGER.info("New user is copied from 2.3 to 3.0 with username={}", userName30);
-        }
-    }
-
-    /**
-     * Import 2.3 mails to 3.0 mails.
-     * 
-     * @param james23MailRepositoryPath
-     *            the 2.3 mail repository path to import from e.g.
-     *            file://var/mail/inboxes
-     * @throws MessagingException
-     * @throws MailRepositoryStoreException
-     * @throws UsersRepositoryException
-     * @throws IOException
-     * @throws MailboxException
-     * @throws DomainListException
-     */
-    public void importMailsFromJames23(String james23MailRepositoryPath) throws MessagingException, MailRepositoryStoreException, UsersRepositoryException, MailboxException, DomainListException {
-
-        Iterator<String> james23userRepositoryIterator = james23UsersRepository.list();
-
-        while (james23userRepositoryIterator.hasNext()) {
-
-            String userName23 = james23userRepositoryIterator.next();
-            MailRepository mailRepository = mailRepositoryStore.select(MailRepositoryUrl.from(james23MailRepositoryPath + "/" + userName23));
-            Iterator<MailKey> mailRepositoryIterator = mailRepository.list();
-
-            String userName30 = convert23UserTo30(userName23);
-
-
-            MailboxSession mailboxSession = mailboxManager.createSystemSession(userName30);
-            MailboxPath mailboxPath = MailboxPath.inbox(mailboxSession);
-
-            mailboxManager.startProcessingRequest(mailboxSession);
-            try {
-                mailboxManager.createMailbox(mailboxPath, mailboxSession);
-            } catch (MailboxExistsException e) {
-                // Do nothing, the mailbox already exists.
-            }
-            mailboxManager.endProcessingRequest(mailboxSession);
-
-            MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
-
-            while (mailRepositoryIterator.hasNext()) {
-                Mail mail = mailRepository.retrieve(mailRepositoryIterator.next());
-                mailboxManager.startProcessingRequest(mailboxSession);
-                messageManager.appendMessage(MessageManager.AppendCommand.builder()
-                    .build(new MimeMessageInputStream(mail.getMessage())), mailboxSession);
-                mailboxManager.endProcessingRequest(mailboxSession);
-            }
-
-        }
-
-    }
-
-    /**
-     * Utility method to convert a James 2.3 username to a James 3.0 username.
-     * To achieve this, we need to add the default James 3.0 domain because 2.3
-     * users have no domains.
-     * 
-     * @param userName23
-     * @return
-     * @throws DomainListException
-     */
-    private String convert23UserTo30(String userName23) throws DomainListException {
-        return userName23 + "@" + domainList.getDefaultDomain();
-    }
-
-}
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
deleted file mode 100644
index 2f0f203..0000000
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************
- * 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.container.spring.tool;
-
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * {@link James23Importer} support via JMX.
- */
-public class James23ImporterManagement implements James23ImporterManagementMBean {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(James23ImporterManagement.class);
-
-    @Inject
-    private James23Importer james23Importer;
-
-    @Override
-    public void importUsersAndMailsFromJames23(String james23MailRepositoryPath, String defaultPassword) throws Exception {
-        try {
-            james23Importer.importUsersAndMailsFromJames23(james23MailRepositoryPath, defaultPassword);
-        } catch (Exception e) {
-            throw new Exception("Error while importing users and mails", e);
-        }
-    }
-
-    @Override
-    public void importUsersFromJames23(String defaultPassword) throws Exception {
-        try {
-            james23Importer.importUsersFromJames23(defaultPassword);
-        } catch (Exception e) {
-            throw new Exception("Error while importing users", e);
-        }
-    }
-
-    @Override
-    public void importMailsFromJames23(String james23MailRepositoryPath) throws Exception {
-        try {
-            james23Importer.importMailsFromJames23(james23MailRepositoryPath);
-        } catch (Exception e) {
-            LOGGER.error("Error while importing mail", e);
-            throw new Exception(e.getMessage());
-        }
-    }
-
-}
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagementMBean.java b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagementMBean.java
deleted file mode 100644
index 212569d..0000000
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagementMBean.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************
- * 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.container.spring.tool;
-
-import org.apache.james.mailbox.MailboxManager;
-
-/**
- * Allow to copy {@link MailboxManager} contents from one to the other via JMX
- */
-public interface James23ImporterManagementMBean {
-    
-    /**
-     * First import users (each user is created with the given default  password), the
-     * import the mails for each users from the given mail repository path.
-     * 
-     * @param james23MailRepositoryPath
-     * @param defaultPassword
-     */
-    void importUsersAndMailsFromJames23(String james23MailRepositoryPath, String defaultPassword) throws Exception;
-
-    /**
-     * Import users (each user is created with the given default  password).
-     * 
-     * @param defaultPassword
-     * @throws Exception
-     */
-    void importUsersFromJames23(String defaultPassword) throws Exception;
-    
-    /**
-     * Import the mails for each users from the given mail repository path.
-     * 
-     * @param james23MailRepositoryPath
-     * @throws Exception
-     */
-    void importMailsFromJames23(String james23MailRepositoryPath) throws Exception;
-    
-}
diff --git a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java
index 8956cf8..263d9af 100644
--- a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java
+++ b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java
@@ -43,7 +43,7 @@ public interface UsersRepository {
      *             if error
      * 
      */
-    void addUser(String username, String password) throws UsersRepositoryException;
+    void addUser(Username username, String password) throws UsersRepositoryException;
 
     /**
      * Get the user object with the specified user name. Return null if no such
@@ -55,7 +55,7 @@ public interface UsersRepository {
      * @throws UsersRepositoryException
      *             if error
      */
-    User getUserByName(String name) throws UsersRepositoryException;
+    User getUserByName(Username name) throws UsersRepositoryException;
 
     /**
      * Update the repository with the specified user object. A user object with
@@ -74,7 +74,7 @@ public interface UsersRepository {
      * @throws UsersRepositoryException
      *             if error
      */
-    void removeUser(String name) throws UsersRepositoryException;
+    void removeUser(Username name) throws UsersRepositoryException;
 
     /**
      * Returns whether or not this user is in the repository
@@ -85,7 +85,7 @@ public interface UsersRepository {
      * @throws UsersRepositoryException
      *             if error
      */
-    boolean contains(String name) throws UsersRepositoryException;
+    boolean contains(Username name) throws UsersRepositoryException;
 
     /**
      * Test if user with name 'name' has password 'password'.
@@ -101,7 +101,7 @@ public interface UsersRepository {
      *             if error
      * 
      */
-    boolean test(String name, String password) throws UsersRepositoryException;
+    boolean test(Username name, String password) throws UsersRepositoryException;
 
     /**
      * Returns a count of the users in the repository.
@@ -120,7 +120,7 @@ public interface UsersRepository {
      * @throws UsersRepositoryException
      *             if error
      */
-    Iterator<String> list() throws UsersRepositoryException;
+    Iterator<Username> list() throws UsersRepositoryException;
 
     /**
      * Return true if virtualHosting support is enabled, otherwise false
@@ -136,7 +136,7 @@ public interface UsersRepository {
      * @return Username used by James for this mailAddress
      * @throws UsersRepositoryException
      */
-    String getUser(MailAddress mailAddress) throws UsersRepositoryException;
+    Username getUser(MailAddress mailAddress) throws UsersRepositoryException;
 
     /**
      * Returns one of the possible mail addresses to be used to send a mail to that user
@@ -148,11 +148,11 @@ public interface UsersRepository {
     /**
      * Return true if the user is an admin for this repository
      */
-    boolean isAdministrator(String username) throws UsersRepositoryException;
+    boolean isAdministrator(Username username) throws UsersRepositoryException;
 
     /**
-     * @return true if one can use {@link UsersRepository#updateUser(User)} {@link UsersRepository#addUser(String, String)}
-     *             {@link UsersRepository#removeUser(String)} and false overwhise
+     * @return true if one can use {@link UsersRepository#updateUser(User)} {@link UsersRepository#addUser(Username, String)}
+     *             {@link UsersRepository#removeUser(Username)} and false overwhise
      */
     boolean isReadOnly();
 
diff --git a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
index ee74984..8e262b1 100644
--- a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
+++ b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
@@ -19,6 +19,8 @@
 
 package org.apache.james.user.api;
 
+import org.apache.james.core.Username;
+
 /**
  * Expose user account management functionality through JMX.
  */
@@ -99,7 +101,7 @@ public interface UsersRepositoryManagementMBean {
      *             if error
      */
     @Deprecated
-    void unsetAlias(String userName) throws Exception;
+    void unsetAlias(Username userName) throws Exception;
 
     /**
      * Retrieves the user's alias, if set
@@ -110,7 +112,7 @@ public interface UsersRepositoryManagementMBean {
      *             if error
      */
     @Deprecated
-    String getAlias(String userName) throws Exception;
+    String getAlias(Username userName) throws Exception;
 
     /**
      * Removes a user's forward email address which terminates remote mail
@@ -123,7 +125,7 @@ public interface UsersRepositoryManagementMBean {
      *             if error
      */
     @Deprecated
-    void unsetForwardAddress(String userName) throws Exception;
+    void unsetForwardAddress(Username userName) throws Exception;
 
     /**
      * Retrieves the user's forward, if set
@@ -136,7 +138,7 @@ public interface UsersRepositoryManagementMBean {
      *             if error
      */
     @Deprecated
-    String getForwardAddress(String userName) throws Exception;
+    String getForwardAddress(Username userName) throws Exception;
 
     /**
      * Return true if the UserRepository has VirtualHosting enabled
diff --git a/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java b/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java
index 7aa04a8..c614ba0 100644
--- a/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java
+++ b/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java
@@ -31,7 +31,7 @@ public interface User {
      * 
      * @return the user name for this user
      */
-    String getUserName();
+    Username getUserName();
 
     /**
      * Return true if pass matches password of this user.
@@ -52,9 +52,9 @@ public interface User {
      */
     boolean setPassword(String newPass);
 
-    default boolean hasUsername(String username) {
-        Username thisUsername = Username.of(getUserName());
-        Username thatUsername = Username.of(username);
+    default boolean hasUsername(Username username) {
+        Username thisUsername = getUserName();
+        Username thatUsername = username;
 
         return thisUsername.equals(thatUsername);
     }
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
index 29b4f9d..0f07fcb 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
@@ -39,6 +39,7 @@ import java.util.Optional;
 import javax.inject.Inject;
 
 import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
+import org.apache.james.core.Username;
 import org.apache.james.user.api.AlreadyExistInUsersRepositoryException;
 import org.apache.james.user.api.UsersRepositoryException;
 import org.apache.james.user.api.model.User;
@@ -113,11 +114,11 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
     }
 
     @Override
-    public User getUserByName(String name) {
+    public User getUserByName(Username name) {
         return executor.executeSingleRow(
                 getUserStatement.bind()
-                    .setString(NAME, name.toLowerCase(Locale.US)))
-            .map(row -> new DefaultUser(row.getString(REALNAME), row.getString(PASSWORD), row.getString(ALGORITHM)))
+                    .setString(NAME, name.asString().toLowerCase(Locale.US)))
+            .map(row -> new DefaultUser(Username.of(row.getString(REALNAME)), row.getString(PASSWORD), row.getString(ALGORITHM)))
             .filter(user -> user.hasUsername(name))
             .blockOptional()
             .orElse(null);
@@ -129,10 +130,10 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
         DefaultUser defaultUser = (DefaultUser) user;
         boolean executed = executor.executeReturnApplied(
                 updateUserStatement.bind()
-                    .setString(REALNAME, defaultUser.getUserName())
+                    .setString(REALNAME, defaultUser.getUserName().asString())
                     .setString(PASSWORD, defaultUser.getHashedPassword())
                     .setString(ALGORITHM, defaultUser.getHashAlgorithm())
-                    .setString(NAME, defaultUser.getUserName().toLowerCase(Locale.US)))
+                    .setString(NAME, defaultUser.getUserName().asString().toLowerCase(Locale.US)))
             .block();
 
         if (!executed) {
@@ -141,24 +142,24 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
     }
 
     @Override
-    public void removeUser(String name) throws UsersRepositoryException {
+    public void removeUser(Username name) throws UsersRepositoryException {
         boolean executed = executor.executeReturnApplied(
             removeUserStatement.bind()
-                .setString(NAME, name))
+                .setString(NAME, name.asString()))
             .block();
 
         if (!executed) {
-            throw new UsersRepositoryException("unable to remove unknown user " + name);
+            throw new UsersRepositoryException("unable to remove unknown user " + name.asString());
         }
     }
 
     @Override
-    public boolean contains(String name) {
+    public boolean contains(Username name) {
         return getUserByName(name) != null;
     }
 
     @Override
-    public boolean test(String name, String password) throws UsersRepositoryException {
+    public boolean test(Username name, String password) throws UsersRepositoryException {
         return Optional.ofNullable(getUserByName(name))
                 .map(x -> x.verifyPassword(password))
             .orElseGet(() -> {
@@ -175,27 +176,28 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
     }
 
     @Override
-    public Iterator<String> list() throws UsersRepositoryException {
+    public Iterator<Username> list() throws UsersRepositoryException {
         return executor.executeRows(listStatement.bind())
             .map(row -> row.getString(REALNAME))
+            .map(Username::of)
             .toIterable()
             .iterator();
     }
 
     @Override
-    public void addUser(String username, String password) throws UsersRepositoryException {
+    public void addUser(Username username, String password) throws UsersRepositoryException {
         isValidUsername(username);
         doAddUser(username, password);
     }
 
     @Override
-    protected void doAddUser(String username, String password) throws UsersRepositoryException {
+    protected void doAddUser(Username username, String password) throws UsersRepositoryException {
         DefaultUser user = new DefaultUser(username, DEFAULT_ALGO_VALUE);
         user.setPassword(password);
         boolean executed = executor.executeReturnApplied(
             insertStatement.bind()
-                .setString(NAME, user.getUserName().toLowerCase(Locale.US))
-                .setString(REALNAME, user.getUserName())
+                .setString(NAME, user.getUserName().asString().toLowerCase(Locale.US))
+                .setString(REALNAME, user.getUserName().asString())
                 .setString(PASSWORD, user.getHashedPassword())
                 .setString(ALGORITHM, user.getHashAlgorithm()))
             .block();
diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
index 2d549e8..9089cd3 100644
--- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
@@ -366,7 +366,7 @@ public class SieveFileRepository implements SieveRepository {
             try {
                 FileUtils.forceMkdir(getUserDirectoryFile(username));
             } catch (IOException e) {
-                throw new StorageException("Error while creating directory for " + username, e);
+                throw new StorageException("Error while creating directory for " + username.asString(), e);
             }
         }
     }
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenDAO.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenDAO.java
index 23e761a..79851fe 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenDAO.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenDAO.java
@@ -33,12 +33,14 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
+import org.apache.james.core.Username;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.cassandra.access.table.CassandraAccessTokenTable;
 
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;
 import com.google.common.primitives.Ints;
+
 import reactor.core.publisher.Mono;
 
 public class CassandraAccessTokenDAO {
@@ -70,10 +72,10 @@ public class CassandraAccessTokenDAO {
             .where(eq(CassandraAccessTokenTable.TOKEN, bindMarker(CassandraAccessTokenTable.TOKEN))));
     }
 
-    public Mono<Void> addToken(String username, AccessToken accessToken) {
+    public Mono<Void> addToken(Username username, AccessToken accessToken) {
         return cassandraAsyncExecutor.executeVoid(insertStatement.bind()
             .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.asUUID())
-            .setString(CassandraAccessTokenTable.USERNAME, username)
+            .setString(CassandraAccessTokenTable.USERNAME, username.asString())
             .setInt(TTL, durationInSeconds));
     }
 
@@ -82,9 +84,10 @@ public class CassandraAccessTokenDAO {
             .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.asUUID()));
     }
 
-    public Mono<String> getUsernameFromToken(AccessToken accessToken) {
+    public Mono<Username> getUsernameFromToken(AccessToken accessToken) {
         return cassandraAsyncExecutor.executeSingleRow(selectStatement.bind()
                 .setUUID(CassandraAccessTokenTable.TOKEN, accessToken.asUUID()))
-            .map(row -> row.getString(CassandraAccessTokenTable.USERNAME));
+            .map(row -> row.getString(CassandraAccessTokenTable.USERNAME))
+            .map(Username::of);
     }
... 9395 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 35/44: [Refactoring] MessageResultImpl: headers are never null

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 57da2c3ded75f9c1503a360eb57fb4d52dd8f59d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Nov 15 10:24:32 2019 +0700

    [Refactoring] MessageResultImpl: headers are never null
---
 .../main/java/org/apache/james/mailbox/store/MessageResultImpl.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index fb3b9cb..18cb8ea 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -54,9 +54,9 @@ public class MessageResultImpl implements MessageResult {
 
     private final Map<MimePath, PartContent> partsByPath = new HashMap<>();
     private final MailboxMessage message;
+    private final HeadersImpl headers;
 
     private MimeDescriptor mimeDescriptor;
-    private HeadersImpl headers;
     private Content fullContent;
     private Content bodyContent;
 
@@ -305,9 +305,6 @@ public class MessageResultImpl implements MessageResult {
     
     @Override
     public Headers getHeaders() {
-        if (headers == null) {
-            headers = new HeadersImpl(message);
-        }
         return headers;
     }
     


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 39/44: JAMES-2632 Add MailboxCounters to mailbox metadata

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit c1b5058b16d2f0b72def97109ad8cda6835da1c1
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 7 14:41:39 2019 +0700

    JAMES-2632 Add MailboxCounters to mailbox metadata
---
 .../james/mailbox/model/MailboxMetaData.java       | 15 ++++++++++--
 .../james/mailbox/store/StoreMailboxManager.java   | 27 ++++++++++++++++++----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java
index 004dfff..0cd4dc8 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java
@@ -61,7 +61,12 @@ public class MailboxMetaData implements Comparable<MailboxMetaData> {
     }
 
     public static MailboxMetaData unselectableMailbox(MailboxPath path, MailboxId mailboxId, char delimiter) {
-        return new MailboxMetaData(path, mailboxId, delimiter, Children.CHILDREN_ALLOWED_BUT_UNKNOWN, Selectability.NONE, new MailboxACL());
+        return new MailboxMetaData(path, mailboxId, delimiter, Children.CHILDREN_ALLOWED_BUT_UNKNOWN, Selectability.NONE, new MailboxACL(),
+            MailboxCounters.builder()
+                .mailboxId(mailboxId)
+                .count(0)
+                .unseen(0)
+                .build());
     }
 
     public static  final Comparator<MailboxMetaData> COMPARATOR = Comparator
@@ -74,14 +79,20 @@ public class MailboxMetaData implements Comparable<MailboxMetaData> {
     private final Selectability selectability;
     private final MailboxId mailboxId;
     private final MailboxACL resolvedAcls;
+    private final MailboxCounters counters;
 
-    public MailboxMetaData(MailboxPath path, MailboxId mailboxId, char delimiter, Children inferiors, Selectability selectability, MailboxACL resolvedAcls) {
+    public MailboxMetaData(MailboxPath path, MailboxId mailboxId, char delimiter, Children inferiors, Selectability selectability, MailboxACL resolvedAcls, MailboxCounters counters) {
         this.path = path;
         this.mailboxId = mailboxId;
         this.delimiter = delimiter;
         this.inferiors = inferiors;
         this.selectability = selectability;
         this.resolvedAcls = resolvedAcls;
+        this.counters = counters;
+    }
+
+    public MailboxCounters getCounters() {
+        return counters;
     }
 
     public MailboxACL getResolvedAcls() {
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 6d36a28..b80196b 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
@@ -86,7 +86,9 @@ import org.slf4j.LoggerFactory;
 
 import com.github.fge.lambdas.Throwing;
 import com.github.steveash.guavate.Guavate;
+import com.google.common.base.Functions;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 
@@ -575,15 +577,23 @@ public class StoreMailboxManager implements MailboxManager {
             .filter(Throwing.predicate(mailbox -> storeRightManager.hasRight(mailbox, right, session)))
             .collect(Guavate.toImmutableList());
 
+        ImmutableMap<MailboxId, MailboxCounters> counters = getMailboxCounters(mailboxes, session)
+            .stream()
+            .collect(Guavate.toImmutableMap(
+                MailboxCounters::getMailboxId,
+                Functions.identity()));
+
         return mailboxes
             .stream()
             .filter(mailboxQuery::matches)
-            .map(Throwing.<Mailbox, MailboxMetaData>function(mailbox -> toMailboxMetadata(session, mailboxes, mailbox)).sneakyThrow())
+            .map(Throwing.<Mailbox, MailboxMetaData>function(
+                mailbox -> toMailboxMetadata(session, mailboxes, mailbox, retrieveCounters(counters, mailbox)))
+                .sneakyThrow())
             .sorted(MailboxMetaData.COMPARATOR)
             .collect(Guavate.toImmutableList());
     }
 
-    public static MailboxQuery.UserBound toSingleUserQuery(MailboxQuery mailboxQuery, MailboxSession mailboxSession) {
+    static MailboxQuery.UserBound toSingleUserQuery(MailboxQuery mailboxQuery, MailboxSession mailboxSession) {
         return MailboxQuery.builder()
             .namespace(mailboxQuery.getNamespace().orElse(MailboxConstants.USER_NAMESPACE))
             .username(mailboxQuery.getUser().orElse(mailboxSession.getUser()))
@@ -593,6 +603,14 @@ public class StoreMailboxManager implements MailboxManager {
             .asUserBound();
     }
 
+    private MailboxCounters retrieveCounters(ImmutableMap<MailboxId, MailboxCounters> counters, Mailbox mailbox) {
+        return counters.getOrDefault(mailbox.getMailboxId(), MailboxCounters.builder()
+            .mailboxId(mailbox.getMailboxId())
+            .count(0)
+            .unseen(0)
+            .build());
+    }
+
     private Stream<Mailbox> getDelegatedMailboxes(MailboxMapper mailboxMapper, MailboxQuery mailboxQuery,
                                                   Right right, MailboxSession session) throws MailboxException {
         if (mailboxQuery.isPrivateMailboxes(session)) {
@@ -601,14 +619,15 @@ public class StoreMailboxManager implements MailboxManager {
         return mailboxMapper.findNonPersonalMailboxes(session.getUser(), right).stream();
     }
 
-    private MailboxMetaData toMailboxMetadata(MailboxSession session, List<Mailbox> mailboxes, Mailbox mailbox) throws UnsupportedRightException {
+    private MailboxMetaData toMailboxMetadata(MailboxSession session, List<Mailbox> mailboxes, Mailbox mailbox, MailboxCounters counters) throws UnsupportedRightException {
         return new MailboxMetaData(
             mailbox.generateAssociatedPath(),
             mailbox.getMailboxId(),
             getDelimiter(),
             computeChildren(session, mailboxes, mailbox),
             Selectability.NONE,
-            storeRightManager.getResolvedMailboxACL(mailbox, session));
+            storeRightManager.getResolvedMailboxACL(mailbox, session),
+            counters);
     }
 
     private MailboxMetaData.Children computeChildren(MailboxSession session, List<Mailbox> potentialChildren, Mailbox mailbox) {


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 07/44: JAMES-2972 commented-out WithPriority mailet/matcher, added description/explanation for both

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 19f9b64c7239037fa194e693604cc12397404b17
Author: Joerg Thomas <jo...@consol.de>
AuthorDate: Thu Nov 14 11:10:36 2019 +0100

    JAMES-2972 commented-out WithPriority mailet/matcher, added description/explanation for both
---
 server/app/src/main/resources/mailetcontainer.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/app/src/main/resources/mailetcontainer.xml b/server/app/src/main/resources/mailetcontainer.xml
index dba24bd..baeeeef 100644
--- a/server/app/src/main/resources/mailetcontainer.xml
+++ b/server/app/src/main/resources/mailetcontainer.xml
@@ -56,14 +56,22 @@
        <!-- Important check to avoid looping -->
        <mailet match="RelayLimit=30" class="Null"/>
 
+        <!-- The WithPriority mailet allows to set a priority attribute on the mail. If the
+             attribute is set and priority handling is enabled it will take care of moving the
+             Mails with higher priority to the head of the queue (so the mails are faster handled). -->
+        <!--
         <mailet match="All" class="WithPriority">
             <priority>8</priority>
         </mailet>
-
+        -->
+        <!-- Using the following three matchers you can control the mail processing flow based
+             on the priority attribute. Note that if a mail's priority is set to 8, then all of
+             the below will match. -->
+        <!--
         <mailet match="HasPriority=8" class="Null"/>
         <mailet match="AtLeastPriority=8" class="Null"/>
         <mailet match="AtMostPriority=8" class="Null"/>
-
+        -->
 
         <!-- Check attachment extensions for possible viruses -->
        <!-- The "-z" option requests the check to be non-recursively applied -->


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 02/44: Request for comment: make UsersRepository case insensitive.

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 733d51b0f5b63c42240cc08e1fb570d5f348fe51
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Fri Nov 8 15:47:02 2019 +0100

    Request for comment: make UsersRepository case insensitive.
    
    Probably need some migrations instructions and to write an ADR about this?
---
 .../main/java/org/apache/james/core/Username.java   |  5 +++++
 .../james/mailbox/jpa/mail/JPAMailboxMapper.java    | 20 ++++++--------------
 .../user/cassandra/CassandraUsersRepository.java    |  8 +++-----
 .../apache/james/user/jpa/JPAUsersRepository.java   |  8 ++++----
 .../org/apache/james/user/jpa/model/JPAUser.java    |  2 +-
 .../james/user/lib/AbstractUsersRepositoryTest.java |  9 +++++----
 .../james/user/memory/MemoryUsersRepository.java    | 21 ++++++++-------------
 7 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/core/src/main/java/org/apache/james/core/Username.java b/core/src/main/java/org/apache/james/core/Username.java
index 3c3d5dd..b29e9b8 100644
--- a/core/src/main/java/org/apache/james/core/Username.java
+++ b/core/src/main/java/org/apache/james/core/Username.java
@@ -20,6 +20,7 @@
 package org.apache.james.core;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -119,6 +120,10 @@ public class Username {
             .orElse(localPart);
     }
 
+    public String asId() {
+        return asString().toLowerCase(Locale.US);
+    }
+
     public MailAddress asMailAddress() throws AddressException {
         Preconditions.checkState(hasDomainPart());
         return new MailAddress(localPart, domainPart.get());
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
index 29114b5..b38874a 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
@@ -128,20 +128,12 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
     @Override
     public Mailbox findMailboxByPath(MailboxPath mailboxPath) throws MailboxException, MailboxNotFoundException {
         try {
-            if (mailboxPath.getUser() == null) {
-                return getEntityManager().createNamedQuery("findMailboxByName", JPAMailbox.class)
-                    .setParameter("nameParam", mailboxPath.getName())
-                    .setParameter("namespaceParam", mailboxPath.getNamespace())
-                    .getSingleResult()
-                    .toMailbox();
-            } else {
-                return getEntityManager().createNamedQuery("findMailboxByNameWithUser", JPAMailbox.class)
-                    .setParameter("nameParam", mailboxPath.getName())
-                    .setParameter("namespaceParam", mailboxPath.getNamespace())
-                    .setParameter("userParam", mailboxPath.getUser())
-                    .getSingleResult()
-                    .toMailbox();
-            }
+            return getEntityManager().createNamedQuery("findMailboxByNameWithUser", JPAMailbox.class)
+                .setParameter("nameParam", mailboxPath.getName())
+                .setParameter("namespaceParam", mailboxPath.getNamespace())
+                .setParameter("userParam", mailboxPath.getUser().asString())
+                .getSingleResult()
+                .toMailbox();
         } catch (NoResultException e) {
             throw new MailboxNotFoundException(mailboxPath);
         } catch (PersistenceException e) {
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
index 0f07fcb..cd8070b 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
@@ -33,7 +33,6 @@ import static org.apache.james.user.cassandra.tables.CassandraUserTable.REALNAME
 import static org.apache.james.user.cassandra.tables.CassandraUserTable.TABLE_NAME;
 
 import java.util.Iterator;
-import java.util.Locale;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -117,9 +116,8 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
     public User getUserByName(Username name) {
         return executor.executeSingleRow(
                 getUserStatement.bind()
-                    .setString(NAME, name.asString().toLowerCase(Locale.US)))
+                    .setString(NAME, name.asId()))
             .map(row -> new DefaultUser(Username.of(row.getString(REALNAME)), row.getString(PASSWORD), row.getString(ALGORITHM)))
-            .filter(user -> user.hasUsername(name))
             .blockOptional()
             .orElse(null);
     }
@@ -133,7 +131,7 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
                     .setString(REALNAME, defaultUser.getUserName().asString())
                     .setString(PASSWORD, defaultUser.getHashedPassword())
                     .setString(ALGORITHM, defaultUser.getHashAlgorithm())
-                    .setString(NAME, defaultUser.getUserName().asString().toLowerCase(Locale.US)))
+                    .setString(NAME, defaultUser.getUserName().asId()))
             .block();
 
         if (!executed) {
@@ -196,7 +194,7 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
         user.setPassword(password);
         boolean executed = executor.executeReturnApplied(
             insertStatement.bind()
-                .setString(NAME, user.getUserName().asString().toLowerCase(Locale.US))
+                .setString(NAME, user.getUserName().asId())
                 .setString(REALNAME, user.getUserName().asString())
                 .setString(PASSWORD, user.getHashedPassword())
                 .setString(ALGORITHM, user.getHashAlgorithm()))
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
index 45f8fd7..369bb38 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
@@ -40,11 +40,11 @@ import org.apache.james.user.api.UsersRepositoryException;
 import org.apache.james.user.api.model.User;
 import org.apache.james.user.jpa.model.JPAUser;
 import org.apache.james.user.lib.AbstractUsersRepository;
-
-import com.github.steveash.guavate.Guavate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.steveash.guavate.Guavate;
+
 /**
  * JPA based UserRepository
  */
@@ -87,7 +87,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
         EntityManager entityManager = entityManagerFactory.createEntityManager();
 
         try {
-            return (JPAUser) entityManager.createNamedQuery("findUserByName").setParameter("name", name.asString()).getSingleResult();
+            return (JPAUser) entityManager.createNamedQuery("findUserByName").setParameter("name", name.asId()).getSingleResult();
         } catch (NoResultException e) {
             return null;
         } catch (PersistenceException e) {
@@ -160,7 +160,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
         final EntityTransaction transaction = entityManager.getTransaction();
         try {
             transaction.begin();
-            if (entityManager.createNamedQuery("deleteUserByName").setParameter("name", name.asString()).executeUpdate() < 1) {
+            if (entityManager.createNamedQuery("deleteUserByName").setParameter("name", name.asId()).executeUpdate() < 1) {
                 transaction.commit();
                 throw new UsersRepositoryException("User " + name.asString() + " does not exist");
             } else {
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
index 289cef7..fc805c5 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
@@ -42,7 +42,7 @@ import com.google.common.hash.Hashing;
 @Entity(name = "JamesUser")
 @Table(name = "JAMES_USER")
 @NamedQueries({ 
-    @NamedQuery(name = "findUserByName", query = "SELECT user FROM JamesUser user WHERE user.name=:name"), 
+    @NamedQuery(name = "findUserByName", query = "SELECT user FROM JamesUser user WHERE LOWER(user.name)=:name"),
     @NamedQuery(name = "deleteUserByName", query = "DELETE FROM JamesUser user WHERE user.name=:name"),
     @NamedQuery(name = "containsUser", query = "SELECT COUNT(user) FROM JamesUser user WHERE user.name=:name"), 
     @NamedQuery(name = "countUsers", query = "SELECT COUNT(user) FROM JamesUser user"), 
diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
index f297179..3919ea3 100644
--- a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
@@ -179,13 +179,14 @@ public abstract class AbstractUsersRepositoryTest {
     }
 
     @Test
-    public void getUserByNameShouldReturnNullWhenDifferentCase() throws UsersRepositoryException {
+    public void getUserByNameShouldReturnUserWhenDifferentCase() throws UsersRepositoryException {
         //Given
         usersRepository.addUser(login("username"), "password");
         //When
         User actual = usersRepository.getUserByName(login("uSERNAMe"));
         //Then
-        assertThat(actual).isNull();
+        assertThat(actual).isNotNull();
+        assertThat(actual.getUserName()).isEqualTo(user1);
     }
    
     @Test
@@ -243,13 +244,13 @@ public abstract class AbstractUsersRepositoryTest {
     }
 
     @Test
-    public void testShouldReturnFalseWhenAUserHasAnIncorrectCaseName() throws UsersRepositoryException {
+    public void testShouldReturnTrueWhenAUserHasAnIncorrectCaseName() throws UsersRepositoryException {
         //Given
         usersRepository.addUser(login("username"), "password");
         //When
         boolean actual = usersRepository.test(login("userName"), "password");
         //Then
-        assertThat(actual).isFalse();
+        assertThat(actual).isTrue();
     }
 
     @Test
diff --git a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
index 99f2ec2..f7d74c2 100644
--- a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
+++ b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
@@ -21,7 +21,6 @@ package org.apache.james.user.memory;
 
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 
@@ -73,12 +72,12 @@ public class MemoryUsersRepository extends AbstractUsersRepository {
     protected void doAddUser(Username username, String password) throws UsersRepositoryException {
         DefaultUser user = new DefaultUser(username, algo);
         user.setPassword(password);
-        userByName.put(toKey(username), user);
+        userByName.put(username.asId(), user);
     }
 
     @Override
     public User getUserByName(Username name) throws UsersRepositoryException {
-        return userByName.get(toKey(name));
+        return userByName.get(name.asId());
     }
 
     @Override
@@ -87,24 +86,24 @@ public class MemoryUsersRepository extends AbstractUsersRepository {
         if (existingUser == null) {
             throw new UsersRepositoryException("Please provide an existing user to update");
         }
-        userByName.put(toKey(user.getUserName()), user);
+        userByName.put(user.getUserName().asId(), user);
     }
 
     @Override
     public void removeUser(Username name) throws UsersRepositoryException {
-        if (userByName.remove(toKey(name)) == null) {
+        if (userByName.remove(name.asId()) == null) {
             throw new UsersRepositoryException("unable to remove unknown user " + name.asString());
         }
     }
 
     @Override
     public boolean contains(Username name) throws UsersRepositoryException {
-        return userByName.containsKey(toKey(name));
+        return userByName.containsKey(name.asId());
     }
 
     @Override
     public boolean test(Username name, final String password) throws UsersRepositoryException {
-        return Optional.ofNullable(userByName.get(toKey(name)))
+        return Optional.ofNullable(userByName.get(name.asId()))
             .map(user -> user.verifyPassword(password))
             .orElse(false);
     }
@@ -116,13 +115,9 @@ public class MemoryUsersRepository extends AbstractUsersRepository {
 
     @Override
     public Iterator<Username> list() throws UsersRepositoryException {
-        return userByName.values()
+        return userByName.keySet()
             .stream()
-            .map(User::getUserName)
+            .map(Username::of)
             .iterator();
     }
-
-    private String toKey(Username username) {
-        return username.asString().toLowerCase(Locale.US);
-    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 33/44: [Refactoring] ResultHeader: PartContentBuilder reindex switch

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 7708ca464af1c89d852bea5542a4cd491a236484
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:39:52 2019 +0700

    [Refactoring] ResultHeader: PartContentBuilder reindex switch
---
 .../store/streaming/PartContentBuilder.java        | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
index 6ef12fe..f8e560f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
@@ -132,19 +132,19 @@ public class PartContentBuilder {
                 case T_START_MULTIPART:
                     ignoreInnerMessage();
                     break;
-            case T_BODY:
-            case T_END_BODYPART:
-            case T_END_HEADER:
-            case T_END_MESSAGE:
-            case T_END_MULTIPART:
-            case T_EPILOGUE:
-            case T_FIELD:
-            case T_PREAMBLE:
-            case T_RAW_ENTITY:
-            case T_START_BODYPART:
-            case T_START_HEADER:
-            case T_START_MESSAGE:
-                break;
+                case T_BODY:
+                case T_END_BODYPART:
+                case T_END_HEADER:
+                case T_END_MESSAGE:
+                case T_END_MULTIPART:
+                case T_EPILOGUE:
+                case T_FIELD:
+                case T_PREAMBLE:
+                case T_RAW_ENTITY:
+                case T_START_BODYPART:
+                case T_START_HEADER:
+                case T_START_MESSAGE:
+                    break;
             }
         }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 22/44: [Refactoring] MessageResultImpl: optimize import

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 9ded6a8a2bf154dcbab802e4bc6d4d46ca1100a7
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:27:27 2019 +0700

    [Refactoring] MessageResultImpl: optimize import
---
 .../store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
index 0f1395a..96a64ac 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
@@ -21,7 +21,6 @@ package org.apache.james.mailbox.store;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 32/44: [Refactoring] ResultHeader: remove not thrown exception

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 49565e712e5798cc3b332e8b0a7146679fd358fa
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:38:06 2019 +0700

    [Refactoring] ResultHeader: remove not thrown exception
---
 .../store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
index 860bce9..f1424f2 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
@@ -25,7 +25,6 @@ package org.apache.james.mailbox.store;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.james.mailbox.model.MessageResult;


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 27/44: [Refactoring] MimeDescriptorImpl: Constructor should be private

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 732e7228241b4a60a50032e623b6f2960a794f07
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Nov 14 11:34:00 2019 +0700

    [Refactoring] MimeDescriptorImpl: Constructor should be private
---
 .../apache/james/mailbox/store/MimeDescriptorImpl.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index 4c43e1f..8e600c0 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -189,14 +189,14 @@ public class MimeDescriptorImpl implements MimeDescriptor {
     private final String location;
     private final String md5;
 
-    public MimeDescriptorImpl(long bodyOctets,
-            String contentDescription, String contentId,
-            long lines, String subType, String type,
-            String transferEncoding, Collection<MessageResult.Header> headers,
-            Map<String, String> contentTypeParameters, List<String> languages,
-            String disposition, Map<String, String> dispositionParams,
-            MimeDescriptor embeddedMessage, Collection<MimeDescriptor> parts,
-            String location, String md5) {
+    private MimeDescriptorImpl(long bodyOctets,
+                               String contentDescription, String contentId,
+                               long lines, String subType, String type,
+                               String transferEncoding, Collection<MessageResult.Header> headers,
+                               Map<String, String> contentTypeParameters, List<String> languages,
+                               String disposition, Map<String, String> dispositionParams,
+                               MimeDescriptor embeddedMessage, Collection<MimeDescriptor> parts,
+                               String location, String md5) {
         super();
         this.type = type;
         this.bodyOctets = bodyOctets;


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 09/44: JAMES-2972 log at debug level when null mailet destroys a mail

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 9e521d0ba7ca023afa06e2f7ecb56ef8b1f71bb5
Author: Joerg Thomas <jo...@consol.de>
AuthorDate: Thu Nov 14 13:18:32 2019 +0100

    JAMES-2972 log at debug level when null mailet destroys a mail
---
 .../src/main/java/org/apache/james/transport/mailets/Null.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java
index 53038fa..8fb0dba 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/Null.java
@@ -23,15 +23,20 @@ package org.apache.james.transport.mailets;
 
 import org.apache.mailet.Mail;
 import org.apache.mailet.base.GenericMailet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Simplest Mailet which destroys any incoming messages
  * by setting their state to GHOST
  */
 public class Null extends GenericMailet {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Null.class);
 
     @Override
     public void service(Mail mail) {
+        LOGGER.debug("Null mailet is destroying mail {} from {} for {}", mail.getName(), mail.getMaybeSender(),
+                mail.getRecipients());
         mail.setState(Mail.GHOST);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 38/44: JAMES-2632 Add mailboxId in mailbox counter

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 3281e542aaab18ae4187b60dd643269a841d8efb
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Oct 16 18:11:02 2019 +0700

    JAMES-2632 Add mailboxId in mailbox counter
---
 .../james/mailbox/model/MailboxCounters.java       | 22 ++++++++++++++++++----
 .../apache/james/mailbox/MailboxManagerTest.java   | 10 ++++++----
 .../cassandra/mail/CassandraMailboxCounterDAO.java |  2 ++
 .../cassandra/mail/CassandraMessageMapper.java     | 10 ----------
 .../mail/CassandraMailboxCounterDAOTest.java       |  3 +++
 .../james/mailbox/jpa/mail/JPAMessageMapper.java   |  1 +
 .../jpa/mail/TransactionalMessageMapper.java       |  1 +
 .../james/mailbox/store/StoreMessageManager.java   | 11 +++++------
 .../mailbox/store/mail/AbstractMessageMapper.java  |  1 +
 .../StoreMailboxMessageResultIteratorTest.java     |  1 +
 10 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxCounters.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxCounters.java
index 324149d..270eb4e 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxCounters.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxCounters.java
@@ -29,6 +29,12 @@ public class MailboxCounters {
     public static class Builder {
         private Optional<Long> count = Optional.empty();
         private Optional<Long> unseen = Optional.empty();
+        private Optional<MailboxId> mailboxId = Optional.empty();
+
+        public Builder mailboxId(MailboxId mailboxId) {
+            this.mailboxId = Optional.of(mailboxId);
+            return this;
+        }
 
         public Builder count(long count) {
             this.count = Optional.of(count);
@@ -43,7 +49,8 @@ public class MailboxCounters {
         public MailboxCounters build() {
             Preconditions.checkState(count.isPresent(), "count is compulsory");
             Preconditions.checkState(unseen.isPresent(), "unseen is compulsory");
-            return new MailboxCounters(count.get(), unseen.get());
+            Preconditions.checkState(mailboxId.isPresent(), "mailboxId is compulsory");
+            return new MailboxCounters(mailboxId.get(), count.get(), unseen.get());
         }
     }
 
@@ -51,14 +58,20 @@ public class MailboxCounters {
         return new Builder();
     }
 
+    private final MailboxId mailboxId;
     private final long count;
     private final long unseen;
 
-    private MailboxCounters(long count, long unseen) {
+    private MailboxCounters(MailboxId mailboxId, long count, long unseen) {
+        this.mailboxId = mailboxId;
         this.count = count;
         this.unseen = unseen;
     }
 
+    public MailboxId getMailboxId() {
+        return mailboxId;
+    }
+
     public long getCount() {
         return count;
     }
@@ -73,13 +86,14 @@ public class MailboxCounters {
             MailboxCounters that = (MailboxCounters) o;
 
             return Objects.equal(this.count, that.count)
-                && Objects.equal(this.unseen, that.unseen);
+                && Objects.equal(this.unseen, that.unseen)
+                && Objects.equal(this.mailboxId, that.mailboxId);
         }
         return false;
     }
 
     @Override
     public final int hashCode() {
-        return Objects.hashCode(count, unseen);
+        return Objects.hashCode(count, unseen, mailboxId);
     }
 }
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 5f634be..14fd87e 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
@@ -965,7 +965,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
             MailboxSession session1 = mailboxManager.createSystemSession(USER_1);
             MailboxSession session2 = mailboxManager.createSystemSession(USER_2);
             MailboxPath inbox1 = MailboxPath.inbox(session1);
-            mailboxManager.createMailbox(inbox1, session1);
+            Optional<MailboxId> mailboxIdInbox1 = mailboxManager.createMailbox(inbox1, session1);
             mailboxManager.setRights(inbox1,
                 MailboxACL.EMPTY.apply(MailboxACL.command()
                     .forUser(USER_2)
@@ -1271,7 +1271,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
             MailboxSession session1 = mailboxManager.createSystemSession(USER_1);
             MailboxSession session2 = mailboxManager.createSystemSession(USER_2);
             MailboxPath inbox1 = MailboxPath.inbox(session1);
-            mailboxManager.createMailbox(inbox1, session1);
+            Optional<MailboxId> mailboxIdInbox1 = mailboxManager.createMailbox(inbox1, session1);
             mailboxManager.setRights(inbox1,
                 MailboxACL.EMPTY.apply(MailboxACL.command()
                     .forUser(USER_2)
@@ -1303,7 +1303,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
             MailboxSession session1 = mailboxManager.createSystemSession(USER_1);
             MailboxSession session2 = mailboxManager.createSystemSession(USER_2);
             MailboxPath inbox1 = MailboxPath.inbox(session1);
-            mailboxManager.createMailbox(inbox1, session1);
+            Optional<MailboxId> mailboxIdInbox1 = mailboxManager.createMailbox(inbox1, session1);
             mailboxManager.setRights(inbox1,
                 MailboxACL.EMPTY.apply(MailboxACL.command()
                     .forUser(USER_2)
@@ -1318,6 +1318,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
 
             assertThat(mailboxCounters)
                 .isEqualTo(MailboxCounters.builder()
+                    .mailboxId(mailboxIdInbox1.get())
                     .count(0)
                     .unseen(0)
                     .build());
@@ -1329,7 +1330,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
             MailboxSession session1 = mailboxManager.createSystemSession(USER_1);
             MailboxSession session2 = mailboxManager.createSystemSession(USER_2);
             MailboxPath inbox1 = MailboxPath.inbox(session1);
-            mailboxManager.createMailbox(inbox1, session1);
+            Optional<MailboxId> mailboxIdInbox1 = mailboxManager.createMailbox(inbox1, session1);
             mailboxManager.setRights(inbox1,
                 MailboxACL.EMPTY.apply(MailboxACL.command()
                     .forUser(USER_2)
@@ -1347,6 +1348,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
 
             assertThat(mailboxCounters)
                 .isEqualTo(MailboxCounters.builder()
+                    .mailboxId(mailboxIdInbox1.get())
                     .count(1)
                     .unseen(1)
                     .build());
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
index d1c3180..0c12e28 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
@@ -39,6 +39,7 @@ import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.querybuilder.Assignment;
+
 import reactor.core.publisher.Mono;
 
 public class CassandraMailboxCounterDAO {
@@ -77,6 +78,7 @@ public class CassandraMailboxCounterDAO {
     public Mono<MailboxCounters> retrieveMailboxCounters(CassandraId mailboxId) {
         return cassandraAsyncExecutor.executeSingleRow(bindWithMailbox(mailboxId, readStatement))
             .map(row ->  MailboxCounters.builder()
+                .mailboxId(mailboxId)
                 .count(row.getLong(CassandraMailboxCountersTable.COUNT))
                 .unseen(row.getLong(CassandraMailboxCountersTable.UNSEEN))
                 .build());
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
index de6407ff..675d648 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -65,10 +65,6 @@ import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
 public class CassandraMessageMapper implements MessageMapper {
-    public static final MailboxCounters INITIAL_COUNTERS =  MailboxCounters.builder()
-        .count(0L)
-        .unseen(0L)
-        .build();
     public static final Logger LOGGER = LoggerFactory.getLogger(CassandraMessageMapper.class);
 
     private final CassandraModSeqProvider modSeqProvider;
@@ -134,11 +130,6 @@ public class CassandraMessageMapper implements MessageMapper {
 
     @Override
     public MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException {
-<<<<<<< HEAD
-        return mailboxCounterDAO.retrieveMailboxCounters(mailbox)
-                .defaultIfEmpty(INITIAL_COUNTERS)
-                .block();
-=======
         CassandraId mailboxId = (CassandraId) mailbox.getMailboxId();
         return getMailboxCounters(mailboxId)
                 .block();
@@ -161,7 +152,6 @@ public class CassandraMessageMapper implements MessageMapper {
             .concatMap(this::getMailboxCounters)
             .toStream()
             .collect(Guavate.toImmutableList());
->>>>>>> f4ef8da35d... JAMES-2632 Allow bulk mailbox counter retrieval
     }
 
     @Override
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 073b4a2..c9b41b6 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
@@ -88,6 +88,7 @@ class CassandraMailboxCounterDAOTest {
 
         assertThat(testee.retrieveMailboxCounters(MAILBOX_ID).block())
             .isEqualTo(MailboxCounters.builder()
+                .mailboxId(MAILBOX_ID)
                 .count(0L)
                 .unseen(1L)
                 .build());
@@ -99,6 +100,7 @@ class CassandraMailboxCounterDAOTest {
 
         assertThat(testee.retrieveMailboxCounters(MAILBOX_ID).block())
             .isEqualTo(MailboxCounters.builder()
+                .mailboxId(MAILBOX_ID)
                 .count(1L)
                 .unseen(0L)
                 .build());
@@ -111,6 +113,7 @@ class CassandraMailboxCounterDAOTest {
 
         assertThat(testee.retrieveMailboxCounters(MAILBOX_ID).block())
             .isEqualTo(MailboxCounters.builder()
+                .mailboxId(MAILBOX_ID)
                 .count(1L)
                 .unseen(1L)
                 .build());
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
index a1ebacd..6c88f59 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
@@ -79,6 +79,7 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
     @Override
     public MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException {
         return MailboxCounters.builder()
+            .mailboxId(mailbox.getMailboxId())
             .count(countMessagesInMailbox(mailbox))
             .unseen(countUnseenMessagesInMailbox(mailbox))
             .build();
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
index 6b45c1d..58d34a4 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
@@ -56,6 +56,7 @@ public class TransactionalMessageMapper implements MessageMapper {
     @Override
     public MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException {
         return MailboxCounters.builder()
+            .mailboxId(mailbox.getMailboxId())
             .count(countMessagesInMailbox(mailbox))
             .unseen(countUnseenMessagesInMailbox(mailbox))
             .build();
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index e46ebce..5cfca6d 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -117,11 +117,6 @@ import reactor.core.scheduler.Schedulers;
  * {@link MailboxSession}'s.
  */
 public class StoreMessageManager implements MessageManager {
-    private static final MailboxCounters ZERO_MAILBOX_COUNTERS = MailboxCounters.builder()
-        .count(0)
-        .unseen(0)
-        .build();
-
     /**
      * The minimal Permanent flags the {@link MessageManager} must support. <br>
      * 
@@ -221,7 +216,11 @@ public class StoreMessageManager implements MessageManager {
         if (storeRightManager.hasRight(mailbox, MailboxACL.Right.Read, mailboxSession)) {
             return mapperFactory.createMessageMapper(mailboxSession).getMailboxCounters(mailbox);
         }
-        return ZERO_MAILBOX_COUNTERS;
+        return MailboxCounters.builder()
+            .mailboxId(mailbox.getMailboxId())
+            .unseen(0)
+            .count(0)
+            .build();
     }
 
     /**
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
index 646e092..f183728 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
@@ -71,6 +71,7 @@ public abstract class AbstractMessageMapper extends TransactionalMapper implemen
     @Override
     public MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException {
         return MailboxCounters.builder()
+            .mailboxId(mailbox.getMailboxId())
             .count(countMessagesInMailbox(mailbox))
             .unseen(countUnseenMessagesInMailbox(mailbox))
             .build();
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
index 053dc3d..28e164c 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
@@ -92,6 +92,7 @@ public class StoreMailboxMessageResultIteratorTest {
         @Override
         public MailboxCounters getMailboxCounters(Mailbox mailbox) throws MailboxException {
             return MailboxCounters.builder()
+                .mailboxId(mailbox.getMailboxId())
                 .count(countMessagesInMailbox(mailbox))
                 .unseen(countUnseenMessagesInMailbox(mailbox))
                 .build();


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 06/44: JAMES-2972 correct use of mailet attribute from 'matcher' to 'match', project-wide

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 01a451400125fbf857add3e7b00011eb48359ce7
Author: Joerg Thomas <jo...@consol.de>
AuthorDate: Thu Nov 14 10:52:40 2019 +0100

    JAMES-2972 correct use of mailet attribute from 'matcher' to 'match', project-wide
---
 .../java/org/apache/james/transport/mailets/ICALToHeader.java     | 2 +-
 .../org/apache/james/transport/mailets/ICALToJsonAttribute.java   | 2 +-
 server/app/src/main/resources/mailetcontainer.xml                 | 8 ++++----
 .../java/org/apache/james/transport/mailets/MetricsMailet.java    | 2 +-
 .../apache/james/transport/mailets/ToSenderDomainRepository.java  | 2 +-
 .../org/apache/james/transport/mailets/WithStorageDirective.java  | 2 +-
 .../java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java   | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
index 025dfc3..2e4dae2 100644
--- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
+++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
@@ -53,7 +53,7 @@ import net.fortuna.ical4j.model.component.VEvent;
  *
  * <pre>
  *     <code>
- *         &lt;mailet matcher=??? class=ICALToHeader&gt;
+ *         &lt;mailet match=??? class=ICALToHeader&gt;
  *             &lt;attribute&gt;icalendars&lt;/attribute&gt;
  *         &lt;/mailet&gt;
  *     </code>
diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
index 5892e86..950adcc 100644
--- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
+++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
@@ -78,7 +78,7 @@ import net.fortuna.ical4j.model.Calendar;
  *
  * <pre>
  *     <code>
- *         &lt;mailet matcher=??? class=ICALToJsonAttribute&gt;
+ *         &lt;mailet match=??? class=ICALToJsonAttribute&gt;
  *             &lt;sourceAttribute&gt;icalendars&lt;/sourceAttribute&gt;
  *             &lt;destinationAttribute&gt;icalendarJson&lt;/destinationAttribute&gt;
  *         &lt;/mailet&gt;
diff --git a/server/app/src/main/resources/mailetcontainer.xml b/server/app/src/main/resources/mailetcontainer.xml
index bb98c7c..dba24bd 100644
--- a/server/app/src/main/resources/mailetcontainer.xml
+++ b/server/app/src/main/resources/mailetcontainer.xml
@@ -56,13 +56,13 @@
        <!-- Important check to avoid looping -->
        <mailet match="RelayLimit=30" class="Null"/>
 
-        <mailet matcher="All" class="WithPriority">
+        <mailet match="All" class="WithPriority">
             <priority>8</priority>
         </mailet>
 
-        <mailet matcher="HasPriority=8" class="Null"/>
-        <mailet matcher="AtLeastPriority=8" class="Null"/>
-        <mailet matcher="AtMostPriority=8" class="Null"/>
+        <mailet match="HasPriority=8" class="Null"/>
+        <mailet match="AtLeastPriority=8" class="Null"/>
+        <mailet match="AtMostPriority=8" class="Null"/>
 
 
         <!-- Check attachment extensions for possible viruses -->
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/MetricsMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/MetricsMailet.java
index 22f5461..4ad9b31 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/MetricsMailet.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/MetricsMailet.java
@@ -36,7 +36,7 @@ import com.google.common.base.Preconditions;
  *
  * Example :
  *
- * &lt;mailet matcher="all" class="MetricsMailet"&gt;
+ * &lt;mailet match="all" class="MetricsMailet"&gt;
  *     &lt;metricName&gt;relayDenied&lt;/metricName&gt;
  * &lt;/mailet&gt;
  *
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
index 86fd146..93dab2d 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
@@ -56,7 +56,7 @@ import com.github.fge.lambdas.consumers.ThrowingConsumer;
  *
  *  Example:
  *
- * &lt;mailet matcher="All" class="ToSenderDomainRepository"&gt;
+ * &lt;mailet match="All" class="ToSenderDomainRepository"&gt;
  *     &lt;urlPrefix&gt;cassandra://var/mail/sendersRepositories/&lt;/urlPrefix&gt;
  *     &lt;passThrough&gt;false&lt;/passThrough&gt;
  *     &lt;allowRepositoryCreation&gt;true&lt;/allowRepositoryCreation&gt;
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
index eb5762f..4d112a5 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
@@ -45,7 +45,7 @@ import com.google.common.base.Strings;
  *
  *  Example:
  *
- *  <mailet matcher="IsMarkedAsSpam" class="WithStorageDirective">
+ *  <mailet match="IsMarkedAsSpam" class="WithStorageDirective">
  *      <targetFolderName>Spam</targetFolderName>
  *  </mailet>
  */
diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java
index 1a2561b..85a09bc 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
  *
  * Example:
  *
- *  &lt;mailet matcher="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/&gt;
+ *  &lt;mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/&gt;
  */
 public class JMAPFiltering extends GenericMailet {
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 43/44: [Refactoring] Remove some unused methods in JPAMailboxMapper

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 6cce9bc449f3b1eb626ff179c97dbc5e6979a702
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Nov 12 16:33:38 2019 +0700

    [Refactoring] Remove some unused methods in JPAMailboxMapper
---
 .../james/mailbox/jpa/mail/JPAMailboxMapper.java   | 25 ----------------------
 .../james/mailbox/jpa/mail/model/JPAMailbox.java   |  2 --
 .../model/openjpa/AbstractJPAMailboxMessage.java   |  4 ++--
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
index b38874a..723d239 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
@@ -162,15 +162,6 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
         }
     }
 
-    public boolean exists(MailboxId id) throws MailboxException, MailboxNotFoundException {
-        try {
-            loadJpaMailbox(id);
-            return true;
-        } catch (MailboxNotFoundException e) {
-            return false;
-        }
-    }
-
     @Override
     public void delete(Mailbox mailbox) throws MailboxException {
         try {  
@@ -204,22 +195,6 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
             .setParameter("namespaceParam", namespace)
             .setParameter("userParam", username.asString());
     }
-
-    public void deleteAllMemberships() throws MailboxException {
-        try {
-            getEntityManager().createNamedQuery("deleteAllMemberships").executeUpdate();
-        } catch (PersistenceException e) {
-            throw new MailboxException("Delete of mailboxes failed", e);
-        } 
-    }
-    
-    public void deleteAllMailboxes() throws MailboxException {
-        try {
-            getEntityManager().createNamedQuery("deleteAllMailboxes").executeUpdate();
-        } catch (PersistenceException e) {
-            throw new MailboxException("Delete of mailboxes failed", e);
-        } 
-    }
     
     @Override
     public boolean hasChildren(Mailbox mailbox, char delimiter) throws MailboxException, MailboxNotFoundException {
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
index 8ff4992..0b795a2 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
@@ -42,8 +42,6 @@ import org.apache.james.mailbox.model.MailboxPath;
         query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name = :nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam"),
     @NamedQuery(name = "findMailboxByNameWithUser",
         query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name = :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam"),
-    @NamedQuery(name = "deleteAllMailboxes",
-        query = "DELETE FROM Mailbox mailbox"),
     @NamedQuery(name = "findMailboxWithNameLikeWithUser",
         query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam"),
     @NamedQuery(name = "findMailboxWithNameLike",
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
index 306a436..ebf69f9 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
@@ -91,8 +91,8 @@ import com.google.common.base.Objects;
         @NamedQuery(name = "countMessagesInMailbox", query = "SELECT COUNT(message) FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam"),
         @NamedQuery(name = "deleteMessages", query = "DELETE FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam"),
         @NamedQuery(name = "findLastUidInMailbox", query = "SELECT message.uid FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.uid DESC"),
-        @NamedQuery(name = "findHighestModSeqInMailbox", query = "SELECT message.modSeq FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.modSeq DESC"),
-        @NamedQuery(name = "deleteAllMemberships", query = "DELETE FROM MailboxMessage message") })
+        @NamedQuery(name = "findHighestModSeqInMailbox", query = "SELECT message.modSeq FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.modSeq DESC")
+})
 @MappedSuperclass
 public abstract class AbstractJPAMailboxMessage implements MailboxMessage {
     private static final String TOSTRING_SEPARATOR = " ";


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org