SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Resolve bean post processor warnings (#1361)"

Browse Source 
This reverts commit 4e6540b2b0.

# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java
This commit is contained in:
Olga Maciaszek-Sharma
2024-07-31 14:24:16 +02:00
parent c1b08f8b9b
commit 246bc321c7
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,6 @@ import org.springframework.context.ApplicationContext;
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;
@@ -50,7 +49,6 @@ import org.springframework.web.client.RestTemplate;
* @author Will Tran
* @author Gang Li
* @author Olga Maciaszek-Sharma
* @author Henning Pöttker
*/
@AutoConfiguration
@Conditional(BlockingRestClassesPresentCondition.class)
@@ -88,7 +86,7 @@ public class LoadBalancerAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public static DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
public DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
ObjectProvider<BlockingLoadBalancerInterceptor> loadBalancerInterceptorObjectProvider) {
return new DeferringLoadBalancerInterceptor(loadBalancerInterceptorObjectProvider);
}
@@ -96,8 +94,8 @@ public class LoadBalancerAutoConfiguration {
@Bean
@ConditionalOnBean(DeferringLoadBalancerInterceptor.class)
@ConditionalOnMissingBean
static LoadBalancerRestClientBuilderBeanPostProcessor lbRestClientPostProcessor(
@Lazy DeferringLoadBalancerInterceptor loadBalancerInterceptor, ApplicationContext context) {
LoadBalancerRestClientBuilderBeanPostProcessor lbRestClientPostProcessor(
DeferringLoadBalancerInterceptor loadBalancerInterceptor, ApplicationContext context) {
return new LoadBalancerRestClientBuilderBeanPostProcessor(loadBalancerInterceptor, context);
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.springframework.context.ApplicationContext;
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.context.annotation.Primary;
import org.springframework.web.reactive.function.client.WebClient;
@@ -40,7 +39,6 @@ import org.springframework.web.reactive.function.client.WebClient;
* beans.
*
* @author Olga Maciaszek-Sharma
* @author Henning Pöttker
* @since 2.2.0
*/
@Configuration(proxyBeanMethods = false)
@@ -49,9 +47,8 @@ import org.springframework.web.reactive.function.client.WebClient;
public class LoadBalancerBeanPostProcessorAutoConfiguration {
@Bean
public static LoadBalancerWebClientBuilderBeanPostProcessor loadBalancerWebClientBuilderBeanPostProcessor(
@Lazy DeferringLoadBalancerExchangeFilterFunction deferringExchangeFilterFunction,
ApplicationContext context) {
public LoadBalancerWebClientBuilderBeanPostProcessor loadBalancerWebClientBuilderBeanPostProcessor(
DeferringLoadBalancerExchangeFilterFunction deferringExchangeFilterFunction, ApplicationContext context) {
return new LoadBalancerWebClientBuilderBeanPostProcessor(deferringExchangeFilterFunction, context);
}
@@ -61,7 +58,7 @@ public class LoadBalancerBeanPostProcessorAutoConfiguration {
@Bean
@Primary
static DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction> reactorDeferringLoadBalancerExchangeFilterFunction(
DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction> reactorDeferringLoadBalancerExchangeFilterFunction(
ObjectProvider<LoadBalancedExchangeFilterFunction> exchangeFilterFunctionProvider) {
return new DeferringLoadBalancerExchangeFilterFunction<>(exchangeFilterFunctionProvider);
}