From 0500353036b79af2d2f564f5c2f99d177f1865ca Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 11 Oct 2021 11:09:38 +0200 Subject: [PATCH] [jOOQ/jOOQ#12425] Don't leak type from Traverser --- jOOQ/src/main/java/org/jooq/Traversers.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Traversers.java b/jOOQ/src/main/java/org/jooq/Traversers.java index 45165e3c10..f51a1247ff 100644 --- a/jOOQ/src/main/java/org/jooq/Traversers.java +++ b/jOOQ/src/main/java/org/jooq/Traversers.java @@ -55,7 +55,7 @@ public final class Traversers { /** * A traverser constructed from a {@link Collector}. */ - public static Traverser collecting(Collector collector) { + public static Traverser collecting(Collector collector) { return Traverser.of( collector.supplier(), t -> false, @@ -76,7 +76,7 @@ public final class Traversers { * @param part The part to find within the traversed {@link QueryPart} tree. */ @NotNull - public static Traverser containing(QueryPart part) { + public static Traverser containing(QueryPart part) { return Traverser.of( () -> false, b -> b, @@ -93,8 +93,8 @@ public final class Traversers { * {@link QueryPart} to find. */ @NotNull - public static Traverser> findingAny(Predicate predicate) { - return Traverser.of( + public static Traverser> findingAny(Predicate predicate) { + return Traverser.>of( () -> null, p -> p != null, p -> true, @@ -112,7 +112,7 @@ public final class Traversers { * {@link QueryPart}s to find. */ @NotNull - public static Traverser, List> findingAll(Predicate predicate) { + public static Traverser> findingAll(Predicate predicate) { return Traverser.of( () -> new ArrayList<>(), (l, p) -> { @@ -124,6 +124,5 @@ public final class Traversers { (l, p) -> l ); } - private Traversers() {} }