Merge pull request quarkusio#47341 from geoand/quarkusio#47321

Add support for `ServerRequestContext` for `@ServerExceptionMapper` and `@ServerRequestFilter` methods

Author: geoand

extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherExceptionMapper.java

@@ -4,6 +4,7 @@
 
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
 import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
 import io.vertx.ext.web.RoutingContext;
 
@@ -17,7 +18,9 @@ public MyOtherExceptionMapper(SomeBean someBean) {
 
     @ServerExceptionMapper
     public Response handleMyOtherException(RoutingContext routingContext, MyOtherException myOtherException,
-            SimpleResourceInfo simplifiedResourceInfo) {
+            SimpleResourceInfo simplifiedResourceInfo, ServerRequestContext serverRequestContext) {
+        serverRequestContext.getResteasyReactiveResourceInfo();
+        simplifiedResourceInfo.getMethodName();
         return Response.status(411).build();
     }
 }

extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerRequestFilter.java

@@ -5,12 +5,15 @@
 import jakarta.ws.rs.core.UriInfo;
 
 import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
 public class CustomContainerRequestFilter {
 
     @ServerRequestFilter
-    public void whatever(UriInfo uriInfo, HttpHeaders httpHeaders, ContainerRequestContext requestContext) {
-        String customHeaderValue = uriInfo.getPath() + "-" + httpHeaders.getHeaderString("some-input");
+    public void whatever(UriInfo uriInfo, HttpHeaders httpHeaders, ContainerRequestContext requestContext,
+            ServerRequestContext serverRequestContext) {
+        String customHeaderValue = uriInfo.getPath() + "-" + httpHeaders.getHeaderString("some-input") + "-"
+                + serverRequestContext.getRequestHeaders().getHeaderString("some-other-input");
         requestContext.getHeaders().putSingle("custom-header", customHeaderValue);
     }
 }

extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersTest.java

@@ -31,14 +31,16 @@ public JavaArchive get() {
 
     @Test
     public void testFilters() {
-        Headers responseHeaders = RestAssured.given().header("some-input", "bar").get("/custom/req")
-                .then().statusCode(200).body(Matchers.containsString("/custom/req-bar-null")).extract().headers();
+        Headers responseHeaders = RestAssured.given().header("some-input", "bar").header("some-other-input", "bar2")
+                .get("/custom/req")
+                .then().statusCode(200).body(Matchers.containsString("/custom/req-bar-bar2-null")).extract().headers();
         assertThat(responseHeaders.getValues("java-method")).containsOnly("filters");
         Assertions.assertEquals(3, AssertContainerFilter.COUNT.get());
         assertThat(responseHeaders.getValues("very")).isEmpty();
 
-        responseHeaders = RestAssured.given().header("some-input", "bar").get("/custom/metal")
-                .then().statusCode(200).body(Matchers.containsString("/custom/metal-bar-metal")).extract().headers();
+        responseHeaders = RestAssured.given().header("some-input", "bar").header("some-other-input", "bar2")
+                .get("/custom/metal")
+                .then().statusCode(200).body(Matchers.containsString("/custom/metal-bar-bar2-metal")).extract().headers();
         assertThat(responseHeaders.getValues("very")).containsOnly("heavy");
     }
 }

independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java

@@ -273,6 +273,9 @@ public final class ResteasyReactiveDotNames {
     public static final DotName RESTEASY_REACTIVE_CONTAINER_REQUEST_CONTEXT = DotName
             .createSimple("org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext");
 
+    public static final DotName RESTEASY_REACTIVE_SERVER_REQUEST_CONTEXT = DotName
+            .createSimple("org.jboss.resteasy.reactive.server.spi.ServerRequestContext");
+
     public static final DotName WITH_FORM_READ = DotName
             .createSimple("org.jboss.resteasy.reactive.server.WithFormRead");
 

independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java

@@ -9,6 +9,7 @@
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.RESPONSE;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_RESPONSE;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.SERVER_EXCEPTION_MAPPER;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.SERVER_REQUEST_CONTEXT;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.UNI;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.URI_INFO;
 import static org.jboss.resteasy.reactive.server.processor.generation.multipart.GeneratorUtils.paramHandleFromReqContextMethod;
@@ -569,6 +570,8 @@ private static TargetMethodParamsInfo getTargetMethodParamsInfo(MethodInfo targe
                         ofMethod(ResteasyReactiveRequestContext.class.getName(), "getContainerRequestContext",
                                 ContainerRequestContextImpl.class),
                         contextHandle);
+            } else if (SERVER_REQUEST_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = contextHandle;
             } else if (URI_INFO.equals(paramDotName)) {
                 paramHandleFromReqContextMethod(mc, contextHandle, targetMethodParamHandles, i,
                         "getUriInfo",

independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java

@@ -8,6 +8,7 @@
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.RESOURCE_INFO;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.RESPONSE;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_RESPONSE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.SERVER_REQUEST_CONTEXT;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.THROWABLE;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.UNI;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.URI_INFO;
@@ -330,6 +331,8 @@ private ResultHandle[] getRequestFilterResultHandles(MethodInfo targetMethod, Do
             } else if (ResteasyReactiveServerDotNames.QUARKUS_REST_CONTAINER_REQUEST_CONTEXT.equals(paramDotName)) {
                 targetMethodParamHandles[i] = filterMethod.checkCast(filterMethod.getMethodParam(0),
                         ResteasyReactiveContainerRequestContext.class);
+            } else if (SERVER_REQUEST_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = rrReqCtxHandle;
             } else if (URI_INFO.equals(paramDotName)) {
                 GeneratorUtils.paramHandleFromReqContextMethod(filterMethod, rrReqCtxHandle, targetMethodParamHandles,
                         i,