Skip to content

Commit 6b2517c

Browse files
committed
Use forEach()
1 parent 01b2da3 commit 6b2517c

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/main/java/org/apache/commons/lang3/Validate.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package org.apache.commons.lang3;
1818

1919
import java.util.Collection;
20-
import java.util.Iterator;
2120
import java.util.Map;
2221
import java.util.Objects;
22+
import java.util.concurrent.atomic.AtomicInteger;
2323
import java.util.function.Supplier;
2424
import java.util.regex.Pattern;
2525

@@ -667,13 +667,12 @@ public static <T extends Iterable<?>> T noNullElements(final T iterable) {
667667
*/
668668
public static <T extends Iterable<?>> T noNullElements(final T iterable, final String message, final Object... values) {
669669
Objects.requireNonNull(iterable, "iterable");
670-
int i = 0;
671-
for (final Iterator<?> it = iterable.iterator(); it.hasNext(); i++) {
672-
if (it.next() == null) {
673-
final Object[] values2 = ArrayUtils.addAll(values, Integer.valueOf(i));
674-
throw new IllegalArgumentException(getMessage(message, values2));
670+
AtomicInteger ai = new AtomicInteger();
671+
iterable.forEach(e -> {
672+
if (e == null) {
673+
throw new IllegalArgumentException(getMessage(message, ArrayUtils.addAll(values, ai.getAndIncrement())));
675674
}
676-
}
675+
});
677676
return iterable;
678677
}
679678

0 commit comments

Comments
 (0)