!1056 Opt添加ifFail方法

Merge pull request !1056 from 孔皮皮/v6-dev-opt

hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java

@@ -13,6 +13,7 @@ package org.dromara.hutool.core.lang;
 
 import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.func.SerSupplier;
+import org.dromara.hutool.core.stream.EasyStream;
 import org.dromara.hutool.core.text.StrUtil;
 
 import java.util.Collection;
@@ -32,6 +33,7 @@ import java.util.stream.Stream;
  * @param <T> 包裹里元素的类型
  * @author VampireAchao
  * @author Cizai
+ * @author kongweiguang
  * @see java.util.Optional
  */
 public class Opt<T> {
@@ -189,6 +191,52 @@ public class Opt<T> {
 		return null != this.throwable;
 	}
 
+	/**
+	 * 如果包裹内容失败了，就执行传入的操作({@link Consumer#accept})
+	 *
+	 * <p> 例如如果值存在就打印结果
+	 * <pre>{@code
+	 * Opt.ofTry(() -> 1 / 0).ifFail(Console::log);
+	 * }</pre>
+	 *
+	 * @param action 你想要执行的操作
+	 * @return this
+	 * @throws NullPointerException 如果包裹里的值存在，但你传入的操作为{@code null}时抛出
+	 */
+	public Opt<T> ifFail(final Consumer<? super Throwable> action) {
+		Objects.requireNonNull(action, "action is null");
+
+		if (isFail()) {
+			action.accept(throwable);
+		}
+
+		return this;
+	}
+
+	/**
+	 * 如果包裹内容失败了，同时是指定的异常执行传入的操作({@link Consumer#accept})
+	 *
+	 * <p> 例如如果值存在就打印结果
+	 * <pre>{@code
+	 * Opt.ofTry(() -> 1 / 0).ifFail(Console::log, ArithmeticException.class);
+	 * }</pre>
+	 *
+	 * @param action 你想要执行的操作
+	 * @param exs    抛出相应异常执行操作
+	 * @return this
+	 * @throws NullPointerException 如果包裹里的值存在，但你传入的操作为{@code null}时抛出
+	 */
+	@SafeVarargs
+	public final Opt<T> ifFail(final Consumer<? super Throwable> action, final Class<? extends Throwable>... exs) {
+		Objects.requireNonNull(action, "action is null");
+
+		if (isFail() && EasyStream.of(exs).anyMatch(e -> e.isAssignableFrom(throwable.getClass()))) {
+			action.accept(throwable);
+		}
+
+		return this;
+	}
+
 	/**
 	 * 判断包裹里元素的值是否存在，存在为 {@code true}，否则为{@code false}
 	 *

hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import javax.management.monitor.MonitorSettingException;
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -68,8 +69,8 @@ public class OptTest {
 		Opt.ofNullable("hutool").peeks(user::setUsername, user::setNickname);
 		// 也可以在适当的地方换行使得代码的可读性提高
 		Opt.of(user).peeks(
-				u -> Assertions.assertEquals("hutool", u.getNickname()),
-				u -> Assertions.assertEquals("hutool", u.getUsername())
+			u -> Assertions.assertEquals("hutool", u.getNickname()),
+			u -> Assertions.assertEquals("hutool", u.getUsername())
 		);
 		Assertions.assertEquals("hutool", user.getNickname());
 		Assertions.assertEquals("hutool", user.getUsername());
@@ -77,8 +78,8 @@ public class OptTest {
 		// 注意，传入的lambda中，对包裹内的元素执行赋值操作并不会影响到原来的元素,这是java语言的特性。。。
 		// 这也是为什么我们需要getter和setter而不直接给bean中的属性赋值中的其中一个原因
 		final String name = Opt.ofNullable("hutool").peeks(
-				username -> username = "123", username -> username = "456",
-				n -> Assertions.assertEquals("hutool", n)).get();
+			username -> username = "123", username -> username = "456",
+			n -> Assertions.assertEquals("hutool", n)).get();
 		Assertions.assertEquals("hutool", name);
 
 		// 当然，以下情况不会抛出NPE，但也没什么意义
@@ -104,7 +105,7 @@ public class OptTest {
 
 	@Test
 	public void orElseThrowTest() {
-		Assertions.assertThrows(NoSuchElementException.class, ()->{
+		Assertions.assertThrows(NoSuchElementException.class, () -> {
 			// 获取一个不可能为空的值，否则抛出NoSuchElementException异常
 			final Object obj = Opt.ofNullable(null).orElseThrow();
 			Assertions.assertNull(obj);
@@ -113,7 +114,7 @@ public class OptTest {
 
 	@Test
 	public void orElseThrowTest2() {
-		Assertions.assertThrows(IllegalStateException.class, ()->{
+		Assertions.assertThrows(IllegalStateException.class, () -> {
 			// 获取一个不可能为空的值，否则抛出自定义异常
 			final Object assignException = Opt.ofNullable(null).orElseThrow(IllegalStateException::new);
 			Assertions.assertNull(assignException);
@@ -127,8 +128,8 @@ public class OptTest {
 		final String key = "key";
 		map.put(key, 1);
 		Opt.ofNullable(map.get(key))
-				.ifPresent(v -> map.put(key, v + 1))
-				.orElseRun(() -> map.remove(key));
+			.ifPresent(v -> map.put(key, v + 1))
+			.orElseRun(() -> map.remove(key));
 		Assertions.assertEquals((Object) 2, map.get(key));
 	}
 
@@ -140,7 +141,7 @@ public class OptTest {
 //		Opt.ofNullable(userList).map(List::stream).flatMap(Stream::findFirst);
 		// 现在，兼容
 		final User user = Opt.ofNullable(userList).map(List::stream)
-				.flattedMap(Stream::findFirst).orElseGet(User.builder()::build);
+			.flattedMap(Stream::findFirst).orElseGet(User.builder()::build);
 		Assertions.assertNull(user.getUsername());
 		Assertions.assertNull(user.getNickname());
 	}
@@ -194,8 +195,8 @@ public class OptTest {
 				}
 			});
 			Assertions.assertTrue(
-					(i % 2 == 0 && opt.getThrowable() instanceof IllegalStateException) ||
-							(i % 2 != 0 && opt.getThrowable() instanceof NullPointerException)
+				(i % 2 == 0 && opt.getThrowable() instanceof IllegalStateException) ||
+					(i % 2 != 0 && opt.getThrowable() instanceof NullPointerException)
 			);
 		});
 	}
@@ -208,4 +209,14 @@ public class OptTest {
 		private String username;
 		private String nickname;
 	}
+
+	@Test
+	void testFail() {
+		Opt.ofTry(() -> 1 / 0)
+			.ifFail(Console::log)
+			.ifFail(Console::log, ArithmeticException.class)
+			.ifFail(Console::log, NullPointerException.class)
+			.ifFail(Console::log, NullPointerException.class, MonitorSettingException.class)
+		;
+	}
 }