You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/04/30 04:11:36 UTC
[james-project] 16/21: [REFACTORING] CassandraMailboxMapper: remove duplicated code
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 30de0db37eb769ccabc95c5b813690f9b48b1d12
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Apr 21 13:35:42 2022 +0700
[REFACTORING] CassandraMailboxMapper: remove duplicated code
---
.../james/mailbox/cassandra/mail/CassandraMailboxMapper.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
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 63acaa8108..e4cf928020 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
@@ -261,7 +261,7 @@ public class CassandraMailboxMapper implements MailboxMapper {
@Override
public Flux<Mailbox> list() {
return performReadRepair(mailboxDAO.retrieveAllMailboxes())
- .flatMap(this::toMailboxWithAcl, CONCURRENCY);
+ .flatMap(this::addAcl, CONCURRENCY);
}
@Override
@@ -276,15 +276,6 @@ public class CassandraMailboxMapper implements MailboxMapper {
return aclMapper.setACL(cassandraId, mailboxACL);
}
- private Mono<Mailbox> toMailboxWithAcl(Mailbox mailbox) {
- CassandraId cassandraId = (CassandraId) mailbox.getMailboxId();
- return retrieveAcl(cassandraId)
- .map(acl -> {
- mailbox.setACL(acl);
- return mailbox;
- });
- }
-
@Override
public Flux<Mailbox> findNonPersonalMailboxes(Username userName, Right right) {
return performReadRepair(
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org