diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java index 6400c595dc1..0309b360b9f 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java @@ -48,21 +48,16 @@ public class CassandraHealthIndicator extends AbstractHealthIndicator { @Override protected void doHealthCheck(Health.Builder builder) throws Exception { - try { - Select select = QueryBuilder.select("release_version").from("system", - "local"); - ResultSet results = this.cassandraOperations.getCqlOperations() - .queryForResultSet(select); - if (results.isExhausted()) { - builder.up(); - return; - } - String version = results.one().getString(0); - builder.up().withDetail("version", version); - } - catch (Exception ex) { - builder.down(ex); + Select select = QueryBuilder.select("release_version").from("system", + "local"); + ResultSet results = this.cassandraOperations.getCqlOperations() + .queryForResultSet(select); + if (results.isExhausted()) { + builder.up(); + return; } + String version = results.one().getString(0); + builder.up().withDetail("version", version); } } 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 173e041df27..7946170a44e 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 @@ -108,16 +108,11 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator builder.up().withDetail("database", product); String validationQuery = getValidationQuery(product); 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("hello", result); - } - catch (Exception ex) { - builder.down(ex); - } + // 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("hello", result); } } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/neo4j/Neo4jHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/neo4j/Neo4jHealthIndicator.java index ca84ff1f971..457a24f2148 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/neo4j/Neo4jHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/neo4j/Neo4jHealthIndicator.java @@ -63,8 +63,10 @@ public class Neo4jHealthIndicator extends AbstractHealthIndicator { * {@link Health.Builder Builder}. * @param session the session to use to execute a cypher statement * @param builder the builder to add details to + * @throws Exception if getting health details failed */ - protected void extractResult(Session session, Health.Builder builder) { + protected void extractResult(Session session, Health.Builder builder) + throws Exception { Result result = session.query(CYPHER, Collections.emptyMap()); builder.up().withDetail("nodes", result.queryResults().iterator().next().get("nodes"));