fixing issue with rxjava based promise implementations not handling a…

… void/null promise return time
grails · Jan 15, 2025 · 6f020ce · 6f020ce
1 parent c4c29da
commit 6f020ce
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/grails-async/rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromise.groovy b/grails-async/rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromise.groovy
@@ -41,9 +41,10 @@ class RxPromise<T>  implements Promise<T> {
     protected boolean finished = false
 
     RxPromise(RxPromiseFactory promiseFactory, Closure callable, Scheduler scheduler) {
+
         this(promiseFactory, Single.create( { SingleEmitter<? super T> singleSubscriber ->
             try {
-                singleSubscriber.onSuccess((T)callable.call())
+                singleSubscriber.onSuccess((T)runCallable(callable))
             } catch (Throwable t) {
                 singleSubscriber.onError(t)
             }
@@ -158,4 +159,13 @@ class RxPromise<T>  implements Promise<T> {
             }
         }
     }
+
+    static Object runCallable(Closure callable) {
+        Object rtn = callable.call()
+        if(rtn == null) {
+            return Void
+        } else {
+            return rtn
+        }
+    }
 }
diff --git a/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy b/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy
@@ -54,6 +54,19 @@ class RxPromiseSpec extends Specification {
             result == [one: 1, two: 2, four: 4]
     }
 
+    void 'Test promise null handling'() {
+
+        when: 'a promise map is created'
+        def promise = Promises.createPromise {
+            sleep 1000
+            return null
+        }
+        def result = promise.get()
+
+        then: 'result is void'
+        result == Void
+    }
+
     void 'Test promise list handling'() {
 
         when: 'a promise list is created from two promises'

diff --git a/grails-async/rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromise.groovy b/grails-async/rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromise.groovy
@@ -41,7 +41,7 @@ class RxPromise<T>  implements Promise<T> {
     RxPromise(RxPromiseFactory promiseFactory, Closure callable, Scheduler scheduler) {
         this(promiseFactory, Single.create( { SingleEmitter<? super T> singleSubscriber ->
             try {
-                singleSubscriber.onSuccess((T)callable.call())
+                singleSubscriber.onSuccess((T)runCallable(callable))
             } catch (Throwable t) {
                 singleSubscriber.onError(t)
             }
@@ -156,4 +156,13 @@ class RxPromise<T>  implements Promise<T> {
             }
         }
     }
+
+    static Object runCallable(Closure callable) {
+        Object rtn = callable.call()
+        if(rtn == null) {
+            return Void
+        } else {
+            return rtn
+        }
+    }
 }
diff --git a/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy b/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy
@@ -41,6 +41,19 @@ class RxPromiseSpec extends Specification {
 
     }
 
+    void 'Test promise null handling'() {
+
+        when: 'a promise map is created'
+        def promise = Promises.createPromise {
+            sleep 1000
+            return null
+        }
+        def result = promise.get()
+
+        then: 'result is void'
+        result == Void
+    }
+
     void 'Test promise map handling'() {
 
         when: 'a promise map is created'