Merge pull request #6 from code77se/parameterize-pre-reject

Parameterize JQ.reject
henhal · Apr 21, 2016 · b6758e3 · b6758e3
2 parents c9106ad + 79a8f69
commit b6758e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/jq/src/main/java/se/code77/jq/JQ.java b/jq/src/main/java/se/code77/jq/JQ.java
@@ -311,14 +311,15 @@ public V call() throws Exception {
 
     /**
      * Create a pre-rejected promise for the given exception
-     * 
+     *
+     * @param <T> Type of the value to be carried by the return promise
      * @param reason Exception to reject the promise with
      * @return A new promise
      */
-    public static Promise<Void> reject(final Exception reason) {
-        return defer(new DeferredHandler<Void>() {
+    public static <T> Promise<T> reject(final Exception reason) {
+        return defer(new DeferredHandler<T>() {
             @Override
-            public void handle(Deferred<Void> deferred) {
+            public void handle(Deferred<T> deferred) {
                 deferred.reject(reason);
             }
         });

diff --git a/jq/src/test/java/se/code77/jq/PromiseTests.java b/jq/src/test/java/se/code77/jq/PromiseTests.java
@@ -395,7 +395,7 @@ public void delay_isResolved() throws InterruptedException {
     @Test
     public void delay_isRejected() throws InterruptedException {
         // new promise is rejected immediately
-        Promise<Void> p = JQ.reject(TEST_REASON1).delay(1000);
+        Promise<Void> p = JQ.<Void>reject(TEST_REASON1).delay(1000);
 
         Thread.sleep(500);
         assertRejected(p, TEST_REASON1);