PR feedback

andimarek · andimarek · commit 080b73bccd8b · 2019-01-11T16:13:58.000+11:00
diff --git a/src/main/java/graphql/language/AstMultiZipper.java b/src/main/java/graphql/language/AstMultiZipper.java
@@ -67,7 +67,7 @@ public List<AstZipper> getZippers() {
     }
 
     public AstZipper getZipperForNode(Node node) {
-        return FpKit.findOne(zippers, zipper -> zipper.getCurNode() == node);
+        return FpKit.findOneOrNull(zippers, zipper -> zipper.getCurNode() == node);
     }
 
     public AstMultiZipper withReplacedZippers(List<AstZipper> zippers) {
diff --git a/src/main/java/graphql/util/FpKit.java b/src/main/java/graphql/util/FpKit.java
@@ -10,6 +10,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
@@ -152,12 +153,15 @@ public static <T> List<T> flatList(List<List<T>> listLists) {
                 .collect(Collectors.toList());
     }
 
-    public static <T> T findOne(List<T> list, Predicate<T> filter) {
+    public static <T> Optional<T> findOne(List<T> list, Predicate<T> filter) {
         return list
                 .stream()
                 .filter(filter)
-                .findFirst()
-                .orElse(null);
+                .findFirst();
+    }
+
+    public static <T> T findOneOrNull(List<T> list, Predicate<T> filter) {
+        return findOne(list, filter).orElse(null);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public List<AstZipper> getZippers() {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public AstZipper getZipperForNode(Node node) {`
`70`		`- return FpKit.findOne(zippers, zipper -> zipper.getCurNode() == node);`
	`70`	`+ return FpKit.findOneOrNull(zippers, zipper -> zipper.getCurNode() == node);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public AstMultiZipper withReplacedZippers(List<AstZipper> zippers) {`