Remove unnecessary content type checks

These checks have potentially already been performed in ClassRoutingHandler Closes: quarkusio#37637
geoand · Dec 11, 2023 · bc20239 · bc20239
1 parent 5d4c70a
commit bc20239
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/...src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java b/...src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java
@@ -796,6 +796,18 @@ public void initPathSegments() {
         }
     }
 
+    private static final String PRODUCES_CHECKED_PROPERTY_KEY = AbstractResteasyReactiveContext.CUSTOM_RR_PROPERTIES_PREFIX
+            + "ProducesChecked";
+
+    public void setProducesChecked(boolean checked) {
+        setProperty(PRODUCES_CHECKED_PROPERTY_KEY, checked);
+    }
+
+    public boolean isProducesChecked() {
+        Object val = getProperty(PRODUCES_CHECKED_PROPERTY_KEY);
+        return val != null && (boolean) val;
+    }
+
     @Override
     public Object getHeader(String name, boolean single) {
         if (httpHeaders == null) {

diff --git a/...untime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java b/...untime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java
@@ -141,6 +141,8 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
                     throw new NotAcceptableException(INVALID_ACCEPT_HEADER_MESSAGE);
                 }
             }
+
+            requestContext.setProducesChecked(true);
         }
 
         requestContext.restart(target.value);

diff --git a/...ntime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java b/...ntime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java
@@ -39,7 +39,7 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
         if (acceptValues.isEmpty()) {
             requestContext.setResponseContentType(mediaType);
             requestContext.setEntityWriter(writer);
-        } else {
+        } else if (!requestContext.isProducesChecked()) {
             boolean handled = false;
             for (int i = 0; i < acceptValues.size(); i++) {
                 String accept = acceptValues.get(i);
-Original file line number
+Diff line change
@@ Expand Up @@
                         throw new NotAcceptableException(INVALID_ACCEPT_HEADER_MESSAGE);
                     }
                 }
+                requestContext.setProducesChecked(true);
             }
             requestContext.restart(target.value);
@@ Expand Down @@