From cced3514a7c925b9824b4513a7f0c46c05291885 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Jul 2018 17:49:10 +0100 Subject: [PATCH] Polish --- .../actuate/endpoint/annotation/EndpointDiscoverer.java | 4 ---- ...atorTest.java => MongoReactiveHealthIndicatorTests.java} | 5 +++-- .../boot/actuate/web/mappings/MappingsEndpointTests.java | 3 +-- .../web/servlet/DispatcherServletAutoConfiguration.java | 6 +----- 4 files changed, 5 insertions(+), 13 deletions(-) rename spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/{MongoReactiveHealthIndicatorTest.java => MongoReactiveHealthIndicatorTests.java} (94%) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java index d92de1d5236..7c462310da1 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java @@ -465,10 +465,6 @@ public abstract class EndpointDiscoverer, O exten return this.id; } - public Class getType() { - return this.bean.getClass(); - } - public boolean isEnabledByDefault() { return this.enabledByDefault; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTest.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTests.java similarity index 94% rename from spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTest.java rename to spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTests.java index f5df23de06c..8e60e6b0143 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTest.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTests.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock; * * @author Yulin Qin */ -public class MongoReactiveHealthIndicatorTest { +public class MongoReactiveHealthIndicatorTests { @Test public void testMongoIsUp() { @@ -65,7 +65,8 @@ public class MongoReactiveHealthIndicatorTest { StepVerifier.create(health).consumeNextWith((h) -> { assertThat(h.getStatus()).isEqualTo(Status.DOWN); assertThat(h.getDetails()).containsOnlyKeys("error"); - assertThat(h.getDetails().get("error")).isEqualTo("Connection failed"); + assertThat(h.getDetails().get("error")) + .isEqualTo(MongoException.class.getName() + ": Connection failed"); }).verifyComplete(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java index 981c431be1f..d66600286e8 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java @@ -73,7 +73,6 @@ import static org.springframework.web.reactive.function.server.RouterFunctions.r public class MappingsEndpointTests { @Test - @SuppressWarnings("unchecked") public void servletWebMappings() { Supplier contextSupplier = prepareContextSupplier(); new WebApplicationContextRunner(contextSupplier) @@ -100,7 +99,6 @@ public class MappingsEndpointTests { } @Test - @SuppressWarnings("unchecked") public void servletWebMappingsWithAdditionalDispatcherServlets() { Supplier contextSupplier = prepareContextSupplier(); new WebApplicationContextRunner(contextSupplier).withUserConfiguration( @@ -121,6 +119,7 @@ public class MappingsEndpointTests { }); } + @SuppressWarnings("unchecked") private Supplier prepareContextSupplier() { ServletContext servletContext = mock(ServletContext.class); given(servletContext.getInitParameterNames()) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java index 7718d238b88..321c6d311d0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java @@ -90,12 +90,8 @@ public class DispatcherServletAutoConfiguration { private final WebMvcProperties webMvcProperties; - private final ServerProperties serverProperties; - - public DispatcherServletConfiguration(WebMvcProperties webMvcProperties, - ServerProperties serverProperties) { + public DispatcherServletConfiguration(WebMvcProperties webMvcProperties) { this.webMvcProperties = webMvcProperties; - this.serverProperties = serverProperties; } @Bean(name = DEFAULT_DISPATCHER_SERVLET_BEAN_NAME)