(james-project) 09/09: James-4099 Use configured mailbox folder delimiter in the FileIntoAction

[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 cf193f3929c2eaeacf384206efc311f897749d2f
Author: Jan-Eric Hellenberg <janeric.hellenb...@gmail.com>
AuthorDate: Wed Jan 8 11:57:11 2025 +0100

    James-4099 Use configured mailbox folder delimiter in the FileIntoAction
---
 .../apache/james/transport/mailets/jsieve/FileIntoAction.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
 
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
index 72fd58d5b0..ea04381a2e 100644
--- 
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
+++ 
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
@@ -20,6 +20,7 @@ package org.apache.james.transport.mailets.jsieve;
 
 import jakarta.mail.MessagingException;
 
+import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.jsieve.mail.Action;
 import org.apache.jsieve.mail.ActionFileInto;
 import org.apache.mailet.Mail;
@@ -34,8 +35,6 @@ import org.slf4j.LoggerFactory;
 public class FileIntoAction implements MailAction {
     private static final Logger LOGGER = 
LoggerFactory.getLogger(FileIntoAction.class);
 
-    private static final char HIERARCHY_DELIMITER = '.';
-
     @Override
     public void execute(Action action, Mail mail, ActionContext context) 
throws MessagingException {
         if (action instanceof ActionFileInto) {
@@ -68,7 +67,7 @@ public class FileIntoAction implements MailAction {
      */
     public void execute(ActionFileInto anAction, Mail aMail, final 
ActionContext context) throws MessagingException {
         String destinationMailbox = getDestinationMailbox(anAction);
-        String mailbox = destinationMailbox.replace(HIERARCHY_DELIMITER, '/');
+        String mailbox = 
destinationMailbox.replace(MailboxConstants.FOLDER_DELIMITER, '/');
         String url = "mailbox://" + context.getRecipient().asString() + 
mailbox;
 
         context.post(url, aMail);
@@ -76,8 +75,8 @@ public class FileIntoAction implements MailAction {
     }
 
     private String getDestinationMailbox(ActionFileInto anAction) {
-        if (!(anAction.getDestination().length() > 0 && 
anAction.getDestination().charAt(0) == HIERARCHY_DELIMITER)) {
-            return HIERARCHY_DELIMITER + anAction.getDestination();
+        if (anAction.getDestination().isEmpty() || 
anAction.getDestination().charAt(0) != MailboxConstants.FOLDER_DELIMITER) {
+            return MailboxConstants.FOLDER_DELIMITER + 
anAction.getDestination();
         }
         return anAction.getDestination();
     }


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