1
0
mirror of synced 2026-08-05 01:36:56 +00:00

Formatting

Issue gh-3881
This commit is contained in:
Rob Winch
2016-05-13 12:22:52 -05:00
committed by Joe Grandja
parent f363c62afd
commit 602bb457b8
5 changed files with 96 additions and 76 deletions
@@ -15,14 +15,14 @@
*/
package org.springframework.security.test.web.servlet.setup;
import javax.servlet.Filter;
import org.springframework.security.config.BeanIds;
import org.springframework.test.web.servlet.request.RequestPostProcessor;
import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
import org.springframework.test.web.servlet.setup.MockMvcConfigurerAdapter;
import org.springframework.web.context.WebApplicationContext;
import javax.servlet.Filter;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.testSecurityContext;
/**
@@ -54,18 +54,20 @@ final class SecurityMockMvcConfigurer extends MockMvcConfigurerAdapter {
public RequestPostProcessor beforeMockMvcCreated(
ConfigurableMockMvcBuilder<?> builder, WebApplicationContext context) {
String securityBeanId = BeanIds.SPRING_SECURITY_FILTER_CHAIN;
if (springSecurityFilterChain == null && context.containsBean(securityBeanId)) {
springSecurityFilterChain = context.getBean(securityBeanId, Filter.class);
if (this.springSecurityFilterChain == null
&& context.containsBean(securityBeanId)) {
this.springSecurityFilterChain = context.getBean(securityBeanId,
Filter.class);
}
if (springSecurityFilterChain == null) {
if (this.springSecurityFilterChain == null) {
throw new IllegalStateException(
"springSecurityFilterChain cannot be null. Ensure a Bean with the name "
+ securityBeanId
+ " implementing Filter is present or inject the Filter to be used.");
}
builder.addFilters(springSecurityFilterChain);
builder.addFilters(this.springSecurityFilterChain);
return testSecurityContext();
}
@@ -123,13 +123,14 @@ public abstract class WebTestUtils {
Filter springSecurityFilterChain = null;
try {
springSecurityFilterChain = webApplicationContext.getBean(
AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME, Filter.class);
AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME,
Filter.class);
}
catch (NoSuchBeanDefinitionException notFound) {
return null;
}
List<Filter> filters = (List<Filter>) ReflectionTestUtils.invokeMethod(
springSecurityFilterChain, "getFilters", request);
List<Filter> filters = (List<Filter>) ReflectionTestUtils
.invokeMethod(springSecurityFilterChain, "getFilters", request);
if (filters == null) {
return null;
}