From 04deb1d8cb08a593b24902559ed5886fc406e692 Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Wed, 18 Sep 2024 14:16:46 +0200
Subject: [PATCH] Arc - treat non-inherited interceptor bindings properly even
 outside strict mode

---
 .../security/test/cdi/CdiClassLevelInheritanceTest.java       | 4 +---
 .../src/main/java/io/quarkus/arc/processor/BeanInfo.java      | 4 +---
 .../bindings/inherited/InheritedBindingOnBeanTest.java        | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CdiClassLevelInheritanceTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CdiClassLevelInheritanceTest.java
index 8059b01c1c8b5..fb84bc6487c83 100644
--- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CdiClassLevelInheritanceTest.java
+++ b/extensions/security/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
index 89e964f9cab17..4ef5bb7b468f5 100644
--- 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/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/inherited/InheritedBindingOnBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/inherited/InheritedBindingOnBeanTest.java
index 6f08c6cf41389..1c85fdc13f597 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/inherited/InheritedBindingOnBeanTest.java
+++ b/independent-projects/arc/tests/src/test/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