Arc - treat non-inherited interceptor bindings properly even outside …

…strict mode
Ladicek · Sep 18, 2024 · 04deb1d · 04deb1d
1 parent 2f9954b
commit 04deb1d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/...y/deployment/src/test/java/io/quarkus/security/test/cdi/CdiClassLevelInheritanceTest.java b/...y/deployment/src/test/java/io/quarkus/security/test/cdi/CdiClassLevelInheritanceTest.java
@@ -59,9 +59,7 @@ public class CdiClassLevelInheritanceTest {
                             SubclassRolesAllowedBean.class,
                             SubclassAuthenticatedBean.class,
                             TestException.class,
-                            SecurityTestUtils.class))
-            // Following configuration tells Arc to *not* automatically inherit all class level annotations
-            .overrideConfigKey("quarkus.arc.strict-compatibility", "true");
+                            SecurityTestUtils.class));
 
     @Test
     public void testDenyAllInherited() {

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java
@@ -930,9 +930,7 @@ private void doAddClassLevelBindings(ClassInfo classInfo, Collection<AnnotationI
         if (classInfo.superClassType() != null && !classInfo.superClassType().name().equals(DotNames.OBJECT)) {
             ClassInfo superClass = getClassByName(beanDeployment.getBeanArchiveIndex(), classInfo.superName());
             if (superClass != null) {
-                // proper interceptor binding inheritance only in strict mode, due to Quarkus expecting security
-                // annotations (such as `@RolesAllowed`) to be inherited, even though they are not `@Inherited`
-                doAddClassLevelBindings(superClass, bindings, skip, beanDeployment.strictCompatibility);
+                doAddClassLevelBindings(superClass, bindings, skip, true);
             }
         }
     }

diff --git a/.../java/io/quarkus/arc/test/interceptors/bindings/inherited/InheritedBindingOnBeanTest.java b/.../java/io/quarkus/arc/test/interceptors/bindings/inherited/InheritedBindingOnBeanTest.java
@@ -29,7 +29,6 @@ public class InheritedBindingOnBeanTest {
     @RegisterExtension
     public ArcTestContainer container = new ArcTestContainer.Builder()
             .beanClasses(MyBean.class, FooBinding.class, BarBinding.class, FooInterceptor.class, BarInterceptor.class)
-            .strictCompatibility(true) // correct interceptor binding inheritance
             .build();
 
     @Test