From a7ca0abe523018a7f036c8d390fcc191ed5ed212 Mon Sep 17 00:00:00 2001
From: Simon Chemouil <simon.chemouil@lambdacube.fr>
Date: Mon, 16 Oct 2017 17:40:22 +0200
Subject: [PATCH] Issue #15: Switch to Reactor 3.1.0

---
 pom.xml                                                    | 4 ++--
 src/main/java/io/primeval/codex/promise/PromiseHelper.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index aadc714..331ea97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
 	<properties>
 		<primeval-commons.version>1.1.0-SNAPSHOT</primeval-commons.version>
-		<reactor-core.version>3.0.7.RELEASE</reactor-core.version>
+		<reactor-core.version>3.1.0.RELEASE</reactor-core.version>
 	</properties>
 
 	<dependencies>
@@ -30,7 +30,7 @@
 			<artifactId>primeval-commons</artifactId>
 			<version>${primeval-commons.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.core</artifactId>
diff --git a/src/main/java/io/primeval/codex/promise/PromiseHelper.java b/src/main/java/io/primeval/codex/promise/PromiseHelper.java
index 56a9d7b..9f9fe46 100644
--- a/src/main/java/io/primeval/codex/promise/PromiseHelper.java
+++ b/src/main/java/io/primeval/codex/promise/PromiseHelper.java
@@ -194,16 +194,16 @@ public static <T> Mono<T> toMonoOptional(Promise<Optional<T>> promise) {
     }
 
     public static <T> Mono<T> toMono(Callable<Promise<T>> promise) {
-        return Mono.fromCallable(promise).then(PromiseHelper::toMono);
+        return Mono.fromCallable(promise).flatMap(PromiseHelper::toMono);
     }
 
     public static <T> Mono<T> toMonoOptional(Callable<Promise<Optional<T>>> promise) {
-        return Mono.fromCallable(promise).then(PromiseHelper::toMonoOptional);
+        return Mono.fromCallable(promise).flatMap(PromiseHelper::toMonoOptional);
     }
 
     public static <T> Promise<T> fromMono(Mono<T> mono) {
         Deferred<T> deferred = new Deferred<>();
-        mono.doOnTerminate((value, error) -> {
+        mono.doOnSuccessOrError((value, error) -> {
             if (error != null) {
                 deferred.fail(error);
             } else {