Merge pull request #126 from quarkiverse/task/update-ext-names

Update to new 3.10 extension names for Quarkus Rest
quarkiverse · Apr 26, 2024 · ea58f3d · ea58f3d
2 parents e41a673 + 7be467c
commit ea58f3d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/deployment/pom.xml b/deployment/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive-server-spi-deployment</artifactId>
+      <artifactId>quarkus-rest-server-spi-deployment</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkiverse.zanzibar</groupId>

diff --git a/deployment/src/main/java/io/quarkiverse/zanzibar/deployment/ZanzibarProcessor.java b/deployment/src/main/java/io/quarkiverse/zanzibar/deployment/ZanzibarProcessor.java
@@ -4,6 +4,8 @@
 
 import jakarta.enterprise.context.ApplicationScoped;
 
+import org.jboss.logging.Logger;
+
 import io.quarkiverse.zanzibar.DefaultUserIdExtractor;
 import io.quarkiverse.zanzibar.RelationshipManager;
 import io.quarkiverse.zanzibar.UserIdExtractor;
@@ -12,6 +14,7 @@
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -27,6 +30,8 @@ class ZanzibarProcessor {
 
     public static final String FEATURE = "zanzibar";
 
+    private static final Logger log = Logger.getLogger(ZanzibarProcessor.class);
+
     @BuildStep
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
@@ -43,15 +48,16 @@ void registerProvider(
             BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
-            BuildProducer<AdditionalIndexedClassesBuildItem> additionalIndexedClasses) {
+            BuildProducer<AdditionalIndexedClassesBuildItem> additionalIndexedClasses,
+            BuildProducer<ValidationPhaseBuildItem.ValidationErrorBuildItem> validationErrors) {
 
         if (!config.filter.enabled) {
             return;
         }
 
         RuntimeValue<ZanzibarDynamicFeature.FilterFactory> filterFactory;
 
-        if (capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
+        if (capabilities.isPresent(Capability.REST) || capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
 
             filterFactory = recorder.createReactiveFilterFactory();
 
@@ -66,6 +72,7 @@ void registerProvider(
             additionalIndexedClasses.produce(new AdditionalIndexedClassesBuildItem(featureClass.getName()));
             reflectiveClass.produce(ReflectiveClassBuildItem.builder(featureClass).fields(true).methods(true).build());
         } else {
+            log.error("Zanzibar requires either the Quarkus REST or RESTEasy extension to be included");
             return;
         }
 

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -14,7 +14,7 @@
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive</artifactId>
+      <artifactId>quarkus-rest</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkiverse.zanzibar</groupId>

diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -24,7 +24,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive</artifactId>
+      <artifactId>quarkus-rest</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/zanzibar-authzed/integration-tests/pom.xml b/zanzibar-authzed/integration-tests/pom.xml
@@ -14,11 +14,11 @@
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive</artifactId>
+      <artifactId>quarkus-rest</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+      <artifactId>quarkus-rest-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/zanzibar-openfga/integration-tests/pom.xml b/zanzibar-openfga/integration-tests/pom.xml
@@ -14,11 +14,11 @@
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive</artifactId>
+      <artifactId>quarkus-rest</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+      <artifactId>quarkus-rest-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>