Commit 13146788 authored by Andy Wilkinson's avatar Andy Wilkinson

Nest @EnableWebFluxSecurity to avoid overzealous Wildfly warnings

Closes gh-12174
parent 800ddc54
......@@ -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 {
}
}
......@@ -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));
}
......
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