[commons-collections] branch master updated: Use Objects.requireNonNull() instead of custom check. Minor formatting.

[ggregory]

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-collections.git


The following commit(s) were added to refs/heads/master by this push:
     new be28c1d  Use Objects.requireNonNull() instead of custom check. Minor 
formatting.
be28c1d is described below

commit be28c1d647223fc123c0e25084ebaea68f45cd66
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Dec 25 18:42:19 2019 -0500

    Use Objects.requireNonNull() instead of custom check. Minor formatting.
---
 .../commons/collections4/iterators/CollatingIterator.java   | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
 
b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
index 3d1ff4a..a1ae4c1 100644
--- 
a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
+++ 
b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
@@ -23,6 +23,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 
 import org.apache.commons.collections4.list.UnmodifiableList;
 
@@ -163,9 +164,7 @@ public class CollatingIterator<E> implements Iterator<E> {
      */
     public void addIterator(final Iterator<? extends E> iterator) {
         checkNotStarted();
-        if (iterator == null) {
-            throw new NullPointerException("Iterator must not be null");
-        }
+        Objects.requireNonNull(iterator, "iterator");
         iterators.add(iterator);
     }
 
@@ -180,9 +179,7 @@ public class CollatingIterator<E> implements Iterator<E> {
      */
     public void setIterator(final int index, final Iterator<? extends E> 
iterator) {
         checkNotStarted();
-        if (iterator == null) {
-            throw new NullPointerException("Iterator must not be null");
-        }
+        Objects.requireNonNull(iterator, "iterator");
         iterators.set(index, iterator);
     }
 
@@ -357,9 +354,7 @@ public class CollatingIterator<E> implements Iterator<E> {
                     leastObject = values.get(i);
                 } else {
                     final E curObject = values.get(i);
-                    if (comparator == null) {
-                        throw new NullPointerException("You must invoke 
setComparator() to set a comparator first.");
-                    }
+                    Objects.requireNonNull(comparator, "You must invoke 
setComparator() to set a comparator first.");
                     if (comparator.compare(curObject, leastObject) < 0) {
                         leastObject = curObject;
                         leastIndex = i;