Merge pull request #15767 from geoand/#15763-part2

Make per class @ServerExceptionMapper work with Mutiny response types
quarkusio · Mar 16, 2021 · 30ea183 · 30ea183
2 parents 10aad34 + 7064dc7
commit 30ea183
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 2 deletions.
diff --git a/...io/quarkus/resteasy/reactive/server/test/customexceptions/CustomExceptionMappersTest.java b/...io/quarkus/resteasy/reactive/server/test/customexceptions/CustomExceptionMappersTest.java
@@ -42,6 +42,22 @@ public void testResourceWithExceptionMapper() {
                 .then().statusCode(500);
     }
 
+    @Test
+    public void testResourceWithExceptionMapperAndUniResponse() {
+        RestAssured.get("/first/uni?name=IllegalState")
+                .then().statusCode(409);
+        RestAssured.get("/first/uni?name=IllegalArgument")
+                .then().statusCode(409);
+        RestAssured.get("/first/uni?name=My")
+                .then().statusCode(410).body(Matchers.equalTo("/first/uni->uni"));
+        RestAssured.get("/first/uni?name=MyOther")
+                .then().statusCode(411);
+        RestAssured.get("/first/uni?name=Uni")
+                .then().statusCode(412).body(Matchers.equalTo("/first/uni->uni"));
+        RestAssured.get("/first/uni?name=Other")
+                .then().statusCode(500);
+    }
+
     @Test
     public void testResourceWithoutExceptionMapper() {
         RestAssured.get("/second")

diff --git a/...rc/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java b/...rc/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java
@@ -36,6 +36,25 @@ public String throwsVariousExceptions(@RestQuery String name) {
         throw new RuntimeException();
     }
 
+    @GET
+    @Path("uni")
+    @Produces("text/plain")
+    public Uni<String> uni(@RestQuery String name) {
+        Exception e = new RuntimeException();
+        if (name.startsWith("IllegalArgument")) {
+            e = new IllegalArgumentException();
+        } else if (name.startsWith("IllegalState")) {
+            e = new IllegalStateException("IllegalState");
+        } else if (name.startsWith("MyOther")) {
+            e = new MyOtherException();
+        } else if (name.startsWith("My")) {
+            e = new MyException();
+        } else if (name.startsWith("Uni")) {
+            e = new UniException();
+        }
+        return Uni.createFrom().failure(e);
+    }
+
     @ServerExceptionMapper({ IllegalStateException.class, IllegalArgumentException.class })
     public Response handleIllegal() {
         return Response.status(409).build();

diff --git a/...rc/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java b/...rc/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java
@@ -51,6 +51,11 @@ public synchronized void resume(Throwable throwable) {
         resume((Executor) null);
     }
 
+    public synchronized void resume(Throwable throwable, boolean keepTarget) {
+        handleException(throwable, keepTarget);
+        resume((Executor) null);
+    }
+
     public synchronized void resume(Executor executor) {
         if (running) {
             this.executor = executor;

diff --git a/...e/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java b/...e/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java
@@ -155,7 +155,7 @@ protected void handleException(ResteasyReactiveRequestContext requestContext, Th
                 log.error("Exception in SSE server handling, impossible to send it to client", t);
             } else {
                 // we can go through the abort chain
-                requestContext.resume(t);
+                requestContext.resume(t, true);
             }
         }
     }

diff --git a/...runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java b/...runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java
@@ -23,7 +23,7 @@ public void accept(Object v) {
             }, new Consumer<Throwable>() {
                 @Override
                 public void accept(Throwable t) {
-                    requestContext.resume(t);
+                    requestContext.resume(t, true);
                 }
             });
         }