You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/06/23 12:16:44 UTC
[commons-dbcp] branch master updated (1a8b173 -> 7790b7c)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git.
from 1a8b173 Simplify Assertions #113.
new e4a295a Organize imports, use final, remove super call, inline local var.
new 7790b7c Fix Javadoc warnings.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/commons/dbcp2/DelegatingConnection.java | 4 +--
.../commons/dbcp2/datasources/CharArray.java | 3 +-
.../dbcp2/datasources/InstanceKeyDataSource.java | 9 +++++-
.../commons/dbcp2/datasources/UserPassKey.java | 3 +-
.../dbcp2/managed/BasicManagedDataSource.java | 14 ++++----
.../managed/DataSourceXAConnectionFactory.java | 8 ++---
.../dbcp2/managed/LocalXAConnectionFactory.java | 9 +++---
.../commons/dbcp2/managed/ManagedConnection.java | 6 ++--
.../commons/dbcp2/managed/ManagedDataSource.java | 6 ++--
.../commons/dbcp2/managed/TransactionContext.java | 9 +++---
.../dbcp2/TestAbandonedBasicDataSource.java | 2 +-
.../apache/commons/dbcp2/TestConnectionPool.java | 20 ++++++------
.../java/org/apache/commons/dbcp2/TestJndi.java | 2 +-
.../org/apache/commons/dbcp2/TestPStmtPooling.java | 2 +-
.../dbcp2/TestParallelCreationWithNoIdle.java | 10 +++---
.../commons/dbcp2/TestPoolingConnection.java | 2 +-
.../commons/dbcp2/TesterCallableStatement.java | 6 ++--
.../org/apache/commons/dbcp2/TesterConnection.java | 14 ++++----
.../commons/dbcp2/TesterPreparedStatement.java | 10 +++---
.../org/apache/commons/dbcp2/TesterResultSet.java | 10 +++---
.../datasources/TestInstanceKeyDataSource.java | 1 +
.../dbcp2/managed/TestBasicManagedDataSource.java | 32 ++++++++++---------
.../dbcp2/managed/TestManagedConnection.java | 2 +-
.../dbcp2/managed/TestManagedDataSource.java | 10 +++---
.../dbcp2/managed/TestSynchronizationOrder.java | 37 +++++++++++-----------
.../dbcp2/managed/TestTransactionContext.java | 9 +++---
26 files changed, 126 insertions(+), 114 deletions(-)
[commons-dbcp] 01/02: Organize imports, use final, remove super call,
inline local var.
Posted by gg...@apache.org.
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 e4a295ab62679cc54fa95f1de2a14ffbfc577199
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jun 23 08:00:41 2021 -0400
Organize imports, use final, remove super call, inline local var.
---
.../apache/commons/dbcp2/DelegatingConnection.java | 4 +--
.../commons/dbcp2/datasources/CharArray.java | 3 +-
.../dbcp2/datasources/InstanceKeyDataSource.java | 1 +
.../commons/dbcp2/datasources/UserPassKey.java | 3 +-
.../dbcp2/managed/BasicManagedDataSource.java | 14 ++++----
.../managed/DataSourceXAConnectionFactory.java | 8 ++---
.../dbcp2/managed/LocalXAConnectionFactory.java | 9 +++---
.../commons/dbcp2/managed/ManagedConnection.java | 6 ++--
.../commons/dbcp2/managed/ManagedDataSource.java | 6 ++--
.../commons/dbcp2/managed/TransactionContext.java | 9 +++---
.../dbcp2/TestAbandonedBasicDataSource.java | 2 +-
.../apache/commons/dbcp2/TestConnectionPool.java | 20 ++++++------
.../java/org/apache/commons/dbcp2/TestJndi.java | 2 +-
.../org/apache/commons/dbcp2/TestPStmtPooling.java | 2 +-
.../dbcp2/TestParallelCreationWithNoIdle.java | 10 +++---
.../commons/dbcp2/TestPoolingConnection.java | 2 +-
.../commons/dbcp2/TesterCallableStatement.java | 6 ++--
.../org/apache/commons/dbcp2/TesterConnection.java | 14 ++++----
.../commons/dbcp2/TesterPreparedStatement.java | 10 +++---
.../org/apache/commons/dbcp2/TesterResultSet.java | 10 +++---
.../datasources/TestInstanceKeyDataSource.java | 1 +
.../dbcp2/managed/TestBasicManagedDataSource.java | 32 ++++++++++---------
.../dbcp2/managed/TestManagedConnection.java | 2 +-
.../dbcp2/managed/TestManagedDataSource.java | 10 +++---
.../dbcp2/managed/TestSynchronizationOrder.java | 37 +++++++++++-----------
.../dbcp2/managed/TestTransactionContext.java | 9 +++---
26 files changed, 119 insertions(+), 113 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index 969f250..a9be933 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -248,7 +248,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
/**
* Handles the given exception by throwing it.
- *
+ *
* @param e the exception to throw.
* @throws SQLException the exception to throw.
*/
@@ -270,7 +270,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
/**
* Initializes the given statement with this connection's settings.
- *
+ *
* @param <T> The DelegatingStatement type.
* @param delegatingStatement The DelegatingStatement to initialize.
* @return The given DelegatingStatement.
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CharArray.java b/src/main/java/org/apache/commons/dbcp2/datasources/CharArray.java
index e6d299a..d9f0929 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/CharArray.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/CharArray.java
@@ -47,8 +47,7 @@ final class CharArray {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + Arrays.hashCode(chars);
- return result;
+ return prime * result + Arrays.hashCode(chars);
}
@Override
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 9d2aa60..f35da6d 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -892,6 +892,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable
* infinite lifetime.
* @deprecated Use {@link #getMaxConnLifetime()}.
*/
+ @Deprecated
public long getMaxConnLifetimeMillis() {
return maxConnLifetimeMillis.toMillis();
}
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 da9ec03..5bbfa91 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
@@ -43,8 +43,7 @@ class UserPassKey implements Serializable {
private final CharArray name;
private final CharArray password;
- UserPassKey(CharArray userName, CharArray userPassword) {
- super();
+ UserPassKey(final CharArray userName, final CharArray userPassword) {
this.name = userName;
this.password = userPassword;
}
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 25c7619..f3b639f 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
@@ -17,19 +17,19 @@
*/
package org.apache.commons.dbcp2.managed;
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.apache.commons.dbcp2.ConnectionFactory;
-import org.apache.commons.dbcp2.PoolableConnection;
-import org.apache.commons.dbcp2.PoolableConnectionFactory;
-import org.apache.commons.dbcp2.PoolingDataSource;
-import org.apache.commons.dbcp2.Utils;
+import java.sql.SQLException;
import javax.sql.DataSource;
import javax.sql.XADataSource;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
-import java.sql.SQLException;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.PoolableConnection;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.PoolingDataSource;
+import org.apache.commons.dbcp2.Utils;
/**
* <p>
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 07e6f4e..4fdb705 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
@@ -17,6 +17,10 @@
*/
package org.apache.commons.dbcp2.managed;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Objects;
+
import javax.sql.ConnectionEvent;
import javax.sql.ConnectionEventListener;
import javax.sql.PooledConnection;
@@ -28,10 +32,6 @@ import javax.transaction.xa.XAResource;
import org.apache.commons.dbcp2.Utils;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Objects;
-
/**
* An implementation of XAConnectionFactory which uses a real XADataSource to obtain connections and XAResources.
*
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
index 8b15b17..7859473 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
@@ -17,16 +17,17 @@
*/
package org.apache.commons.dbcp2.managed;
-import org.apache.commons.dbcp2.ConnectionFactory;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Objects;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Objects;
+
+import org.apache.commons.dbcp2.ConnectionFactory;
/**
* An implementation of XAConnectionFactory which manages non-XA connections in XA transactions. A non-XA connection
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
index e964509..784380a 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
@@ -17,14 +17,14 @@
*/
package org.apache.commons.dbcp2.managed;
-import org.apache.commons.dbcp2.DelegatingConnection;
-import org.apache.commons.pool2.ObjectPool;
-
import java.sql.Connection;
import java.sql.SQLException;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import org.apache.commons.dbcp2.DelegatingConnection;
+import org.apache.commons.pool2.ObjectPool;
+
/**
* ManagedConnection is responsible for managing a database connection in a transactional environment (typically called
* "Container Managed"). A managed connection operates like any other connection when no global transaction (a.k.a. XA
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java b/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
index bf25d59..d15469c 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
@@ -17,13 +17,13 @@
*/
package org.apache.commons.dbcp2.managed;
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.dbcp2.PoolingDataSource;
-
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
+import org.apache.commons.dbcp2.PoolingDataSource;
+import org.apache.commons.pool2.ObjectPool;
+
/**
* The ManagedDataSource is a PoolingDataSource that creates ManagedConnections.
*
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 9e0f913..66a5937 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
@@ -17,6 +17,11 @@
*/
package org.apache.commons.dbcp2.managed;
+import java.lang.ref.WeakReference;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Objects;
+
import javax.transaction.RollbackException;
import javax.transaction.Status;
import javax.transaction.Synchronization;
@@ -24,10 +29,6 @@ import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Objects;
-import java.lang.ref.WeakReference;
/**
* TransactionContext represents the association between a single XAConnectionFactory and a Transaction. This context
diff --git a/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
index 5b4cc77..c2d383e 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
@@ -24,8 +24,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.sql.Connection;
import java.sql.CallableStatement;
+import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
diff --git a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
index 71c0d7e..900eeb7 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
@@ -17,6 +17,16 @@
package org.apache.commons.dbcp2;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -30,16 +40,6 @@ import java.util.Stack;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
// XXX FIX ME XXX
// this class still needs some cleanup, but at least
// this consolidates most of the relevant test code
diff --git a/src/test/java/org/apache/commons/dbcp2/TestJndi.java b/src/test/java/org/apache/commons/dbcp2/TestJndi.java
index c263bd2..ed92277 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestJndi.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestJndi.java
@@ -26,8 +26,8 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
import org.apache.commons.dbcp2.datasources.PerUserPoolDataSource;
+import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
index 631392c..671ffde 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
@@ -26,8 +26,8 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
-import java.sql.Statement;
import java.sql.SQLException;
+import java.sql.Statement;
import javax.management.ObjectName;
import javax.sql.DataSource;
diff --git a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
index e20922d..20fa071 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
@@ -16,10 +16,7 @@
*/
package org.apache.commons.dbcp2;
-import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -29,7 +26,10 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test if the pooling if no idle objects are used
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index 31d8252..58ff9e6 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.dbcp2;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.commons.pool2.KeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java b/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
index 5230a03..0fa283e 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
@@ -27,16 +27,16 @@ import java.sql.CallableStatement;
import java.sql.Clob;
import java.sql.Connection;
import java.sql.Date;
+import java.sql.NClob;
import java.sql.Ref;
+import java.sql.RowId;
import java.sql.SQLException;
import java.sql.SQLType;
+import java.sql.SQLXML;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Map;
-import java.sql.NClob;
-import java.sql.RowId;
-import java.sql.SQLXML;
/**
* Trivial implementation of a CallableStatement to avoid null pointer exceptions in tests.
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
index f664f33..2ed3891 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
@@ -17,21 +17,21 @@
package org.apache.commons.dbcp2;
+import java.sql.Array;
+import java.sql.Blob;
import java.sql.CallableStatement;
+import java.sql.Clob;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
+import java.sql.NClob;
import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
import java.sql.SQLException;
import java.sql.SQLWarning;
-import java.sql.Statement;
-import java.util.Map;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.NClob;
-import java.sql.SQLClientInfoException;
import java.sql.SQLXML;
+import java.sql.Statement;
import java.sql.Struct;
+import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
index 4bffa0c..b9b51f7 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
@@ -17,23 +17,23 @@
package org.apache.commons.dbcp2;
+import java.io.InputStream;
+import java.io.Reader;
import java.math.BigDecimal;
import java.sql.Array;
import java.sql.Blob;
import java.sql.Clob;
import java.sql.Connection;
+import java.sql.NClob;
import java.sql.PreparedStatement;
import java.sql.Ref;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
+import java.sql.RowId;
import java.sql.SQLException;
import java.sql.SQLType;
-import java.util.Calendar;
-import java.io.InputStream;
-import java.io.Reader;
-import java.sql.NClob;
-import java.sql.RowId;
import java.sql.SQLXML;
+import java.util.Calendar;
/**
* A dummy {@link PreparedStatement}, for testing purposes.
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
index fdfbc38..effcc46 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
@@ -17,25 +17,25 @@
package org.apache.commons.dbcp2;
+import java.io.InputStream;
+import java.io.Reader;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.sql.Array;
import java.sql.Blob;
import java.sql.Clob;
+import java.sql.NClob;
import java.sql.Ref;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
+import java.sql.RowId;
import java.sql.SQLException;
import java.sql.SQLType;
import java.sql.SQLWarning;
+import java.sql.SQLXML;
import java.sql.Statement;
import java.util.Calendar;
import java.util.Map;
-import java.io.InputStream;
-import java.io.Reader;
-import java.sql.NClob;
-import java.sql.RowId;
-import java.sql.SQLXML;
/**
* A dummy {@link ResultSet}, for testing purposes.
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
index 950a1a6..6abf6b0 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
@@ -30,6 +30,7 @@ import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
+
import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
index 35e6277..34b9a06 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
@@ -17,28 +17,30 @@
*/
package org.apache.commons.dbcp2.managed;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple;
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.apache.commons.dbcp2.TestBasicDataSource;
-import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import org.h2.Driver;
-import org.h2.jdbcx.JdbcDataSource;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.sql.Connection;
+import java.sql.SQLException;
import javax.sql.XADataSource;
import javax.transaction.Synchronization;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.TestBasicDataSource;
+import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.h2.Driver;
+import org.h2.jdbcx.JdbcDataSource;
+import org.junit.jupiter.api.Test;
+
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple;
/**
* TestSuite for BasicManagedDataSource
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
index 19ff91c..52b5b73 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
@@ -17,7 +17,7 @@
*/
package org.apache.commons.dbcp2.managed;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.lang.reflect.Field;
import java.sql.Connection;
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
index 09e733b..71370ed 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
@@ -25,6 +25,11 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.sql.Connection;
+import java.util.Properties;
+
+import javax.transaction.TransactionManager;
+
import org.apache.commons.dbcp2.ConnectionFactory;
import org.apache.commons.dbcp2.Constants;
import org.apache.commons.dbcp2.DelegatingConnection;
@@ -41,11 +46,6 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.transaction.TransactionManager;
-
-import java.sql.Connection;
-import java.util.Properties;
-
/**
* TestSuite for ManagedDataSource without a transaction in progress.
*/
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
index 234ebf9..3bdb208 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
@@ -17,14 +17,17 @@
*/
package org.apache.commons.dbcp2.managed;
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.apache.commons.dbcp2.DelegatingConnection;
-import org.apache.commons.dbcp2.PoolableConnectionFactory;
-import org.apache.commons.dbcp2.TesterClassLoader;
-import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
@@ -39,17 +42,15 @@ import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.DelegatingConnection;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.TesterClassLoader;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestSynchronizationOrder {
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java b/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java
index 5ee0eba..702e9e9 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java
@@ -17,14 +17,15 @@
*/
package org.apache.commons.dbcp2.managed;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.sql.SQLException;
+
import javax.transaction.xa.XAResource;
-import org.junit.jupiter.api.Test;
-import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
import org.apache.geronimo.transaction.manager.TransactionImpl;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.junit.jupiter.api.Test;
/**
* TestSuite for TransactionContext
[commons-dbcp] 02/02: Fix Javadoc warnings.
Posted by gg...@apache.org.
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 7790b7c6fc75c27f9ff053a1415beb940c3cd385
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jun 23 08:16:40 2021 -0400
Fix Javadoc warnings.
---
.../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 f35da6d..352ae92 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -1037,7 +1037,13 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable
}
/**
- * This method is protected but can only be implemented in this package because PooledConnectionAndInfo is a package private type.
+ * This method is protected but can only be implemented in this package because PooledConnectionAndInfo is a package
+ * private type.
+ *
+ * @param userName The user name.
+ * @param userPassword The user password.
+ * @return Matching PooledConnectionAndInfo.
+ * @throws SQLException Connection or registration failure.
*/
protected abstract PooledConnectionAndInfo getPooledConnectionAndInfo(String userName, String userPassword)
throws SQLException;