Fix searching for qualified bean.

Author: OlgaMaciaszek

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

@@ -23,8 +23,6 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.util.Assert;
 
-import static com.mysema.commons.lang.Assert.assertThat;
-
 /**
  * @author Olga Maciaszek-Sharma
  */

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

@@ -16,29 +16,19 @@
 
 package org.springframework.boot.autoconfigure.interfaceclients.http;
 
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 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;
 import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.client.RestClient;
-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;
 
 /**

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

@@ -16,13 +16,15 @@
 
 package org.springframework.boot.autoconfigure.interfaceclients.http;
 
+import java.util.Map;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
-import org.springframework.boot.autoconfigure.interfaceclients.InterfaceClientsAdapter;
+import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
+
+import static org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils.qualifiedBeansOfType;
 
 /**
  * @author Olga Maciaszek-Sharma
@@ -32,25 +34,26 @@ final class QualifiedBeanProvider {
 	private static final Log logger = LogFactory.getLog(QualifiedBeanProvider.class);
 
 	static <T> T qualifiedBean(ListableBeanFactory beanFactory, Class<T> type, String clientId) {
-		try {
-			return BeanFactoryAnnotationUtils.qualifiedBeanOfType(beanFactory, type, clientId);
+		Map<String, T> matchingClientBeans = qualifiedBeansOfType(beanFactory, type, clientId);
+		if (matchingClientBeans.size() > 1) {
+			throw new NoUniqueBeanDefinitionException(type, matchingClientBeans.keySet());
 		}
-		catch (NoSuchBeanDefinitionException ignored) {
+		if (matchingClientBeans.isEmpty()) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("No qualified bean of type " + type + " found for " + clientId);
 			}
-		}
-		// Get default-qualified bean
-		try {
-			return BeanFactoryAnnotationUtils.qualifiedBeanOfType(beanFactory, type,
-					InterfaceClientsAdapter.DEFAULT_QUALIFIER);
-		}
-		catch (NoSuchBeanDefinitionException ignored) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("No qualified of type " + type + "found for " + InterfaceClientsAdapter.DEFAULT_QUALIFIER);
+			Map<String, T> matchingDefaultBeans = qualifiedBeansOfType(beanFactory, type, clientId);
+			if (matchingDefaultBeans.size() > 1) {
+				throw new NoUniqueBeanDefinitionException(type, matchingDefaultBeans.keySet());
+			}
+			if (matchingDefaultBeans.isEmpty()) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("No qualified bean of type " + type + " found for default id");
+				}
+				return null;
 			}
 		}
-		return null;
+		return matchingClientBeans.values().iterator().next();
 	}
 
 }

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

@@ -32,24 +32,31 @@ public class RestClientInterfaceClientsFactoryBean extends AbstractHttpInterface
 
 	@Override
 	protected HttpExchangeAdapter exchangeAdapter() {
+		HttpInterfaceClientsProperties properties = this.applicationContext
+			.getBean(HttpInterfaceClientsProperties.class);
+		// If the user wants to set the baseUrl directly on the builder,
+		// it should not be set in properties.
+		String baseUrl = properties.getProperties(this.clientId).getBaseUrl();
+
 		RestClient userProvidedRestClient = QualifiedBeanProvider.qualifiedBean(this.applicationContext,
 				RestClient.class, this.clientId);
 		if (userProvidedRestClient != null) {
+			if (baseUrl != null) {
+				userProvidedRestClient = userProvidedRestClient.mutate().baseUrl(baseUrl).build();
+			}
 			return RestClientAdapter.create(userProvidedRestClient);
 		}
-		HttpInterfaceClientsProperties properties = this.applicationContext
-			.getBean(HttpInterfaceClientsProperties.class);
-		String baseUrl = properties.getProperties(this.clientId).getBaseUrl();
+
 		RestClient.Builder userProvidedRestClientBuilder = QualifiedBeanProvider.qualifiedBean(this.applicationContext,
 				RestClient.Builder.class, this.clientId);
 		if (userProvidedRestClientBuilder != null) {
-			// 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 '" + this.clientId + "'");