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 bt...@apache.org on 2020/02/25 02:25:44 UTC
[james-project] 07/10: [REFACTORING] Extract condition in
CassandraMailboxMapper::hasChildren
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 b1109e0053e480d5f5f4f1c7bee575c88b7759a5
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Feb 18 14:12:24 2020 +0700
[REFACTORING] Extract condition in CassandraMailboxMapper::hasChildren
This complex condition deserves a proper name
---
.../apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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 916b842..7be9c1e 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
@@ -213,11 +213,15 @@ public class CassandraMailboxMapper implements MailboxMapper {
return Flux.merge(
mailboxPathDAO.listUserMailboxes(mailbox.getNamespace(), mailbox.getUser()),
mailboxPathV2DAO.listUserMailboxes(mailbox.getNamespace(), mailbox.getUser()))
- .filter(idAndPath -> idAndPath.getMailboxPath().getName().startsWith(mailbox.getName() + String.valueOf(delimiter)))
+ .filter(idAndPath -> isPathChildOfMailbox(idAndPath, mailbox, delimiter))
.hasElements()
.block();
}
+ private boolean isPathChildOfMailbox(CassandraIdAndPath idAndPath, Mailbox mailbox, char delimiter) {
+ return idAndPath.getMailboxPath().getName().startsWith(mailbox.getName() + String.valueOf(delimiter));
+ }
+
@Override
public List<Mailbox> list() {
return mailboxDAO.retrieveAllMailboxes()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org