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 43887c3f061e7cd39ab828a668b64fff5c0b9d88 Author: Benoit Tellier <[email protected]> AuthorDate: Sun Mar 28 14:29:45 2021 +0700 JAMES-3435 s/ReadConsistency/ConsistencyChoice --- .../apache/james/mailbox/cassandra/DeleteMessageListener.java | 4 ++-- .../james/mailbox/cassandra/mail/CassandraMessageIdMapper.java | 8 ++++---- .../mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java | 10 +++++----- .../james/mailbox/cassandra/mail/CassandraMessageMapper.java | 2 +- .../cassandra/mail/task/RecomputeMailboxCountersService.java | 2 +- .../mail/task/SolveMessageInconsistenciesService.java | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/DeleteMessageListener.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/DeleteMessageListener.java index 728bd81..ddfe04b 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/DeleteMessageListener.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/DeleteMessageListener.java @@ -239,13 +239,13 @@ public class DeleteMessageListener implements EventListener.GroupEventListener { } private Mono<Boolean> isReferenced(CassandraMessageId id) { - return imapUidDAO.retrieve(id, ALL_MAILBOXES, CassandraMessageIdToImapUidDAO.ReadConsistency.STRONG) + return imapUidDAO.retrieve(id, ALL_MAILBOXES, CassandraMessageIdToImapUidDAO.ConsistencyChoice.STRONG) .hasElements() .map(negate()); } private Mono<Boolean> isReferenced(CassandraMessageId id, CassandraId excludedId) { - return imapUidDAO.retrieve(id, ALL_MAILBOXES, CassandraMessageIdToImapUidDAO.ReadConsistency.STRONG) + return imapUidDAO.retrieve(id, ALL_MAILBOXES, CassandraMessageIdToImapUidDAO.ConsistencyChoice.STRONG) .filter(metadata -> !metadata.getComposedMessageId().getMailboxId().equals(excludedId)) .hasElements() .map(negate()); diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java index 3fae704..9cb0d5e 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.mailbox.cassandra.mail; -import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ReadConsistency.STRONG; -import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ReadConsistency.WEAK; +import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ConsistencyChoice.STRONG; +import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ConsistencyChoice.WEAK; import static org.apache.james.util.ReactorUtils.DEFAULT_CONCURRENCY; import java.time.Duration; @@ -35,7 +35,7 @@ import org.apache.james.backends.cassandra.init.configuration.CassandraConfigura import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; -import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ReadConsistency; +import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ConsistencyChoice; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.ComposedMessageId; @@ -147,7 +147,7 @@ public class CassandraMessageIdMapper implements MessageIdMapper { .block(); } - public ReadConsistency chooseReadConsistency() { + public ConsistencyChoice chooseReadConsistency() { if (cassandraConfiguration.isMessageReadStrongConsistency()) { return STRONG; } else { diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java index 2633fbf..0bb92ea 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java @@ -70,14 +70,14 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; public class CassandraMessageIdToImapUidDAO { - public enum ReadConsistency { + public enum ConsistencyChoice { STRONG(CassandraConsistenciesConfiguration::getLightweightTransaction), WEAK(CassandraConsistenciesConfiguration::getRegular); private final Function<CassandraConsistenciesConfiguration, ConsistencyLevel> consistencyLevelChoice; - ReadConsistency(Function<CassandraConsistenciesConfiguration, ConsistencyLevel> consistencyLevelChoice) { + ConsistencyChoice(Function<CassandraConsistenciesConfiguration, ConsistencyLevel> consistencyLevelChoice) { this.consistencyLevelChoice = consistencyLevelChoice; } @@ -213,16 +213,16 @@ public class CassandraMessageIdToImapUidDAO { .setLong(MOD_SEQ_CONDITION, oldModSeq.asLong())); } - public Flux<ComposedMessageIdWithMetaData> retrieve(CassandraMessageId messageId, Optional<CassandraId> mailboxId, ReadConsistency readConsistency) { + public Flux<ComposedMessageIdWithMetaData> retrieve(CassandraMessageId messageId, Optional<CassandraId> mailboxId, ConsistencyChoice readConsistencyChoice) { return cassandraAsyncExecutor.executeRows( selectStatement(messageId, mailboxId) - .setConsistencyLevel(readConsistency.choose(consistenciesConfiguration))) + .setConsistencyLevel(readConsistencyChoice.choose(consistenciesConfiguration))) .map(this::toComposedMessageIdWithMetadata); } @VisibleForTesting public Flux<ComposedMessageIdWithMetaData> retrieve(CassandraMessageId messageId, Optional<CassandraId> mailboxId) { - return retrieve(messageId, mailboxId, ReadConsistency.STRONG); + return retrieve(messageId, mailboxId, ConsistencyChoice.STRONG); } public Flux<ComposedMessageIdWithMetaData> retrieveAllMessages() { diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java index 419b8f8..68a7e72 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java @@ -19,7 +19,7 @@ package org.apache.james.mailbox.cassandra.mail; -import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ReadConsistency.STRONG; +import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ConsistencyChoice.STRONG; import static org.apache.james.util.ReactorUtils.DEFAULT_CONCURRENCY; import java.security.SecureRandom; diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersService.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersService.java index aa88ef9..4245e78 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersService.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersService.java @@ -19,7 +19,7 @@ package org.apache.james.mailbox.cassandra.mail.task; -import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ReadConsistency.STRONG; +import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ConsistencyChoice.STRONG; import java.util.Objects; import java.util.Optional; diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesService.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesService.java index facd5d6..a7ddc31 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesService.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesService.java @@ -19,7 +19,7 @@ package org.apache.james.mailbox.cassandra.mail.task; -import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ReadConsistency.STRONG; +import static org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO.ConsistencyChoice.STRONG; import static org.apache.james.util.ReactorUtils.publishIfPresent; import java.time.Duration; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
