root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Remove @ConditionalOnMissingBean from RestTemplateBuilderConfigurer 

See gh-37746
This commit is contained in:
saravanakumar Ramasamy 2023-10-07 19:28:20 +05:30 committed by Moritz Halbritter
parent 91204dfda6
commit 882e29dc7f
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfiguration.java
View File

@ -45,7 +45,6 @@ public class RestTemplateAutoConfiguration {
@Bean
@Lazy
@ConditionalOnMissingBean
public RestTemplateBuilderConfigurer restTemplateBuilderConfigurer(
ObjectProvider<HttpMessageConverters> messageConverters,
ObjectProvider<RestTemplateCustomizer> restTemplateCustomizers,

21
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java
View File

@ -21,6 +21,7 @@ import java.util.List;
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;
@ -42,6 +43,7 @@ import org.springframework.mock.http.client.MockClientHttpResponse;
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;
@ -65,6 +67,15 @@ class RestTemplateAutoConfigurationTests {
.isTrue());
}
@Test
void assertExceptionWhenCustomRestTemplateConfigurerIsDefined() {
this.contextRunner
.withUserConfiguration(RestTemplateCustomConfigurerConfig.class)
.run((context) -> assertThrows( BeanDefinitionOverrideException.class, () ->{
context.getBeanFactory().getBeanDefinition("restTemplateBuilderConfigurer");
}));
}
@Test
void restTemplateBuilderShouldBeLazilyDefined() {
this.contextRunner
@ -263,6 +274,16 @@ class RestTemplateAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
static class RestTemplateCustomConfigurerConfig {
@Bean
RestTemplateBuilderConfigurer restTemplateBuilderConfigurer() {
return new RestTemplateBuilderConfigurer();
}
}
static class CustomHttpMessageConverter extends StringHttpMessageConverter {
}