From 9eb71c157a17e00686c38ed8541c9c5156878e38 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 30 Jan 2014 09:00:40 +0000 Subject: [PATCH] Remove unnecessary @Conditional --- .../security/SpringBootWebSecurityConfiguration.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java index 591b72f160..cd49f36c37 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java @@ -24,7 +24,6 @@ import javax.servlet.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -100,8 +99,6 @@ public class SpringBootWebSecurityConfiguration { @Bean @ConditionalOnMissingBean({ IgnoredPathsWebSecurityConfigurerAdapter.class }) - // @ConditionalOnBean(annotation = EnableWebSecurity.class) - @ConditionalOnBean(SpringBootWebSecurityConfiguration.class) public SecurityConfigurer ignoredPathsWebSecurityConfigurerAdapter() { return new IgnoredPathsWebSecurityConfigurerAdapter(); }