Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WebMvcConfigurerAdapter->WebMvcConfigurer 

Fixes gh-4612
This commit is contained in:
Rob Winch 2017-10-30 01:29:51 -05:00
parent ec723952d5
commit 5280ac40e9
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java
View File

@ -28,7 +28,7 @@ import org.springframework.security.web.method.annotation.CsrfTokenArgumentResol
import org.springframework.security.web.servlet.support.csrf.CsrfRequestDataValueProcessor; import org.springframework.security.web.servlet.support.csrf.CsrfRequestDataValueProcessor;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; 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; import org.springframework.web.servlet.support.RequestDataValueProcessor;
/** /**
@ -41,7 +41,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
* @author Rob Winch * @author Rob Winch
* @since 3.2 * @since 3.2
*/ */
class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter implements ApplicationContextAware { class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContextAware {
private BeanResolver beanResolver; private BeanResolver beanResolver;
@Override @Override
@ -64,4 +64,4 @@ class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter implements App
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.beanResolver = new BeanFactoryResolver(applicationContext.getAutowireCapableBeanFactory()); this.beanResolver = new BeanFactoryResolver(applicationContext.getAutowireCapableBeanFactory());
} }
} }

6
config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java
View File

@ -23,7 +23,7 @@ import org.springframework.security.web.method.annotation.AuthenticationPrincipa
import org.springframework.security.web.servlet.support.csrf.CsrfRequestDataValueProcessor; import org.springframework.security.web.servlet.support.csrf.CsrfRequestDataValueProcessor;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; 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; import org.springframework.web.servlet.support.RequestDataValueProcessor;
/** /**
@ -38,7 +38,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
* @since 3.2 * @since 3.2
*/ */
@EnableWebSecurity @EnableWebSecurity
public class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter { public class WebMvcSecurityConfiguration implements WebMvcConfigurer {
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@ -52,4 +52,4 @@ public class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter {
public RequestDataValueProcessor requestDataValueProcessor() { public RequestDataValueProcessor requestDataValueProcessor() {
return new CsrfRequestDataValueProcessor(); return new CsrfRequestDataValueProcessor();
} }
} }

4
config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java
View File

@ -38,7 +38,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; 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 @EnableWebMvc
@Configuration @Configuration
static class WebMvcConfig extends WebMvcConfigurerAdapter { static class WebMvcConfig implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/resources/**").addResourceLocations("classpath:/resources/").setCachePeriod(12345); registry.addResourceHandler("/resources/**").addResourceLocations("classpath:/resources/").setCachePeriod(12345);

2
docs/guides/src/docs/asciidoc/form-javaconfig.asc
View File

@ -143,7 +143,7 @@ Within Spring Web MVC, the first step is to ensure that we have a controller tha
@EnableWebMvc @EnableWebMvc
@ComponentScan("org.springframework.security.samples.mvc") @ComponentScan("org.springframework.security.samples.mvc")
public class WebMvcConfiguration extends WebMvcConfigurerAdapter { public class WebMvcConfiguration implements WebMvcConfigurer {
// ... // ...

6
docs/manual/src/docs/asciidoc/index.adoc
View File

@ -440,7 +440,7 @@ import org.springframework.security.config.annotation.authentication.builders.*;
import org.springframework.security.config.annotation.web.configuration.*; import org.springframework.security.config.annotation.web.configuration.*;
@EnableWebSecurity @EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter { public class WebSecurityConfig implements WebMvcConfigurer {
@Bean @Bean
public UserDetailsService userDetailsService() throws Exception { public UserDetailsService userDetailsService() throws Exception {
@ -3927,7 +3927,7 @@ When using Spring Web MVC, this is typically done within your configuration. For
[source,java] [source,java]
---- ----
@EnableWebMvc @EnableWebMvc
public class WebMvcConfiguration extends WebMvcConfigurerAdapter { public class WebMvcConfiguration implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { 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. 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]] [[mvc-requestmatcher]]
=== MvcRequestMatcher === MvcRequestMatcher

4
samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java
View File

@ -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.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; 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.TemplateEngine;
import org.thymeleaf.spring5.SpringTemplateEngine; import org.thymeleaf.spring5.SpringTemplateEngine;
import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
@ -35,7 +35,7 @@ import org.thymeleaf.templatemode.TemplateMode;
@EnableWebMvc @EnableWebMvc
@ComponentScan("org.springframework.security.samples.mvc") @ComponentScan("org.springframework.security.samples.mvc")
public class WebMvcConfiguration extends WebMvcConfigurerAdapter { public class WebMvcConfiguration implements WebMvcConfigurer {
@Autowired @Autowired
private ApplicationContext applicationContext; private ApplicationContext applicationContext;