From 2f8456e06ad0a46dd7c90a0c869a60df974386d1 Mon Sep 17 00:00:00 2001 From: RichardHightower Date: Thu, 14 Apr 2016 19:10:44 -0700 Subject: [PATCH] Reakt 2.1.0 release --- build.gradle | 2 +- src/main/java/io/advantageous/reakt/impl/ResultImpl.java | 3 ++- .../java/io/advantageous/reakt/promise/impl/FinalPromise.java | 1 + src/test/java/io/advantageous/reakt/promise/PromiseTest.java | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index c292b15..de78a81 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'io.advantageous.reakt' -version '2.1.0-SNAPSHOT' +version '2.1.0.RELEASE' apply plugin: 'java' apply plugin: 'maven' diff --git a/src/main/java/io/advantageous/reakt/impl/ResultImpl.java b/src/main/java/io/advantageous/reakt/impl/ResultImpl.java index f8c0ea3..952472c 100644 --- a/src/main/java/io/advantageous/reakt/impl/ResultImpl.java +++ b/src/main/java/io/advantageous/reakt/impl/ResultImpl.java @@ -2,6 +2,7 @@ import io.advantageous.reakt.Expected; import io.advantageous.reakt.Result; + import java.util.function.Consumer; public class ResultImpl implements Result { @@ -78,7 +79,7 @@ public T get() { @Override public T orElse(T other) { - return success() ? (T)object : other; + return success() ? (T) object : other; } } diff --git a/src/main/java/io/advantageous/reakt/promise/impl/FinalPromise.java b/src/main/java/io/advantageous/reakt/promise/impl/FinalPromise.java index e4225d9..98fcee4 100644 --- a/src/main/java/io/advantageous/reakt/promise/impl/FinalPromise.java +++ b/src/main/java/io/advantageous/reakt/promise/impl/FinalPromise.java @@ -146,6 +146,7 @@ protected void doThenValue(final Result result) { public Promise thenMap(Function mapper) { throw new UnsupportedOperationException("then(..) not supported for final promise"); } + @Override public T orElse(T other) { if (!complete()) { diff --git a/src/test/java/io/advantageous/reakt/promise/PromiseTest.java b/src/test/java/io/advantageous/reakt/promise/PromiseTest.java index bc5add6..1f87ba6 100644 --- a/src/test/java/io/advantageous/reakt/promise/PromiseTest.java +++ b/src/test/java/io/advantageous/reakt/promise/PromiseTest.java @@ -548,7 +548,6 @@ public void testError() throws Exception { .catchError(throwable -> error[0] = true); - testErrorWithPromise(testService, employee, error, promise); }