This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7af6293f10bddeef999a94a463f149a2dac8cd66
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 3 12:07:26 2024 +0000
Align with Commons DBCP
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 6 ------
java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 2 --
java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java | 1 -
4 files changed, 10 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index e6b86e07d6..50b21d6ae6 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -465,7 +465,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 {
@@ -571,7 +570,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 {
@@ -606,7 +604,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)
@@ -727,7 +724,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
@@ -1413,7 +1409,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
@@ -1525,7 +1520,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/java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java
b/java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java
index 2f40c52b81..b70b6dacc4 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java
@@ -356,7 +356,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 {
@@ -367,7 +366,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/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
index addd13564a..fbf8f5e2c0 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
@@ -449,7 +449,6 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
* </p>
*
* @return The innermost delegate, may return null.
- *
* @see #getDelegate
*/
public Statement getInnermostDelegate() {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
index 76d013033c..2422c70465 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
@@ -373,7 +373,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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
