Repository: commons-dbcp Updated Branches: refs/heads/master 3f28c60b2 -> 57132135b
Remove trailing white spaces on all lines. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/57132135 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/57132135 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/57132135 Branch: refs/heads/master Commit: 57132135b269f9cf76870ac08b558fd80c861d49 Parents: 3f28c60 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sun Jun 10 13:16:36 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sun Jun 10 13:16:36 2018 -0600 ---------------------------------------------------------------------- .../apache/commons/dbcp2/AbandonedTrace.java | 2 +- .../apache/commons/dbcp2/BasicDataSource.java | 36 ++++---- .../commons/dbcp2/BasicDataSourceMXBean.java | 80 ++++++++--------- .../commons/dbcp2/DelegatingConnection.java | 4 +- .../commons/dbcp2/DelegatingStatement.java | 4 +- .../org/apache/commons/dbcp2/PoolingDriver.java | 2 +- .../java/org/apache/commons/dbcp2/Utils.java | 6 +- .../dbcp2/cpdsadapter/ConnectionImpl.java | 6 +- .../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 42 ++++----- .../commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 2 +- .../dbcp2/cpdsadapter/PooledConnectionImpl.java | 18 ++-- .../datasources/InstanceKeyDataSource.java | 82 +++++++++--------- .../datasources/KeyedCPDSConnectionFactory.java | 2 +- .../datasources/PerUserPoolDataSource.java | 90 ++++++++++---------- .../datasources/PooledConnectionAndInfo.java | 6 +- .../datasources/PooledConnectionManager.java | 2 +- .../dbcp2/datasources/SharedPoolDataSource.java | 12 +-- .../commons/dbcp2/datasources/UserPassKey.java | 6 +- .../dbcp2/managed/BasicManagedDataSource.java | 8 +- .../managed/DataSourceXAConnectionFactory.java | 4 +- .../dbcp2/managed/TransactionContext.java | 8 +- 21 files changed, 211 insertions(+), 211 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java index 3b8752b..9fe9df4 100644 --- a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java +++ b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java @@ -37,7 +37,7 @@ public class AbandonedTrace implements TrackedUse { /** A list of objects created by children of this object */ private final List<WeakReference<AbandonedTrace>> traceList = new ArrayList<>(); - + /** Last time this connection was used */ private volatile long lastUsed = 0; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/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 563cd7a..c1517e5 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -207,7 +207,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Gets the default query timeout that will be used for {@link java.sql.Statement Statement}s created from this * connection. <code>null</code> means that the driver default will be used. - * + * * @return The default query timeout in seconds. */ public Integer getDefaultQueryTimeout() { @@ -218,7 +218,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Sets the default query timeout that will be used for {@link java.sql.Statement Statement}s created from this * connection. <code>null</code> means that the driver default will be used. - * + * * @param defaultQueryTimeoutSeconds * The default query timeout in seconds. */ @@ -377,7 +377,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * Note: This getter only returns the last value set by a call to {@link #setDriverClassLoader(ClassLoader)}. It * does not return the class loader of any driver that may have been set via {@link #setDriver(Driver)}. * </p> - * + * * @return The class loader specified for loading the JDBC driver. */ public synchronized ClassLoader getDriverClassLoader() { @@ -918,8 +918,8 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Gets the EvictionPolicy implementation in use with this connection pool. - * - * @return The EvictionPolicy implementation in use with this connection pool. + * + * @return The EvictionPolicy implementation in use with this connection pool. */ public synchronized String getEvictionPolicyClassName() { return evictionPolicyClassName; @@ -1292,7 +1292,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * time one of the following methods is invoked: <code>getConnection, setLogwriter, * setLoginTimeout, getLoginTimeout, getLogWriter.</code> * </p> - * + * * @param maxConnLifetimeMillis * The maximum permitted lifetime of a connection in milliseconds. */ @@ -1304,7 +1304,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * When {@link #getMaxConnLifetimeMillis()} is set to limit connection lifetime, this property determines whether or * not log messages are generated when the pool closes connections due to maximum lifetime exceeded. Set this * property to false to suppress log messages when connections expire. - * + * * @param logExpiredConnections * Whether or not log messages are generated when the pool closes connections due to maximum lifetime * exceeded. @@ -1318,7 +1318,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Returns the JMX name that has been requested for this DataSource. If the requested name is not valid, an * alternative may be chosen. - * + * * @return The JMX name that has been requested for this DataSource. */ public String getJmxName() { @@ -1330,7 +1330,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * may be chosen. This DataSource will attempt to register itself using this name. If another component registers * this DataSource with JMX and this name is valid this name will be used in preference to any specified by the * other component. - * + * * @param jmxName * The JMX name that has been requested for this DataSource */ @@ -1344,7 +1344,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * Returns the value of the flag that controls whether or not connections being returned to the pool will be checked * and configured with {@link Connection#setAutoCommit(boolean) Connection.setAutoCommit(true)} if the auto commit * setting is {@code false} when the connection is returned. It is <code>true</code> by default. - * + * * @return Whether or not connections being returned to the pool will be checked and configured with auto-commit. */ public boolean getEnableAutoCommitOnReturn() { @@ -1355,7 +1355,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * Sets the value of the flag that controls whether or not connections being returned to the pool will be checked * and configured with {@link Connection#setAutoCommit(boolean) Connection.setAutoCommit(true)} if the auto commit * setting is {@code false} when the connection is returned. It is <code>true</code> by default. - * + * * @param enableAutoCommitOnReturn * Whether or not connections being returned to the pool will be checked and configured with auto-commit. */ @@ -1368,7 +1368,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Gets the current value of the flag that controls whether a connection will be rolled back when it is returned to * the pool if auto commit is not enabled and the connection is not read only. - * + * * @return whether a connection will be rolled back when it is returned to the pool. */ public boolean getRollbackOnReturn() { @@ -1378,7 +1378,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Sets the flag that controls if a connection will be rolled back when it is returned to the pool if auto commit is * not enabled and the connection is not read only. - * + * * @param rollbackOnReturn * whether a connection will be rolled back when it is returned to the pool. */ @@ -1390,7 +1390,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Returns the set of SQL_STATE codes considered to signal fatal conditions. - * + * * @return fatal disconnection state codes * @see #setDisconnectionSqlCodes(Collection) * @since 2.1 @@ -1405,7 +1405,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Provides the same data as {@link #getDisconnectionSqlCodes} but in an array so it is accessible via JMX. - * + * * @since 2.1 */ @Override @@ -1818,7 +1818,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Gets the print writer used by this configuration to log information on abandoned objects. - * + * * @return The print writer used by this configuration to log information on abandoned objects. */ public PrintWriter getAbandonedLogWriter() { @@ -1984,7 +1984,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * If true, this data source is closed and no more connections can be retrieved from this datasource. - * + * * @return true, if the data source is closed; false otherwise */ @Override @@ -2010,7 +2010,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Manually invalidates a connection, effectively requesting the pool to try to close it, remove it from the pool * and reclaim pool capacity. - * + * * @param connection * The Connection to invalidate. * http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java index f8402da..4693c88 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java @@ -25,231 +25,231 @@ public interface BasicDataSourceMXBean { /** * See {@link BasicDataSource#getAbandonedUsageTracking()} - * + * * @return {@link BasicDataSource#getAbandonedUsageTracking()} */ boolean getAbandonedUsageTracking(); /** * See {@link BasicDataSource#getDefaultAutoCommit()} - * + * * @return {@link BasicDataSource#getDefaultAutoCommit()} */ Boolean getDefaultAutoCommit(); /** * See {@link BasicDataSource#getDefaultReadOnly()} - * + * * @return {@link BasicDataSource#getDefaultReadOnly()} */ Boolean getDefaultReadOnly(); /** * See {@link BasicDataSource#getDefaultTransactionIsolation()} - * + * * @return {@link BasicDataSource#getDefaultTransactionIsolation()} */ int getDefaultTransactionIsolation(); /** * See {@link BasicDataSource#getDefaultCatalog()} - * + * * @return {@link BasicDataSource#getDefaultCatalog()} */ String getDefaultCatalog(); /** * See {@link BasicDataSource#getCacheState()} - * + * * @return {@link BasicDataSource#getCacheState()} */ boolean getCacheState(); /** * See {@link BasicDataSource#getDriverClassName()} - * + * * @return {@link BasicDataSource#getDriverClassName()} */ String getDriverClassName(); /** * See {@link BasicDataSource#getLifo()} - * + * * @return {@link BasicDataSource#getLifo()} */ boolean getLifo(); /** * See {@link BasicDataSource#getMaxTotal()} - * + * * @return {@link BasicDataSource#getMaxTotal()} */ int getMaxTotal(); /** * See {@link BasicDataSource#getMaxIdle()} - * + * * @return {@link BasicDataSource#getMaxIdle()} */ int getMaxIdle(); /** * See {@link BasicDataSource#getMinIdle()} - * + * * @return {@link BasicDataSource#getMinIdle()} */ int getMinIdle(); /** * See {@link BasicDataSource#getInitialSize()} - * + * * @return {@link BasicDataSource#getInitialSize()} */ int getInitialSize(); /** * See {@link BasicDataSource#getMaxWaitMillis()} - * + * * @return {@link BasicDataSource#getMaxWaitMillis()} */ long getMaxWaitMillis(); /** * See {@link BasicDataSource#isPoolPreparedStatements()} - * + * * @return {@link BasicDataSource#isPoolPreparedStatements()} */ boolean isPoolPreparedStatements(); /** * See {@link BasicDataSource#getMaxOpenPreparedStatements()} - * + * * @return {@link BasicDataSource#getMaxOpenPreparedStatements()} */ int getMaxOpenPreparedStatements(); /** * See {@link BasicDataSource#getTestOnCreate()} - * + * * @return {@link BasicDataSource#getTestOnCreate()} */ boolean getTestOnCreate(); /** * See {@link BasicDataSource#getTestOnBorrow()} - * + * * @return {@link BasicDataSource#getTestOnBorrow()} */ boolean getTestOnBorrow(); /** * See {@link BasicDataSource#getTimeBetweenEvictionRunsMillis()} - * + * * @return {@link BasicDataSource#getTimeBetweenEvictionRunsMillis()} */ long getTimeBetweenEvictionRunsMillis(); /** * See {@link BasicDataSource#getNumTestsPerEvictionRun()} - * + * * @return {@link BasicDataSource#getNumTestsPerEvictionRun()} */ int getNumTestsPerEvictionRun(); /** * See {@link BasicDataSource#getMinEvictableIdleTimeMillis()} - * + * * @return {@link BasicDataSource#getMinEvictableIdleTimeMillis()} */ long getMinEvictableIdleTimeMillis(); /** * See {@link BasicDataSource#getSoftMinEvictableIdleTimeMillis()} - * + * * @return {@link BasicDataSource#getSoftMinEvictableIdleTimeMillis()} */ long getSoftMinEvictableIdleTimeMillis(); /** * See {@link BasicDataSource#getTestWhileIdle()} - * + * * @return {@link BasicDataSource#getTestWhileIdle()} */ boolean getTestWhileIdle(); /** * See {@link BasicDataSource#getNumActive()} - * + * * @return {@link BasicDataSource#getNumActive()} */ int getNumActive(); /** * See {@link BasicDataSource#getNumIdle()} - * + * * @return {@link BasicDataSource#getNumIdle()} */ int getNumIdle(); /** * See {@link BasicDataSource#getPassword()} - * + * * @return {@link BasicDataSource#getPassword()} */ String getPassword(); /** * See {@link BasicDataSource#getUrl()} - * + * * @return {@link BasicDataSource#getUrl()} */ String getUrl(); /** * See {@link BasicDataSource#getUsername()} - * + * * @return {@link BasicDataSource#getUsername()} */ String getUsername(); /** * See {@link BasicDataSource#getValidationQuery()} - * + * * @return {@link BasicDataSource#getValidationQuery()} */ String getValidationQuery(); /** * See {@link BasicDataSource#getValidationQueryTimeout()} - * + * * @return {@link BasicDataSource#getValidationQueryTimeout()} */ int getValidationQueryTimeout(); /** * See {@link BasicDataSource#getConnectionInitSqlsAsArray()} - * + * * @return {@link BasicDataSource#getConnectionInitSqlsAsArray()} */ String[] getConnectionInitSqlsAsArray(); /** * See {@link BasicDataSource#isAccessToUnderlyingConnectionAllowed()} - * + * * @return {@link BasicDataSource#isAccessToUnderlyingConnectionAllowed()} */ boolean isAccessToUnderlyingConnectionAllowed(); /** * See {@link BasicDataSource#getMaxConnLifetimeMillis()} - * + * * @return {@link BasicDataSource#getMaxConnLifetimeMillis()} */ long getMaxConnLifetimeMillis(); /** * See {@link BasicDataSource#getLogExpiredConnections()} - * + * * @return {@link BasicDataSource#getLogExpiredConnections()} * @since 2.1 */ @@ -257,42 +257,42 @@ public interface BasicDataSourceMXBean { /** * See {@link BasicDataSource#getRemoveAbandonedOnBorrow()} - * + * * @return {@link BasicDataSource#getRemoveAbandonedOnBorrow()} */ boolean getRemoveAbandonedOnBorrow(); /** * See {@link BasicDataSource#getRemoveAbandonedOnMaintenance()} - * + * * @return {@link BasicDataSource#getRemoveAbandonedOnMaintenance()} */ boolean getRemoveAbandonedOnMaintenance(); /** * See {@link BasicDataSource#getRemoveAbandonedTimeout()} - * + * * @return {@link BasicDataSource#getRemoveAbandonedTimeout()} */ int getRemoveAbandonedTimeout(); /** * See {@link BasicDataSource#getLogAbandoned()} - * + * * @return {@link BasicDataSource#getLogAbandoned()} */ boolean getLogAbandoned(); /** * See {@link BasicDataSource#isClosed()} - * + * * @return {@link BasicDataSource#isClosed()} */ boolean isClosed(); /** * See {@link BasicDataSource#getFastFailValidation()} - * + * * @return {@link BasicDataSource#getFastFailValidation()} * @since 2.1 */ @@ -300,7 +300,7 @@ public interface BasicDataSourceMXBean { /** * See {@link BasicDataSource#getDisconnectionSqlCodesAsArray()} - * + * * @return {@link BasicDataSource#getDisconnectionSqlCodesAsArray()} * @since 2.1 */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index a67cd09..861dc1b 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -498,7 +498,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace /** * Gets the default query timeout that will be used for {@link Statement}s created from this connection. * <code>null</code> means that the driver default will be used. - * + * * @return query timeout limit in seconds; zero means there is no limit. */ public Integer getDefaultQueryTimeout() { @@ -509,7 +509,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace /** * Sets the default query timeout that will be used for {@link Statement}s created from this connection. * <code>null</code> means that the driver default will be used. - * + * * @param defaultQueryTimeoutSeconds * the new query timeout limit in seconds; zero means there is no limit */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java index 3584159..283e483 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java @@ -43,10 +43,10 @@ import java.util.List; * @since 2.0 */ public class DelegatingStatement extends AbandonedTrace implements Statement { - + /** My delegate. */ private Statement statement; - + /** The connection that created me. **/ private DelegatingConnection<?> connection; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java index e777eec..ae9f5fa 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java @@ -41,7 +41,7 @@ import org.apache.commons.pool2.ObjectPool; * @since 2.0 */ public class PoolingDriver implements Driver { - + /** Register myself with the {@link DriverManager}. */ static { try { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/Utils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java b/src/main/java/org/apache/commons/dbcp2/Utils.java index 4ae0119..80c80ea 100644 --- a/src/main/java/org/apache/commons/dbcp2/Utils.java +++ b/src/main/java/org/apache/commons/dbcp2/Utils.java @@ -137,7 +137,7 @@ public final class Utils { /** * Converts the given String to a char[]. - * + * * @param value * may be null. * @return a char[] or null. @@ -146,10 +146,10 @@ public final class Utils { return value != null ? value.toCharArray() : null; } - + /** * Converts the given char[] to a String. - * + * * @param value * may be null. * @return a String or null. http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java index 951c4ff..9e731c1 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java @@ -285,7 +285,7 @@ class ConnectionImpl extends DelegatingConnection<Connection> { /** * If false, getDelegate() and getInnermostDelegate() will return null. - * + * * @return true if access is allowed to the underlying connection * @see ConnectionImpl */ @@ -295,7 +295,7 @@ class ConnectionImpl extends DelegatingConnection<Connection> { /** * Get the delegated connection, if allowed. - * + * * @return the internal connection, or null if access is not allowed. * @see #isAccessToUnderlyingConnectionAllowed() */ @@ -309,7 +309,7 @@ class ConnectionImpl extends DelegatingConnection<Connection> { /** * Get the innermost connection, if allowed. - * + * * @return the innermost internal connection, or null if access is not allowed. * @see #isAccessToUnderlyingConnectionAllowed() */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java index 676ff44..553a3a2 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -108,22 +108,22 @@ public class DriverAdapterCPDS /** Description */ private String description; - + /** Url name */ private String url; - + /** User name */ private String userName; /** User password */ private char[] userPassword; - + /** Driver class name */ private String driver; /** Login TimeOut in seconds */ private int loginTimeout; - + /** Log stream. NOT USED */ private transient PrintWriter logWriter; @@ -168,7 +168,7 @@ public class DriverAdapterCPDS /** * Attempt to establish a database connection. - * + * * @param pooledUserName * name to be used for the connection * @param pooledUserPassword @@ -436,7 +436,7 @@ public class DriverAdapterCPDS /** * Gets the value of password for the default user. - * + * * @return value of password. * @since 2.4.0 */ @@ -446,7 +446,7 @@ public class DriverAdapterCPDS /** * Gets the value of password for the default user. - * + * * @return value of password. */ public String getPassword() { @@ -455,7 +455,7 @@ public class DriverAdapterCPDS /** * Sets the value of password for the default user. - * + * * @param userPassword * Value to assign to password. * @throws IllegalStateException @@ -469,7 +469,7 @@ public class DriverAdapterCPDS /** * Sets the value of password for the default user. - * + * * @param userPassword * Value to assign to password. * @throws IllegalStateException @@ -483,7 +483,7 @@ public class DriverAdapterCPDS /** * Gets the value of url used to locate the database for this datasource. - * + * * @return value of url. */ public String getUrl() { @@ -492,7 +492,7 @@ public class DriverAdapterCPDS /** * Sets the value of URL string used to locate the database for this datasource. - * + * * @param v * Value to assign to url. * @throws IllegalStateException @@ -505,7 +505,7 @@ public class DriverAdapterCPDS /** * Gets the value of default user (login or user name). - * + * * @return value of user. */ public String getUser() { @@ -514,7 +514,7 @@ public class DriverAdapterCPDS /** * Sets the value of default user (login or user name). - * + * * @param v * Value to assign to user. * @throws IllegalStateException @@ -528,7 +528,7 @@ public class DriverAdapterCPDS /** * Gets the driver class name. - * + * * @return value of driver. */ public String getDriver() { @@ -538,7 +538,7 @@ public class DriverAdapterCPDS /** * Sets the driver class name. Setting the driver class name cause the driver to be registered with the * DriverManager. - * + * * @param v * Value to assign to driver. * @throws IllegalStateException @@ -594,7 +594,7 @@ public class DriverAdapterCPDS /** * Flag to toggle the pooling of <code>PreparedStatement</code>s - * + * * @return value of poolPreparedStatements. */ public boolean isPoolPreparedStatements() { @@ -603,7 +603,7 @@ public class DriverAdapterCPDS /** * Flag to toggle the pooling of <code>PreparedStatement</code>s - * + * * @param v * true to pool statements. * @throws IllegalStateException @@ -617,7 +617,7 @@ public class DriverAdapterCPDS /** * Gets the maximum number of statements that can remain idle in the pool, without extra ones being released, or * negative for no limit. - * + * * @return the value of maxIdle */ public int getMaxIdle() { @@ -641,7 +641,7 @@ public class DriverAdapterCPDS /** * Gets the number of milliseconds to sleep between runs of the idle object evictor thread. When non-positive, no * idle object evictor thread will be run. - * + * * @return the value of the evictor thread timer * @see #setTimeBetweenEvictionRunsMillis(long) */ @@ -712,7 +712,7 @@ public class DriverAdapterCPDS /** * Sets the minimum amount of time a statement may sit idle in the pool before it is eligible for eviction by the * idle object evictor (if any). When non-positive, no objects will be evicted from the pool due to idle time alone. - * + * * @param minEvictableIdleTimeMillis * minimum time to set (in ms) * @see #getMinEvictableIdleTimeMillis() @@ -757,7 +757,7 @@ public class DriverAdapterCPDS /** * Sets the maximum number of prepared statements. - * + * * @param maxPreparedStatements * the new maximum number of prepared statements */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java index 4edbb2c..bd25c12 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java @@ -20,7 +20,7 @@ import org.apache.commons.dbcp2.PStmtKey; /** * A key uniquely identifying a {@link java.sql.PreparedStatement PreparedStatement}. - * + * * @since 2.0 * @deprecated Use {@link PStmtKey}. */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java index 138c1fc..59fee86 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java @@ -92,7 +92,7 @@ class PooledConnectionImpl /** * Wraps the real connection. - * + * * @param connection * the connection to be wrapped */ @@ -109,7 +109,7 @@ class PooledConnectionImpl /** * My {@link KeyedPooledObjectFactory} method for activating {@link PreparedStatement}s. - * + * * @param key * ignored * @param p @@ -256,7 +256,7 @@ class PooledConnectionImpl /** * My {@link KeyedPooledObjectFactory} method for destroying {@link PreparedStatement}s. - * + * * @param key * ignored * @param p @@ -331,7 +331,7 @@ class PooledConnectionImpl /** * My {@link KeyedPooledObjectFactory} method for creating {@link PreparedStatement}s. - * + * * @param key * the key for the {@link PreparedStatement} to be created */ @@ -374,7 +374,7 @@ class PooledConnectionImpl /** * My {@link KeyedPooledObjectFactory} method for passivating {@link PreparedStatement}s. Currently invokes * {@link PreparedStatement#clearParameters}. - * + * * @param key * ignored * @param p @@ -484,7 +484,7 @@ class PooledConnectionImpl /** * Creates or obtains a {@link PreparedStatement} from my pool. - * + * * @param sql * the SQL statement * @return a {@link PoolablePreparedStatement} @@ -504,7 +504,7 @@ class PooledConnectionImpl /** * Creates or obtains a {@link PreparedStatement} from my pool. - * + * * @param sql * an SQL statement that may contain one or more '?' IN parameter placeholders * @param autoGeneratedKeys @@ -543,7 +543,7 @@ class PooledConnectionImpl /** * Creates or obtains a {@link PreparedStatement} from my pool. - * + * * @param sql * a <code>String</code> object that is the SQL statement to be sent to the database; may contain one or * more '?' IN parameters @@ -638,7 +638,7 @@ class PooledConnectionImpl /** * My {@link KeyedPooledObjectFactory} method for validating {@link PreparedStatement}s. - * + * * @param key * ignored * @param p http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/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 bef86cc..bd8db77 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java @@ -184,7 +184,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getBlockWhenExhausted()} for each per user pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getBlockWhenExhausted()} for each per user * pool. */ @@ -194,7 +194,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getBlockWhenExhausted()} for each per user pool. - * + * * @param blockWhenExhausted * The default value for {@link GenericKeyedObjectPoolConfig#getBlockWhenExhausted()} for each per user * pool. @@ -207,7 +207,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getEvictionPolicyClassName()} for each per user * pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getEvictionPolicyClassName()} for each per user * pool. */ @@ -218,7 +218,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getEvictionPolicyClassName()} for each per user * pool. - * + * * @param evictionPolicyClassName * The default value for {@link GenericKeyedObjectPoolConfig#getEvictionPolicyClassName()} for each per * user pool. @@ -230,7 +230,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getLifo()} for each per user pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getLifo()} for each per user pool. */ public boolean getDefaultLifo() { @@ -239,7 +239,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getLifo()} for each per user pool. - * + * * @param lifo * The default value for {@link GenericKeyedObjectPoolConfig#getLifo()} for each per user pool. */ @@ -250,7 +250,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getMaxIdlePerKey()} for each per user pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getMaxIdlePerKey()} for each per user pool. */ public int getDefaultMaxIdle() { @@ -259,7 +259,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getMaxIdlePerKey()} for each per user pool. - * + * * @param maxIdle * The default value for {@link GenericKeyedObjectPoolConfig#getMaxIdlePerKey()} for each per user pool. */ @@ -270,7 +270,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getMaxTotalPerKey()} for each per user pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getMaxTotalPerKey()} for each per user pool. */ public int getDefaultMaxTotal() { @@ -279,7 +279,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getMaxTotalPerKey()} for each per user pool. - * + * * @param maxTotal * The default value for {@link GenericKeyedObjectPoolConfig#getMaxTotalPerKey()} for each per user pool. */ @@ -290,7 +290,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getMaxWaitMillis()} for each per user pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getMaxWaitMillis()} for each per user pool. */ public long getDefaultMaxWaitMillis() { @@ -299,7 +299,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getMaxWaitMillis()} for each per user pool. - * + * * @param maxWaitMillis * The default value for {@link GenericKeyedObjectPoolConfig#getMaxWaitMillis()} for each per user pool. */ @@ -311,7 +311,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getMinEvictableIdleTimeMillis()} for each per user * pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getMinEvictableIdleTimeMillis()} for each per * user pool. */ @@ -322,7 +322,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getMinEvictableIdleTimeMillis()} for each per user * pool. - * + * * @param minEvictableIdleTimeMillis * The default value for {@link GenericKeyedObjectPoolConfig#getMinEvictableIdleTimeMillis()} for each * per user pool. @@ -334,7 +334,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getMinIdlePerKey()} for each per user pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getMinIdlePerKey()} for each per user pool. */ public int getDefaultMinIdle() { @@ -343,7 +343,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getMinIdlePerKey()} for each per user pool. - * + * * @param minIdle * The default value for {@link GenericKeyedObjectPoolConfig#getMinIdlePerKey()} for each per user pool. */ @@ -355,7 +355,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link GenericKeyedObjectPoolConfig#getNumTestsPerEvictionRun()} for each per user * pool. - * + * * @return The default value for {@link GenericKeyedObjectPoolConfig#getNumTestsPerEvictionRun()} for each per user * pool. */ @@ -366,7 +366,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link GenericKeyedObjectPoolConfig#getNumTestsPerEvictionRun()} for each per user * pool. - * + * * @param numTestsPerEvictionRun * The default value for {@link GenericKeyedObjectPoolConfig#getNumTestsPerEvictionRun()} for each per * user pool. @@ -379,7 +379,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each per user pool. - * + * * @return The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each per user pool. */ @@ -390,7 +390,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each per user pool. - * + * * @param softMinEvictableIdleTimeMillis * The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each per user pool. @@ -403,7 +403,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnCreate()} for each per user pool. - * + * * @return The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnCreate()} for each per user pool. */ @@ -414,7 +414,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnCreate()} for each per user pool. - * + * * @param testOnCreate * The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnCreate()} for each per user pool. @@ -427,7 +427,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnBorrow()} for each per user pool. - * + * * @return The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnBorrow()} for each per user pool. */ @@ -438,7 +438,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnBorrow()} for each per user pool. - * + * * @param testOnBorrow * The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnBorrow()} for each per user pool. @@ -451,7 +451,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnReturn()} for each per user pool. - * + * * @return The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnReturn()} for each per user pool. */ @@ -462,7 +462,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnReturn()} for each per user pool. - * + * * @param testOnReturn * The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestOnReturn()} for each per user pool. @@ -475,7 +475,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestWhileIdle()} for each per user pool. - * + * * @return The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestWhileIdle()} for each per user pool. */ @@ -486,7 +486,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestWhileIdle()} for each per user pool. - * + * * @param testWhileIdle * The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTestWhileIdle()} for each per user pool. @@ -499,7 +499,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each per user pool. - * + * * @return The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each per user pool. */ @@ -510,7 +510,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Sets the default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each per user pool. - * + * * @param timeBetweenEvictionRunsMillis * The default value for {@link org.apache.commons.pool2.impl.GenericObjectPool * GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each per user pool. @@ -688,7 +688,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Gets the value of jndiEnvironment which is used when instantiating a JNDI InitialContext. This InitialContext is * used to locate the backend ConnectionPoolDataSource. - * + * * @param key * JNDI environment key. * @return value of jndiEnvironment. @@ -735,7 +735,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Get the value of loginTimeout. - * + * * @return value of loginTimeout. */ @Override @@ -745,7 +745,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Set the value of loginTimeout. - * + * * @param v * Value to assign to loginTimeout. */ @@ -756,7 +756,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Get the value of logWriter. - * + * * @return value of logWriter. */ @Override @@ -769,7 +769,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Set the value of logWriter. - * + * * @param v * Value to assign to logWriter. */ @@ -782,7 +782,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable * Gets the SQL query that will be used to validate connections from this pool before returning them to the caller. * If specified, this query <strong>MUST</strong> be an SQL SELECT statement that returns at least one row. If not * specified, {@link Connection#isValid(int)} will be used to validate connections. - * + * * @return The SQL query that will be used to validate connections from this pool before returning them to the * caller. */ @@ -794,7 +794,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable * Sets the SQL query that will be used to validate connections from this pool before returning them to the caller. * If specified, this query <strong>MUST</strong> be an SQL SELECT statement that returns at least one row. If not * specified, connections will be validated using {@link Connection#isValid(int)}. - * + * * @param validationQuery * The SQL query that will be used to validate connections from this pool before returning them to the * caller. @@ -806,7 +806,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Returns the timeout in seconds before the validation query fails. - * + * * @return The timeout in seconds before the validation query fails. */ public int getValidationQueryTimeout() { @@ -849,7 +849,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable /** * Returns the maximum permitted lifetime of a connection in milliseconds. A value of zero or less indicates an * infinite lifetime. - * + * * @return The maximum permitted lifetime of a connection in milliseconds. A value of zero or less indicates an * infinite lifetime. */ @@ -867,7 +867,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable * time one of the following methods is invoked: <code>getConnection, setLogwriter, * setLoginTimeout, getLoginTimeout, getLogWriter.</code> * </p> - * + * * @param maxConnLifetimeMillis * The maximum permitted lifetime of a connection in milliseconds. A value of zero or less indicates an * infinite lifetime. @@ -926,7 +926,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable } // Password on PooledConnectionAndInfo does not match - if (!(null == userPassword ? null == info.getPassword() : userPassword.equals(info.getPassword()))) { + if (!(null == userPassword ? null == info.getPassword() : userPassword.equals(info.getPassword()))) { try { // See if password has changed by attempting connection testCPDS(userName, userPassword); } catch (final SQLException ex) { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/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 160b78f..cfef246 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java @@ -70,7 +70,7 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory<UserPassKey /** * Create a new {@code KeyedPoolableConnectionFactory}. - * + * * @param cpds * the ConnectionPoolDataSource from which to obtain PooledConnections * @param validationQuery http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java index c0dceef..f34b127 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java @@ -145,7 +145,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the number of active connections in the default pool. - * + * * @return The number of active connections in the default pool. */ public int getNumActive() { @@ -154,7 +154,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the number of active connections in the pool for a given user. - * + * * @param userName The user name key. * @return The user specific value. */ @@ -166,7 +166,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the number of idle connections in the default pool. - * + * * @return The number of idle connections in the default pool. */ public int getNumIdle() { @@ -176,7 +176,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the number of idle connections in the pool for a given user. - * + * * @param userName The user name key. * @return The user specific value. */ @@ -189,7 +189,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getBlockWhenExhausted()} for the specified user's pool * or the default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -207,7 +207,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific default value for {@link Connection#setAutoCommit(boolean)} for the specified user's pool. - * + * * @param userName * The user name key. * @return The user specific value. @@ -223,7 +223,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific default value for {@link Connection#setReadOnly(boolean)} for the specified user's pool. - * + * * @param userName * The user name key. * @return The user specific value. @@ -239,7 +239,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific default value for {@link Connection#setTransactionIsolation(int)} for the specified user's * pool. - * + * * @param userName * The user name key. * @return The user specific value. @@ -255,7 +255,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getEvictionPolicyClassName()} for the specified user's * pool or the default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -275,7 +275,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getLifo()} for the specified user's pool or the default * if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -294,7 +294,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getMaxIdle()} for the specified user's pool or the * default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -313,7 +313,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getMaxTotal()} for the specified user's pool or the * default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -333,7 +333,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getMaxWaitMillis()} for the specified user's pool or * the default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -352,7 +352,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getMinEvictableIdleTimeMillis()} for the specified * user's pool or the default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -371,7 +371,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getMinIdle()} for the specified user's pool or the * default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -391,7 +391,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getNumTestsPerEvictionRun()} for the specified user's * pool or the default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -410,7 +410,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for the specified * user's pool or the default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -429,7 +429,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getTestOnBorrow()} for the specified user's pool or the * default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -449,7 +449,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getTestOnCreate()} for the specified user's pool or the * default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -468,7 +468,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getTestOnReturn()} for the specified user's pool or the * default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -487,7 +487,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getTestWhileIdle()} for the specified user's pool or * the default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -507,7 +507,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Gets the user specific value for {@link GenericObjectPool#getTimeBetweenEvictionRunsMillis()} for the specified * user's pool or the default if no user specific value is defined. - * + * * @param userName * The user name key. * @return The user specific value. @@ -678,9 +678,9 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getBlockWhenExhausted()} for the specified user's pool. - * + * * @param userName The user name key. - * @param value The user specific value. + * @param value The user specific value. */ public void setPerUserBlockWhenExhausted(final String userName, final Boolean value) { assertInitializationAllowed(); @@ -702,7 +702,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific default value for {@link Connection#setAutoCommit(boolean)} for the specified user's pool. - * + * * @param userName * The user name key. * @param value @@ -729,7 +729,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific default value for {@link Connection#setReadOnly(boolean)} for the specified user's pool. - * + * * @param userName * The user name key. * @param value @@ -758,7 +758,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific default value for {@link Connection#setTransactionIsolation(int)} for the specified user's * pool. - * + * * @param userName * The user name key. * @param value @@ -786,7 +786,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getEvictionPolicyClassName()} for the specified user's * pool. - * + * * @param userName * The user name key. * @param value @@ -812,7 +812,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getLifo()} for the specified user's pool. - * + * * @param userName * The user name key. * @param value @@ -839,7 +839,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getMaxIdle()} for the specified user's pool. - * + * * @param userName * The user name key. * @param value @@ -865,7 +865,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getMaxTotal()} for the specified user's pool. - * + * * @param userName * The user name key. * @param value @@ -893,7 +893,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getMaxWaitMillis()} for the specified user's pool. - * + * * @param userName * The user name key. * @param value @@ -923,7 +923,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getMinEvictableIdleTimeMillis()} for the specified user's * pool. - * + * * @param userName * The user name key. * @param value @@ -949,7 +949,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getMinIdle()} for the specified user's pool. - * + * * @param userName * The user name key. * @param value @@ -978,7 +978,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getNumTestsPerEvictionRun()} for the specified user's * pool. - * + * * @param userName * The user name key. * @param value @@ -1006,7 +1006,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for the specified * user's pool. - * + * * @param userName * The user name key. * @param value @@ -1032,7 +1032,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getTestOnBorrow()} for the specified user's pool. - * + * * @param userName * The user name key. * @param value @@ -1059,9 +1059,9 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getTestOnCreate()} for the specified user's pool. - * + * * @param userName The user name key. - * @param value The user specific value. + * @param value The user specific value. */ public void setPerUserTestOnCreate(final String userName, final Boolean value) { assertInitializationAllowed(); @@ -1084,9 +1084,9 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getTestOnReturn()} for the specified user's pool. - * + * * @param userName The user name key. - * @param value The user specific value. + * @param value The user specific value. */ public void setPerUserTestOnReturn(final String userName, final Boolean value) { assertInitializationAllowed(); @@ -1109,9 +1109,9 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getTestWhileIdle()} for the specified user's pool. - * + * * @param userName The user name key. - * @param value The user specific value. + * @param value The user specific value. */ public void setPerUserTestWhileIdle(final String userName, final Boolean value) { assertInitializationAllowed(); @@ -1134,9 +1134,9 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { /** * Sets a user specific value for {@link GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for the specified * user's pool. - * + * * @param userName The user name key. - * @param value The user specific value. + * @param value The user specific value. */ public void setPerUserTimeBetweenEvictionRunsMillis(final String userName, final Long value) { assertInitializationAllowed(); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java b/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java index 3a0414d..68b0ff4 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java @@ -61,7 +61,7 @@ final class PooledConnectionAndInfo { /** * Gets the value of password. - * + * * @return value of password. */ String getPassword() { @@ -70,7 +70,7 @@ final class PooledConnectionAndInfo { /** * Gets the value of password. - * + * * @return value of password. * @since 2.4.0 */ @@ -80,7 +80,7 @@ final class PooledConnectionAndInfo { /** * Gets the value of userName. - * + * * @return value of userName. */ String getUsername() { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java b/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java index 17af372..dfb0080 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java @@ -27,7 +27,7 @@ import javax.sql.PooledConnection; * @since 2.0 */ interface PooledConnectionManager { - + /** * Closes the PooledConnection and remove it from the connection pool * to which it belongs, adjusting pool counters. http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java index e84aa7f..e692f85 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java @@ -82,7 +82,7 @@ public class SharedPoolDataSource extends InstanceKeyDataSource { /** * Gets {@link GenericKeyedObjectPool#getMaxTotal()} for this pool. - * + * * @return {@link GenericKeyedObjectPool#getMaxTotal()} for this pool. */ public int getMaxTotal() { @@ -91,8 +91,8 @@ public class SharedPoolDataSource extends InstanceKeyDataSource { /** * Sets {@link GenericKeyedObjectPool#getMaxTotal()} for this pool. - * - * @param maxTotal {@link GenericKeyedObjectPool#getMaxTotal()} for this pool. + * + * @param maxTotal {@link GenericKeyedObjectPool#getMaxTotal()} for this pool. */ public void setMaxTotal(final int maxTotal) { assertInitializationAllowed(); @@ -105,7 +105,7 @@ public class SharedPoolDataSource extends InstanceKeyDataSource { /** * Gets the number of active connections in the pool. - * + * * @return The number of active connections in the pool. */ public int getNumActive() { @@ -114,8 +114,8 @@ public class SharedPoolDataSource extends InstanceKeyDataSource { /** * Gets the number of idle connections in the pool. - * - * @return The number of idle connections in the pool. + * + * @return The number of idle connections in the pool. */ public int getNumIdle() { return pool == null ? 0 : pool.getNumIdle(); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java index 55b4a8f..199ddb1 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java @@ -87,7 +87,7 @@ class UserPassKey implements Serializable { /** * Gets the value of password. - * + * * @return value of password. */ public String getPassword() { @@ -96,7 +96,7 @@ class UserPassKey implements Serializable { /** * Gets the value of password. - * + * * @return value of password. */ public char[] getPasswordCharArray() { @@ -105,7 +105,7 @@ class UserPassKey implements Serializable { /** * Gets the value of user name. - * + * * @return value of user name. */ public String getUsername() { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java index 9fc867c..12fe740 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java @@ -53,16 +53,16 @@ import java.sql.SQLException; * @since 2.0 */ public class BasicManagedDataSource extends BasicDataSource { - + /** Transaction Registry */ private TransactionRegistry transactionRegistry; - + /** Transaction Manager */ private transient TransactionManager transactionManager; - + /** XA data source class name */ private String xaDataSource; - + /** XA data source instance */ private XADataSource xaDataSourceInstance; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java index 83f340f..4237171 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java @@ -105,7 +105,7 @@ public class DataSourceXAConnectionFactory implements XAConnectionFactory { /** * Sets the password used to authenticate new connections. - * + * * @param userPassword * the password used for authenticating the connection or null for unauthenticated. * @since 2.4.0 @@ -116,7 +116,7 @@ public class DataSourceXAConnectionFactory implements XAConnectionFactory { /** * Sets the password used to authenticate new connections. - * + * * @param userPassword * the password used for authenticating the connection or null for unauthenticated */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/57132135/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java index 279e107..b2ffe80 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java @@ -159,7 +159,7 @@ public class TransactionContext { /** * Sets the transaction complete flag to true. - * + * * @since 2.4.0 */ public void completeTransaction() { @@ -168,9 +168,9 @@ public class TransactionContext { /** * Gets the transaction complete flag to true. - * - * @return The transaction complete flag. - * + * + * @return The transaction complete flag. + * * @since 2.4.0 */ public boolean isTransactionComplete() {
