root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-08-03 13:47:43 +02:00
parent e53ec5c645 0f095abded
commit 8fdc9b6403
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfiguration.java
View File

@ -31,6 +31,7 @@ import org.springframework.security.web.server.WebFilterChainProxy;
*
* @author Madhura Bhave
*/
@Configuration
@ConditionalOnClass({ EnableWebFluxSecurity.class, WebFilterChainProxy.class })
@ConditionalOnMissingBean(WebFilterChainProxy.class)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
@ -38,7 +39,7 @@ class WebFluxSecurityConfiguration {
@Configuration
@EnableWebFluxSecurity
class EnableWebFluxSecurityConfiguration {
static class EnableWebFluxSecurityConfiguration {
}