root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Andy Wilkinson 2018-07-11 17:49:10 +01:00
parent c489c6c5f6
commit cced3514a7
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java
View File

@ -465,10 +465,6 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
return this.id; return this.id;
} }
public Class<?> getType() {
return this.bean.getClass();
}
public boolean isEnabledByDefault() { public boolean isEnabledByDefault() {
return this.enabledByDefault; return this.enabledByDefault;
} }

5
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTest.java → spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTests.java
View File

@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock;
* *
* @author Yulin Qin * @author Yulin Qin
*/ */
public class MongoReactiveHealthIndicatorTest { public class MongoReactiveHealthIndicatorTests {
@Test @Test
public void testMongoIsUp() { public void testMongoIsUp() {
@ -65,7 +65,8 @@ public class MongoReactiveHealthIndicatorTest {
StepVerifier.create(health).consumeNextWith((h) -> { StepVerifier.create(health).consumeNextWith((h) -> {
assertThat(h.getStatus()).isEqualTo(Status.DOWN); assertThat(h.getStatus()).isEqualTo(Status.DOWN);
assertThat(h.getDetails()).containsOnlyKeys("error"); 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(); }).verifyComplete();
} }

3
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java
View File

@ -73,7 +73,6 @@ import static org.springframework.web.reactive.function.server.RouterFunctions.r
public class MappingsEndpointTests { public class MappingsEndpointTests {
@Test @Test
@SuppressWarnings("unchecked")
public void servletWebMappings() { public void servletWebMappings() {
Supplier<ConfigurableWebApplicationContext> contextSupplier = prepareContextSupplier(); Supplier<ConfigurableWebApplicationContext> contextSupplier = prepareContextSupplier();
new WebApplicationContextRunner(contextSupplier) new WebApplicationContextRunner(contextSupplier)
@ -100,7 +99,6 @@ public class MappingsEndpointTests {
} }
@Test @Test
@SuppressWarnings("unchecked")
public void servletWebMappingsWithAdditionalDispatcherServlets() { public void servletWebMappingsWithAdditionalDispatcherServlets() {
Supplier<ConfigurableWebApplicationContext> contextSupplier = prepareContextSupplier(); Supplier<ConfigurableWebApplicationContext> contextSupplier = prepareContextSupplier();
new WebApplicationContextRunner(contextSupplier).withUserConfiguration( new WebApplicationContextRunner(contextSupplier).withUserConfiguration(
@ -121,6 +119,7 @@ public class MappingsEndpointTests {
}); });
} }
@SuppressWarnings("unchecked")
private Supplier<ConfigurableWebApplicationContext> prepareContextSupplier() { private Supplier<ConfigurableWebApplicationContext> prepareContextSupplier() {
ServletContext servletContext = mock(ServletContext.class); ServletContext servletContext = mock(ServletContext.class);
given(servletContext.getInitParameterNames()) given(servletContext.getInitParameterNames())

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java
View File

@ -90,12 +90,8 @@ public class DispatcherServletAutoConfiguration {
private final WebMvcProperties webMvcProperties; private final WebMvcProperties webMvcProperties;
private final ServerProperties serverProperties; public DispatcherServletConfiguration(WebMvcProperties webMvcProperties) {
public DispatcherServletConfiguration(WebMvcProperties webMvcProperties,
ServerProperties serverProperties) {
this.webMvcProperties = webMvcProperties; this.webMvcProperties = webMvcProperties;
this.serverProperties = serverProperties;
} }
@Bean(name = DEFAULT_DISPATCHER_SERVLET_BEAN_NAME) @Bean(name = DEFAULT_DISPATCHER_SERVLET_BEAN_NAME)