diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java index a06d61190..5b54acf21 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java @@ -9,7 +9,7 @@ import cn.hutool.core.lang.mutable.MutableObj; import cn.hutool.core.text.StrJoiner; import cn.hutool.core.util.ObjUtil; import cn.hutool.json.mapper.ArrayMapper; -import cn.hutool.json.serialize.JSONWriter; +import cn.hutool.json.writer.JSONWriter; import java.io.StringWriter; import java.io.Writer; diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java index 7b95980e4..f6f97a37d 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java @@ -10,7 +10,7 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapWrapper; import cn.hutool.core.util.ObjUtil; import cn.hutool.json.mapper.ObjectMapper; -import cn.hutool.json.serialize.JSONWriter; +import cn.hutool.json.writer.JSONWriter; import java.io.StringWriter; import java.io.Writer; diff --git a/hutool-json/src/main/java/cn/hutool/json/package-info.java b/hutool-json/src/main/java/cn/hutool/json/package-info.java index c9ef526da..111f68e35 100644 --- a/hutool-json/src/main/java/cn/hutool/json/package-info.java +++ b/hutool-json/src/main/java/cn/hutool/json/package-info.java @@ -7,7 +7,9 @@ * JSON封装主要包括JSON表示和JSON转换: * *
{@code
- * Java对象 <----> JSON对象 <----> JSON字符串
+ * <--JSONConverter-- <---JSONParser----
+ * Java对象 <-----------------> JSON对象 <-----------------> JSON字符串
+ * ------mapper-----> ---JSONWriter---->
* }
*
*
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/package-info.java b/hutool-json/src/main/java/cn/hutool/json/serialize/package-info.java
deleted file mode 100644
index 8a97a7444..000000000
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * JSON自定义序列化和反序列化接口和默认实现
- *
- * @author Looly
- *
- */
-package cn.hutool.json.serialize;
\ No newline at end of file
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java b/hutool-json/src/main/java/cn/hutool/json/writer/JSONWriter.java
similarity index 98%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java
rename to hutool-json/src/main/java/cn/hutool/json/writer/JSONWriter.java
index aee7439dc..42d40e502 100755
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java
+++ b/hutool-json/src/main/java/cn/hutool/json/writer/JSONWriter.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.serialize;
+package cn.hutool.json.writer;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.lang.mutable.MutableEntry;
@@ -9,6 +9,8 @@ import cn.hutool.json.InternalJSONUtil;
import cn.hutool.json.JSON;
import cn.hutool.json.JSONConfig;
import cn.hutool.json.JSONException;
+import cn.hutool.json.serialize.DateJSONString;
+import cn.hutool.json.serialize.JSONString;
import java.io.IOException;
import java.io.Writer;
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/package-info.java b/hutool-json/src/main/java/cn/hutool/json/writer/package-info.java
new file mode 100644
index 000000000..7c4a929f0
--- /dev/null
+++ b/hutool-json/src/main/java/cn/hutool/json/writer/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * JSON对象自定义转JSON字符串实现
+ *
+ * @author Looly
+ *
+ */
+package cn.hutool.json.writer;