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

Polish RestClient auto-config and tests 

For consistency, replace webClient and WebClient with restClient and
RestClient. This also address a bean name clash between
RestClientAutoConfiguration's RestClient.Builder bean and
WebClientAutoConfiguration's WebClient.Builder bean that were both
previously named webClientBuilder.
This commit is contained in:
Andy Wilkinson 2023-07-06 12:22:54 +01:00
parent 3a07f4df80
commit 3b90919313
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ public class RestClientAutoConfiguration {
@Bean @Bean
@Scope("prototype") @Scope("prototype")
@ConditionalOnMissingBean @ConditionalOnMissingBean
public RestClient.Builder webClientBuilder(ObjectProvider<RestClientCustomizer> customizerProvider) { public RestClient.Builder restClientBuilder(ObjectProvider<RestClientCustomizer> customizerProvider) {
RestClient.Builder builder = RestClient.builder() RestClient.Builder builder = RestClient.builder()
.requestFactory(ClientHttpRequestFactories.get(ClientHttpRequestFactorySettings.DEFAULTS)); .requestFactory(ClientHttpRequestFactories.get(ClientHttpRequestFactorySettings.DEFAULTS));
customizerProvider.orderedStream().forEach((customizer) -> customizer.customize(builder)); customizerProvider.orderedStream().forEach((customizer) -> customizer.customize(builder));

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

@ -61,7 +61,7 @@ class RestClientAutoConfigurationTests {
void restClientShouldApplyCustomizers() { void restClientShouldApplyCustomizers() {
this.contextRunner.withUserConfiguration(RestClientCustomizerConfig.class).run((context) -> { this.contextRunner.withUserConfiguration(RestClientCustomizerConfig.class).run((context) -> {
RestClient.Builder builder = context.getBean(RestClient.Builder.class); RestClient.Builder builder = context.getBean(RestClient.Builder.class);
RestClientCustomizer customizer = context.getBean("webClientCustomizer", RestClientCustomizer.class); RestClientCustomizer customizer = context.getBean("restClientCustomizer", RestClientCustomizer.class);
builder.build(); builder.build();
then(customizer).should().customize(any(RestClient.Builder.class)); then(customizer).should().customize(any(RestClient.Builder.class));
}); });
@ -80,7 +80,7 @@ class RestClientAutoConfigurationTests {
void shouldNotCreateClientBuilderIfAlreadyPresent() { void shouldNotCreateClientBuilderIfAlreadyPresent() {
this.contextRunner.withUserConfiguration(CustomRestClientBuilderConfig.class).run((context) -> { this.contextRunner.withUserConfiguration(CustomRestClientBuilderConfig.class).run((context) -> {
RestClient.Builder builder = context.getBean(RestClient.Builder.class); RestClient.Builder builder = context.getBean(RestClient.Builder.class);
assertThat(builder).isInstanceOf(MyWebClientBuilder.class); assertThat(builder).isInstanceOf(MyRestClientBuilder.class);
}); });
} }
@ -141,7 +141,7 @@ class RestClientAutoConfigurationTests {
static class RestClientCustomizerConfig { static class RestClientCustomizerConfig {
@Bean @Bean
RestClientCustomizer webClientCustomizer() { RestClientCustomizer restClientCustomizer() {
return mock(RestClientCustomizer.class); return mock(RestClientCustomizer.class);
} }
@ -151,13 +151,13 @@ class RestClientAutoConfigurationTests {
static class CustomRestClientBuilderConfig { static class CustomRestClientBuilderConfig {
@Bean @Bean
MyWebClientBuilder myWebClientBuilder() { MyRestClientBuilder myRestClientBuilder() {
return mock(MyWebClientBuilder.class); return mock(MyRestClientBuilder.class);
} }
} }
interface MyWebClientBuilder extends RestClient.Builder { interface MyRestClientBuilder extends RestClient.Builder {
} }