From 35cbd38b3bfd11015317a40fdf3a65e8a7233f56 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Fri, 21 Mar 2025 00:47:55 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E6=96=B0=E5=A2=9E=20json=20=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96=E6=8F=92=E4=BB=B6=E7=9A=84=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../json/SaJsonTemplateForFastjson.java | 7 + .../json/SaJsonTemplateForFastjson2.java | 7 + .../json/SaJsonTemplateForJackson.java | 3 + .../satoken/json/SaJsonTemplateForSnack3.java | 7 + sa-token-test/pom.xml | 3 +- sa-token-test/sa-token-json-test/pom.xml | 49 ++++++ .../java/com/pj/test/SaJsonTemplateTest.java | 157 ++++++++++++++++++ .../test/java/com/pj/test/model/SysRole.java | 64 +++++++ .../test/java/com/pj/test/model/SysUser.java | 103 ++++++++++++ 9 files changed, 399 insertions(+), 1 deletion(-) create mode 100644 sa-token-test/sa-token-json-test/pom.xml create mode 100644 sa-token-test/sa-token-json-test/src/test/java/com/pj/test/SaJsonTemplateTest.java create mode 100644 sa-token-test/sa-token-json-test/src/test/java/com/pj/test/model/SysRole.java create mode 100644 sa-token-test/sa-token-json-test/src/test/java/com/pj/test/model/SysUser.java diff --git a/sa-token-plugin/sa-token-fastjson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson.java b/sa-token-plugin/sa-token-fastjson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson.java index 33ba23c1..28da6919 100644 --- a/sa-token-plugin/sa-token-fastjson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson.java +++ b/sa-token-plugin/sa-token-fastjson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson.java @@ -15,6 +15,7 @@ */ package cn.dev33.satoken.json; +import cn.dev33.satoken.util.SaFoxUtil; import com.alibaba.fastjson.JSON; /** @@ -30,6 +31,9 @@ public class SaJsonTemplateForFastjson implements SaJsonTemplate { */ @Override public String objectToJson(Object obj) { + if(SaFoxUtil.isEmpty(obj)) { + return null; + } return JSON.toJSONString(obj); } @@ -38,6 +42,9 @@ public class SaJsonTemplateForFastjson implements SaJsonTemplate { */ @Override public T jsonToObject(String jsonStr, Class type) { + if(SaFoxUtil.isEmpty(jsonStr)) { + return null; + } return JSON.parseObject(jsonStr, type); } diff --git a/sa-token-plugin/sa-token-fastjson2/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson2.java b/sa-token-plugin/sa-token-fastjson2/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson2.java index 64efa883..4946ef80 100644 --- a/sa-token-plugin/sa-token-fastjson2/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson2.java +++ b/sa-token-plugin/sa-token-fastjson2/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson2.java @@ -16,6 +16,7 @@ package cn.dev33.satoken.json; +import cn.dev33.satoken.util.SaFoxUtil; import com.alibaba.fastjson2.JSON; /** @@ -31,6 +32,9 @@ public class SaJsonTemplateForFastjson2 implements SaJsonTemplate { */ @Override public String objectToJson(Object obj) { + if(SaFoxUtil.isEmpty(obj)) { + return null; + } return JSON.toJSONString(obj); } @@ -39,6 +43,9 @@ public class SaJsonTemplateForFastjson2 implements SaJsonTemplate { */ @Override public T jsonToObject(String jsonStr, Class type) { + if(SaFoxUtil.isEmpty(jsonStr)) { + return null; + } return JSON.parseObject(jsonStr, type); } diff --git a/sa-token-plugin/sa-token-jackson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForJackson.java b/sa-token-plugin/sa-token-jackson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForJackson.java index 3d95b941..ec88de44 100644 --- a/sa-token-plugin/sa-token-jackson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForJackson.java +++ b/sa-token-plugin/sa-token-jackson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForJackson.java @@ -156,6 +156,9 @@ public class SaJsonTemplateForJackson implements SaJsonTemplate { */ @Override public Map jsonToMap(String jsonStr) { + if(SaFoxUtil.isEmpty(jsonStr)) { + return null; + } try { @SuppressWarnings("unchecked") Map map = mapObjectMapper.readValue(jsonStr, Map.class); diff --git a/sa-token-plugin/sa-token-snack3/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForSnack3.java b/sa-token-plugin/sa-token-snack3/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForSnack3.java index 01457c1d..9a7f83ee 100644 --- a/sa-token-plugin/sa-token-snack3/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForSnack3.java +++ b/sa-token-plugin/sa-token-snack3/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForSnack3.java @@ -15,6 +15,7 @@ */ package cn.dev33.satoken.json; +import cn.dev33.satoken.util.SaFoxUtil; import org.noear.snack.ONode; /** @@ -31,6 +32,9 @@ public class SaJsonTemplateForSnack3 implements SaJsonTemplate { */ @Override public String objectToJson(Object obj) { + if(SaFoxUtil.isEmpty(obj)) { + return null; + } return ONode.stringify(obj); } @@ -39,6 +43,9 @@ public class SaJsonTemplateForSnack3 implements SaJsonTemplate { */ @Override public T jsonToObject(String jsonStr, Class type) { + if(SaFoxUtil.isEmpty(jsonStr)) { + return null; + } return ONode.deserialize(jsonStr, type); } } diff --git a/sa-token-test/pom.xml b/sa-token-test/pom.xml index 0f3a42aa..6a336c45 100644 --- a/sa-token-test/pom.xml +++ b/sa-token-test/pom.xml @@ -21,9 +21,10 @@ - sa-token-springboot-test + sa-token-springboot-test sa-token-jwt-test + sa-token-json-test diff --git a/sa-token-test/sa-token-json-test/pom.xml b/sa-token-test/sa-token-json-test/pom.xml new file mode 100644 index 00000000..6fc7117a --- /dev/null +++ b/sa-token-test/sa-token-json-test/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + + cn.dev33 + sa-token-test + ${revision} + ../pom.xml + + jar + + sa-token-json-test + sa-token-json-test + sa-token-json-test + + + + cn.dev33 + sa-token-jackson + + + cn.dev33 + sa-token-fastjson + + + cn.dev33 + sa-token-fastjson2 + + + cn.dev33 + sa-token-snack3 + + + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + + diff --git a/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/SaJsonTemplateTest.java b/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/SaJsonTemplateTest.java new file mode 100644 index 00000000..62725994 --- /dev/null +++ b/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/SaJsonTemplateTest.java @@ -0,0 +1,157 @@ +package com.pj.test; + +import cn.dev33.satoken.SaManager; +import cn.dev33.satoken.exception.NotImplException; +import cn.dev33.satoken.json.*; +import com.pj.test.model.SysUser; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import java.util.HashMap; +import java.util.Map; + +/** + * Sa-Token json 序列化模块测试 + * + * @author click33 + * + */ +public class SaJsonTemplateTest { + + // 开始 + @BeforeAll + public static void beforeClass() { + System.out.println("\n\n------------------------ SaJsonTemplateTest star ..."); + } + + // 结束 + @AfterAll + public static void afterClass() { + System.out.println("\n\n------------------------ SaJsonTemplateTest end ... \n"); + } + + // 测试：DefaultImpl + @Test + public void testDefaultImpl() { + SaManager.setSaJsonTemplate(new SaJsonTemplateDefaultImpl()); + Assertions.assertEquals(SaManager.getSaJsonTemplate().getClass(), SaJsonTemplateDefaultImpl.class); + + // test Object -> Json + SysUser user = new SysUser(10001, "张三", 18); + Assertions.assertThrows(NotImplException.class, () -> SaManager.getSaJsonTemplate().objectToJson(user) ); + Assertions.assertThrows(NotImplException.class, () -> SaManager.getSaJsonTemplate().jsonToObject("xxx", SysUser.class) ); + Assertions.assertThrows(NotImplException.class, () -> SaManager.getSaJsonTemplate().jsonToObject("xxx") ); + Assertions.assertThrows(NotImplException.class, () -> SaManager.getSaJsonTemplate().jsonToMap("xxx") ); + } + + // 测试：Jackson + @Test + public void testJackson() { + SaManager.setSaJsonTemplate(new SaJsonTemplateForJackson()); + Assertions.assertEquals(SaManager.getSaJsonTemplate().getClass(), SaJsonTemplateForJackson.class); + + // test Object -> Json + SysUser user = new SysUser(10001, "张三", 18); + String objectJson = SaManager.getSaJsonTemplate().objectToJson(user); + Assertions.assertEquals("{\"@class\":\"com.pj.test.model.SysUser\",\"id\":10001,\"name\":\"张三\",\"age\":18,\"role\":null}", objectJson); + + // test Json -> Object + SysUser user2 = SaManager.getSaJsonTemplate().jsonToObject(objectJson, SysUser.class); + Assertions.assertEquals(user2.toString(), user.toString()); + + SysUser user3 = (SysUser)SaManager.getSaJsonTemplate().jsonToObject(objectJson); + Assertions.assertEquals(user3.toString(), user.toString()); + + // more + testNull(); + testMap(); + } + + // 测试：Fastjson + @Test + public void testFastjson() { + SaManager.setSaJsonTemplate(new SaJsonTemplateForFastjson()); + Assertions.assertEquals(SaManager.getSaJsonTemplate().getClass(), SaJsonTemplateForFastjson.class); + + // test Object -> Json + SysUser user = new SysUser(10001, "张三", 18); + String objectJson = SaManager.getSaJsonTemplate().objectToJson(user); + Assertions.assertEquals("{\"age\":18,\"id\":10001,\"name\":\"张三\"}", objectJson); + + // test Json -> Object + SysUser user2 = SaManager.getSaJsonTemplate().jsonToObject(objectJson, SysUser.class); + Assertions.assertEquals(user2.toString(), user.toString()); + + // more + testNull(); + testMap(); + } + + // 测试：Fastjson2 + @Test + public void testFastjson2() { + SaManager.setSaJsonTemplate(new SaJsonTemplateForFastjson2()); + Assertions.assertEquals(SaManager.getSaJsonTemplate().getClass(), SaJsonTemplateForFastjson2.class); + + // test Object -> Json + SysUser user = new SysUser(10001, "张三", 18); + String objectJson = SaManager.getSaJsonTemplate().objectToJson(user); + Assertions.assertEquals("{\"age\":18,\"id\":10001,\"name\":\"张三\"}", objectJson); + + // test Json -> Object + SysUser user2 = SaManager.getSaJsonTemplate().jsonToObject(objectJson, SysUser.class); + Assertions.assertEquals(user2.toString(), user.toString()); + + // more + testNull(); + testMap(); + } + + // 测试：Snack3 + @Test + public void testSnack3() { + SaManager.setSaJsonTemplate(new SaJsonTemplateForSnack3()); + Assertions.assertEquals(SaManager.getSaJsonTemplate().getClass(), SaJsonTemplateForSnack3.class); + + // test Object -> Json + SysUser user = new SysUser(10001, "张三", 18); + String objectJson = SaManager.getSaJsonTemplate().objectToJson(user); + Assertions.assertEquals("{\"id\":10001,\"name\":\"张三\",\"age\":18}", objectJson); + + // test Json -> Object + SysUser user2 = SaManager.getSaJsonTemplate().jsonToObject(objectJson, SysUser.class); + Assertions.assertEquals(user2.toString(), user.toString()); + + // more + testNull(); + testMap(); + } + + // 测试 Map 的转换 + public void testMap() { + + // test Map -> Json + Map map = new HashMap<>(); + map.put("id", 10001); + map.put("name", "张三"); + map.put("age", 18); + String mapJson = SaManager.getSaJsonTemplate().objectToJson(map); + Assertions.assertEquals("{\"name\":\"张三\",\"id\":10001,\"age\":18}", mapJson); + + // test Json -> Map + Map map2 = SaManager.getSaJsonTemplate().jsonToMap(mapJson); + Assertions.assertEquals(map2.toString(), map.toString()); + + } + + // 测试 Null 值 + public void testNull() { + Assertions.assertEquals(null, SaManager.getSaJsonTemplate().objectToJson(null) ); + Assertions.assertEquals(null, SaManager.getSaJsonTemplate().jsonToObject(null, SysUser.class) ); + Assertions.assertEquals(null, SaManager.getSaJsonTemplate().jsonToObject(null) ); + Assertions.assertEquals(null, SaManager.getSaJsonTemplate().jsonToMap(null) ); + } + +} diff --git a/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/model/SysRole.java b/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/model/SysRole.java new file mode 100644 index 00000000..c66b66f5 --- /dev/null +++ b/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/model/SysRole.java @@ -0,0 +1,64 @@ +package com.pj.test.model; + +/** + * Role 实体类 + * + * @author click33 + * @since 2022-10-15 + */ +public class SysRole { +// +// public SysRole() { +// } +// +// public SysRole(long id, String name) { +// super(); +// this.id = id; +// this.name = name; +// } +// +// +// /** +// * 角色id +// */ +// private long id; +// +// /** +// * 角色名称 +// */ +// private String name; +// +// /** +// * @return id +// */ +// public long getId() { +// return id; +// } +// +// /** +// * @param id 要设置的 id +// */ +// public void setId(long id) { +// this.id = id; +// } +// +// /** +// * @return name +// */ +// public String getName() { +// return name; +// } +// +// /** +// * @param name 要设置的 name +// */ +// public void setName(String name) { +// this.name = name; +// } +// +// @Override +// public String toString() { +// return "SysRole [id=" + id + ", name=" + name + "]"; +// } +// +} diff --git a/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/model/SysUser.java b/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/model/SysUser.java new file mode 100644 index 00000000..5406d82f --- /dev/null +++ b/sa-token-test/sa-token-json-test/src/test/java/com/pj/test/model/SysUser.java @@ -0,0 +1,103 @@ +package com.pj.test.model; + +/** + * User 实体类 + * + * @author click33 + * @since 2022-10-15 + */ +public class SysUser { + + public SysUser() { + } + + public SysUser(long id, String name, int age) { + super(); + this.id = id; + this.name = name; + this.age = age; + } + + + /** + * 用户id + */ + private long id; + + /** + * 用户名称 + */ + private String name; + + /** + * 用户年龄 + */ + private int age; + + /** + * 用户角色 + */ + private SysRole role; + + /** + * @return id + */ + public long getId() { + return id; + } + + /** + * @param id 要设置的 id + */ + public void setId(long id) { + this.id = id; + } + + /** + * @return name + */ + public String getName() { + return name; + } + + /** + * @param name 要设置的 name + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return age + */ + public int getAge() { + return age; + } + + /** + * @param age 要设置的 age + */ + public void setAge(int age) { + this.age = age; + } + + public SysRole getRole() { + return role; + } + + public SysUser setRole(SysRole role) { + this.role = role; + return this; + } + + @Override + public String toString() { + return "SysUser{" + + "id=" + id + + ", name='" + name + '\'' + + ", age=" + age + + ", role=" + role + + '}'; + } + +}