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

Merge pull request #3555 from kaliy/adding_firebird_to_health_checking 

* pr/3555:
  Polish
  Add firebird specific health query
This commit is contained in:
Stephane Nicoll 2015-08-05 03:53:27 +02:00
parent 12b876fbfa 7c9f2ae19c
commit a44c7883dd
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ import org.springframework.util.StringUtils;
* @author Christian Dupuis * @author Christian Dupuis
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Arthur Kalimullin
* @since 1.1.0 * @since 1.1.0
*/ */
public class DataSourceHealthIndicator extends AbstractHealthIndicator implements public class DataSourceHealthIndicator extends AbstractHealthIndicator implements
@ -203,13 +204,22 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator implement
}, },
INFORMIX("Informix Dynamic Server", "select count(*) from systables"); INFORMIX("Informix Dynamic Server", "select count(*) from systables"),
FIREBIRD("Firebird", "SELECT 1 FROM RDB$DATABASE") {
@Override
protected boolean matchesProduct(String product) {
return super.matchesProduct(product)
|| product.toLowerCase().startsWith("firebird");
}
};
private final String product; private final String product;
private final String query; private final String query;
private Product(String product, String query) { Product(String product, String query) {
this.product = product; this.product = product;
this.query = query; this.query = query;
} }

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DataSourceHealthIndicatorTests.java
View File

@ -110,6 +110,8 @@ public class DataSourceHealthIndicatorTests {
assertThat(Product.forProduct("DB2/LINUXX8664"), equalTo(Product.DB2)); assertThat(Product.forProduct("DB2/LINUXX8664"), equalTo(Product.DB2));
assertThat(Product.forProduct("Informix Dynamic Server"), assertThat(Product.forProduct("Informix Dynamic Server"),
equalTo(Product.INFORMIX)); equalTo(Product.INFORMIX));
assertThat(Product.forProduct("Firebird 2.5.WI"), equalTo(Product.FIREBIRD));
assertThat(Product.forProduct("Firebird 2.1.LI"), equalTo(Product.FIREBIRD));
} }
} }