Merge pull request #34570 from geoand/quarkus-petclinic-bug

Prevent build failure when @Blocking on Application
quarkusio · Jul 6, 2023 · 0a91fd2 · 0a91fd2
2 parents 4d94571 + 0cfba8c
commit 0a91fd2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/...src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java b/...src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java
@@ -15,6 +15,7 @@
 import static java.util.stream.Collectors.*;
 import static org.jboss.resteasy.reactive.common.processor.EndpointIndexer.CDI_WRAPPER_SUFFIX;
 import static org.jboss.resteasy.reactive.common.processor.JandexUtil.isImplementorOf;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.APPLICATION;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BLOCKING;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REQUEST_SCOPED;
 import static org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveScanner.BUILTIN_HTTP_ANNOTATIONS_TO_METHOD;
@@ -523,7 +524,7 @@ void addRestClientBeans(Capabilities capabilities,
         for (AnnotationInstance registerBlockingClass : registerBlockingClasses) {
             AnnotationTarget target = registerBlockingClass.target();
             if (target.kind() == AnnotationTarget.Kind.CLASS
-                    && isImplementorOf(index, target.asClass(), RESPONSE_EXCEPTION_MAPPER)) {
+                    && isImplementorOf(index, target.asClass(), RESPONSE_EXCEPTION_MAPPER, Set.of(APPLICATION))) {
                 // Watch for @Blocking annotations in classes that implements ResponseExceptionMapper:
                 blockingClassNames.add(target.asClass().toString());
             } else if (target.kind() == AnnotationTarget.Kind.METHOD

diff --git a/...mmon/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java b/...mmon/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java
@@ -373,6 +373,20 @@ public static boolean isSubclassOf(IndexView index, ClassInfo info, DotName pare
      * @throws RuntimeException if one of the superclasses is not indexed.
      */
     public static boolean isImplementorOf(IndexView index, ClassInfo info, DotName name) {
+        return isImplementorOf(index, info, name, Collections.emptySet());
+    }
+
+    /**
+     * Returns true if the given Jandex ClassInfo is a subclass of or inherits the given <tt>name</tt>.
+     *
+     * @param index the index to use to look up super classes.
+     * @param info the ClassInfo we want to check.
+     * @param name the name of the superclass or interface we want to find.
+     * @param additionalIgnoredSuperClasses return false if the class has any of these as a superclass.
+     * @throws RuntimeException if one of the superclasses is not indexed.
+     */
+    public static boolean isImplementorOf(IndexView index, ClassInfo info, DotName name,
+            Set<DotName> additionalIgnoredSuperClasses) {
         // Check interfaces
         List<DotName> interfaceNames = info.interfaceNames();
         for (DotName interfaceName : interfaceNames) {
@@ -382,7 +396,9 @@ public static boolean isImplementorOf(IndexView index, ClassInfo info, DotName n
         }
 
         // Check direct hierarchy
-        if (info.superName().equals(DOTNAME_OBJECT) || info.superName().equals(DOTNAME_RECORD)) {
+        DotName superDotName = info.superName();
+        if (superDotName.equals(DOTNAME_OBJECT) || superDotName.equals(DOTNAME_RECORD)
+                || additionalIgnoredSuperClasses.contains(superDotName)) {
             return false;
         }
         if (info.superName().equals(name)) {
@@ -393,10 +409,10 @@ public static boolean isImplementorOf(IndexView index, ClassInfo info, DotName n
         Type superType = info.superClassType();
         ClassInfo superClass = index.getClassByName(superType.name());
         if (superClass == null) {
-            // this can happens if the parent is not inside the Jandex index
+            // this can happen if the parent is not inside the Jandex index
             throw new RuntimeException("The class " + superType.name() + " is not inside the Jandex index");
         }
-        return isImplementorOf(index, superClass, name);
+        return isImplementorOf(index, superClass, name, additionalIgnoredSuperClasses);
     }
 
 }