Skip to content

Commit 12fde5f

Browse files
committed
Reuse Suppliers.nul() in tests
1 parent 4deaf20 commit 12fde5f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/test/java/org/apache/commons/pool3/impl/TestGenericKeyedObjectPool.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import javax.management.ObjectName;
5454

5555
import org.apache.commons.lang3.exception.ExceptionUtils;
56+
import org.apache.commons.lang3.function.Suppliers;
5657
import org.apache.commons.pool3.AbstractTestKeyedObjectPool;
5758
import org.apache.commons.pool3.BaseKeyedPooledObjectFactory;
5859
import org.apache.commons.pool3.DestroyMode;
@@ -2392,7 +2393,7 @@ void testNegativeMaxTotalPerKey() throws Exception {
23922393
void testNPEOnFactoryNull() {
23932394
// @formatter:off
23942395
final DisconnectingWaiterFactory<String> factory = new DisconnectingWaiterFactory<>(
2395-
() -> null, // Override default to always return null from makeObject
2396+
Suppliers.nul(), // Override default to always return null from makeObject
23962397
DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_LIFECYCLE_ACTION,
23972398
DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_VALIDATION_ACTION
23982399
);

src/test/java/org/apache/commons/pool3/impl/TestGenericObjectPool.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import javax.management.ObjectName;
5353

5454
import org.apache.commons.lang3.ThreadUtils;
55+
import org.apache.commons.lang3.function.Suppliers;
5556
import org.apache.commons.lang3.time.DurationUtils;
5657
import org.apache.commons.pool3.BasePooledObjectFactory;
5758
import org.apache.commons.pool3.ObjectPool;
@@ -2653,7 +2654,7 @@ void testNoInvalidateNPE() throws Exception {
26532654
@Timeout(value = 1000, unit = TimeUnit.MILLISECONDS)
26542655
void testNPEOnFactoryNull() throws InterruptedException {
26552656
final DisconnectingWaiterFactory<String> factory = new DisconnectingWaiterFactory<>(
2656-
() -> null, // Override default to always return null from makeObject
2657+
Suppliers.nul(), // Override default to always return null from makeObject
26572658
DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_LIFECYCLE_ACTION,
26582659
DisconnectingWaiterFactory.DEFAULT_DISCONNECTED_VALIDATION_ACTION);
26592660
try (GenericObjectPool<Waiter, IllegalStateException> pool = new GenericObjectPool<>(factory)) {

0 commit comments

Comments
 (0)