Do not override baseUrl from client builder with null.

Author: OlgaMaciaszek

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

@@ -50,18 +50,22 @@ public HttpExchangeAdapter get(ListableBeanFactory beanFactory, String clientId)
 			return RestClientAdapter.create(userProvidedRestClient);
 		}
 		HttpInterfaceClientsProperties properties = this.propertiesProvider.getObject();
+		String baseUrl = properties.getProperties(clientId).getBaseUrl();
 		RestClient.Builder userProvidedRestClientBuilder = QualifiedBeanProvider.qualifiedBean(beanFactory,
 				RestClient.Builder.class, clientId);
 		if (userProvidedRestClientBuilder != null) {
-			// TODO: should we do this or get it from the user?
-			userProvidedRestClientBuilder.baseUrl(properties.getProperties(clientId).getBaseUrl());
+			// If the user wants to set the baseUrl directly on the builder,
+			// it should not be set in properties.
+			if (baseUrl != null) {
+				userProvidedRestClientBuilder.baseUrl(baseUrl);
+			}
 			return RestClientAdapter.create(userProvidedRestClientBuilder.build());
 		}
 		// create a RestClientAdapter bean with default implementation
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating RestClientAdapter for '" + clientId + "'");
 		}
-		RestClient restClient = this.builder.baseUrl(properties.getProperties(clientId).getBaseUrl()).build();
+		RestClient restClient = this.builder.baseUrl(baseUrl).build();
 		return RestClientAdapter.create(restClient);
 	}
 

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

@@ -51,19 +51,22 @@ public HttpExchangeAdapter get(ListableBeanFactory beanFactory, String clientId)
 			return RestTemplateAdapter.create(userProvidedRestTemplate);
 		}
 		HttpInterfaceClientsProperties properties = this.propertiesProvider.getObject();
+		String baseUrl = properties.getProperties(clientId).getBaseUrl();
 		RestTemplateBuilder userProvidedRestTemplateBuilder = QualifiedBeanProvider.qualifiedBean(beanFactory,
 				RestTemplateBuilder.class, clientId);
 		if (userProvidedRestTemplateBuilder != null) {
-			// TODO: should we do this or get it from the user?
-			userProvidedRestTemplateBuilder.rootUri(properties.getProperties(clientId).getBaseUrl());
+			// If the user wants to set the baseUrl directly on the builder,
+			// it should not be set in properties.
+			if (baseUrl != null) {
+				userProvidedRestTemplateBuilder.rootUri(baseUrl);
+			}
 			return RestTemplateAdapter.create(userProvidedRestTemplateBuilder.build());
 		}
 		// create a RestTemplateAdapter bean with default implementation
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating RestTemplateAdapter for '" + clientId + "'");
 		}
-		RestTemplate restTemplate = this.restTemplateBuilder.rootUri(properties.getProperties(clientId).getBaseUrl())
-			.build();
+		RestTemplate restTemplate = this.restTemplateBuilder.rootUri(baseUrl).build();
 		return RestTemplateAdapter.create(restTemplate);
 	}
 

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

@@ -49,18 +49,22 @@ public HttpExchangeAdapter get(ListableBeanFactory beanFactory, String clientId)
 			return WebClientAdapter.create(userProvidedWebClient);
 		}
 		HttpInterfaceClientsProperties properties = this.propertiesProvider.getObject();
+		String baseUrl = properties.getProperties(clientId).getBaseUrl();
 		WebClient.Builder userProvidedWebClientBuilder = QualifiedBeanProvider.qualifiedBean(beanFactory,
 				WebClient.Builder.class, clientId);
 		if (userProvidedWebClientBuilder != null) {
-			// TODO: should we do this or get it from the user?
-			userProvidedWebClientBuilder.baseUrl(properties.getProperties(clientId).getBaseUrl());
+			// If the user wants to set the baseUrl directly on the builder,
+			// it should not be set in properties.
+			if (baseUrl != null) {
+				userProvidedWebClientBuilder.baseUrl(baseUrl);
+			}
 			return WebClientAdapter.create(userProvidedWebClientBuilder.build());
 		}
 		// create a WebClientAdapter bean with default implementation
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating WebClientAdapter for '" + clientId + "'");
 		}
-		WebClient webClient = this.builder.baseUrl(properties.getProperties(clientId).getBaseUrl()).build();
+		WebClient webClient = this.builder.baseUrl(baseUrl).build();
 		return WebClientAdapter.create(webClient);
 	}