(james-project) 10/37: JAMES-2182 PathConverter: change arguments of mailboxName method

[rcordier]

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

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

commit dcd27a088b831e5504af31c6f3d202c09b00eae5
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Wed Oct 9 12:00:09 2024 +0200

    JAMES-2182 PathConverter: change arguments of mailboxName method
---
 .../src/main/java/org/apache/james/imap/main/PathConverter.java    | 7 ++++---
 .../main/java/org/apache/james/imap/processor/ListProcessor.java   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

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 042c4b2ae1..74bfc7335a 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
@@ -23,6 +23,7 @@ import java.util.List;
 
 import org.apache.james.core.Username;
 import org.apache.james.imap.api.process.ImapSession;
+import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailbox.model.MailboxPath;
 
@@ -132,16 +133,16 @@ public interface PathConverter {
             return sb.toString();
         }
 
-        public String mailboxName(boolean relative, MailboxPath path, char 
delimiter) {
+        public String mailboxName(boolean relative, MailboxPath path, 
MailboxSession session) {
             if (relative) {
                 return path.getName();
             } else {
-                return joinMailboxPath(path, delimiter);
+                return joinMailboxPath(path, session.getPathDelimiter());
             }
         }
     }
 
     MailboxPath buildFullPath(String mailboxName);
 
-    String mailboxName(boolean relative, MailboxPath path, char delimiter);
+    String mailboxName(boolean relative, MailboxPath path, MailboxSession 
session);
 }
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
index 8657d8c494..aa6f19cd5e 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
@@ -224,7 +224,7 @@ public class ListProcessor<T extends ListRequest> extends 
AbstractMailboxProcess
                     responder.respond(
                         createResponse(metaData.inferiors(),
                             metaData.getSelectability(),
-                            
pathConverterFactory.forSession(session).mailboxName(isRelative, 
metaData.getPath(), metaData.getHierarchyDelimiter()),
+                            
pathConverterFactory.forSession(session).mailboxName(isRelative, 
metaData.getPath(), mailboxSession),
                             metaData.getHierarchyDelimiter(),
                             mailboxType,
                             isSubscribed.test(metaData.getPath())));
@@ -287,7 +287,7 @@ public class ListProcessor<T extends ListRequest> extends 
AbstractMailboxProcess
             .map(mailboxMetaData -> ListResponse.builder()
                 .returnSubscribed(RETURN_SUBSCRIBED)
                 .forMetaData(mailboxMetaData)
-                
.name(pathConverterFactory.forSession(session).mailboxName(relative, 
subscribed, mailboxMetaData.getHierarchyDelimiter()))
+                
.name(pathConverterFactory.forSession(session).mailboxName(relative, 
subscribed, session.getMailboxSession()))
                 .returnNonExistent(!RETURN_NON_EXISTENT)
                 .mailboxType(getMailboxType(listRequest, session, 
mailboxMetaData.getPath())))
             .orElseGet(() -> 
ListResponse.builder().nonExitingSubscribedMailbox(subscribed))
@@ -311,7 +311,7 @@ public class ListProcessor<T extends ListRequest> extends 
AbstractMailboxProcess
                 MailboxMetaData metaData = pair.getValue();
                 ListResponse listResponse = ListResponse.builder()
                     .forMetaData(metaData)
-                    
.name(pathConverterFactory.forSession(session).mailboxName(relative, 
metaData.getPath(), metaData.getHierarchyDelimiter()))
+                    
.name(pathConverterFactory.forSession(session).mailboxName(relative, 
metaData.getPath(), mailboxSession))
                     .childInfos(ListResponse.ChildInfo.SUBSCRIBED)
                     
.returnSubscribed(allSubscribedSearch.contains(pair.getKey()))
                     .mailboxType(getMailboxType(listRequest, session, 
metaData.getPath()))


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