You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/09/01 21:59:06 UTC
(commons-collections) branch master updated: Inline redundant package-private method that wraps Objects.requireNonNull()
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 e205e071b Inline redundant package-private method that wraps Objects.requireNonNull()
e205e071b is described below
commit e205e071bb217e3d00379048bc2ac9e08e3e0f0d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Sep 1 17:59:01 2024 -0400
Inline redundant package-private method that wraps
Objects.requireNonNull()
---
.../commons/collections4/FluentIterable.java | 2 +-
.../apache/commons/collections4/IterableUtils.java | 34 ++++++++--------------
2 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/FluentIterable.java b/src/main/java/org/apache/commons/collections4/FluentIterable.java
index d3b07b88a..c985d7e57 100644
--- a/src/main/java/org/apache/commons/collections4/FluentIterable.java
+++ b/src/main/java/org/apache/commons/collections4/FluentIterable.java
@@ -91,7 +91,7 @@ public class FluentIterable<E> implements Iterable<E> {
* @throws NullPointerException if iterable is null
*/
public static <T> FluentIterable<T> of(final Iterable<T> iterable) {
- IterableUtils.checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
if (iterable instanceof FluentIterable<?>) {
return (FluentIterable<T>) iterable;
}
diff --git a/src/main/java/org/apache/commons/collections4/IterableUtils.java b/src/main/java/org/apache/commons/collections4/IterableUtils.java
index 4b3adadca..7066028ff 100644
--- a/src/main/java/org/apache/commons/collections4/IterableUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IterableUtils.java
@@ -93,7 +93,7 @@ public class IterableUtils {
* @throws NullPointerException if iterable is null
*/
public static <E> Iterable<E> boundedIterable(final Iterable<E> iterable, final long maxSize) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
if (maxSize < 0) {
throw new IllegalArgumentException("MaxSize parameter must not be negative.");
}
@@ -219,16 +219,6 @@ public class IterableUtils {
return chainedIterable(new Iterable[] {a, b, c, d});
}
- /**
- * Fail-fast check for null arguments.
- *
- * @param iterable the iterable to check
- * @throws NullPointerException if iterable is null
- */
- static void checkNotNull(final Iterable<?> iterable) {
- Objects.requireNonNull(iterable, "iterable");
- }
-
/**
* Fail-fast check for null arguments.
*
@@ -238,7 +228,7 @@ public class IterableUtils {
static void checkNotNull(final Iterable<?>... iterables) {
Objects.requireNonNull(iterables, "iterables");
for (final Iterable<?> iterable : iterables) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
}
}
@@ -409,7 +399,7 @@ public class IterableUtils {
*/
public static <E> Iterable<E> filteredIterable(final Iterable<E> iterable,
final Predicate<? super E> predicate) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
Objects.requireNonNull(predicate, "predicate");
return new FluentIterable<E>() {
@Override
@@ -572,7 +562,7 @@ public class IterableUtils {
* @throws NullPointerException if iterable is null
*/
public static <E> Iterable<E> loopingIterable(final Iterable<E> iterable) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
return new FluentIterable<E>() {
@Override
public Iterator<E> iterator() {
@@ -818,7 +808,7 @@ public class IterableUtils {
* @see ReverseListIterator
*/
public static <E> Iterable<E> reversedIterable(final Iterable<E> iterable) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
return new FluentIterable<E>() {
@Override
public Iterator<E> iterator() {
@@ -864,7 +854,7 @@ public class IterableUtils {
* @throws NullPointerException if iterable is null
*/
public static <E> Iterable<E> skippingIterable(final Iterable<E> iterable, final long elementsToSkip) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
if (elementsToSkip < 0) {
throw new IllegalArgumentException("ElementsToSkip parameter must not be negative.");
}
@@ -970,7 +960,7 @@ public class IterableUtils {
*/
public static <I, O> Iterable<O> transformedIterable(final Iterable<I> iterable,
final Transformer<? super I, ? extends O> transformer) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
Objects.requireNonNull(transformer, "transformer");
return new FluentIterable<O>() {
@Override
@@ -994,7 +984,7 @@ public class IterableUtils {
* @throws NullPointerException if iterable is null
*/
public static <E> Iterable<E> uniqueIterable(final Iterable<E> iterable) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
return new FluentIterable<E>() {
@Override
public Iterator<E> iterator() {
@@ -1015,7 +1005,7 @@ public class IterableUtils {
* @throws NullPointerException if iterable is null
*/
public static <E> Iterable<E> unmodifiableIterable(final Iterable<E> iterable) {
- checkNotNull(iterable);
+ Objects.requireNonNull(iterable, "iterable");
if (iterable instanceof UnmodifiableIterable<?>) {
return iterable;
}
@@ -1042,8 +1032,8 @@ public class IterableUtils {
*/
public static <E> Iterable<E> zippingIterable(final Iterable<? extends E> a,
final Iterable<? extends E> b) {
- checkNotNull(a);
- checkNotNull(b);
+ Objects.requireNonNull(a, "iterable");
+ Objects.requireNonNull(b, "iterable");
return new FluentIterable<E>() {
@Override
public Iterator<E> iterator() {
@@ -1069,7 +1059,7 @@ public class IterableUtils {
* @throws NullPointerException if either of the provided iterables is null
*/
public static <E> Iterable<E> zippingIterable(final Iterable<? extends E> first, final Iterable<? extends E>... others) {
- checkNotNull(first);
+ Objects.requireNonNull(first, "iterable");
checkNotNull(others);
return new FluentIterable<E>() {
@Override