This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 59b94833262bfead2211d1d3278936a5f4bce352 Author: Benoit Tellier <[email protected]> AuthorDate: Thu May 13 15:43:23 2021 +0700 [REFACTORING] Reactive version for MessageIdMapper::copyInMailbox --- .../james/mailbox/cassandra/mail/CassandraMessageIdMapper.java | 8 ++++++-- .../java/org/apache/james/mailbox/store/mail/MessageIdMapper.java | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) 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 f724466..9ac0b67 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 @@ -172,9 +172,13 @@ public class CassandraMessageIdMapper implements MessageIdMapper { @Override public void copyInMailbox(MailboxMessage mailboxMessage, Mailbox mailbox) throws MailboxException { - CassandraId mailboxId = (CassandraId) mailbox.getMailboxId(); + MailboxReactorUtils.block(copyInMailboxReactive(mailboxMessage, mailbox)); + } - MailboxReactorUtils.block(saveMessageMetadata(mailboxMessage, mailboxId)); + @Override + public Mono<Void> copyInMailboxReactive(MailboxMessage mailboxMessage, Mailbox mailbox) { + CassandraId mailboxId = (CassandraId) mailbox.getMailboxId(); + return saveMessageMetadata(mailboxMessage, mailboxId); } private Mono<Void> saveMessageMetadata(MailboxMessage mailboxMessage, CassandraId mailboxId) { diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageIdMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageIdMapper.java index 02e1726..0db04f8 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageIdMapper.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageIdMapper.java @@ -35,6 +35,7 @@ import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.reactivestreams.Publisher; +import com.github.fge.lambdas.Throwing; import com.google.common.collect.Multimap; import reactor.core.publisher.Flux; @@ -56,6 +57,10 @@ public interface MessageIdMapper { void copyInMailbox(MailboxMessage mailboxMessage, Mailbox mailbox) throws MailboxException; + default Mono<Void> copyInMailboxReactive(MailboxMessage mailboxMessage, Mailbox mailbox) { + return Mono.fromRunnable(Throwing.runnable(() -> copyInMailboxReactive(mailboxMessage, mailbox)).sneakyThrow()); + } + void delete(MessageId messageId); void delete(MessageId messageId, Collection<MailboxId> mailboxIds); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
