You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/11/15 08:02:01 UTC
[03/11] james-project git commit: MAILBOX-316 getMailboxById should
retrieve acl mailbox also
MAILBOX-316 getMailboxById should retrieve acl mailbox also
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c0db96a8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c0db96a8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c0db96a8
Branch: refs/heads/master
Commit: c0db96a8fc96815336e0e1758282efbbc525292c
Parents: 5ceee78
Author: quynhn <qn...@linagora.com>
Authored: Thu Nov 2 17:30:55 2017 +0700
Committer: quynhn <qn...@linagora.com>
Committed: Wed Nov 15 09:22:18 2017 +0700
----------------------------------------------------------------------
.../cassandra/mail/CassandraMailboxMapper.java | 2 +-
.../store/mail/model/MailboxMapperACLTest.java | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c0db96a8/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
index 4765250..25723ff 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java
@@ -92,7 +92,7 @@ public class CassandraMailboxMapper implements MailboxMapper {
.thenCompose(cassandraIdOptional ->
cassandraIdOptional
.map(CassandraMailboxPathDAO.CassandraIdAndPath::getCassandraId)
- .map(mailboxDAO::retrieveMailbox)
+ .map(this::retrieveMailbox)
.orElse(CompletableFuture.completedFuture(Optional.empty())))
.join()
.orElseThrow(() -> new MailboxNotFoundException(path));
http://git-wip-us.apache.org/repos/asf/james-project/blob/c0db96a8/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
index dcc3acb..aba69b9 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
@@ -398,4 +398,18 @@ public abstract class MailboxMapperACLTest {
.containsOnly(benwaInboxMailbox);
}
+ @Test
+ public void findMailboxByPathShouldReturnMailboxWithACL() throws MailboxException {
+ EntryKey key = EntryKey.createUserEntryKey("user");
+ Rfc4314Rights rights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
+ mailboxMapper.setACL(benwaInboxMailbox,
+ new MailboxACL(ImmutableMap.of(key, rights)));
+
+ assertThat(
+ mailboxMapper.findMailboxByPath(benwaInboxMailbox.generateAssociatedPath())
+ .getACL()
+ .getEntries())
+ .hasSize(1)
+ .containsEntry(key, rights);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org