Repository: commons-dbcp Updated Branches: refs/heads/master b8427a3d1 -> 4627678be
Use the scale in timeout parameter and ivar names (validationQueryTimeout -> validationQueryTimeoutSeconds) Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/4627678b Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/4627678b Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/4627678b Branch: refs/heads/master Commit: 4627678be12a3b25fae317b2f30a4b31a2e80634 Parents: b8427a3 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Mon Jun 11 11:42:18 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Mon Jun 11 11:42:18 2018 -0600 ---------------------------------------------------------------------- .../org/apache/commons/dbcp2/BasicDataSource.java | 12 ++++++------ .../commons/dbcp2/PoolableConnectionFactory.java | 6 +++--- .../dbcp2/datasources/CPDSConnectionFactory.java | 16 ++++++++-------- .../dbcp2/datasources/InstanceKeyDataSource.java | 10 +++++----- .../datasources/KeyedCPDSConnectionFactory.java | 10 +++++----- 5 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/4627678b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java index 4b5a2a7..b1c113b 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -1137,7 +1137,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Timeout in seconds before connection validation queries fail. */ - private volatile int validationQueryTimeout = -1; + private volatile int validationQueryTimeoutSeconds = -1; /** * Returns the validation query timeout. @@ -1146,7 +1146,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean */ @Override public int getValidationQueryTimeout() { - return validationQueryTimeout; + return validationQueryTimeoutSeconds; } /** @@ -1158,11 +1158,11 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * setLoginTimeout, getLoginTimeout, getLogWriter.</code> * </p> * - * @param timeout + * @param validationQueryTimeoutSeconds * new validation query timeout value in seconds */ - public void setValidationQueryTimeout(final int timeout) { - this.validationQueryTimeout = timeout; + public void setValidationQueryTimeout(final int validationQueryTimeoutSeconds) { + this.validationQueryTimeoutSeconds = validationQueryTimeoutSeconds; } /** @@ -2322,7 +2322,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean connectionFactory = new PoolableConnectionFactory(driverConnectionFactory, ObjectNameWrapper.unwrap(registeredJmxObjectName)); connectionFactory.setValidationQuery(validationQuery); - connectionFactory.setValidationQueryTimeout(validationQueryTimeout); + connectionFactory.setValidationQueryTimeout(validationQueryTimeoutSeconds); connectionFactory.setConnectionInitSql(connectionInitSqls); connectionFactory.setDefaultReadOnly(defaultReadOnly); connectionFactory.setDefaultAutoCommit(defaultAutoCommit); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/4627678b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java index 9c527ec..a68155e 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -80,10 +80,10 @@ public class PoolableConnectionFactory * executing a validation query. Use a value less than or equal to 0 for * no timeout. * - * @param timeoutSeconds new validation query timeout value in seconds + * @param validationQueryTimeoutSeconds new validation query timeout value in seconds */ - public void setValidationQueryTimeout(final int timeoutSeconds) { - this.validationQueryTimeoutSeconds = timeoutSeconds; + public void setValidationQueryTimeout(final int validationQueryTimeoutSeconds) { + this.validationQueryTimeoutSeconds = validationQueryTimeoutSeconds; } /** http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/4627678b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java index 4591cef..665b8ff 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java @@ -52,7 +52,7 @@ class CPDSConnectionFactory private final ConnectionPoolDataSource cpds; private final String validationQuery; - private final int validationQueryTimeout; + private final int validationQueryTimeoutSeconds; private final boolean rollbackAfterValidation; private ObjectPool<PooledConnectionAndInfo> pool; private final String userName; @@ -81,7 +81,7 @@ class CPDSConnectionFactory * a query to use to {@link #validateObject validate} {@link Connection}s. Should return at least one * row. May be {@code null} in which case {@link Connection#isValid(int)} will be used to validate * connections. - * @param validationQueryTimeout + * @param validationQueryTimeoutSeconds * Timeout in seconds before validation fails * @param rollbackAfterValidation * whether a rollback should be issued after {@link #validateObject validating} {@link Connection}s. @@ -93,13 +93,13 @@ class CPDSConnectionFactory */ public CPDSConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery, - final int validationQueryTimeout, + final int validationQueryTimeoutSeconds, final boolean rollbackAfterValidation, final String userName, final char[] userPassword) { this.cpds = cpds; this.validationQuery = validationQuery; - this.validationQueryTimeout = validationQueryTimeout; + this.validationQueryTimeoutSeconds = validationQueryTimeoutSeconds; this.userName = userName; this.userPassword = userPassword; this.rollbackAfterValidation = rollbackAfterValidation; @@ -114,7 +114,7 @@ class CPDSConnectionFactory * a query to use to {@link #validateObject validate} {@link Connection}s. Should return at least one * row. May be {@code null} in which case {@link Connection#isValid(int)} will be used to validate * connections. - * @param validationQueryTimeout + * @param validationQueryTimeoutSeconds * Timeout in seconds before validation fails * @param rollbackAfterValidation * whether a rollback should be issued after {@link #validateObject validating} {@link Connection}s. @@ -125,11 +125,11 @@ class CPDSConnectionFactory */ public CPDSConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery, - final int validationQueryTimeout, + final int validationQueryTimeoutSeconds, final boolean rollbackAfterValidation, final String userName, final String userPassword) { - this(cpds, validationQuery, validationQueryTimeout, rollbackAfterValidation, userName, + this(cpds, validationQuery, validationQueryTimeoutSeconds, rollbackAfterValidation, userName, Utils.toCharArray(userPassword)); } @@ -204,7 +204,7 @@ class CPDSConnectionFactory Connection conn = null; validatingSet.add(pconn); if (null == validationQuery) { - int timeout = validationQueryTimeout; + int timeout = validationQueryTimeoutSeconds; if (timeout < 0) { timeout = 0; } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/4627678b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java index 571f8ad..58a04ea 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java @@ -130,7 +130,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable // Connection factory properties private String validationQuery; - private int validationQueryTimeout = -1; + private int validationQueryTimeoutSeconds = -1; private boolean rollbackAfterValidation; private long maxConnLifetimeMillis = -1; @@ -810,17 +810,17 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable * @return The timeout in seconds before the validation query fails. */ public int getValidationQueryTimeout() { - return validationQueryTimeout; + return validationQueryTimeoutSeconds; } /** * Sets the timeout in seconds before the validation query fails. * - * @param validationQueryTimeout + * @param validationQueryTimeoutSeconds * The new timeout in seconds */ - public void setValidationQueryTimeout(final int validationQueryTimeout) { - this.validationQueryTimeout = validationQueryTimeout; + public void setValidationQueryTimeout(final int validationQueryTimeoutSeconds) { + this.validationQueryTimeoutSeconds = validationQueryTimeoutSeconds; } /** http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/4627678b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java index cfef246..d253fbf 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java @@ -52,7 +52,7 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory<UserPassKey private final ConnectionPoolDataSource cpds; private final String validationQuery; - private final int validationQueryTimeout; + private final int validationQueryTimeoutSeconds; private final boolean rollbackAfterValidation; private KeyedObjectPool<UserPassKey,PooledConnectionAndInfo> pool; private long maxConnLifetimeMillis = -1; @@ -77,18 +77,18 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory<UserPassKey * a query to use to {@link #validateObject validate} {@link Connection}s. Should return at least one * row. May be {@code null} in which case3 {@link Connection#isValid(int)} will be used to validate * connections. - * @param validationQueryTimeout + * @param validationQueryTimeoutSeconds * The time, in seconds, to allow for the validation query to complete * @param rollbackAfterValidation * whether a rollback should be issued after {@link #validateObject validating} {@link Connection}s. */ public KeyedCPDSConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery, - final int validationQueryTimeout, + final int validationQueryTimeoutSeconds, final boolean rollbackAfterValidation) { this.cpds = cpds; this.validationQuery = validationQuery; - this.validationQueryTimeout = validationQueryTimeout; + this.validationQueryTimeoutSeconds = validationQueryTimeoutSeconds; this.rollbackAfterValidation = rollbackAfterValidation; } @@ -172,7 +172,7 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory<UserPassKey Connection conn = null; validatingSet.add(pconn); if (null == validationQuery) { - int timeout = validationQueryTimeout; + int timeout = validationQueryTimeoutSeconds; if (timeout < 0) { timeout = 0; }
