Merge pull request quarkusio#49880 from geoand/quarkusio#49879

Remove Content-Encoding header when response is 204

Author: geoand

extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/compress/CompressionTest.java

@@ -8,6 +8,7 @@
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 
+import org.hamcrest.CoreMatchers;
 import org.jboss.resteasy.reactive.RestResponse;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.junit.jupiter.api.Test;
@@ -45,6 +46,12 @@ public void testEndpoint() {
         assertUncompressed("/my.doc");
     }
 
+    @Test
+    public void noContent() {
+        assertNoContent("/endpoint/no-content");
+        assertNoContent("/endpoint/void-no-content");
+    }
+
     private void assertCompressed(String path) {
         String bodyStr = get(path).then().statusCode(200).header("Content-Encoding", "gzip").extract().asString();
         assertEquals(MyEndpoint.MESSAGE, bodyStr);
@@ -57,6 +64,13 @@ private void assertUncompressed(String path) {
         assertEquals(MyEndpoint.MESSAGE, response.asString());
     }
 
+    private static void assertNoContent(String path) {
+        get(path)
+                .then()
+                .statusCode(204)
+                .header("Content-Encoding", CoreMatchers.nullValue());
+    }
+
     @Path("endpoint")
     public static class MyEndpoint {
 
@@ -121,6 +135,18 @@ public String contentTypeInProducesCompressed() {
         public String contentTypeInProducesUncompressed() {
             return MESSAGE;
         }
+
+        @GET
+        @Path("no-content")
+        public RestResponse<Void> noContent() {
+            return RestResponse.noContent();
+        }
+
+        @GET
+        @Path("void-no-content")
+        public void voidNoContent() {
+
+        }
     }
 
 }

independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java

@@ -484,11 +484,13 @@ public static void encodeResponseHeaders(ResteasyReactiveRequestContext requestC
             //there is no response, so we just set the content type
             if (requestContext.getResponseEntity() == null) {
                 vertxResponse.setStatusCode(Response.Status.NO_CONTENT.getStatusCode());
+                sanitizeNoContentResponse(vertxResponse);
             }
             EncodedMediaType contentType = requestContext.getResponseContentType();
             if (contentType != null) {
                 vertxResponse.setResponseHeader(CONTENT_TYPE, contentType.toString());
             }
+
             return;
         }
         Response response = requestContext.getResponse().get();
@@ -531,6 +533,14 @@ public static void encodeResponseHeaders(ResteasyReactiveRequestContext requestC
                 vertxResponse.setResponseHeader(entry.getKey(), strValues);
             }
         }
+
+        if (response.getStatus() == Response.Status.NO_CONTENT.getStatusCode()) {
+            sanitizeNoContentResponse(vertxResponse);
+        }
+    }
+
+    private static void sanitizeNoContentResponse(ServerHttpResponse serverHttpResponse) {
+        serverHttpResponse.removeResponseHeader("Content-Encoding");
     }
 
     private static boolean requireSingleHeader(String header) {