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 2c2578326b57c91a4a543b640284977e243dd1ea Author: Benoit Tellier <[email protected]> AuthorDate: Tue Feb 18 14:06:15 2020 +0700 [REFACTORING] Remove unused method Mailbox matching is performed directly by mailboxQuery being now pushed to the mapper. --- .../cassandra/mail/CassandraMailboxMapper.java | 22 ---------------------- 1 file changed, 22 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 f62c27b..ed2573c 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 @@ -19,11 +19,7 @@ package org.apache.james.mailbox.cassandra.mail; -import java.util.Collections; import java.util.List; -import java.util.StringTokenizer; -import java.util.regex.Pattern; -import java.util.stream.Collectors; import javax.inject.Inject; @@ -53,8 +49,6 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; public class CassandraMailboxMapper implements MailboxMapper { - - private static final String WILDCARD = "%"; public static final Logger LOGGER = LoggerFactory.getLogger(CassandraMailboxMapper.class); private final CassandraMailboxDAO mailboxDAO; @@ -254,22 +248,6 @@ public class CassandraMailboxMapper implements MailboxMapper { // Do nothing } - private String constructEscapedRegexForMailboxNameMatching(MailboxPath path) { - return Collections - .list(new StringTokenizer(path.getName(), WILDCARD, true)) - .stream() - .map(this::tokenToPatternPart) - .collect(Collectors.joining()); - } - - private String tokenToPatternPart(Object token) { - if (token.equals(WILDCARD)) { - return ".*"; - } else { - return Pattern.quote((String) token); - } - } - private Mono<Mailbox> toMailboxWithAcl(Mailbox mailbox) { CassandraId cassandraId = (CassandraId) mailbox.getMailboxId(); return cassandraACLMapper.getACL(cassandraId) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
