You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/05/13 12:07:13 UTC

[james-project] 04/15: JAMES-3149 Improve ListeningMessageSearchIndex reactive code

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 b716576fa0a3573e0099ab0d6427d6dbfa52c028
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed May 6 11:25:52 2020 +0700

    JAMES-3149 Improve ListeningMessageSearchIndex reactive code
---
 .../james/mailbox/store/search/ListeningMessageSearchIndex.java  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
index 6ce170b..d9ebfe9 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
@@ -33,7 +33,6 @@ import org.apache.james.mailbox.model.UpdatedFlags;
 import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
 import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
 import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.util.streams.Iterators;
 
 import com.google.common.collect.ImmutableList;
 
@@ -105,12 +104,8 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
     }
 
     private Flux<MailboxMessage> retrieveMailboxMessages(MailboxSession session, Mailbox mailbox, MessageRange range) {
-        try {
-            return Iterators.toFlux(factory.getMessageMapper(session)
-                .findInMailbox(mailbox, range, FetchType.Full, UNLIMITED));
-        } catch (Exception e) {
-            return Flux.error(e);
-        }
+        return factory.getMessageMapper(session)
+            .findInMailboxReactive(mailbox, range, FetchType.Full, UNLIMITED);
     }
 
     /**


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