Browse Source

Ensure Unique Names

Issue: gh-4394
pull/4402/head
Rob Winch 9 years ago
parent
commit
9d19b7337e
  1. 5
      config/src/main/java/org/springframework/security/config/annotation/web/reactive/HttpSecurityConfiguration.java
  2. 7
      config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java

5
config/src/main/java/org/springframework/security/config/annotation/web/reactive/HttpSecurityConfiguration.java

@ -38,6 +38,9 @@ import static org.springframework.security.config.web.server.HttpSecurity.http; @@ -38,6 +38,9 @@ import static org.springframework.security.config.web.server.HttpSecurity.http;
* @since 5.0
*/
public class HttpSecurityConfiguration implements WebFluxConfigurer {
private static final String BEAN_NAME_PREFIX = "org.springframework.security.config.annotation.web.reactive.HttpSecurityConfiguration.";
private static final String HTTPSECURITY_BEAN_NAME = BEAN_NAME_PREFIX + "httpSecurity";
@Autowired(required = false)
private ReactiveAdapterRegistry adapterRegistry = new ReactiveAdapterRegistry();
@ -57,7 +60,7 @@ public class HttpSecurityConfiguration implements WebFluxConfigurer { @@ -57,7 +60,7 @@ public class HttpSecurityConfiguration implements WebFluxConfigurer {
return new AuthenticationPrincipalArgumentResolver(adapterRegistry);
}
@Bean
@Bean(HTTPSECURITY_BEAN_NAME)
@Scope("prototype")
public HttpSecurity httpSecurity() {
HttpSecurity http = http();

7
config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java

@ -36,6 +36,9 @@ import java.util.List; @@ -36,6 +36,9 @@ import java.util.List;
*/
@Configuration
public class WebFluxSecurityConfiguration {
private static final String BEAN_NAME_PREFIX = "org.springframework.security.config.annotation.web.reactive.WebFluxSecurityConfiguration.";
private static final String SPRING_SECURITY_WEBFILTERCHAINFILTER_BEAN_NAME = BEAN_NAME_PREFIX + "WebFilterChainFilter";
@Autowired(required = false)
private List<SecurityWebFilterChain> securityWebFilterChains;
@ -43,8 +46,8 @@ public class WebFluxSecurityConfiguration { @@ -43,8 +46,8 @@ public class WebFluxSecurityConfiguration {
@Autowired
ApplicationContext context;
@Bean
public WebFilterChainFilter springSecurityFilterChain() {
@Bean(SPRING_SECURITY_WEBFILTERCHAINFILTER_BEAN_NAME)
public WebFilterChainFilter springSecurityWebFilterChainFilter() {
return WebFilterChainFilter.fromSecurityWebFilterChainsList(getSecurityWebFilterChains());
}

Loading…
Cancel
Save