Skip to content

Commit

Permalink
Introduce @UnwrapException for Quarkus REST
Browse files Browse the repository at this point in the history
This allows users to configure exceptions
whose cause will be checked against exception mappers.

This capability already existed in Quarkus REST and was
used to map some internal exceptions, but with the new
annotation users can opt into the feature for whatever
exceptions make sense for their use case.

Closes: quarkusio#42089
  • Loading branch information
geoand committed Jul 24, 2024
1 parent 6e4b804 commit b13d7dc
Show file tree
Hide file tree
Showing 4 changed files with 247 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.jboss.jandex.IndexView;
import org.jboss.jandex.Indexer;
import org.jboss.jandex.MethodInfo;
import org.jboss.jandex.Type;
import org.jboss.resteasy.reactive.common.core.BlockingNotAllowedException;
import org.jboss.resteasy.reactive.common.model.ResourceContextResolver;
import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper;
Expand All @@ -33,6 +34,7 @@
import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
import org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveInterceptorScanner;
import org.jboss.resteasy.reactive.server.UnwrapException;
import org.jboss.resteasy.reactive.server.core.ExceptionMapping;
import org.jboss.resteasy.reactive.server.model.ContextResolvers;
import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
Expand Down Expand Up @@ -82,6 +84,9 @@
*/
public class ResteasyReactiveScanningProcessor {

private static final DotName EXCEPTION = DotName.createSimple(Exception.class);
private static final DotName RUNTIME_EXCEPTION = DotName.createSimple(RuntimeException.class);

public static final Set<DotName> CONDITIONAL_BEAN_ANNOTATIONS;

static {
Expand Down Expand Up @@ -118,11 +123,55 @@ public void accept(ResourceInterceptors interceptors) {
}

@BuildStep
public List<UnwrappedExceptionBuildItem> defaultUnwrappedException() {
public List<UnwrappedExceptionBuildItem> defaultUnwrappedExceptions() {
return List.of(new UnwrappedExceptionBuildItem(ArcUndeclaredThrowableException.class),
new UnwrappedExceptionBuildItem(RollbackException.class));
}

@BuildStep
public void applicationSpecificUnwrappedExceptions(CombinedIndexBuildItem combinedIndexBuildItem,
BuildProducer<UnwrappedExceptionBuildItem> producer) {
IndexView index = combinedIndexBuildItem.getIndex();
for (AnnotationInstance instance : index.getAnnotations(UnwrapException.class)) {
AnnotationValue value = instance.value();
if (value == null) {
// in this case we need to use the class where the annotation was placed as the exception to be unwrapped

AnnotationTarget target = instance.target();
if (target.kind() != AnnotationTarget.Kind.CLASS) {
throw new IllegalStateException(
"@UnwrapException is only supported on classes. Offending target is: " + target);
}
ClassInfo classInfo = target.asClass();
ClassInfo toCheck = classInfo;
boolean isException = false;
while (true) {
DotName superDotName = toCheck.superName();
if (EXCEPTION.equals(superDotName) || RUNTIME_EXCEPTION.equals(superDotName)) {
isException = true;
break;
}
toCheck = index.getClassByName(superDotName);
if (toCheck == null) {
break;
}
}
if (!isException) {
throw new IllegalArgumentException(
"Using @UnwrapException without a value is only supported on exception classes. Offending target is '"
+ classInfo.name() + "'.");
}

producer.produce(new UnwrappedExceptionBuildItem(classInfo.name().toString()));
} else {
Type[] exceptionTypes = value.asClassArray();
for (Type exceptionType : exceptionTypes) {
producer.produce(new UnwrappedExceptionBuildItem(exceptionType.name().toString()));
}
}
}
}

@BuildStep
public ExceptionMappersBuildItem scanForExceptionMappers(CombinedIndexBuildItem combinedIndexBuildItem,
ApplicationResultBuildItem applicationResultBuildItem,
Expand All @@ -137,7 +186,7 @@ public ExceptionMappersBuildItem scanForExceptionMappers(CombinedIndexBuildItem
exceptions.addBlockingProblem(BlockingOperationNotAllowedException.class);
exceptions.addBlockingProblem(BlockingNotAllowedException.class);
for (UnwrappedExceptionBuildItem bi : unwrappedExceptions) {
exceptions.addUnwrappedException(bi.getThrowableClass().getName());
exceptions.addUnwrappedException(bi.getThrowableClassName());
}
if (capabilities.isPresent(Capability.HIBERNATE_REACTIVE)) {
exceptions.addNonBlockingProblem(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
package io.quarkus.resteasy.reactive.server.test.customexceptions;

import static io.quarkus.resteasy.reactive.server.test.ExceptionUtil.removeStackTrace;
import static io.restassured.RestAssured.when;

import java.util.function.Supplier;

import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.Response;

import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
import org.jboss.resteasy.reactive.server.UnwrapException;
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.resteasy.reactive.server.test.ExceptionUtil;
import io.quarkus.test.QuarkusUnitTest;

public class UnwrapExceptionTest {

@RegisterExtension
static QuarkusUnitTest test = new QuarkusUnitTest()
.setArchiveProducer(new Supplier<>() {
@Override
public JavaArchive get() {
return ShrinkWrap.create(JavaArchive.class)
.addClasses(FirstException.class, SecondException.class, ThirdException.class,
FourthException.class, FifthException.class, SixthException.class,
Mappers.class, Resource.class, ExceptionUtil.class);
}
});

@Test
public void testWrapperWithUnmappedException() {
when().get("/hello/iaeInSecond")
.then().statusCode(500);
}

@Test
public void testMappedExceptionWithoutUnwrappedWrapper() {
when().get("/hello/iseInFirst")
.then().statusCode(500);

when().get("/hello/iseInThird")
.then().statusCode(500);

when().get("/hello/iseInSixth")
.then().statusCode(500);
}

@Test
public void testWrapperWithMappedException() {
when().get("/hello/iseInSecond")
.then().statusCode(900);

when().get("/hello/iseInFourth")
.then().statusCode(900);

when().get("/hello/iseInFifth")
.then().statusCode(900);
}

@Path("hello")
public static class Resource {

@Path("iseInFirst")
public String throwsISEAsCauseOfFirstException() {
throw removeStackTrace(new FirstException(removeStackTrace(new IllegalStateException("dummy"))));
}

@Path("iseInSecond")
public String throwsISEAsCauseOfSecondException() {
throw removeStackTrace(new SecondException(removeStackTrace(new IllegalStateException("dummy"))));
}

@Path("iaeInSecond")
public String throwsIAEAsCauseOfSecondException() {
throw removeStackTrace(new SecondException(removeStackTrace(new IllegalArgumentException("dummy"))));
}

@Path("iseInThird")
public String throwsISEAsCauseOfThirdException() throws ThirdException {
throw removeStackTrace(new ThirdException(removeStackTrace(new IllegalStateException("dummy"))));
}

@Path("iseInFourth")
public String throwsISEAsCauseOfFourthException() throws FourthException {
throw removeStackTrace(new FourthException(removeStackTrace(new IllegalStateException("dummy"))));
}

@Path("iseInFifth")
public String throwsISEAsCauseOfFifthException() {
throw removeStackTrace(new FifthException(removeStackTrace(new IllegalStateException("dummy"))));
}

@Path("iseInSixth")
public String throwsISEAsCauseOfSixthException() {
throw removeStackTrace(new SixthException(removeStackTrace(new IllegalStateException("dummy"))));
}
}

@UnwrapException({ FourthException.class, FifthException.class })
public static class Mappers {

@ServerExceptionMapper
public Response handleIllegalStateException(IllegalStateException e) {
return Response.status(900).build();
}
}

public static class FirstException extends RuntimeException {

public FirstException(Throwable cause) {
super(cause);
}
}

@UnwrapException
public static class SecondException extends FirstException {

public SecondException(Throwable cause) {
super(cause);
}
}

public static class ThirdException extends Exception {

public ThirdException(Throwable cause) {
super(cause);
}
}

public static class FourthException extends SecondException {

public FourthException(Throwable cause) {
super(cause);
}
}

public static class FifthException extends RuntimeException {

public FifthException(Throwable cause) {
super(cause);
}
}

public static class SixthException extends RuntimeException {

public SixthException(Throwable cause) {
super(cause);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,32 @@
import io.quarkus.builder.item.MultiBuildItem;

/**
* When an Exception of this type is thrown and no {@code jakarta.ws.rs.ext.ExceptionMapper} exists,
* When an {@link Exception} of this type is thrown and no {@code jakarta.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;
private final String throwableClassName;

public UnwrappedExceptionBuildItem(Class<? extends Throwable> throwableClass) {
this.throwableClass = throwableClass;
public UnwrappedExceptionBuildItem(String throwableClassName) {
this.throwableClassName = throwableClassName;
}

public UnwrappedExceptionBuildItem(Class<? extends Throwable> throwableClassName) {
this.throwableClassName = throwableClassName.getName();
}

@Deprecated(forRemoval = true)
public Class<? extends Throwable> getThrowableClass() {
return throwableClass;
try {
return (Class<? extends Throwable>) Class.forName(throwableClassName, false,
Thread.currentThread().getContextClassLoader());
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
}

public String getThrowableClassName() {
return throwableClassName;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.jboss.resteasy.reactive.server;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* Used to configure that an exception (or exceptions) should be unwrapped during exception handling.
* <p>
* Unwrapping means that when an {@link Exception} of the configured type is thrown and no {@code jakarta.ws.rs.ext.ExceptionMapper} exists,
* then RESTEasy Reactive will attempt to locate an {@code ExceptionMapper} for the cause of the Exception.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface UnwrapException {

/**
* If this is not set, the value is assumed to be the exception class where the annotation is placed
*/
Class<? extends Exception>[] value() default {};
}

0 comments on commit b13d7dc

Please sign in to comment.