This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new c5fa5bd2f9 Fix various IDE warnings
c5fa5bd2f9 is described below
commit c5fa5bd2f983a7476b51328a76f0362269022a62
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Oct 27 08:18:12 2026 +0000
Fix various IDE warnings
---
.../java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java | 1 +
.../test/java/org/apache/tomcat/jdbc/naming/TestNamingFactory.java | 2 +-
.../org/apache/tomcat/jdbc/pool/TestDisposableConnectionFacade.java | 4 ++--
.../org/apache/tomcat/jdbc/pool/TestProxyKindAfterDataSourceSwap.java | 2 --
.../apache/tomcat/jdbc/pool/interceptor/TestSlowQueryEviction.java | 1 -
.../apache/tomcat/jdbc/pool/interceptor/TestStatementFinalizer.java | 1 +
6 files changed, 5 insertions(+), 6 deletions(-)
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
index 5809d1d7a6..280c3506cf 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
@@ -102,6 +102,7 @@ public class ConnectionState extends JdbcInterceptor {
* @param con the pooled connection being set up for its next
* borrower
*/
+ @SuppressWarnings("null") // Suppress false positive warnings
@Override
public void reset(ConnectionPool parent, PooledConnection con) {
if (parent==null || con==null) {
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/naming/TestNamingFactory.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/naming/TestNamingFactory.java
index cf8cfd45d4..754c314081 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/naming/TestNamingFactory.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/naming/TestNamingFactory.java
@@ -299,7 +299,7 @@ class TestNamingFactory extends JdbcPoolBaseTest {
public void setCount(int count) {
this.count = count;
}
- public void setBoom(String value) {
+ public void setBoom(@SuppressWarnings("unused") String value) {
throw new IllegalStateException("setter always fails");
}
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestDisposableConnectionFacade.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestDisposableConnectionFacade.java
index 421a805fbe..ab47200249 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestDisposableConnectionFacade.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestDisposableConnectionFacade.java
@@ -123,9 +123,9 @@ class TestDisposableConnectionFacade {
// From this point on nothing may pass through the facade: the
// physical connection is the pool's to hand out again.
- Assertions.assertEquals(Boolean.TRUE, proxy.isClosed(),
+ Assertions.assertEquals(Boolean.TRUE,
Boolean.valueOf(proxy.isClosed()),
"the facade must report closed while the close is still in
flight");
- Assertions.assertEquals(Boolean.FALSE, proxy.isValid(0),
+ Assertions.assertEquals(Boolean.FALSE,
Boolean.valueOf(proxy.isValid(0)),
"the facade must report invalid while the close is still
in flight");
Assertions.assertThrows(SQLException.class, proxy::getAutoCommit,
"post-return calls must be rejected instead of reaching
the chain");
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyKindAfterDataSourceSwap.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyKindAfterDataSourceSwap.java
index b7c68e0091..ad545e8fe8 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyKindAfterDataSourceSwap.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyKindAfterDataSourceSwap.java
@@ -42,8 +42,6 @@ class TestProxyKindAfterDataSourceSwap extends
JdbcPoolBaseTest {
/* A plain, non-XA javax.sql.DataSource for H2. */
private static final class PlainDataSource implements javax.sql.DataSource
{
- private static final long serialVersionUID = 1L;
-
private final String url;
PlainDataSource(String url) {
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSlowQueryEviction.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSlowQueryEviction.java
index ee558216e0..69d6649786 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSlowQueryEviction.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSlowQueryEviction.java
@@ -132,7 +132,6 @@ class TestSlowQueryEviction extends JdbcPoolBaseTest {
int threads = 48;
int perThread = 1000;
- ConcurrentHashMap<String, QueryStats> stats;
ExecutorService pool = Executors.newFixedThreadPool(threads);
CopyOnWriteArrayList<Throwable> failures = new
CopyOnWriteArrayList<>();
CountDownLatch ready = new CountDownLatch(threads);
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 0e2b5ab325..fcf016bf93 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
@@ -156,6 +156,7 @@ class TestStatementFinalizer extends JdbcPoolBaseTest {
"the leaked statement must be closed when its connection goes
back");
}
+ @SuppressWarnings("unlikely-arg-type") // Use of unlikely arg-type is
deliberate
@Test
void theTrackingWrapperStaysHonestAboutTheStatementItWraps() throws
Exception {
DataSource ds = finalizerPool();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
