Merge pull request quarkusio#21958 from geoand/quarkusio#21956

Allow the use of UriInfo in @ServerResponseFilter
mkouba · Dec 6, 2021 · 2b6c6d9 · 2b6c6d9
2 parents 7a1320f + 0b2c0c1
commit 2b6c6d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.../quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java b/.../quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java
@@ -1,10 +1,12 @@
 package io.quarkus.resteasy.reactive.server.test.customproviders;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.core.UriInfo;
 
 import org.jboss.resteasy.reactive.server.ServerResponseFilter;
 import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
@@ -14,10 +16,11 @@ public class CustomContainerResponseFilter {
 
     @ServerResponseFilter
     public void whatever(SimpleResourceInfo simplifiedResourceInfo, ContainerResponseContext responseContext,
-            ContainerRequestContext requestContext, Throwable t) {
+            ContainerRequestContext requestContext, UriInfo uriInfo, Throwable t) {
         assertTrue(
                 PreventAbortResteasyReactiveContainerRequestContext.class.isAssignableFrom(requestContext.getClass()));
         assertNull(t);
+        assertNotNull(uriInfo);
         if (simplifiedResourceInfo != null) {
             responseContext.getHeaders().putSingle("java-method", simplifiedResourceInfo.getMethodName());
         }

diff --git a/...rg/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java b/...rg/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java
@@ -488,6 +488,11 @@ private static ResultHandle[] getResponseFilterResultHandles(MethodInfo targetMe
                 targetMethodParamHandles[i] = filterMethod.getMethodParam(1);
             } else if (unwrappableTypes.contains(paramDotName)) {
                 targetMethodParamHandles[i] = GeneratorUtils.unwrapObject(filterMethod, rrReqCtxHandle, paramDotName);
+            } else if (URI_INFO.equals(paramDotName)) {
+                GeneratorUtils.paramHandleFromReqContextMethod(filterMethod, rrReqCtxHandle, targetMethodParamHandles,
+                        i,
+                        "getUriInfo",
+                        URI_INFO);
             } else if (RESOURCE_INFO.equals(paramDotName)) {
                 targetMethodParamHandles[i] = getResourceInfoHandle(filterMethod, rrReqCtxHandle);
             } else if (ResteasyReactiveServerDotNames.SIMPLIFIED_RESOURCE_INFO.equals(paramDotName)) {

diff --git a/...server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java b/...server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java
@@ -8,6 +8,7 @@
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.UriInfo;
 
 /**
  * When used on a method, then an implementation of {@link javax.ws.rs.container.ContainerResponseContext} is generated
@@ -41,6 +42,7 @@
  * <li>{@link ContainerRequestContext}
  * <li>{@link ContainerResponseContext}
  * <li>{@link ResourceInfo}
+ * <li>{@link UriInfo}
  * <li>{@link SimpleResourceInfo}
  * <li>{@link Throwable} - The thrown exception - or {@code null} if no exception was thrown
  * </ul>