MAILBOX-365 Move locale preference from MailboxSession.User 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/000f775d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/000f775d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/000f775d Branch: refs/heads/master Commit: 000f775d120afc9a442799272b0a3e026c6490b9 Parents: ad104d2 Author: Benoit Tellier <[email protected]> Authored: Sat Dec 15 14:10:48 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Tue Dec 18 14:48:05 2018 +0700 ---------------------------------------------------------------------- .../org/apache/james/mailbox/MailboxSession.java | 17 +++++++++-------- .../james/mailbox/mock/MockMailboxSession.java | 15 +++++---------- .../james/jmap/methods/GetMessagesMethodTest.java | 6 ------ 3 files changed, 14 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/000f775d/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 0b6324a..f81c229 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 @@ -122,6 +122,15 @@ public interface MailboxSession { User getUser(); /** + * Gets acceptable localisation for this user in preference order.<br> + * When localising a phrase, each <code>Locale</code> should be tried in + * order until an appropriate translation is obtained. + * + * @return not null, when empty the default local should be used + */ + List<Locale> getLocalePreferences(); + + /** * A mailbox user. Useful for specialist mailbox implementation. */ interface User { @@ -132,14 +141,6 @@ public interface MailboxSession { */ String getUserName(); - /** - * Gets acceptable localisation for this user in preference order.<br> - * When localising a phrase, each <code>Locale</code> should be tried in - * order until an appropriate translation is obtained. - * - * @return not null, when empty the default local should be used - */ - List<Locale> getLocalePreferences(); boolean isSameUser(String username); http://git-wip-us.apache.org/repos/asf/james-project/blob/000f775d/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java index 608f0a3..8e8e90c 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java @@ -49,16 +49,6 @@ public class MockMailboxSession implements MailboxSession { } @Override - public String getPassword() { - return null; - } - - @Override - public List<Locale> getLocalePreferences() { - return new ArrayList<>(); - } - - @Override public boolean isSameUser(String other) { if (username == null) { return other == null; @@ -72,6 +62,11 @@ public class MockMailboxSession implements MailboxSession { } @Override + public List<Locale> getLocalePreferences() { + return new ArrayList<>(); + } + + @Override public void close() { this.open = false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/000f775d/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java index 4032bd0..a8b845f 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.when; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -101,11 +100,6 @@ public class GetMessagesMethodTest { public String getUserName() { return username; } - - @Override - public List<Locale> getLocalePreferences() { - return ImmutableList.of(); - } @Override public boolean isSameUser(String username) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
