You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by hq...@apache.org on 2025/10/29 07:11:34 UTC

(james-project) branch master updated (7a8db2557d -> b1a5d746cd)

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

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


    from 7a8db2557d Add MailboxId in Mailbox audit trails
     new cc36e33750 [IMPROVEMENT] MethodWithoutAccountId::doProcess should propagate capabilities
     new ab36cb9269 JAMES-4148 RunRulesOnMailboxTask should rely on MailboxPath
     new 904d30aece JAMES-4148 Additional information: mailboxName -> mailboxPath
     new ab0d56d91c JAMES-4148 Enable run rules on all users mailbox tests
     new 0a647b1bea JAMES-4148 RunRuleOnAllMailboxesRoute: avoid blocking call when submitting tasks
     new 5d7f0297fb JAMES-4148 Fix reactor issue
     new b1a5d746cd JAMES-4148 Fix failing runRulesOnAllUsersMailboxShouldComplete integration test

The 7 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:
 .../modules/servers/partials/operate/webadmin.adoc |  4 +--
 .../org/apache/james/jmap/method/Method.scala      |  4 +--
 .../jmap/method/PushSubscriptionGetMethod.scala    |  2 +-
 .../jmap/method/PushSubscriptionSetMethod.scala    |  2 +-
 ...dminServerTaskSerializationIntegrationTest.java |  9 ++----
 .../data/jmap/RunRuleOnAllMailboxesRoute.java      | 14 +++++----
 .../data/jmap/RunRulesOnMailboxService.java        |  9 +++---
 .../webadmin/data/jmap/RunRulesOnMailboxTask.java  | 36 +++++++++++++---------
 ...RulesOnMailboxTaskAdditionalInformationDTO.java | 16 +++++-----
 .../data/jmap/RunRulesOnMailboxTaskDTO.java        | 17 +++++-----
 .../data/jmap/RunRulesOnMailboxRoutesTest.java     |  4 +--
 ...sOnMailboxTaskAdditionalInformationDTOTest.java |  4 +--
 .../runRulesOnMailbox.additionalInformation.json   |  2 +-
 .../resources/json/runRulesOnMailbox.task.json     |  2 +-
 14 files changed, 65 insertions(+), 60 deletions(-)


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


(james-project) 01/07: [IMPROVEMENT] MethodWithoutAccountId::doProcess should propagate capabilities

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

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

commit cc36e337503de4b465624b85eb2699d89cd2c4c5
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Mon Oct 27 17:06:59 2025 +0700

    [IMPROVEMENT] MethodWithoutAccountId::doProcess should propagate capabilities
---
 .../src/main/scala/org/apache/james/jmap/method/Method.scala          | 4 ++--
 .../org/apache/james/jmap/method/PushSubscriptionGetMethod.scala      | 2 +-
 .../org/apache/james/jmap/method/PushSubscriptionSetMethod.scala      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/Method.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/Method.scala
index 6aa766d9ae..b2ffd1cb62 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/Method.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/Method.scala
@@ -176,7 +176,7 @@ trait MethodWithoutAccountId[REQUEST <: WithoutAccountId] extends Method {
     val either: Either[Exception, Publisher[InvocationWithContext]] = for {
       request <- getRequest(invocation.invocation)
     } yield {
-      doProcess(invocation, mailboxSession, request)
+      doProcess(capabilities, invocation, mailboxSession, request)
     }
 
     val result: SFlux[InvocationWithContext] = SFlux.fromPublisher(either.fold(e => SFlux.error[InvocationWithContext](e), r => r))
@@ -199,5 +199,5 @@ trait MethodWithoutAccountId[REQUEST <: WithoutAccountId] extends Method {
 
   def getRequest(invocation: Invocation): Either[Exception, REQUEST]
 
-  def doProcess(invocation: InvocationWithContext, mailboxSession: MailboxSession, request: REQUEST): Publisher[InvocationWithContext]
+  def doProcess(capabilities: Set[CapabilityIdentifier], invocation: InvocationWithContext, mailboxSession: MailboxSession, request: REQUEST): Publisher[InvocationWithContext]
 }
\ No newline at end of file
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionGetMethod.scala
index e1dc3600d9..1f3bbf1021 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionGetMethod.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionGetMethod.scala
@@ -62,7 +62,7 @@ class PushSubscriptionGetMethod @Inject()(pushSubscriptionSerializer: PushSubscr
     pushSubscriptionSerializer.deserializePushSubscriptionGetRequest(invocation.arguments.value).asEitherRequest
       .flatMap(request => request.validate(configuration).map(_ => request))
 
-  override def doProcess(invocation: InvocationWithContext, session: MailboxSession, request: PushSubscriptionGetRequest): SMono[InvocationWithContext] =
+  override def doProcess(capabilities: Set[CapabilityIdentifier], invocation: InvocationWithContext, session: MailboxSession, request: PushSubscriptionGetRequest): SMono[InvocationWithContext] =
     request.validateProperties
       .fold(e => SMono.error(e),
         properties => retrieveRecords(request, session)
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionSetMethod.scala
index 8fd0aa878c..f6263f58b9 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionSetMethod.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionSetMethod.scala
@@ -46,7 +46,7 @@ class PushSubscriptionSetMethod @Inject()(createPerformer: PushSubscriptionSetCr
     pushSubscriptionSerializer.deserializePushSubscriptionSetRequest(invocation.arguments.value).asEitherRequest
       .flatMap(request => request.validate(configuration).map(_ => request))
 
-  override def doProcess(invocation: InvocationWithContext, mailboxSession: MailboxSession, request: PushSubscriptionSetRequest): SMono[InvocationWithContext] =
+  override def doProcess(capabilities: Set[CapabilityIdentifier], invocation: InvocationWithContext, mailboxSession: MailboxSession, request: PushSubscriptionSetRequest): SMono[InvocationWithContext] =
     for {
       created <- createPerformer.create(request, mailboxSession)
       updated <- updatePerformer.update(request, mailboxSession)


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


(james-project) 05/07: JAMES-4148 RunRuleOnAllMailboxesRoute: avoid blocking call when submitting tasks

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

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

commit 0a647b1bead99c7a5e9ec2856c866b0349eff065
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Tue Oct 28 16:07:03 2025 +0700

    JAMES-4148 RunRuleOnAllMailboxesRoute: avoid blocking call when submitting tasks
    
    `runRulesOnAllUsersMailboxShouldComplete` tests failed:
    15:45:02.194 [ERROR] s.h.m.GeneralError -
    com.datastax.oss.driver.api.core.DriverTimeoutException: Query timed out after PT2S
    
    {
        "statusCode": 500,
        "type": "ServerError",
        "message": "WebAdmin encountered an unexpected internal error",
        "details": null
    }
---
 ...itMQWebAdminServerTaskSerializationIntegrationTest.java |  2 +-
 .../webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java     | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
index acca84a319..32a5a89011 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
@@ -841,7 +841,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest {
             .getList(".");
 
         assertThat(list)
-            .hasSize(3)
+            .hasSize(2)
             .first()
             .satisfies(map -> assertThat(map).hasSize(2)
                 .containsKeys("taskId")
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
index 15c01c64e8..da8863fd78 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
@@ -33,9 +33,9 @@ import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.task.Task;
-import org.apache.james.task.TaskId;
 import org.apache.james.task.TaskManager;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.util.ReactorUtils;
 import org.apache.james.webadmin.data.jmap.dto.UserTask;
 import org.apache.james.webadmin.routes.ConditionalRoute;
 import org.apache.james.webadmin.tasks.TaskRegistrationKey;
@@ -57,7 +57,7 @@ import spark.Request;
 import spark.Response;
 
 public class RunRuleOnAllMailboxesRoute implements ConditionalRoute {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RunRulesOnMailboxRoutes.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RunRuleOnAllMailboxesRoute.class);
 
     private static final TaskRegistrationKey TRIAGE = TaskRegistrationKey.of("triage");
     private static final String ACTION_QUERY_PARAM = "action";
@@ -124,15 +124,17 @@ public class RunRuleOnAllMailboxesRoute implements ConditionalRoute {
     private List<UserTask> runRulesOnAllUsersMailbox(MailboxName mailboxName, Rules rules) {
         return Flux.from(usersRepository.listReactive())
             .filterWhen(username -> mailboxForUserExists(username, mailboxName))
-            .map(username -> runRulesOnUserMailbox(username, mailboxName, rules))
+            .flatMap(username -> runRulesOnUserMailbox(username, mailboxName, rules))
             .collectList()
             .block();
     }
 
-    private UserTask runRulesOnUserMailbox(Username username, MailboxName mailboxName, Rules rules) {
+    private Mono<UserTask> runRulesOnUserMailbox(Username username, MailboxName mailboxName, Rules rules) {
         Task task = new RunRulesOnMailboxTask(username, mailboxName, rules, runRulesOnMailboxService);
-        TaskId taskId = taskManager.submit(task);
-        return new UserTask(username, taskId);
+
+        return Mono.fromCallable(() -> taskManager.submit(task))
+            .subscribeOn(ReactorUtils.BLOCKING_CALL_WRAPPER)
+            .map(taskId -> new UserTask(username, taskId));
     }
 
     private void actionPrecondition(Request request) {


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


(james-project) 07/07: JAMES-4148 Fix failing runRulesOnAllUsersMailboxShouldComplete integration test

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

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

commit b1a5d746cd0c5dc65d4f2bbc57dec1e3b7a13150
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Wed Oct 29 12:03:25 2025 +0700

    JAMES-4148 Fix failing runRulesOnAllUsersMailboxShouldComplete integration test
    
    the test was not happy with a blocking call issue.
---
 .../RabbitMQWebAdminServerTaskSerializationIntegrationTest.java       | 3 +--
 .../apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
index 32a5a89011..0a992d21c7 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
@@ -844,8 +844,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest {
             .hasSize(2)
             .first()
             .satisfies(map -> assertThat(map).hasSize(2)
-                .containsKeys("taskId")
-                .containsEntry("username", USERNAME));
+                .containsKeys("taskId", "username"));
     }
 
     @Test
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
index 14b2683fc1..cc095f626e 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
@@ -124,9 +124,8 @@ public class RunRuleOnAllMailboxesRoute implements ConditionalRoute {
     private List<UserTask> runRulesOnAllUsersMailbox(MailboxName mailboxName, Rules rules) {
         return Flux.from(usersRepository.listReactive())
             .filterWhen(username -> mailboxForUserExists(username, mailboxName))
-            .flatMap(username -> runRulesOnUserMailbox(username, mailboxName, rules))
+            .concatMap(username -> runRulesOnUserMailbox(username, mailboxName, rules))
             .collectList()
-            .subscribeOn(ReactorUtils.BLOCKING_CALL_WRAPPER)
             .block();
     }
 
@@ -134,6 +133,7 @@ public class RunRuleOnAllMailboxesRoute implements ConditionalRoute {
         Task task = new RunRulesOnMailboxTask(username, mailboxName, rules, runRulesOnMailboxService);
 
         return Mono.fromCallable(() -> taskManager.submit(task))
+            .subscribeOn(ReactorUtils.BLOCKING_CALL_WRAPPER)
             .map(taskId -> new UserTask(username, taskId));
     }
 


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


(james-project) 02/07: JAMES-4148 RunRulesOnMailboxTask should rely on MailboxPath

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

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

commit ab36cb926917262787c2b15ac7ace4aa7dacbd12
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Tue Oct 28 11:33:26 2025 +0700

    JAMES-4148 RunRulesOnMailboxTask should rely on MailboxPath
    
    To allow running on shared mailbox if needed.
---
 .../data/jmap/RunRulesOnMailboxService.java        |  9 ++++-----
 .../webadmin/data/jmap/RunRulesOnMailboxTask.java  | 22 +++++++++++++++-------
 .../data/jmap/RunRulesOnMailboxTaskDTO.java        | 17 +++++++++--------
 .../resources/json/runRulesOnMailbox.task.json     |  2 +-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxService.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxService.java
index 881dc3fefb..1cfa6278a5 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxService.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxService.java
@@ -46,7 +46,6 @@ import org.apache.james.mailbox.model.MessageId;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MessageResult;
 import org.apache.james.task.Task;
-import org.apache.james.webadmin.validation.MailboxName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,20 +85,20 @@ public class RunRulesOnMailboxService {
         this.maxActionsPerMailbox = maxActionsPerMailbox;
     }
 
-    public Mono<Task.Result> runRulesOnMailbox(Username username, MailboxName mailboxName, Rules rules, RunRulesOnMailboxTask.Context context) {
+    public Mono<Task.Result> runRulesOnMailbox(Username username, MailboxPath mailboxPath, Rules rules, RunRulesOnMailboxTask.Context context) {
         MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
         RuleMatcher ruleMatcher = new RuleMatcher(rules.getRules());
 
-        return Mono.from(mailboxManager.getMailboxReactive(MailboxPath.forUser(username, mailboxName.asString()), mailboxSession))
+        return Mono.from(mailboxManager.getMailboxReactive(mailboxPath, mailboxSession))
             .flatMapMany(messageManager -> Flux.from(messageManager.getMessagesReactive(MessageRange.all(), FetchGroup.HEADERS, mailboxSession))
                 .flatMap(Throwing.function(messageResult -> runRulesOnMessage(ruleMatcher, messageResult, mailboxSession, context)), DEFAULT_CONCURRENCY))
             .onErrorResume(TooManyAppliedActionsException.class, e -> {
-                LOGGER.info("Maximum number of actions exceeded for mailbox {} of user {}", mailboxName.asString(), username);
+                LOGGER.info("Maximum number of actions exceeded for mailbox {} of user {}", mailboxPath.asString(), username);
                 context.setMaximumAppliedActionExceeded();
                 return Mono.just(Task.Result.COMPLETED);
             })
             .onErrorResume(e -> {
-                LOGGER.error("Error when applying rules to mailbox. Mailbox {} for user {}", mailboxName.asString(), username, e);
+                LOGGER.error("Error when applying rules to mailbox. Mailbox {} for user {}", mailboxPath.asString(), username, e);
                 context.incrementFails();
                 return Mono.just(Task.Result.PARTIAL);
             })
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTask.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTask.java
index e9c3f7f356..da99e07ceb 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTask.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTask.java
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.james.core.Username;
 import org.apache.james.jmap.api.filtering.Rules;
+import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.task.Task;
 import org.apache.james.task.TaskExecutionDetails;
 import org.apache.james.task.TaskType;
@@ -202,24 +203,31 @@ public class RunRulesOnMailboxTask implements Task {
 
     private final Context context;
     private final Username username;
-    private final MailboxName mailboxName;
+    private final MailboxPath mailboxPath;
     private final Rules rules;
     private final RunRulesOnMailboxService runRulesOnMailboxService;
 
     public RunRulesOnMailboxTask(Username username,
-                                 MailboxName mailboxName,
+                                 MailboxPath mailboxPath,
                                  Rules rules,
                                  RunRulesOnMailboxService runRulesOnMailboxService) {
         this.username = username;
-        this.mailboxName = mailboxName;
+        this.mailboxPath = mailboxPath;
         this.rules = rules;
         this.runRulesOnMailboxService = runRulesOnMailboxService;
         this.context = new Context();
     }
 
+    public RunRulesOnMailboxTask(Username username,
+                                 MailboxName mailboxName,
+                                 Rules rules,
+                                 RunRulesOnMailboxService runRulesOnMailboxService) {
+        this(username, MailboxPath.forUser(username, mailboxName.asString()), rules, runRulesOnMailboxService);
+    }
+
     @Override
     public Result run() {
-        return runRulesOnMailboxService.runRulesOnMailbox(username, mailboxName, rules, context)
+        return runRulesOnMailboxService.runRulesOnMailbox(username, mailboxPath, rules, context)
             .block();
     }
 
@@ -230,15 +238,15 @@ public class RunRulesOnMailboxTask implements Task {
 
     @Override
     public Optional<TaskExecutionDetails.AdditionalInformation> details() {
-        return Optional.of(AdditionalInformation.from(username, mailboxName, context));
+        return Optional.of(AdditionalInformation.from(username, new MailboxName(mailboxPath.getName()), context));
     }
 
     public Username getUsername() {
         return username;
     }
 
-    public MailboxName getMailboxName() {
-        return mailboxName;
+    public MailboxPath getMailboxPath() {
+        return mailboxPath;
     }
 
     public Rules getRules() {
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskDTO.java
index 266401be7a..e4ff361c99 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskDTO.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskDTO.java
@@ -24,9 +24,9 @@ import org.apache.james.jmap.api.filtering.RuleDTO;
 import org.apache.james.jmap.api.filtering.Rules;
 import org.apache.james.jmap.api.filtering.Version;
 import org.apache.james.json.DTOModule;
+import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.server.task.json.dto.TaskDTO;
 import org.apache.james.server.task.json.dto.TaskDTOModule;
-import org.apache.james.webadmin.validation.MailboxName;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
@@ -34,16 +34,16 @@ import com.google.common.collect.ImmutableList;
 public class RunRulesOnMailboxTaskDTO implements TaskDTO {
     private final String type;
     private final String username;
-    private final String mailboxName;
+    private final String mailboxPath;
     private final ImmutableList<RuleDTO> rules;
 
     public RunRulesOnMailboxTaskDTO(@JsonProperty("type") String type,
                                     @JsonProperty("username") String username,
-                                    @JsonProperty("mailboxName") String mailboxName,
+                                    @JsonProperty("mailboxPath") String mailboxPath,
                                     @JsonProperty("rules") ImmutableList<RuleDTO> rules) {
         this.type = type;
         this.username = username;
-        this.mailboxName = mailboxName;
+        this.mailboxPath = mailboxPath;
         this.rules = rules;
     }
 
@@ -56,8 +56,8 @@ public class RunRulesOnMailboxTaskDTO implements TaskDTO {
         return username;
     }
 
-    public String getMailboxName() {
-        return mailboxName;
+    public String getMailboxPath() {
+        return mailboxPath;
     }
 
     public ImmutableList<RuleDTO> getRules() {
@@ -75,10 +75,11 @@ public class RunRulesOnMailboxTaskDTO implements TaskDTO {
     }
 
     public RunRulesOnMailboxTask fromDTO(RunRulesOnMailboxService runRulesOnMailboxService) {
-        return new RunRulesOnMailboxTask(Username.of(username), new MailboxName(mailboxName), new Rules(RuleDTO.toRules(rules), Version.INITIAL), runRulesOnMailboxService);
+        return new RunRulesOnMailboxTask(Username.of(username), MailboxPath.parseEscaped(mailboxPath).orElseThrow(() -> new IllegalArgumentException("Can not parse mailboxPath: " + mailboxPath)),
+            new Rules(RuleDTO.toRules(rules), Version.INITIAL), runRulesOnMailboxService);
     }
 
     public static RunRulesOnMailboxTaskDTO toDTO(RunRulesOnMailboxTask domainObject, String typeName) {
-        return new RunRulesOnMailboxTaskDTO(typeName, domainObject.getUsername().asString(), domainObject.getMailboxName().asString(), RuleDTO.from(domainObject.getRules().getRules()));
+        return new RunRulesOnMailboxTaskDTO(typeName, domainObject.getUsername().asString(), domainObject.getMailboxPath().asString(), RuleDTO.from(domainObject.getRules().getRules()));
     }
 }
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/resources/json/runRulesOnMailbox.task.json b/server/protocols/webadmin/webadmin-jmap/src/test/resources/json/runRulesOnMailbox.task.json
index 63445e07e9..5864a987a5 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/resources/json/runRulesOnMailbox.task.json
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/resources/json/runRulesOnMailbox.task.json
@@ -1,5 +1,5 @@
 {
-  "mailboxName": "mbx1",
+  "mailboxPath": "#private:bob@domain.tld:mbx1",
   "type": "RunRulesOnMailboxTask",
   "username": "bob@domain.tld",
   "rules": [


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


(james-project) 04/07: JAMES-4148 Enable run rules on all users mailbox tests

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

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

commit ab0d56d91c34ffe4594811b96a4ca718207fbe53
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Tue Oct 28 15:31:43 2025 +0700

    JAMES-4148 Enable run rules on all users mailbox tests
---
 .../RabbitMQWebAdminServerTaskSerializationIntegrationTest.java         | 2 --
 .../apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
index 3c47808de4..acca84a319 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
@@ -90,7 +90,6 @@ import org.apache.james.webadmin.vault.routes.DeletedMessagesVaultRoutes;
 import org.eclipse.jetty.http.HttpStatus;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -780,7 +779,6 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest {
             .body("additionalInformation.mailboxPath", is(MailboxPath.forUser(Username.of(USERNAME), MailboxConstants.INBOX).asString()));
     }
 
-    @Disabled("JAMES-4148: Route not plugged yet")
     @Test
     void runRulesOnAllUsersMailboxShouldComplete(GuiceJamesServer server) throws Exception {
         server.getProbe(DataProbeImpl.class).addUser(USERNAME, "secret");
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java
index 50b43be71e..d1058a9bf5 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java
@@ -69,7 +69,6 @@ import org.assertj.core.api.SoftAssertions;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
@@ -1041,7 +1040,6 @@ public class RunRulesOnMailboxRoutesTest {
         }
     }
 
-    @Disabled("JAMES-4148: Route not plugged yet")
     @Nested
     class RunRulesOnAllUsersMailbox {
         @BeforeEach


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


(james-project) 03/07: JAMES-4148 Additional information: mailboxName -> mailboxPath

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

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

commit 904d30aece1bf1b08c6e770b9afff2a294a749bd
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Tue Oct 28 15:28:25 2025 +0700

    JAMES-4148 Additional information: mailboxName -> mailboxPath
    
    Allow knowing if the mailbox is a shared mailbox.
---
 docs/modules/servers/partials/operate/webadmin.adoc      |  4 ++--
 ...MQWebAdminServerTaskSerializationIntegrationTest.java |  2 +-
 .../james/webadmin/data/jmap/RunRulesOnMailboxTask.java  | 16 ++++++++--------
 .../RunRulesOnMailboxTaskAdditionalInformationDTO.java   | 16 ++++++++--------
 .../webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java  |  2 +-
 ...unRulesOnMailboxTaskAdditionalInformationDTOTest.java |  4 ++--
 .../json/runRulesOnMailbox.additionalInformation.json    |  2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/modules/servers/partials/operate/webadmin.adoc b/docs/modules/servers/partials/operate/webadmin.adoc
index 0bd32faead..b86cf502a1 100644
--- a/docs/modules/servers/partials/operate/webadmin.adoc
+++ b/docs/modules/servers/partials/operate/webadmin.adoc
@@ -1854,7 +1854,7 @@ the following `additionalInformation`:
 
 ....
 {
-    "mailboxName": "mbx1",
+    "mailboxPath": "#private:bob@domain.tld:mbx1",
     "messagesFailCount": 9,
     "messagesSuccessCount": 10,
     "timestamp": "2007-12-03T10:15:30Z",
@@ -1926,7 +1926,7 @@ the following `additionalInformation`:
 
 ....
 {
-    "mailboxName": "mbx1",
+    "mailboxPath": "#private:bob@domain.tld:mbx1",
     "processedMessagesCount": 15,
     "rulesOnMessagesApplySuccessfully": 9,
     "rulesOnMessagesApplyFailed": 3,
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
index ea01f9eb62..3c47808de4 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
@@ -777,7 +777,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest {
             .body("additionalInformation.rulesOnMessagesApplySuccessfully", is(1))
             .body("additionalInformation.rulesOnMessagesApplyFailed", is(0))
             .body("additionalInformation.username", is(USERNAME))
-            .body("additionalInformation.mailboxName", is(MailboxConstants.INBOX));
+            .body("additionalInformation.mailboxPath", is(MailboxPath.forUser(Username.of(USERNAME), MailboxConstants.INBOX).asString()));
     }
 
     @Disabled("JAMES-4148: Route not plugged yet")
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTask.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTask.java
index da99e07ceb..a478af63d7 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTask.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTask.java
@@ -134,15 +134,15 @@ public class RunRulesOnMailboxTask implements Task {
     public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
 
         private static AdditionalInformation from(Username username,
-                                                  MailboxName mailboxName,
+                                                  MailboxPath mailboxPath,
                                                   RunRulesOnMailboxTask.Context context) {
             Context.Snapshot snapshot = context.snapshot();
-            return new AdditionalInformation(username, mailboxName, Clock.systemUTC().instant(), snapshot.rulesOnMessagesApplySuccessfully,
+            return new AdditionalInformation(username, mailboxPath, Clock.systemUTC().instant(), snapshot.rulesOnMessagesApplySuccessfully,
                 snapshot.rulesOnMessagesApplyFailed, snapshot.maximumAppliedActionExceeded, snapshot.processedMessagesCount);
         }
 
         private final Username username;
-        private final MailboxName mailboxName;
+        private final MailboxPath mailboxPath;
         private final Instant timestamp;
         private final long rulesOnMessagesApplySuccessfully;
         private final long rulesOnMessagesApplyFailed;
@@ -150,14 +150,14 @@ public class RunRulesOnMailboxTask implements Task {
         private final long processedMessagesCount;
 
         public AdditionalInformation(Username username,
-                                     MailboxName mailboxName,
+                                     MailboxPath mailboxPath,
                                      Instant timestamp,
                                      long rulesOnMessagesApplySuccessfully,
                                      long rulesOnMessagesApplyFailed,
                                      boolean maximumAppliedActionExceeded,
                                      long processedMessagesCount) {
             this.username = username;
-            this.mailboxName = mailboxName;
+            this.mailboxPath = mailboxPath;
             this.timestamp = timestamp;
             this.rulesOnMessagesApplySuccessfully = rulesOnMessagesApplySuccessfully;
             this.rulesOnMessagesApplyFailed = rulesOnMessagesApplyFailed;
@@ -169,8 +169,8 @@ public class RunRulesOnMailboxTask implements Task {
             return username;
         }
 
-        public MailboxName getMailboxName() {
-            return mailboxName;
+        public MailboxPath getMailboxPath() {
+            return mailboxPath;
         }
 
         public Instant getTimestamp() {
@@ -238,7 +238,7 @@ public class RunRulesOnMailboxTask implements Task {
 
     @Override
     public Optional<TaskExecutionDetails.AdditionalInformation> details() {
-        return Optional.of(AdditionalInformation.from(username, new MailboxName(mailboxPath.getName()), context));
+        return Optional.of(AdditionalInformation.from(username, mailboxPath, context));
     }
 
     public Username getUsername() {
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskAdditionalInformationDTO.java
index 4f3feff328..14d2bc493c 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskAdditionalInformationDTO.java
@@ -23,9 +23,9 @@ import java.time.Instant;
 
 import org.apache.james.core.Username;
 import org.apache.james.json.DTOModule;
+import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
 import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
-import org.apache.james.webadmin.validation.MailboxName;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -41,7 +41,7 @@ public class RunRulesOnMailboxTaskAdditionalInformationDTO implements Additional
     private static RunRulesOnMailboxTask.AdditionalInformation toDomainObject(RunRulesOnMailboxTaskAdditionalInformationDTO dto) {
         return new RunRulesOnMailboxTask.AdditionalInformation(
             Username.of(dto.getUsername()),
-            new MailboxName(dto.getMailboxName()),
+            MailboxPath.parseEscaped(dto.getMailboxPath()).orElseThrow(),
             dto.getTimestamp(),
             dto.getRulesOnMessagesApplySuccessfully(),
             dto.getRulesOnMessagesApplyFailed(),
@@ -53,7 +53,7 @@ public class RunRulesOnMailboxTaskAdditionalInformationDTO implements Additional
         return new RunRulesOnMailboxTaskAdditionalInformationDTO(
             type,
             domain.getUsername().asString(),
-            domain.getMailboxName().asString(),
+            domain.getMailboxPath().asString(),
             domain.getTimestamp(),
             domain.getRulesOnMessagesApplySuccessfully(),
             domain.getRulesOnMessagesApplyFailed(),
@@ -63,7 +63,7 @@ public class RunRulesOnMailboxTaskAdditionalInformationDTO implements Additional
 
     private final String type;
     private final String username;
-    private final String mailboxName;
+    private final String mailboxPath;
     private final Instant timestamp;
     private final long rulesOnMessagesApplySuccessfully;
     private final long rulesOnMessagesApplyFailed;
@@ -72,7 +72,7 @@ public class RunRulesOnMailboxTaskAdditionalInformationDTO implements Additional
 
     public RunRulesOnMailboxTaskAdditionalInformationDTO(@JsonProperty("type") String type,
                                                          @JsonProperty("username") String username,
-                                                         @JsonProperty("mailboxName") String mailboxName,
+                                                         @JsonProperty("mailboxPath") String mailboxPath,
                                                          @JsonProperty("timestamp") Instant timestamp,
                                                          @JsonProperty("rulesOnMessagesApplySuccessfully") long rulesOnMessagesApplySuccessfully,
                                                          @JsonProperty("rulesOnMessagesApplyFailed") long rulesOnMessagesApplyFailed,
@@ -80,7 +80,7 @@ public class RunRulesOnMailboxTaskAdditionalInformationDTO implements Additional
                                                          @JsonProperty("processedMessagesCount") long processedMessagesCount) {
         this.type = type;
         this.username = username;
-        this.mailboxName = mailboxName;
+        this.mailboxPath = mailboxPath;
         this.timestamp = timestamp;
         this.rulesOnMessagesApplySuccessfully = rulesOnMessagesApplySuccessfully;
         this.rulesOnMessagesApplyFailed = rulesOnMessagesApplyFailed;
@@ -102,8 +102,8 @@ public class RunRulesOnMailboxTaskAdditionalInformationDTO implements Additional
         return username;
     }
 
-    public String getMailboxName() {
-        return mailboxName;
+    public String getMailboxPath() {
+        return mailboxPath;
     }
 
     public long getRulesOnMessagesApplySuccessfully() {
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java
index 71ca7a9bf3..50b43be71e 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxRoutesTest.java
@@ -1035,7 +1035,7 @@ public class RunRulesOnMailboxRoutesTest {
                 .body("submitDate", Matchers.is(notNullValue()))
                 .body("completedDate", Matchers.is(notNullValue()))
                 .body("additionalInformation.username", Matchers.is(USERNAME.asString()))
-                .body("additionalInformation.mailboxName", Matchers.is(MAILBOX_NAME))
+                .body("additionalInformation.mailboxPath", Matchers.is(MailboxPath.forUser(USERNAME, MAILBOX_NAME).asString()))
                 .body("additionalInformation.rulesOnMessagesApplySuccessfully", Matchers.is(2))
                 .body("additionalInformation.rulesOnMessagesApplyFailed", Matchers.is(0));
         }
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskAdditionalInformationDTOTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskAdditionalInformationDTOTest.java
index b6cfcc7a35..6af7e3a24b 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskAdditionalInformationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RunRulesOnMailboxTaskAdditionalInformationDTOTest.java
@@ -23,15 +23,15 @@ import java.time.Instant;
 
 import org.apache.james.JsonSerializationVerifier;
 import org.apache.james.core.Username;
+import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.util.ClassLoaderUtils;
-import org.apache.james.webadmin.validation.MailboxName;
 import org.junit.jupiter.api.Test;
 
 public class RunRulesOnMailboxTaskAdditionalInformationDTOTest {
     private static final Instant INSTANT = Instant.parse("2007-12-03T10:15:30.00Z");
 
     private static final RunRulesOnMailboxTask.AdditionalInformation DOMAIN_OBJECT = new RunRulesOnMailboxTask.AdditionalInformation(
-        Username.of("bob@domain.tld"), new MailboxName("mbx1"), INSTANT, 10, 9, false, 30);
+        Username.of("bob@domain.tld"), MailboxPath.forUser(Username.of("bob@domain.tld"), "mbx1"), INSTANT, 10, 9, false, 30);
 
     @Test
     void shouldMatchJsonSerializationContract() throws Exception {
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/resources/json/runRulesOnMailbox.additionalInformation.json b/server/protocols/webadmin/webadmin-jmap/src/test/resources/json/runRulesOnMailbox.additionalInformation.json
index 6be4f207e4..a9482c4dc1 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/resources/json/runRulesOnMailbox.additionalInformation.json
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/resources/json/runRulesOnMailbox.additionalInformation.json
@@ -1,5 +1,5 @@
 {
-  "mailboxName": "mbx1",
+  "mailboxPath": "#private:bob@domain.tld:mbx1",
   "rulesOnMessagesApplyFailed": 9,
   "rulesOnMessagesApplySuccessfully": 10,
   "processedMessagesCount": 30,


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


(james-project) 06/07: JAMES-4148 Fix reactor issue

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

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

commit 5d7f0297fb749a336c065c672845deb3123e6632
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Tue Oct 28 17:32:12 2025 +0700

    JAMES-4148 Fix reactor issue
    
    [ERROR] r.c.p.Operators - Operator called default onErrorDropped
    reactor.core.publisher.Sinks$EmissionException: Spec. Rule 1.3 - onSubscribe, onNext, onError and onComplete signaled to a Subscriber MUST be signaled serially.
            at reactor.core.publisher.InternalManySink.emitNext(InternalManySink.java:56)
            at org.apache.james.task.MemoryWorkQueue.submit(MemoryWorkQueue.java:51)
            at org.apache.james.task.MemoryTaskManager.submit(MemoryTaskManager.java:113)
            at org.apache.james.webadmin.data.jmap.RunRuleOnAllMailboxesRoute.lambda$runRulesOnUserMailbox$2(RunRuleOnAllMailboxesRoute.java:135)
            at reactor.core.publisher.MonoCallable.call(MonoCallable.java:72)
            at reactor.core.publisher.FluxSubscribeOnCallable$CallableSubscribeOnSubscription.run(FluxSubscribeOnCallable.java:228)
            at reactor.core.scheduler.SchedulerTask.call(SchedulerTask.java:68)
            at reactor.core.scheduler.SchedulerTask.call(SchedulerTask.java:28)
            at java.base/java.util.concurrent.FutureTask.run$$$capture(FutureTask.java:317)
            at java.base/java.util.concurrent.FutureTask.run(FutureTask.java)
            at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:304)
            at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)
            at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)
            at java.base/java.lang.Thread.run(Thread.java:1583)
    
    java.lang.AssertionError: 1 expectation failed.
    Expected status code <201> but was <404>.
---
 .../org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
index da8863fd78..14b2683fc1 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunRuleOnAllMailboxesRoute.java
@@ -126,6 +126,7 @@ public class RunRuleOnAllMailboxesRoute implements ConditionalRoute {
             .filterWhen(username -> mailboxForUserExists(username, mailboxName))
             .flatMap(username -> runRulesOnUserMailbox(username, mailboxName, rules))
             .collectList()
+            .subscribeOn(ReactorUtils.BLOCKING_CALL_WRAPPER)
             .block();
     }
 
@@ -133,7 +134,6 @@ public class RunRuleOnAllMailboxesRoute implements ConditionalRoute {
         Task task = new RunRulesOnMailboxTask(username, mailboxName, rules, runRulesOnMailboxService);
 
         return Mono.fromCallable(() -> taskManager.submit(task))
-            .subscribeOn(ReactorUtils.BLOCKING_CALL_WRAPPER)
             .map(taskId -> new UserTask(username, taskId));
     }
 


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