Removed invokeAndUnwrap methods

These would require code to be wrapped in a method or lambda, where try-catch combined with UncheckedException.throwCauseAs is usually just as easy

Author: robtimus

src/main/java/com/github/robtimus/function/throwing/ThrowingBiConsumer.java

@@ -292,34 +292,16 @@ static <T, U, X extends Throwable> ThrowingBiConsumer<T, U, X> checked(BiConsume
     static <T, U, X extends Throwable> ThrowingBiConsumer<T, U, X> checked(BiConsumer<? super T, ? super U> operation, Class<X> errorType) {
         Objects.requireNonNull(operation);
         Objects.requireNonNull(errorType);
-        return (t, u) -> invokeAndUnwrap(operation, t, u, errorType);
-    }
-
-    /**
-     * Invokes an operation, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <T> The type of the first argument to the operation.
-     * @param <U> The type of the second argument to the operation.
-     * @param <X> The type of checked exception that can be thrown.
-     * @param operation The operation to invoke.
-     * @param input1 The first input to the operation.
-     * @param input2 The second input to the operation.
-     * @param errorType The type of checked exception that can be thrown.
-     * @throws NullPointerException If {@code operation} or {@code errorType} is {@code null}.
-     * @throws X If {@code operation} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <T, U, X extends Throwable> void invokeAndUnwrap(BiConsumer<? super T, ? super U> operation, T input1, U input2, Class<X> errorType)
-            throws X {
-
-        Objects.requireNonNull(errorType);
-        try {
-            operation.accept(input1, input2);
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return (t, u) -> {
+            try {
+                operation.accept(t, u);
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }

src/main/java/com/github/robtimus/function/throwing/ThrowingBiFunction.java

@@ -344,35 +344,16 @@ static <T, U, R, X extends Throwable> ThrowingBiFunction<T, U, R, X> checked(BiF
                                                                                  Class<X> errorType) {
         Objects.requireNonNull(function);
         Objects.requireNonNull(errorType);
-        return (t, u) -> invokeAndUnwrap(function, t, u, errorType);
-    }
-
-    /**
-     * Invokes a function, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <T> The type of the first argument to the function.
-     * @param <U> The type of the second argument to the function.
-     * @param <R> The type of the result of the function.
-     * @param <X> The type of checked exception that can be thrown.
-     * @param function The function to invoke.
-     * @param input1 The first input to the function.
-     * @param input2 The second input to the function.
-     * @param errorType The type of checked exception that can be thrown.
-     * @return The result of invoking {@code function}.
-     * @throws NullPointerException If {@code function} or {@code errorType} is {@code null}.
-     * @throws X If {@code function} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <T, U, R, X extends Throwable> R invokeAndUnwrap(BiFunction<? super T, ? super U, ? extends R> function, T input1, U input2,
-                                                            Class<X> errorType) throws X {
-        Objects.requireNonNull(errorType);
-        try {
-            return function.apply(input1, input2);
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return (t, u) -> {
+            try {
+                return function.apply(t, u);
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }

src/main/java/com/github/robtimus/function/throwing/ThrowingBiPredicate.java

@@ -379,35 +379,16 @@ static <T, U, X extends Throwable> ThrowingBiPredicate<T, U, X> checked(BiPredic
     static <T, U, X extends Throwable> ThrowingBiPredicate<T, U, X> checked(BiPredicate<? super T, ? super U> predicate, Class<X> errorType) {
         Objects.requireNonNull(predicate);
         Objects.requireNonNull(errorType);
-        return (t, u) -> invokeAndUnwrap(predicate, t, u, errorType);
-    }
-
-    /**
-     * Invokes a predicate, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <T> The type of the first argument to the predicate.
-     * @param <U> The type of the second argument the predicate.
-     * @param <X> The type of checked exception that can be thrown.
-     * @param predicate The predicate to invoke.
-     * @param input1 The first input to the predicate.
-     * @param input2 The second input to the predicate.
-     * @param errorType The type of checked exception that can be thrown.
-     * @return The result of invoking {@code predicate}.
-     * @throws NullPointerException If {@code predicate} or {@code errorType} is {@code null}.
-     * @throws X If {@code predicate} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <T, U, X extends Throwable> boolean invokeAndUnwrap(BiPredicate<? super T, ? super U> predicate, T input1, U input2, Class<X> errorType)
-            throws X {
-
-        Objects.requireNonNull(errorType);
-        try {
-            return predicate.test(input1, input2);
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return (t, u) -> {
+            try {
+                return predicate.test(t, u);
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }

src/main/java/com/github/robtimus/function/throwing/ThrowingBinaryOperator.java

@@ -238,32 +238,16 @@ static <T, X extends Throwable> ThrowingBinaryOperator<T, X> checked(BinaryOpera
     static <T, X extends Throwable> ThrowingBinaryOperator<T, X> checked(BinaryOperator<T> operator, Class<X> errorType) {
         Objects.requireNonNull(operator);
         Objects.requireNonNull(errorType);
-        return (t, u) -> invokeAndUnwrap(operator, t, u, errorType);
-    }
-
-    /**
-     * Invokes a binary operator, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <T> The type of the operands and result of the operator.
-     * @param <X> The type of checked exception that can be thrown.
-     * @param operator The binary operator to invoke.
-     * @param input1 The first input to the binary operator.
-     * @param input2 The second input to the binary operator.
-     * @param errorType The type of checked exception that can be thrown.
-     * @return The result of invoking {@code operator}.
-     * @throws NullPointerException If {@code operator} or {@code errorType} is {@code null}.
-     * @throws X If {@code operator} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <T, X extends Throwable> T invokeAndUnwrap(BinaryOperator<T> operator, T input1, T input2, Class<X> errorType) throws X {
-        Objects.requireNonNull(errorType);
-        try {
-            return operator.apply(input1, input2);
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return (t, u) -> {
+            try {
+                return operator.apply(t, u);
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }

src/main/java/com/github/robtimus/function/throwing/ThrowingBooleanSupplier.java

@@ -264,29 +264,16 @@ static <X extends Throwable> ThrowingBooleanSupplier<X> checked(BooleanSupplier
     static <X extends Throwable> ThrowingBooleanSupplier<X> checked(BooleanSupplier supplier, Class<X> errorType) {
         Objects.requireNonNull(supplier);
         Objects.requireNonNull(errorType);
-        return () -> invokeAndUnwrap(supplier, errorType);
-    }
-
-    /**
-     * Invokes a supplier, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <X> The type of checked exception that can be thrown.
-     * @param supplier The supplier to invoke.
-     * @param errorType The type of checked exception that can be thrown.
-     * @return The result of invoking {@code supplier}.
-     * @throws NullPointerException If {@code supplier} or {@code errorType} is {@code null}.
-     * @throws X If {@code supplier} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <X extends Throwable> boolean invokeAndUnwrap(BooleanSupplier supplier, Class<X> errorType) throws X {
-        Objects.requireNonNull(errorType);
-        try {
-            return supplier.getAsBoolean();
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return () -> {
+            try {
+                return supplier.getAsBoolean();
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }

src/main/java/com/github/robtimus/function/throwing/ThrowingConsumer.java

@@ -285,30 +285,16 @@ static <T, X extends Throwable> ThrowingConsumer<T, X> checked(Consumer<? super
     static <T, X extends Throwable> ThrowingConsumer<T, X> checked(Consumer<? super T> operation, Class<X> errorType) {
         Objects.requireNonNull(operation);
         Objects.requireNonNull(errorType);
-        return t -> invokeAndUnwrap(operation, t, errorType);
-    }
-
-    /**
-     * Invokes an operation, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <T> The type of the input to the operation.
-     * @param <X> The type of checked exception that can be thrown.
-     * @param operation The operation to invoke.
-     * @param input The input to the operation.
-     * @param errorType The type of checked exception that can be thrown.
-     * @throws NullPointerException If {@code operation} or {@code errorType} is {@code null}.
-     * @throws X If {@code operation} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <T, X extends Throwable> void invokeAndUnwrap(Consumer<? super T> operation, T input, Class<X> errorType) throws X {
-        Objects.requireNonNull(errorType);
-        try {
-            operation.accept(input);
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return t -> {
+            try {
+                operation.accept(t);
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }

src/main/java/com/github/robtimus/function/throwing/ThrowingDoubleBinaryOperator.java

@@ -313,31 +313,16 @@ static <X extends Throwable> ThrowingDoubleBinaryOperator<X> checked(DoubleBinar
     static <X extends Throwable> ThrowingDoubleBinaryOperator<X> checked(DoubleBinaryOperator operator, Class<X> errorType) {
         Objects.requireNonNull(operator);
         Objects.requireNonNull(errorType);
-        return (t, u) -> invokeAndUnwrap(operator, t, u, errorType);
-    }
-
-    /**
-     * Invokes a binary operator, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <X> The type of checked exception that can be thrown.
-     * @param operator The operator to invoke.
-     * @param input1 The first input to the operator.
-     * @param input2 The second input to the operator.
-     * @param errorType The type of checked exception that can be thrown.
-     * @return The result of invoking {@code operator}.
-     * @throws NullPointerException If {@code operator} or {@code errorType} is {@code null}.
-     * @throws X If {@code operator} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <X extends Throwable> double invokeAndUnwrap(DoubleBinaryOperator operator, double input1, double input2, Class<X> errorType) throws X {
-        Objects.requireNonNull(errorType);
-        try {
-            return operator.applyAsDouble(input1, input2);
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return (t, u) -> {
+            try {
+                return operator.applyAsDouble(t, u);
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }

src/main/java/com/github/robtimus/function/throwing/ThrowingDoubleConsumer.java

@@ -280,29 +280,16 @@ static <X extends Throwable> ThrowingDoubleConsumer<X> checked(DoubleConsumer op
     static <X extends Throwable> ThrowingDoubleConsumer<X> checked(DoubleConsumer operation, Class<X> errorType) {
         Objects.requireNonNull(operation);
         Objects.requireNonNull(errorType);
-        return t -> invokeAndUnwrap(operation, t, errorType);
-    }
-
-    /**
-     * Invokes an operation, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <X> The type of checked exception that can be thrown.
-     * @param operation The operation to invoke.
-     * @param input The input to the operation.
-     * @param errorType The type of checked exception that can be thrown.
-     * @throws NullPointerException If {@code operation} or {@code errorType} is {@code null}.
-     * @throws X If {@code operation} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <X extends Throwable> void invokeAndUnwrap(DoubleConsumer operation, double input, Class<X> errorType) throws X {
-        Objects.requireNonNull(errorType);
-        try {
-            operation.accept(input);
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return t -> {
+            try {
+                operation.accept(t);
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }

src/main/java/com/github/robtimus/function/throwing/ThrowingDoubleFunction.java

@@ -317,31 +317,16 @@ static <R, X extends Throwable> ThrowingDoubleFunction<R, X> checked(DoubleFunct
     static <R, X extends Throwable> ThrowingDoubleFunction<R, X> checked(DoubleFunction<? extends R> function, Class<X> errorType) {
         Objects.requireNonNull(function);
         Objects.requireNonNull(errorType);
-        return t -> invokeAndUnwrap(function, t, errorType);
-    }
-
-    /**
-     * Invokes a function, unwrapping any {@link UncheckedException} that is thrown if its cause if an instance of {@code errorType}.
-     *
-     * @param <R> The type of the result of the function.
-     * @param <X> The type of checked exception that can be thrown.
-     * @param function The function to invoke.
-     * @param input The input to the function.
-     * @param errorType The type of checked exception that can be thrown.
-     * @return The result of invoking {@code function}.
-     * @throws NullPointerException If {@code function} or {@code errorType} is {@code null}.
-     * @throws X If {@code function} throws an {@link UncheckedException} that wraps an instance of {@code errorType}.
-     */
-    static <R, X extends Throwable> R invokeAndUnwrap(DoubleFunction<? extends R> function, double input, Class<X> errorType) throws X {
-        Objects.requireNonNull(errorType);
-        try {
-            return function.apply(input);
-        } catch (UncheckedException e) {
-            Throwable cause = e.getCause();
-            if (errorType.isInstance(cause)) {
-                throw errorType.cast(cause);
+        return t -> {
+            try {
+                return function.apply(t);
+            } catch (UncheckedException e) {
+                Throwable cause = e.getCause();
+                if (errorType.isInstance(cause)) {
+                    throw errorType.cast(cause);
+                }
+                throw e;
             }
-            throw e;
-        }
+        };
     }
 }