From bd08b4d91c3aaf414054366fa76710b88811d402 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 5 Mar 2020 08:04:54 +0900 Subject: [PATCH] Polish DataSourceHealthIndicator See gh-20367 --- .../jdbc/DataSourceHealthIndicator.java | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java index 81459c4f0ba..b92c7398a67 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java @@ -105,24 +105,16 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator implement builder.up().withDetail("database", getProduct()); String validationQuery = this.query; if (StringUtils.hasText(validationQuery)) { - try { - // Avoid calling getObject as it breaks MySQL on Java 7 - List results = this.jdbcTemplate.query(validationQuery, new SingleColumnRowMapper()); - Object result = DataAccessUtils.requiredSingleResult(results); - builder.withDetail("result", result); - } - finally { - builder.withDetail("validationQuery", validationQuery); - } + builder.withDetail("validationQuery", validationQuery); + // Avoid calling getObject as it breaks MySQL on Java 7 and later + List results = this.jdbcTemplate.query(validationQuery, new SingleColumnRowMapper()); + Object result = DataAccessUtils.requiredSingleResult(results); + builder.withDetail("result", result); } else { - try { - boolean valid = isConnectionValid(); - builder.status((valid) ? Status.UP : Status.DOWN); - } - finally { - builder.withDetail("validationQuery", "isValid()"); - } + builder.withDetail("validationQuery", "isValid()"); + boolean valid = isConnectionValid(); + builder.status((valid) ? Status.UP : Status.DOWN); } }