Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid recursive interceptor lookups when the REST Client full name matches the simple name #45716

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Avoid recursive interceptor lookups when the REST Client full name matches the simple name #45716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ...g/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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());
Expand All @@ -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);
}
Expand Down
23 changes: 23 additions & 0 deletions ...lient-config/runtime/src/test/java/io/quarkus/restclient/config/RestClientConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading