From ae82ab05998ddf0de83f4990d0d1d14dd95c3840 Mon Sep 17 00:00:00 2001
From: Auri Munoz <amunozhe@redhat.com>
Date: Mon, 9 Dec 2024 15:48:49 +0100
Subject: [PATCH] Create specific resteasy spi artifact to share with reactive
 and classic

---
 bom/application/pom.xml                       |  5 ++++
 extensions/pom.xml                            |  1 +
 .../resteasy-common/deployment-spi/pom.xml    | 27 +++++++++++++++++++
 ...EndpointValidationPredicatesBuildItem.java |  2 +-
 extensions/resteasy-common/pom.xml            | 20 ++++++++++++++
 .../rest-client-jaxrs/deployment/pom.xml      |  4 +++
 .../JaxrsClientReactiveProcessor.java         |  2 +-
 .../resteasy-reactive/rest/deployment/pom.xml |  4 +++
 .../deployment/ResteasyReactiveProcessor.java |  2 +-
 extensions/spring-web/core/deployment/pom.xml |  4 +++
 .../web/deployment/SpringWebProcessor.java    |  2 +-
 11 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 extensions/resteasy-common/deployment-spi/pom.xml
 rename extensions/{resteasy-reactive/rest-common/deployment/src/main/java/io/quarkus/resteasy/reactive => resteasy-common/deployment-spi/src/main/java/io/quarkus/resteasy}/common/deployment/EndpointValidationPredicatesBuildItem.java (89%)
 create mode 100644 extensions/resteasy-common/pom.xml

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index e697541501d52..24d0103a142e2 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -3780,6 +3780,11 @@
                 <artifactId>quarkus-resteasy-common-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarksu-resteasy-common-deployment-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.reactivex.rxjava2</groupId>
                 <artifactId>rxjava</artifactId>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 7f86c1174b30f..1b866dc2c2165 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -59,6 +59,7 @@
 
         <!-- REST services -->
         <module>resteasy-classic</module>
+        <module>resteasy-common</module>
         <module>smallrye-openapi-common</module>
         <module>smallrye-openapi</module>
         <module>swagger-ui</module>
diff --git a/extensions/resteasy-common/deployment-spi/pom.xml b/extensions/resteasy-common/deployment-spi/pom.xml
new file mode 100644
index 0000000000000..d4378386eb930
--- /dev/null
+++ b/extensions/resteasy-common/deployment-spi/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-resteasy-common-spi-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarksu-resteasy-common-deployment-spi</artifactId>
+    <name>Quarkus - Resteasy - SPI - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>jandex</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/extensions/resteasy-reactive/rest-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/EndpointValidationPredicatesBuildItem.java b/extensions/resteasy-common/deployment-spi/src/main/java/io/quarkus/resteasy/common/deployment/EndpointValidationPredicatesBuildItem.java
similarity index 89%
rename from extensions/resteasy-reactive/rest-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/EndpointValidationPredicatesBuildItem.java
rename to extensions/resteasy-common/deployment-spi/src/main/java/io/quarkus/resteasy/common/deployment/EndpointValidationPredicatesBuildItem.java
index 427b5642b4f09..f3b9b7bc34fd0 100644
--- a/extensions/resteasy-reactive/rest-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/EndpointValidationPredicatesBuildItem.java
+++ b/extensions/resteasy-common/deployment-spi/src/main/java/io/quarkus/resteasy/common/deployment/EndpointValidationPredicatesBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.reactive.common.deployment;
+package io.quarkus.resteasy.common.deployment;
 
 import java.util.function.Predicate;
 
diff --git a/extensions/resteasy-common/pom.xml b/extensions/resteasy-common/pom.xml
new file mode 100644
index 0000000000000..86b66d80bd60a
--- /dev/null
+++ b/extensions/resteasy-common/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-common-spi-parent</artifactId>
+    <name>Quarkus - JMS SPI - Parent</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment-spi</module>
+    </modules>
+
+</project>
diff --git a/extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml b/extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml
index bc8a8c616760a..4c40a3460fdf3 100644
--- a/extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml
@@ -33,6 +33,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-spi-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarksu-resteasy-common-deployment-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-client-jaxrs</artifactId>
diff --git a/extensions/resteasy-reactive/rest-client-jaxrs/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/extensions/resteasy-reactive/rest-client-jaxrs/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java
index 33f74574a49dc..2f8b3722a6a67 100644
--- a/extensions/resteasy-reactive/rest-client-jaxrs/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java
+++ b/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;
diff --git a/extensions/resteasy-reactive/rest/deployment/pom.xml b/extensions/resteasy-reactive/rest/deployment/pom.xml
index a506c92c91c7a..12b9cda33db48 100644
--- a/extensions/resteasy-reactive/rest/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest/deployment/pom.xml
@@ -46,6 +46,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-security-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarksu-resteasy-common-deployment-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jsonp-deployment</artifactId>
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
index d07af25448a44..0e47168c16a72 100644
--- 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
@@ -160,9 +160,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;
diff --git a/extensions/spring-web/core/deployment/pom.xml b/extensions/spring-web/core/deployment/pom.xml
index 3e4a4c85b1414..59044073bf2c6 100644
--- a/extensions/spring-web/core/deployment/pom.xml
+++ b/extensions/spring-web/core/deployment/pom.xml
@@ -44,6 +44,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-common-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarksu-resteasy-common-deployment-spi</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
index 752cb73baac71..796bcef677ef0 100644
--- a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
+++ b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
@@ -35,8 +35,8 @@
 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.ResteasyJaxrsProviderBuildItem;
-import io.quarkus.resteasy.reactive.common.deployment.EndpointValidationPredicatesBuildItem;
 import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
 
 public class SpringWebProcessor {