You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/04/19 04:04:35 UTC

[james-project] 44/49: JAMES-3737 Status processor was not fully reactive

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 6b2fcf02b5b4087ba9d95c38007d1d8d19fd39ef
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Apr 7 15:52:49 2022 +0700

    JAMES-3737 Status processor was not fully reactive
---
 .../apache/james/imap/processor/StatusProcessor.java    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
index 848b99359a..17ae9af7e0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
@@ -42,6 +42,8 @@ import org.apache.james.util.ReactorUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.fge.lambdas.Throwing;
+
 import reactor.core.publisher.Mono;
 
 public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> {
@@ -58,8 +60,8 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> {
         StatusDataItems statusDataItems = request.getStatusDataItems();
         MailboxSession mailboxSession = session.getMailboxSession();
 
-        return logInitialRequest(mailboxPath).
-            then(retrieveMetadata(mailboxPath, statusDataItems, mailboxSession))
+        return logInitialRequest(mailboxPath)
+            .then(retrieveMetadata(mailboxPath, statusDataItems, mailboxSession))
             .doOnNext(metaData -> {
                 MailboxStatusResponse response = computeStatusResponse(request, statusDataItems, metaData);
 
@@ -88,13 +90,10 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> {
     }
 
     private Mono<MessageManager.MailboxMetaData> retrieveMetadata(MailboxPath mailboxPath, StatusDataItems statusDataItems, MailboxSession mailboxSession) {
-        try {
-            MessageManager mailbox = getMailboxManager().getMailbox(mailboxPath, mailboxSession);
-            MessageManager.MailboxMetaData.FetchGroup fetchGroup = computeFetchGroup(statusDataItems);
-            return mailbox.getMetaDataReactive(false, mailboxSession, fetchGroup);
-        } catch (MailboxException e) {
-            return Mono.error(e);
-        }
+        MessageManager.MailboxMetaData.FetchGroup fetchGroup = computeFetchGroup(statusDataItems);
+
+        return Mono.from(getMailboxManager().getMailboxReactive(mailboxPath, mailboxSession))
+            .flatMap(Throwing.function(mailbox -> mailbox.getMetaDataReactive(false, mailboxSession, fetchGroup)));
     }
 
     private MailboxStatusResponse computeStatusResponse(StatusRequest request, StatusDataItems statusDataItems, MessageManager.MailboxMetaData metaData) {


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