Add BeanFactory-based implementation for WebClient.

Author: OlgaMaciaszek

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

@@ -19,6 +19,7 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.web.client.NotReactiveWebApplicationCondition;
 import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
@@ -31,6 +32,8 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.support.RestClientAdapter;
 import org.springframework.web.client.support.RestTemplateAdapter;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.support.WebClientAdapter;
 import org.springframework.web.service.invoker.HttpServiceProxyFactory;
 
 /**
@@ -61,21 +64,12 @@ protected static class RestTemplateAdapterProviderConfiguration {
 
 	}
 
-	// @Configuration(proxyBeanMethods = false)
-	// @ConditionalOnClass({ WebClient.class, WebClientAdapter.class,
-	// HttpServiceProxyFactory.class })
-	// @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
-	// protected static class WebClientAdapterProviderConfiguration {
-	//
-	// @Bean
-	// @ConditionalOnBean(WebClient.Builder.class)
-	// @ConditionalOnMissingBean
-	// HttpExchangeAdapterProvider webClientAdapterProvider(WebClient.Builder
-	// webClientBuilder,
-	// ObjectProvider<HttpInterfaceClientsProperties> propertiesProvider) {
-	// return new WebClientAdapterProvider(webClientBuilder, propertiesProvider);
-	// }
-	//
-	// }
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass({ WebClient.class, WebClientAdapter.class, HttpServiceProxyFactory.class })
+	@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
+	@Import(WebClientInterfaceClientsImportRegistrar.class)
+	protected static class WebClientAdapterProviderConfiguration {
+
+	}
 
 }

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

@@ -19,53 +19,48 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.support.WebClientAdapter;
 import org.springframework.web.service.invoker.HttpExchangeAdapter;
 
 /**
  * @author Olga Maciaszek-Sharma
  */
-public class WebClientAdapterProvider implements HttpExchangeAdapterProvider {
+public class WebClientInterfaceClientsFactoryBean extends AbstractHttpInterfaceClientsFactoryBean {
 
-	private static final Log logger = LogFactory.getLog(WebClientAdapterProvider.class);
-
-	private final WebClient.Builder builder;
-
-	private final ObjectProvider<HttpInterfaceClientsProperties> propertiesProvider;
-
-	public WebClientAdapterProvider(WebClient.Builder builder,
-			ObjectProvider<HttpInterfaceClientsProperties> propertiesProvider) {
-		this.builder = builder;
-		this.propertiesProvider = propertiesProvider;
-	}
+	private static final Log logger = LogFactory.getLog(WebClientInterfaceClientsFactoryBean.class);
 
 	@Override
-	public HttpExchangeAdapter get(ConfigurableListableBeanFactory beanFactory, String clientId) {
-		WebClient userProvidedWebClient = QualifiedBeanProvider.qualifiedBean(beanFactory, WebClient.class, clientId);
+	protected HttpExchangeAdapter exchangeAdapter() {
+		String baseUrl = getBaseUrl();
+
+		WebClient userProvidedWebClient = QualifiedBeanProvider.qualifiedBean(this.applicationContext.getBeanFactory(),
+				WebClient.class, this.clientId);
 		if (userProvidedWebClient != null) {
+			// If the user wants to set the baseUrl directly on the builder,
+			// it should not be set in properties.
+			if (baseUrl != null) {
+				userProvidedWebClient = userProvidedWebClient.mutate().baseUrl(baseUrl).build();
+			}
 			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);
+
+		WebClient.Builder userProvidedWebClientBuilder = QualifiedBeanProvider
+			.qualifiedBean(this.applicationContext.getBeanFactory(), WebClient.Builder.class, this.clientId);
 		if (userProvidedWebClientBuilder != null) {
-			// 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 + "'");
+			logger.debug("Creating WebClientAdapter for '" + this.clientId + "'");
 		}
-		WebClient webClient = this.builder.baseUrl(baseUrl).build();
+		WebClient.Builder builder = this.applicationContext.getBean(WebClient.Builder.class);
+		WebClient webClient = builder.baseUrl(baseUrl).build();
 		return WebClientAdapter.create(webClient);
 	}
 

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

@@ -16,16 +16,23 @@
 
 package org.springframework.boot.autoconfigure.interfaceclients.http;
 
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.web.service.invoker.HttpExchangeAdapter;
+import java.lang.annotation.Annotation;
+
+import org.springframework.boot.autoconfigure.interfaceclients.AbstractInterfaceClientsImportRegistrar;
 
 /**
  * @author Olga Maciaszek-Sharma
  */
-@FunctionalInterface
-public interface HttpExchangeAdapterProvider {
+public class WebClientInterfaceClientsImportRegistrar extends AbstractInterfaceClientsImportRegistrar {
+
+	@Override
+	protected Class<? extends Annotation> getAnnotation() {
+		return HttpClient.class;
+	}
 
-	// TODO: try a less specific type for the beanFactory
-	HttpExchangeAdapter get(ConfigurableListableBeanFactory beanFactory, String clientId);
+	@Override
+	protected Class<?> getFactoryBeanClass() {
+		return WebClientInterfaceClientsFactoryBean.class;
+	}
 
 }