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 424e043a7a Fix IDE warnings
424e043a7a is described below
commit 424e043a7ae3c415924de6d32a02cc8dcde5b5c1
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Oct 23 21:34:04 2026 +0100
Fix IDE warnings
---
.../org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java | 4 ++--
.../test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java | 2 +-
.../java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java | 2 +-
.../java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java | 2 +-
.../src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java | 6 +++---
.../apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java | 6 +++---
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java
index 761817a829..6e936daff8 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java
@@ -141,7 +141,7 @@ class TestConnectionAcquireRelease extends JdbcPoolBaseTest
{
Thread waiter = new Thread(() -> {
long start = System.currentTimeMillis();
try (Connection c = ds.getConnection()) {
- waitMillis.set(System.currentTimeMillis() - start);
+ waitMillis.set(Long.valueOf(System.currentTimeMillis() -
start));
Integer marker = sessionMarker(c);
if (marker != null) {
observedMarker.set(marker.intValue());
@@ -160,7 +160,7 @@ class TestConnectionAcquireRelease extends JdbcPoolBaseTest
{
assertTrue(done.await(10, java.util.concurrent.TimeUnit.SECONDS),
"waiter should have obtained a connection");
assertNull(failure.get());
- assertTrue(waitMillis.get() >= 200,
+ assertTrue(waitMillis.get().longValue() >= 200,
"waiter must actually have waited for the release, waited "
+ waitMillis.get() + " ms");
assertEquals(42, observedMarker.get(),
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java
index 57d881352a..a37151343f 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java
@@ -71,7 +71,7 @@ class TestConnectionSetup extends JdbcPoolBaseTest {
// a second physical connection gets the init SQL as well
Connection secondPhysical;
- try (Connection first = ds.getConnection()) {
+ try (@SuppressWarnings("unused") Connection first =
ds.getConnection()) {
secondPhysical = ds.getConnection();
assertEquals(2, poolSessions(), "two concurrent borrowers need two
sessions");
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java
index 4c8fac57cd..52664342e6 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java
@@ -88,7 +88,7 @@ class TestInterruptedWaiter extends JdbcPoolBaseTest {
for (int i = 0; i < HOLDERS; i++) {
waiters[i] = new Thread(() -> {
stillWaiting.incrementAndGet();
- try (Connection c = ds.getConnection()) {
+ try (@SuppressWarnings("unused") Connection c =
ds.getConnection()) {
interruptedWithConnection.incrementAndGet();
} catch (Exception expected) {
// interrupted or timed out while waiting - as intended
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java
index 894f805a14..5b69f1f227 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java
@@ -84,7 +84,7 @@ class TestShouldForceReconnect {
String askedUser, String askedPassword, boolean expected) throws
Exception {
PooledConnection con = pooledConnection();
loggedInAs(con, loggedInUser, loggedInPassword);
- assertEquals(expected, con.shouldForceReconnect(askedUser,
askedPassword),
+ assertEquals(Boolean.valueOf(expected),
Boolean.valueOf(con.shouldForceReconnect(askedUser, askedPassword)),
sessionLabel + " session asked for " + askedUser);
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java
index ecb77adb4f..8d409ba47c 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java
@@ -92,7 +92,7 @@ class TestTransaction extends JdbcPoolBaseTest {
@Test
void rollbackOnReturnDiscardsUncommittedWork() throws Exception {
DataSource ds = newDataSource();
- ds.getPoolProperties().setDefaultAutoCommit(false);
+ ds.getPoolProperties().setDefaultAutoCommit(Boolean.FALSE);
ds.getPoolProperties().setRollbackOnReturn(true);
String t = createTable(ds);
@@ -116,7 +116,7 @@ class TestTransaction extends JdbcPoolBaseTest {
@Test
void configuredDefaultAutoCommitIsRestoredForNextBorrower() throws
Exception {
DataSource ds = newDataSource();
- ds.getPoolProperties().setDefaultAutoCommit(true);
+ ds.getPoolProperties().setDefaultAutoCommit(Boolean.TRUE);
ds.getPoolProperties().setJdbcInterceptors(
"org.apache.tomcat.jdbc.pool.interceptor.ConnectionState");
try (Connection c1 = ds.getConnection()) {
@@ -154,7 +154,7 @@ class TestTransaction extends JdbcPoolBaseTest {
@Test
void configuredDefaultReadOnlyIsRestoredAndNextBorrowerCanWrite() throws
Exception {
DataSource ds = newDataSource();
- ds.getPoolProperties().setDefaultReadOnly(false);
+ ds.getPoolProperties().setDefaultReadOnly(Boolean.FALSE);
ds.getPoolProperties().setJdbcInterceptors(
"org.apache.tomcat.jdbc.pool.interceptor.ConnectionState");
String t = createTable(ds);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java
index 1e488173ae..21da46aa0a 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java
@@ -191,13 +191,13 @@ class TestStatementLifecycle extends JdbcPoolBaseTest {
return Stream.of(
Arguments.of("queryTimeout",
(Consumer<PreparedStatement>) ps -> setQuietly(ps, 37),
- (Reader) Statement::getQueryTimeout, 37, 0),
+ (Reader) Statement::getQueryTimeout,
Integer.valueOf(37), Integer.valueOf(0)),
Arguments.of("maxRows",
(Consumer<PreparedStatement>) ps ->
setMaxRowsQuietly(ps, 999),
- (Reader) Statement::getMaxRows, 999, 0),
+ (Reader) Statement::getMaxRows, Integer.valueOf(999),
Integer.valueOf(0)),
Arguments.of("fetchSize",
(Consumer<PreparedStatement>) ps ->
setFetchSizeQuietly(ps, 777),
- (Reader) Statement::getFetchSize, 777, 100));
+ (Reader) Statement::getFetchSize,
Integer.valueOf(777), Integer.valueOf(100)));
}
/** Reads one of the statement's mutable properties. */
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
