From b7639ac7cd815a855bc2c064f78661f5e62eebb0 Mon Sep 17 00:00:00 2001 From: wanjinhao1 <394959433@qq.com> Date: Thu, 22 Oct 2026 00:25:57 +0800 Subject: [PATCH] Fix #1255: remove fastjson2 dependency used only for test logging --- README.md | 2 +- README_CN.md | 2 +- .../sheet/converter/ExtraDataListener.java | 3 +-- .../fesod/sheet/format/CompatibilityTest.java | 17 ++++++++--------- .../fesod/sheet/format/CsvDataListener.java | 3 +-- .../fesod/sheet/head/MaxHeadReadListener.java | 4 +--- .../fesod/sheet/head/MaxHeadSizeTest.java | 8 +++----- .../sheet/readwrite/AutoStripParameterTest.java | 5 ++--- .../sheet/readwrite/ExceptionDataListener.java | 3 +-- .../sheet/readwrite/LargeDataListener.java | 5 ++--- pom.xml | 11 ----------- 11 files changed, 21 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index abcd40ae5..c9e044272 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ public class DemoDataListener implements ReadListener { @Override public void invoke(DemoData data, AnalysisContext context) { - System.out.println("Parsed a data entry" + JSON.toJSONString(data)); + System.out.println("Parsed a data entry" + data); } @Override diff --git a/README_CN.md b/README_CN.md index 013ea72fe..6c8a2b0f9 100644 --- a/README_CN.md +++ b/README_CN.md @@ -91,7 +91,7 @@ public class DemoDataListener implements ReadListener { @Override public void invoke(DemoData data, AnalysisContext context) { - System.out.println("解析了一条数据" + JSON.toJSONString(data)); + System.out.println("解析了一条数据" + data); } @Override diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExtraDataListener.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExtraDataListener.java index 667bf3290..ef895fd43 100644 --- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExtraDataListener.java +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExtraDataListener.java @@ -25,7 +25,6 @@ package org.apache.fesod.sheet.converter; -import com.alibaba.fastjson2.JSON; import java.util.ArrayList; import java.util.List; import lombok.Getter; @@ -51,7 +50,7 @@ public void doAfterAllAnalysed(AnalysisContext context) {} @Override public void extra(CellExtra extra, AnalysisContext context) { - log.info("extra data:{}", JSON.toJSONString(extra)); + log.info("extra data:{}", extra); extras.add(extra); } } diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CompatibilityTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CompatibilityTest.java index 797cb4d09..fee5e55b3 100644 --- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CompatibilityTest.java +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CompatibilityTest.java @@ -25,7 +25,6 @@ package org.apache.fesod.sheet.format; -import com.alibaba.fastjson2.JSON; import java.io.File; import java.math.BigDecimal; import java.util.List; @@ -66,7 +65,7 @@ public void readXlsWithSpecialCharacters() { public void readXlsxWithSharedStringNamespace() { // Exist in `sharedStrings.xml` `x:t` start tag, need to be compatible List> list = readCompatibilityFile("t02.xlsx", 0); - log.info("data:{}", JSON.toJSONString(list)); + log.info("data:{}", list); Assertions.assertEquals(3, list.size()); Map row2 = list.get(2); Assertions.assertEquals("1，2-戊二醇", row2.get(2)); @@ -76,7 +75,7 @@ public void readXlsxWithSharedStringNamespace() { public void readXlsxIgnoreNullColumns() { // In the presence of the first line of a lot of null columns, ignore null columns List> list = readCompatibilityFile("t03.xlsx"); - log.info("data:{}", JSON.toJSONString(list)); + log.info("data:{}", list); Assertions.assertEquals(1, list.size()); Map row0 = list.get(0); Assertions.assertEquals(12, row0.size()); @@ -86,7 +85,7 @@ public void readXlsxIgnoreNullColumns() { public void readXlsxWithNamespacedTag() { // Exist in `sheet1.xml` `ns2:t` start tag, need to be compatible List> list = readCompatibilityFile("t04.xlsx"); - log.info("data:{}", JSON.toJSONString(list)); + log.info("data:{}", list); Assertions.assertEquals(56, list.size()); Map row0 = list.get(0); Assertions.assertEquals("QQSJK28F152A012242S0081", row0.get(5)); @@ -96,7 +95,7 @@ public void readXlsxWithNamespacedTag() { public void readXlsxDateRounding() { // Excel read date needs to be rounded List> list = readCompatibilityFile("t05.xlsx"); - log.info("data:{}", JSON.toJSONString(list)); + log.info("data:{}", list); Assertions.assertEquals("2023-01-01 00:00:00", list.get(0).get(0)); Assertions.assertEquals("2023-01-01 00:00:00", list.get(1).get(0)); Assertions.assertEquals("2023-01-01 00:00:00", list.get(2).get(0)); @@ -108,7 +107,7 @@ public void readXlsxDateRounding() { public void readXlsxPrecisionFormat() { // Keep error precision digital format List> list = readCompatibilityFile("t06.xlsx", 0); - log.info("data:{}", JSON.toJSONString(list)); + log.info("data:{}", list); Assertions.assertEquals("2087.03", list.get(0).get(2)); } @@ -119,12 +118,12 @@ public void readXlsxActualDataReturn() { .readDefaultReturn(ReadDefaultReturnEnum.ACTUAL_DATA) .sheet() .doReadSync(); - log.info("data:{}", JSON.toJSONString(list)); + log.info("data:{}", list); Assertions.assertEquals(0, new BigDecimal("24.1998124").compareTo((BigDecimal) list.get(0).get(11))); list = readCompatibilityFile("t07.xlsx"); - log.info("data:{}", JSON.toJSONString(list)); + log.info("data:{}", list); Assertions.assertEquals("24.20", list.get(0).get(11)); } @@ -157,7 +156,7 @@ public void readXlsxWithEscapeSequence() { File file = compatibilityFile("t09.xlsx"); List> list = FesodSheet.read(file).headRowNumber(0).sheet().doReadSync(); - log.info("data:{}", JSON.toJSONString(list)); + log.info("data:{}", list); Assertions.assertEquals(1, list.size()); Assertions.assertEquals("SH_x000D_Z002", list.get(0).get(0)); diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CsvDataListener.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CsvDataListener.java index 3d5038580..5e059d2ec 100644 --- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CsvDataListener.java +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CsvDataListener.java @@ -19,7 +19,6 @@ package org.apache.fesod.sheet.format; -import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.apache.fesod.sheet.context.AnalysisContext; import org.apache.fesod.sheet.event.AnalysisEventListener; @@ -43,7 +42,7 @@ public void onException(Exception exception, AnalysisContext context) { @Override public void invoke(Object data, AnalysisContext context) { - log.info("data:{}", JSON.toJSONString(data)); + log.info("data:{}", data); } @Override diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/MaxHeadReadListener.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/MaxHeadReadListener.java index e55f9d3c6..95404707e 100644 --- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/MaxHeadReadListener.java +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/MaxHeadReadListener.java @@ -19,8 +19,6 @@ package org.apache.fesod.sheet.head; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONWriter; import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.fesod.sheet.context.AnalysisContext; @@ -38,7 +36,7 @@ public void invoke(Map data, AnalysisContext context) { @Override public void doAfterAllAnalysed(AnalysisContext context) { - log.info("origin head : {}", JSON.toJSONString(headTitleMap, JSONWriter.Feature.WriteMapNullValue)); + log.info("origin head : {}", headTitleMap); log.info("max not empty head size : {}", context.readSheetHolder().getMaxNotEmptyDataHeadSize()); } diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/MaxHeadSizeTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/MaxHeadSizeTest.java index 92bdba104..cbd925a85 100644 --- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/MaxHeadSizeTest.java +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/MaxHeadSizeTest.java @@ -19,8 +19,6 @@ package org.apache.fesod.sheet.head; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONWriter; import java.io.File; import java.util.List; import java.util.Map; @@ -66,7 +64,7 @@ private void readFileWithMap(File file, int expectHeadSize) { // default dataList = FesodSheet.read(file).excelType(ExcelTypeEnum.XLSX).sheet().doReadSync(); dataList.forEach(d -> { - log.info(JSON.toJSONString(d, JSONWriter.Feature.WriteMapNullValue)); + log.info("{}", d); Assertions.assertTrue(d.size() >= expectHeadSize); }); @@ -76,7 +74,7 @@ private void readFileWithMap(File file, int expectHeadSize) { .sheet() .doReadSync(); dataList.forEach(d -> { - log.info(JSON.toJSONString(d, JSONWriter.Feature.WriteMapNullValue)); + log.info("{}", d); Assertions.assertTrue(d.size() >= expectHeadSize); }); } @@ -88,7 +86,7 @@ private void readFileWithPOJO(File file) { .sheet() .doReadSync(); dataList.forEach(d -> { - log.info(JSON.toJSONString(d, JSONWriter.Feature.WriteMapNullValue)); + log.info("{}", d); }); } diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/AutoStripParameterTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/AutoStripParameterTest.java index c5bf6f959..a931c0de5 100644 --- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/AutoStripParameterTest.java +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/AutoStripParameterTest.java @@ -19,7 +19,6 @@ package org.apache.fesod.sheet.readwrite; -import com.alibaba.fastjson2.JSON; import java.io.File; import java.util.ArrayList; import java.util.List; @@ -111,7 +110,7 @@ private void testAutoStripSheetNameInternal( .registerReadListenerIfNotNull(new AnalysisEventListener() { @Override public void invoke(SimpleData data, AnalysisContext context) { - log.info("Read one record: {}", JSON.toJSONString(data)); + log.info("Read one record: {}", data); } @Override @@ -175,7 +174,7 @@ private void testAutoStripContentInternal( .sheet() .doReadSync(); - log.info("Read records: {}", JSON.toJSONString(dataList)); + log.info("Read records: {}", dataList); Assertions.assertEquals(2, dataList.size()); if (Boolean.TRUE.equals(autoStrip)) { Assertions.assertEquals( diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ExceptionDataListener.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ExceptionDataListener.java index 28693a700..4bdd170f5 100644 --- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ExceptionDataListener.java +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ExceptionDataListener.java @@ -25,7 +25,6 @@ package org.apache.fesod.sheet.readwrite; -import com.alibaba.fastjson2.JSON; import java.util.ArrayList; import java.util.List; import lombok.Getter; @@ -71,7 +70,7 @@ public void invokeHeadMap(java.util.Map headMap, AnalysisContex @Override public void doAfterAllAnalysed(AnalysisContext context) { if (!list.isEmpty()) { - log.debug("First row:{}", JSON.toJSONString(list.get(0))); + log.debug("First row:{}", list.get(0)); } } } diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/LargeDataListener.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/LargeDataListener.java index da0d32cb7..59f349d0d 100644 --- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/LargeDataListener.java +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/LargeDataListener.java @@ -25,7 +25,6 @@ package org.apache.fesod.sheet.readwrite; -import com.alibaba.fastjson2.JSON; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.fesod.sheet.context.AnalysisContext; @@ -42,11 +41,11 @@ public class LargeDataListener extends AnalysisEventListener { @Override public void invoke(LargeData data, AnalysisContext context) { if (count == 0) { - log.info("First row:{}", JSON.toJSONString(data)); + log.info("First row:{}", data); } count++; if (count % 100000 == 0) { - log.info("Already read:{},{}", count, JSON.toJSONString(data)); + log.info("Already read:{},{}", count, data); } } diff --git a/pom.xml b/pom.xml index 4afa0c1a4..30b785f38 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,6 @@ under the License. 2.0.20 1.18.44 5.3.39 - 2.0.65 2.7.18 2.0.20 2.0.20 @@ -206,11 +205,6 @@ under the License. spring-core ${spring-core.version} - - com.alibaba.fastjson2 - fastjson2 - ${fastjson2.version} - org.slf4j jcl-over-slf4j @@ -308,11 +302,6 @@ under the License. provided - - com.alibaba.fastjson2 - fastjson2 - test - org.junit.jupiter junit-jupiter