Improve reactive rest client "process paths before sub resources" sce…

…nario (#995)

There is an issue in upstream (quarkusio/quarkus#29821) that
only happens under some RestClient definition hierarchy.

This commit reproduces the problem in Quarkus 2.12 and earlier versions

http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/ResourceAndSubResourcesClient.java

@@ -0,0 +1,40 @@
+package io.quarkus.ts.http.restclient.reactive;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+@RegisterClientHeaders
+@Consumes(MediaType.TEXT_PLAIN)
+@Produces(MediaType.TEXT_PLAIN)
+public interface ResourceAndSubResourcesClient {
+    @Path("clients")
+    ClientsResource clients();
+
+    interface ClientsResource {
+        @Path("{id}")
+        ClientResource get(@PathParam("id") String id);
+    }
+
+    interface ClientResource {
+        @Path("/resource-server")
+        SubResource sub();
+    }
+
+    interface LeafResource {
+        @GET
+        String retrieve();
+    }
+
+    interface SubResource {
+        @Path("{id}")
+        LeafResource findById(@PathParam("id") String id);
+    }
+}

http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/PlainBookResource.java → http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainBookResource.java

@@ -1,4 +1,4 @@
-package io.quarkus.ts.http.restclient.reactive;
+package io.quarkus.ts.http.restclient.reactive.resources;
 
 import java.util.ArrayList;
 import java.util.List;

http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainComplexClientResource.java

@@ -0,0 +1,44 @@
+package io.quarkus.ts.http.restclient.reactive.resources;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+import io.quarkus.ts.http.restclient.reactive.ResourceAndSubResourcesClient;
+
+@Path("clients/{clientId}/clientResource")
+@Consumes("text/plain")
+@Produces("text/plain")
+public class PlainComplexClientResource {
+    @Inject
+    @RestClient
+    ResourceAndSubResourcesClient resourceAndSubResourcesClient;
+
+    @GET
+    @Path("/{id}")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String getClientResource(@PathParam("clientId") String rootParam,
+            @PathParam("id") String id,
+            @QueryParam("baseUri") String baseUri) throws URISyntaxException {
+
+        ResourceAndSubResourcesClient restClient = resourceAndSubResourcesClient;
+        if (!StringUtils.isEmpty(baseUri)) {
+            restClient = RestClientBuilder.newBuilder().baseUri(new URI(baseUri))
+                    .build(ResourceAndSubResourcesClient.class);
+        }
+
+        return restClient.clients().get(rootParam).sub().findById(id).retrieve();
+    }
+}

http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/ReactiveClientBookResource.java → http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactiveClientBookResource.java

@@ -1,4 +1,4 @@
-package io.quarkus.ts.http.restclient.reactive;
+package io.quarkus.ts.http.restclient.reactive.resources;
 
 import java.util.List;
 import java.util.Map;
@@ -14,6 +14,7 @@
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
+import io.quarkus.ts.http.restclient.reactive.BookClient;
 import io.quarkus.ts.http.restclient.reactive.json.Book;
 import io.quarkus.ts.http.restclient.reactive.json.BookIdWrapper;
 import io.quarkus.ts.http.restclient.reactive.json.IdBeanParam;

http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactivecomplexClientResource.java

@@ -0,0 +1,14 @@
+package io.quarkus.ts.http.restclient.reactive.resources;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+@Path("/clients/{rootPath}/resource-server")
+public class ReactivecomplexClientResource {
+    @Path("/{id}")
+    @GET
+    public String retrieveById(@PathParam("rootPath") String rootPath, @PathParam("id") String id) {
+        return "/clients/" + rootPath + "/resource-server/" + id;
+    }
+}

http/rest-client-reactive/src/main/resources/modern.properties

@@ -3,7 +3,7 @@ quarkus.rest-client."io.quarkus.ts.http.restclient.reactive.json.JsonRestInterfa
 quarkus.rest-client."io.quarkus.ts.http.restclient.reactive.files.FileClient".url=http://localhost:${quarkus.http.port}
 quarkus.rest-client."io.quarkus.ts.http.restclient.reactive.BookClient".url=http://localhost:${quarkus.http.port}
 quarkus.rest-client."io.quarkus.ts.http.restclient.reactive.BookClient.AuthorClient".url=http://localhost:${quarkus.http.port}
-quarkus.rest-client."io.quarkus.ts.http.restclient.reactive.SubResourcesClient".url=http://localhost:${quarkus.http.port}
+quarkus.rest-client."io.quarkus.ts.http.restclient.reactive.ResourceAndSubResourcesClient".url=http://localhost:${quarkus.http.port}
 
 quarkus.rest-client.logging.scope=request-response
 quarkus.log.category."org.jboss.resteasy.reactive.client.logging".level=DEBUG

http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientIT.java

@@ -1,15 +1,18 @@
 package io.quarkus.ts.http.restclient.reactive;
 
-import static io.quarkus.ts.http.restclient.reactive.PlainBookResource.SEARCH_TERM_VAL;
+import static io.quarkus.ts.http.restclient.reactive.resources.PlainBookResource.SEARCH_TERM_VAL;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.UUID;
+
 import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 
+import io.quarkus.test.bootstrap.Protocol;
 import io.quarkus.test.bootstrap.RestService;
 import io.quarkus.test.scenarios.QuarkusScenario;
 import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusVersion;
@@ -201,23 +204,24 @@ public void checkSuffixPriority() {
     @Tag("QUARKUS-2741")
     @Test
     public void checkProcessPathBeforeSubResources() {
-        // should result in sending GET root/method/sub/sub/subsub
-        String result = app.given().get("/plain-root/root/method/sub/subsub").then()
+        final String randomId = UUID.randomUUID().toString();
+        String result = app.given().get("clients/myRealm/clientResource/" + randomId).then()
                 .statusCode(HttpStatus.SC_OK)
                 .extract().asString();
 
-        assertEquals("root/method/sub/sub/subsub", result);
+        assertEquals("/clients/myRealm/resource-server/" + randomId, result);
     }
 
     @Tag("QUARKUS-2741")
     @Test
     public void checkProcessPathBeforeSubResourcesManualRestClientBuild() {
-        String baseUri = String.format("http://%s:%s", app.getURI().getHost(), "" + app.getURI().getPort());
-        // should result in sending GET root/method/sub/sub/subsub
-        String result = app.given().get("/plain-root/root/manualClient/method/sub/subsub?baseUri=" + baseUri).then()
+        final String randomId = UUID.randomUUID().toString();
+        String result = app.given()
+                .get("clients/myRealm/clientResource/" + randomId + "/?baseUri=" + app.getURI(Protocol.HTTP).toString())
+                .then()
                 .statusCode(HttpStatus.SC_OK)
                 .extract().asString();
 
-        assertEquals("root/method/sub/sub/subsub", result);
+        assertEquals("/clients/myRealm/resource-server/" + randomId, result);
     }
 }