You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2020/12/11 10:44:16 UTC

[james-project] 12/15: [REFACTORING] Remove Mapper::executeReactiveVoid

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 1181b78c75a1e8b8d1970c8d59b679d02dafa17d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Dec 6 21:47:00 2020 +0700

    [REFACTORING] Remove Mapper::executeReactiveVoid
---
 .../apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java  | 2 +-
 .../james/mailbox/store/transaction/TransactionalMapper.java       | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
index d3ebc16..eef06de 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
@@ -52,7 +52,7 @@ public class TransactionalMailboxMapper implements MailboxMapper {
 
     @Override
     public Mono<Void> delete(Mailbox mailbox) {
-        return wrapped.executeReactiveVoid(wrapped.delete(mailbox));
+        return wrapped.executeReactive(wrapped.delete(mailbox));
     }
 
     @Override
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
index 4bc1073..bdfb6d7 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
@@ -51,13 +51,6 @@ public abstract class TransactionalMapper implements Mapper {
             .doOnError(MailboxException.class, Throwing.consumer(e -> rollback()).sneakyThrow());
     }
 
-    public final Mono<Void> executeReactiveVoid(Mono<Void> transaction) {
-        return Mono.fromRunnable(Throwing.runnable(this::begin).sneakyThrow())
-                .then(transaction)
-                .thenEmpty(Mono.fromRunnable(Throwing.runnable(this::commit).sneakyThrow()))
-                .doOnError(MailboxException.class, Throwing.consumer(e -> rollback()).sneakyThrow());
-    }
-
     /**
      * Begin transaction
      */


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org