From 8590950d70c4e607d89440382e453a16e37a27f3 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 8 Jun 2015 13:24:03 +0100 Subject: [PATCH] Discontinue use of deprecated @EnableWebMvcSecurity --- .../SpringBootWebSecurityConfiguration.java | 28 +------------------ 1 file changed, 1 insertion(+), 27 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 8d79ea8d8e4..b1cb5f62b71 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 @@ -29,7 +29,6 @@ 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.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties.Headers; @@ -49,7 +48,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; -import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint; import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; @@ -57,7 +55,6 @@ import org.springframework.security.web.header.writers.HstsHeaderWriter; import org.springframework.security.web.util.matcher.AnyRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.StringUtils; -import org.springframework.web.servlet.support.RequestDataValueProcessor; /** * {@link EnableAutoConfiguration Auto-configuration} for security of a web application or @@ -89,6 +86,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor; @ConditionalOnClass({ EnableWebSecurity.class, AuthenticationEntryPoint.class }) @ConditionalOnMissingBean(WebSecurityConfiguration.class) @ConditionalOnWebApplication +@EnableWebSecurity public class SpringBootWebSecurityConfiguration { private static List DEFAULT_IGNORED = Arrays.asList("/css/**", "/js/**", @@ -184,30 +182,6 @@ public class SpringBootWebSecurityConfiguration { } - // Pull in @EnableWebMvcSecurity if Spring MVC is available and no-one defined a - // RequestDataValueProcessor - @ConditionalOnClass(RequestDataValueProcessor.class) - @ConditionalOnMissingBean(RequestDataValueProcessor.class) - @Configuration - protected static class WebMvcSecurityConfigurationConditions { - - @Configuration - @EnableWebMvcSecurity - protected static class DefaultWebMvcSecurityConfiguration { - - } - - } - - // Pull in a plain @EnableWebSecurity if Spring MVC is not available - @ConditionalOnMissingBean(WebMvcSecurityConfigurationConditions.class) - @ConditionalOnMissingClass("org.springframework.web.servlet.support.RequestDataValueProcessor") - @Configuration - @EnableWebSecurity - protected static class DefaultWebSecurityConfiguration { - - } - @Configuration @ConditionalOnProperty(prefix = "security.basic", name = "enabled", havingValue = "false") @Order(SecurityProperties.BASIC_AUTH_ORDER)