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 60f84283b6d6414da381d9cb5723815a08a5ddd8 Author: Rémi Kowalski <[email protected]> AuthorDate: Tue Sep 29 14:52:55 2020 +0200 JAMES-3393 wrap exception into Mono instead of using Throwing --- .../james/mailbox/cassandra/mail/CassandraMessageMapper.java | 7 ++++--- .../main/java/org/apache/james/vault/DeletedMessageVaultHook.java | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) 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 75adad6..851db3d 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 @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.Function; import javax.mail.Flags; import javax.mail.Flags.Flag; @@ -56,7 +57,6 @@ import org.apache.james.util.streams.Limit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.fge.lambdas.Throwing; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; @@ -262,8 +262,9 @@ public class CassandraMessageMapper implements MessageMapper { CassandraId mailboxId = (CassandraId) mailbox.getMailboxId(); return block(addUidAndModseq(message, mailboxId) - .flatMap(Throwing.function(messageWithUidAndModSeq -> save(mailbox, messageWithUidAndModSeq) - .thenReturn(messageWithUidAndModSeq))) + .flatMap(messageWithUidAndModSeq -> Mono.fromCallable(() -> save(mailbox, messageWithUidAndModSeq)) + .flatMap(Function.identity()) + .thenReturn(messageWithUidAndModSeq)) .map(MailboxMessage::metaData)); } diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java index 5474f86..30c03e2 100644 --- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java +++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java @@ -40,7 +40,6 @@ import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapper; import org.reactivestreams.Publisher; -import com.github.fge.lambdas.Throwing; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -125,11 +124,11 @@ public class DeletedMessageVaultHook implements PreDeletionHook { .findReactive(ImmutableList.of(deletedMessageMailboxContext.getMessageId()), MessageMapper.FetchType.Full) .next() .switchIfEmpty(Mono.error(new RuntimeException("Cannot find " + deletedMessageMailboxContext.getMessageId()))) - .map(Throwing.function(mailboxMessage -> Pair.of(mailboxMessage, + .flatMap(mailboxMessage -> Mono.fromCallable(() -> Pair.of(mailboxMessage, deletedMessageConverter.convert(deletedMessageMailboxContext, mailboxMessage, ZonedDateTime.ofInstant(clock.instant(), ZoneOffset.UTC))))) - .flatMap(Throwing.function(pairs -> Mono.from(deletedMessageVault - .append(pairs.getRight(), pairs.getLeft().getFullContent())))); + .flatMap(pairs -> Mono.fromCallable(() -> pairs.getLeft().getFullContent()) + .flatMap(fullContent -> Mono.from(deletedMessageVault.append(pairs.getRight(), fullContent)))); } private Flux<DeletedMessageMailboxContext> groupMetadataByOwnerAndMessageId(DeleteOperation deleteOperation) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
