fix code and add UTF8OutputStreamWriter

This commit is contained in:
Looly
2024-09-29 01:15:23 +08:00
parent 4db6ac1f34
commit 924357730e
15 changed files with 360 additions and 67 deletions

View File

@@ -0,0 +1,28 @@
/*
* Copyright (c) 2024 Hutool Team and hutool.cn
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.hutool.json.engine;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@AllArgsConstructor
public class BeanWithLocalDateTime {
private LocalDateTime date;
}

View File

@@ -26,7 +26,6 @@ import org.dromara.hutool.json.engine.jackson.JacksonEngine;
import org.junit.jupiter.api.Test;
import java.io.StringReader;
import java.io.StringWriter;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -72,12 +71,10 @@ public class JSONEngineFactoryTest {
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());
assertEquals(jsonStr, engine.toJsonString(testBean));
final TestBean testBean1 = engine.deserialize(new StringReader(jsonStr), TestBean.class);
assertEquals(testBean, testBean1);
@@ -88,12 +85,10 @@ public class JSONEngineFactoryTest {
final JSONEngine engine = JSONEngineFactory.createEngine("fastjson");
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());
assertEquals(jsonStr, engine.toJsonString(testBean));
final TestBean testBean1 = engine.deserialize(new StringReader(jsonStr), TestBean.class);
assertEquals(testBean, testBean1);
@@ -104,12 +99,10 @@ public class JSONEngineFactoryTest {
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());
assertEquals(jsonStr, engine.toJsonString(testBean));
final TestBean testBean1 = engine.deserialize(new StringReader(jsonStr), TestBean.class);
assertEquals(testBean, testBean1);

View File

@@ -0,0 +1,39 @@
/*
* Copyright (c) 2024 Hutool Team and hutool.cn
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.hutool.json.engine;
import org.dromara.hutool.core.date.DateTime;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class MoshiTest {
@Test
void writeLocalDateFormatTest() {
final DateTime date = DateUtil.parse("2024-01-01 01:12:21");
final BeanWithLocalDateTime bean = new BeanWithLocalDateTime(TimeUtil.of(date));
final JSONEngine engine = JSONEngineFactory.createEngine("moshi");
final String jsonString = engine.toJsonString(bean);
Assertions.assertEquals("{\"date\":1704042741000}", jsonString);
engine.init(JSONEngineConfig.of().setDateFormat("yyyy-MM-dd HH:mm:ss"));
Assertions.assertEquals("{\"date\":\"2024-01-01 01:12:21\"}", engine.toJsonString(bean));
}
}

View File

@@ -14,12 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.json;
package org.dromara.hutool.json.serializer;
import lombok.ToString;
import org.dromara.hutool.json.serializer.JSONDeserializer;
import org.dromara.hutool.json.serializer.JSONSerializer;
import org.dromara.hutool.json.serializer.TypeAdapterManager;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.JSONUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;