fix: declarative client with suspended function fails on 404 (#5575)

* fix: declarative client with suspended function fails on 404 * fix: add tests for nullable return types * PR feedback
micronaut-projects · Jun 14, 2021 · 5ef638a · 5ef638a
1 parent f01d96d
commit 5ef638a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/aop/src/main/java/io/micronaut/aop/internal/intercepted/KotlinInterceptedMethod.java b/aop/src/main/java/io/micronaut/aop/internal/intercepted/KotlinInterceptedMethod.java
@@ -148,13 +148,8 @@ public Object handleResult(Object result) {
         }
         completionStageResult.whenComplete((value, throwable) -> {
             if (throwable == null) {
-                if (value == null) {
-                    if (isUnitValueType) {
-                        value = kotlin.Unit.INSTANCE;
-                    } else {
-                        CompletableFutureContinuation.Companion.completeExceptionally(continuation, new IllegalStateException("Cannot complete Kotlin coroutine with null: " + returnTypeValue.getType()));
-                        return;
-                    }
+                if (value == null && isUnitValueType) {
+                    value = kotlin.Unit.INSTANCE;
                 }
                 CompletableFutureContinuation.Companion.completeSuccess(continuation, value);
             } else {

diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/http/client/SuspendClient.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/http/client/SuspendClient.kt
@@ -13,4 +13,7 @@ interface SuspendClient {
 
     @Get
     suspend fun notFound(): HttpResponse<String?>
+
+    @Get
+    suspend fun notFoundWithoutHttpResponseWrapper(): String?
 }
diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/http/client/SuspendClientSpec.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/http/client/SuspendClientSpec.kt
@@ -30,4 +30,16 @@ class SuspendClientSpec {
 
         Assertions.assertEquals(response.status, HttpStatus.NOT_FOUND)
     }
+
+    @Test
+    fun testNotFoundWithoutHttpResponseWrapper() {
+        val server = ApplicationContext.run(EmbeddedServer::class.java, mapOf("spec.name" to "SuspendClientSpec"))
+        val ctx = server.applicationContext
+        val response = runBlocking {
+            ctx.getBean(SuspendClient::class.java).notFoundWithoutHttpResponseWrapper()
+        }
+
+        Assertions.assertNull(response)
+    }
+
 }