feat: 重命名SneakThrow、Throw为SneakThrows、Throws

lokic · lokic · commit 8d86569cffe4 · 2021-12-18T23:22:29.000+08:00
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowFunctional.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowFunctional.java
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsConsumer1.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsConsumer1.java
@@ -1,12 +1,12 @@
 package com.github.lokic.javaplus.functional.sneakythrows;
 
-import com.github.lokic.javaplus.functional.throwable.ThrowConsumer1;
+import com.github.lokic.javaplus.functional.throwable.ThrowsConsumer1;
 import lombok.SneakyThrows;
 
 import java.util.function.Consumer;
 
 @FunctionalInterface
-public interface SneakyThrowConsumer1<T> extends Consumer<T>, ThrowConsumer1<T> {
+public interface SneakyThrowsConsumer1<T> extends Consumer<T>, ThrowsConsumer1<T> {
 
     @SneakyThrows
     @Override
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunction1.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunction1.java
@@ -1,12 +1,12 @@
 package com.github.lokic.javaplus.functional.sneakythrows;
 
-import com.github.lokic.javaplus.functional.throwable.ThrowFunction1;
+import com.github.lokic.javaplus.functional.throwable.ThrowsFunction1;
 import lombok.SneakyThrows;
 
 import java.util.function.Function;
 
 @FunctionalInterface
-public interface SneakyThrowFunction1<T, R> extends Function<T, R>, ThrowFunction1<T, R> {
+public interface SneakyThrowsFunction1<T, R> extends Function<T, R>, ThrowsFunction1<T, R> {
 
     @SneakyThrows
     @Override
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunction2.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunction2.java
@@ -1,11 +1,11 @@
 package com.github.lokic.javaplus.functional.sneakythrows;
 
-import com.github.lokic.javaplus.functional.throwable.ThrowFunction2;
+import com.github.lokic.javaplus.functional.throwable.ThrowsFunction2;
 import com.github.lokic.javaplus.functional.tuple.TupleFunction2;
 import lombok.SneakyThrows;
 
 @FunctionalInterface
-public interface SneakyThrowFunction2<T1, T2, R> extends TupleFunction2<T1, T2, R>, ThrowFunction2<T1, T2, R> {
+public interface SneakyThrowsFunction2<T1, T2, R> extends TupleFunction2<T1, T2, R>, ThrowsFunction2<T1, T2, R> {
 
     @SneakyThrows
     @Override
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunction3.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunction3.java
@@ -1,11 +1,11 @@
 package com.github.lokic.javaplus.functional.sneakythrows;
 
-import com.github.lokic.javaplus.functional.throwable.ThrowFunction3;
+import com.github.lokic.javaplus.functional.throwable.ThrowsFunction3;
 import com.github.lokic.javaplus.functional.tuple.TupleFunction3;
 import lombok.SneakyThrows;
 
 @FunctionalInterface
-public interface SneakyThrowFunction3<T1, T2, T3, R> extends TupleFunction3<T1, T2, T3, R>, ThrowFunction3<T1, T2, T3, R> {
+public interface SneakyThrowsFunction3<T1, T2, T3, R> extends TupleFunction3<T1, T2, T3, R>, ThrowsFunction3<T1, T2, T3, R> {
 
     @SneakyThrows
     @Override
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunctional.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunctional.java
@@ -0,0 +1,30 @@
+package com.github.lokic.javaplus.functional.sneakythrows;
+
+import com.github.lokic.javaplus.functional.throwable.*;
+
+public interface SneakyThrowsFunctional {
+
+    static <T> SneakyThrowsConsumer1<T> consumer(ThrowsConsumer1<T> throwsConsumer1) {
+        return throwsConsumer1::throwableAccept;
+    }
+
+    static <T, R> SneakyThrowsFunction1<T, R> function(ThrowsFunction1<T, R> throwsFunction1) {
+        return throwsFunction1::throwableApply;
+    }
+
+    static <T1, T2, R> SneakyThrowsFunction2<T1, T2, R> function(ThrowsFunction2<T1, T2, R> throwsFunction2) {
+        return throwsFunction2::throwableApply;
+    }
+
+    static <T1, T2, T3, R> SneakyThrowsFunction3<T1, T2, T3, R> function(ThrowsFunction3<T1, T2, T3, R> throwsFunction3) {
+        return throwsFunction3::throwableApply;
+    }
+
+    static SneakyThrowsRunnable runnable(ThrowsRunnable throwsRunnable) {
+        return throwsRunnable::throwableRun;
+    }
+
+    static <T> SneakyThrowsSupplier<T> supplier(ThrowsSupplier<T> throwsSupplier) {
+        return throwsSupplier::throwableGet;
+    }
+}
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsRunnable.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsRunnable.java
@@ -1,10 +1,10 @@
 package com.github.lokic.javaplus.functional.sneakythrows;
 
-import com.github.lokic.javaplus.functional.throwable.ThrowRunnable;
+import com.github.lokic.javaplus.functional.throwable.ThrowsRunnable;
 import lombok.SneakyThrows;
 
 @FunctionalInterface
-public interface SneakyThrowRunnable extends Runnable, ThrowRunnable {
+public interface SneakyThrowsRunnable extends Runnable, ThrowsRunnable {
 
     @SneakyThrows
     @Override
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsSupplier.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsSupplier.java
@@ -1,12 +1,12 @@
 package com.github.lokic.javaplus.functional.sneakythrows;
 
-import com.github.lokic.javaplus.functional.throwable.ThrowSupplier;
+import com.github.lokic.javaplus.functional.throwable.ThrowsSupplier;
 import lombok.SneakyThrows;
 
 import java.util.function.Supplier;
 
 @FunctionalInterface
-public interface SneakyThrowSupplier<T> extends Supplier<T>, ThrowSupplier<T> {
+public interface SneakyThrowsSupplier<T> extends Supplier<T>, ThrowsSupplier<T> {
 
     @SneakyThrows
     @Override
diff --git a/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/package-info.java b/src/main/java/com/github/lokic/javaplus/functional/sneakythrows/package-info.java
@@ -10,7 +10,7 @@
  * 这样既不需要定义一个统一非受检异常，也不需要定义很多特殊的非受检异常。需要捕获异常的时候也十分方便，直接try catch受检异常就可以了;
  * 在代码中也可以更加方便得使用方法引用，使代码看起来更加简洁和优雅。
  * <p>
- * 如下 {@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowFunction1 } 的使用：
+ * 如下 {@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowsFunction1 } 的使用：
  * <pre>{@code
  *      Optional.of(0)
  *              .map( (SneakyThrowFunction1<Integer, Integer>) this::throwableMethod );
diff --git a/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsConsumer1.java b/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsConsumer1.java
@@ -1,7 +1,7 @@
 package com.github.lokic.javaplus.functional.throwable;
 
 @FunctionalInterface
-public interface ThrowConsumer1<T> {
+public interface ThrowsConsumer1<T> {
 
     void throwableAccept(T t) throws Throwable;
 }
diff --git a/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsFunction1.java b/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsFunction1.java
@@ -2,7 +2,7 @@
 
 
 @FunctionalInterface
-public interface ThrowFunction1<T, R> {
+public interface ThrowsFunction1<T, R> {
 
     R throwableApply(T t) throws Throwable;
 }
diff --git a/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsFunction2.java b/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsFunction2.java
@@ -2,7 +2,7 @@
 
 
 @FunctionalInterface
-public interface ThrowFunction2<T1, T2, R> {
+public interface ThrowsFunction2<T1, T2, R> {
 
     R throwableApply(T1 t1, T2 t2) throws Throwable;
 }
diff --git a/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsFunction3.java b/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsFunction3.java
@@ -1,7 +1,7 @@
 package com.github.lokic.javaplus.functional.throwable;
 
 @FunctionalInterface
-public interface ThrowFunction3<T1, T2, T3, R> {
+public interface ThrowsFunction3<T1, T2, T3, R> {
 
     R throwableApply(T1 t1, T2 t2, T3 t3) throws Throwable;
 }
diff --git a/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsRunnable.java b/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsRunnable.java
@@ -2,7 +2,7 @@
 
 
 @FunctionalInterface
-public interface ThrowRunnable {
+public interface ThrowsRunnable {
 
     void throwableRun() throws Throwable;
 }
diff --git a/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsSupplier.java b/src/main/java/com/github/lokic/javaplus/functional/throwable/ThrowsSupplier.java
@@ -1,7 +1,7 @@
 package com.github.lokic.javaplus.functional.throwable;
 
 @FunctionalInterface
-public interface ThrowSupplier<T> {
+public interface ThrowsSupplier<T> {
 
     T throwableGet() throws Throwable;
 }
diff --git a/src/main/java/com/github/lokic/javaplus/package-info.java b/src/main/java/com/github/lokic/javaplus/package-info.java
@@ -10,16 +10,16 @@
  * {@link java.util.function.Supplier}相关扩展：
  * <ul>
  *     <li>{@link com.github.lokic.javaplus.Lazy}
- *     <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowSupplier}
- *     <li>{@link com.github.lokic.javaplus.functional.throwable.ThrowSupplier}
+ *     <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowsSupplier}
+ *     <li>{@link com.github.lokic.javaplus.functional.throwable.ThrowsSupplier}
  * </ul>
  * <p>
  * {@link java.util.function.Function}相关扩展：
  * <ul>
  *      <li>{@link com.github.lokic.javaplus.Functions}
- *      <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowFunction1}
- *      <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowFunction2}
- *      <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowFunction3}
+ *      <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowsFunction1}
+ *      <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowsFunction2}
+ *      <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowsFunction3}
  *      <li>{@link com.github.lokic.javaplus.functional.tuple.TupleFunction2}
  *      <li>{@link com.github.lokic.javaplus.functional.tuple.TupleFunction3}
  *      <li>{@link com.github.lokic.javaplus.functional.tuple.TupleFunction4}
@@ -31,17 +31,17 @@
  * {@link java.util.function.Consumer}相关扩展：
  * <ul>
  *     <li>{@link com.github.lokic.javaplus.Consumers}
- *     <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowConsumer1}
+ *     <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowsConsumer1}
  *     <li>{@link com.github.lokic.javaplus.functional.tuple.TupleConsumer2}
  *     <li>{@link com.github.lokic.javaplus.functional.tuple.TupleConsumer3}
  *     <li>{@link com.github.lokic.javaplus.functional.entry.EntryConsumer}
- *     <li>{@link com.github.lokic.javaplus.functional.throwable.ThrowConsumer1}
+ *     <li>{@link com.github.lokic.javaplus.functional.throwable.ThrowsConsumer1}
  * </ul>
  * <p>
  * {@link java.lang.Runnable} 相关扩展：
  * <ul>
- *     <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowRunnable}
- *     <li>{@link com.github.lokic.javaplus.functional.throwable.ThrowRunnable}
+ *     <li>{@link com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowsRunnable}
+ *     <li>{@link com.github.lokic.javaplus.functional.throwable.ThrowsRunnable}
  * </ul>
  * <p>
  * {@link java.util.Optional} 相关扩展：
diff --git a/src/test/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunctionalTest.java b/src/test/java/com/github/lokic/javaplus/functional/sneakythrows/SneakyThrowsFunctionalTest.java
@@ -8,12 +8,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class SneakyThrowFunctionalTest {
+public class SneakyThrowsFunctionalTest {
 
     @Test
     public void cast() {
         List<String> re = Stream.of(1, 2)
-                .map(SneakyThrowFunctional.function(this::toStrThrow))
+                .map(SneakyThrowsFunctional.function(this::toStrThrow))
                 .collect(Collectors.toList());
 
         Assert.assertEquals(Lists.newArrayList("1", "2"), re);
diff --git a/src/test/java/com/github/lokic/javaplus/functional/tuple/TupleFunctionalTest.java b/src/test/java/com/github/lokic/javaplus/functional/tuple/TupleFunctionalTest.java
@@ -1,6 +1,6 @@
 package com.github.lokic.javaplus.functional.tuple;
 
-import com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowFunctional;
+import com.github.lokic.javaplus.functional.sneakythrows.SneakyThrowsFunctional;
 import com.github.lokic.javaplus.tuple.Tuple;
 import com.github.lokic.javaplus.tuple.Tuple2;
 import org.assertj.core.util.Lists;
@@ -25,15 +25,15 @@ public void cast() {
     public void cast_use_SneakyThrowFunction2() {
         // SneakyThrowFunction2 extends TupleFunction2
         Optional<String> res = Optional.of(Tuple.of("A", 1))
-                .map(SneakyThrowFunctional.function(this::toStrThrow));
+                .map(SneakyThrowsFunctional.function(this::toStrThrow));
         Assert.assertTrue(res.isPresent());
         Assert.assertEquals("A1", res.get());
     }
 
     @Test
     public void cast_use_SneakyThrowFunction1() {
         Optional<String> res = Optional.of(Tuple.of("A", 1))
-                .map(SneakyThrowFunctional.function(x -> x.getT1() + x.getT2()));
+                .map(SneakyThrowsFunctional.function(x -> x.getT1() + x.getT2()));
         Assert.assertTrue(res.isPresent());
         Assert.assertEquals("A1", res.get());
     }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.github.lokic.javaplus.functional.throwable;`
`2`	`2`
`3`	`3`	`@FunctionalInterface`
`4`		`-public interface ThrowConsumer1<T> {`
	`4`	`+public interface ThrowsConsumer1<T> {`
`5`	`5`
`6`	`6`	`void throwableAccept(T t) throws Throwable;`
`7`	`7`	`}`