(james-project) 04/04: [FIX] FETCH: flatten reactor operations

[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 019dabb51789fb1fccc5e342aec77a34b48478e3
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Sat Mar 16 22:12:09 2024 +0100

    [FIX] FETCH: flatten reactor operations
---
 .../org/apache/james/imap/processor/fetch/FetchProcessor.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
index db2c99fb90..7878c19162 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
@@ -239,13 +239,10 @@ public class FetchProcessor extends 
AbstractMailboxProcessor<FetchRequest> {
         } else {
             FetchSubscriber fetchSubscriber = new FetchSubscriber(imapSession, 
responder);
             Flux.fromIterable(consolidate(selected, ranges, fetch))
-                .concatMap(range -> {
-                    auditTrail(mailbox, mailboxSession, resultToFetch, range);
-
-                    return Flux.from(mailbox.getMessagesReactive(range, 
resultToFetch, mailboxSession))
-                        .filter(ids -> !fetch.contains(Item.MODSEQ) || 
ids.getModSeq().asLong() > fetch.getChangedSince())
-                        .concatMap(result -> toResponse(mailbox, fetch, 
mailboxSession, selected, result));
-                })
+                .doOnNext(range -> auditTrail(mailbox, mailboxSession, 
resultToFetch, range))
+                .concatMap(range -> 
Flux.from(mailbox.getMessagesReactive(range, resultToFetch, mailboxSession)))
+                .filter(ids -> !fetch.contains(Item.MODSEQ) || 
ids.getModSeq().asLong() > fetch.getChangedSince())
+                .concatMap(result -> toResponse(mailbox, fetch, 
mailboxSession, selected, result))
                 .subscribe(fetchSubscriber);
 
             return fetchSubscriber.completionMono();


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