Merge pull request #41111 from geoand/#41097

Take MediaType set in pre-match filter into when returning Response
quarkusio · Jun 11, 2024 · 04992fe · 04992fe
2 parents c2c55b4 + 57f38f1
commit 04992fe
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 2 deletions.
diff --git a/.../main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java b/.../main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java
@@ -41,8 +41,15 @@ public void write(ResteasyReactiveRequestContext context, Object entity) throws
             ServerHttpRequest vertxRequest = context.serverRequest();
             // first check and see if the resource method defined a media type and try to use it
             if ((context.getTarget() != null) && (context.getTarget().getProduces() != null)) {
-                MediaType negotiatedMediaType = context.getTarget().getProduces()
-                        .negotiateProduces(vertxRequest.getRequestHeader(HttpHeaders.ACCEPT)).getKey();
+                MediaType negotiatedMediaType = null;
+                List<String> accepts = context.getHttpHeaders().getRequestHeader(HttpHeaders.ACCEPT);
+                for (String accept : accepts) {
+                    negotiatedMediaType = context.getTarget().getProduces().negotiateProduces(accept).getKey();
+                    if (negotiatedMediaType != null) {
+                        break;
+                    }
+                }
+
                 List<MessageBodyWriter<?>> writersList = serialisers.findWriters(null, entity.getClass(), negotiatedMediaType,
                         RuntimeType.SERVER);
                 if (!writersList.isEmpty()) {

diff --git a/...va/org/jboss/resteasy/reactive/server/vertx/test/matching/PreMatchAcceptInHeaderTest.java b/...va/org/jboss/resteasy/reactive/server/vertx/test/matching/PreMatchAcceptInHeaderTest.java
@@ -20,6 +20,7 @@
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
@@ -123,6 +124,37 @@ void entityTextWithAcceptToTextInFilter() {
                 .body(equalTo("text"));
     }
 
+    @Test
+    void responseEntityJsonWithoutAcceptToTextInFilter() {
+        given().accept("application/json")
+                .when()
+                .get("test/response")
+                .then()
+                .statusCode(200)
+                .body(containsString("\"text\""));
+    }
+
+    @Test
+    void responseEntityTextWithoutAcceptToTextInFilter() {
+        given().accept("text/plain")
+                .when()
+                .get("test/response")
+                .then()
+                .statusCode(200)
+                .body(equalTo("text"));
+    }
+
+    @Test
+    void responseEntityTextWithAcceptToTextInFilter() {
+        given().accept("application/json")
+                .header("x-set-accept-to-text", "true")
+                .when()
+                .get("test/response")
+                .then()
+                .statusCode(200)
+                .body(equalTo("text"));
+    }
+
     @Path("/test")
     public static class Resource {
 
@@ -152,6 +184,13 @@ public String html() {
         public Entity entity() {
             return new Entity("text");
         }
+
+        @GET
+        @Path("response")
+        @Produces({ MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON })
+        public Response response() {
+            return Response.ok(new Entity("text")).build();
+        }
     }
 
     public record Entity(String value) {