Merge pull request #40845 from michalvavrik/feature/tweak-tenant-ann-detection-on-classes

Detect @Tenant interceptors are required when only JAX-RS classes are annotated, but no resource methods

Author: sberyozkin

extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java

@@ -300,11 +300,10 @@ public void registerTenantResolverInterceptor(Capabilities capabilities, OidcRec
                     .getAnnotations(TENANT_NAME)
                     .stream()
                     .map(AnnotationInstance::target)
-                    // ignored field injection points and injection setters
-                    // as we don't want to count in the TenantIdentityProvider injection point
-                    .filter(t -> t.kind() == METHOD)
-                    .map(AnnotationTarget::asMethod)
-                    .anyMatch(m -> !m.isConstructor() && !m.hasAnnotation(DotNames.INJECT));
+                    // ignore field injection points and injection setters
+                    // as we don't want to count in the TenantIdentityProvider injection point;
+                    // if class is the target, we know it cannot be a TenantIdentityProvider as we produce it ourselves
+                    .anyMatch(t -> isMethodWithTenantAnnButNotInjPoint(t) || t.kind() == CLASS);
             if (foundTenantResolver) {
                 // register method interceptor that will be run before security checks
                 bindingProducer.produce(
@@ -315,6 +314,10 @@ public void registerTenantResolverInterceptor(Capabilities capabilities, OidcRec
         }
     }
 
+    private static boolean isMethodWithTenantAnnButNotInjPoint(AnnotationTarget t) {
+        return t.kind() == METHOD && !t.asMethod().isConstructor() && !t.hasAnnotation(DotNames.INJECT);
+    }
+
     private static boolean detectUserInfoRequired(BeanRegistrationPhaseBuildItem beanRegistrationPhaseBuildItem) {
         return isInjected(beanRegistrationPhaseBuildItem, USER_INFO_NAME, null);
     }
@@ -356,14 +359,6 @@ private static boolean isApplicationPackage(String injectionPointTargetInfo) {
                 && !injectionPointTargetInfo.startsWith(SMALLRYE_JWT_PACKAGE);
     }
 
-    private static String toTargetName(AnnotationTarget target) {
-        if (target.kind() == CLASS) {
-            return target.asClass().name().toString();
-        } else {
-            return target.asMethod().declaringClass().name().toString() + "#" + target.asMethod().name();
-        }
-    }
-
     public static class IsEnabled implements BooleanSupplier {
         OidcBuildTimeConfig config;