Ensure that HTTP OPTIONS handling involves the proper handler chain

This is done in order to be more consistent with how other cases are handled and how RESTEasy Classic handles things as well Fixes: quarkusio#26828
geoand · Jul 27, 2022 · 8082c2b · 8082c2b
1 parent 314c240
commit 8082c2b
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 2 deletions.
diff --git a/...est/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionsRequestTest.java b/...est/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionsRequestTest.java
@@ -0,0 +1,61 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerResponseContext;
+
+import org.assertj.core.api.Assertions;
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class OptionsRequestTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(Resource.class, Filters.class);
+                }
+            });
+
+    @Test
+    public void testJsonHeaderAdded() {
+        String allowValue = when()
+                .options("/test")
+                .then()
+                .statusCode(200)
+                .header("Foo", equalTo("Bar"))
+                .extract().header("Allow");
+
+        Assertions.assertThat(allowValue).contains("GET", "HEAD", "OPTIONS");
+    }
+
+    @Path("test")
+    public static class Resource {
+
+        @GET
+        public String hello() {
+            return "hello";
+        }
+    }
+
+    public static class Filters {
+        @ServerResponseFilter
+        public void preMatchingFilter(ContainerResponseContext context) {
+            context.getHeaders().putSingle("Foo", "Bar");
+        }
+    }
+}
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
@@ -44,7 +44,7 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
             if (requestMethod.equals(HttpMethod.HEAD)) {
                 mapper = mappers.get(HttpMethod.GET);
             } else if (requestMethod.equals(HttpMethod.OPTIONS)) {
-                Set<CharSequence> allowedMethods = new HashSet<>();
+                Set<String> allowedMethods = new HashSet<>();
                 for (String method : mappers.keySet()) {
                     if (method == null) {
                         continue;
@@ -53,7 +53,7 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
                 }
                 allowedMethods.add(HttpMethod.OPTIONS);
                 allowedMethods.add(HttpMethod.HEAD);
-                requestContext.serverResponse().setResponseHeader(HttpHeaders.ALLOW, allowedMethods).end();
+                requestContext.abortWith(Response.ok().allow(allowedMethods).build());
                 return;
             }
             if (mapper == null) {