This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 308855233ea17534974d0924b9e5e80e19a8dabd Author: Matthieu Baechler <matth...@apache.org> AuthorDate: Thu Jan 30 10:27:40 2020 +0100 MAILBOX-396 CassandraUidProvider doesn't need to use Mono.defer now that the executor produce lazy Monos --- .../james/mailbox/cassandra/mail/CassandraUidProvider.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java index a5d9968..6dd5e17 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProvider.java @@ -117,28 +117,28 @@ public class CassandraUidProvider implements UidProvider { } private Mono<MessageUid> findHighestUid(CassandraId mailboxId) { - return Mono.defer(() -> executor.executeSingleRow( + return executor.executeSingleRow( selectStatement.bind() .setUUID(MAILBOX_ID, mailboxId.asUuid()) .setConsistencyLevel(ConsistencyLevel.SERIAL)) - .map(row -> MessageUid.of(row.getLong(NEXT_UID)))); + .map(row -> MessageUid.of(row.getLong(NEXT_UID))); } private Mono<MessageUid> tryUpdateUid(CassandraId mailboxId, MessageUid uid) { MessageUid nextUid = uid.next(); - return Mono.defer(() -> executor.executeReturnApplied( + return executor.executeReturnApplied( updateStatement.bind() .setUUID(MAILBOX_ID, mailboxId.asUuid()) .setLong(CONDITION, uid.asLong()) .setLong(NEXT_UID, nextUid.asLong())) - .handle((success, sink) -> successToUid(nextUid, success).ifPresent(sink::next))); + .handle((success, sink) -> successToUid(nextUid, success).ifPresent(sink::next)); } private Mono<MessageUid> tryInsert(CassandraId mailboxId) { - return Mono.defer(() -> executor.executeReturnApplied( + return executor.executeReturnApplied( insertStatement.bind() .setUUID(MAILBOX_ID, mailboxId.asUuid())) - .handle((success, sink) -> successToUid(MessageUid.MIN_VALUE, success).ifPresent(sink::next))); + .handle((success, sink) -> successToUid(MessageUid.MIN_VALUE, success).ifPresent(sink::next)); } private Optional<MessageUid> successToUid(MessageUid uid, Boolean success) { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org