Merge pull request #33793 from geoand/rr-context-unremovable

Remove the need for @Unremoveable producer with custom @context types
quarkusio · Jun 6, 2023 · 62707a0 · 62707a0
2 parents e361121 + 35077ce
commit 62707a0
Show file tree

Hide file tree

Showing 2 changed files with 114 additions and 4 deletions.
diff --git a/...ain/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java b/...ain/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java
@@ -1,23 +1,31 @@
 package io.quarkus.resteasy.reactive.server.deployment;
 
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.APPLICATION_PATH;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.CONTEXT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PATH;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PROVIDER;
+
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 import jakarta.ws.rs.BeanParam;
 
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
-import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
 import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult;
 import org.jboss.resteasy.reactive.server.injection.ContextProducers;
 import org.jboss.resteasy.reactive.server.processor.util.ResteasyReactiveServerDotNames;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.AutoInjectAnnotationBuildItem;
 import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -45,15 +53,38 @@ AutoInjectAnnotationBuildItem contextInjection(
     @BuildStep
     void beanDefiningAnnotations(BuildProducer<BeanDefiningAnnotationBuildItem> beanDefiningAnnotations) {
         beanDefiningAnnotations
-                .produce(new BeanDefiningAnnotationBuildItem(ResteasyReactiveDotNames.PATH, BuiltinScope.SINGLETON.getName()));
+                .produce(new BeanDefiningAnnotationBuildItem(PATH, BuiltinScope.SINGLETON.getName()));
         beanDefiningAnnotations
-                .produce(new BeanDefiningAnnotationBuildItem(ResteasyReactiveDotNames.APPLICATION_PATH,
+                .produce(new BeanDefiningAnnotationBuildItem(APPLICATION_PATH,
                         BuiltinScope.SINGLETON.getName()));
         beanDefiningAnnotations
-                .produce(new BeanDefiningAnnotationBuildItem(ResteasyReactiveDotNames.PROVIDER,
+                .produce(new BeanDefiningAnnotationBuildItem(PROVIDER,
                         BuiltinScope.SINGLETON.getName()));
     }
 
+    @BuildStep
+    void unremovableContextMethodParams(Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            BuildProducer<UnremovableBeanBuildItem> producer) {
+
+        if (resourceScanningResultBuildItem.isEmpty()) {
+            return;
+        }
+
+        Collection<ClassInfo> resourceClasses = resourceScanningResultBuildItem.get().getResult().getScannedResources()
+                .values();
+        for (ClassInfo resourceClass : resourceClasses) {
+            if (resourceClass.annotationsMap().containsKey(CONTEXT)) {
+                for (AnnotationInstance instance : resourceClass.annotationsMap().get(CONTEXT)) {
+                    if (instance.target().kind() != AnnotationTarget.Kind.METHOD_PARAMETER) {
+                        continue;
+                    }
+                    producer.produce(UnremovableBeanBuildItem
+                            .beanTypes(instance.target().asMethodParameter().type().name()));
+                }
+            }
+        }
+    }
+
     @BuildStep
     void subResourcesAsBeans(ResourceScanningResultBuildItem setupEndpointsResult,
             List<SubResourcesAsBeansBuildItem> subResourcesAsBeans,

diff --git a/.../src/test/java/io/quarkus/resteasy/reactive/server/test/simple/CustomContextTypeTest.java b/.../src/test/java/io/quarkus/resteasy/reactive/server/test/simple/CustomContextTypeTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import java.util.function.Supplier;
+
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+
+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;
+import io.restassured.RestAssured;
+
+public class CustomContextTypeTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(TestResource.class, CustomType.class, CustomTypeProducer.class);
+                }
+            });
+
+    @Test
+    public void firstTest() {
+        RestAssured.given().headers("foo", "bar")
+                .get("/test")
+                .then().statusCode(200).body(is("bar"));
+    }
+
+    @Test
+    public void secondTest() {
+        RestAssured.given().headers("foo", "baz")
+                .get("/test")
+                .then().statusCode(200).body(is("baz"));
+    }
+
+    @Path("/test")
+    public static class TestResource {
+
+        @GET
+        public String get(@Context CustomType customType) {
+            return customType.getValue();
+        }
+    }
+
+    public static class CustomType {
+        private final String value;
+
+        public CustomType(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    @Singleton
+    public static class CustomTypeProducer {
+
+        @Produces
+        @RequestScoped
+        public CustomType customType(HttpHeaders headers) {
+            return new CustomType(headers.getHeaderString("foo"));
+        }
+    }
+}