Fixing exceptions propagation with Promise.getNow(...)

Author: vsilaev

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>net.tascalate.concurrent</groupId>
 	<artifactId>net.tascalate.concurrent.lib</artifactId>
-	<version>0.6-SNAPSHOT</version>
+	<version>0.5.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Tascalate Concurrenct</name>

src/main/java/net/tascalate/concurrent/CompletablePromise.java

@@ -74,6 +74,11 @@ public T get() throws InterruptedException, ExecutionException {
     public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
         return completionStage.get(timeout, unit);
     }
+    
+    @Override
+    public T getNow(T valueIfAbsent) {
+        return completionStage.getNow(valueIfAbsent);
+    }
 
     static boolean cancelPromise(final CompletionStage<?> promise, final boolean mayInterruptIfRunning) {
         if (promise instanceof Future) {

src/main/java/net/tascalate/concurrent/Promise.java

@@ -15,6 +15,7 @@
  */
 package net.tascalate.concurrent;
 
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
@@ -25,6 +26,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+
 /**
  * <p>{@link Promise} is a combination of the {@link CompletionStage} and {@link Future} contracts.
  * It provides both composition methods of the former and blocking access methods of the later.
@@ -37,13 +39,20 @@
  */
 public interface Promise<T> extends Future<T>, CompletionStage<T> {
 
-    default public T getNow(T valueIfAbsent) throws InterruptedException, ExecutionException {
+    default public T getNow(T valueIfAbsent) {
         return getNow(() -> valueIfAbsent);
     }
 
-    default public T getNow(Supplier<T> valueIfAbsent) throws InterruptedException, ExecutionException {
+    default public T getNow(Supplier<T> valueIfAbsent) {
         if (isDone()) {
-            return get();
+            try {
+                return get();
+            } catch (InterruptedException ex) {
+                // Should not happen when isDone() returns true
+                throw new RuntimeException(ex);
+            } catch (ExecutionException ex) {
+                throw new CompletionException(ex);
+            }
         } else {
             return valueIfAbsent.get();
         }