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 6e1ce5feb6 Fix checkstyle warnings
6e1ce5feb6 is described below
commit 6e1ce5feb63c46c94c59c55615c87be6ce4b9239
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Oct 23 21:29:37 2026 +0100
Fix checkstyle warnings
---
.../org/apache/tomcat/jdbc/JdbcPoolBaseTest.java | 24 +++++++++++-----------
.../tomcat/jdbc/naming/TestNamingFactory.java | 9 ++++----
.../tomcat/jdbc/pool/TestAlternateCredentials.java | 7 +++----
.../apache/tomcat/jdbc/pool/TestAsyncBorrow.java | 9 ++++----
.../jdbc/pool/TestConnectionAcquireRelease.java | 13 ++++++------
.../tomcat/jdbc/pool/TestConnectionSetup.java | 9 ++++----
.../tomcat/jdbc/pool/TestFairBlockingQueue.java | 13 ++++++------
.../tomcat/jdbc/pool/TestInterruptedWaiter.java | 5 ++---
.../pool/TestJdbcInterceptorConfigParsing.java | 5 ++---
.../apache/tomcat/jdbc/pool/TestPoolEviction.java | 9 ++++----
.../tomcat/jdbc/pool/TestPoolProperties.java | 7 +++----
.../apache/tomcat/jdbc/pool/TestProxyContract.java | 13 ++++++------
.../org/apache/tomcat/jdbc/pool/TestPurge.java | 5 ++---
.../tomcat/jdbc/pool/TestShouldForceReconnect.java | 5 ++---
.../tomcat/jdbc/pool/TestStatementExecution.java | 11 +++++-----
.../apache/tomcat/jdbc/pool/TestTransaction.java | 7 +++----
.../apache/tomcat/jdbc/pool/TestValidation.java | 9 ++++----
.../apache/tomcat/jdbc/pool/TestXaConnection.java | 11 +++++-----
.../pool/interceptor/TestInterceptorLifecycle.java | 11 +++++-----
.../interceptor/TestInterceptorResetOrder.java | 9 ++++----
.../pool/interceptor/TestInterceptorSemantics.java | 11 +++++-----
.../jdbc/pool/interceptor/TestSessionState.java | 7 +++----
.../pool/interceptor/TestSlowQueryComparator.java | 5 ++---
.../pool/interceptor/TestStatementCacheReuse.java | 11 +++++-----
.../pool/interceptor/TestStatementLifecycle.java | 13 ++++++------
.../tomcat/jdbc/pool/jmx/TestJmxMonitor.java | 9 ++++----
26 files changed, 111 insertions(+), 136 deletions(-)
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/JdbcPoolBaseTest.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/JdbcPoolBaseTest.java
index 7ec8c31193..f5791cede3 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/JdbcPoolBaseTest.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/JdbcPoolBaseTest.java
@@ -101,7 +101,7 @@ public abstract class JdbcPoolBaseTest {
return url;
}
- /**
+ /*
* Creates a DataSource pointing at this test class' database. JMX is
* disabled by default to keep MBean registration out of functional
* tests (it has its own test area). Initial/min idle sizes are pinned
@@ -120,7 +120,7 @@ public abstract class JdbcPoolBaseTest {
return manage(ds);
}
- /** Registers an externally constructed DataSource for teardown closing. */
+ /* Registers an externally constructed DataSource for teardown closing. */
protected <D extends DataSource> D manage(D ds) {
createdDataSources.add(ds);
return ds;
@@ -138,12 +138,12 @@ public abstract class JdbcPoolBaseTest {
createdDataSources.clear();
}
- /** A raw admin connection that bypasses the pool entirely. */
+ /* A raw admin connection that bypasses the pool entirely. */
protected Connection adminConnection() throws SQLException {
return DriverManager.getConnection(url, "sa", "");
}
- /**
+ /*
* Finds an interceptor of the given type in the chain behind a
* borrowed connection. The objects the pool hands out are JDK proxies
* whose invocation handler is the first interceptor of the chain, so
@@ -162,7 +162,7 @@ public abstract class JdbcPoolBaseTest {
return null;
}
- /**
+ /*
* The driver's own object behind a pooled connection's statement. For
* a prepared statement this is the honest oracle for "the session was
* not asked to prepare this SQL again": two handles onto the same
@@ -173,7 +173,7 @@ public abstract class JdbcPoolBaseTest {
return pooled.unwrap(Statement.class);
}
- /**
+ /*
* Number of physical sessions on the database other than the admin
* connection this method itself opens - i.e. the connections the
* pool (or a test) currently holds.
@@ -188,7 +188,7 @@ public abstract class JdbcPoolBaseTest {
}
}
- /** Polls {@link #poolSessions()} until it reaches the expected count. */
+ /* Polls {@link #poolSessions()} until it reaches the expected count. */
protected void awaitSessions(int expected) throws SQLException {
long deadline = System.currentTimeMillis() + AWAIT_TIMEOUT_MS;
int observed = poolSessions();
@@ -202,7 +202,7 @@ public abstract class JdbcPoolBaseTest {
}
}
- /**
+ /*
* Sets an H2 session variable on the physical session behind this
* connection. It is visible only to that same physical session,
* which makes it a session identity probe.
@@ -213,7 +213,7 @@ public abstract class JdbcPoolBaseTest {
}
}
- /** The marker visible on this connection's physical session, or null. */
+ /* The marker visible on this connection's physical session, or null. */
protected Integer sessionMarker(Connection c) throws SQLException {
try (Statement st = c.createStatement();
ResultSet rs = st.executeQuery("SELECT @POOL_TEST_MARKER")) {
@@ -223,7 +223,7 @@ public abstract class JdbcPoolBaseTest {
}
}
- /** Polls a condition until it holds or the await timeout expires. */
+ /* Polls a condition until it holds or the await timeout expires. */
protected static void awaitUntil(BooleanSupplier condition) {
long deadline = System.currentTimeMillis() + AWAIT_TIMEOUT_MS;
while (!condition.getAsBoolean()) {
@@ -244,12 +244,12 @@ public abstract class JdbcPoolBaseTest {
}
}
- /** Unique table name for the duration of one test. */
+ /* Unique table name for the duration of one test. */
protected static String uniqueTable() {
return "T_" + System.nanoTime();
}
- /** Committed row count of a table, observed through an admin connection.
*/
+ /* Committed row count of a table, observed through an admin connection. */
protected int adminRowCount(String table) throws SQLException {
try (Connection admin = adminConnection();
Statement st = admin.createStatement();
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 4360a97ffc..ce21b11464 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
@@ -16,15 +16,14 @@
*/
package org.apache.tomcat.jdbc.naming;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
+import javax.naming.CompositeName;
import javax.naming.Name;
import javax.naming.Reference;
import javax.naming.StringRefAddr;
-import javax.naming.CompositeName;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java
index fca2da18f2..b7ee5c650c 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java
@@ -16,10 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
@@ -31,6 +27,9 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java
index 99893195c9..dcb43154ad 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java
@@ -16,11 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -28,6 +23,10 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
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 702f4493cb..761817a829 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
@@ -16,13 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -33,6 +26,12 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
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 fe7b2110c6..57d881352a 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
@@ -16,14 +16,13 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.NullAndEmptySource;
@@ -83,7 +82,7 @@ class TestConnectionSetup extends JdbcPoolBaseTest {
@ParameterizedTest
@NullAndEmptySource
- @ValueSource(strings = { " " })
+ @ValueSource(strings = " ")
void aBlankInitSqlIsNotConfiguredAtAll(String initSql) throws Exception {
DataSource ds = newDataSource();
ds.getPoolProperties().setInitSQL(initSql);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java
index e029d66218..0c747a6a66 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java
@@ -16,13 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -30,6 +23,12 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
/**
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 ca6542cd9e..4c8fac57cd 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
@@ -16,14 +16,13 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java
index da51846752..48d9ff3658 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java
@@ -16,12 +16,11 @@
*/
package org.apache.tomcat.jdbc.pool;
+import java.util.Map;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.util.Map;
-
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java
index 742594f788..4ffb02000f 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java
@@ -16,17 +16,16 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java
index 820b1ad8f6..ca8e5c42e0 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java
@@ -16,13 +16,12 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.ArrayList;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
/**
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java
index 94f0aac8ae..a39558fbce 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java
@@ -16,19 +16,18 @@
*/
package org.apache.tomcat.jdbc.pool;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.sql.PooledConnection;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.PooledConnection;
-
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java
index 8ed869f046..5582765bec 100644
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java
@@ -16,11 +16,10 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
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 d6246ce82c..894f805a14 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
@@ -16,12 +16,11 @@
*/
package org.apache.tomcat.jdbc.pool;
+import java.util.stream.Stream;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.stream.Stream;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java
index d055e86614..2058ebee33 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java
@@ -16,12 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -30,6 +24,11 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
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 1c93d1229d..ecb77adb4f 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
@@ -16,13 +16,12 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.Statement;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java
index 63f6114235..90240b6ba9 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java
@@ -16,17 +16,16 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java
index afb26a93b5..500f159918 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java
@@ -16,12 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -31,6 +25,11 @@ import javax.sql.XAConnection;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java
index 3f10dc88b8..00f85b8db8 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java
@@ -16,17 +16,16 @@
*/
package org.apache.tomcat.jdbc.pool.interceptor;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorResetOrder.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorResetOrder.java
index 41c439fad6..f11cff60fa 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorResetOrder.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorResetOrder.java
@@ -16,11 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool.interceptor;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -28,6 +23,10 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java
index 28e590890d..13dc82911c 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java
@@ -16,12 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool.interceptor;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -29,6 +23,11 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.concurrent.ConcurrentHashMap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java
index 008002b153..1f0d57b022 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java
@@ -16,13 +16,12 @@
*/
package org.apache.tomcat.jdbc.pool.interceptor;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.Statement;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSlowQueryComparator.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSlowQueryComparator.java
index f70151bfed..b760afcea2 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSlowQueryComparator.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSlowQueryComparator.java
@@ -16,14 +16,13 @@
*/
package org.apache.tomcat.jdbc.pool.interceptor;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.QueryStats;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java
index bb2d69b753..b214d45a2b 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java
@@ -16,17 +16,16 @@
*/
package org.apache.tomcat.jdbc.pool.interceptor;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.Statement;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
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 1747b1dab3..1e488173ae 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
@@ -16,13 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool.interceptor;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -31,6 +24,12 @@ import java.sql.Statement;
import java.util.function.Consumer;
import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java
index 7759b5a479..6059056534 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java
@@ -16,11 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool.jmx;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.lang.management.ManagementFactory;
import java.sql.Connection;
import java.util.HashSet;
@@ -32,6 +27,10 @@ import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.apache.tomcat.jdbc.JdbcPoolBaseTest;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
