Merge pull request #47746 from gsmet/fix-application-class

geoand · web-flow · commit 25cc0e0ba922 · 2025-05-08T13:32:03.000+03:00
Honor application class predicate in QuarkusInvokerFactory
diff --git a/extensions/resteasy-reactive/rest-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java b/extensions/resteasy-reactive/rest-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
@@ -276,7 +276,8 @@ JaxRsResourceIndexBuildItem resourceIndex(CombinedIndexBuildItem combinedIndex,
         for (GeneratedJaxRsResourceBuildItem generatedJaxRsResource : generatedJaxRsResources) {
             indexer.index(new ByteArrayInputStream(generatedJaxRsResource.getData()));
             generatedBeansProducer
-                    .produce(new GeneratedBeanBuildItem(generatedJaxRsResource.getName(), generatedJaxRsResource.getData()));
+                    .produce(new GeneratedBeanBuildItem(generatedJaxRsResource.internalName(),
+                            generatedJaxRsResource.getData()));
         }
         return new JaxRsResourceIndexBuildItem(CompositeIndex.create(combinedIndex.getComputingIndex(), indexer.complete()));
     }
diff --git a/extensions/resteasy-reactive/rest-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java b/extensions/resteasy-reactive/rest-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java
@@ -8,16 +8,38 @@
  */
 public final class GeneratedJaxRsResourceBuildItem extends MultiBuildItem {
 
-    private final String name;
+    private final String binaryName;
+    private final String internalName;
     private final byte[] data;
 
     public GeneratedJaxRsResourceBuildItem(String name, byte[] data) {
-        this.name = name;
+        this.internalName = name.replace('.', '/');
+        this.binaryName = name.replace('/', '.');
         this.data = data;
     }
 
+    /**
+     * @return the internal name for this class
+     *
+     * @deprecated Use {@link #internalName()} instead.
+     */
+    @Deprecated(since = "3.23", forRemoval = true)
     public String getName() {
-        return name;
+        return internalName;
+    }
+
+    /**
+     * {@return the <em>binary name</em> of the class, which is delimited by <code>.</code> characters}
+     */
+    public String binaryName() {
+        return binaryName;
+    }
+
+    /**
+     * {@return the <em>internal name</em> of the class, which is delimited by <code>/</code> characters}
+     */
+    public String internalName() {
+        return internalName;
     }
 
     public byte[] getData() {
diff --git a/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusInvokerFactory.java b/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusInvokerFactory.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.jboss.jandex.ClassInfo;
@@ -22,11 +23,14 @@
 
 public class QuarkusInvokerFactory implements EndpointInvokerFactory {
 
+    private final Predicate<String> applicationClassPredicate;
     final BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer;
     final ResteasyReactiveRecorder recorder;
 
-    public QuarkusInvokerFactory(BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer,
+    public QuarkusInvokerFactory(Predicate<String> applicationClassPredicate,
+            BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer,
             ResteasyReactiveRecorder recorder) {
+        this.applicationClassPredicate = applicationClassPredicate;
         this.generatedClassBuildItemBuildProducer = generatedClassBuildItemBuildProducer;
         this.recorder = recorder;
     }
@@ -43,7 +47,9 @@ public Supplier<EndpointInvoker> create(ResourceMethod method, ClassInfo current
         String baseName = currentClassInfo.name() + "$quarkusrestinvoker$" + method.getName() + "_"
                 + HashUtil.sha1(endpointIdentifier);
         try (ClassCreator classCreator = new ClassCreator(
-                new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer, true), baseName, null,
+                new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer,
+                        applicationClassPredicate.test(currentClassInfo.name().toString())),
+                baseName, null,
                 Object.class.getName(), EndpointInvoker.class.getName())) {
             MethodCreator mc = classCreator.getMethodCreator("invoke", Object.class, Object.class, Object[].class);
             ResultHandle[] args = new ResultHandle[method.getParameters().length];
diff --git a/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
@@ -204,6 +204,7 @@
 import io.quarkus.resteasy.reactive.spi.DynamicFeatureBuildItem;
 import io.quarkus.resteasy.reactive.spi.EndpointValidationPredicatesBuildItem;
 import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
+import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem;
 import io.quarkus.resteasy.reactive.spi.JaxrsFeatureBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderOverrideBuildItem;
@@ -474,7 +475,8 @@ public void setupEndpoints(ApplicationIndexBuildItem applicationIndexBuildItem,
             ResourceInterceptorsBuildItem resourceInterceptorsBuildItem,
             Capabilities capabilities,
             Optional<AllowNotRestParametersBuildItem> allowNotRestParametersBuildItem,
-            List<EndpointValidationPredicatesBuildItem> validationPredicatesBuildItems) {
+            List<EndpointValidationPredicatesBuildItem> validationPredicatesBuildItems,
+            List<GeneratedJaxRsResourceBuildItem> generatedJaxRsResourcesBuildItems) {
 
         if (!resourceScanningResultBuildItem.isPresent()) {
             // no detected @Path, bail out
@@ -512,13 +514,18 @@ public void setupEndpoints(ApplicationIndexBuildItem applicationIndexBuildItem,
 
             List<ResteasyReactiveResourceMethodEntriesBuildItem.Entry> resourceMethodEntries = new ArrayList<>();
 
+            // Generated JAX-RS resources are application classes
+            Set<String> applicationGeneratedJaxRsResources = generatedJaxRsResourcesBuildItems.stream()
+                    .map(r -> r.binaryName())
+                    .collect(Collectors.toSet());
+
             Predicate<String> applicationClassPredicate = s -> {
                 for (ApplicationClassPredicateBuildItem i : applicationClassPredicateBuildItems) {
                     if (i.test(s)) {
                         return true;
                     }
                 }
-                return false;
+                return applicationGeneratedJaxRsResources.contains(s);
             };
 
             final boolean filtersAccessResourceMethod = filtersAccessResourceMethod(
@@ -537,7 +544,8 @@ public void setupEndpoints(ApplicationIndexBuildItem applicationIndexBuildItem,
                     .addContextTypes(additionalContextTypes(contextTypeBuildItems))
                     .setFactoryCreator(new QuarkusFactoryCreator(recorder, beanContainerBuildItem.getValue()))
                     .setEndpointInvokerFactory(
-                            new QuarkusInvokerFactory(generatedClassBuildItemBuildProducer, recorder))
+                            new QuarkusInvokerFactory(applicationClassPredicate, generatedClassBuildItemBuildProducer,
+                                    recorder))
                     .setGeneratedClassBuildItemBuildProducer(generatedClassBuildItemBuildProducer)
                     .setExistingConverters(existingConverters)
                     .setScannedResourcePaths(scannedResourcePaths)
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
@@ -1701,6 +1701,7 @@ public void testResteasyReactiveExternalArtifact() throws Exception {
 
         Assertions.assertEquals("Quarkus", devModeClient.getHttpResponse("/hello/Quarkus"));
         Assertions.assertEquals("OK", devModeClient.getHttpResponse("/hello/parameterized-type-external"));
+        Assertions.assertEquals("Hello from Quarkus REST", devModeClient.getHttpResponse("/greet"));
     }
 
     @Test
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/.gitignore b/integration-tests/maven/src/test/resources-filtered/projects/.gitignore
@@ -0,0 +1 @@
+!lib
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rr-external-artifacts/external-lib/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/rr-external-artifacts/external-lib/pom.xml
@@ -52,6 +52,19 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>\${maven.jar.plugin.version}</version>
             </plugin>
+            <plugin>
+                <groupId>io.smallrye</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <version>${jandex.version}</version>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                        <goals>
+                            <goal>jandex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rr-external-artifacts/external-lib/src/main/java/org/acme/lib/GreetingResource.java b/integration-tests/maven/src/test/resources-filtered/projects/rr-external-artifacts/external-lib/src/main/java/org/acme/lib/GreetingResource.java
@@ -0,0 +1,16 @@
+package org.acme.lib;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+@Path("/greet")
+class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String greet() {
+        return "Hello from Quarkus REST";
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,8 @@ JaxRsResourceIndexBuildItem resourceIndex(CombinedIndexBuildItem combinedIndex,`
`276`	`276`	`for (GeneratedJaxRsResourceBuildItem generatedJaxRsResource : generatedJaxRsResources) {`
`277`	`277`	`indexer.index(new ByteArrayInputStream(generatedJaxRsResource.getData()));`
`278`	`278`	`generatedBeansProducer`
`279`		`- .produce(new GeneratedBeanBuildItem(generatedJaxRsResource.getName(), generatedJaxRsResource.getData()));`
	`279`	`+ .produce(new GeneratedBeanBuildItem(generatedJaxRsResource.internalName(),`
	`280`	`+ generatedJaxRsResource.getData()));`
`280`	`281`	`}`
`281`	`282`	`return new JaxRsResourceIndexBuildItem(CompositeIndex.create(combinedIndex.getComputingIndex(), indexer.complete()));`
`282`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1701,6 +1701,7 @@ public void testResteasyReactiveExternalArtifact() throws Exception {`
`1701`	`1701`
`1702`	`1702`	`Assertions.assertEquals("Quarkus", devModeClient.getHttpResponse("/hello/Quarkus"));`
`1703`	`1703`	`Assertions.assertEquals("OK", devModeClient.getHttpResponse("/hello/parameterized-type-external"));`
	`1704`	`+ Assertions.assertEquals("Hello from Quarkus REST", devModeClient.getHttpResponse("/greet"));`
`1704`	`1705`	`}`
`1705`	`1706`
`1706`	`1707`	`@Test`