summaryrefslogtreecommitdiffstats
path: root/yolean
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-05-03 13:49:10 +0200
committerjonmv <venstad@gmail.com>2022-05-03 13:49:10 +0200
commite7d5a03bc97d59f217913b40714d3a556b03f6c3 (patch)
treefff63c9fc224652429f1bc432341b653dbdd71a6 /yolean
parentad9240b1b12d77f469b4331c89911aa05544842c (diff)
Simplify signature
Diffstat (limited to 'yolean')
-rw-r--r--yolean/src/main/java/com/yahoo/yolean/concurrent/Memoized.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/yolean/src/main/java/com/yahoo/yolean/concurrent/Memoized.java b/yolean/src/main/java/com/yahoo/yolean/concurrent/Memoized.java
index 92f6c323334..8e2b7b7a7eb 100644
--- a/yolean/src/main/java/com/yahoo/yolean/concurrent/Memoized.java
+++ b/yolean/src/main/java/com/yahoo/yolean/concurrent/Memoized.java
@@ -43,7 +43,7 @@ public class Memoized<T, E extends Exception> implements Supplier<T>, AutoClosea
return new Memoized<>(factory, AutoCloseable::close);
}
- public static <T, U, E extends Exception, F extends E, G extends E> Memoized<U, E> combine(Memoized<T, ? extends F> inner, Function<T, U> outer, Closer<U, ? extends G> closer) {
+ public static <T, U, E extends Exception> Memoized<U, E> combine(Memoized<T, ? extends E> inner, Function<T, U> outer, Closer<U, ? extends E> closer) {
return new Memoized<>(() -> outer.apply(inner.get()), compose(closer, inner::close));
}
@@ -78,7 +78,7 @@ public class Memoized<T, E extends Exception> implements Supplier<T>, AutoClosea
private interface Thrower<E extends Exception> { void call() throws E; }
- private static <T, E extends Exception, F extends E, G extends E> Closer<T, E> compose(Closer<T, G> outer, Thrower<F> inner) {
+ private static <T, E extends Exception> Closer<T, E> compose(Closer<T, ? extends E> outer, Thrower<? extends E> inner) {
return parent -> {
Exception thrown = null;
try {