Duplicating EndpointValidationPredicatesBuildItem for avoiding restea…

…sy spi common module

bom/application/pom.xml

@@ -3785,11 +3785,6 @@
                 <artifactId>quarkus-resteasy-common-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-resteasy-common-deployment-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.reactivex.rxjava2</groupId>
                 <artifactId>rxjava</artifactId>

extensions/pom.xml

@@ -59,7 +59,6 @@
 
         <!-- REST services -->
         <module>resteasy-classic</module>
-        <module>resteasy-common</module>
         <module>smallrye-openapi-common</module>
         <module>smallrye-openapi</module>
         <module>swagger-ui</module>

extensions/resteasy-common/deployment-spi/src/main/java/io/quarkus/resteasy/common/deployment/EndpointValidationPredicatesBuildItem.java → extensions/resteasy-classic/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/EndpointValidationPredicatesBuildItem.java

@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.common.deployment;
+package io.quarkus.resteasy.common.spi;
 
 import java.util.function.Predicate;
 

extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml

@@ -33,10 +33,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-spi-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-common-deployment-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-client-jaxrs</artifactId>

extensions/resteasy-reactive/rest-client-jaxrs/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java

@@ -171,8 +171,8 @@
 import io.quarkus.jaxrs.client.reactive.runtime.RestClientBase;
 import io.quarkus.jaxrs.client.reactive.runtime.ToObjectArray;
 import io.quarkus.jaxrs.client.reactive.runtime.impl.MultipartResponseDataBase;
-import io.quarkus.resteasy.common.deployment.EndpointValidationPredicatesBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.ApplicationResultBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.EndpointValidationPredicatesBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.ParameterContainersBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.QuarkusFactoryCreator;
 import io.quarkus.resteasy.reactive.common.deployment.QuarkusResteasyReactiveDotNames;

extensions/resteasy-reactive/rest-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/EndpointValidationPredicatesBuildItem.java

@@ -0,0 +1,33 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import java.util.function.Predicate;
+
+import org.jboss.jandex.ClassInfo;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * A build item that provides a {@link Predicate} to detect and validate classes defining REST endpoints.
+ * <p>
+ * This can include resources in RESTEasy or controllers in the Spring ecosystem.
+ * It acts as a Service Provider Interface (SPI) to allow customization of the validation logic for endpoint detection,
+ * enabling integration with various frameworks or specific application needs.
+ * </p>
+ *
+ * <p>
+ * The {@link Predicate} evaluates {@link ClassInfo} instances to determine whether a class defines a REST endpoint
+ * according to the provided logic.
+ * </p>
+ */
+public final class EndpointValidationPredicatesBuildItem extends MultiBuildItem {
+
+    private final Predicate<ClassInfo> predicate;
+
+    public EndpointValidationPredicatesBuildItem(Predicate<ClassInfo> predicate) {
+        this.predicate = predicate;
+    }
+
+    public Predicate<ClassInfo> getPredicate() {
+        return predicate;
+    }
+}

extensions/resteasy-reactive/rest/deployment/pom.xml

@@ -46,10 +46,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-security-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-common-deployment-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jsonp-deployment</artifactId>

extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java

@@ -159,9 +159,9 @@
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.netty.deployment.MinNettyAllocatorMaxOrderBuildItem;
-import io.quarkus.resteasy.common.deployment.EndpointValidationPredicatesBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.AggregatedParameterContainersBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.ApplicationResultBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.EndpointValidationPredicatesBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.FactoryUtils;
 import io.quarkus.resteasy.reactive.common.deployment.ParameterContainersBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.QuarkusFactoryCreator;

extensions/spring-web/core/deployment/pom.xml

@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-common-deployment-spi</artifactId>
+            <artifactId>quarkus-rest-common-deployment</artifactId>
         </dependency>
     </dependencies>
 

extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java

@@ -35,7 +35,7 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
 import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.jaxrs.spi.deployment.AdditionalJaxRsResourceMethodAnnotationsBuildItem;
-import io.quarkus.resteasy.common.deployment.EndpointValidationPredicatesBuildItem;
+import io.quarkus.resteasy.common.spi.EndpointValidationPredicatesBuildItem;
 import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
 import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
 
@@ -89,7 +89,7 @@ public AdditionalJaxRsResourceMethodAnnotationsBuildItem additionalJaxRsResource
     }
 
     @BuildStep
-    EndpointValidationPredicatesBuildItem createSpringRestControllerPredicate() {
+    EndpointValidationPredicatesBuildItem createSpringRestControllerPredicateForClassic() {
         Predicate<ClassInfo> predicate = new Predicate<>() {
             @Override
             public boolean test(ClassInfo classInfo) {
@@ -100,6 +100,18 @@ public boolean test(ClassInfo classInfo) {
         return new EndpointValidationPredicatesBuildItem(predicate);
     }
 
+    @BuildStep
+    io.quarkus.resteasy.reactive.common.deployment.EndpointValidationPredicatesBuildItem createSpringRestControllerPredicateForReactive() {
+        Predicate<ClassInfo> predicate = new Predicate<>() {
+            @Override
+            public boolean test(ClassInfo classInfo) {
+                return classInfo
+                        .declaredAnnotation(REST_CONTROLLER_ANNOTATION) == null;
+            }
+        };
+        return new io.quarkus.resteasy.reactive.common.deployment.EndpointValidationPredicatesBuildItem(predicate);
+    }
+
     @BuildStep
     public void ignoreReflectionHierarchy(BuildProducer<ReflectiveHierarchyIgnoreWarningBuildItem> ignore) {
         ignore.produce(new ReflectiveHierarchyIgnoreWarningBuildItem(