From 14899ba3b25edb25ef575986a49d6ee7707ea94d Mon Sep 17 00:00:00 2001 From: Christian Dupuis Date: Thu, 22 May 2014 12:45:15 +0200 Subject: [PATCH] Fix compile problem Something slipped the recent merge --- .../health/SimpleDataSourceHealthIndicator.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java index ead2847f337..0e4ddaddc5b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java @@ -35,8 +35,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Christian Dupuis */ -public class SimpleDataSourceHealthIndicator implements - HealthIndicator> { +public class SimpleDataSourceHealthIndicator implements HealthIndicator { private DataSource dataSource; @@ -64,6 +63,7 @@ public class SimpleDataSourceHealthIndicator implements /** * Create a new {@link SimpleDataSourceHealthIndicator} using the specified * datasource. + * * @param dataSource the data source */ public SimpleDataSourceHealthIndicator(DataSource dataSource) { @@ -80,6 +80,7 @@ public class SimpleDataSourceHealthIndicator implements if (this.dataSource != null) { try { product = this.jdbcTemplate.execute(new ConnectionCallback() { + @Override public String doInConnection(Connection connection) throws SQLException, DataAccessException { @@ -87,8 +88,7 @@ public class SimpleDataSourceHealthIndicator implements } }); health.withDetail("database", product); - } - catch (DataAccessException ex) { + } catch (DataAccessException ex) { health.down().withException(ex); } String query = detectQuery(product); @@ -96,8 +96,7 @@ public class SimpleDataSourceHealthIndicator implements try { health.withDetail("hello", this.jdbcTemplate.queryForObject(query, Object.class)); - } - catch (Exception ex) { + } catch (Exception ex) { health.down().withException(ex); } }