Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15136 from restolho

Browse Source 
* pr/15136:
  Change DataSourceHealthIndicator details from "hello" to "result"
This commit is contained in:
Stephane Nicoll
2018-12-03 09:35:46 +01:00
parent 84ace92a27 d9586d94f6
commit 56ae9cfc7a
2 changed files with 3 additions and 3 deletions
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,
new SingleColumnRowMapper());
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);
Health health = this.indicator.health();
assertThat(health.getDetails().get("database")).isNotNull();
assertThat(health.getDetails().get("hello")).isNotNull();
assertThat(health.getDetails().get("result")).isNotNull();
}
@Test
@@ -80,7 +80,7 @@ public class DataSourceHealthIndicatorTests {
System.err.println(health);
assertThat(health.getDetails().get("database")).isNotNull();
assertThat(health.getStatus()).isEqualTo(Status.UP);
assertThat(health.getDetails().get("hello")).isNotNull();
assertThat(health.getDetails().get("result")).isNotNull();
}
@Test