JAMES-1691 MessageId doesn't need a MailboxSession
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6d7e6833 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6d7e6833 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6d7e6833 Branch: refs/heads/master Commit: 6d7e68330a4e3b5be526a3dc86ea399f10e75427 Parents: a5a9ee2 Author: Raphael Ouazana <[email protected]> Authored: Wed Feb 24 15:03:32 2016 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Wed Feb 24 15:03:32 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/james/jmap/methods/GetMessagesMethod.java | 2 +- .../java/org/apache/james/jmap/methods/SetMessagesMethod.java | 2 +- .../org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java | 2 +- .../jmap/src/main/java/org/apache/james/jmap/model/MessageId.java | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6d7e6833/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java index a2ad348..08b4de6 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java @@ -142,7 +142,7 @@ public class GetMessagesMethod<Id extends MailboxId> implements Method { return Throwing .function((MessageId messageId) -> { - MailboxPath mailboxPath = messageId.getMailboxPath(mailboxSession); + MailboxPath mailboxPath = messageId.getMailboxPath(); MessageMapper<Id> messageMapper = messageMapperFactory.getMessageMapper(mailboxSession); Mailbox<Id> mailbox = mailboxMapperFactory.getMailboxMapper(mailboxSession).findMailboxByPath(mailboxPath); return Pair.with( http://git-wip-us.apache.org/repos/asf/james-project/blob/6d7e6833/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java index eeb7a65..f14cdba 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java @@ -112,7 +112,7 @@ public class SetMessagesMethod<Id extends MailboxId> implements Method { try { Mailbox<Id> mailbox = mailboxMapperFactory .getMailboxMapper(mailboxSession) - .findMailboxByPath(messageId.getMailboxPath(mailboxSession)); + .findMailboxByPath(messageId.getMailboxPath()); MailboxMessage<Id> mailboxMessage = getMailboxMessage(messageMapper, messageId, mailbox); http://git-wip-us.apache.org/repos/asf/james-project/blob/6d7e6833/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java index 458e748..f62e390 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java @@ -87,7 +87,7 @@ public class SetMessagesUpdateProcessor<Id extends MailboxId> { try { MessageMapper<Id> messageMapper = mailboxSessionMapperFactory.createMessageMapper(mailboxSession); Mailbox<Id> mailbox = mailboxMapperFactory.getMailboxMapper(mailboxSession) - .findMailboxByPath(messageId.getMailboxPath(mailboxSession)); + .findMailboxByPath(messageId.getMailboxPath()); Iterator<MailboxMessage<Id>> mailboxMessage = messageMapper.findInMailbox( mailbox, MessageRange.one(messageId.getUid()), MessageMapper.FetchType.Metadata, LIMIT_BY_ONE); MailboxMessage<Id> messageWithUpdatedFlags = applyMessagePatch(messageId, mailboxMessage.next(), updateMessagePatch, builder); http://git-wip-us.apache.org/repos/asf/james-project/blob/6d7e6833/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java index b4b08c5..1a93291 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java @@ -20,7 +20,6 @@ package org.apache.james.jmap.model; import java.util.Objects; -import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSession.User; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; @@ -67,7 +66,7 @@ public class MessageId { return uid; } - public MailboxPath getMailboxPath(MailboxSession mailboxSession) { + public MailboxPath getMailboxPath() { return new MailboxPath(MailboxConstants.USER_NAMESPACE, username, mailboxPath); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
