Skip to content

Commit 4e6540b

Browse files
authored
Resolve bean post processor warnings (#1361)
1 parent e7f6514 commit 4e6540b

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.springframework.context.annotation.Bean;
3838
import org.springframework.context.annotation.Conditional;
3939
import org.springframework.context.annotation.Configuration;
40+
import org.springframework.context.annotation.Lazy;
4041
import org.springframework.http.client.ClientHttpRequestInterceptor;
4142
import org.springframework.retry.support.RetryTemplate;
4243
import org.springframework.web.client.RestTemplate;
@@ -49,6 +50,7 @@
4950
* @author Will Tran
5051
* @author Gang Li
5152
* @author Olga Maciaszek-Sharma
53+
* @author Henning Pöttker
5254
*/
5355
@AutoConfiguration
5456
@Conditional(BlockingRestClassesPresentCondition.class)
@@ -86,16 +88,16 @@ static class DeferringLoadBalancerInterceptorConfig {
8688

8789
@Bean
8890
@ConditionalOnMissingBean
89-
public DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
91+
public static DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
9092
ObjectProvider<BlockingLoadBalancerInterceptor> loadBalancerInterceptorObjectProvider) {
9193
return new DeferringLoadBalancerInterceptor(loadBalancerInterceptorObjectProvider);
9294
}
9395

9496
@Bean
9597
@ConditionalOnBean(DeferringLoadBalancerInterceptor.class)
9698
@ConditionalOnMissingBean
97-
LoadBalancerRestClientBuilderBeanPostProcessor lbRestClientPostProcessor(
98-
DeferringLoadBalancerInterceptor loadBalancerInterceptor, ApplicationContext context) {
99+
static LoadBalancerRestClientBuilderBeanPostProcessor lbRestClientPostProcessor(
100+
@Lazy DeferringLoadBalancerInterceptor loadBalancerInterceptor, ApplicationContext context) {
99101
return new LoadBalancerRestClientBuilderBeanPostProcessor(loadBalancerInterceptor, context);
100102
}
101103

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Conditional;
2929
import org.springframework.context.annotation.Configuration;
30+
import org.springframework.context.annotation.Lazy;
3031
import org.springframework.context.annotation.Primary;
3132
import org.springframework.web.reactive.function.client.WebClient;
3233

@@ -39,6 +40,7 @@
3940
* beans.
4041
*
4142
* @author Olga Maciaszek-Sharma
43+
* @author Henning Pöttker
4244
* @since 2.2.0
4345
*/
4446
@Configuration(proxyBeanMethods = false)
@@ -47,8 +49,8 @@
4749
public class LoadBalancerBeanPostProcessorAutoConfiguration {
4850

4951
@Bean
50-
public LoadBalancerWebClientBuilderBeanPostProcessor loadBalancerWebClientBuilderBeanPostProcessor(
51-
DeferringLoadBalancerExchangeFilterFunction deferringExchangeFilterFunction, ApplicationContext context) {
52+
public static LoadBalancerWebClientBuilderBeanPostProcessor loadBalancerWebClientBuilderBeanPostProcessor(
53+
@Lazy DeferringLoadBalancerExchangeFilterFunction deferringExchangeFilterFunction, ApplicationContext context) {
5254
return new LoadBalancerWebClientBuilderBeanPostProcessor(deferringExchangeFilterFunction, context);
5355
}
5456

@@ -58,7 +60,7 @@ protected static class ReactorDeferringLoadBalancerFilterConfig {
5860

5961
@Bean
6062
@Primary
61-
DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction> reactorDeferringLoadBalancerExchangeFilterFunction(
63+
static DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction> reactorDeferringLoadBalancerExchangeFilterFunction(
6264
ObjectProvider<LoadBalancedExchangeFilterFunction> exchangeFilterFunctionProvider) {
6365
return new DeferringLoadBalancerExchangeFilterFunction<>(exchangeFilterFunctionProvider);
6466
}

0 commit comments

Comments
 (0)