Avoid recursive interceptor lookups when the REST Client full name ma…

…tches the simple name (cherry picked from commit de0e007)
quarkusio · Jan 21, 2025 · 388dcf7 · 388dcf7
1 parent 7d146e4
commit 388dcf7
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
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
@@ -94,7 +94,9 @@ public SmallRyeConfigBuilder configBuilder(final SmallRyeConfigBuilder builder)
                         // FQN -> Quoted Config Key -> Quoted Simple Name -> Simple Name
                         quarkusFallbacks.put(quotedFullName, quotedConfigKey);
                         quarkusFallbacks.put(quotedConfigKey, restClient.getSimpleName());
-                        quarkusFallbacks.put(restClient.getSimpleName(), quotedSimpleName);
+                        if (!quotedSimpleName.equals(quotedFullName)) {
+                            quarkusFallbacks.put(restClient.getSimpleName(), quotedSimpleName);
+                        }
                         fullNameRelocates.add(quotedConfigKey);
                         fullNameRelocates.add(restClient.getSimpleName());
                         fullNameRelocates.add(quotedSimpleName);
@@ -103,7 +105,9 @@ public SmallRyeConfigBuilder configBuilder(final SmallRyeConfigBuilder builder)
                         quarkusFallbacks.put(quotedFullName, configKey);
                         quarkusFallbacks.put(configKey, quotedConfigKey);
                         quarkusFallbacks.put(quotedConfigKey, restClient.getSimpleName());
-                        quarkusFallbacks.put(restClient.getSimpleName(), quotedSimpleName);
+                        if (!quotedSimpleName.equals(quotedFullName)) {
+                            quarkusFallbacks.put(restClient.getSimpleName(), quotedSimpleName);
+                        }
                         fullNameRelocates.add(configKey);
                         fullNameRelocates.add(quotedConfigKey);
                         fullNameRelocates.add(restClient.getSimpleName());
@@ -112,14 +116,18 @@ public SmallRyeConfigBuilder configBuilder(final SmallRyeConfigBuilder builder)
                 } else {
                     // FQN -> Quoted Simple Name -> Simple Name
                     quarkusFallbacks.put(quotedFullName, restClient.getSimpleName());
-                    quarkusFallbacks.put(restClient.getSimpleName(), quotedSimpleName);
+                    if (!quotedSimpleName.equals(quotedFullName)) {
+                        quarkusFallbacks.put(restClient.getSimpleName(), quotedSimpleName);
+                    }
                     fullNameRelocates.add(restClient.getSimpleName());
                     fullNameRelocates.add(quotedSimpleName);
                 }
             } else {
                 // FQN -> Quoted Simple Name -> Simple Name
                 quarkusFallbacks.put(quotedFullName, restClient.getSimpleName());
-                quarkusFallbacks.put(restClient.getSimpleName(), quotedSimpleName);
+                if (!quotedSimpleName.equals(quotedFullName)) {
+                    quarkusFallbacks.put(restClient.getSimpleName(), quotedSimpleName);
+                }
                 fullNameRelocates.add(restClient.getSimpleName());
                 fullNameRelocates.add(quotedSimpleName);
             }

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
@@ -324,6 +324,29 @@ void buildTimeConfig() {
         assertFalse(buildTimeConfig.clients().get(ConfigKeyRestClient.class.getName()).removesTrailingSlash());
     }
 
+    @Test
+    void defaultPackage() {
+        RegisteredRestClient registeredRestClient = new RegisteredRestClient("FullNameRestClient", "FullNameRestClient", null);
+        // application.properties in test/resources
+        SmallRyeConfig config = ConfigUtils.emptyConfigBuilder()
+                .withMapping(RestClientsConfig.class)
+                .withCustomizers(new SmallRyeConfigBuilderCustomizer() {
+                    @Override
+                    public void configBuilder(final SmallRyeConfigBuilder builder) {
+                        new AbstractRestClientConfigBuilder() {
+                            @Override
+                            public List<RegisteredRestClient> getRestClients() {
+                                return List.of(registeredRestClient);
+                            }
+                        }.configBuilder(builder);
+                    }
+                })
+                .build();
+
+        RestClientsConfig restClientsConfig = config.getConfigMapping(RestClientsConfig.class);
+        assertEquals(1, restClientsConfig.clients().size());
+    }
+
     private void verifyConfig(RestClientConfig config) {
         assertTrue(config.url().isPresent());
         assertThat(config.url().get()).isEqualTo("http://localhost:8080");