Merge pull request quarkusio#44096 from radcortez/fix-44073

Allow to use Simple Class name with @RegisterRestClient#configKey with MicroProfile config style
danielsoro · Nov 7, 2024 · 998d667 · 998d667
2 parents 012fbb4 + 5c4e42f
commit 998d667
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/...g/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java b/...g/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java
@@ -97,7 +97,7 @@ public SmallRyeConfigBuilder configBuilder(final SmallRyeConfigBuilder builder)
             String mpRestFullName = restClient.getFullName() + "/mp-rest/";
             microProfileFallbacks.put(quotedFullName, mpRestFullName);
             relocates.put(mpRestFullName, quotedFullName);
-            if (configKey != null && !restClient.isConfigKeyEqualsNames()) {
+            if (configKey != null && !configKey.equals(restClient.getFullName())) {
                 String mpConfigKey = configKey + "/mp-rest/";
                 microProfileFallbacks.put(mpRestFullName, mpConfigKey);
                 relocates.put(mpConfigKey, quotedFullName);

diff --git a/...lient-config/runtime/src/test/java/io/quarkus/restclient/config/RestClientConfigTest.java b/...lient-config/runtime/src/test/java/io/quarkus/restclient/config/RestClientConfigTest.java
@@ -222,6 +222,14 @@ public List<RegisteredRestClient> getRestClients() {
                 })
                 .build();
         assertNotNull(config);
+
+        RestClientsConfig restClientsConfig = config.getConfigMapping(RestClientsConfig.class);
+        assertEquals(1, restClientsConfig.clients().size());
+        assertTrue(restClientsConfig.clients().containsKey(MPConfigKeyRestClient.class.getName()));
+
+        RestClientConfig restClientConfig = restClientsConfig.getClient(MPConfigKeyRestClient.class);
+        assertTrue(restClientConfig.uri().isPresent());
+        assertThat(restClientConfig.uri().get()).isEqualTo("http://localhost:8082");
     }
 
     private void verifyConfig(RestClientConfig config) {

diff --git a/...ons/resteasy-classic/rest-client-config/runtime/src/test/resources/application.properties b/...ons/resteasy-classic/rest-client-config/runtime/src/test/resources/application.properties
@@ -51,3 +51,5 @@ mp.key/mp-rest/readTimeout=6000
 mp.key/mp-rest/followRedirects=true
 mp.key/mp-rest/proxyAddress=mp.key
 mp.key/mp-rest/queryParamStyle=COMMA_SEPARATED
+
+MPConfigKeyRestClient/mp-rest/uri=http://localhost:8082