add Optional support

hutool-json/src/test/java/org/dromara/hutool/json/Issue3681Test.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2024. looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          https://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
+package org.dromara.hutool.json;
+
+import org.dromara.hutool.core.lang.Opt;
+import org.dromara.hutool.core.map.MapUtil;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+public class Issue3681Test {
+	@Test
+	void toJsonStrOfOptionalTest() {
+		String abc = JSONUtil.toJsonStr(Optional.of("abc"));
+		Assertions.assertEquals("\"abc\"", abc);
+
+		abc = JSONUtil.toJsonStr(Optional.of("123"));
+		Assertions.assertEquals("123", abc);
+	}
+
+	@Test
+	void toJsonStrOfOptionalTest2() {
+		final String abc = JSONUtil.toJsonStr(Optional.of(MapUtil.of("a", 1)));
+		Assertions.assertEquals("{\"a\":1}", abc);
+	}
+
+	@Test
+	void toJsonStrOfOptTest() {
+		String abc = JSONUtil.toJsonStr(Opt.of("abc"));
+		Assertions.assertEquals("\"abc\"", abc);
+
+		abc = JSONUtil.toJsonStr(Opt.of("123"));
+		Assertions.assertEquals("123", abc);
+	}
+}

hutool-json/src/test/java/org/dromara/hutool/json/IssueI6LBZATest.java

@@ -32,11 +32,10 @@ public class IssueI6LBZATest {
 
 	@Test
 	public void parseJSONErrorTest() {
-		Assertions.assertThrows(JSONException.class, ()->{
-			final String a = "a";
-			final Object parse = JSONUtil.parse(a);
-			Assertions.assertEquals(String.class, parse.getClass());
-		});
+		final String a = "a";
+		final Object parse = JSONUtil.parse(a);
+		Assertions.assertEquals(String.class, parse.getClass());
+		Assertions.assertEquals("\"a\"", parse);
 	}
 
 	@Test

hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java

@@ -31,13 +31,6 @@ public class JSONUtilTest {
 
 	@Test
 	public void parseInvalid() {
-		Assertions.assertThrows(JSONException.class, ()->{
-			JSONUtil.parse("abc");
-		});
-	}
-
-	@Test
-	public void parseInvalid2() {
 		Assertions.assertThrows(JSONException.class, ()->{
 			JSONUtil.parse("'abc");
 		});
@@ -312,13 +305,10 @@ public class JSONUtilTest {
 
 	@Test
 	public void toJsonStrOfStringTest(){
-		Assertions.assertThrows(JSONException.class, ()->{
-			final String a = "a";
+		final String a = "a";
 
-			// 普通字符串不能解析为JSON字符串，必须由双引号或者单引号包裹
-			final String s = JSONUtil.toJsonStr(a);
-			Assertions.assertEquals(a, s);
-		});
+		final String s = JSONUtil.toJsonStr(a);
+		Assertions.assertEquals("\"a\"", s);
 	}
 
 	@Test