Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nest the @EnableWebSecurity so it can be added to a condition

Browse Source
This commit is contained in:
Dave Syer
2013-11-01 17:46:37 +00:00
parent 761c2dabd1
commit bd719c1330
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
View File

@@ -96,8 +96,7 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
*/
@Configuration
@ConditionalOnClass({ EnableWebSecurity.class })
// @ConditionalOnMissingBean(SecurityAutoConfiguration.class)
@EnableWebSecurity
@ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
@EnableConfigurationProperties
public class SecurityAutoConfiguration {
@@ -137,6 +136,7 @@ public class SecurityAutoConfiguration {
// Get the ignored paths in early
@Order(Ordered.HIGHEST_PRECEDENCE)
@EnableWebSecurity
private static class IgnoredPathsWebSecurityConfigurerAdapter implements
SecurityConfigurer<Filter, WebSecurity> {

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java
View File

@@ -17,7 +17,6 @@
package org.springframework.boot.actuate.autoconfigure;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
@@ -28,7 +27,6 @@ import org.springframework.context.ConfigurableApplicationContext;
* @author Dave Syer
*
*/
@Ignore("Unignore me when security configuration can be made conditional")
public class SpringApplicationHierarchyTests {
private ConfigurableApplicationContext context;