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

Change DataSourceHealthIndicator details from "hello" to "result" 

Closes gh-15136
This commit is contained in:
Andre Restolho 2018-11-08 20:03:03 +00:00 committed by Stephane Nicoll
parent 84ace92a27
commit d9586d94f6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java
View File

@ -114,7 +114,7 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator
List<Object> results = this.jdbcTemplate.query(validationQuery, List<Object> results = this.jdbcTemplate.query(validationQuery,
new SingleColumnRowMapper()); new SingleColumnRowMapper());
Object result = DataAccessUtils.requiredSingleResult(results); Object result = DataAccessUtils.requiredSingleResult(results);
builder.withDetail("hello", result); builder.withDetail("result", result);
} }
} }

4
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicatorTests.java
View File

@ -67,7 +67,7 @@ public class DataSourceHealthIndicatorTests {
this.indicator.setDataSource(this.dataSource); this.indicator.setDataSource(this.dataSource);
Health health = this.indicator.health(); Health health = this.indicator.health();
assertThat(health.getDetails().get("database")).isNotNull(); assertThat(health.getDetails().get("database")).isNotNull();
assertThat(health.getDetails().get("hello")).isNotNull(); assertThat(health.getDetails().get("result")).isNotNull();
} }
@Test @Test
@ -80,7 +80,7 @@ public class DataSourceHealthIndicatorTests {
System.err.println(health); System.err.println(health);
assertThat(health.getDetails().get("database")).isNotNull(); assertThat(health.getDetails().get("database")).isNotNull();
assertThat(health.getStatus()).isEqualTo(Status.UP); assertThat(health.getStatus()).isEqualTo(Status.UP);
assertThat(health.getDetails().get("hello")).isNotNull(); assertThat(health.getDetails().get("result")).isNotNull();
} }
@Test @Test