From 246bc321c748c76b8f222f7201cc5e5dae487237 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 31 Jul 2024 14:24:16 +0200 Subject: [PATCH] Revert "Resolve bean post processor warnings (#1361)" This reverts commit 4e6540b2b045a8abddc876265cf0373e1bee32bd. # Conflicts: # spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java --- .../loadbalancer/LoadBalancerAutoConfiguration.java | 8 +++----- ...oadBalancerBeanPostProcessorAutoConfiguration.java | 11 ++++------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java index 2a1101a6..a2cb39ce 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java @@ -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 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); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java index 3f61c373..8e61f33c 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java @@ -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 reactorDeferringLoadBalancerExchangeFilterFunction( + DeferringLoadBalancerExchangeFilterFunction reactorDeferringLoadBalancerExchangeFilterFunction( ObjectProvider exchangeFilterFunctionProvider) { return new DeferringLoadBalancerExchangeFilterFunction<>(exchangeFilterFunctionProvider); }