This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 92e32de667 Fix IDE warnings
92e32de667 is described below
commit 92e32de667be06149fb35f96222391c372031cfe
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Nov 6 21:23:43 2026 +0000
Fix IDE warnings
---
java/org/apache/jasper/tagplugins/jstl/core/UrlParameters.java | 2 +-
.../tomcat/jdbc/pool/TestDataSourceProxyPublicationCleanup.java | 2 ++
.../test/java/org/apache/tomcat/jdbc/pool/TestTestAllIdleClaim.java | 6 +++---
.../apache/tomcat/jdbc/pool/TestThrowingDriverOnClaimedPaths.java | 4 ++--
.../org/apache/tomcat/jdbc/pool/TestThrowingResetInterceptor.java | 6 ++----
.../jdbc/pool/interceptor/TestStatementCacheCloseAfterDisposal.java | 2 +-
.../jdbc/pool/interceptor/TestStatementCacheInterceptorOrder.java | 2 +-
.../jdbc/pool/interceptor/TestStatementCachePurgeCloseFailure.java | 4 ++--
.../tomcat/jdbc/pool/interceptor/TestStatementCacheRacingClose.java | 2 +-
.../tomcat/jdbc/pool/interceptor/TestStatementCacheRacingPark.java | 4 ++--
.../apache/tomcat/jdbc/pool/interceptor/TestStatementFinalizer.java | 2 +-
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/jasper/tagplugins/jstl/core/UrlParameters.java
b/java/org/apache/jasper/tagplugins/jstl/core/UrlParameters.java
index 961babb516..85a3ddb316 100644
--- a/java/org/apache/jasper/tagplugins/jstl/core/UrlParameters.java
+++ b/java/org/apache/jasper/tagplugins/jstl/core/UrlParameters.java
@@ -59,7 +59,7 @@ final class UrlParameters {
ctxt.generateJavaSource("int " + paramEnd + " = -1;");
ctxt.setPluginAttribute(URL_VARIABLE_ATTRIBUTE, urlName);
ctxt.setPluginAttribute(PARAM_END_ATTRIBUTE, paramEnd);
- ctxt.setPluginAttribute(PARAMS_ATTRIBUTE, new
ArrayList<TagPluginContext>());
+ ctxt.setPluginAttribute(PARAMS_ATTRIBUTE, new ArrayList<>());
}
ctxt.generateBody();
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestDataSourceProxyPublicationCleanup.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestDataSourceProxyPublicationCleanup.java
index d2319345f9..783b3a16e4 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestDataSourceProxyPublicationCleanup.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestDataSourceProxyPublicationCleanup.java
@@ -36,6 +36,8 @@ class TestDataSourceProxyPublicationCleanup extends
JdbcPoolBaseTest {
*/
public static class FailingPublicationProperties extends PoolProperties {
+ private static final long serialVersionUID = 1L;
+
@Override
public int getMaxActive() {
StackTraceElement[] stack = Thread.currentThread().getStackTrace();
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTestAllIdleClaim.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTestAllIdleClaim.java
index 040a8ccc94..09ab308b8b 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTestAllIdleClaim.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTestAllIdleClaim.java
@@ -119,7 +119,7 @@ class TestTestAllIdleClaim extends JdbcPoolBaseTest {
Connection first = ds.getConnection();
awaitSessions(1);
setSessionMarker(first, 7);
- PooledConnection pc = (PooledConnection) internalOf(first);
+ PooledConnection pc = internalOf(first);
first.close();
forceExpired(pc);
@@ -218,7 +218,7 @@ class TestTestAllIdleClaim extends JdbcPoolBaseTest {
Connection first = ds.getConnection();
awaitSessions(1);
- PooledConnection pc = (PooledConnection) internalOf(first);
+ PooledConnection pc = internalOf(first);
first.close();
forceExpired(pc);
@@ -273,7 +273,7 @@ class TestTestAllIdleClaim extends JdbcPoolBaseTest {
Connection first = ds.getConnection();
awaitSessions(1);
- PooledConnection pc = (PooledConnection) internalOf(first);
+ PooledConnection pc = internalOf(first);
first.close();
forceExpired(pc);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestThrowingDriverOnClaimedPaths.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestThrowingDriverOnClaimedPaths.java
index 71f9455349..81f69bdd12 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestThrowingDriverOnClaimedPaths.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestThrowingDriverOnClaimedPaths.java
@@ -154,7 +154,7 @@ public class TestThrowingDriverOnClaimedPaths extends
JdbcPoolBaseTest {
DataSource ds = oneSlotPool();
Connection first = ds.getConnection();
awaitSessions(1);
- PooledConnection pc = (PooledConnection) internalOf(first);
+ PooledConnection pc = internalOf(first);
first.close();
forceExpired(pc);
@@ -180,7 +180,7 @@ public class TestThrowingDriverOnClaimedPaths extends
JdbcPoolBaseTest {
DataSource ds = oneSlotPool();
Connection first = ds.getConnection();
awaitSessions(1);
- PooledConnection pc = (PooledConnection) internalOf(first);
+ PooledConnection pc = internalOf(first);
first.close();
forceExpired(pc);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestThrowingResetInterceptor.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestThrowingResetInterceptor.java
index 4d59a51d40..49630f4c78 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestThrowingResetInterceptor.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestThrowingResetInterceptor.java
@@ -63,10 +63,8 @@ class TestThrowingResetInterceptor extends JdbcPoolBaseTest {
// test: an abandoned, unclosed physical connection is otherwise
// reclaimed by the JDK's socket cleaner and the leaked database
// sessions would disappear with GC timing instead of staying open
- PooledConnection pooledFirst =
- (PooledConnection) internalOf(first);
- PooledConnection pooledSecond =
- (PooledConnection) internalOf(second);
+ PooledConnection pooledFirst = internalOf(first);
+ PooledConnection pooledSecond = internalOf(second);
java.sql.Connection physicalFirst = pooledFirst.getConnection();
java.sql.Connection physicalSecond = pooledSecond.getConnection();
awaitSessions(2);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheCloseAfterDisposal.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheCloseAfterDisposal.java
index 629498272a..4a1c39a213 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheCloseAfterDisposal.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheCloseAfterDisposal.java
@@ -141,7 +141,7 @@ class TestStatementCacheCloseAfterDisposal extends
JdbcPoolBaseTest {
Connection first = ds.getConnection();
StatementCache cache = interceptorOf(first, StatementCache.class);
- PooledConnection pooled = (PooledConnection) internalOf(first);
+ PooledConnection pooled = internalOf(first);
DisposalAtParkMap parkPoint = new DisposalAtParkMap();
parkPoint.disposal = () -> cache.reset(null, null);
pooled.getAttributes().put(StatementCache.STATEMENT_CACHE_ATTR,
parkPoint);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheInterceptorOrder.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheInterceptorOrder.java
index 0ec6c4363c..9cb1fcddd7 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheInterceptorOrder.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheInterceptorOrder.java
@@ -211,7 +211,7 @@ class TestStatementCacheInterceptorOrder extends
JdbcPoolBaseTest {
String racingSql = "INSERT INTO " + racingTable + " VALUES (?)";
Connection first = ds.getConnection();
- PooledConnection pcon = (PooledConnection) internalOf(first);
+ PooledConnection pcon = internalOf(first);
TestStatementCacheRacingClose.RacingCloseStatementCache cache =
interceptorOf(first,
TestStatementCacheRacingClose.RacingCloseStatementCache.class);
setSessionMarker(first, 43);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCachePurgeCloseFailure.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCachePurgeCloseFailure.java
index 1dcc18aac6..2f9fc6d48e 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCachePurgeCloseFailure.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCachePurgeCloseFailure.java
@@ -95,7 +95,7 @@ class TestStatementCachePurgeCloseFailure extends
JdbcPoolBaseTest {
try {
ErrorCloseStatementCache cache =
interceptorOf(shared, ErrorCloseStatementCache.class);
- PooledConnection pcon = (PooledConnection) internalOf(shared);
+ PooledConnection pcon = internalOf(shared);
FAIL_NEXT_CLOSE.set(true);
PreparedStatement first = shared.prepareStatement("SELECT 1");
@@ -135,7 +135,7 @@ class TestStatementCachePurgeCloseFailure extends
JdbcPoolBaseTest {
try {
ErrorCloseStatementCache cache =
interceptorOf(shared, ErrorCloseStatementCache.class);
- PooledConnection pcon = (PooledConnection) internalOf(shared);
+ PooledConnection pcon = internalOf(shared);
FAIL_NEXT_CLOSE.set(true);
PreparedStatement statement = shared.prepareStatement(
"SELECT 1\nFROM SYSTEM_RANGE(1,1)\r");
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheRacingClose.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheRacingClose.java
index b086e6bf90..ce7ce4da24 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheRacingClose.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheRacingClose.java
@@ -111,7 +111,7 @@ class TestStatementCacheRacingClose extends
JdbcPoolBaseTest {
String racingSql = "INSERT INTO " + racingTable + " VALUES (?)";
Connection first = ds.getConnection();
- PooledConnection pcon = (PooledConnection) internalOf(first);
+ PooledConnection pcon = internalOf(first);
RacingCloseStatementCache cache =
interceptorOf(first, RacingCloseStatementCache.class);
setSessionMarker(first, 31);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheRacingPark.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheRacingPark.java
index 8dec624e55..db73f5fce5 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheRacingPark.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheRacingPark.java
@@ -167,7 +167,7 @@ class TestStatementCacheRacingPark extends JdbcPoolBaseTest
{
Connection shared = ds.getConnection();
try {
StatementCache cache = interceptorOf(shared, StatementCache.class);
- PooledConnection pcon = (PooledConnection) internalOf(shared);
+ PooledConnection pcon = internalOf(shared);
GatedParkMap gated = new GatedParkMap();
pcon.getAttributes().put(StatementCache.STATEMENT_CACHE_ATTR,
gated);
@@ -230,7 +230,7 @@ class TestStatementCacheRacingPark extends JdbcPoolBaseTest
{
StatementCache cache = interceptorOf(shared, StatementCache.class);
// getCache() re-reads the map from the attributes on every
// call, so this swap is what the next closes will meet
- PooledConnection pcon = (PooledConnection) internalOf(shared);
+ PooledConnection pcon = internalOf(shared);
ParkRendezvousMap parkPoint = new ParkRendezvousMap();
pcon.getAttributes().put(StatementCache.STATEMENT_CACHE_ATTR,
parkPoint);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementFinalizer.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementFinalizer.java
index 85ea6ce576..8ef7b1fb53 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementFinalizer.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementFinalizer.java
@@ -598,7 +598,7 @@ class TestStatementFinalizer extends JdbcPoolBaseTest {
ds.createPool();
try (Connection pooled = ds.getConnection()) {
StatementFinalizer finalizer = interceptorOf(pooled,
StatementFinalizer.class);
- PooledConnection pcon = (PooledConnection) internalOf(pooled);
+ PooledConnection pcon = internalOf(pooled);
Method create = Connection.class.getMethod("createStatement");
finalizer.reset(ds.getPool(), pcon);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
