[james-project] 21/30: MAILBOX-392 Rework slightly UserMailboxesService

[btellier]

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 c0c2cde5bafb0878893d81968246b2482505334b
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Tue Nov 12 12:04:58 2019 +0700

    MAILBOX-392 Rework slightly UserMailboxesService
---
 .../apache/james/webadmin/service/UserMailboxesService.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java
 
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java
index 35e1860..a8f1904 100644
--- 
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java
+++ 
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java
@@ -63,7 +63,7 @@ public class UserMailboxesService {
         MailboxSession mailboxSession = 
mailboxManager.createSystemSession(username);
         try {
             mailboxManager.createMailbox(
-                convertToMailboxPath(username, mailboxName.asString(), 
mailboxSession),
+                convertToMailboxPath(username, mailboxName),
                 mailboxSession);
         } catch (MailboxExistsException e) {
             LOGGER.info("Attempt to create mailbox {} for user {} that already 
exists", mailboxName, username);
@@ -90,14 +90,14 @@ public class UserMailboxesService {
         usernamePreconditions(username);
         MailboxSession mailboxSession = 
mailboxManager.createSystemSession(username);
         return mailboxManager.mailboxExists(
-            convertToMailboxPath(username, mailboxName.asString(), 
mailboxSession),
+            convertToMailboxPath(username, mailboxName),
             mailboxSession);
     }
 
     public void deleteMailbox(String username, MailboxName mailboxName) throws 
MailboxException, UsersRepositoryException, MailboxHaveChildrenException {
         usernamePreconditions(username);
         MailboxSession mailboxSession = 
mailboxManager.createSystemSession(username);
-        MailboxPath mailboxPath = convertToMailboxPath(username, 
mailboxName.asString(), mailboxSession);
+        MailboxPath mailboxPath = convertToMailboxPath(username, mailboxName);
         listChildren(mailboxPath, mailboxSession)
             .forEach(Throwing.consumer(path -> deleteMailbox(mailboxSession, 
path)));
     }
@@ -121,8 +121,8 @@ public class UserMailboxesService {
         Preconditions.checkState(usersRepository.contains(username));
     }
 
-    private MailboxPath convertToMailboxPath(String username, String 
mailboxName, MailboxSession mailboxSession) {
-        return MailboxPath.forUser(username, mailboxName);
+    private MailboxPath convertToMailboxPath(String username, MailboxName 
mailboxName) {
+        return MailboxPath.forUser(username, mailboxName.asString());
     }
 
     private Stream<MailboxMetaData> listUserMailboxes(MailboxSession 
mailboxSession) throws MailboxException {


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