JAMES-2345 Fix QuotaRoot error message
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/df574765 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/df574765 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/df574765 Branch: refs/heads/master Commit: df574765ddba1c2f93656dba3e118aaa26a94209 Parents: 23a634c Author: Raphael Ouazana <[email protected]> Authored: Tue Mar 6 16:23:54 2018 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Thu Mar 8 09:29:52 2018 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/james/mailbox/model/QuotaRoot.java | 6 ++++++ .../mailbox/store/quota/DefaultUserQuotaRootResolver.java | 2 +- .../mailbox/store/quota/DefaultQuotaRootResolverTest.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/df574765/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java index 885540b..248b7fc 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java @@ -19,6 +19,7 @@ package org.apache.james.mailbox.model; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -51,4 +52,9 @@ public class QuotaRoot { return value; } + public String toString() { + return MoreObjects.toStringHelper(this) + .add("value", value) + .toString(); + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/df574765/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java index a95c8a5..98a8816 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java @@ -64,7 +64,7 @@ public class DefaultUserQuotaRootResolver implements UserQuotaRootResolver { public List<MailboxPath> retrieveAssociatedMailboxes(QuotaRoot quotaRoot, MailboxSession mailboxSession) throws MailboxException { List<String> parts = Lists.newArrayList(Splitter.on(SEPARATOR).split(quotaRoot.getValue())); if (parts.size() != 2) { - throw new MailboxException(quotaRoot + " used as QuotaRoot should not contain 2 \"" + SEPARATOR + "\""); + throw new MailboxException(quotaRoot + " used as QuotaRoot should contain exactly one \"" + SEPARATOR + "\""); } String namespace = parts.get(0); String user = parts.get(1); http://git-wip-us.apache.org/repos/asf/james-project/blob/df574765/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java index 0ca9839..1c3e95c 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java @@ -76,7 +76,7 @@ public class DefaultQuotaRootResolverTest { } @Test(expected = MailboxException.class) - public void retrieveAssociatedMailboxesShouldThrowWhenQuotaRootNotContainsSeparator2Times() throws Exception { + public void retrieveAssociatedMailboxesShouldThrowWhenQuotaRootContainsSeparator2Times() throws Exception { testee.retrieveAssociatedMailboxes(QuotaRoot.quotaRoot("#private&be&nwa"), null); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
