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
The following commit(s) were added to refs/heads/master by this push:
new 91f3ccbf No need for blank Javadoc lines between Javadoc @ tags
91f3ccbf is described below
commit 91f3ccbf94585fd2a9a29e870a1d11a22510047c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Nov 28 12:31:27 2024 -0500
No need for blank Javadoc lines between Javadoc @ tags
---
src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 6 ------
src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java | 2 --
src/main/java/org/apache/commons/dbcp2/PoolingConnection.java | 1 -
.../commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java | 2 --
.../java/org/apache/commons/dbcp2/managed/TransactionContext.java | 1 -
src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java | 2 --
6 files changed, 14 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index 259835df..e38ee67e 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -466,7 +466,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* </p>
*
* @return A new connection factory.
- *
* @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
@@ -572,7 +571,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* implementation class.
*
* @throws SQLException if unable to create a datasource instance
- *
* @return A new DataSource instance
*/
protected DataSource createDataSourceInstance() throws SQLException {
@@ -607,7 +605,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @param driverConnectionFactory JDBC connection factory
* @throws SQLException if an error occurs creating the
PoolableConnectionFactory
- *
* @return A new PoolableConnectionFactory configured with the current
configuration of this BasicDataSource
*/
protected PoolableConnectionFactory createPoolableConnectionFactory(final
ConnectionFactory driverConnectionFactory)
@@ -728,7 +725,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @param user Database user on whose behalf the Connection is being made
* @param pass The database user's password
- *
* @throws UnsupportedOperationException always thrown.
* @throws SQLException if a database access error occurs
* @return nothing - always throws UnsupportedOperationException
@@ -1414,7 +1410,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the {code testOnBorrow} property.
*
* @return true if objects are validated before being borrowed from the
pool
- *
* @see #setTestOnBorrow(boolean)
*/
@Override
@@ -1526,7 +1521,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* and reclaim pool capacity.
*
* @param connection The Connection to invalidate.
- *
* @throws IllegalStateException if invalidating the connection failed.
* @since 2.1
*/
diff --git a/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
b/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
index c28bd1f6..f5d9d09c 100644
--- a/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
+++ b/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
@@ -348,7 +348,6 @@ public interface DataSourceMXBean {
* See {@link BasicDataSource#restart()}
*
* @throws SQLException if an error occurs initializing the data source.
- *
* @since 2.8.0
*/
default void restart() throws SQLException {
@@ -359,7 +358,6 @@ public interface DataSourceMXBean {
* See {@link BasicDataSource#start()}
*
* @throws SQLException if an error occurs initializing the data source.
- *
* @since 2.8.0
*/
default void start() throws SQLException {
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index a5fe2b34..f3941648 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -377,7 +377,6 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
* Normalizes the given SQL statement, producing a canonical form that is
semantically equivalent to the original.
*
* @param sql The statement to be normalized.
- *
* @return The canonical form of the supplied SQL statement.
*/
protected String normalizeSQL(final String sql) {
diff --git
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
index a9f8c280..376a3e05 100644
---
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
+++
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
@@ -78,7 +78,6 @@ abstract class InstanceKeyDataSourceFactory implements
ObjectFactory {
* Data to deserialize to create the configuration parameter.
*
* @return The Object created by deserializing the data.
- *
* @throws ClassNotFoundException
* If a class cannot be found during the deserialization of a
configuration parameter.
* @throws IOException
@@ -129,7 +128,6 @@ abstract class InstanceKeyDataSourceFactory implements
ObjectFactory {
* The properties to be set on the created DataSource
*
* @return A configured DataSource of the appropriate type.
- *
* @throws ClassNotFoundException
* If a class cannot be found during the deserialization of a
configuration parameter.
* @throws IOException
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 e44a487d..ad26646f 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
@@ -161,7 +161,6 @@ public class TransactionContext {
* Gets the transaction complete flag to true.
*
* @return The transaction complete flag.
- *
* @since 2.4.0
*/
public boolean isTransactionComplete() {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
index 7f09aab9..cd655d01 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
@@ -331,7 +331,6 @@ public abstract class TestConnectionPool {
* @param expectError whether or not an error is expected
* @param loopOnce whether threads should complete the borrow - hold -
return cycle only once, or loop indefinitely
* @param maxWaitDuration passed in by client - has no impact on the test
itself, but does get reported
- *
* @throws Exception
*/
protected void multipleThreads(final Duration holdDuration,
@@ -353,7 +352,6 @@ public abstract class TestConnectionPool {
* @param maxWaitDuration passed in by client - has no impact on the test
itself, but does get reported
* @param numThreads the number of threads
* @param duration duration in ms of test
- *
* @throws Exception
*/
protected void multipleThreads(final Duration holdDuration,
