Merge pull request quarkusio#47909 from geoand/quarkusio#47821

Make bean param work properly with subresource in REST Client

Author: gsmet

extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceAndBeanParamTest.java

@@ -0,0 +1,67 @@
+package io.quarkus.rest.client.reactive.subresource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URI;
+
+import jakarta.ws.rs.BeanParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
+
+import org.jboss.resteasy.reactive.RestQuery;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+
+public class SubResourceAndBeanParamTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(TestClient.class, SubClient.class, TestBean.class, Exception.class, Resource.class));
+
+    @TestHTTPResource
+    URI baseUri;
+
+    @Test
+    public void test() {
+        TestClient testClient = QuarkusRestClientBuilder.newBuilder().baseUri(baseUri).build(TestClient.class);
+        assertThat(testClient.subResource(new TestBean("io.quarkus:quarkus-rest")).getExtensionById()).isEqualTo("foo");
+    }
+
+    @Path("/api/extensions")
+    public static class Resource {
+
+        @GET
+        public String getExtensions(@RestQuery String id) {
+            return "foo";
+        }
+    }
+
+    public interface TestClient {
+
+        @Path("/api/extensions")
+        SubClient subResource(@BeanParam TestBean bean);
+    }
+
+    public interface SubClient {
+
+        @GET
+        String getExtensionById();
+    }
+
+    public static class TestBean {
+
+        @QueryParam("id")
+        public final String extensionName;
+
+        public TestBean(String extensionName) {
+            this.extensionName = extensionName;
+        }
+    }
+
+}

independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java

@@ -128,7 +128,16 @@ protected ResourceMethod createResourceMethod(MethodInfo info, ClassInfo actualE
     protected boolean handleBeanParam(ClassInfo actualEndpointInfo, Type paramType, MethodParameter[] methodParameters, int i,
             Set<String> fileFormNames) {
         ClassInfo beanParamClassInfo = index.getClassByName(paramType.name());
-        methodParameters[i] = parseClientBeanParam(beanParamClassInfo, index);
+        if (methodParameters[i] != null) {
+            // TODO: we might want to make this smarter
+            List<Item> items = BeanParamParser.parse(beanParamClassInfo, index);
+            ClientBeanParamInfo clientBeanParamInfo = new ClientBeanParamInfo(items, beanParamClassInfo.name().toString());
+            clientBeanParamInfo.setDeclaredType(methodParameters[i].getDeclaredType());
+            methodParameters[i] = clientBeanParamInfo;
+
+        } else {
+            methodParameters[i] = parseClientBeanParam(beanParamClassInfo, index);
+        }
 
         return false;
     }