JAMES-2530 Add a convenience `toCoreUser` to 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/2dbdc83a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2dbdc83a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2dbdc83a Branch: refs/heads/master Commit: 2dbdc83a22829ed75cffc884ad42ae1d5d480af0 Parents: 80d0dec Author: Benoit Tellier <btell...@linagora.com> Authored: Tue Aug 28 12:30:16 2018 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Tue Aug 28 14:11:52 2018 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/james/mailbox/MailboxSession.java | 4 ++++ .../main/java/org/apache/james/jmap/methods/GetFilterMethod.java | 4 +--- .../main/java/org/apache/james/jmap/methods/SetFilterMethod.java | 4 +--- .../jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/2dbdc83a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java index 4ac93a1..50136b9 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java @@ -108,6 +108,10 @@ public interface MailboxSession { List<Locale> getLocalePreferences(); boolean isSameUser(String username); + + default org.apache.james.core.User getCoreUser() { + return org.apache.james.core.User.fromUsername(getUserName()); + } } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/2dbdc83a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetFilterMethod.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetFilterMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetFilterMethod.java index 5c04c60..2dac51e 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetFilterMethod.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetFilterMethod.java @@ -81,9 +81,7 @@ public class GetFilterMethod implements Method { private Stream<JmapResponse> process(ClientId clientId, MailboxSession mailboxSession, GetFilterRequest request) { try { - User user = User.fromUsername(mailboxSession.getUser().getUserName()); - - return retrieveFilter(clientId, user); + return retrieveFilter(clientId, mailboxSession.getUser().getCoreUser()); } catch (Exception e) { LOGGER.warn("Failed to retrieve filter"); http://git-wip-us.apache.org/repos/asf/james-project/blob/2dbdc83a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetFilterMethod.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetFilterMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetFilterMethod.java index b9eb9e7..e6184ec 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetFilterMethod.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetFilterMethod.java @@ -121,9 +121,7 @@ public class SetFilterMethod implements Method { private Stream<JmapResponse> process(ClientId clientId, MailboxSession mailboxSession, SetFilterRequest request) { try { - User user = User.fromUsername(mailboxSession.getUser().getUserName()); - - return updateFilter(clientId, request, user); + return updateFilter(clientId, request, mailboxSession.getUser().getCoreUser()); } catch (MultipleMailboxIdException e) { LOGGER.debug("Rule targeting several mailboxes", e); return Stream.of(multipleMailboxesError(clientId, e)); http://git-wip-us.apache.org/repos/asf/james-project/blob/2dbdc83a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java index 99f54f5..e162961 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java @@ -142,7 +142,7 @@ public class JmapMDN { public Message generateMDNMessage(Message originalMessage, MailboxSession mailboxSession) throws ParseException, IOException, InvalidOriginMessageForMDNException { - User user = User.fromUsername(mailboxSession.getUser().getUserName()); + User user = mailboxSession.getUser().getCoreUser(); return MDN.builder() .report(generateReport(originalMessage, mailboxSession)) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
