Skip to content

Commit 246bc32

Browse files
committed
Revert "Resolve bean post processor warnings (#1361)"
This reverts commit 4e6540b. # Conflicts: # spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java
1 parent c1b08f8 commit 246bc32

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
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;
4140
import org.springframework.http.client.ClientHttpRequestInterceptor;
4241
import org.springframework.retry.support.RetryTemplate;
4342
import org.springframework.web.client.RestTemplate;
@@ -50,7 +49,6 @@
5049
* @author Will Tran
5150
* @author Gang Li
5251
* @author Olga Maciaszek-Sharma
53-
* @author Henning Pöttker
5452
*/
5553
@AutoConfiguration
5654
@Conditional(BlockingRestClassesPresentCondition.class)
@@ -88,16 +86,16 @@ static class DeferringLoadBalancerInterceptorConfig {
8886

8987
@Bean
9088
@ConditionalOnMissingBean
91-
public static DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
89+
public DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
9290
ObjectProvider<BlockingLoadBalancerInterceptor> loadBalancerInterceptorObjectProvider) {
9391
return new DeferringLoadBalancerInterceptor(loadBalancerInterceptorObjectProvider);
9492
}
9593

9694
@Bean
9795
@ConditionalOnBean(DeferringLoadBalancerInterceptor.class)
9896
@ConditionalOnMissingBean
99-
static LoadBalancerRestClientBuilderBeanPostProcessor lbRestClientPostProcessor(
100-
@Lazy DeferringLoadBalancerInterceptor loadBalancerInterceptor, ApplicationContext context) {
97+
LoadBalancerRestClientBuilderBeanPostProcessor lbRestClientPostProcessor(
98+
DeferringLoadBalancerInterceptor loadBalancerInterceptor, ApplicationContext context) {
10199
return new LoadBalancerRestClientBuilderBeanPostProcessor(loadBalancerInterceptor, context);
102100
}
103101

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2020 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,7 +27,6 @@
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;
3130
import org.springframework.context.annotation.Primary;
3231
import org.springframework.web.reactive.function.client.WebClient;
3332

@@ -40,7 +39,6 @@
4039
* beans.
4140
*
4241
* @author Olga Maciaszek-Sharma
43-
* @author Henning Pöttker
4442
* @since 2.2.0
4543
*/
4644
@Configuration(proxyBeanMethods = false)
@@ -49,9 +47,8 @@
4947
public class LoadBalancerBeanPostProcessorAutoConfiguration {
5048

5149
@Bean
52-
public static LoadBalancerWebClientBuilderBeanPostProcessor loadBalancerWebClientBuilderBeanPostProcessor(
53-
@Lazy DeferringLoadBalancerExchangeFilterFunction deferringExchangeFilterFunction,
54-
ApplicationContext context) {
50+
public LoadBalancerWebClientBuilderBeanPostProcessor loadBalancerWebClientBuilderBeanPostProcessor(
51+
DeferringLoadBalancerExchangeFilterFunction deferringExchangeFilterFunction, ApplicationContext context) {
5552
return new LoadBalancerWebClientBuilderBeanPostProcessor(deferringExchangeFilterFunction, context);
5653
}
5754

@@ -61,7 +58,7 @@ protected static class ReactorDeferringLoadBalancerFilterConfig {
6158

6259
@Bean
6360
@Primary
64-
static DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction> reactorDeferringLoadBalancerExchangeFilterFunction(
61+
DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction> reactorDeferringLoadBalancerExchangeFilterFunction(
6562
ObjectProvider<LoadBalancedExchangeFilterFunction> exchangeFilterFunctionProvider) {
6663
return new DeferringLoadBalancerExchangeFilterFunction<>(exchangeFilterFunctionProvider);
6764
}

0 commit comments

Comments
 (0)