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 4d4e6db Use Objects.requireNonNull() instead of custom check. Minor formatting. 4d4e6db is described below commit 4d4e6db883331e9b182bf939accd0350573ac9a4 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Thu Dec 26 08:27:36 2019 -0500 Use Objects.requireNonNull() instead of custom check. Minor formatting. --- .../commons/pool2/impl/LinkedBlockingDeque.java | 33 ++++++---------------- .../pool2/impl/TestAbandonedObjectPool.java | 5 ++-- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java b/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java index ccd9f65..e024546 100644 --- a/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java +++ b/src/main/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Deque; import java.util.Iterator; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; @@ -224,9 +225,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E> lock.lock(); // Never contended, but necessary for visibility try { for (final E e : c) { - if (e == null) { - throw new NullPointerException(); - } + Objects.requireNonNull(e); if (!linkLast(e)) { throw new IllegalStateException("Deque full"); } @@ -392,9 +391,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E> */ @Override public boolean offerFirst(final E e) { - if (e == null) { - throw new NullPointerException(); - } + Objects.requireNonNull(e, "e"); lock.lock(); try { return linkFirst(e); @@ -408,9 +405,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E> */ @Override public boolean offerLast(final E e) { - if (e == null) { - throw new NullPointerException(); - } + Objects.requireNonNull(e, "e"); lock.lock(); try { return linkLast(e); @@ -430,9 +425,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E> * for space */ public void putFirst(final E e) throws InterruptedException { - if (e == null) { - throw new NullPointerException(); - } + Objects.requireNonNull(e, "e"); lock.lock(); try { while (!linkFirst(e)) { @@ -454,9 +447,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E> * for space */ public void putLast(final E e) throws InterruptedException { - if (e == null) { - throw new NullPointerException(); - } + Objects.requireNonNull(e, "e"); lock.lock(); try { while (!linkLast(e)) { @@ -483,9 +474,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E> */ public boolean offerFirst(final E e, final long timeout, final TimeUnit unit) throws InterruptedException { - if (e == null) { - throw new NullPointerException(); - } + Objects.requireNonNull(e, "e"); long nanos = unit.toNanos(timeout); lock.lockInterruptibly(); try { @@ -517,9 +506,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E> */ public boolean offerLast(final E e, final long timeout, final TimeUnit unit) throws InterruptedException { - if (e == null) { - throw new NullPointerException(); - } + Objects.requireNonNull(e, "e"); long nanos = unit.toNanos(timeout); lock.lockInterruptibly(); try { @@ -940,9 +927,7 @@ class LinkedBlockingDeque<E> extends AbstractQueue<E> * @throws IllegalArgumentException if c is this instance */ public int drainTo(final Collection<? super E> c, final int maxElements) { - if (c == null) { - throw new NullPointerException(); - } + Objects.requireNonNull(c, "c"); if (c == this) { throw new IllegalArgumentException(); } diff --git a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java index 7579d2e..0c9ebfd 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java @@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream; import java.io.PrintWriter; import java.lang.management.ManagementFactory; import java.util.ArrayList; +import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; @@ -155,9 +156,7 @@ public class TestAbandonedObjectPool { for (int i = 0; i < n - 2; i++) { obj = pool.borrowObject(); } - if (obj == null) { - throw new NullPointerException("Unable to borrow object from pool"); - } + Objects.requireNonNull(obj, "Unable to borrow object from pool"); final int deadMansHash = obj.hashCode(); final ConcurrentReturner returner = new ConcurrentReturner(obj); Thread.sleep(2000); // abandon checked out instances