Bubble up WebApplicationExceptions in RestDataResourceMethodListener …

…implementations - Fixes quarkusio#35169
gastaldi · Jan 18, 2024 · 6e3b906 · 6e3b906
1 parent 39c4f53
commit 6e3b906
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 0 deletions.
diff --git a/...rest/data/panache/deployment/entity/PanacheEntityResourceMethodListenerExceptionTest.java b/...rest/data/panache/deployment/entity/PanacheEntityResourceMethodListenerExceptionTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
+
+import static io.restassured.RestAssured.given;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.ForbiddenException;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.rest.data.panache.RestDataResourceMethodListener;
+import io.quarkus.test.QuarkusUnitTest;
+
+class PanacheEntityResourceMethodListenerExceptionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class,
+                            Item.class, ItemsResource.class, WebApplicationExceptionResourceMethodListener.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Test
+    void shouldReceiveWebApplicationException() {
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-simple\", \"collection\": {\"id\": \"full\"}}")
+                .when().post("/items")
+                .then()
+                .statusCode(403);
+    }
+
+    @ApplicationScoped
+    public static class WebApplicationExceptionResourceMethodListener implements RestDataResourceMethodListener<Item> {
+
+        @Override
+        public void onBeforeAdd(Item item) {
+            throw new ForbiddenException("You shall not pass");
+        }
+    }
+
+}
diff --git a/...rest/data/panache/deployment/entity/PanacheEntityResourceMethodListenerExceptionTest.java b/...rest/data/panache/deployment/entity/PanacheEntityResourceMethodListenerExceptionTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.hibernate.reactive.rest.data.panache.deployment.entity;
+
+import static io.restassured.RestAssured.given;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.ForbiddenException;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.reactive.rest.data.panache.RestDataResourceMethodListener;
+import io.quarkus.test.QuarkusUnitTest;
+
+class PanacheEntityResourceMethodListenerExceptionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class,
+                            Item.class, ItemsResource.class, WebApplicationExceptionResourceMethodListener.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Test
+    void shouldReceiveWebApplicationException() {
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-simple\", \"collection\": {\"id\": \"full\"}}")
+                .when().post("/items")
+                .then()
+                .statusCode(403);
+    }
+
+    @ApplicationScoped
+    public static class WebApplicationExceptionResourceMethodListener implements RestDataResourceMethodListener<Item> {
+
+        @Override
+        public void onBeforeAdd(Item item) {
+            throw new ForbiddenException("You shall not pass");
+        }
+    }
+
+}
diff --git a/.../main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java b/.../main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java
@@ -12,6 +12,7 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
 
@@ -78,6 +79,9 @@ protected abstract void implementInternal(ClassCreator classCreator, ResourceMet
 
     protected TryBlock implementTryBlock(BytecodeCreator bytecodeCreator, String message) {
         TryBlock tryBlock = bytecodeCreator.tryBlock();
+        CatchBlockCreator webApplicationExceptionCatch = tryBlock.addCatch(WebApplicationException.class);
+        webApplicationExceptionCatch.throwException(webApplicationExceptionCatch.getCaughtException());
+        webApplicationExceptionCatch.close();
         CatchBlockCreator catchBlock = tryBlock.addCatch(Throwable.class);
         catchBlock.throwException(RestDataPanacheException.class, message, catchBlock.getCaughtException());
         catchBlock.close();