diff --git a/bin/check_dependency_updates.sh b/bin/check_dependency_updates.sh index db58d376c..a20afe90d 100755 --- a/bin/check_dependency_updates.sh +++ b/bin/check_dependency_updates.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/cobertura.sh b/bin/cobertura.sh index 94a98781f..54a6492b3 100755 --- a/bin/cobertura.sh +++ b/bin/cobertura.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/commit.sh b/bin/commit.sh index 141d57c94..7392d6916 100755 --- a/bin/commit.sh +++ b/bin/commit.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/deploy.sh b/bin/deploy.sh index 24d30c4af..5453472f8 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/install.sh b/bin/install.sh index 792f02b98..1cdabf20e 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/javadoc.sh b/bin/javadoc.sh index 8de4cef27..7a39f02a5 100755 --- a/bin/javadoc.sh +++ b/bin/javadoc.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/logo.sh b/bin/logo.sh index cafa9d4a7..173ed5171 100755 --- a/bin/logo.sh +++ b/bin/logo.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/package.sh b/bin/package.sh index 451358492..9a4cad5fb 100755 --- a/bin/package.sh +++ b/bin/package.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/push_dev.sh b/bin/push_dev.sh index b48b0b061..736eaa8a7 100755 --- a/bin/push_dev.sh +++ b/bin/push_dev.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/push_master.sh b/bin/push_master.sh index 036c44bee..86bd2297a 100755 --- a/bin/push_master.sh +++ b/bin/push_master.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/replaceVersion.sh b/bin/replaceVersion.sh index b06394d92..3c8769011 100755 --- a/bin/replaceVersion.sh +++ b/bin/replaceVersion.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/simple_install.sh b/bin/simple_install.sh index 721ba5f72..ad5256410 100755 --- a/bin/simple_install.sh +++ b/bin/simple_install.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/sync.sh b/bin/sync.sh index 2bf1334e0..cc26f7a1a 100644 --- a/bin/sync.sh +++ b/bin/sync.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/test.sh b/bin/test.sh index c58a73d08..9ca99428d 100755 --- a/bin/test.sh +++ b/bin/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/bin/update_version.sh b/bin/update_version.sh index 30a4d821e..eb0738e2c 100755 --- a/bin/update_version.sh +++ b/bin/update_version.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2023 looly(loolly@aliyun.com) +# Copyright (c) 2024 looly(loolly@aliyun.com) # Hutool is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan PSL v2. # You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 8a000a313..8ff814f9d 100755 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -1,6 +1,6 @@ + + com.fasterxml.jackson.core + jackson-databind + 2.17.2 + true + + + com.google.code.gson + gson + 2.11.0 + true + + + com.alibaba.fastjson2 + fastjson2 + 2.0.41 + true + + org.bouncycastle diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java index 12f276026..a078b3a48 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java index 0531e140b..5d54aa39d 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java index e5e3dbfb7..09482bd68 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java index af02fdf44..f4ef74c69 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java index 9463184a8..de223b258 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java index b6e7f4265..4cc6bc0a4 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java index a311f9d72..8a3b5af9e 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONObjectIter.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObjectIter.java index 33607f153..a00ce182f 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONObjectIter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObjectIter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java index 530b4bae5..e2d817546 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java index c588481d5..02968716b 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java index e25a5bc9e..0259ca274 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java index c9e735dfe..60130a023 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java index e46405c75..d3a168a5c 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java index dc9f310a0..9176ac853 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONGetterValueProvider.java b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONGetterValueProvider.java index 789cd44f3..c089d09fe 100755 --- a/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONGetterValueProvider.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONGetterValueProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/convert/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/convert/package-info.java index de4c7ceef..6933adebf 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/convert/package-info.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/convert/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/FastJSON2Engine.java b/hutool-json/src/main/java/org/dromara/hutool/json/engine/FastJSON2Engine.java new file mode 100644 index 000000000..c11a8876a --- /dev/null +++ b/hutool-json/src/main/java/org/dromara/hutool/json/engine/FastJSON2Engine.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2024. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.json.engine; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONWriter; +import com.alibaba.fastjson2.writer.ObjectWriter; + +import java.io.Reader; +import java.io.Writer; +import java.lang.reflect.Type; + +/** + * FastJSON2引擎实现 + * + * @author Looly + * @since 6.0.0 + */ +public class FastJSON2Engine implements JSONEngine { + @Override + public void serialize(final Object bean, final Writer writer) { + final JSONWriter.Context context = new JSONWriter.Context(); + try (final JSONWriter jsonWriter = JSONWriter.ofUTF8(context)) { + if (bean == null) { + jsonWriter.writeNull(); + } else { + jsonWriter.setRootObject(bean); + final Class valueClass = bean.getClass(); + final ObjectWriter objectWriter = context.getObjectWriter(valueClass, valueClass); + objectWriter.write(jsonWriter, bean, null, null, 0); + } + + jsonWriter.flushTo(writer); + } + } + + @Override + public T deserialize(final Reader reader, final Object type) { + return JSON.parseObject(reader, (Type) type); + } +} diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/GsonEngine.java b/hutool-json/src/main/java/org/dromara/hutool/json/engine/GsonEngine.java new file mode 100644 index 000000000..c7fb5bc72 --- /dev/null +++ b/hutool-json/src/main/java/org/dromara/hutool/json/engine/GsonEngine.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2024. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.json.engine; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import org.dromara.hutool.json.JSONException; + +import java.io.Reader; +import java.io.Writer; +import java.lang.reflect.Type; + +/** + * Gson引擎实现 + * + * @author Looly + * @since 6.0.0 + */ +public class GsonEngine implements JSONEngine{ + + private final Gson gson; + + /** + * 构造 + */ + public GsonEngine() { + this.gson = new GsonBuilder().create(); + } + + @Override + public void serialize(final Object bean, final Writer writer) { + gson.toJson(bean, writer); + } + + @SuppressWarnings("unchecked") + @Override + public T deserialize(final Reader reader, final Object type) { + if(type instanceof Class){ + return gson.fromJson(reader, (Class)type); + } else if(type instanceof Type){ + return gson.fromJson(reader, (Type)type); + } + + throw new JSONException("Unsupported type: {}", type.getClass()); + } +} diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/HutoolJSONEngine.java b/hutool-json/src/main/java/org/dromara/hutool/json/engine/HutoolJSONEngine.java new file mode 100644 index 000000000..d0b162adb --- /dev/null +++ b/hutool-json/src/main/java/org/dromara/hutool/json/engine/HutoolJSONEngine.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2024. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.json.engine; + +import org.dromara.hutool.json.JSON; +import org.dromara.hutool.json.JSONUtil; + +import java.io.Reader; +import java.io.Writer; +import java.lang.reflect.Type; + +/** + * Hutool自身实现的JSON引擎 + * + * @author Looly + * @since 6.0.0 + */ +public class HutoolJSONEngine implements JSONEngine { + @Override + public void serialize(final Object bean, final Writer writer) { + final JSON json = (JSON) JSONUtil.parse(bean); + json.write(writer); + } + + @Override + public T deserialize(final Reader reader, final Object type) { + final JSON json = (JSON) JSONUtil.parse(reader); + return json.toBean((Type) type); + } +} diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngine.java b/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngine.java new file mode 100644 index 000000000..a37a644de --- /dev/null +++ b/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngine.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2024. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.json.engine; + +import java.io.Reader; +import java.io.Writer; + +/** + * JSON引擎实现 + * + * @author Looly + * @since 6.0.0 + */ +public interface JSONEngine { + + /** + * 生成JSON数据（序列化） + * + * @param bean Java Bean（POJO）对象 + * @param writer 写出到的Writer + */ + void serialize(Object bean, Writer writer); + + /** + * 解析JSON数据（反序列化） + * + * @param Java Bean对象类型 + * @param reader 读取JSON的Reader + * @param type Java Bean（POJO）对象类型，可以为{@code Class}或者TypeReference + * @return Java Bean（POJO）对象 + */ + T deserialize(Reader reader, Object type); +} diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineFactory.java b/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineFactory.java new file mode 100644 index 000000000..6a1374b85 --- /dev/null +++ b/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineFactory.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2024. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.json.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; + +/** + * JSON引擎工厂 + * + * @author looly + * @since 6.0.0 + */ +public class JSONEngineFactory { + + /** + * 获得单例的ClientEngine + * + * @return 单例的ClientEngine + */ + public static JSONEngine getEngine() { + return Singleton.get(JSONEngine.class.getName(), JSONEngineFactory::createEngine); + } + + /** + * 创建自定义引擎 + * + * @param engineName 引擎名称，忽略大小写，如`HttpClient4`、`HttpClient5`、`OkHttp`、`JdkClient` + * @return 引擎 + * @throws JSONException 无对应名称的引擎 + */ + public static JSONEngine createEngine(String engineName) throws JSONException { + if (!StrUtil.endWithIgnoreCase(engineName, "Engine")) { + engineName = engineName + "Engine"; + } + final ServiceLoader list = SpiUtil.loadList(JSONEngine.class); + for (final String serviceName : list.getServiceNames()) { + if (StrUtil.endWithIgnoreCase(serviceName, engineName)) { + return list.getService(serviceName); + } + } + throw new JSONException("No such engine named: " + engineName); + } + + /** + * 根据用户引入的JSON引擎jar，自动创建对应的JSON引擎对象
+ * 推荐创建的引擎单例使用，此方法每次调用会返回新的引擎 + * + * @return {@code ClientEngine} + */ + public static JSONEngine createEngine() { + // HutoolJSONEngine托底，始终不空 + return SpiUtil.loadFirstAvailable(JSONEngine.class); + } +} diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JacksonEngine.java b/hutool-json/src/main/java/org/dromara/hutool/json/engine/JacksonEngine.java new file mode 100644 index 000000000..626da3e20 --- /dev/null +++ b/hutool-json/src/main/java/org/dromara/hutool/json/engine/JacksonEngine.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2024. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.json.engine; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.json.JSONException; + +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; + +/** + * Jackson引擎 + * + * @author Looly + */ +public class JacksonEngine implements JSONEngine{ + + private final ObjectMapper mapper; + + /** + * 构造 + */ + public JacksonEngine() { + this.mapper = new ObjectMapper(); + } + + @Override + public void serialize(final Object bean, final Writer writer) { + try { + mapper.writeValue(writer, bean); + } catch (final IOException e) { + throw new IORuntimeException(e); + } + } + + @SuppressWarnings("unchecked") + @Override + public T deserialize(final Reader reader, final Object type) { + try { + if(type instanceof Class){ + return mapper.readValue(reader, (Class)type); + } else if(type instanceof TypeReference){ + return mapper.readValue(reader, (TypeReference)type); + } else if(type instanceof JavaType){ + return mapper.readValue(reader, (JavaType)type); + } + } catch (final IOException e) { + throw new IORuntimeException(e); + } + + throw new JSONException("Unsupported type: {}", type.getClass()); + } +} diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/engine/package-info.java new file mode 100644 index 000000000..cebbffeaf --- /dev/null +++ b/hutool-json/src/main/java/org/dromara/hutool/json/engine/package-info.java @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +/** + * JSON SPI 实现
+ * 通过实现{@link org.dromara.hutool.json.engine.JSONEngine} 以使用不同的JSON库完成： + *
    + *
  • JSON序列化，即Java Bean（POJO）对象转为JSON字符串
    • + *
  • JSON反序列化，即JSON字符串转为Java Bean（POJO）对象
    • + *
+ */ +package org.dromara.hutool.json.engine; diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java index e0c62b193..0882bd02a 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java index cb3ebfa3e..c5494ae35 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java index 53a68d277..e299fdb6c 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java index 2ab0994a8..0d0d7690a 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java index b8786b37c..db84d4878 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java index 4e11c221a..b9efb3df7 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java index 0c312c1b0..d31d4b38f 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java index 9a2b26c11..a4be0651a 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java index 0bfc352bf..36138ce4e 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java index 50db5b653..c37523af9 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java index d3175199b..f94b05c55 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/EllipticCurveJWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/EllipticCurveJWTSigner.java index e7a354835..e673c801e 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/EllipticCurveJWTSigner.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/EllipticCurveJWTSigner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java index 0683f897a..628baacc4 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java index 066448481..d2d82602b 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java index 9a3341ebc..985969b67 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java index c0d362aab..b917e39bb 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java index 4456d35af..1ca609cf9 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java index 9f10fbedc..2ff12a9c7 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java index 13c44752c..475823e22 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONValueMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONValueMapper.java index cd464d5c5..0d8e91ca2 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONValueMapper.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONValueMapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023. looly(loolly@aliyun.com) + * Copyright (c) 2024. looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/package-info.java index 8a94677cc..5a4ffc7d7 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/package-info.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/package-info.java index 370957ded..7e4ecf182 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/package-info.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/DateJSONString.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/DateJSONString.java index 51cdbb7bc..e88ab365f 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/DateJSONString.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/DateJSONString.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/GlobalSerializeMapping.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/GlobalSerializeMapping.java index b7210d080..65a4fefc8 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/GlobalSerializeMapping.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/GlobalSerializeMapping.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONArraySerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONArraySerializer.java index 2c8f0357c..8c9710c37 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONArraySerializer.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONArraySerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONDeserializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONDeserializer.java index e74fbaa4b..fb1fb7e69 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONDeserializer.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONObjectSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONObjectSerializer.java index d6040a87e..492ba0cdb 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONObjectSerializer.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONObjectSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONSerializer.java index efd822d31..c76f065ab 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONSerializer.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONStringer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONStringer.java index 981820cbf..b11cc1c3a 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONStringer.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONStringer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java index df0f39eb4..b7f3ba443 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/package-info.java index e130323f2..6266ea3aa 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/package-info.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/BooleanValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/BooleanValueWriter.java index 69f05ef09..3e218b50f 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/BooleanValueWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/BooleanValueWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/ClassValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/ClassValueWriter.java index c6f6e679b..02f020512 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/ClassValueWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/ClassValueWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024. looly(loolly@aliyun.com) + * Copyright (c) 2024-2024. looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/DateValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/DateValueWriter.java index 223502ff4..faa3cc593 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/DateValueWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/DateValueWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/GlobalValueWriters.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/GlobalValueWriters.java index 46b6714c3..48f14b26a 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/GlobalValueWriters.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/GlobalValueWriters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONStringValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONStringValueWriter.java index 94fe56923..ea9943df0 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONStringValueWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONStringValueWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONValueWriter.java index 391fa306c..c8ff8c62d 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONValueWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONValueWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java index d20439170..b5418f0f6 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JdkValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JdkValueWriter.java index 99b8985ba..d31dc765f 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JdkValueWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JdkValueWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberValueWriter.java index cd04048cb..69293961e 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberValueWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberValueWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java index 8fb853b0a..b8e2f900e 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java index f4826cf5d..6a270e3a5 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java index 84626333a..beea1c20f 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java index 3127857b5..f62f90e11 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java index 3e83f71d1..b5054fbea 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java index f7d896b46..c193585d3 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/main/resources/META-INF/services/org.dromara.hutool.json.engine.JSONEngine b/hutool-json/src/main/resources/META-INF/services/org.dromara.hutool.json.engine.JSONEngine new file mode 100644 index 000000000..d325d9d4a --- /dev/null +++ b/hutool-json/src/main/resources/META-INF/services/org.dromara.hutool.json.engine.JSONEngine @@ -0,0 +1,16 @@ +# +# Copyright (c) 2024 looly(loolly@aliyun.com) +# Hutool is licensed under Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: +# https://license.coscl.org.cn/MulanPSL2 +# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +# See the Mulan PSL v2 for more details. +# + +org.dromara.hutool.json.engine.JacksonEngine +org.dromara.hutool.json.engine.GsonEngine +org.dromara.hutool.json.engine.FastJSON2Engine +org.dromara.hutool.json.engine.HutoolJSONEngine diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/CustomSerializeTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/CustomSerializeTest.java index ef4b55b5c..3a5fbcfe0 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/CustomSerializeTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/CustomSerializeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue1075Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1075Test.java index acfb1e3ac..fa3b5f550 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue1075Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1075Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue1101Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1101Test.java index 6bcb7eb33..03a567ab5 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue1101Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1101Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue1200Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1200Test.java index 918432435..9fce22266 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue1200Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1200Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2090Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2090Test.java index 274f153d2..e824629cf 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2090Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2090Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2131Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2131Test.java index 95643643b..b0b9a69f6 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2131Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2131Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2223Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2223Test.java index a4c0b7115..fc79ccf97 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2223Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2223Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2377Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2377Test.java index a3303f2a0..b3b8b19f6 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2377Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2377Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2447Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2447Test.java index 56d522b6c..73bde3b7d 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2447Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2447Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2507Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2507Test.java index b043e4f35..0df0fc8fa 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2507Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2507Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2555Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2555Test.java index db254c9c7..53668de0e 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2555Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2555Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2564Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2564Test.java index 2104d5458..d764fdf59 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2564Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2564Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2572Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2572Test.java index 4f508b6a6..3331663ac 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2572Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2572Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2746Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2746Test.java index accb14409..b7bc291df 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2746Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2746Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2749Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2749Test.java index cc0b11cb2..fd2529950 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2749Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2749Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2801Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2801Test.java index 392df66d2..83a54c4d3 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2801Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2801Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2924Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2924Test.java index b861d6546..342839892 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2924Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2924Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2953Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2953Test.java index 0224fb5be..ec860f468 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue2953Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2953Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3051Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3051Test.java index 528e434a4..2f264b355 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3051Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3051Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3058Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3058Test.java index a6507cec0..1d7724268 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3058Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3058Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3086Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3086Test.java index fb2032341..5e547f20c 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3086Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3086Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3139Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3139Test.java index 5194f2897..997a67a10 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3139Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3139Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3193Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3193Test.java index 69ac74bf2..411a2a653 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3193Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3193Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3274Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3274Test.java index 1737ed095..15b7e3ce7 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3274Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3274Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3289Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3289Test.java index 0cdebd58c..0ba0c1e38 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue3289Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue3289Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue488Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue488Test.java index 2d2211be0..988a4c96c 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue488Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue488Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue644Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue644Test.java index 012393011..79c671cc1 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue644Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue644Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue677Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue677Test.java index 831001a35..1719259d8 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue677Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue677Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issue867Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue867Test.java index 6bace2a61..ebecfa486 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issue867Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue867Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1AU86Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1AU86Test.java index 6314a8352..dc9876038 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1AU86Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1AU86Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1F8M2Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1F8M2Test.java index 0a34b97af..ccd5f81d3 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1F8M2Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1F8M2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1H2VNTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1H2VNTest.java index 785b0f48b..4cb13dd71 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1H2VNTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1H2VNTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3BS4STest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3BS4STest.java index 735e57065..5a1fc9f6e 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3BS4STest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3BS4STest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3EGJPTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3EGJPTest.java index a299444ac..f38f0db2c 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3EGJPTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3EGJPTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI49VZBTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI49VZBTest.java index dc407838d..e7932d1a8 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI49VZBTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI49VZBTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4RBZ4Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4RBZ4Test.java index 3286b0af6..4e5519a51 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4RBZ4Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4RBZ4Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4XFMWTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4XFMWTest.java index 856de05ae..ae4f55f3b 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4XFMWTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4XFMWTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI50EGGTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI50EGGTest.java index f9ba6c668..bb125a1b9 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI50EGGTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI50EGGTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI59LW4Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI59LW4Test.java index 15793c0c0..5662130ff 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI59LW4Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI59LW4Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5DHK2Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5DHK2Test.java index 7fcebb466..21c4a315d 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5DHK2Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5DHK2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5OMSCTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5OMSCTest.java index a7059859c..973712ee7 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5OMSCTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5OMSCTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI676ITTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI676ITTest.java index d1cedfd1f..3a9a18540 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI676ITTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI676ITTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6H0XFTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6H0XFTest.java index 017362125..7af74998b 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6H0XFTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6H0XFTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6LBZATest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6LBZATest.java index aea68a360..75d8b24bb 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6LBZATest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6LBZATest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6SZYBTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6SZYBTest.java index 2598daefb..2be40572f 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6SZYBTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6SZYBTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6YN2ATest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6YN2ATest.java index 53c7a6fab..0bfdc1f58 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6YN2ATest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6YN2ATest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI71BE6Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI71BE6Test.java index 66e8d6678..c09205111 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI71BE6Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI71BE6Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI76CSUTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI76CSUTest.java index b322b4fc4..63171b3bf 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI76CSUTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI76CSUTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7CW27Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7CW27Test.java index 2faad26b8..c3b4f36f7 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7CW27Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7CW27Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7FQ29Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7FQ29Test.java index 130229232..70c383b95 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7FQ29Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7FQ29Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7GPGXTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7GPGXTest.java index b46b62066..77e68bdb6 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7GPGXTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7GPGXTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7M2GZTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7M2GZTest.java index b78e51351..d5c4f423e 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7M2GZTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7M2GZTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7VM64Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7VM64Test.java index 19fe52863..340a0507f 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7VM64Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI7VM64Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023. looly(loolly@aliyun.com) + * Copyright (c) 2024. looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI81QZ2Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI81QZ2Test.java index 6a7d53baa..6aa2d1c54 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI81QZ2Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI81QZ2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI82AM8Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI82AM8Test.java index 42bef475b..f7eca9b53 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI82AM8Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI82AM8Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI84V6ITest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI84V6ITest.java index 3d84dcb7e..58bee1f45 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI84V6ITest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI84V6ITest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023. looly(loolly@aliyun.com) + * Copyright (c) 2024. looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Issues1881Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issues1881Test.java index fb4affd1b..e988f966a 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Issues1881Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issues1881Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI44E4HTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI44E4HTest.java index e3aea737e..094dd41c9 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI44E4HTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI44E4HTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI4V14NTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI4V14NTest.java index abcc88cdc..4f861a3de 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI4V14NTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI4V14NTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java index f29b7faf8..6b7088e0a 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java index aa99599b1..20e97f7f0 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java index d2caaeb0c..f1a3a318d 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java index 489602f09..5eaf86e72 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java index 740560108..e98186c81 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java index fe1e3e5cb..498e36ba5 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java index e083c795f..8c846391d 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONSupportTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONSupportTest.java index abffb1947..52c1686c7 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONSupportTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONSupportTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java index fab01580d..8bf26ee36 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java index dfd530523..a0ea1198f 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java index 10e5e84da..bb69a712b 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanTest.java index d0057dfc5..a57b17a8f 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Pr192Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Pr192Test.java index 1ba97e501..843148d45 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Pr192Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Pr192Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/Pr3067Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Pr3067Test.java index 40d9652cb..ec9b2bfb6 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/Pr3067Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/Pr3067Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java index 5221abe09..5736a1e61 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineFactoryTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineFactoryTest.java new file mode 100644 index 000000000..41aaef8cc --- /dev/null +++ b/hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineFactoryTest.java @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2024. looly(loolly@aliyun.com) + * Hutool is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * https://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +package org.dromara.hutool.json.engine; + +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.junit.jupiter.api.Test; + +import java.io.StringReader; +import java.io.StringWriter; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class JSONEngineFactoryTest { + @Test + void createDefaultEngineTest() { + final JSONEngine engine = JSONEngineFactory.createEngine(); + assertEquals(JacksonEngine.class, engine.getClass()); + } + + @Test + void jacksonTest() { + final JSONEngine engine = JSONEngineFactory.createEngine("jackson"); + assertEquals(JacksonEngine.class, engine.getClass()); + + final StringWriter stringWriter = new StringWriter(); + final TestBean testBean = new TestBean("张三", 18, true); + engine.serialize(testBean, stringWriter); + + final String jsonStr = "{\"name\":\"张三\",\"age\":18,\"gender\":true}"; + assertEquals(jsonStr, stringWriter.toString()); + + final TestBean testBean1 = engine.deserialize(new StringReader(jsonStr), TestBean.class); + assertEquals(testBean, testBean1); + } + + @Test + void GsonTest() { + final JSONEngine engine = JSONEngineFactory.createEngine("gson"); + assertEquals(GsonEngine.class, engine.getClass()); + + final StringWriter stringWriter = new StringWriter(); + final TestBean testBean = new TestBean("张三", 18, true); + engine.serialize(testBean, stringWriter); + + final String jsonStr = "{\"name\":\"张三\",\"age\":18,\"gender\":true}"; + assertEquals(jsonStr, stringWriter.toString()); + + final TestBean testBean1 = engine.deserialize(new StringReader(jsonStr), TestBean.class); + assertEquals(testBean, testBean1); + } + + @Test + void fastJSON2Test() { + final JSONEngine engine = JSONEngineFactory.createEngine("fastjson2"); + assertEquals(FastJSON2Engine.class, engine.getClass()); + + final StringWriter stringWriter = new StringWriter(); + final TestBean testBean = new TestBean("张三", 18, true); + engine.serialize(testBean, stringWriter); + + final String jsonStr = "{\"name\":\"张三\",\"age\":18,\"gender\":true}"; + assertEquals(jsonStr, stringWriter.toString()); + + final TestBean testBean1 = engine.deserialize(new StringReader(jsonStr), TestBean.class); + assertEquals(testBean, testBean1); + } + + @Test + void HutoolJSONTest() { + final JSONEngine engine = JSONEngineFactory.createEngine("hutoolJSON"); + assertEquals(HutoolJSONEngine.class, engine.getClass()); + + final StringWriter stringWriter = new StringWriter(); + final TestBean testBean = new TestBean("张三", 18, true); + engine.serialize(testBean, stringWriter); + + final String jsonStr = "{\"name\":\"张三\",\"age\":18,\"gender\":true}"; + assertEquals(jsonStr, stringWriter.toString()); + + final TestBean testBean1 = engine.deserialize(new StringReader(jsonStr), TestBean.class); + assertEquals(testBean, testBean1); + } + + @Data + @NoArgsConstructor + @AllArgsConstructor + static class TestBean { + // 解决输出顺序问题 + @JSONField(ordinal = 1) + private String name; + @JSONField(ordinal = 2) + private int age; + @JSONField(ordinal = 3) + private boolean gender; + } +} diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issueI5WDP0/ERPProduct.kt b/hutool-json/src/test/java/org/dromara/hutool/json/issueI5WDP0/ERPProduct.kt index f46db01f4..7265d1b6d 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/issueI5WDP0/ERPProduct.kt +++ b/hutool-json/src/test/java/org/dromara/hutool/json/issueI5WDP0/ERPProduct.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issueI5WDP0/JsonToBeanTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/issueI5WDP0/JsonToBeanTest.java index 75cb3dbbb..419535e00 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/issueI5WDP0/JsonToBeanTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/issueI5WDP0/JsonToBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/BaseResult.java b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/BaseResult.java index 858a80e72..a47ca9e4f 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/BaseResult.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/BaseResult.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/IssueIVMD5Test.java index 2a9b8ac49..b3af24ed3 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/IssueIVMD5Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/IssueIVMD5Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/StudentInfo.java b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/StudentInfo.java index e55378524..b4edfc1fc 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/StudentInfo.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/StudentInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3205Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3205Test.java index 38884b5dd..f62c9c2da 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3205Test.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3205Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java index aff23f81a..14170ba40 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java index 5a6754671..b43706fae 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI76TRQTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI76TRQTest.java index 9f3a10534..7d5c26018 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI76TRQTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI76TRQTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI7IZIMTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI7IZIMTest.java index d99789d97..1073cc74c 100755 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI7IZIMTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI7IZIMTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java index 50cf038ce..f9c3da1f7 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java index fb3cd7ab3..44444591b 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java index c4c6d9053..bb02e1021 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java index fdd8249c9..9b53726e0 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java index d17b5d5a3..45b082179 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java index 37768b169..d3cb901bf 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java index 378671f04..0f20524c6 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java index dc9e6d0ac..d78b5fc0a 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java index 556f07336..15a06c99c 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java index d87f17564..57341571b 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java index 564660392..3aaac7448 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java index 8d00413c7..03095ecf9 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java index f1f73de8f..1b577d6ca 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java index af9890a67..6db1e26e4 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultBean.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultBean.java index 3114c36e4..b557dcaab 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultBean.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java index 5ce992fb6..50d2291a5 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java index ebb6be946..3c1bc582c 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java index eaad117be..979da8955 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java index c2a556309..939593776 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java index 76cb36021..f61a6d7f7 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java index 27971c2f1..994890ba1 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java index 1ae28f63f..f1d71231d 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java index 8eb775359..89304cc94 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java index 122b0d522..ae5955af4 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java index 552278b61..6afa91eae 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java index 9ee4b7a0f..9d9cdc83c 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java index 3b4f3b991..4ca561f5e 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java index 72b5daa2b..6da19b69f 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/EnvSettingInfo.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/EnvSettingInfo.java index 604cfec4e..baa10354e 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/EnvSettingInfo.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/EnvSettingInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java index 65634337f..950af6bf7 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java index c0e398f3b..9421f8666 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/writer/GlobalValueWritersTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/writer/GlobalValueWritersTest.java index db29ea751..ee7d70a52 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/writer/GlobalValueWritersTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/writer/GlobalValueWritersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java index 4cb18b7f1..3389717c8 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2024 looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index f481cb769..7c328cdbe 100755 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -1,6 +1,6 @@