Commit c86b8444 authored by Andy Wilkinson's avatar Andy Wilkinson

Remove @Component from ResourceServerFilterChainOrderProcessor

Closes gh-8050
parent a15cb262
...@@ -47,7 +47,6 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.R ...@@ -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.ResourceServerConfigurer;
import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer; import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
import org.springframework.stereotype.Component;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
...@@ -79,6 +78,12 @@ public class OAuth2ResourceServerConfiguration { ...@@ -79,6 +78,12 @@ public class OAuth2ResourceServerConfiguration {
return new ResourceSecurityConfigurer(this.resource); return new ResourceSecurityConfigurer(this.resource);
} }
@Bean
public static ResourceServerFilterChainOrderProcessor resourceServerFilterChainOrderProcessor(
ResourceServerProperties properties) {
return new ResourceServerFilterChainOrderProcessor(properties);
}
protected static class ResourceSecurityConfigurer protected static class ResourceSecurityConfigurer
extends ResourceServerConfigurerAdapter { extends ResourceServerConfigurerAdapter {
...@@ -101,15 +106,14 @@ public class OAuth2ResourceServerConfiguration { ...@@ -101,15 +106,14 @@ public class OAuth2ResourceServerConfiguration {
} }
@Component private static class ResourceServerFilterChainOrderProcessor
public static class ResourceServerFilterChainOrderProcessor
implements BeanPostProcessor { implements BeanPostProcessor {
private final ResourceServerProperties resource; private final ResourceServerProperties properties;
public ResourceServerFilterChainOrderProcessor( private ResourceServerFilterChainOrderProcessor(
ResourceServerProperties resource) { ResourceServerProperties properties) {
this.resource = resource; this.properties = properties;
} }
@Override @Override
...@@ -123,7 +127,7 @@ public class OAuth2ResourceServerConfiguration { ...@@ -123,7 +127,7 @@ public class OAuth2ResourceServerConfiguration {
throws BeansException { throws BeansException {
if (bean instanceof ResourceServerConfiguration) { if (bean instanceof ResourceServerConfiguration) {
ResourceServerConfiguration config = (ResourceServerConfiguration) bean; ResourceServerConfiguration config = (ResourceServerConfiguration) bean;
config.setOrder(this.resource.getFilterOrder()); config.setOrder(this.properties.getFilterOrder());
} }
return bean; return bean;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment