Fix Throwable handling in @ServerExceptionMapper

Fixes: #18603
(cherry picked from commit 1aa3e26)

Author: geoand

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

@@ -61,6 +61,8 @@
 
 final class ServerExceptionMapperGenerator {
 
+    private static final DotName THROWABLE = DotName.createSimple(Throwable.class.getName());
+
     private ServerExceptionMapperGenerator() {
     }
 
@@ -136,7 +138,9 @@ public static Map<String, String> generatePerClassMapper(MethodInfo targetMethod
                     MethodDescriptor rrToResponseDescriptor = toResponseDescriptor(handledExceptionType, generatedClassName);
 
                     // bridge toResponse(Throwable, ServerRequestContext) method
-                    generateRRResponseBridge(handledExceptionType, cc, rrToResponseDescriptor);
+                    if (!THROWABLE.equals(handledExceptionType.name())) {
+                        generateRRResponseBridge(handledExceptionType, cc, rrToResponseDescriptor);
+                    }
 
                     // RESTEasy Reactive toResponse(...) method
                     generateRRResponse(targetMethod, targetClass, handledExceptionType, cc, rrToResponseDescriptor,
@@ -151,7 +155,9 @@ public static Map<String, String> generatePerClassMapper(MethodInfo targetMethod
                             generatedClassName);
 
                     // bridge asyncResponse(Throwable, AsyncExceptionMapperContext) method
-                    generateRRUniResponseBridge(handledExceptionType, cc, rrAsyncResponseDescriptor);
+                    if (!THROWABLE.equals(handledExceptionType.name())) {
+                        generateRRUniResponseBridge(handledExceptionType, cc, rrAsyncResponseDescriptor);
+                    }
 
                     // RESTEasy Reactive asyncResponse(...) method
                     generateRRUniResponse(targetMethod, targetClass, handledExceptionType, cc, rrAsyncResponseDescriptor,
@@ -261,7 +267,9 @@ public static Map<String, String> generateGlobalMapper(MethodInfo targetMethod,
                     MethodDescriptor rrToResponseDescriptor = toResponseDescriptor(handledExceptionType, generatedClassName);
 
                     // bridge toResponse(Throwable, ServerRequestContext) method
-                    generateRRResponseBridge(handledExceptionType, cc, rrToResponseDescriptor);
+                    if (!THROWABLE.equals(handledExceptionType.name())) {
+                        generateRRResponseBridge(handledExceptionType, cc, rrToResponseDescriptor);
+                    }
 
                     // RESTEasy Reactive toResponse(...) method
                     generateRRResponse(targetMethod, targetClass, handledExceptionType, cc, rrToResponseDescriptor,
@@ -271,7 +279,9 @@ public static Map<String, String> generateGlobalMapper(MethodInfo targetMethod,
                             generatedClassName);
 
                     // bridge asyncResponse(Throwable, AsyncExceptionMapperContext) method
-                    generateRRUniResponseBridge(handledExceptionType, cc, rrAsyncResponseDescriptor);
+                    if (!THROWABLE.equals(handledExceptionType.name())) {
+                        generateRRUniResponseBridge(handledExceptionType, cc, rrAsyncResponseDescriptor);
+                    }
 
                     // RESTEasy Reactive asyncResponse(...) method
                     generateRRUniResponse(targetMethod, targetClass, handledExceptionType, cc, rrAsyncResponseDescriptor,

extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/GlobalThrowableExceptionMapperTest.java

@@ -0,0 +1,54 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class GlobalThrowableExceptionMapperTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(Resource.class, ThrowableExceptionMapper.class);
+                }
+            });
+
+    @Test
+    public void test() {
+        RestAssured.get("/test/throwable")
+                .then().statusCode(415);
+    }
+
+    @Path("test")
+    public static class Resource {
+        @GET
+        @Path("throwable")
+        @Produces("text/plain")
+        public String throwsThrowable() throws Throwable {
+            throw new Throwable();
+        }
+    }
+
+    public static class ThrowableExceptionMapper {
+
+        @ServerExceptionMapper
+        public Response handleThrowable(Throwable t) {
+            return Response.status(415).build();
+        }
+    }
+}

extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/PerClassThrowableExceptionMapperTest.java

@@ -0,0 +1,66 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class PerClassThrowableExceptionMapperTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(HasCustomThrowableHandlerResource.class);
+                }
+            });
+
+    @Test
+    public void test() {
+        RestAssured.get("/custom/throwable")
+                .then().statusCode(416);
+
+        RestAssured.get("/stock/throwable")
+                .then().statusCode(500);
+    }
+
+    @Path("custom")
+    public static class HasCustomThrowableHandlerResource {
+
+        @ServerExceptionMapper
+        public Response handleThrowable(Throwable t) {
+            return Response.status(416).build();
+        }
+
+        @GET
+        @Path("throwable")
+        @Produces("text/plain")
+        public String throwsThrowable() throws Throwable {
+            throw new Throwable();
+        }
+    }
+
+    @Path("stock")
+    public static class DoesNotHaveCustomThrowableHandlerResource {
+
+        @GET
+        @Path("throwable")
+        @Produces("text/plain")
+        public String throwsThrowable() throws Throwable {
+            throw new Throwable();
+        }
+    }
+}