Protects RestTemplate and RestClient related beans with ConditionalOnClass

Changes required for Boot 4.0 restructuring

Author: spencergibb

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

@@ -31,6 +31,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.restclient.RestTemplateBuilder;
 import org.springframework.boot.restclient.autoconfigure.service.HttpClientServiceProperties;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.reactive.ReactiveLoadBalancer;
@@ -102,6 +103,19 @@ static LoadBalancerRestClientBuilderBeanPostProcessor<DeferringLoadBalancerInter
 			return new LoadBalancerRestClientBuilderBeanPostProcessor<>(loadBalancerInterceptorProvider, context);
 		}
 
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(RestTemplateBuilder.class)
+	static class DeferringLoadBalancerInterceptorRestTemplateBuilderConfig {
+
+		@Bean
+		@ConditionalOnMissingBean
+		public static DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
+				ObjectProvider<BlockingLoadBalancerInterceptor> loadBalancerInterceptorObjectProvider) {
+			return new DeferringLoadBalancerInterceptor(loadBalancerInterceptorObjectProvider);
+		}
+
 		@Bean
 		@ConditionalOnBean(DeferringLoadBalancerInterceptor.class)
 		@ConditionalOnMissingBean(LoadBalancerRestTemplateBuilderBeanPostProcessor.class)
@@ -111,6 +125,19 @@ static LoadBalancerRestTemplateBuilderBeanPostProcessor<DeferringLoadBalancerInt
 			return new LoadBalancerRestTemplateBuilderBeanPostProcessor<>(loadBalancerInterceptorProvider, context);
 		}
 
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(HttpClientServiceProperties.class)
+	static class DeferringLoadBalancerInterceptorHttpClientConfig {
+
+		@Bean
+		@ConditionalOnMissingBean
+		public static DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
+				ObjectProvider<BlockingLoadBalancerInterceptor> loadBalancerInterceptorObjectProvider) {
+			return new DeferringLoadBalancerInterceptor(loadBalancerInterceptorObjectProvider);
+		}
+
 		@Bean
 		@ConditionalOnBean({ HttpClientServiceProperties.class, ReactiveLoadBalancer.Factory.class })
 		@ConditionalOnMissingBean(LoadBalancerRestClientHttpServiceGroupConfigurer.class)

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

@@ -68,6 +68,13 @@ static DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFun
 			return new DeferringLoadBalancerExchangeFilterFunction<>(exchangeFilterFunctionProvider);
 		}
 
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(ReactiveHttpClientServiceProperties.class)
+	@ConditionalOnBean(ReactiveLoadBalancer.Factory.class)
+	protected static class ReactorDeferringLoadBalancerFilterHttpClientConfig {
+
 		@Bean
 		@ConditionalOnBean({ ReactiveHttpClientServiceProperties.class, ReactiveLoadBalancer.Factory.class })
 		@ConditionalOnMissingBean(LoadBalancerWebClientHttpServiceGroupConfigurer.class)