diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java index e27e0e0904..60ed903893 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java @@ -28,7 +28,7 @@ import org.springframework.security.web.method.annotation.CsrfTokenArgumentResol import org.springframework.security.web.servlet.support.csrf.CsrfRequestDataValueProcessor; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.support.RequestDataValueProcessor; /** @@ -41,7 +41,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor; * @author Rob Winch * @since 3.2 */ -class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter implements ApplicationContextAware { +class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContextAware { private BeanResolver beanResolver; @Override @@ -64,4 +64,4 @@ class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter implements App public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.beanResolver = new BeanFactoryResolver(applicationContext.getAutowireCapableBeanFactory()); } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java index 97a3f91441..0960dd57f9 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.security.web.method.annotation.AuthenticationPrincipa import org.springframework.security.web.servlet.support.csrf.CsrfRequestDataValueProcessor; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.support.RequestDataValueProcessor; /** @@ -38,7 +38,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor; * @since 3.2 */ @EnableWebSecurity -public class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter { +public class WebMvcSecurityConfiguration implements WebMvcConfigurer { @Override @SuppressWarnings("deprecation") @@ -52,4 +52,4 @@ public class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter { public RequestDataValueProcessor requestDataValueProcessor() { return new CsrfRequestDataValueProcessor(); } -} \ No newline at end of file +} diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java index 79e9678188..f4d7b55b3d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java @@ -38,7 +38,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * @@ -92,7 +92,7 @@ public class HttpSecurityHeadersTests { @EnableWebMvc @Configuration - static class WebMvcConfig extends WebMvcConfigurerAdapter { + static class WebMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/resources/**").addResourceLocations("classpath:/resources/").setCachePeriod(12345); diff --git a/docs/guides/src/docs/asciidoc/form-javaconfig.asc b/docs/guides/src/docs/asciidoc/form-javaconfig.asc index dfb78a47ea..cbaa43e719 100644 --- a/docs/guides/src/docs/asciidoc/form-javaconfig.asc +++ b/docs/guides/src/docs/asciidoc/form-javaconfig.asc @@ -143,7 +143,7 @@ Within Spring Web MVC, the first step is to ensure that we have a controller tha @EnableWebMvc @ComponentScan("org.springframework.security.samples.mvc") -public class WebMvcConfiguration extends WebMvcConfigurerAdapter { +public class WebMvcConfiguration implements WebMvcConfigurer { // ... diff --git a/docs/manual/src/docs/asciidoc/index.adoc b/docs/manual/src/docs/asciidoc/index.adoc index 7882b8332d..a21b1791d4 100644 --- a/docs/manual/src/docs/asciidoc/index.adoc +++ b/docs/manual/src/docs/asciidoc/index.adoc @@ -440,7 +440,7 @@ import org.springframework.security.config.annotation.authentication.builders.*; import org.springframework.security.config.annotation.web.configuration.*; @EnableWebSecurity -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { +public class WebSecurityConfig implements WebMvcConfigurer { @Bean public UserDetailsService userDetailsService() throws Exception { @@ -3927,7 +3927,7 @@ When using Spring Web MVC, this is typically done within your configuration. For [source,java] ---- @EnableWebMvc -public class WebMvcConfiguration extends WebMvcConfigurerAdapter { +public class WebMvcConfiguration implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { @@ -6868,7 +6868,7 @@ NOTE: As of Spring Security 4.0, `@EnableWebMvcSecurity` is deprecated. The repl To enable Spring Security integration with Spring MVC add the `@EnableWebSecurity` annotation to your configuration. -NOTE: Spring Security provides the configuration using Spring MVC's http://docs.spring.io/spring-framework/docs/4.1.x/spring-framework-reference/htmlsingle/#mvc-config-customize[WebMvcConfigurerAdapter]. This means that if you are using more advanced options, like integrating with `WebMvcConfigurationSupport` directly, then you will need to manually provide the Spring Security configuration. +NOTE: Spring Security provides the configuration using Spring MVC's https://docs.spring.io/spring/docs/5.0.0.RELEASE/spring-framework-reference/web.html#mvc-config-customize[WebMvcConfigurer]. This means that if you are using more advanced options, like integrating with `WebMvcConfigurationSupport` directly, then you will need to manually provide the Spring Security configuration. [[mvc-requestmatcher]] === MvcRequestMatcher diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java index 133d5bafc4..4fae80bd58 100644 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java +++ b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.thymeleaf.TemplateEngine; import org.thymeleaf.spring5.SpringTemplateEngine; import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; @@ -35,7 +35,7 @@ import org.thymeleaf.templatemode.TemplateMode; @EnableWebMvc @ComponentScan("org.springframework.security.samples.mvc") -public class WebMvcConfiguration extends WebMvcConfigurerAdapter { +public class WebMvcConfiguration implements WebMvcConfigurer { @Autowired private ApplicationContext applicationContext;