This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 502b648e46e13771fab432a84a1e044343c41d80 Author: Mark Thomas <[email protected]> AuthorDate: Thu Mar 5 09:55:24 2026 +0000 Align DBCP fork in 11.0.x with 12.0.x Cosmetic changes that fix a few IDE warnings --- .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 6 +- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 8 +- .../tomcat/dbcp/dbcp2/LocalStrings.properties | 2 +- java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java | 129 ++++++++++----------- .../tomcat/dbcp/dbcp2/PoolingDataSource.java | 2 +- .../datasources/PerUserPoolDataSourceFactory.java | 9 +- .../datasources/SharedPoolDataSourceFactory.java | 2 +- .../dbcp/dbcp2/managed/BasicManagedDataSource.java | 7 -- .../org/apache/tomcat/dbcp/pool2/PooledObject.java | 2 + .../dbcp/pool2/impl/BaseObjectPoolConfig.java | 1 + 10 files changed, 78 insertions(+), 90 deletions(-) diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java index 77793fc5af..a8c2d0f397 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java @@ -264,13 +264,13 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData { } /** - * If my underlying {@link ResultSet} is not a {@link DelegatingResultSet}, returns it, otherwise recursively invokes this method on my delegate. + * If my underlying {@link ResultSet} is not a {@code DelegatingResultSet}, returns it, otherwise recursively invokes this method on my delegate. * <p> - * Hence this method will return the first delegate that is not a {@link DelegatingResultSet}, or {@code null} when no non-{@link DelegatingResultSet} + * Hence this method will return the first delegate that is not a {@code DelegatingResultSet}, or {@code null} when no non-{@code DelegatingResultSet} * delegate can be found by traversing this chain. * </p> * <p> - * This method is useful when you may have nested {@link DelegatingResultSet}s, and you want to make sure to obtain a "genuine" {@link ResultSet}. + * This method is useful when you may have nested {@code DelegatingResultSet}s, and you want to make sure to obtain a "genuine" {@link ResultSet}. * </p> * * @return the innermost database meta data. diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java index e56b232d84..c40c1f8bac 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java @@ -595,14 +595,14 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS } /** - * If my underlying {@link ResultSet} is not a {@link DelegatingResultSet}, returns it, otherwise recursively + * If my underlying {@link ResultSet} is not a {@code DelegatingResultSet}, returns it, otherwise recursively * invokes this method on my delegate. * <p> - * Hence this method will return the first delegate that is not a {@link DelegatingResultSet}, or {@code null} when - * no non-{@link DelegatingResultSet} delegate can be found by traversing this chain. + * Hence this method will return the first delegate that is not a {@code DelegatingResultSet}, or {@code null} when + * no non-{@code DelegatingResultSet} delegate can be found by traversing this chain. * </p> * <p> - * This method is useful when you may have nested {@link DelegatingResultSet}s, and you want to make sure to obtain + * This method is useful when you may have nested {@code DelegatingResultSet}s, and you want to make sure to obtain * a "genuine" {@link ResultSet}. * </p> * diff --git a/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties b/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties index 88182ef17b..96b39628fa 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties +++ b/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties @@ -5,7 +5,7 @@ # (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # -# https://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java b/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java index 7b1936c717..40c85522ec 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java @@ -17,7 +17,6 @@ package org.apache.tomcat.dbcp.dbcp2; import java.sql.Connection; -import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; @@ -69,20 +68,20 @@ public class PStmtKey { private final String sql; /** - * Result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or - * {@link ResultSet#TYPE_SCROLL_SENSITIVE}. + * Result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or + * {@code ResultSet.TYPE_SCROLL_SENSITIVE}. */ private final Integer resultSetType; /** - * Result set concurrency. A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. + * Result set concurrency. A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. */ private final Integer resultSetConcurrency; /** - * Result set holdability. One of the following {@link ResultSet} constants: {@link ResultSet#HOLD_CURSORS_OVER_COMMIT} - * or {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}. + * Result set holdability. One of the following {@code ResultSet} constants: {@code ResultSet.HOLD_CURSORS_OVER_COMMIT} + * or {@code ResultSet.CLOSE_CURSORS_AT_COMMIT}. */ private final Integer resultSetHoldability; @@ -97,8 +96,8 @@ public class PStmtKey { private final String schema; /** - * A flag indicating whether auto-generated keys should be returned; one of {@link Statement#RETURN_GENERATED_KEYS} or - * {@link Statement#NO_GENERATED_KEYS}. + * A flag indicating whether auto-generated keys should be returned; one of {@code Statement.RETURN_GENERATED_KEYS} or + * {@code Statement.NO_GENERATED_KEYS}. */ private final Integer autoGeneratedKeys; @@ -137,10 +136,10 @@ public class PStmtKey { * Constructs a key to uniquely identify a prepared statement. * * @param sql The SQL statement. - * @param resultSetType A result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE}. - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. + * @param resultSetType A result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE}. + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. * @deprecated Use {@link #PStmtKey(String, String, String, int, int)}. */ @Deprecated @@ -166,7 +165,7 @@ public class PStmtKey { * @param sql The SQL statement. * @param catalog The catalog. * @param autoGeneratedKeys A flag indicating whether auto-generated keys should be returned; one of - * {@link Statement#RETURN_GENERATED_KEYS} or {@link Statement#NO_GENERATED_KEYS}. + * {@code Statement.RETURN_GENERATED_KEYS} or {@code Statement.NO_GENERATED_KEYS}. * @deprecated Use {@link #PStmtKey(String, String, String, int)}. */ @Deprecated @@ -179,10 +178,10 @@ public class PStmtKey { * * @param sql The SQL statement. * @param catalog The catalog. - * @param resultSetType A result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE}. - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. + * @param resultSetType A result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE}. + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. * @deprecated Use {@link #PStmtKey(String, String, String, int, int)}. */ @Deprecated @@ -195,12 +194,12 @@ public class PStmtKey { * * @param sql The SQL statement. * @param catalog The catalog. - * @param resultSetType a result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE}. - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE} - * @param resultSetHoldability One of the following {@link ResultSet} constants: - * {@link ResultSet#HOLD_CURSORS_OVER_COMMIT} or {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}. + * @param resultSetType a result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE}. + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE} + * @param resultSetHoldability One of the following {@code ResultSet} constants: + * {@code ResultSet.HOLD_CURSORS_OVER_COMMIT} or {@code ResultSet.CLOSE_CURSORS_AT_COMMIT}. * @deprecated Use {@link #PStmtKey(String, String, String, int, int, int)}. */ @Deprecated @@ -213,12 +212,12 @@ public class PStmtKey { * * @param sql The SQL statement. * @param catalog The catalog. - * @param resultSetType a result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE} - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. - * @param resultSetHoldability One of the following {@link ResultSet} constants: - * {@link ResultSet#HOLD_CURSORS_OVER_COMMIT} or {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}. + * @param resultSetType a result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE} + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. + * @param resultSetHoldability One of the following {@code ResultSet} constants: + * {@code ResultSet.HOLD_CURSORS_OVER_COMMIT} or {@code ResultSet.CLOSE_CURSORS_AT_COMMIT}. * @param statementType The SQL statement type, prepared or callable. * @deprecated Use {@link #PStmtKey(String, String, String, int, int, int, PoolingConnection.StatementType)} */ @@ -234,10 +233,10 @@ public class PStmtKey { * * @param sql The SQL statement. * @param catalog The catalog. - * @param resultSetType A result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE}. - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. + * @param resultSetType A result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE}. + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. * @param statementType The SQL statement type, prepared or callable. * @deprecated Use {@link #PStmtKey(String, String, String, int, int, PoolingConnection.StatementType)}. */ @@ -281,7 +280,7 @@ public class PStmtKey { * @param catalog The catalog. * @param statementType The SQL statement type, prepared or callable. * @param autoGeneratedKeys A flag indicating whether auto-generated keys should be returned; one of - * {@link Statement#RETURN_GENERATED_KEYS} or {@link Statement#NO_GENERATED_KEYS}. + * {@code Statement.RETURN_GENERATED_KEYS} or {@code Statement.NO_GENERATED_KEYS}. * @deprecated Use {@link #PStmtKey(String, String, String, PoolingConnection.StatementType, Integer)} */ @Deprecated @@ -309,7 +308,7 @@ public class PStmtKey { * @param catalog The catalog. * @param schema The schema * @param autoGeneratedKeys A flag indicating whether auto-generated keys should be returned; one of - * {@link Statement#RETURN_GENERATED_KEYS} or {@link Statement#NO_GENERATED_KEYS}. + * {@code Statement.RETURN_GENERATED_KEYS} or {@code Statement.NO_GENERATED_KEYS}. * @since 2.5.0 */ public PStmtKey(final String sql, final String catalog, final String schema, final int autoGeneratedKeys) { @@ -322,10 +321,10 @@ public class PStmtKey { * @param sql The SQL statement. * @param catalog The catalog. * @param schema The schema - * @param resultSetType A result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE}. - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. + * @param resultSetType A result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE}. + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. */ public PStmtKey(final String sql, final String catalog, final String schema, final int resultSetType, final int resultSetConcurrency) { this(sql, catalog, schema, resultSetType, resultSetConcurrency, StatementType.PREPARED_STATEMENT); @@ -337,12 +336,12 @@ public class PStmtKey { * @param sql The SQL statement. * @param catalog The catalog. * @param schema The schema - * @param resultSetType a result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE}. - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE} - * @param resultSetHoldability One of the following {@link ResultSet} constants: - * {@link ResultSet#HOLD_CURSORS_OVER_COMMIT} or {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}. + * @param resultSetType a result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE}. + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE} + * @param resultSetHoldability One of the following {@code ResultSet} constants: + * {@code ResultSet.HOLD_CURSORS_OVER_COMMIT} or {@code ResultSet.CLOSE_CURSORS_AT_COMMIT}. * @since 2.5.0 */ public PStmtKey(final String sql, final String catalog, final String schema, final int resultSetType, final int resultSetConcurrency, @@ -356,12 +355,12 @@ public class PStmtKey { * @param sql The SQL statement. * @param catalog The catalog. * @param schema The schema. - * @param resultSetType a result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE} - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. - * @param resultSetHoldability One of the following {@link ResultSet} constants: - * {@link ResultSet#HOLD_CURSORS_OVER_COMMIT} or {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}. + * @param resultSetType a result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE} + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. + * @param resultSetHoldability One of the following {@code ResultSet} constants: + * {@code ResultSet.HOLD_CURSORS_OVER_COMMIT} or {@code ResultSet.CLOSE_CURSORS_AT_COMMIT}. * @param statementType The SQL statement type, prepared or callable. * @since 2.5.0 */ @@ -377,10 +376,10 @@ public class PStmtKey { * @param sql The SQL statement. * @param catalog The catalog. * @param schema The schema. - * @param resultSetType A result set type; one of {@link ResultSet#TYPE_FORWARD_ONLY}, - * {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or {@link ResultSet#TYPE_SCROLL_SENSITIVE}. - * @param resultSetConcurrency A concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. + * @param resultSetType A result set type; one of {@code ResultSet.TYPE_FORWARD_ONLY}, + * {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code ResultSet.TYPE_SCROLL_SENSITIVE}. + * @param resultSetConcurrency A concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. * @param statementType The SQL statement type, prepared or callable. * @since 2.5.0 */ @@ -457,7 +456,7 @@ public class PStmtKey { * @param schema The schema. * @param statementType The SQL statement type, prepared or callable. * @param autoGeneratedKeys A flag indicating whether auto-generated keys should be returned; one of - * {@link Statement#RETURN_GENERATED_KEYS} or {@link Statement#NO_GENERATED_KEYS}. + * {@code Statement.RETURN_GENERATED_KEYS} or {@code Statement.NO_GENERATED_KEYS}. * @since 2.5.0 */ public PStmtKey(final String sql, final String catalog, final String schema, final StatementType statementType, final Integer autoGeneratedKeys) { @@ -536,8 +535,8 @@ public class PStmtKey { } /** - * Gets a flag indicating whether auto-generated keys should be returned; one of {@link Statement#RETURN_GENERATED_KEYS} - * or {@link Statement#NO_GENERATED_KEYS}. + * Gets a flag indicating whether auto-generated keys should be returned; one of {@code Statement.RETURN_GENERATED_KEYS} + * or {@code Statement.NO_GENERATED_KEYS}. * * @return a flag indicating whether auto-generated keys should be returned. */ @@ -573,8 +572,8 @@ public class PStmtKey { } /** - * Gets the result set concurrency type; one of {@link ResultSet#CONCUR_READ_ONLY} or - * {@link ResultSet#CONCUR_UPDATABLE}. + * Gets the result set concurrency type; one of {@code ResultSet.CONCUR_READ_ONLY} or + * {@code ResultSet.CONCUR_UPDATABLE}. * * @return The result set concurrency type. */ @@ -583,8 +582,8 @@ public class PStmtKey { } /** - * Gets the result set holdability, one of the following {@link ResultSet} constants: - * {@link ResultSet#HOLD_CURSORS_OVER_COMMIT} or {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}. + * Gets the result set holdability, one of the following {@code ResultSet} constants: + * {@code ResultSet.HOLD_CURSORS_OVER_COMMIT} or {@code ResultSet.CLOSE_CURSORS_AT_COMMIT}. * * @return The result set holdability. */ @@ -593,8 +592,8 @@ public class PStmtKey { } /** - * Gets the result set type, one of {@link ResultSet#TYPE_FORWARD_ONLY}, {@link ResultSet#TYPE_SCROLL_INSENSITIVE}, or - * {@link ResultSet#TYPE_SCROLL_SENSITIVE}. + * Gets the result set type, one of {@code ResultSet.TYPE_FORWARD_ONLY}, {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or + * {@code ResultSet.TYPE_SCROLL_SENSITIVE}. * * @return the result set type. */ diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java index 856036f8cf..0aa3441a9b 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java @@ -129,7 +129,7 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto } /** - * Returns a {@link Connection} from my pool, according to the contract specified by + * Returns a {@link java.sql.Connection} from my pool, according to the contract specified by * {@link ObjectPool#borrowObject}. */ @Override diff --git a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java index 3267961cb2..5693d9d95b 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java @@ -24,20 +24,13 @@ import javax.naming.RefAddr; import javax.naming.Reference; /** - * A JNDI ObjectFactory which creates {@link SharedPoolDataSource}s + * A JNDI ObjectFactory which creates {@code SharedPoolDataSource}s * * @since 2.0 */ public class PerUserPoolDataSourceFactory extends InstanceKeyDataSourceFactory { private static final String PER_USER_POOL_CLASSNAME = PerUserPoolDataSource.class.getName(); - /** - * Constructs a new instance. - */ - public PerUserPoolDataSourceFactory() { - // empty - } - @SuppressWarnings("unchecked") // Avoid warnings on deserialization @Override protected InstanceKeyDataSource getNewInstance(final Reference ref) throws IOException, ClassNotFoundException { diff --git a/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java b/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java index c1efa3ba0f..a0a349edb5 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java @@ -20,7 +20,7 @@ import javax.naming.RefAddr; import javax.naming.Reference; /** - * A JNDI ObjectFactory which creates {@link SharedPoolDataSource}s + * A JNDI ObjectFactory which creates {@code SharedPoolDataSource}s * * @since 2.0 */ diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java index 4c5d5cc05d..64998aa2cf 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java @@ -67,13 +67,6 @@ public class BasicManagedDataSource extends BasicDataSource { /** Transaction Synchronization Registry */ private transient TransactionSynchronizationRegistry transactionSynchronizationRegistry; - /** - * Constructs a new instance. - */ - public BasicManagedDataSource() { - // empty - } - @Override protected synchronized ConnectionFactory createConnectionFactory() throws SQLException { if (transactionManager == null) { diff --git a/java/org/apache/tomcat/dbcp/pool2/PooledObject.java b/java/org/apache/tomcat/dbcp/pool2/PooledObject.java index 65497d5e9d..ef211307c5 100644 --- a/java/org/apache/tomcat/dbcp/pool2/PooledObject.java +++ b/java/org/apache/tomcat/dbcp/pool2/PooledObject.java @@ -31,6 +31,7 @@ import java.util.Deque; * @param <T> the type of object in the pool. * @since 2.0 */ +@SuppressWarnings("deprecation") public interface PooledObject<T> extends Comparable<PooledObject<T>> { /** @@ -273,6 +274,7 @@ public interface PooledObject<T> extends Comparable<PooledObject<T>> { * @return the last time this object was used * @since 2.11.0 */ + @SuppressWarnings("javadoc") default Instant getLastUsedInstant() { return Instant.ofEpochMilli(getLastUsedTime()); } diff --git a/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java b/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java index 8c278022c7..9b4c04fb88 100644 --- a/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java +++ b/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java @@ -30,6 +30,7 @@ import org.apache.tomcat.dbcp.pool2.BaseObject; * @param <T> Type of element pooled. * @since 2.0 */ +@SuppressWarnings("deprecation") public abstract class BaseObjectPoolConfig<T> extends BaseObject implements Cloneable { /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
