From aa5fe560d9db2953ca17e7036fc9685b331f3bfd Mon Sep 17 00:00:00 2001 From: SwallowGG <1558143046@qq.com> Date: Wed, 27 Nov 2024 10:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=90=8DEa?= =?UTF-8?q?syexcel=E6=94=B9=E5=90=8DFastExcel=E5=90=8C=E6=97=B6=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=80=81=E7=9A=84Easyexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/idev/excel/EasyExcel.java | 4 ++-- .../src/main/java/cn/idev/excel/FastExcel.java | 10 ++++++++++ .../{EasyExcelFactory.java => FastExcelFactory.java} | 2 +- .../excel/read/builder/ExcelReaderSheetBuilder.java | 4 ++-- .../excel/write/builder/ExcelWriterSheetBuilder.java | 4 ++-- .../excel/write/builder/ExcelWriterTableBuilder.java | 2 +- .../test/java/cn/idev/excel/test/temp/Xls03Test.java | 4 ++-- .../cn/idev/excel/test/temp/write/TempWriteTest.java | 2 +- 8 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 fastexcel-core/src/main/java/cn/idev/excel/FastExcel.java rename fastexcel-core/src/main/java/cn/idev/excel/{EasyExcelFactory.java => FastExcelFactory.java} (99%) diff --git a/fastexcel-core/src/main/java/cn/idev/excel/EasyExcel.java b/fastexcel-core/src/main/java/cn/idev/excel/EasyExcel.java index 2e6e55a..90715a3 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/EasyExcel.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/EasyExcel.java @@ -1,8 +1,8 @@ package cn.idev.excel; /** - * This is actually {@link EasyExcelFactory}, and short names look better. + * This is actually {@link FastExcelFactory}, and short names look better. * * @author jipengfei */ -public class EasyExcel extends EasyExcelFactory {} +public class EasyExcel extends FastExcelFactory {} diff --git a/fastexcel-core/src/main/java/cn/idev/excel/FastExcel.java b/fastexcel-core/src/main/java/cn/idev/excel/FastExcel.java new file mode 100644 index 0000000..3859fc1 --- /dev/null +++ b/fastexcel-core/src/main/java/cn/idev/excel/FastExcel.java @@ -0,0 +1,10 @@ +package cn.idev.excel; + +/** + * This is actually {@link FastExcelFactory}, and short names look better. + * + * @author jipengfei + */ +public class FastExcel extends FastExcelFactory { + +} diff --git a/fastexcel-core/src/main/java/cn/idev/excel/EasyExcelFactory.java b/fastexcel-core/src/main/java/cn/idev/excel/FastExcelFactory.java similarity index 99% rename from fastexcel-core/src/main/java/cn/idev/excel/EasyExcelFactory.java rename to fastexcel-core/src/main/java/cn/idev/excel/FastExcelFactory.java index 1bb6012..a165c05 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/EasyExcelFactory.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/FastExcelFactory.java @@ -16,7 +16,7 @@ * * @author jipengfei */ -public class EasyExcelFactory { +public class FastExcelFactory { /** * Build excel the write diff --git a/fastexcel-core/src/main/java/cn/idev/excel/read/builder/ExcelReaderSheetBuilder.java b/fastexcel-core/src/main/java/cn/idev/excel/read/builder/ExcelReaderSheetBuilder.java index 68c40c8..069761d 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/read/builder/ExcelReaderSheetBuilder.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/read/builder/ExcelReaderSheetBuilder.java @@ -60,7 +60,7 @@ public ReadSheet build() { */ public void doRead() { if (excelReader == null) { - throw new ExcelGenerateException("Must use 'EasyExcelFactory.read().sheet()' to call this method"); + throw new ExcelGenerateException("Must use 'FastExcelFactory.read().sheet()' to call this method"); } excelReader.read(build()); excelReader.finish(); @@ -73,7 +73,7 @@ public void doRead() { */ public List doReadSync() { if (excelReader == null) { - throw new ExcelAnalysisException("Must use 'EasyExcelFactory.read().sheet()' to call this method"); + throw new ExcelAnalysisException("Must use 'FastExcelFactory.read().sheet()' to call this method"); } SyncReadListener syncReadListener = new SyncReadListener(); registerReadListener(syncReadListener); diff --git a/fastexcel-core/src/main/java/cn/idev/excel/write/builder/ExcelWriterSheetBuilder.java b/fastexcel-core/src/main/java/cn/idev/excel/write/builder/ExcelWriterSheetBuilder.java index beabb2b..199ebd7 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/write/builder/ExcelWriterSheetBuilder.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/write/builder/ExcelWriterSheetBuilder.java @@ -57,7 +57,7 @@ public WriteSheet build() { public void doWrite(Collection data) { if (excelWriter == null) { - throw new ExcelGenerateException("Must use 'EasyExcelFactory.write().sheet()' to call this method"); + throw new ExcelGenerateException("Must use 'FastExcelFactory.write().sheet()' to call this method"); } excelWriter.write(data, build()); excelWriter.finish(); @@ -69,7 +69,7 @@ public void doFill(Object data) { public void doFill(Object data, FillConfig fillConfig) { if (excelWriter == null) { - throw new ExcelGenerateException("Must use 'EasyExcelFactory.write().sheet()' to call this method"); + throw new ExcelGenerateException("Must use 'FastExcelFactory.write().sheet()' to call this method"); } excelWriter.fill(data, fillConfig, build()); excelWriter.finish(); diff --git a/fastexcel-core/src/main/java/cn/idev/excel/write/builder/ExcelWriterTableBuilder.java b/fastexcel-core/src/main/java/cn/idev/excel/write/builder/ExcelWriterTableBuilder.java index a4f50b9..b723f3c 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/write/builder/ExcelWriterTableBuilder.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/write/builder/ExcelWriterTableBuilder.java @@ -50,7 +50,7 @@ public WriteTable build() { public void doWrite(Collection data) { if (excelWriter == null) { - throw new ExcelGenerateException("Must use 'EasyExcelFactory.write().sheet().table()' to call this method"); + throw new ExcelGenerateException("Must use 'FastExcelFactory.write().sheet().table()' to call this method"); } excelWriter.write(data, writeSheet, build()); excelWriter.finish(); diff --git a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/Xls03Test.java b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/Xls03Test.java index 41046cd..144a41c 100644 --- a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/Xls03Test.java +++ b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/Xls03Test.java @@ -4,8 +4,8 @@ import cn.idev.excel.EasyExcel; import cn.idev.excel.util.BeanMapUtils; -import ai.chat2db.excel.support.cglib.beans.BeanMap; -import ai.chat2db.excel.support.cglib.core.DebuggingClassWriter; +import cn.idev.excel.support.cglib.beans.BeanMap; +import cn.idev.excel.support.cglib.core.DebuggingClassWriter; import com.alibaba.fastjson2.JSON; import org.junit.jupiter.api.Test; diff --git a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/write/TempWriteTest.java b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/write/TempWriteTest.java index 9bd3242..3a17ca0 100644 --- a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/write/TempWriteTest.java +++ b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/write/TempWriteTest.java @@ -11,7 +11,7 @@ import cn.idev.excel.util.FileUtils; import cn.idev.excel.util.ListUtils; import cn.idev.excel.test.util.TestFileUtil; -import ai.chat2db.excel.support.cglib.beans.BeanMap; +import cn.idev.excel.support.cglib.beans.BeanMap; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.ClientAnchor;