Merge remote-tracking branch 'origin/main'

# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/DeferringLoadBalancerExchangeFilterFunction.java

Author: OlgaMaciaszek

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java

@@ -37,7 +37,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.web.client.RestTemplate;
@@ -95,10 +94,11 @@ public static DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
 
 		@Bean
 		@ConditionalOnBean(DeferringLoadBalancerInterceptor.class)
-		@ConditionalOnMissingBean
-		static LoadBalancerRestClientBuilderBeanPostProcessor lbRestClientPostProcessor(
-				@Lazy DeferringLoadBalancerInterceptor loadBalancerInterceptor, ApplicationContext context) {
-			return new LoadBalancerRestClientBuilderBeanPostProcessor(loadBalancerInterceptor, context);
+		@ConditionalOnMissingBean(LoadBalancerRestClientBuilderBeanPostProcessor.class)
+		static LoadBalancerRestClientBuilderBeanPostProcessor<DeferringLoadBalancerInterceptor> lbRestClientPostProcessor(
+				ObjectProvider<DeferringLoadBalancerInterceptor> loadBalancerInterceptorProvider,
+				ApplicationContext context) {
+			return new LoadBalancerRestClientBuilderBeanPostProcessor<>(loadBalancerInterceptorProvider, context);
 		}
 
 	}

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRestClientBuilderBeanPostProcessor.java

@@ -17,6 +17,7 @@
 package org.springframework.cloud.client.loadbalancer;
 
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -29,15 +30,21 @@
  * @author Olga Maciaszek-Sharma
  * @since 4.1.0
  */
-public class LoadBalancerRestClientBuilderBeanPostProcessor implements BeanPostProcessor {
+public class LoadBalancerRestClientBuilderBeanPostProcessor<T extends ClientHttpRequestInterceptor>
+		implements BeanPostProcessor {
 
-	private final ClientHttpRequestInterceptor loadBalancerInterceptor;
+	private final ObjectProvider<T> loadBalancerInterceptorProvider;
 
 	private final ApplicationContext context;
 
-	public LoadBalancerRestClientBuilderBeanPostProcessor(ClientHttpRequestInterceptor loadBalancerInterceptor,
+	public LoadBalancerRestClientBuilderBeanPostProcessor(T loadBalancerInterceptor, ApplicationContext context) {
+		this.loadBalancerInterceptorProvider = new SimpleObjectProvider<>(loadBalancerInterceptor);
+		this.context = context;
+	}
+
+	public LoadBalancerRestClientBuilderBeanPostProcessor(ObjectProvider<T> loadBalancerInterceptorProvider,
 			ApplicationContext context) {
-		this.loadBalancerInterceptor = loadBalancerInterceptor;
+		this.loadBalancerInterceptorProvider = loadBalancerInterceptorProvider;
 		this.context = context;
 	}
 
@@ -47,7 +54,11 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) thro
 			if (context.findAnnotationOnBean(beanName, LoadBalanced.class) == null) {
 				return bean;
 			}
-			((RestClient.Builder) bean).requestInterceptor(loadBalancerInterceptor);
+			ClientHttpRequestInterceptor interceptor = loadBalancerInterceptorProvider.getIfAvailable();
+			if (interceptor == null) {
+				throw new IllegalStateException(ClientHttpRequestInterceptor.class.getSimpleName() + " not available.");
+			}
+			((RestClient.Builder) bean).requestInterceptor(interceptor);
 		}
 		return bean;
 	}

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/DeferringLoadBalancerExchangeFilterFunction.java

@@ -55,7 +55,7 @@ void tryResolveDelegate() {
 		if (delegate == null) {
 			delegate = exchangeFilterFunctionProvider.getIfAvailable();
 			if (delegate == null) {
-				throw new IllegalStateException("LoadBalancerExchangeFilterFunction not available.");
+				throw new IllegalStateException("LoadBalancer ExchangeFilterFunction not available.");
 			}
 		}
 	}