Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java

@@ -143,12 +143,11 @@ public class WebMvcMetricsAutoConfigurationTests {
 		this.contextRunner.withUserConfiguration(TestController.class)
 				.withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class,
 						WebMvcAutoConfiguration.class))
-				.run((context) -> {
+				.run((context) -> assertThat(
-					assertThat(context.getBean(RequestMappingHandlerMapping.class))
+						context.getBean(RequestMappingHandlerMapping.class))
-							.extracting("interceptors").element(0).asList()
+								.extracting("interceptors").element(0).asList()
-							.extracting((item) -> (Class) item.getClass())
+								.extracting((item) -> (Class) item.getClass())
-							.contains(LongTaskTimingHandlerInterceptor.class);
+								.contains(LongTaskTimingHandlerInterceptor.class));
-				});
 	}
 
 	private MeterRegistry getInitializedMeterRegistry(

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Boot specific {@link org.springframework.web.server.WebFilter} implementations.
+ */
+package org.springframework.boot.web.reactive.filter;

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java

@@ -432,9 +432,8 @@ public class TomcatServletWebServerFactoryTests
 				((StandardContext) context).setFailCtxIfServletStartFails(true);
 			}
 		});
-		this.webServer = factory.getWebServer((context) -> {
+		this.webServer = factory.getWebServer((context) -> context
-			context.addServlet("failing", FailingServlet.class).setLoadOnStartup(0);
+				.addServlet("failing", FailingServlet.class).setLoadOnStartup(0));
-		});
 		assertThatExceptionOfType(WebServerException.class)
 				.isThrownBy(this.webServer::start);
 	}
@@ -447,9 +446,8 @@ public class TomcatServletWebServerFactoryTests
 				((StandardContext) context).setFailCtxIfServletStartFails(false);
 			}
 		});
-		this.webServer = factory.getWebServer((context) -> {
+		this.webServer = factory.getWebServer((context) -> context
-			context.addServlet("failing", FailingServlet.class).setLoadOnStartup(0);
+				.addServlet("failing", FailingServlet.class).setLoadOnStartup(0));
-		});
 		this.webServer.start();
 	}