From ef7e872738fc9afdd4315797454257563b3014fe Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 27 Mar 2017 22:38:32 +0100 Subject: Return OptionalInt from findIndex --- src/main/java/org/zwobble/mammoth/internal/util/Iterables.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/util/Iterables.java') diff --git a/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java b/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java index 85fdaee..205f6a2 100644 --- a/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java +++ b/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java @@ -2,6 +2,7 @@ package org.zwobble.mammoth.internal.util; import java.util.Iterator; import java.util.Optional; +import java.util.OptionalInt; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; @@ -153,14 +154,14 @@ public class Iterables { return StreamSupport.stream(iterable.spliterator(), false); } - public static int findIndex(Iterable iterable, Predicate predicate) { + public static OptionalInt findIndex(Iterable iterable, Predicate predicate) { int index = 0; for (T element : iterable) { if (predicate.test(element)) { - return index; + return OptionalInt.of(index); } index++; } - return -1; + return OptionalInt.empty(); } } -- cgit v1.2.3