zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

7.0.0.M1

Browse Source
This commit is contained in:
choweli
2025-04-15 17:02:41 +08:00
parent b0e37e3ef3
commit 22d487624d
2867 changed files with 9839 additions and 10677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-json/src/main/java/org/dromara/hutool/json/JSON.java → hutool-json/src/main/java/cn/hutool/v7/json/JSON.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.bean.path.BeanPath;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.json.writer.JSONWriter;
import cn.hutool.v7.core.bean.path.BeanPath;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.json.writer.JSONWriter;
import java.io.Serializable;
import java.lang.reflect.Type;

16
hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java → hutool-json/src/main/java/cn/hutool/v7/json/JSONArray.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListWrapper;
import org.dromara.hutool.core.lang.Validator;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.json.serializer.impl.ArrayTypeAdapter;
import org.dromara.hutool.json.serializer.impl.IterTypeAdapter;
import org.dromara.hutool.json.writer.JSONWriter;
import cn.hutool.v7.core.collection.CollUtil;
import cn.hutool.v7.core.collection.ListWrapper;
import cn.hutool.v7.core.lang.Validator;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.json.serializer.impl.ArrayTypeAdapter;
import cn.hutool.v7.json.serializer.impl.IterTypeAdapter;
import cn.hutool.v7.json.writer.JSONWriter;
import java.util.*;

6
hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java → hutool-json/src/main/java/cn/hutool/v7/json/JSONConfig.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.comparator.CompareUtil;
import org.dromara.hutool.json.writer.NumberWriteMode;
import cn.hutool.v7.core.comparator.CompareUtil;
import cn.hutool.v7.json.writer.NumberWriteMode;
import java.io.Serializable;
import java.util.Comparator;

4
hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java → hutool-json/src/main/java/cn/hutool/v7/json/JSONException.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.exception.HutoolException;
import cn.hutool.v7.core.exception.HutoolException;
/**
* JSON异常

31
hutool-json/src/main/java/org/dromara/hutool/json/JSONFactory.java → hutool-json/src/main/java/cn/hutool/v7/json/JSONFactory.java
View File

@@ -14,21 +14,22 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.bean.path.BeanPath;
import org.dromara.hutool.core.lang.loader.LazyFunLoader;
import org.dromara.hutool.core.lang.loader.Loader;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.reader.JSONParser;
import org.dromara.hutool.json.reader.JSONTokener;
import org.dromara.hutool.json.serializer.JSONMapper;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import org.dromara.hutool.json.serializer.TypeAdapter;
import org.dromara.hutool.json.support.JSONNodeBeanFactory;
import org.dromara.hutool.json.writer.JSONWriter;
import cn.hutool.v7.core.bean.path.BeanPath;
import cn.hutool.v7.core.lang.loader.LazyFunLoader;
import cn.hutool.v7.core.lang.loader.Loader;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.core.reflect.TypeReference;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.reader.JSONParser;
import cn.hutool.v7.json.reader.JSONTokener;
import cn.hutool.v7.json.serializer.JSONMapper;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.json.serializer.TypeAdapter;
import cn.hutool.v7.json.support.JSONNodeBeanFactory;
import cn.hutool.v7.json.writer.JSONWriter;
import java.lang.reflect.Type;
import java.util.function.Consumer;
@@ -336,7 +337,7 @@ public class JSONFactory {
* 将JSON转换为指定类型的Bean对象
*
* @param json JSON
* @param type Bean类型，泛型对象使用{@link org.dromara.hutool.core.reflect.TypeReference}
* @param type Bean类型，泛型对象使用{@link TypeReference}
* @param <T> 泛型类型
* @return Bean对象
*/

8
hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java → hutool-json/src/main/java/cn/hutool/v7/json/JSONGetter.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.lang.getter.TypeGetter;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.support.InternalJSONUtil;
import cn.hutool.v7.core.lang.getter.TypeGetter;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.support.InternalJSONUtil;
import java.lang.reflect.Type;
import java.util.List;

26
hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java → hutool-json/src/main/java/cn/hutool/v7/json/JSONObject.java
View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.func.LambdaInfo;
import org.dromara.hutool.core.func.LambdaUtil;
import org.dromara.hutool.core.func.SerFunction;
import org.dromara.hutool.core.func.SerSupplier;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.map.MapWrapper;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.support.InternalJSONUtil;
import org.dromara.hutool.json.writer.JSONWriter;
import cn.hutool.v7.core.func.LambdaInfo;
import cn.hutool.v7.core.func.LambdaUtil;
import cn.hutool.v7.core.func.SerFunction;
import cn.hutool.v7.core.func.SerSupplier;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.core.map.MapUtil;
import cn.hutool.v7.core.map.MapWrapper;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.support.InternalJSONUtil;
import cn.hutool.v7.json.writer.JSONWriter;
import java.util.Arrays;
import java.util.Map;

10
hutool-json/src/main/java/org/dromara/hutool/json/JSONPrimitive.java → hutool-json/src/main/java/cn/hutool/v7/json/JSONPrimitive.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.wrapper.Wrapper;
import org.dromara.hutool.core.reflect.ClassUtil;
import org.dromara.hutool.json.writer.JSONWriter;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.wrapper.Wrapper;
import cn.hutool.v7.core.reflect.ClassUtil;
import cn.hutool.v7.json.writer.JSONWriter;
import java.math.BigDecimal;
import java.math.BigInteger;

26
hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java → hutool-json/src/main/java/cn/hutool/v7/json/JSONUtil.java
View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import org.dromara.hutool.json.serializer.TypeAdapter;
import org.dromara.hutool.json.serializer.TypeAdapterManager;
import org.dromara.hutool.json.support.JSONStrFormatter;
import org.dromara.hutool.json.xml.JSONXMLUtil;
import cn.hutool.v7.core.io.IORuntimeException;
import cn.hutool.v7.core.io.file.FileUtil;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.json.serializer.TypeAdapter;
import cn.hutool.v7.json.serializer.TypeAdapterManager;
import cn.hutool.v7.json.support.JSONStrFormatter;
import cn.hutool.v7.json.xml.JSONXMLUtil;
import java.io.File;
import java.lang.reflect.Type;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/AbstractJSONEngine.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/AbstractJSONEngine.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine;
package cn.hutool.v7.json.engine;
/**
* JSONEngine抽象类，用于保存配置和定义初始化，并提供：

12
hutool-json/src/main/java/org/dromara/hutool/json/engine/HutoolJSONEngine.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/HutoolJSONEngine.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine;
package cn.hutool.v7.json.engine;
import org.dromara.hutool.core.io.stream.UTF8OutputStreamWriter;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONFactory;
import cn.hutool.v7.core.io.stream.UTF8OutputStreamWriter;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONFactory;
import java.io.OutputStream;
import java.io.Reader;

6
hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngine.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine;
package cn.hutool.v7.json.engine;
import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
import org.dromara.hutool.core.util.CharsetUtil;
import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
import cn.hutool.v7.core.util.CharsetUtil;
import java.io.*;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineConfig.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineConfig.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine;
package cn.hutool.v7.json.engine;
import java.io.Serializable;

12
hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineFactory.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineFactory.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine;
package cn.hutool.v7.json.engine;
import org.dromara.hutool.core.lang.Singleton;
import org.dromara.hutool.core.spi.ServiceLoader;
import org.dromara.hutool.core.spi.SpiUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.json.JSONException;
import cn.hutool.v7.core.lang.Singleton;
import cn.hutool.v7.core.spi.ServiceLoader;
import cn.hutool.v7.core.spi.SpiUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.json.JSONException;
/**
* JSON引擎工厂<br>

16
hutool-json/src/main/java/org/dromara/hutool/json/engine/fastjson/FastJSON2Engine.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/fastjson/FastJSON2Engine.java
View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.fastjson;
package cn.hutool.v7.json.engine.fastjson;
import com.alibaba.fastjson2.JSONFactory;
import com.alibaba.fastjson2.JSONReader;
import com.alibaba.fastjson2.JSONWriter;
import com.alibaba.fastjson2.reader.ObjectReader;
import com.alibaba.fastjson2.writer.ObjectWriter;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.engine.AbstractJSONEngine;
import org.dromara.hutool.json.engine.JSONEngineConfig;
import cn.hutool.v7.core.collection.ListUtil;
import cn.hutool.v7.core.io.IORuntimeException;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.engine.AbstractJSONEngine;
import cn.hutool.v7.json.engine.JSONEngineConfig;
import java.io.IOException;
import java.io.OutputStream;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/fastjson/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/fastjson/package-info.java
View File

@@ -21,4 +21,4 @@
* @author Looly
* @since 6.0.0
*/
package org.dromara.hutool.json.engine.fastjson;
package cn.hutool.v7.json.engine.fastjson;

6
hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/DateGsonTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/DateGsonTypeAdapter.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.gson;
package cn.hutool.v7.json.engine.gson;
import com.google.gson.*;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.text.StrUtil;
import java.lang.reflect.Type;
import java.util.Date;

16
hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/GsonEngine.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/GsonEngine.java
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.gson;
package cn.hutool.v7.json.engine.gson;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.dromara.hutool.core.io.stream.UTF8OutputStreamWriter;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.wrapper.Wrapper;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSONException;
import org.dromara.hutool.json.engine.AbstractJSONEngine;
import org.dromara.hutool.json.engine.JSONEngineConfig;
import cn.hutool.v7.core.io.stream.UTF8OutputStreamWriter;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.wrapper.Wrapper;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSONException;
import cn.hutool.v7.json.engine.AbstractJSONEngine;
import cn.hutool.v7.json.engine.JSONEngineConfig;
import java.io.OutputStream;
import java.io.Reader;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/GsonTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/GsonTypeAdapter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.gson;
package cn.hutool.v7.json.engine.gson;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonSerializer;

8
hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/TemporalGsonTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/TemporalGsonTypeAdapter.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.gson;
package cn.hutool.v7.json.engine.gson;
import com.google.gson.*;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.date.TimeUtil;
import cn.hutool.v7.core.text.StrUtil;
import java.lang.reflect.Type;
import java.time.temporal.TemporalAccessor;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/TimeZoneGsonTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/TimeZoneGsonTypeAdapter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.gson;
package cn.hutool.v7.json.engine.gson;
import com.google.gson.*;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/package-info.java
View File

@@ -21,4 +21,4 @@
* @author Looly
* @since 6.0.0
*/
package org.dromara.hutool.json.engine.gson;
package cn.hutool.v7.json.engine.gson;

12
hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/HutoolJSONSerializer.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolJSONSerializer.java
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.jackson;
package cn.hutool.v7.json.engine.jackson;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONArray;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.JSONPrimitive;
import cn.hutool.v7.core.io.IORuntimeException;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONArray;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.JSONPrimitive;
import java.io.IOException;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/HutoolModule.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolModule.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.jackson;
package cn.hutool.v7.json.engine.jackson;
import com.fasterxml.jackson.databind.module.SimpleModule;

22
hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonEngine.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonEngine.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.jackson;
package cn.hutool.v7.json.engine.jackson;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonParser;
@@ -23,16 +23,16 @@ import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.Module;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.wrapper.Wrapper;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSONException;
import org.dromara.hutool.json.engine.AbstractJSONEngine;
import org.dromara.hutool.json.engine.JSONEngineConfig;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.io.IORuntimeException;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.wrapper.Wrapper;
import cn.hutool.v7.core.reflect.ConstructorUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSONException;
import cn.hutool.v7.json.engine.AbstractJSONEngine;
import cn.hutool.v7.json.engine.JSONEngineConfig;
import java.io.IOException;
import java.io.OutputStream;

8
hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonTemporalDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonTemporalDeserializer.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.jackson;
package cn.hutool.v7.json.engine.jackson;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.date.TimeUtil;
import cn.hutool.v7.core.text.StrUtil;
import java.io.IOException;
import java.time.temporal.TemporalAccessor;

6
hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonTemporalSerializer.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonTemporalSerializer.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.jackson;
package cn.hutool.v7.json.engine.jackson;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.date.TimeUtil;
import cn.hutool.v7.core.text.StrUtil;
import java.io.IOException;
import java.time.temporal.TemporalAccessor;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/package-info.java
View File

@@ -21,4 +21,4 @@
* @author Looly
* @since 6.0.0
*/
package org.dromara.hutool.json.engine.jackson;
package cn.hutool.v7.json.engine.jackson;

8
hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/DateMoshiAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/DateMoshiAdapter.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.moshi;
package cn.hutool.v7.json.engine.moshi;
import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.JsonReader;
import com.squareup.moshi.JsonWriter;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.text.StrUtil;
import java.io.IOException;
import java.util.Date;

18
hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/MoshiEngine.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/MoshiEngine.java
View File

@@ -14,21 +14,21 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.moshi;
package cn.hutool.v7.json.engine.moshi;
import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.Moshi;
import okio.BufferedSink;
import okio.BufferedSource;
import okio.Okio;
import org.dromara.hutool.core.io.stream.ReaderInputStream;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.wrapper.Wrapper;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSONException;
import org.dromara.hutool.json.engine.AbstractJSONEngine;
import org.dromara.hutool.json.engine.JSONEngineConfig;
import cn.hutool.v7.core.io.stream.ReaderInputStream;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.wrapper.Wrapper;
import cn.hutool.v7.core.util.CharsetUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSONException;
import cn.hutool.v7.json.engine.AbstractJSONEngine;
import cn.hutool.v7.json.engine.JSONEngineConfig;
import java.io.IOException;
import java.io.OutputStream;

8
hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/TemporalMoshiAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/TemporalMoshiAdapter.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.moshi;
package cn.hutool.v7.json.engine.moshi;
import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.JsonReader;
import com.squareup.moshi.JsonWriter;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.date.TimeUtil;
import cn.hutool.v7.core.text.StrUtil;
import java.io.IOException;
import java.time.temporal.TemporalAccessor;

4
hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/TimeZoneMoshiAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/TimeZoneMoshiAdapter.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.json.engine.moshi;
package cn.hutool.v7.json.engine.moshi;
import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.JsonReader;
import com.squareup.moshi.JsonWriter;
import com.squareup.moshi.Moshi;
import org.dromara.hutool.core.reflect.TypeUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import java.io.IOException;
import java.lang.annotation.Annotation;

2
hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/package-info.java
View File

@@ -21,4 +21,4 @@
* @author Looly
* @since 6.0.0
*/
package org.dromara.hutool.json.engine.moshi;
package cn.hutool.v7.json.engine.moshi;

4
hutool-json/src/main/java/org/dromara/hutool/json/engine/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/engine/package-info.java
View File

@@ -16,10 +16,10 @@
/**
* JSON SPI 实现<br>
* 通过实现{@link org.dromara.hutool.json.engine.JSONEngine} 以使用不同的JSON库完成：
* 通过实现{@link cn.hutool.v7.json.engine.JSONEngine} 以使用不同的JSON库完成：
* <ul>
* <li>JSON序列化，即Java Bean（POJO）对象转为JSON字符串</li>
* <li>JSON反序列化，即JSON字符串转为Java Bean（POJO）对象</li>
* </ul>
*/
package org.dromara.hutool.json.engine;
package cn.hutool.v7.json.engine;

16
hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/Claims.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;
import org.dromara.hutool.core.codec.binary.Base64;
import org.dromara.hutool.core.date.format.DateFormatManager;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.JSONUtil;
import cn.hutool.v7.core.codec.binary.Base64;
import cn.hutool.v7.core.date.format.DateFormatManager;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.map.MapUtil;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.JSONUtil;
import java.io.Serializable;
import java.nio.charset.Charset;

28
hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWT.java
View File

@@ -14,21 +14,21 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;
import org.dromara.hutool.core.codec.binary.Base64;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.exception.ValidateException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.text.split.SplitUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.jwt.signers.AlgorithmUtil;
import org.dromara.hutool.json.jwt.signers.JWTSigner;
import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
import org.dromara.hutool.json.jwt.signers.NoneJWTSigner;
import cn.hutool.v7.core.codec.binary.Base64;
import cn.hutool.v7.core.collection.CollUtil;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.exception.ValidateException;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.text.split.SplitUtil;
import cn.hutool.v7.core.util.CharsetUtil;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.jwt.signers.AlgorithmUtil;
import cn.hutool.v7.json.jwt.signers.JWTSigner;
import cn.hutool.v7.json.jwt.signers.JWTSignerUtil;
import cn.hutool.v7.json.jwt.signers.NoneJWTSigner;
import java.lang.reflect.Type;
import java.nio.charset.Charset;

4
hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTException.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;
import org.dromara.hutool.core.exception.HutoolException;
import cn.hutool.v7.core.exception.HutoolException;
/**
* JWT异常

2
hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTHeader.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;
import java.util.Map;

2
hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTPayload.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;
import java.util.Map;

6
hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTUtil.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.json.jwt.signers.JWTSigner;
import cn.hutool.v7.core.map.MapUtil;
import cn.hutool.v7.json.jwt.signers.JWTSigner;
import java.util.Map;

12
hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTValidator.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.exception.ValidateException;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.json.jwt.signers.JWTSigner;
import org.dromara.hutool.json.jwt.signers.NoneJWTSigner;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.exception.ValidateException;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.json.jwt.signers.JWTSigner;
import cn.hutool.v7.json.jwt.signers.NoneJWTSigner;
import java.util.Date;

2
hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/RegisteredPayload.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;
import java.util.Date;

2
hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/package-info.java
View File

@@ -20,4 +20,4 @@
*
* @author Looly
*/
package org.dromara.hutool.json.jwt;
package cn.hutool.v7.json.jwt;

10
hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/AlgorithmUtil.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt.signers;
package cn.hutool.v7.json.jwt.signers;
import org.dromara.hutool.core.map.BiMap;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.crypto.asymmetric.SignAlgorithm;
import org.dromara.hutool.crypto.digest.mac.HmacAlgorithm;
import cn.hutool.v7.core.map.BiMap;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.crypto.asymmetric.SignAlgorithm;
import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
import java.util.HashMap;

12
hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/AsymmetricJWTSigner.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt.signers;
package cn.hutool.v7.json.jwt.signers;
import org.dromara.hutool.core.codec.binary.Base64;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ByteUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.crypto.asymmetric.Sign;
import cn.hutool.v7.core.codec.binary.Base64;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ByteUtil;
import cn.hutool.v7.core.util.CharsetUtil;
import cn.hutool.v7.crypto.asymmetric.Sign;
import java.nio.charset.Charset;
import java.security.Key;

4
hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/EllipticCurveJWTSigner.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/EllipticCurveJWTSigner.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt.signers;
package cn.hutool.v7.json.jwt.signers;
import org.dromara.hutool.json.jwt.JWTException;
import cn.hutool.v7.json.jwt.JWTException;
import java.security.Key;
import java.security.KeyPair;

10
hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/HMacJWTSigner.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt.signers;
package cn.hutool.v7.json.jwt.signers;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ByteUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.crypto.digest.mac.HMac;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ByteUtil;
import cn.hutool.v7.core.util.CharsetUtil;
import cn.hutool.v7.crypto.digest.mac.HMac;
import java.nio.charset.Charset;
import java.security.Key;

2
hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/JWTSigner.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt.signers;
package cn.hutool.v7.json.jwt.signers;
/**
* JWT签名接口封装，通过实现此接口，完成不同算法的签名功能

6
hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/JWTSignerUtil.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt.signers;
package cn.hutool.v7.json.jwt.signers;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.regex.ReUtil;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.regex.ReUtil;
import java.security.Key;
import java.security.KeyPair;

4
hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/NoneJWTSigner.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.json.jwt.signers;
package cn.hutool.v7.json.jwt.signers;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.text.StrUtil;
/**
* 无需签名的JWT签名器

2
hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/package-info.java
View File

@@ -17,4 +17,4 @@
/**
* JWT签名封装
*/
package org.dromara.hutool.json.jwt.signers;
package cn.hutool.v7.json.jwt.signers;

2
hutool-json/src/main/java/org/dromara/hutool/json/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/package-info.java
View File

@@ -45,4 +45,4 @@
* @author Looly
*
*/
package org.dromara.hutool.json;
package cn.hutool.v7.json;

10
hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONParser.java → hutool-json/src/main/java/cn/hutool/v7/json/reader/JSONParser.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.json.reader;
package cn.hutool.v7.json.reader;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.json.*;
import org.dromara.hutool.json.support.InternalJSONUtil;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.json.*;
import cn.hutool.v7.json.support.InternalJSONUtil;
import java.util.function.Predicate;

16
hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONTokener.java → hutool-json/src/main/java/cn/hutool/v7/json/reader/JSONTokener.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.json.reader;
package cn.hutool.v7.json.reader;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.ReaderWrapper;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.math.NumberUtil;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.json.JSONException;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.io.ReaderWrapper;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.math.NumberUtil;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.json.JSONException;
import java.io.IOException;
import java.io.InputStream;

4
hutool-json/src/main/java/org/dromara/hutool/json/reader/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/reader/package-info.java
View File

@@ -15,8 +15,8 @@
*/
/**
* JSON读取和解析，主要解析字符串、流等JSON字符串为{@link org.dromara.hutool.json.JSON}。
* JSON读取和解析，主要解析字符串、流等JSON字符串为{@link cn.hutool.v7.json.JSON}。
*
* @author Looly
*/
package org.dromara.hutool.json.reader;
package cn.hutool.v7.json.reader;

4
hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONContext.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONContext.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
import org.dromara.hutool.json.*;
import cn.hutool.v7.json.*;
/**
* JSON序列化上下文，用于获取当前JSON对象，以便在序列化过程中获取配置信息

4
hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONDeserializer.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
import org.dromara.hutool.json.JSON;
import cn.hutool.v7.json.JSON;
import java.lang.reflect.Type;

20
hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONMapper.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONMapper.java
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.core.lang.loader.LazyFunLoader;
import org.dromara.hutool.core.lang.loader.Loader;
import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.*;
import org.dromara.hutool.json.serializer.impl.CharSequenceTypeAdapter;
import org.dromara.hutool.json.serializer.impl.DefaultDeserializer;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.Opt;
import cn.hutool.v7.core.lang.loader.LazyFunLoader;
import cn.hutool.v7.core.lang.loader.Loader;
import cn.hutool.v7.core.reflect.TypeReference;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.*;
import cn.hutool.v7.json.serializer.impl.CharSequenceTypeAdapter;
import cn.hutool.v7.json.serializer.impl.DefaultDeserializer;
import java.io.Serializable;
import java.lang.reflect.Type;

10
hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONSerializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONSerializer.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONObject;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONObject;
/**
* 序列化接口，通过实现此接口，实现自定义的对象转换为JSON的操作<br>
@@ -32,8 +32,8 @@ public interface JSONSerializer<V> extends TypeAdapter{
/**
* 序列化实现，通过实现此方法，将指定类型的对象转换为{@link JSON}对象,可以：
* <ul>
* <li>如果为原始类型，可以转为{@link org.dromara.hutool.json.JSONPrimitive}</li>
* <li>如果是集合或数组类，可以转为{@link org.dromara.hutool.json.JSONArray}</li>
* <li>如果为原始类型，可以转为{@link cn.hutool.v7.json.JSONPrimitive}</li>
* <li>如果是集合或数组类，可以转为{@link cn.hutool.v7.json.JSONArray}</li>
* <li>如果是Bean或键值对类型，可以转为{@link JSONObject}</li>
* </ul>
*

4
hutool-json/src/main/java/org/dromara/hutool/json/serializer/MatcherJSONDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/MatcherJSONDeserializer.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
import org.dromara.hutool.json.JSON;
import cn.hutool.v7.json.JSON;
import java.lang.reflect.Type;

2
hutool-json/src/main/java/org/dromara/hutool/json/serializer/MatcherJSONSerializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/MatcherJSONSerializer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
/**
* 匹配JSON序列化器，用于判断是否匹配，匹配则执行序列化

6
hutool-json/src/main/java/org/dromara/hutool/json/serializer/SimpleJSONContext.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/SimpleJSONContext.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONFactory;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONFactory;
/**
* 简单的JSON上下文，用于在JSON序列化时提供配置项

2
hutool-json/src/main/java/org/dromara/hutool/json/serializer/TypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/TypeAdapter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
/**
* JSON类型适配器，实现此接口即同时实现对象的序列化和反序列化

24
hutool-json/src/main/java/org/dromara/hutool/json/serializer/TypeAdapterManager.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/TypeAdapterManager.java
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.loader.LazyFunLoader;
import org.dromara.hutool.core.lang.loader.Loader;
import org.dromara.hutool.core.lang.tuple.Pair;
import org.dromara.hutool.core.lang.tuple.Triple;
import org.dromara.hutool.core.lang.tuple.Tuple;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONException;
import org.dromara.hutool.json.serializer.impl.*;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.loader.LazyFunLoader;
import cn.hutool.v7.core.lang.loader.Loader;
import cn.hutool.v7.core.lang.tuple.Pair;
import cn.hutool.v7.core.lang.tuple.Triple;
import cn.hutool.v7.core.lang.tuple.Tuple;
import cn.hutool.v7.core.reflect.ConstructorUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONException;
import cn.hutool.v7.json.serializer.impl.*;
import java.lang.reflect.Type;
import java.util.HashMap;

24
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ArrayTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ArrayTypeAdapter.java
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.iter.ArrayIter;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONArray;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.reader.JSONTokener;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.array.ArrayUtil;
import cn.hutool.v7.core.collection.iter.ArrayIter;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONArray;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.reader.JSONTokener;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Array;
import java.lang.reflect.Type;

34
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/BeanTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/BeanTypeAdapter.java
View File

@@ -14,24 +14,24 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.bean.BeanDesc;
import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.bean.copier.ValueProviderToBeanCopier;
import org.dromara.hutool.core.lang.copier.Copier;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.support.InternalJSONUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import org.dromara.hutool.json.support.BeanToJSONCopier;
import org.dromara.hutool.json.support.JSONObjectValueProvider;
import cn.hutool.v7.core.bean.BeanDesc;
import cn.hutool.v7.core.bean.BeanUtil;
import cn.hutool.v7.core.bean.copier.ValueProviderToBeanCopier;
import cn.hutool.v7.core.lang.copier.Copier;
import cn.hutool.v7.core.reflect.ConstructorUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.support.InternalJSONUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.json.support.BeanToJSONCopier;
import cn.hutool.v7.json.support.JSONObjectValueProvider;
import java.lang.reflect.Type;

22
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/CalendarTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/CalendarTypeAdapter.java
View File

@@ -14,18 +14,18 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.convert.impl.CalendarConverter;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONPrimitive;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.convert.impl.CalendarConverter;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONPrimitive;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;
import java.util.Calendar;

24
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/CharSequenceTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/CharSequenceTypeAdapter.java
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.JSONPrimitive;
import org.dromara.hutool.json.reader.JSONTokener;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import org.dromara.hutool.json.xml.JSONXMLParser;
import org.dromara.hutool.json.xml.ParseConfig;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.JSONPrimitive;
import cn.hutool.v7.json.reader.JSONTokener;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.json.xml.JSONXMLParser;
import cn.hutool.v7.json.xml.ParseConfig;
import java.lang.reflect.Type;

12
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ClassTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ClassTypeAdapter.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.reflect.ClassUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.JSONDeserializer;
import org.dromara.hutool.json.serializer.JSONSerializer;
import cn.hutool.v7.core.reflect.ClassUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.JSONDeserializer;
import cn.hutool.v7.json.serializer.JSONSerializer;
import java.lang.reflect.Type;

24
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/DateTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/DateTypeAdapter.java
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.convert.impl.DateConverter;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.format.DateFormatManager;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONPrimitive;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.convert.impl.DateConverter;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.date.format.DateFormatManager;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONPrimitive;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;
import java.util.Date;

8
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/DefaultDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/DefaultDeserializer.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.*;
import org.dromara.hutool.json.serializer.JSONDeserializer;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.*;
import cn.hutool.v7.json.serializer.JSONDeserializer;
import java.lang.reflect.Type;

20
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/EntryTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/EntryTypeAdapter.java
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.convert.CompositeConverter;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.convert.CompositeConverter;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.reflect.ConstructorUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;
import java.util.Map;

18
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/EnumTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/EnumTypeAdapter.java
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.util.EnumUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONPrimitive;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.util.EnumUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONPrimitive;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;

20
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/IterTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/IterTypeAdapter.java
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.map.MapWrapper;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONArray;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.collection.CollUtil;
import cn.hutool.v7.core.map.MapWrapper;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONArray;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;
import java.util.Collection;

16
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/JSONPrimitiveDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/JSONPrimitiveDeserializer.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONPrimitive;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONPrimitive;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import java.lang.reflect.Type;

16
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/KBeanDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/KBeanDeserializer.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.reflect.kotlin.KClassUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONGetter;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.support.JSONObjectValueProvider;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.reflect.kotlin.KClassUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONGetter;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.support.JSONObjectValueProvider;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import java.lang.reflect.Type;

24
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/MapTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/MapTypeAdapter.java
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONArray;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.map.MapUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONArray;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;
import java.util.Iterator;

14
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/PairDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/PairDeserializer.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.lang.tuple.Pair;
import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.serializer.JSONDeserializer;
import cn.hutool.v7.core.lang.tuple.Pair;
import cn.hutool.v7.core.reflect.TypeReference;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.serializer.JSONDeserializer;
import java.lang.reflect.Type;

14
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/RecordDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/RecordDeserializer.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.bean.RecordUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.support.JSONObjectValueProvider;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.core.bean.RecordUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.support.JSONObjectValueProvider;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import java.lang.reflect.Type;

20
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ResourceBundleSerializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ResourceBundleSerializer.java
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.text.split.SplitUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.JSONUtil;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.text.split.SplitUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.JSONUtil;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.util.Enumeration;
import java.util.ResourceBundle;
@@ -71,7 +71,7 @@ public class ResourceBundleSerializer implements MatcherJSONSerializer<ResourceB
/**
* 将Property的键转化为JSON形式<br>
* 用于识别类似于：org.dromara.hutool.json这类用点隔开的键<br>
* 用于识别类似于：cn.hutool.v7.json这类用点隔开的键<br>
* 注意：不允许重复键
*
* @param jsonObject JSONObject

16
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ResourceSerializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ResourceSerializer.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.io.resource.Resource;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONFactory;
import org.dromara.hutool.json.reader.JSONParser;
import org.dromara.hutool.json.reader.JSONTokener;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.io.resource.Resource;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONFactory;
import cn.hutool.v7.json.reader.JSONParser;
import cn.hutool.v7.json.reader.JSONTokener;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
/**
* {@link Resource}序列化器

26
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TemporalTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java
View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.convert.impl.TemporalAccessorConverter;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.date.format.DateFormatManager;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.core.math.NumberUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.*;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.convert.impl.TemporalAccessorConverter;
import cn.hutool.v7.core.date.TimeUtil;
import cn.hutool.v7.core.date.format.DateFormatManager;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.Opt;
import cn.hutool.v7.core.math.NumberUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.*;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;
import java.time.*;

20
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ThrowableTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ThrowableTypeAdapter.java
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONPrimitive;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.reflect.ConstructorUtil;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONPrimitive;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;

14
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TimeZoneTypeAdapter.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TimeZoneTypeAdapter.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONPrimitive;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONPrimitive;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.lang.reflect.Type;
import java.util.TimeZone;

14
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TokenerSerializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TokenerSerializer.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONFactory;
import org.dromara.hutool.json.reader.JSONParser;
import org.dromara.hutool.json.reader.JSONTokener;
import org.dromara.hutool.json.serializer.JSONContext;
import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONFactory;
import cn.hutool.v7.json.reader.JSONParser;
import cn.hutool.v7.json.reader.JSONTokener;
import cn.hutool.v7.json.serializer.JSONContext;
import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
import java.io.InputStream;
import java.io.Reader;

14
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TripleDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TripleDeserializer.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.lang.tuple.Triple;
import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.serializer.JSONDeserializer;
import cn.hutool.v7.core.lang.tuple.Triple;
import cn.hutool.v7.core.reflect.TypeReference;
import cn.hutool.v7.core.reflect.TypeUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.serializer.JSONDeserializer;
import java.lang.reflect.Type;

8
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TupleDeserializer.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TupleDeserializer.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;
import org.dromara.hutool.core.lang.tuple.Tuple;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.serializer.JSONDeserializer;
import cn.hutool.v7.core.lang.tuple.Tuple;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.serializer.JSONDeserializer;
import java.lang.reflect.Type;

2
hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/package-info.java
View File

@@ -19,4 +19,4 @@
*
* @author Looly
*/
package org.dromara.hutool.json.serializer.impl;
package cn.hutool.v7.json.serializer.impl;

2
hutool-json/src/main/java/org/dromara/hutool/json/serializer/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/serializer/package-info.java
View File

@@ -39,4 +39,4 @@
* TypeAdapterManager用于管理定义的序列化和反序列化器
*
*/
package org.dromara.hutool.json.serializer;
package cn.hutool.v7.json.serializer;

16
hutool-json/src/main/java/org/dromara/hutool/json/support/BeanToJSONCopier.java → hutool-json/src/main/java/cn/hutool/v7/json/support/BeanToJSONCopier.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.json.support;
package cn.hutool.v7.json.support;
import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.bean.PropDesc;
import org.dromara.hutool.core.lang.copier.Copier;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONFactory;
import org.dromara.hutool.json.JSONObject;
import cn.hutool.v7.core.bean.BeanUtil;
import cn.hutool.v7.core.bean.PropDesc;
import cn.hutool.v7.core.lang.copier.Copier;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONFactory;
import cn.hutool.v7.json.JSONObject;
import java.util.Map;
import java.util.function.Predicate;

26
hutool-json/src/main/java/org/dromara/hutool/json/support/InternalJSONUtil.java → hutool-json/src/main/java/cn/hutool/v7/json/support/InternalJSONUtil.java
View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.dromara.hutool.json.support;
package cn.hutool.v7.json.support;
import org.dromara.hutool.core.bean.copier.CopyOptions;
import org.dromara.hutool.core.codec.binary.HexUtil;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.map.CaseInsensitiveLinkedMap;
import org.dromara.hutool.core.map.CaseInsensitiveTreeMap;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONFactory;
import org.dromara.hutool.json.serializer.JSONMapper;
import cn.hutool.v7.core.bean.copier.CopyOptions;
import cn.hutool.v7.core.codec.binary.HexUtil;
import cn.hutool.v7.core.io.IORuntimeException;
import cn.hutool.v7.core.map.CaseInsensitiveLinkedMap;
import cn.hutool.v7.core.map.CaseInsensitiveTreeMap;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONFactory;
import cn.hutool.v7.json.serializer.JSONMapper;
import java.io.IOException;
import java.math.BigDecimal;

8
hutool-json/src/main/java/org/dromara/hutool/json/support/JSONFormatStyle.java → hutool-json/src/main/java/cn/hutool/v7/json/support/JSONFormatStyle.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.json.support;
package cn.hutool.v7.json.support;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
/**
* JSON格式化风格，用于格式化JSON字符串

16
hutool-json/src/main/java/org/dromara/hutool/json/support/JSONNodeBeanFactory.java → hutool-json/src/main/java/cn/hutool/v7/json/support/JSONNodeBeanFactory.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.json.support;
package cn.hutool.v7.json.support;
import org.dromara.hutool.core.bean.path.BeanPath;
import org.dromara.hutool.core.bean.path.NodeBeanFactory;
import org.dromara.hutool.core.bean.path.node.*;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.json.*;
import cn.hutool.v7.core.bean.path.BeanPath;
import cn.hutool.v7.core.bean.path.NodeBeanFactory;
import cn.hutool.v7.core.bean.path.node.*;
import cn.hutool.v7.core.collection.CollUtil;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.map.MapUtil;
import cn.hutool.v7.json.*;
/**
* JSON节点Bean创建器

10
hutool-json/src/main/java/org/dromara/hutool/json/support/JSONObjectValueProvider.java → hutool-json/src/main/java/cn/hutool/v7/json/support/JSONObjectValueProvider.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.json.support;
package cn.hutool.v7.json.support;
import org.dromara.hutool.core.bean.copier.ValueProvider;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONObject;
import cn.hutool.v7.core.bean.copier.ValueProvider;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONObject;
import java.lang.reflect.Type;

6
hutool-json/src/main/java/org/dromara/hutool/json/support/JSONStrFormatter.java → hutool-json/src/main/java/cn/hutool/v7/json/support/JSONStrFormatter.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.json.support;
package cn.hutool.v7.json.support;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
/**
* JSON字符串格式化工具，用于简单格式化JSON字符串<br>

2
hutool-json/src/main/java/org/dromara/hutool/json/support/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/support/package-info.java
View File

@@ -20,4 +20,4 @@
* @author Looly
* @since 6.0.0
*/
package org.dromara.hutool.json.support;
package cn.hutool.v7.json.support;

26
hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java → hutool-json/src/main/java/cn/hutool/v7/json/writer/JSONWriter.java
View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.dromara.hutool.json.writer;
package cn.hutool.v7.json.writer;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.math.NumberUtil;
import org.dromara.hutool.core.regex.ReUtil;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.JSON;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONException;
import org.dromara.hutool.json.support.InternalJSONUtil;
import org.dromara.hutool.json.support.JSONFormatStyle;
import cn.hutool.v7.core.io.IORuntimeException;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.core.math.NumberUtil;
import cn.hutool.v7.core.regex.ReUtil;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.json.JSON;
import cn.hutool.v7.json.JSONConfig;
import cn.hutool.v7.json.JSONException;
import cn.hutool.v7.json.support.InternalJSONUtil;
import cn.hutool.v7.json.support.JSONFormatStyle;
import java.io.Closeable;
import java.io.Flushable;

2
hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberWriteMode.java → hutool-json/src/main/java/cn/hutool/v7/json/writer/NumberWriteMode.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.json.writer;
package cn.hutool.v7.json.writer;
/**
* Long写出模式<br>

2
hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java → hutool-json/src/main/java/cn/hutool/v7/json/writer/package-info.java
View File

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.json.writer;
package cn.hutool.v7.json.writer;

18
hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java → hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLParser.java
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.dromara.hutool.json.xml;
package cn.hutool.v7.json.xml;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.xml.XmlConstants;
import org.dromara.hutool.json.support.InternalJSONUtil;
import org.dromara.hutool.json.JSONException;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.JSONUtil;
import cn.hutool.v7.core.lang.mutable.MutableEntry;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.xml.XmlConstants;
import cn.hutool.v7.json.support.InternalJSONUtil;
import cn.hutool.v7.json.JSONException;
import cn.hutool.v7.json.JSONObject;
import cn.hutool.v7.json.JSONUtil;
import java.util.function.Predicate;

Some files were not shown because too many files have changed in this diff Show More