Implement tryFind that returns Java optionals

2 files changed, 14 insertions, 9 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
index 537b347..4cd72cf 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
@@ -1,6 +1,5 @@
 package org.zwobble.mammoth.internal.styles;
 
-import com.google.common.collect.Iterables;
 import org.zwobble.mammoth.internal.documents.Paragraph;
 import org.zwobble.mammoth.internal.documents.Run;
 import org.zwobble.mammoth.internal.util.MammothLists;
@@ -9,6 +8,8 @@ import org.zwobble.mammoth.internal.util.MammothOptionals;
 import java.util.List;
 import java.util.Optional;
 
+import static org.zwobble.mammoth.internal.util.MammothIterables.tryFind;
+
 public class StyleMap {
     public static StyleMapBuilder builder() {
         return new StyleMapBuilder();
@@ -67,18 +68,12 @@ public class StyleMap {
     }
 
     public Optional<HtmlPath> getParagraphHtmlPath(Paragraph paragraph) {
-        com.google.common.base.Optional<StyleMapping<Paragraph>> mapping = Iterables.tryFind(
-            paragraphStyles,
-            styleMapping -> styleMapping.matches(paragraph));
-        return Optional.ofNullable(mapping.orNull())
+        return tryFind(paragraphStyles, styleMapping -> styleMapping.matches(paragraph))
             .map(StyleMapping::getHtmlPath);
     }
 
     public Optional<HtmlPath> getRunHtmlPath(Run run) {
-        com.google.common.base.Optional<StyleMapping<Run>> mapping = Iterables.tryFind(
-            runStyles,
-            styleMapping -> styleMapping.matches(run));
-        return Optional.ofNullable(mapping.orNull())
+        return tryFind(runStyles, styleMapping -> styleMapping.matches(run))
             .map(StyleMapping::getHtmlPath);
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
index cd28c14..4335dc1 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
@@ -3,9 +3,19 @@ package org.zwobble.mammoth.internal.util;
 import com.google.common.collect.Iterables;
 
 import java.util.Optional;
+import java.util.function.Predicate;
 
 public class MammothIterables {
     public static <T> Optional<T> tryGetLast(Iterable<T> iterable) {
         return Optional.ofNullable(Iterables.getLast(iterable, null));
     }
+
+    public static <T> Optional<T> tryFind(Iterable<T> iterable, Predicate<T> predicate) {
+        for (T element : iterable) {
+            if (predicate.test(element)) {
+                return Optional.of(element);
+            }
+        }
+        return Optional.empty();
+    }
 }