Fix CompletableFuture responses without body (micronaut-projects#10953)

Fixes micronaut-projects#10917
altro3 · Jul 6, 2024 · a79c389 · a79c389
1 parent a90b37a
commit a79c389
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/BodyTest.java b/http-server-tck/src/main/java/io/micronaut/http/server/tck/tests/BodyTest.java
@@ -32,11 +32,13 @@
 import io.micronaut.http.tck.AssertionUtils;
 import io.micronaut.http.tck.BodyAssertion;
 import io.micronaut.http.tck.HttpResponseAssertion;
+import io.micronaut.http.tck.TestScenario;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
@@ -168,6 +170,20 @@ void testEmptySingleResultPublisher() throws IOException {
                     .build()));
     }
 
+    @Test
+    void testRedirectFuture() throws IOException {
+        TestScenario.builder()
+            .specName(SPEC_NAME)
+            .request(HttpRequest.GET("/response-body/redirect-future"))
+            .configuration(Map.of("micronaut.http.client.follow-redirects", false))
+            .assertion((server, request) -> AssertionUtils.assertDoesNotThrow(server, request,
+                HttpResponseAssertion.builder()
+                    .status(HttpStatus.FOUND)
+                    .header("Location", "https://example.com")
+                    .build()))
+            .run();
+    }
+
     @Controller("/response-body")
     @Requires(property = "spec.name", value = SPEC_NAME)
     static class BodyController {
@@ -232,6 +248,11 @@ CompletableFuture<HttpResponse<?>> emptyFuture() {
         Publisher<HttpResponse<?>> emptySingleResult() {
             return Mono.just(HttpResponse.ok());
         }
+
+        @Get(uri = "/redirect-future")
+        CompletableFuture<HttpResponse<?>> redirectFuture() {
+            return CompletableFuture.completedFuture(HttpResponse.status(HttpStatus.FOUND).header("Location", "https://example.com"));
+        }
     }
 
     @Introspected

diff --git a/http-server/src/main/java/io/micronaut/http/server/RouteExecutor.java b/http-server/src/main/java/io/micronaut/http/server/RouteExecutor.java
@@ -717,8 +717,8 @@ private CompletionStage<MutableHttpResponse<?>> fromCompletionStage(@NonNull Htt
                 mutableResponse = forStatus(routeInfo, null)
                     .body(asyncBody);
             }
-            if (mutableResponse.body() == null) {
-                if (routeInfo.isVoid() || explicitResponse) {
+            if (mutableResponse.body() == null && !explicitResponse) {
+                if (routeInfo.isVoid()) {
                     return CompletableFuture.completedStage(voidResponse(routeInfo));
                 }
                 return CompletableFuture.completedStage(newNotFoundError(request));