From c86b844477af6697a65f774cc92c1f6fb48f617c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sun, 22 Jan 2017 15:56:00 +0000 Subject: [PATCH] Remove @Component from ResourceServerFilterChainOrderProcessor Closes gh-8050 --- .../OAuth2ResourceServerConfiguration.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java index 554ca1878b6..8e8414ee0e6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java @@ -47,7 +47,6 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.R import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurer; import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer; -import org.springframework.stereotype.Component; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; @@ -79,6 +78,12 @@ public class OAuth2ResourceServerConfiguration { return new ResourceSecurityConfigurer(this.resource); } + @Bean + public static ResourceServerFilterChainOrderProcessor resourceServerFilterChainOrderProcessor( + ResourceServerProperties properties) { + return new ResourceServerFilterChainOrderProcessor(properties); + } + protected static class ResourceSecurityConfigurer extends ResourceServerConfigurerAdapter { @@ -101,15 +106,14 @@ public class OAuth2ResourceServerConfiguration { } - @Component - public static class ResourceServerFilterChainOrderProcessor + private static class ResourceServerFilterChainOrderProcessor implements BeanPostProcessor { - private final ResourceServerProperties resource; + private final ResourceServerProperties properties; - public ResourceServerFilterChainOrderProcessor( - ResourceServerProperties resource) { - this.resource = resource; + private ResourceServerFilterChainOrderProcessor( + ResourceServerProperties properties) { + this.properties = properties; } @Override @@ -123,7 +127,7 @@ public class OAuth2ResourceServerConfiguration { throws BeansException { if (bean instanceof ResourceServerConfiguration) { ResourceServerConfiguration config = (ResourceServerConfiguration) bean; - config.setOrder(this.resource.getFilterOrder()); + config.setOrder(this.properties.getFilterOrder()); } return bean; }