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

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-07-11 17:49:19 +01:00
parent 6a48a440b2 cced3514a7
commit 1ea91ece23
3 changed files with 4 additions and 8 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;
}
public Class<?> getType() {
return this.bean.getClass();
}
public boolean isEnabledByDefault() {
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
*/
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();
}

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 {
@Test
@SuppressWarnings("unchecked")
public void servletWebMappings() {
Supplier<ConfigurableWebApplicationContext> contextSupplier = prepareContextSupplier();
new WebApplicationContextRunner(contextSupplier)
@ -100,7 +99,6 @@ public class MappingsEndpointTests {
}
@Test
@SuppressWarnings("unchecked")
public void servletWebMappingsWithAdditionalDispatcherServlets() {
Supplier<ConfigurableWebApplicationContext> contextSupplier = prepareContextSupplier();
new WebApplicationContextRunner(contextSupplier).withUserConfiguration(
@ -121,6 +119,7 @@ public class MappingsEndpointTests {
});
}
@SuppressWarnings("unchecked")
private Supplier<ConfigurableWebApplicationContext> prepareContextSupplier() {
ServletContext servletContext = mock(ServletContext.class);
given(servletContext.getInitParameterNames())