Skip to content

Commit 1314678

Browse files
committed
Nest @EnableWebFluxSecurity to avoid overzealous Wildfly warnings
Closes gh-12174
1 parent 800ddc5 commit 1314678

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2020
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
22+
import org.springframework.context.annotation.Configuration;
2223
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
2324
import org.springframework.security.web.server.WebFilterChainProxy;
2425

@@ -33,7 +34,12 @@
3334
@ConditionalOnClass({ EnableWebFluxSecurity.class, WebFilterChainProxy.class })
3435
@ConditionalOnMissingBean(WebFilterChainProxy.class)
3536
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
36-
@EnableWebFluxSecurity
3737
class WebFluxSecurityConfiguration {
3838

39+
@Configuration
40+
@EnableWebFluxSecurity
41+
class EnableWebFluxSecurityConfiguration {
42+
43+
}
44+
3945
}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/WebFluxSecurityConfigurationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ public class WebFluxSecurityConfigurationTests {
3939
@Test
4040
public void backsOffWhenWebFilterChainProxyBeanPresent() {
4141
this.contextRunner
42-
.withUserConfiguration(WebFilterChainProxyConfiguration.class,
43-
WebFluxSecurityConfiguration.class)
42+
.withConfiguration(
43+
AutoConfigurations.of(ReactiveSecurityAutoConfiguration.class))
44+
.withUserConfiguration(WebFilterChainProxyConfiguration.class)
4445
.run((context) -> assertThat(context)
4546
.doesNotHaveBean(WebFluxSecurityConfiguration.class));
4647
}

0 commit comments

Comments
 (0)