From bd719c1330e2dde9e5465133520873345c1f437d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 1 Nov 2013 17:46:37 +0000 Subject: [PATCH] Nest the @EnableWebSecurity so it can be added to a condition --- .../boot/actuate/autoconfigure/SecurityAutoConfiguration.java | 4 ++-- .../autoconfigure/SpringApplicationHierarchyTests.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java index 55bf745ebd..e560cd971a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java @@ -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 { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java index d1b9bf20a5..14a5a327fd 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java @@ -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;