Merge pull request #30839 from Bazalii/30806-fix-accept-header-handling

Fix handling of Accept header in graphQL
quarkusio · Feb 4, 2023 · 53087ff · 53087ff
2 parents c33c7bf + 4c48dec
commit 53087ff
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...me/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java b/...me/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java
@@ -223,10 +223,14 @@ private String getRequestAccept(RoutingContext ctx) {
                 if (isValidAcceptRequest(a.rawValue())) {
                     return a.rawValue();
                 }
+
+                if (a.rawValue().startsWith("*/*")) {
+                    return DEFAULT_RESPONSE_CONTENT_TYPE;
+                }
             }
             // Seems like an unknown accept is passed in
             String accept = ctx.request().getHeader("Accept");
-            if (accept != null && !accept.isEmpty() && !accept.startsWith("*/*")) {
+            if (accept != null && !accept.isEmpty()) {
                 return accept;
             }
         }