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 582607c7fcae1c40ffffcae88c600fd9737d4f2f Author: Mark Thomas <[email protected]> AuthorDate: Thu Mar 5 13:08:05 2026 +0000 Align with 10.1.x, fix IDE warnings --- java/org/apache/catalina/session/StandardSession.java | 1 + java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties | 2 +- .../dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java | 7 ------- .../apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java | 7 ------- java/org/apache/tomcat/dbcp/pool2/PooledObject.java | 2 ++ java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java | 1 + 6 files changed, 5 insertions(+), 15 deletions(-) diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java index 4d7056535d..b7f1d14fd5 100644 --- a/java/org/apache/catalina/session/StandardSession.java +++ b/java/org/apache/catalina/session/StandardSession.java @@ -227,6 +227,7 @@ public class StandardSession implements HttpSession, Session, Serializable { /** * The HTTP session context associated with this session. */ + @SuppressWarnings("deprecation") @Deprecated protected static volatile javax.servlet.http.HttpSessionContext sessionContext = null; 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/datasources/PerUserPoolDataSourceFactory.java b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java index 3267961cb2..15d1c6751f 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java @@ -31,13 +31,6 @@ import javax.naming.Reference; 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/managed/BasicManagedDataSource.java b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java index b2c4ab5d8a..a231dcad8e 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java @@ -66,13 +66,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]
