This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch POOL_2_X in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/POOL_2_X by this push: new 440006fd Reuse Suppliers.nul() in tests 440006fd is described below commit 440006fdce4b0078c7b1950dad65dba9d8318073 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Wed Jun 18 08:37:09 2025 -0400 Reuse Suppliers.nul() in tests --- .../org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java | 3 ++- .../java/org/apache/commons/pool2/impl/TestGenericObjectPool.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 529d77eb..0d7f4199 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java @@ -53,6 +53,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.commons.lang3.function.Suppliers; import org.apache.commons.pool2.AbstractTestKeyedObjectPool; import org.apache.commons.pool2.BaseKeyedPooledObjectFactory; import org.apache.commons.pool2.DestroyMode; @@ -2285,7 +2286,7 @@ public class TestGenericKeyedObjectPool extends AbstractTestKeyedObjectPool { void testNPEOnFactoryNull() { // @formatter:off final DisconnectingWaiterFactory<String> factory = new DisconnectingWaiterFactory<>( - () -> null, // Override default to always return null from makeObject + Suppliers.nul(), // Override default to always return null from makeObject DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_LIFECYCLE_ACTION, DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_VALIDATION_ACTION ); 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 477a0b18..8c0995c6 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java @@ -55,6 +55,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.commons.lang3.ThreadUtils; +import org.apache.commons.lang3.function.Suppliers; import org.apache.commons.lang3.time.DurationUtils; import org.apache.commons.pool2.BasePooledObjectFactory; import org.apache.commons.pool2.ObjectPool; @@ -2445,8 +2446,8 @@ class TestGenericObjectPool extends TestBaseObjectPool { @Test @Timeout(value = 1000, unit = TimeUnit.MILLISECONDS) void testNPEOnFactoryNull() throws Exception { - final DisconnectingWaiterFactory<String> factory = new DisconnectingWaiterFactory<>(() -> null, // Override default to always return null from - // makeObject + // Override default to always return null from makeObject + final DisconnectingWaiterFactory<String> factory = new DisconnectingWaiterFactory<>(Suppliers.nul(), DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_LIFECYCLE_ACTION, DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_VALIDATION_ACTION); try (GenericObjectPool<Waiter> pool = new GenericObjectPool<>(factory)) { pool.setTestOnBorrow(true);