diff --git a/extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/exception/SubResourceTest.java b/extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/exception/SubResourceTest.java
new file mode 100644
index 00000000000000..36a4f58bd6fab9
--- /dev/null
+++ b/extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/exception/SubResourceTest.java
@@ -0,0 +1,167 @@
+package io.quarkus.restclient.exception;
+
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
+
+import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Tests client sub-resources
+ *
+ * @author James R. Perkins
+ */
+public class SubResourceTest {
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest()
+ .withApplicationRoot((jar) -> jar
+ .addClasses(SubResourceTest.class, ClientRootResource.class, ClientSubResource.class,
+ ServerResource.class, TestExceptionMapper.class, TestException.class)
+ .addAsResource(new StringAsset(ClientRootResource.class.getName() + "/mp-rest/url=${test.url}\n"),
+ "application.properties"));
+
+ @RestClient
+ ClientRootResource clientRootResource;
+
+ /**
+ * Creates a REST client with an attached exception mapper. The exception mapper will throw a {@link TestException}.
+ * This test invokes a call to the root resource.
+ *
+ */
+ @Test
+ public void rootResourceExceptionMapper() {
+ try (final Response ignored = clientRootResource.fromRoot()) {
+ fail("fromRoot() should have thrown a TestException");
+ } catch (TestException expected) {
+ assertEquals("RootResource failed on purpose", expected.getMessage());
+ }
+ }
+
+ /**
+ * Creates a REST client with an attached exception mapper. The exception mapper will throw a {@link TestException}.
+ * This test invokes a call to the sub-resource. The sub-resource then invokes an additional call which should also
+ * result in a {@link TestException} thrown.
+ *
+ * @throws Exception if a test error occurs
+ */
+ @Test
+ public void subResourceExceptionMapper() throws Exception {
+ try (final Response ignored = clientRootResource.subResource().fromSub()) {
+ fail("fromSub() should have thrown a TestException");
+ } catch (TestException expected) {
+ assertEquals("SubResource failed on purpose", expected.getMessage());
+ }
+ }
+
+ /**
+ * This test invokes a call to the sub-resource. The sub-resource then invokes an additional call which should
+ * return the header value for {@code test-header}.
+ *
+ */
+ @Test
+ public void subResourceWithHeader() {
+ try (final Response response = clientRootResource.subResource().withHeader()) {
+ assertEquals(OK, response.getStatusInfo());
+ assertEquals("SubResourceHeader", response.readEntity(String.class));
+ }
+ }
+
+ /**
+ * This test invokes a call to the sub-resource. The sub-resource then invokes an additional call which should
+ * return the header value for {@code test-global-header}.
+ *
+ * @throws Exception if a test error occurs
+ */
+ @Test
+ public void subResourceWithGlobalHeader() throws Exception {
+ try (final Response response = clientRootResource.subResource().withGlobalHeader()) {
+ assertEquals(OK, response.getStatusInfo());
+ assertEquals("GlobalSubResourceHeader", response.readEntity(String.class));
+ }
+ }
+
+ @RegisterRestClient
+ @RegisterProvider(TestExceptionMapper.class)
+ @Path("/root")
+ public interface ClientRootResource {
+ @Path("/sub")
+ ClientSubResource subResource();
+
+ @GET
+ Response fromRoot() throws TestException;
+ }
+
+ @ClientHeaderParam(name = "test-global-header", value = "GlobalSubResourceHeader")
+ @Produces(TEXT_PLAIN)
+ public interface ClientSubResource {
+ @GET
+ Response fromSub() throws TestException;
+
+ @GET
+ @ClientHeaderParam(name = "test-header", value = "SubResourceHeader")
+ @Path("/header")
+ Response withHeader();
+
+ @GET
+ @Path("/global/header")
+ Response withGlobalHeader();
+ }
+
+ @Path("/root")
+ public static class ServerResource {
+ @GET
+ public Response fromRoot() {
+ return Response.serverError().entity("RootResource failed on purpose").build();
+ }
+
+ @GET
+ @Path("/sub")
+ public Response fromSub() {
+ return Response.serverError().entity("SubResource failed on purpose").build();
+ }
+
+ @GET
+ @Path("/sub/header")
+ public Response subHeader(@HeaderParam("test-header") final String value) {
+ return Response.ok(value).build();
+ }
+
+ @GET
+ @Path("/sub/global/header")
+ public Response subGlobalHeader(@HeaderParam("test-global-header") final String value) {
+ return Response.ok(value).build();
+ }
+ }
+
+ @Provider
+ public static class TestExceptionMapper implements ResponseExceptionMapper {
+ @Override
+ public TestException toThrowable(final Response response) {
+ return new TestException(response.readEntity(String.class));
+ }
+ }
+
+ public static class TestException extends RuntimeException {
+ public TestException(final String msg) {
+ super(msg);
+ }
+ }
+}
diff --git a/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusProxyInvocationHandler.java b/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusProxyInvocationHandler.java
index 022f4b53305b3a..25626fd865ec8b 100644
--- a/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusProxyInvocationHandler.java
+++ b/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusProxyInvocationHandler.java
@@ -1,11 +1,13 @@
package io.quarkus.restclient.runtime;
+import java.io.Closeable;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collections;
@@ -22,6 +24,8 @@
import jakarta.enterprise.inject.spi.CDI;
import jakarta.enterprise.inject.spi.InterceptionType;
import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.Path;
import jakarta.ws.rs.ProcessingException;
import jakarta.ws.rs.client.ResponseProcessingException;
import jakarta.ws.rs.ext.ParamConverter;
@@ -32,6 +36,7 @@
import org.jboss.resteasy.microprofile.client.ExceptionMapping;
import org.jboss.resteasy.microprofile.client.RestClientProxy;
import org.jboss.resteasy.microprofile.client.header.ClientHeaderFillingException;
+import org.jboss.resteasy.microprofile.client.header.ClientHeaderProviders;
/**
* Quarkus version of {@link org.jboss.resteasy.microprofile.client.ProxyInvocationHandler} retaining the ability to
@@ -84,14 +89,17 @@ public QuarkusProxyInvocationHandler(final Class restClientInterface,
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
if (RestClientProxy.class.equals(method.getDeclaringClass())) {
- return invokeRestClientProxyMethod(proxy, method, args);
+ return invokeRestClientProxyMethod(method);
}
// Autocloseable/Closeable
if (method.getName().equals("close") && (args == null || args.length == 0)) {
close();
return null;
}
- if (closed.get()) {
+ // Check if this proxy is closed or the client itself is closed. The client may be closed if this proxy was a
+ // sub-resource and the resource client itself was closed.
+ if (closed.get() || client.isClosed()) {
+ closed.set(true);
throw new IllegalStateException("RestClientProxy is closed");
}
@@ -162,7 +170,30 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
return new QuarkusInvocationContextImpl(target, method, args, chain, interceptorBindingsMap.get(method)).proceed();
} else {
try {
- return method.invoke(target, args);
+ final Object result = method.invoke(target, args);
+ final Class returnType = method.getReturnType();
+ // Check if this is a sub-resource. A sub-resource must be an interface.
+ if (returnType.isInterface()) {
+ final Annotation[] annotations = method.getDeclaredAnnotations();
+ boolean hasPath = false;
+ boolean hasHttpMethod = false;
+ // Check the annotations. If the method has one of the @HttpMethod annotations, we will just use the
+ // current method. If it only has a @Path, then we need to create a proxy for the return type.
+ for (Annotation annotation : annotations) {
+ final Class type = annotation.annotationType();
+ if (type.equals(Path.class)) {
+ hasPath = true;
+ } else if (type.getDeclaredAnnotation(HttpMethod.class) != null) {
+ hasHttpMethod = true;
+ }
+ }
+ if (!hasHttpMethod && hasPath) {
+ // Create a proxy of the return type re-using the providers and client, but do not add the required
+ // interfaces for the sub-resource.
+ return createProxy(returnType, result, false, providerInstances, client);
+ }
+ }
+ return result;
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
if (cause instanceof CompletionException) {
@@ -193,7 +224,41 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
}
}
- private Object invokeRestClientProxyMethod(Object proxy, Method method, Object[] args) {
+ /**
+ * Creates a proxy for the interface.
+ *
+ * If {@code addExtendedInterfaces} is set to {@code true}, the proxy will implement the interfaces
+ * {@link RestClientProxy} and {@link Closeable}.
+ *
+ *
+ * @param resourceInterface the resource interface to create the proxy for
+ * @param target the target object for the proxy
+ * @param addExtendedInterfaces {@code true} if the proxy should also implement {@link RestClientProxy} and
+ * {@link Closeable}
+ * @param providers the providers for the client
+ * @param client the client to use
+ * @return the new proxy
+ */
+ static Object createProxy(final Class resourceInterface, final Object target, final boolean addExtendedInterfaces,
+ final Set