Skip to content

Commit 3902eca

Browse files
committed
Renaming config classes. Adding comments.
1 parent 6f72aaf commit 3902eca

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/HttpInterfaceClientsAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class HttpInterfaceClientsAutoConfiguration {
5858
@ConditionalOnProperty(value = "spring.interfaceclients.http.resttemplate.enabled", havingValue = "false",
5959
matchIfMissing = true)
6060
@Import(RestClientInterfaceClientsImportRegistrar.class)
61-
protected static class RestClientAdapterProviderConfiguration {
61+
protected static class RestClientInterfaceClientsConfiguration {
6262

6363
}
6464

@@ -67,15 +67,15 @@ protected static class RestClientAdapterProviderConfiguration {
6767
@Conditional(NotReactiveWebApplicationCondition.class)
6868
@ConditionalOnProperty(value = "spring.interfaceclients.http.resttemplate.enabled", havingValue = "true")
6969
@Import(RestTemplateInterfaceClientsImportRegistrar.class)
70-
protected static class RestTemplateAdapterProviderConfiguration {
70+
protected static class RestTemplateInterfaceClientsConfiguration {
7171

7272
}
7373

7474
@Configuration(proxyBeanMethods = false)
7575
@ConditionalOnClass({ WebClient.class, WebClientAdapter.class, HttpServiceProxyFactory.class })
7676
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
7777
@Import(WebClientInterfaceClientsImportRegistrar.class)
78-
protected static class WebClientAdapterProviderConfiguration {
78+
protected static class WebClientInterfaceClientsConfiguration {
7979

8080
}
8181

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/RestClientInterfaceClientsFactoryBean.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected HttpExchangeAdapter exchangeAdapter() {
5050
.qualifiedBean(this.applicationContext.getBeanFactory(), RestClient.class, this.clientId);
5151
if (userProvidedRestClient != null) {
5252
// If the user wants to set the baseUrl directly on the builder,
53-
// it should not be set in properties.
53+
// it should not be set in the properties.
5454
if (baseUrl != null) {
5555
userProvidedRestClient = userProvidedRestClient.mutate().baseUrl(baseUrl).build();
5656
}
@@ -60,7 +60,8 @@ protected HttpExchangeAdapter exchangeAdapter() {
6060
RestClient.Builder userProvidedRestClientBuilder = QualifiedBeanProvider
6161
.qualifiedBean(this.applicationContext.getBeanFactory(), RestClient.Builder.class, this.clientId);
6262
if (userProvidedRestClientBuilder != null) {
63-
63+
// If the user wants to set the baseUrl directly on the builder,
64+
// it should not be set in the properties.
6465
if (baseUrl != null) {
6566
userProvidedRestClientBuilder.baseUrl(baseUrl);
6667
}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/WebClientInterfaceClientsFactoryBean.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.web.reactive.function.client.support.WebClientAdapter;
2626
import org.springframework.web.service.invoker.HttpExchangeAdapter;
2727

28+
//FIXME
2829
/**
2930
* {@link RestClient}-backed {@link AbstractHttpInterfaceClientsFactoryBean}
3031
* implementation.

0 commit comments

Comments
 (0)