Merge pull request #49221 from mposolda/49172-resteasy-head-bug

Fix Quarkus REST issue where HEAD returned 405

Author: FroMage

independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java

@@ -79,18 +79,22 @@ public void onComplete(Throwable throwable) {
         }
 
         RequestMapper<RuntimeResource> mapper = target.get(requestContext.getMethod());
-        boolean hadNullMethodMapper = false;
-        if (mapper == null) {
-            mapper = target.get(null); //another layer of resource locators maybe
+        RequestMapper.RequestMatch<RuntimeResource> res;
+        boolean hadNullMethodMapper;
+        if (mapper != null) {
+            res = findRequestMatch(mapper, requestContext);
+            hadNullMethodMapper = false;
+        } else {
+            res = findRequestMatch(target.get(null), requestContext); //another layer of resource locators maybe
             // we set this without checking if we matched, but we only use it after
             // we check for a null mapper, so by the time we use it, it must have meant that
             // we had a matcher for a null method
             hadNullMethodMapper = true;
 
-            if (mapper == null) {
+            if (res == null) {
                 String requestMethod = requestContext.getMethod();
                 if (requestMethod.equals(HttpMethod.HEAD)) {
-                    mapper = target.get(HttpMethod.GET);
+                    res = findRequestMatch(target.get(HttpMethod.GET), requestContext);
                 } else if (requestMethod.equals(HttpMethod.OPTIONS)) {
                     Set<String> allowedMethods = new HashSet<>();
                     for (String method : target.keySet()) {
@@ -106,11 +110,6 @@ public void onComplete(Throwable throwable) {
                 }
             }
         }
-        if (mapper == null) {
-            throw new WebApplicationException(Response.status(Response.Status.METHOD_NOT_ALLOWED.getStatusCode()).build());
-        }
-        RequestMapper.RequestMatch<RuntimeResource> res = mapper
-                .map(requestContext.getRemaining().isEmpty() ? "/" : requestContext.getRemaining());
         if (res == null) {
             // the TCK checks for both these return statuses
             if (hadNullMethodMapper)
@@ -133,6 +132,12 @@ public void onComplete(Throwable throwable) {
 
     }
 
+    private RequestMapper.RequestMatch<RuntimeResource> findRequestMatch(RequestMapper<RuntimeResource> mapper,
+            ResteasyReactiveRequestContext requestContext) {
+        return mapper == null ? null
+                : mapper.map(requestContext.getRemaining().isEmpty() ? "/" : requestContext.getRemaining());
+    }
+
     private Map<String, RequestMapper<RuntimeResource>> findTarget(Class<?> locatorClass) {
         if (locatorClass == Object.class || locatorClass == null) {
             return null;

independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java

@@ -22,6 +22,7 @@
 import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ParameterSubResRootImpl;
 import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ParameterSubResSub;
 import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ParameterSubResSubImpl;
+import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ParameterSubResSubImpl2;
 import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.RequestScopedObject;
 import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -65,6 +66,7 @@ public JavaArchive get() {
                     war.addClass(RequestScopedObject.class);
                     war.addClass(ParameterSubResSub.class);
                     war.addClass(ParameterSubResSubImpl.class);
+                    war.addClass(ParameterSubResSubImpl2.class);
                     war.addClasses(ParameterSubResRootImpl.class, ParameterSubResGenericSub.class);
                     return war;
                 }
@@ -110,6 +112,30 @@ public void testSubResourceOptions() throws Exception {
         Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
     }
 
+    @Test
+    @DisplayName("Test Sub Resource with null path handler")
+    public void testSubResourceWithNullPathHandler() throws Exception {
+        Response response = client.target(generateURL("/path/sub2")).request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals("Boo2", response.readEntity(String.class), "Wrong content of response");
+    }
+
+    @Test
+    @DisplayName("Test Sub Resource with null path handler - HEAD")
+    public void testSubResourceWithNullPathHandlerHead() throws Exception {
+        try (Response response = client.target(generateURL("/path/sub2")).request().head()) {
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        }
+    }
+
+    @Test
+    @DisplayName("Test Sub Resource with null path handler - OPTIONS")
+    public void testSubResourceWithNullPathHandlerOptions() throws Exception {
+        try (Response response = client.target(generateURL("/path/sub2")).request().options()) {
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        }
+    }
+
     @Test
     @DisplayName("Test Return Sub Resource As Class")
     public void testReturnSubResourceAsClass() throws Exception {

independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRoot.java

@@ -9,4 +9,7 @@ public interface ParameterSubResRoot {
 
     @Path("subclass")
     Class<ParameterSubResClassSub> getSubClass();
+
+    @Path("sub2")
+    ParameterSubResSubImpl2 getAnotherSubresource();
 }

independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRootImpl.java

@@ -15,4 +15,8 @@ public Class<ParameterSubResClassSub> getSubClass() {
         return ParameterSubResClassSub.class;
     }
 
+    @Override
+    public ParameterSubResSubImpl2 getAnotherSubresource() {
+        return new ParameterSubResSubImpl2();
+    }
 }

independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResSubImpl2.java

@@ -0,0 +1,20 @@
+package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+
+public class ParameterSubResSubImpl2 {
+
+    @GET
+    @Produces("text/plain")
+    public String get() {
+        return "Boo2";
+    }
+
+    @Path("/unrelated")
+    @Produces("text/plain")
+    public String noHttpMethod() {
+        return "Whatever - this method exists just to simulate 49172";
+    }
+}