Skip to content

Commit 89f5cfc

Browse files
committed
Merge branch '1.5.x' into 2.0.x
2 parents d5b81f9 + da1a17e commit 89f5cfc

File tree

2 files changed

+70
-21
lines changed

2 files changed

+70
-21
lines changed

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
import org.apache.commons.logging.LogFactory;
3030

3131
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
32-
import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean;
33-
import org.springframework.boot.web.servlet.FilterRegistrationBean;
34-
import org.springframework.boot.web.servlet.ServletContextInitializer;
32+
import org.springframework.boot.web.servlet.AbstractFilterRegistrationBean;
3533
import org.springframework.boot.web.servlet.ServletContextInitializerBeans;
3634
import org.springframework.context.ApplicationContext;
3735
import org.springframework.context.ConfigurableApplicationContext;
@@ -108,24 +106,11 @@ private LinesWriter getLinesWriter() {
108106
private void addFilters(ConfigurableMockMvcBuilder<?> builder) {
109107
ServletContextInitializerBeans initializers = new ServletContextInitializerBeans(
110108
this.context);
111-
for (ServletContextInitializer initializer : initializers) {
112-
if (initializer instanceof FilterRegistrationBean) {
113-
addFilter(builder, (FilterRegistrationBean<?>) initializer);
114-
}
115-
if (initializer instanceof DelegatingFilterProxyRegistrationBean) {
116-
addFilter(builder, (DelegatingFilterProxyRegistrationBean) initializer);
117-
}
118-
}
119-
}
120-
121-
private void addFilter(ConfigurableMockMvcBuilder<?> builder,
122-
FilterRegistrationBean<?> registration) {
123-
addFilter(builder, registration.getFilter(), registration.getUrlPatterns());
124-
}
125-
126-
private void addFilter(ConfigurableMockMvcBuilder<?> builder,
127-
DelegatingFilterProxyRegistrationBean registration) {
128-
addFilter(builder, registration.getFilter(), registration.getUrlPatterns());
109+
initializers.stream().filter(AbstractFilterRegistrationBean.class::isInstance)
110+
.map(AbstractFilterRegistrationBean.class::cast)
111+
.filter(AbstractFilterRegistrationBean::isEnabled)
112+
.forEach((registration) -> addFilter(builder, registration.getFilter(),
113+
registration.getUrlPatterns()));
129114
}
130115

131116
private void addFilter(ConfigurableMockMvcBuilder<?> builder, Filter filter,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* Copyright 2012-2018 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.test.autoconfigure.web.servlet.mockmvc;
18+
19+
import org.junit.Test;
20+
import org.junit.runner.RunWith;
21+
22+
import org.springframework.beans.factory.annotation.Autowired;
23+
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
24+
import org.springframework.boot.test.context.TestConfiguration;
25+
import org.springframework.boot.web.servlet.FilterRegistrationBean;
26+
import org.springframework.context.annotation.Bean;
27+
import org.springframework.test.context.junit4.SpringRunner;
28+
import org.springframework.test.web.servlet.MockMvc;
29+
30+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
31+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
32+
33+
/**
34+
* Tests for {@link WebMvcTest} with a disabled filter registration.
35+
*
36+
* @author Andy Wilkinson
37+
*/
38+
@RunWith(SpringRunner.class)
39+
@WebMvcTest
40+
public class WebMvcTestServletFilterRegistrationDisabledIntegrationTests {
41+
42+
@Autowired
43+
private MockMvc mvc;
44+
45+
@Test
46+
public void shouldApplyFilter() throws Exception {
47+
this.mvc.perform(get("/one")).andExpect(header().string("x-test", (String) null));
48+
}
49+
50+
@TestConfiguration
51+
static class DisabledRegistrationConfiguration {
52+
53+
@Bean
54+
public FilterRegistrationBean<ExampleFilter> exampleFilterRegistration(
55+
ExampleFilter filter) {
56+
FilterRegistrationBean<ExampleFilter> registration = new FilterRegistrationBean<>(
57+
filter);
58+
registration.setEnabled(false);
59+
return registration;
60+
}
61+
62+
}
63+
64+
}

0 commit comments

Comments
 (0)