diff --git a/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/src/main/java/com/zaxxer/hikari/HikariDataSource.java index 0da10aac..acc148ef 100644 --- a/src/main/java/com/zaxxer/hikari/HikariDataSource.java +++ b/src/main/java/com/zaxxer/hikari/HikariDataSource.java @@ -116,6 +116,17 @@ public class HikariDataSource implements DataSource return (this.getClass().isAssignableFrom(iface)); } + /** + * close() and shutdown() are synonymous. + */ + public void close() + { + shutdown(); + } + + /** + * Shutdown the DataSource and its associated pool. + */ public void shutdown() { boolean shutdown = isShutdown; @@ -126,4 +137,11 @@ public class HikariDataSource implements DataSource pool = null; } } + + /** {@inheritDoc} */ + @Override + public String toString() + { + return String.format("HikariDataSource (%s)", pool); + } } diff --git a/src/main/java/com/zaxxer/hikari/HikariPool.java b/src/main/java/com/zaxxer/hikari/HikariPool.java index ff1f5027..31c39663 100644 --- a/src/main/java/com/zaxxer/hikari/HikariPool.java +++ b/src/main/java/com/zaxxer/hikari/HikariPool.java @@ -241,6 +241,12 @@ public final class HikariPool implements HikariPoolMBean } } + @Override + public String toString() + { + return configuration.getPoolName(); + } + void shutdown() { LOGGER.info("HikariCP pool " + configuration.getPoolName() + " is being shutdown.");