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 2019/12/13 02:39:43 UTC

[james-project] 27/27: JAMES-2992 Better name variable in MessageFastViewFactory

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 42092d4bd1489338cf6c3a7b897e6173202b74dc
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Dec 9 10:17:13 2019 +0700

    JAMES-2992 Better name variable in MessageFastViewFactory
    
    Reference the projection and not just the preview
---
 .../jmap/draft/model/message/view/MessageFastViewFactory.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFastViewFactory.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFastViewFactory.java
index cc11416..6fd35d8 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFastViewFactory.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFastViewFactory.java
@@ -129,12 +129,12 @@ public class MessageFastViewFactory implements MessageViewFactory<MessageFastVie
 
     private Flux<MessageFastView> gatherMessageViews(Set<MessageId> messageIds, MailboxSession mailboxSession,
                                                      Map<MessageId, MessageFastViewPrecomputedProperties> fastProjections) {
-        Set<MessageId> withPreview = fastProjections.keySet();
-        Set<MessageId> withoutPreviews = Sets.difference(messageIds, fastProjections.keySet());
+        Set<MessageId> withProjectionEntry = fastProjections.keySet();
+        Set<MessageId> withoutProjectionEntry = Sets.difference(messageIds, withProjectionEntry);
         return Flux.merge(
-                fetch(withPreview, FetchGroup.HEADERS, mailboxSession)
+                fetch(withProjectionEntry, FetchGroup.HEADERS, mailboxSession)
                     .map(messageResults -> Helpers.toMessageViews(messageResults, new FromMessageResultAndPreview(blobManager, fastProjections))),
-                fetch(withoutPreviews, FetchGroup.FULL_CONTENT, mailboxSession)
+                fetch(withoutProjectionEntry, FetchGroup.FULL_CONTENT, mailboxSession)
                     .map(messageResults -> Helpers.toMessageViews(messageResults, messageFullViewFactory::fromMessageResults)))
             .flatMap(Flux::fromIterable);
     }


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