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

Add validation query to DataSourceHealthIndicator details 

See gh-15055
This commit is contained in:
Erlend Haugsnes 2018-11-01 10:54:03 +01:00 committed by Stephane Nicoll
parent bbad720e23
commit fc85c34dd8
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,6 +115,7 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator
new SingleColumnRowMapper()); new SingleColumnRowMapper());
Object result = DataAccessUtils.requiredSingleResult(results); Object result = DataAccessUtils.requiredSingleResult(results);
builder.withDetail("result", result); builder.withDetail("result", result);
builder.withDetail("validationQuery", validationQuery);
} }
} }

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

@ -81,6 +81,8 @@ public class DataSourceHealthIndicatorTests {
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("result")).isNotNull(); assertThat(health.getDetails().get("result")).isNotNull();
assertThat(health.getDetails().get("validationQuery"))
.isEqualTo("SELECT COUNT(*) from FOO");
} }
@Test @Test