Refactor names

Author: Grzegorz Piwowarek

src/main/java/pl/touk/throwing/ThrowingBiConsumer.java

@@ -59,14 +59,14 @@ default ThrowingBiFunction<T, U, Void, E> asFunction() {
     static <T, U, E extends Exception> BiConsumer<T, U> unchecked(ThrowingBiConsumer<T, U, E> consumer) {
         Objects.requireNonNull(consumer);
 
-        return consumer.unchecked();
+        return consumer.uncheck();
     }
 
     /**
      * Returns a new BiConsumer instance which wraps thrown checked exception instance into a RuntimeException
      * @return BiConsumer instance that packages checked exceptions into RuntimeException instances
      */
-    default BiConsumer<T, U> unchecked() {
+    default BiConsumer<T, U> uncheck() {
         return (arg1, arg2) -> {
             try {
                 accept(arg1, arg2);

src/main/java/pl/touk/throwing/ThrowingBiFunction.java

@@ -38,6 +38,18 @@
 public interface ThrowingBiFunction<T1, T2, R, E extends Throwable> {
     R apply(T1 arg1, T2 arg2) throws E;
 
+    static <T1, T2, R, E extends Throwable> BiFunction<T1, T2, R> unchecked(ThrowingBiFunction<T1, T2, R, E> function) {
+        Objects.requireNonNull(function);
+
+        return function.unchecked();
+    }
+
+    static <T1, T2, R, E extends Exception> BiFunction<T1, T2, Optional<R>> lifted(ThrowingBiFunction<T1, T2, R, E> f) {
+        Objects.requireNonNull(f);
+
+        return f.lift();
+    }
+
     /**
      * Performs provided action on the result of this ThrowingBiFunction instance
      * @param after action that is supposed to be made on the result of apply()
@@ -50,12 +62,6 @@ default <V> ThrowingBiFunction<T1, T2, V, E> andThen(final ThrowingFunction<? su
         return (arg1, arg2) -> after.apply(apply(arg1, arg2));
     }
 
-    static <T1, T2, R, E extends Throwable> BiFunction<T1, T2, R> unchecked(ThrowingBiFunction<T1, T2, R, E> function) {
-        Objects.requireNonNull(function);
-
-        return function.unchecked();
-    }
-
     default BiFunction<T1, T2, R> unchecked() {
         return (arg1, arg2) -> {
             try {
@@ -75,10 +81,4 @@ default BiFunction<T1, T2, Optional<R>> lift() {
             }
         };
     }
-
-    static <T1, T2, R, E extends Exception> BiFunction<T1, T2, Optional<R>> lifted(ThrowingBiFunction<T1, T2, R, E> f) {
-        Objects.requireNonNull(f);
-
-        return f.lift();
-    }
 }

src/main/java/pl/touk/throwing/ThrowingBiPredicate.java

@@ -33,6 +33,12 @@
 public interface ThrowingBiPredicate<T, U, E extends Throwable> {
     boolean test(T t, U u) throws E;
 
+    static <T, U, E extends Exception> BiPredicate<T, U> unchecked(ThrowingBiPredicate<T, U, E> predicate) {
+        Objects.requireNonNull(predicate);
+
+        return predicate.uncheck();
+    }
+
     default ThrowingBiPredicate<T, U, E> and(final ThrowingBiPredicate<? super T, ? super U, E> other) {
         Objects.requireNonNull(other);
 
@@ -62,16 +68,10 @@ default ThrowingBiFunction<T, U, Boolean, E> asFunction() {
         return this::test;
     }
 
-    static <T, U, E extends Exception> BiPredicate<T, U> unchecked(ThrowingBiPredicate<T, U, E> predicate) {
-        Objects.requireNonNull(predicate);
-
-        return predicate.unchecked();
-    }
-
     /**
      * @return a new BiPredicate instance which wraps thrown checked exception instance into a RuntimeException
      */
-    default BiPredicate<T, U> unchecked() {
+    default BiPredicate<T, U> uncheck() {
         return (arg1, arg2) -> {
             try {
                 return test(arg1, arg2);

src/main/java/pl/touk/throwing/ThrowingConsumer.java

@@ -33,6 +33,12 @@ public interface ThrowingConsumer<T, E extends Throwable> {
 
     void accept(T t) throws E;
 
+    static <T, E extends Throwable> Consumer<T> unchecked(ThrowingConsumer<T, E> consumer) {
+        Objects.requireNonNull(consumer);
+
+        return consumer.uncheck();
+    }
+
     /**
      * Chains given ThrowingConsumer instance
      * @param after - consumer that is chained after this instance
@@ -57,16 +63,10 @@ default ThrowingFunction<T, Void, E> asFunction() {
         };
     }
 
-    static <T, E extends Throwable> Consumer<T> unchecked(ThrowingConsumer<T, E> consumer) {
-        Objects.requireNonNull(consumer);
-
-        return consumer.unchecked();
-    }
-
     /**
      * @return a Consumer instance which wraps thrown checked exception instance into a RuntimeException
      */
-    default Consumer<T> unchecked() {
+    default Consumer<T> uncheck() {
         return t -> {
             try {
                 accept(t);

src/main/java/pl/touk/throwing/ThrowingSupplier.java

@@ -43,7 +43,7 @@ default ThrowingFunction<Void, T, E> asFunction() {
     static <T, E extends Exception> Supplier<T> unchecked(ThrowingSupplier<T, E> supplier) {
         Objects.requireNonNull(supplier);
 
-        return supplier.unchecked();
+        return supplier.uncheck();
     }
 
     static <T, E extends Exception> Supplier<Optional<T>> lifted(ThrowingSupplier<T, E> supplier) {
@@ -55,7 +55,7 @@ static <T, E extends Exception> Supplier<Optional<T>> lifted(ThrowingSupplier<T,
     /**
      * @return a new Supplier instance which wraps thrown checked exception instance into a RuntimeException
      */
-    default Supplier<T> unchecked() {
+    default Supplier<T> uncheck() {
         return () -> {
             try {
                 return get();

src/main/java/pl/touk/throwing/ThrowingUnaryOperator.java

@@ -34,7 +34,7 @@
 @FunctionalInterface
 public interface ThrowingUnaryOperator<T, E extends Throwable> extends ThrowingFunction<T, T, E> {
 
-    static <T, E extends Exception> UnaryOperator<T> uncheck(ThrowingUnaryOperator<T, E> operator) {
+    static <T, E extends Exception> UnaryOperator<T> unchecked(ThrowingUnaryOperator<T, E> operator) {
         Objects.requireNonNull(operator);
 
         return operator.uncheck();

src/test/java/pl/touk/throwing/ThrowingBiPredicateTest.java

@@ -97,25 +97,8 @@ public void shouldTestWhenUsingUncheck() throws Exception {
         final ThrowingBiPredicate<Integer, Integer, Exception> predicate = (i, j) -> true;
 
         // when
-        predicate.unchecked().test(1, 2);
+        predicate.uncheck().test(1, 2);
 
         // then no exception is thrown
     }
-
-    @Test(expected = RuntimeException.class)
-    public void shouldWrapInRuntimeExWhenUsingUncheck() throws Exception {
-        // given
-        final ThrowingBiPredicate<Integer, Integer, Exception> predicate = (i, j) -> {
-            throw new Exception();
-        };
-
-        // when
-        predicate.unchecked().test(0, 2);
-
-        // then RuntimeException is thrown
-    }
-
-
-
-
 }

src/test/java/pl/touk/throwing/ThrowingSupplierTest.java

@@ -64,7 +64,7 @@ public void shouldGetUnchecked() throws Exception {
         final ThrowingSupplier<Integer, IOException> supplier = () -> 42;
 
         // when
-        final Integer result = supplier.unchecked().get();
+        final Integer result = supplier.uncheck().get();
 
         // then
         assertThat(result).isEqualTo(42);
@@ -76,7 +76,7 @@ public void shouldGetUncheckedAndThrow() throws Exception {
         final ThrowingSupplier<Integer, IOException> supplier = () -> { throw new IOException(); };
 
         // when
-        supplier.unchecked().get();
+        supplier.uncheck().get();
 
         // then exception is thrown
     }

src/test/java/pl/touk/throwing/ThrowingUnaryOperatorTest.java

@@ -24,7 +24,7 @@ public void shouldApplyUnchecked() throws Exception {
         ThrowingUnaryOperator<Integer, IOException> op = i -> i;
 
         // when
-        ThrowingUnaryOperator.uncheck(op).apply(42);
+        ThrowingUnaryOperator.unchecked(op).apply(42);
 
         // then no exception thrown
     }
@@ -35,7 +35,7 @@ public void shouldApplyUncheckedAndThrow() throws Exception {
         ThrowingUnaryOperator<Integer, IOException> op = i -> { throw new IOException(); };
 
         // when
-        ThrowingUnaryOperator.uncheck(op).apply(42);
+        ThrowingUnaryOperator.unchecked(op).apply(42);
 
         // then no exception thrown
     }