This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/master by this push:
new 2510ee9 Fix generics warnings, remove unused exceptions, don't
override @AfterEach method name, remove unused imports.
2510ee9 is described below
commit 2510ee904516cdd2b072a1798d6a397cff9633a9
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Jun 3 11:38:22 2021 -0400
Fix generics warnings, remove unused exceptions, don't override
@AfterEach method name, remove unused imports.
---
.../apache/commons/pool2/ObjectPoolIssue326.java | 2 +-
.../java/org/apache/commons/pool2/PoolTest.java | 2 +-
.../apache/commons/pool2/TestBaseObjectPool.java | 2 +-
.../apache/commons/pool2/TestKeyedObjectPool.java | 4 ++--
.../org/apache/commons/pool2/TestObjectPool.java | 2 +-
.../org/apache/commons/pool2/TestPoolUtils.java | 2 +-
.../apache/commons/pool2/impl/CallStackTest.java | 4 ++--
.../commons/pool2/impl/NoOpCallStackTest.java | 2 +-
.../pool2/impl/TestBaseGenericObjectPool.java | 4 ++--
.../pool2/impl/TestGenericKeyedObjectPool.java | 17 ++++++-----------
.../commons/pool2/impl/TestGenericObjectPool.java | 21 +++++++++------------
.../commons/pool2/impl/TestSoftRefOutOfMemory.java | 2 +-
.../pool2/proxy/BaseTestProxiedKeyedObjectPool.java | 2 +-
.../pool2/proxy/BaseTestProxiedObjectPool.java | 2 +-
14 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
index 38ff9a7..2ceca46 100644
--- a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
+++ b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
@@ -108,7 +108,7 @@ public final class ObjectPoolIssue326 {
}
private void run() throws Exception {
- final GenericKeyedObjectPoolConfig poolConfig = new
GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<Object> poolConfig = new
GenericKeyedObjectPoolConfig<>();
poolConfig.setMaxTotal(10);
poolConfig.setMaxTotalPerKey(5);
poolConfig.setMinIdlePerKey(-1);
diff --git a/src/test/java/org/apache/commons/pool2/PoolTest.java
b/src/test/java/org/apache/commons/pool2/PoolTest.java
index 84828a3..c3a884c 100644
--- a/src/test/java/org/apache/commons/pool2/PoolTest.java
+++ b/src/test/java/org/apache/commons/pool2/PoolTest.java
@@ -70,7 +70,7 @@ public class PoolTest {
@Test
public void testPool() throws Exception {
- final GenericObjectPoolConfig poolConfig = new
GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<Foo> poolConfig = new
GenericObjectPoolConfig<>();
poolConfig.setTestWhileIdle(true /* testWhileIdle */);
final PooledFooFactory pooledFooFactory = new PooledFooFactory();
try (GenericObjectPool<Foo> pool = new
GenericObjectPool<>(pooledFooFactory, poolConfig)) {
diff --git a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
index 6829d1b..302486b 100644
--- a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
@@ -258,7 +258,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
@Test
- public void testClose() throws Exception {
+ public void testClose() {
@SuppressWarnings("resource")
final ObjectPool<Object> pool = new TestObjectPool();
diff --git a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
index 31bbbf7..bfc35f5 100644
--- a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
@@ -233,7 +233,7 @@ public abstract class TestKeyedObjectPool {
}
@AfterEach
- public void tearDown() throws Exception {
+ public void tearDown() {
_pool = null;
}
@@ -790,7 +790,7 @@ public abstract class TestKeyedObjectPool {
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
final FailingKeyedPooledObjectFactory factory =
new FailingKeyedPooledObjectFactory();
try (final KeyedObjectPool<Object,Object> pool =
makeEmptyPool(factory)) {
diff --git a/src/test/java/org/apache/commons/pool2/TestObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestObjectPool.java
index 9039d48..5726630 100644
--- a/src/test/java/org/apache/commons/pool2/TestObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestObjectPool.java
@@ -419,7 +419,7 @@ public abstract class TestObjectPool {
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
final ObjectPool<Object> pool;
try {
pool = makeEmptyPool(new MethodCallPoolableObjectFactory());
diff --git a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
index bff7982..45a94d9 100644
--- a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
+++ b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
@@ -278,7 +278,7 @@ public class TestPoolUtils {
}
@Test
- public void testCheckMinIdleKeyedObjectPoolKeysNulls() throws Exception {
+ public void testCheckMinIdleKeyedObjectPoolKeysNulls() {
try (@SuppressWarnings("unchecked")
final KeyedObjectPool<Object,Object> pool =
createProxy(KeyedObjectPool.class, (List<String>)null)) {
PoolUtils.checkMinIdle(pool, (Collection<?>) null, 1, 1);
diff --git a/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java
b/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java
index 0da5fe8..146ec51 100644
--- a/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java
+++ b/src/test/java/org/apache/commons/pool2/impl/CallStackTest.java
@@ -41,7 +41,7 @@ public class CallStackTest {
@ParameterizedTest
@MethodSource("data")
- public void testPrintClearedStackTraceIsNoOp(final CallStack stack) throws
Exception {
+ public void testPrintClearedStackTraceIsNoOp(final CallStack stack) {
stack.fillInStackTrace();
stack.clear();
stack.printStackTrace(new PrintWriter(writer));
@@ -51,7 +51,7 @@ public class CallStackTest {
@ParameterizedTest
@MethodSource("data")
- public void testPrintFilledStackTrace(final CallStack stack) throws
Exception {
+ public void testPrintFilledStackTrace(final CallStack stack) {
stack.fillInStackTrace();
stack.printStackTrace(new PrintWriter(writer));
final String stackTrace = writer.toString();
diff --git a/src/test/java/org/apache/commons/pool2/impl/NoOpCallStackTest.java
b/src/test/java/org/apache/commons/pool2/impl/NoOpCallStackTest.java
index 8cff042..8f3d909 100644
--- a/src/test/java/org/apache/commons/pool2/impl/NoOpCallStackTest.java
+++ b/src/test/java/org/apache/commons/pool2/impl/NoOpCallStackTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
public class NoOpCallStackTest {
@Test
- public void printStackTraceIsNoOp() throws Exception {
+ public void printStackTraceIsNoOp() {
final CallStack stack = NoOpCallStack.INSTANCE;
stack.fillInStackTrace();
final StringWriter writer = new StringWriter();
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java
index bccf6e9..d36fd17 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestBaseGenericObjectPool.java
@@ -35,13 +35,13 @@ public class TestBaseGenericObjectPool {
SimpleFactory factory;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
factory = new SimpleFactory();
pool = new GenericObjectPool<>(factory);
}
@AfterEach
- public void tearDown() throws Exception {
+ public void tearDown() {
pool.close();
pool = null;
factory = null;
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
index 1d02a15..0366010 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -868,9 +868,8 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
gkoPool = new GenericKeyedObjectPool<>(simpleFactory);
}
- @Override
@AfterEach
- public void tearDown() throws Exception {
+ public void tearDownJmx() throws Exception {
super.tearDown();
final ObjectName jmxName = gkoPool.getJmxName();
final String poolName = Objects.toString(jmxName, null);
@@ -1144,7 +1143,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
@SuppressWarnings("deprecation")
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
- public void testConstructors() throws Exception {
+ public void testConstructors() {
// Make constructor arguments all different from defaults
final int maxTotalPerKey = 1;
@@ -1750,12 +1749,10 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
/**
* Test case for POOL-180.
- *
- * @throws Exception May occur in some failure modes
*/
@Test
@Timeout(value = 200000, unit = TimeUnit.MILLISECONDS)
- public void testMaxActivePerKeyExceeded() throws Exception {
+ public void testMaxActivePerKeyExceeded() {
final WaiterFactory<String> waiterFactory = new WaiterFactory<>(0, 20,
0, 0, 0, 0, 8, 5, 0);
// TODO Fix this. Can't use local pool since runTestThreads uses the
// protected pool field
@@ -1852,12 +1849,10 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
* Verifies that maxTotal is not exceeded when factory destroyObject
* has high latency, testOnReturn is set and there is high incidence of
* validation failures.
- *
- * @throws Exception May occur in some failure modes
*/
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
- public void testMaxTotalInvariant() throws Exception {
+ public void testMaxTotalInvariant() {
final int maxTotal = 15;
simpleFactory.setEvenValid(false); // Every other validation fails
simpleFactory.setDestroyLatency(100); // Destroy takes 100 ms
@@ -2342,7 +2337,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
- public void testSettersAndGetters() throws Exception {
+ public void testSettersAndGetters() {
{
gkoPool.setMaxTotalPerKey(123);
assertEquals(123, gkoPool.getMaxTotalPerKey());
@@ -2403,7 +2398,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
- public void testThreaded1() throws Exception {
+ public void testThreaded1() {
gkoPool.setMaxTotalPerKey(15);
gkoPool.setMaxIdlePerKey(15);
gkoPool.setMaxWaitMillis(1000L);
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
index 7ae7863..e9ce2ad 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -594,8 +594,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
private SimpleFactory simpleFactory;
@SuppressWarnings("deprecation")
- private void assertConfiguration(final GenericObjectPoolConfig<?>
expected, final GenericObjectPool<?> actual)
- throws Exception {
+ private void assertConfiguration(final GenericObjectPoolConfig<?>
expected, final GenericObjectPool<?> actual) {
assertEquals(Boolean.valueOf(expected.getTestOnCreate()),
Boolean.valueOf(actual.getTestOnCreate()),
"testOnCreate");
assertEquals(Boolean.valueOf(expected.getTestOnBorrow()),
Boolean.valueOf(actual.getTestOnBorrow()),
@@ -911,7 +910,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
simpleFactory = new SimpleFactory();
genericObjectPool = new GenericObjectPool<>(simpleFactory);
}
@@ -957,14 +956,14 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
@SuppressWarnings("deprecation")
@Test
public void testAbandonedPool() throws Exception {
- final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<String> config = new
GenericObjectPoolConfig<>();
config.setJmxEnabled(false);
GenericObjectPool<String> abandoned = new
GenericObjectPool<>(simpleFactory, config);
abandoned.setTimeBetweenEvictionRuns(Duration.ofMillis(100)); //
Starts evictor
assertEquals(abandoned.getRemoveAbandonedTimeout(),
abandoned.getRemoveAbandonedTimeoutDuration().getSeconds());
- // This is ugly, but forces gc to hit the pool
- final WeakReference<GenericObjectPool> ref = new
WeakReference<>(abandoned);
+ // This is ugly, but forces GC to hit the pool
+ final WeakReference<GenericObjectPool<String>> ref = new
WeakReference<>(abandoned);
abandoned = null;
while (ref.get() != null) {
System.gc();
@@ -1120,7 +1119,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
- public void testCloseMultiplePools1() throws Exception {
+ public void testCloseMultiplePools1() {
try (final GenericObjectPool<String> genericObjectPool2 = new
GenericObjectPool<>(simpleFactory)) {
genericObjectPool.setTimeBetweenEvictionRuns(TestConstants.ONE_MILLISECOND);
genericObjectPool2.setTimeBetweenEvictionRuns(TestConstants.ONE_MILLISECOND);
@@ -1237,7 +1236,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
- public void testConstructors() throws Exception {
+ public void testConstructors() {
// Make constructor arguments all different from defaults
final int minIdle = 2;
@@ -1312,7 +1311,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
- public void testDefaultConfiguration() throws Exception {
+ public void testDefaultConfiguration() {
assertConfiguration(new GenericObjectPoolConfig<>(),genericObjectPool);
}
@@ -2126,12 +2125,10 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
* Verifies that maxTotal is not exceeded when factory destroyObject
* has high latency, testOnReturn is set and there is high incidence of
* validation failures.
- *
- * @throws Exception May occur in some failure modes
*/
@Test
@Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
- public void testMaxTotalInvariant() throws Exception {
+ public void testMaxTotalInvariant() {
final int maxTotal = 15;
simpleFactory.setEvenValid(false); // Every other validation fails
simpleFactory.setDestroyLatency(100); // Destroy takes 100 ms
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
b/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
index d9055ab..7e6aa1a 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java
@@ -127,7 +127,7 @@ public class TestSoftRefOutOfMemory {
private SoftReferenceObjectPool<String> pool;
@AfterEach
- public void tearDown() throws Exception {
+ public void tearDown() {
if (pool != null) {
pool.close();
pool = null;
diff --git
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
index e02b801..dcc4e47 100644
---
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
@@ -180,7 +180,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
@Test
- public void testPassThroughMethods02() throws Exception {
+ public void testPassThroughMethods02() {
pool.close();
assertThrows(IllegalStateException.class,
() -> pool.addObject(KEY1));
diff --git
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
index ab0544d..9d7cd66 100644
---
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
@@ -175,7 +175,7 @@ public abstract class BaseTestProxiedObjectPool {
@Test
- public void testPassThroughMethods02() throws Exception {
+ public void testPassThroughMethods02() {
pool.close();
assertThrows(IllegalStateException.class,
