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

Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-07-29 15:12:11 +01:00
parent 6c718c24d8 333bc3e842
commit 2abf3ebdc3
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DataSourceHealthIndicator.java
View File

@ -17,6 +17,8 @@
package org.springframework.boot.actuate.health; package org.springframework.boot.actuate.health;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -24,8 +26,12 @@ import java.util.Map;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.dao.support.DataAccessUtils;
import org.springframework.jdbc.IncorrectResultSetColumnCountException;
import org.springframework.jdbc.core.ConnectionCallback; import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.support.JdbcUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
@ -34,6 +40,7 @@ import org.springframework.util.StringUtils;
* *
* @author Dave Syer * @author Dave Syer
* @author Christian Dupuis * @author Christian Dupuis
* @author Andy Wilkinson
* @since 1.1.0 * @since 1.1.0
*/ */
public class DataSourceHealthIndicator extends AbstractHealthIndicator { public class DataSourceHealthIndicator extends AbstractHealthIndicator {
@ -86,8 +93,23 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator {
String query = detectQuery(product); String query = detectQuery(product);
if (StringUtils.hasText(query)) { if (StringUtils.hasText(query)) {
try { try {
builder.withDetail("hello", builder.withDetail("hello", DataAccessUtils
this.jdbcTemplate.queryForObject(query, Object.class)); .requiredSingleResult(this.jdbcTemplate.query(query,
new RowMapper<Object>() {
@Override
public Object mapRow(ResultSet rs, int rowNum)
throws SQLException {
ResultSetMetaData rsmd = rs.getMetaData();
int nrOfColumns = rsmd.getColumnCount();
if (nrOfColumns != 1) {
throw new IncorrectResultSetColumnCountException(
1, nrOfColumns);
}
return JdbcUtils.getResultSetValue(rs, 1);
}
})));
} }
catch (Exception ex) { catch (Exception ex) {
builder.down(ex); builder.down(ex);