Skip to content

Commit 9f08df1

Browse files
authored
fix (#1337)
1 parent 88916aa commit 9f08df1

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ public class LoadBalancerAutoConfiguration {
6969

7070
@Bean
7171
public SmartInitializingSingleton loadBalancedRestTemplateInitializerDeprecated(
72-
final ObjectProvider<List<RestTemplateCustomizer>> restTemplateCustomizers) {
72+
ObjectProvider<List<RestTemplateCustomizer>> restTemplateCustomizers) {
7373
return () -> restTemplateCustomizers.ifAvailable(customizers -> {
74-
for (RestTemplate restTemplate : LoadBalancerAutoConfiguration.this.restTemplates) {
74+
for (RestTemplate restTemplate : restTemplates) {
7575
for (RestTemplateCustomizer customizer : customizers) {
7676
customizer.customize(restTemplate);
7777
}
@@ -81,9 +81,9 @@ public SmartInitializingSingleton loadBalancedRestTemplateInitializerDeprecated(
8181

8282
@Bean
8383
public SmartInitializingSingleton loadBalancedRestClientBuilderInitializer(
84-
final ObjectProvider<List<RestClientBuilderCustomizer>> restClientBuilderCustomizers) {
84+
ObjectProvider<List<RestClientBuilderCustomizer>> restClientBuilderCustomizers) {
8585
return () -> restClientBuilderCustomizers.ifAvailable(customizers -> {
86-
for (RestClient.Builder restClientBuilder : LoadBalancerAutoConfiguration.this.restClientBuilders) {
86+
for (RestClient.Builder restClientBuilder : restClientBuilders) {
8787
for (RestClientBuilderCustomizer customizer : customizers) {
8888
customizer.customize(restClientBuilder);
8989
}
@@ -95,7 +95,7 @@ public SmartInitializingSingleton loadBalancedRestClientBuilderInitializer(
9595
@Bean
9696
@ConditionalOnMissingBean
9797
public LoadBalancerRequestFactory loadBalancerRequestFactory(LoadBalancerClient loadBalancerClient) {
98-
return new LoadBalancerRequestFactory(loadBalancerClient, this.transformers);
98+
return new LoadBalancerRequestFactory(loadBalancerClient, transformers);
9999
}
100100

101101
@Configuration(proxyBeanMethods = false)
@@ -110,7 +110,7 @@ public LoadBalancerInterceptor loadBalancerInterceptor(LoadBalancerClient loadBa
110110

111111
@Bean
112112
@ConditionalOnMissingBean
113-
public RestTemplateCustomizer restTemplateCustomizer(final LoadBalancerInterceptor loadBalancerInterceptor) {
113+
public RestTemplateCustomizer restTemplateCustomizer(LoadBalancerInterceptor loadBalancerInterceptor) {
114114
return restTemplate -> {
115115
List<ClientHttpRequestInterceptor> list = new ArrayList<>(restTemplate.getInterceptors());
116116
list.add(loadBalancerInterceptor);
@@ -121,7 +121,7 @@ public RestTemplateCustomizer restTemplateCustomizer(final LoadBalancerIntercept
121121
@Bean
122122
@ConditionalOnMissingBean
123123
public RestClientBuilderCustomizer restClientBuilderCustomizer(
124-
final LoadBalancerInterceptor loadBalancerInterceptor) {
124+
LoadBalancerInterceptor loadBalancerInterceptor) {
125125
return restClientBuilder -> restClientBuilder.requestInterceptor(loadBalancerInterceptor);
126126
}
127127

@@ -182,7 +182,7 @@ public RetryLoadBalancerInterceptor loadBalancerInterceptor(LoadBalancerClient l
182182
@Bean
183183
@ConditionalOnMissingBean
184184
public RestTemplateCustomizer restTemplateCustomizer(
185-
final RetryLoadBalancerInterceptor loadBalancerInterceptor) {
185+
RetryLoadBalancerInterceptor loadBalancerInterceptor) {
186186
return restTemplate -> {
187187
List<ClientHttpRequestInterceptor> list = new ArrayList<>(restTemplate.getInterceptors());
188188
list.add(loadBalancerInterceptor);
@@ -193,7 +193,7 @@ public RestTemplateCustomizer restTemplateCustomizer(
193193
@Bean
194194
@ConditionalOnMissingBean
195195
public RestClientBuilderCustomizer restClientBuilderCustomizer(
196-
final RetryLoadBalancerInterceptor loadBalancerInterceptor) {
196+
RetryLoadBalancerInterceptor loadBalancerInterceptor) {
197197
return restClientBuilder -> restClientBuilder.requestInterceptor(loadBalancerInterceptor);
198198
}
199199

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* @since 4.1.0
3131
* @deprecated to be removed in the next release.
3232
*/
33-
@Deprecated
33+
@Deprecated(forRemoval = true)
3434
public class LoadBalancerRestClientBuilderBeanPostProcessor implements BeanPostProcessor {
3535

3636
private final ClientHttpRequestInterceptor loadBalancerInterceptor;

0 commit comments

Comments
 (0)