Refactor to make EndpointValidationPredicatesBuildItem and avoid conf…

…licts
aureamunoz · Dec 12, 2024 · 1660b0f · 1660b0f
1 parent b54a4f2
commit 1660b0f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/...c/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/...c/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java
@@ -172,13 +172,13 @@
 import io.quarkus.jaxrs.client.reactive.runtime.ToObjectArray;
 import io.quarkus.jaxrs.client.reactive.runtime.impl.MultipartResponseDataBase;
 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;
 import io.quarkus.resteasy.reactive.common.deployment.ResourceScanningResultBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.SerializersUtil;
 import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfig;
+import io.quarkus.resteasy.reactive.spi.EndpointValidationPredicatesBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderOverrideBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;

diff --git a/...ndpointValidationPredicatesBuildItem.java → ...ndpointValidationPredicatesBuildItem.java b/...ndpointValidationPredicatesBuildItem.java → ...ndpointValidationPredicatesBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.reactive.common.deployment;
+package io.quarkus.resteasy.reactive.spi;
 
 import java.util.function.Predicate;
 

diff --git a/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
@@ -161,7 +161,6 @@
 import io.quarkus.netty.deployment.MinNettyAllocatorMaxOrderBuildItem;
 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;
@@ -199,6 +198,7 @@
 import io.quarkus.resteasy.reactive.server.spi.ResumeOn404BuildItem;
 import io.quarkus.resteasy.reactive.spi.CustomExceptionMapperBuildItem;
 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.JaxrsFeatureBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;

diff --git a/extensions/spring-web/core/deployment/pom.xml b/extensions/spring-web/core/deployment/pom.xml
@@ -44,10 +44,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-common-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-common-deployment</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/...eb/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/...eb/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
@@ -101,15 +101,15 @@ public boolean test(ClassInfo classInfo) {
     }
 
     @BuildStep
-    io.quarkus.resteasy.reactive.common.deployment.EndpointValidationPredicatesBuildItem createSpringRestControllerPredicateForReactive() {
+    io.quarkus.resteasy.reactive.spi.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);
+        return new io.quarkus.resteasy.reactive.spi.EndpointValidationPredicatesBuildItem(predicate);
     }
 
     @BuildStep