Merge pull request quarkusio#29171 from geoand/quarkusio#29170

Fix CDI scope for classes that declare @ServerRequestFilter
loicmathieu · Nov 10, 2022 · 9fc44a4 · 9fc44a4
2 parents 1cec84d + 5fcdbf4
commit 9fc44a4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...kus/resteasy/reactive/server/test/customproviders/AnotherValidNonBlockingFiltersTest.java b/...kus/resteasy/reactive/server/test/customproviders/AnotherValidNonBlockingFiltersTest.java
@@ -6,6 +6,7 @@
 import java.util.function.Supplier;
 
 import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Priorities;
@@ -151,6 +152,7 @@ public void filter(ContainerRequestContext requestContext) throws IOException {
         }
     }
 
+    @ApplicationScoped
     public static class CustomFilters {
 
         @ServerRequestFilter(nonBlocking = true, priority = Priorities.USER + 20)

diff --git a/.../io/quarkus/resteasy/reactive/server/test/customproviders/ConditionalBeanFiltersTest.java b/.../io/quarkus/resteasy/reactive/server/test/customproviders/ConditionalBeanFiltersTest.java
@@ -9,6 +9,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import javax.inject.Singleton;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Priorities;
@@ -134,6 +135,7 @@ public Uni<Void> uniResponseFilter(ContainerResponseContext ctx) {
         }
     }
 
+    @Singleton
     public static class AlwaysEnabledFilter {
 
         @ServerRequestFilter(priority = Priorities.USER + 100)

diff --git a/...rg/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java b/...rg/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java
@@ -578,10 +578,10 @@ private FieldDescriptor generateConstructorAndDelegateField(ClassCreator cc, Cla
      */
     private ScopeInspectionResult inspectScope(ClassInfo classInfo) {
         if (classInfo.hasDeclaredAnnotation(ApplicationScoped.class) || classInfo.hasDeclaredAnnotation(RequestScoped.class)) {
-            return new ScopeInspectionResult(null, true);
+            return new ScopeInspectionResult(ApplicationScoped.class, true);
         }
         if (classInfo.hasDeclaredAnnotation(Singleton.class)) {
-            return new ScopeInspectionResult(null, false);
+            return new ScopeInspectionResult(Singleton.class, false);
         }
         List<FieldInfo> fields = classInfo.fields();
         if (fields.isEmpty()) {