Skip to content

restTemplateBuilderConfigurer doesn't need to be @ConditionalOnMissingBean #37746

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

Closed
wants to merge 1 commit into from
Closed

restTemplateBuilderConfigurer doesn't need to be @ConditionalOnMissingBean #37746

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
1 change: 0 additions & 1 deletion ...java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public class RestTemplateAutoConfiguration {

@Bean
@Lazy
@ConditionalOnMissingBean
public RestTemplateBuilderConfigurer restTemplateBuilderConfigurer(
ObjectProvider<HttpMessageConverters> messageConverters,
ObjectProvider<RestTemplateCustomizer> restTemplateCustomizers,
Expand Down
21 changes: 21 additions & 0 deletions ...org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.junit.jupiter.api.Test;

import org.springframework.beans.factory.support.BeanDefinitionOverrideException;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
Expand All @@ -42,6 +43,7 @@
import org.springframework.web.client.RestTemplate;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.then;
Expand All @@ -65,6 +67,15 @@ void restTemplateBuilderConfigurerShouldBeLazilyDefined() {
.isTrue());
}

@Test
void assertExceptionWhenCustomRestTemplateConfigurerIsDefined() {
this.contextRunner
.withUserConfiguration(RestTemplateCustomConfigurerConfig.class)
.run((context) -> assertThrows( BeanDefinitionOverrideException.class, () ->{
context.getBeanFactory().getBeanDefinition("restTemplateBuilderConfigurer");
}));
}

@Test
void restTemplateBuilderShouldBeLazilyDefined() {
this.contextRunner
Expand Down Expand Up @@ -263,6 +274,16 @@ RestTemplateRequestCustomizer<?> restTemplateRequestCustomizer() {

}

@Configuration(proxyBeanMethods = false)
static class RestTemplateCustomConfigurerConfig {

@Bean
RestTemplateBuilderConfigurer restTemplateBuilderConfigurer() {
return new RestTemplateBuilderConfigurer();
}

}

static class CustomHttpMessageConverter extends StringHttpMessageConverter {

}
Expand Down