This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit b4a0c6cf985440545bd48c5739bd41ea052b0d7f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Sep 21 10:58:06 2020 -0400
Remove trailing whitespace.
---
.../apache/commons/dbcp2/BasicDataSourceMXBean.java | 4 ++--
.../commons/dbcp2/PoolableConnectionFactory.java | 6 +++---
.../org/apache/commons/dbcp2/PoolingConnection.java | 20 ++++++++++----------
.../commons/dbcp2/TestBasicDataSourceMXBean.java | 2 +-
.../commons/dbcp2/TestDelegatingConnection.java | 2 +-
.../dbcp2/TestPStmtPoolingBasicDataSource.java | 14 +++++++-------
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
index 3d3033b..b103641 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
@@ -135,14 +135,14 @@ public interface BasicDataSourceMXBean {
/**
* See {@link BasicDataSource#isClearStatementPoolOnReturn()}
- *
+ *
* @return {@link BasicDataSource#isClearStatementPoolOnReturn()}
* @since 2.8.0
*/
default boolean isClearStatementPoolOnReturn() {
return false;
}
-
+
/**
* See {@link BasicDataSource#getMaxOpenPreparedStatements()}
*
diff --git
a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index c744f49..15c30ad 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -601,16 +601,16 @@ public class PoolableConnectionFactory implements
PooledObjectFactory<PoolableCo
}
/**
- * Sets whether the pool of statements (which was enabled with {@link
#setPoolStatements(boolean)}) should
+ * Sets whether the pool of statements (which was enabled with {@link
#setPoolStatements(boolean)}) should
* be cleared when the connection is returned to its pool. Default is
false.
- *
+ *
* @param clearStatementPoolOnReturn clear or not
* @since 2.8.0
*/
public void setClearStatementPoolOnReturn(final boolean
clearStatementPoolOnReturn) {
this.clearStatementPoolOnReturn = clearStatementPoolOnReturn;
}
-
+
public void setRollbackOnReturn(final boolean rollbackOnReturn) {
this.rollbackOnReturn = rollbackOnReturn;
}
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index ac1d489..4b856ff 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -66,7 +66,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
private KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> pstmtPool;
private boolean clearStatementPoolOnReturn = false;
-
+
/**
* Constructor.
*
@@ -120,7 +120,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
/**
* Notification from {@link PoolableConnection} that we returned to the
pool.
- *
+ *
* @throws SQLException when <code>clearStatementPoolOnReturn</code> is
true and the statement pool could not be
* cleared
* @since 2.8.0
@@ -319,7 +319,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
/**
* Returns the prepared statement pool we're using.
- *
+ *
* @return statement pool
* @since 2.8.0
*/
@@ -385,7 +385,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
/**
* Creates or obtains a {@link CallableStatement} from the pool.
*
- * @param key
+ * @param key
* a {@link PStmtKey} for the given arguments
* @return a {@link PoolableCallableStatement}
* @throws SQLException
@@ -453,7 +453,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
/**
* Creates or obtains a {@link PreparedStatement} from the pool.
*
- * @param key
+ * @param key
* a {@link PStmtKey} for the given arguments
* @return a {@link PoolablePreparedStatement}
* @throws SQLException
@@ -516,7 +516,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
* @return a {@link PoolablePreparedStatement}
* @throws SQLException
* Wraps an underlying exception.
- *
+ *
*/
@Override
public PreparedStatement prepareStatement(final String sql, final int
columnIndexes[]) throws SQLException {
@@ -578,18 +578,18 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
public PreparedStatement prepareStatement(final String sql, final String
columnNames[]) throws SQLException {
return prepareStatement(createKey(sql, columnNames));
}
-
+
/**
- * Sets whether the pool of statements should be cleared when the
connection is returned to its pool.
+ * Sets whether the pool of statements should be cleared when the
connection is returned to its pool.
* Default is false.
- *
+ *
* @param clearStatementPoolOnReturn clear or not
* @since 2.8.0
*/
public void setClearStatementPoolOnReturn(final boolean
clearStatementPoolOnReturn) {
this.clearStatementPoolOnReturn = clearStatementPoolOnReturn;
}
-
+
/**
* Sets the prepared statement pool.
*
diff --git
a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
index f0f3a38..51f1185 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
@@ -45,7 +45,7 @@ public class TestBasicDataSourceMXBean {
public boolean isClearStatementPoolOnReturn() {
return false;
}
-
+
@Override
public boolean isClosed() {
return false;
diff --git
a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
index 02a836c..0e54e27 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
@@ -65,7 +65,7 @@ public class TestDelegatingConnection {
public NoReadOnlyOrAutoCommitConnection() {
super("","");
}
-
+
@Override
public void setReadOnly(boolean readOnly) {
// Do nothing
diff --git
a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
index e2d7e20..7d84056 100644
---
a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
+++
b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
@@ -237,7 +237,7 @@ public class TestPStmtPoolingBasicDataSource extends
TestBasicDataSource {
/**
* Tests clearStatementPoolOnReturn introduced with DBCP-566.
* When turned on, the statement pool must be empty after the connection
is closed.
- *
+ *
* @throws Exception
* @since 2.8.0
*/
@@ -253,9 +253,9 @@ public class TestPStmtPoolingBasicDataSource extends
TestBasicDataSource {
assertEquals(0, ds.getNumIdle());
@SuppressWarnings("unchecked")
- final DelegatingConnection<Connection> poolableConn =
+ final DelegatingConnection<Connection> poolableConn =
(DelegatingConnection<Connection>)
((DelegatingConnection<Connection>) conn1).getDelegateInternal();
- final KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> stmtPool
=
+ final KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> stmtPool =
((PoolingConnection)
poolableConn.getDelegateInternal()).getStatementPool();
final PreparedStatement stmt1 = conn1.prepareStatement("select 'a'
from dual");
@@ -263,17 +263,17 @@ public class TestPStmtPoolingBasicDataSource extends
TestBasicDataSource {
final Statement inner1 = ((DelegatingPreparedStatement)
stmt1).getInnermostDelegate();
assertNotNull(inner1);
stmt1.close();
-
+
final PreparedStatement stmt2 = conn1.prepareStatement("select 'a'
from dual");
assertNotNull(stmt2);
final Statement inner2 = ((DelegatingPreparedStatement)
stmt2).getInnermostDelegate();
assertNotNull(inner2);
assertSame(inner1, inner2); // from the same connection the statement
must be pooled
stmt2.close();
-
+
conn1.close();
assertTrue(inner1.isClosed());
-
+
assertEquals(0, stmtPool.getNumActive());
assertEquals(0, stmtPool.getNumIdle());
@@ -291,7 +291,7 @@ public class TestPStmtPoolingBasicDataSource extends
TestBasicDataSource {
assertNotNull(inner3);
assertNotSame(inner1, inner3); // when acquiring the connection the
next time, statement must be new
-
+
conn2.close();
}
