This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1259c208eef42c121b7588688988b48d2190ae8d Author: Benoit Tellier <[email protected]> AuthorDate: Thu Nov 21 18:40:03 2019 +0700 JAMES-2904 MessageResult s/getAttachments/getLoadedAttachments This underlines the fact that attachments returned by this method depends on the fetchType --- .../api/src/main/java/org/apache/james/mailbox/model/MessageResult.java | 2 +- .../src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java | 2 +- .../java/org/apache/james/mailbox/store/StoreMessageResultIterator.java | 2 +- .../src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java | 2 +- .../src/main/java/org/apache/james/jmap/draft/model/MessageFactory.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java index 7393e7d..40f75cf 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java @@ -259,7 +259,7 @@ public interface MessageResult extends Comparable<MessageResult> { * * These attachments will be loaded only for Full */ - List<MessageAttachment> getAttachments() throws MailboxException; + List<MessageAttachment> getLoadedAttachments() throws MailboxException; /** * Indicates if the message have attachments, regardless of loaded attachments. diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java index 308873c..a39e379 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java @@ -309,7 +309,7 @@ public class MessageResultImpl implements MessageResult { } @Override - public List<MessageAttachment> getAttachments() { + public List<MessageAttachment> getLoadedAttachments() { return message.getAttachments(); } diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java index 707e671..68ddee2 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java @@ -333,7 +333,7 @@ public class StoreMessageResultIterator implements MessageResultIterator { } @Override - public List<MessageAttachment> getAttachments() throws MailboxException { + public List<MessageAttachment> getLoadedAttachments() throws MailboxException { throw exception; } diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java b/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java index 6240733..e6703fe 100644 --- a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java +++ b/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java @@ -72,7 +72,7 @@ public class MessageIdProbe implements GuiceProbe { mailboxSession); return messages.stream() - .flatMap(Throwing.function(messageResult -> messageResult.getAttachments().stream())) + .flatMap(Throwing.function(messageResult -> messageResult.getLoadedAttachments().stream())) .map(MessageAttachment::getAttachmentId) .collect(Guavate.toImmutableList()); } diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageFactory.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageFactory.java index 5a7eeef..a0e0359 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageFactory.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageFactory.java @@ -233,7 +233,7 @@ public class MessageFactory { .modSeq(messageResult.getModSeq()) .size(messageResult.getSize()) .internalDate(messageResult.getInternalDate().toInstant()) - .attachments(messageResult.getAttachments()) + .attachments(messageResult.getLoadedAttachments()) .mailboxId(messageResult.getMailboxId()); try { return builder.content(messageResult.getFullContent().getInputStream()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
