From 458ba95507a0717f20037163d3c651c8403f8fdd Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 9 Mar 2021 14:44:38 -0500 Subject: [PATCH] Fixes spring.cloud.oauth2.load-balanced.enabled condition. Fixes gh-921 --- .../OAuth2LoadBalancerClientAutoConfiguration.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfiguration.java index 7b9972b3..764067a8 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.security.oauth2.client.OAuth2RestTemplate; */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass(OAuth2RestTemplate.class) -@ConditionalOnProperty("spring.cloud.oauth2.load-balanced.enabled=true") +@ConditionalOnProperty("spring.cloud.oauth2.load-balanced.enabled") @AutoConfigureAfter(OAuth2AutoConfiguration.class) public class OAuth2LoadBalancerClientAutoConfiguration { @@ -49,13 +49,10 @@ public class OAuth2LoadBalancerClientAutoConfiguration { @Bean public UserInfoRestTemplateCustomizer loadBalancedUserInfoRestTemplateCustomizer( final LoadBalancerInterceptor loadBalancerInterceptor) { - return new UserInfoRestTemplateCustomizer() { - @Override - public void customize(OAuth2RestTemplate restTemplate) { - List interceptors = new ArrayList<>(restTemplate.getInterceptors()); - interceptors.add(loadBalancerInterceptor); - restTemplate.setInterceptors(interceptors); - } + return restTemplate -> { + List interceptors = new ArrayList<>(restTemplate.getInterceptors()); + interceptors.add(loadBalancerInterceptor); + restTemplate.setInterceptors(interceptors); }; }