Merge branch '2.1.x' into 2.2.x

Closes gh-19299

Author: wilkinsona

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java

@@ -107,16 +107,14 @@ private void doDataSourceHealthCheck(Health.Builder builder) throws Exception {
 		String product = getProduct();
 		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<Object> results = this.jdbcTemplate.query(validationQuery, new SingleColumnRowMapper());
-				Object result = DataAccessUtils.requiredSingleResult(results);
-				builder.withDetail("result", result);
-			}
-			finally {
-				builder.withDetail("validationQuery", validationQuery);
-			}
+		try {
+			// Avoid calling getObject as it breaks MySQL on Java 7
+			List<Object> results = this.jdbcTemplate.query(validationQuery, new SingleColumnRowMapper());
+			Object result = DataAccessUtils.requiredSingleResult(results);
+			builder.withDetail("result", result);
+		}
+		finally {
+			builder.withDetail("validationQuery", validationQuery);
 		}
 	}