Merge pull request #20509 from geoand/rr-unwrapped2

Make it easier for RESTEasy Reactive users to handle Hibernate related exceptions

extensions/hibernate-orm/deployment/pom.xml

@@ -41,6 +41,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-panache-hibernate-common-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-server-spi-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ResteasyReactiveServerIntegrationProcessor.java

@@ -0,0 +1,14 @@
+package io.quarkus.hibernate.orm.deployment;
+
+import javax.persistence.PersistenceException;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.resteasy.reactive.server.spi.UnwrappedExceptionBuildItem;
+
+public class ResteasyReactiveServerIntegrationProcessor {
+
+    @BuildStep
+    public UnwrappedExceptionBuildItem unwrappedExceptions() {
+        return new UnwrappedExceptionBuildItem(PersistenceException.class);
+    }
+}

extensions/hibernate-reactive/deployment/pom.xml

@@ -61,6 +61,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-mutiny-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-server-spi-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>

extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/ResteasyReactiveServerIntegrationProcessor.java

@@ -0,0 +1,14 @@
+package io.quarkus.hibernate.reactive.deployment;
+
+import javax.persistence.PersistenceException;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.resteasy.reactive.server.spi.UnwrappedExceptionBuildItem;
+
+public class ResteasyReactiveServerIntegrationProcessor {
+
+    @BuildStep
+    public UnwrappedExceptionBuildItem unwrappedExceptions() {
+        return new UnwrappedExceptionBuildItem(PersistenceException.class);
+    }
+}

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

@@ -13,6 +13,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
+import javax.transaction.RollbackException;
 import javax.ws.rs.Priorities;
 
 import org.jboss.jandex.AnnotationInstance;
@@ -58,6 +59,7 @@
 import io.quarkus.resteasy.reactive.common.deployment.ResourceInterceptorsContributorBuildItem;
 import io.quarkus.resteasy.reactive.common.deployment.ResourceScanningResultBuildItem;
 import io.quarkus.resteasy.reactive.server.spi.MethodScannerBuildItem;
+import io.quarkus.resteasy.reactive.server.spi.UnwrappedExceptionBuildItem;
 import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem;
 import io.quarkus.resteasy.reactive.spi.ContainerResponseFilterBuildItem;
 import io.quarkus.resteasy.reactive.spi.ContextResolverBuildItem;
@@ -97,20 +99,29 @@ public void accept(ResourceInterceptors interceptors) {
         });
     }
 
+    @BuildStep
+    public List<UnwrappedExceptionBuildItem> defaultUnwrappedException() {
+        return List.of(new UnwrappedExceptionBuildItem(ArcUndeclaredThrowableException.class),
+                new UnwrappedExceptionBuildItem(RollbackException.class));
+    }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @BuildStep
     public ExceptionMappersBuildItem scanForExceptionMappers(CombinedIndexBuildItem combinedIndexBuildItem,
             ApplicationResultBuildItem applicationResultBuildItem,
             BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer,
-            List<ExceptionMapperBuildItem> mappers, Capabilities capabilities) {
+            List<ExceptionMapperBuildItem> mappers, List<UnwrappedExceptionBuildItem> unwrappedExceptions,
+            Capabilities capabilities) {
         AdditionalBeanBuildItem.Builder beanBuilder = AdditionalBeanBuildItem.builder().setUnremovable();
         ExceptionMapping exceptions = ResteasyReactiveExceptionMappingScanner
                 .scanForExceptionMappers(combinedIndexBuildItem.getComputingIndex(), applicationResultBuildItem.getResult());
 
         exceptions.addBlockingProblem(BlockingOperationNotAllowedException.class);
         exceptions.addBlockingProblem(BlockingNotAllowedException.class);
-        exceptions.addUnwrappedException(ArcUndeclaredThrowableException.class);
+        for (UnwrappedExceptionBuildItem bi : unwrappedExceptions) {
+            exceptions.addUnwrappedException(bi.getThrowableClass());
+        }
         if (capabilities.isPresent(Capability.HIBERNATE_REACTIVE)) {
             exceptions.addNonBlockingProblem(
                     new ExceptionMapping.ExceptionTypeAndMessageContainsPredicate(IllegalStateException.class, "HR000068"));

extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/UnwrappedExceptionBuildItem.java

@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * When an Exception of this type is thrown and no {@code javax.ws.rs.ext.ExceptionMapper} exists,
+ * then RESTEasy Reactive will attempt to locate an {@code ExceptionMapper} for the cause of the Exception.
+ */
+public final class UnwrappedExceptionBuildItem extends MultiBuildItem {
+
+    private final Class<? extends Throwable> throwableClass;
+
+    public UnwrappedExceptionBuildItem(Class<? extends Throwable> throwableClass) {
+        this.throwableClass = throwableClass;
+    }
+
+    public Class<? extends Throwable> getThrowableClass() {
+        return throwableClass;
+    }
+}