From 1314678890e313d5642fdc4a06ba304937f55934 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 23 Feb 2018 20:50:20 +0000 Subject: [PATCH] Nest @EnableWebFluxSecurity to avoid overzealous Wildfly warnings Closes gh-12174 --- .../security/reactive/WebFluxSecurityConfiguration.java | 8 +++++++- .../reactive/WebFluxSecurityConfigurationTests.java | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfiguration.java index 6739d0cea1..4b3304e568 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfiguration.java @@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.security.reactive; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.web.server.WebFilterChainProxy; @@ -33,7 +34,12 @@ import org.springframework.security.web.server.WebFilterChainProxy; @ConditionalOnClass({ EnableWebFluxSecurity.class, WebFilterChainProxy.class }) @ConditionalOnMissingBean(WebFilterChainProxy.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) -@EnableWebFluxSecurity class WebFluxSecurityConfiguration { + @Configuration + @EnableWebFluxSecurity + class EnableWebFluxSecurityConfiguration { + + } + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfigurationTests.java index 049f57c556..64e58e2a69 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfigurationTests.java @@ -39,8 +39,9 @@ public class WebFluxSecurityConfigurationTests { @Test public void backsOffWhenWebFilterChainProxyBeanPresent() { this.contextRunner - .withUserConfiguration(WebFilterChainProxyConfiguration.class, - WebFluxSecurityConfiguration.class) + .withConfiguration( + AutoConfigurations.of(ReactiveSecurityAutoConfiguration.class)) + .withUserConfiguration(WebFilterChainProxyConfiguration.class) .run((context) -> assertThat(context) .doesNotHaveBean(WebFluxSecurityConfiguration.class)); }