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 546b1607f4e979210197861cd0f4281805ff94be Author: Benoit Tellier <[email protected]> AuthorDate: Tue Apr 14 17:05:16 2020 +0700 [REFACTORING] CassandraMessageMapper::expunge avoid a flatMapMany --- .../apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 919da37..fe6ebfc 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 @@ -210,10 +210,10 @@ public class CassandraMessageMapper implements MessageMapper { .block(); } - private Flux<SimpleMailboxMessage> expungeOne(CassandraId mailboxId, MessageUid messageUid) { + private Mono<SimpleMailboxMessage> expungeOne(CassandraId mailboxId, MessageUid messageUid) { return retrieveComposedId(mailboxId, messageUid) .flatMap(idWithMetadata -> deleteUsingMailboxId(idWithMetadata).thenReturn(idWithMetadata)) - .flatMapMany(idWithMetadata -> messageDAO.retrieveMessage(idWithMetadata, FetchType.Metadata)) + .flatMap(idWithMetadata -> messageDAO.retrieveMessage(idWithMetadata, FetchType.Metadata)) .map(pair -> pair.toMailboxMessage(ImmutableList.of())); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
