From 2b22b23aad783e340938769b2d49544d148a7940 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 27 Nov 2018 20:35:30 +0000 Subject: [PATCH] Polish --- .../WebMvcMetricsAutoConfigurationTests.java | 11 +++++----- .../web/reactive/filter/package-info.java | 20 +++++++++++++++++++ .../TomcatServletWebServerFactoryTests.java | 5 ++--- 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/package-info.java diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java index fd5d11d9e03..ee4d32ad457 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java @@ -150,12 +150,11 @@ public class WebMvcMetricsAutoConfigurationTests { MeterRegistryConfiguration.class) .withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class, WebMvcAutoConfiguration.class)) - .run((context) -> { - assertThat(context.getBean(RequestMappingHandlerMapping.class)) - .extracting("interceptors").element(0).asList() - .extracting((item) -> (Class) item.getClass()) - .contains(LongTaskTimingHandlerInterceptor.class); - }); + .run((context) -> assertThat( + context.getBean(RequestMappingHandlerMapping.class)) + .extracting("interceptors").element(0).asList() + .extracting((item) -> (Class) item.getClass()) + .contains(LongTaskTimingHandlerInterceptor.class)); } private MeterRegistry getInitializedMeterRegistry( diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/package-info.java new file mode 100644 index 00000000000..c230dd27fb7 --- /dev/null +++ b/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; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java index 4b3ca5ce45a..1b278bd09e5 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java @@ -437,9 +437,8 @@ public class TomcatServletWebServerFactoryTests ((StandardContext) context).setFailCtxIfServletStartFails(true); } }); - this.webServer = factory.getWebServer((context) -> { - context.addServlet("failing", FailingServlet.class).setLoadOnStartup(0); - }); + this.webServer = factory.getWebServer((context) -> context + .addServlet("failing", FailingServlet.class).setLoadOnStartup(0)); this.thrown.expect(WebServerException.class); this.webServer.start(); }