Repository: james-project Updated Branches: refs/heads/master adbec1a7d -> 7f6f70823
JAMES-1925 Mailbox should expose its path Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5c4c181c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5c4c181c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5c4c181c Branch: refs/heads/master Commit: 5c4c181ca5011be115fe14499c7297cf1376e59e Parents: 28acf6f Author: Benoit Tellier <[email protected]> Authored: Tue Feb 14 12:01:03 2017 +0700 Committer: Antoine Duprat <[email protected]> Committed: Wed Feb 15 12:00:17 2017 +0100 ---------------------------------------------------------------------- .../apache/james/mailbox/hbase/mail/model/HBaseMailbox.java | 5 +++++ .../org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java | 4 ++++ .../org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java | 5 +++++ .../lucene/search/LuceneMailboxMessageSearchIndexTest.java | 6 ++++++ .../org/apache/james/mailbox/store/mail/model/Mailbox.java | 3 +++ .../james/mailbox/store/mail/model/impl/SimpleMailbox.java | 5 +++++ .../james/mailbox/store/mail/model/ListMailboxAssertTest.java | 6 ++++++ 7 files changed, 34 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/5c4c181c/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java index ea0a360..013371e 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java @@ -59,6 +59,11 @@ public class HBaseMailbox implements Mailbox { this.mailboxId = HBaseId.of(UUID.randomUUID()); } + @Override + public MailboxPath generateAssociatedPath() { + return new MailboxPath(getNamespace(), getUser(), getName()); + } + /** * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId() */ http://git-wip-us.apache.org/repos/asf/james-project/blob/5c4c181c/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java index 0c7a51c..7b570d5 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java @@ -80,6 +80,10 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{ return logger; } + @Override + public MailboxPath generateAssociatedPath() { + return new MailboxPath(getNamespace(), getUser(), getName()); + } /* * (non-Javadoc) http://git-wip-us.apache.org/repos/asf/james-project/blob/5c4c181c/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java index da4b354..1d16eca 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java @@ -156,6 +156,11 @@ public class JPAMailbox implements Mailbox { } @Override + public MailboxPath generateAssociatedPath() { + return new MailboxPath(getNamespace(), getUser(), getName()); + } + + @Override public String toString() { return "Mailbox ( " + "mailboxId = " + this.mailboxId + TAB http://git-wip-us.apache.org/repos/asf/james-project/blob/5c4c181c/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java index d8c39e2..2068cd2 100644 --- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java +++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java @@ -38,6 +38,7 @@ import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxId; +import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.MultimailboxesSearchQuery; import org.apache.james.mailbox.model.SearchQuery; @@ -643,6 +644,11 @@ public class LuceneMailboxMessageSearchIndexTest { public void setMailboxId(MailboxId id) { } + @Override + public MailboxPath generateAssociatedPath() { + return new MailboxPath(getNamespace(), getUser(), getName()); + } + public TestId getMailboxId() { return id; } http://git-wip-us.apache.org/repos/asf/james-project/blob/5c4c181c/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java index 9f077f3..b840534 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java @@ -21,6 +21,7 @@ package org.apache.james.mailbox.store.mail.model; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxId; +import org.apache.james.mailbox.model.MailboxPath; /** * Models long term mailbox data. @@ -33,6 +34,8 @@ public interface Mailbox { */ MailboxId getMailboxId(); + MailboxPath generateAssociatedPath(); + /** * Gets the current namespace for this mailbox. * @return not null http://git-wip-us.apache.org/repos/asf/james-project/blob/5c4c181c/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java index 49b79f0..23f4ad9 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java @@ -116,6 +116,11 @@ public class SimpleMailbox implements Mailbox { return uidValidity; } + @Override + public MailboxPath generateAssociatedPath() { + return new MailboxPath(getNamespace(), getUser(), getName()); + } + /** * @see java.lang.Object#equals(java.lang.Object) */ http://git-wip-us.apache.org/repos/asf/james-project/blob/5c4c181c/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java index 6e8e408..be5fef4 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java @@ -66,6 +66,12 @@ public class ListMailboxAssertTest { private Mailbox createMailbox(final String namespace, final String user, final String name, final long uid_validity) { return new Mailbox() { + + @Override + public MailboxPath generateAssociatedPath() { + return new MailboxPath(getNamespace(), getUser(), getName()); + } + @Override public void setUser(String user) { } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
