Merge branch '2.0.x'

Author: wilkinsona

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

@@ -30,10 +30,10 @@
 
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.boot.web.servlet.AbstractFilterRegistrationBean;
 import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.RegistrationBean;
-import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.boot.web.servlet.ServletContextInitializerBeans;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -108,25 +108,11 @@ private LinesWriter getLinesWriter() {
 	}
 
 	private void addFilters(ConfigurableMockMvcBuilder<?> builder) {
-		FilterRegistrationBeans initializers = new FilterRegistrationBeans(this.context);
-		for (ServletContextInitializer initializer : initializers) {
-			if (initializer instanceof FilterRegistrationBean) {
-				addFilter(builder, (FilterRegistrationBean<?>) initializer);
-			}
-			if (initializer instanceof DelegatingFilterProxyRegistrationBean) {
-				addFilter(builder, (DelegatingFilterProxyRegistrationBean) initializer);
-			}
-		}
-	}
-
-	private void addFilter(ConfigurableMockMvcBuilder<?> builder,
-			FilterRegistrationBean<?> registration) {
-		addFilter(builder, registration.getFilter(), registration.getUrlPatterns());
-	}
-
-	private void addFilter(ConfigurableMockMvcBuilder<?> builder,
-			DelegatingFilterProxyRegistrationBean registration) {
-		addFilter(builder, registration.getFilter(), registration.getUrlPatterns());
+		FilterRegistrationBeans registrations = new FilterRegistrationBeans(this.context);
+		registrations.stream().map(AbstractFilterRegistrationBean.class::cast)
+				.filter(AbstractFilterRegistrationBean::isEnabled)
+				.forEach((registration) -> addFilter(builder, registration.getFilter(),
+						registration.getUrlPatterns()));
 	}
 
 	private void addFilter(ConfigurableMockMvcBuilder<?> builder, Filter filter,

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestServletFilterRegistrationDisabledIntegrationTests.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2012-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.test.autoconfigure.web.servlet.mockmvc;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+
+/**
+ * Tests for {@link WebMvcTest} with a disabled filter registration.
+ *
+ * @author Andy Wilkinson
+ */
+@RunWith(SpringRunner.class)
+@WebMvcTest
+public class WebMvcTestServletFilterRegistrationDisabledIntegrationTests {
+
+	@Autowired
+	private MockMvc mvc;
+
+	@Test
+	public void shouldApplyFilter() throws Exception {
+		this.mvc.perform(get("/one")).andExpect(header().string("x-test", (String) null));
+	}
+
+	@TestConfiguration
+	static class DisabledRegistrationConfiguration {
+
+		@Bean
+		public FilterRegistrationBean<ExampleFilter> exampleFilterRegistration(
+				ExampleFilter filter) {
+			FilterRegistrationBean<ExampleFilter> registration = new FilterRegistrationBean<>(
+					filter);
+			registration.setEnabled(false);
+			return registration;
+		}
+
+	}
+
+}