diff --git a/fastexcel/src/main/java/cn/idev/excel/analysis/v03/handlers/FormulaRecordHandler.java b/fastexcel/src/main/java/cn/idev/excel/analysis/v03/handlers/FormulaRecordHandler.java index b59bf3003..4cdcc3064 100644 --- a/fastexcel/src/main/java/cn/idev/excel/analysis/v03/handlers/FormulaRecordHandler.java +++ b/fastexcel/src/main/java/cn/idev/excel/analysis/v03/handlers/FormulaRecordHandler.java @@ -2,7 +2,7 @@ import cn.idev.excel.analysis.v03.IgnorableXlsRecordHandler; import cn.idev.excel.constant.BuiltinFormats; -import cn.idev.excel.constant.EasyExcelConstants; +import cn.idev.excel.constant.FastExcelConstants; import cn.idev.excel.context.xls.XlsReadContext; import cn.idev.excel.enums.CellDataTypeEnum; import cn.idev.excel.enums.RowTypeEnum; @@ -55,7 +55,7 @@ public void processRecord(XlsReadContext xlsReadContext, Record record) { tempCellData.setType(CellDataTypeEnum.NUMBER); tempCellData.setOriginalNumberValue(BigDecimal.valueOf(frec.getValue())); tempCellData.setNumberValue( - tempCellData.getOriginalNumberValue().round(EasyExcelConstants.EXCEL_MATH_CONTEXT)); + tempCellData.getOriginalNumberValue().round(FastExcelConstants.EXCEL_MATH_CONTEXT)); int dataFormat = xlsReadContext .xlsReadWorkbookHolder() .getFormatTrackingHSSFListener() diff --git a/fastexcel/src/main/java/cn/idev/excel/analysis/v07/handlers/CellTagHandler.java b/fastexcel/src/main/java/cn/idev/excel/analysis/v07/handlers/CellTagHandler.java index b8d8cef4e..a6b7ded89 100644 --- a/fastexcel/src/main/java/cn/idev/excel/analysis/v07/handlers/CellTagHandler.java +++ b/fastexcel/src/main/java/cn/idev/excel/analysis/v07/handlers/CellTagHandler.java @@ -1,7 +1,7 @@ package cn.idev.excel.analysis.v07.handlers; -import cn.idev.excel.constant.EasyExcelConstants; import cn.idev.excel.constant.ExcelXmlConstants; +import cn.idev.excel.constant.FastExcelConstants; import cn.idev.excel.context.xlsx.XlsxReadContext; import cn.idev.excel.enums.CellDataTypeEnum; import cn.idev.excel.metadata.data.ReadCellData; @@ -89,7 +89,7 @@ public void endElement(XlsxReadContext xlsxReadContext, String name) { tempCellData.setType(CellDataTypeEnum.NUMBER); tempCellData.setOriginalNumberValue(new BigDecimal(tempDataString)); tempCellData.setNumberValue( - tempCellData.getOriginalNumberValue().round(EasyExcelConstants.EXCEL_MATH_CONTEXT)); + tempCellData.getOriginalNumberValue().round(FastExcelConstants.EXCEL_MATH_CONTEXT)); break; default: throw new IllegalStateException("Cannot set values now"); diff --git a/fastexcel/src/main/java/cn/idev/excel/constant/EasyExcelConstants.java b/fastexcel/src/main/java/cn/idev/excel/constant/FastExcelConstants.java similarity index 92% rename from fastexcel/src/main/java/cn/idev/excel/constant/EasyExcelConstants.java rename to fastexcel/src/main/java/cn/idev/excel/constant/FastExcelConstants.java index 3b3a552d3..feba06f8c 100644 --- a/fastexcel/src/main/java/cn/idev/excel/constant/EasyExcelConstants.java +++ b/fastexcel/src/main/java/cn/idev/excel/constant/FastExcelConstants.java @@ -8,7 +8,7 @@ * * */ -public class EasyExcelConstants { +public class FastExcelConstants { /** * Excel by default with 15 to store Numbers, and the double in Java can use to store number 17, led to the accuracy diff --git a/fastexcel/src/main/java/cn/idev/excel/metadata/data/ReadCellData.java b/fastexcel/src/main/java/cn/idev/excel/metadata/data/ReadCellData.java index 79abef123..691edabc7 100644 --- a/fastexcel/src/main/java/cn/idev/excel/metadata/data/ReadCellData.java +++ b/fastexcel/src/main/java/cn/idev/excel/metadata/data/ReadCellData.java @@ -1,6 +1,6 @@ package cn.idev.excel.metadata.data; -import cn.idev.excel.constant.EasyExcelConstants; +import cn.idev.excel.constant.FastExcelConstants; import cn.idev.excel.enums.CellDataTypeEnum; import java.math.BigDecimal; import lombok.EqualsAndHashCode; @@ -135,7 +135,7 @@ public static ReadCellData newInstanceOriginal(BigDecimal numberValue, Intege cellData.setRowIndex(rowIndex); cellData.setColumnIndex(columnIndex); cellData.setOriginalNumberValue(numberValue); - cellData.setNumberValue(numberValue.round(EasyExcelConstants.EXCEL_MATH_CONTEXT)); + cellData.setNumberValue(numberValue.round(FastExcelConstants.EXCEL_MATH_CONTEXT)); return cellData; } diff --git a/fastexcel/src/main/java/cn/idev/excel/util/BeanMapUtils.java b/fastexcel/src/main/java/cn/idev/excel/util/BeanMapUtils.java index 14702ca41..7ef27f683 100644 --- a/fastexcel/src/main/java/cn/idev/excel/util/BeanMapUtils.java +++ b/fastexcel/src/main/java/cn/idev/excel/util/BeanMapUtils.java @@ -25,16 +25,16 @@ public static BeanMap create(Object bean) { BeanMap.Generator gen = new BeanMap.Generator(); gen.setBean(bean); gen.setContextClass(bean.getClass()); - gen.setNamingPolicy(EasyExcelNamingPolicy.INSTANCE); + gen.setNamingPolicy(FastExcelNamingPolicy.INSTANCE); return gen.create(); } - public static class EasyExcelNamingPolicy extends DefaultNamingPolicy { - public static final EasyExcelNamingPolicy INSTANCE = new EasyExcelNamingPolicy(); + public static class FastExcelNamingPolicy extends DefaultNamingPolicy { + public static final FastExcelNamingPolicy INSTANCE = new FastExcelNamingPolicy(); @Override protected String getTag() { - return "ByEasyExcelCGLIB"; + return "ByFastExcelCGLIB"; } } } diff --git a/fastexcel/src/main/java/cn/idev/excel/util/EasyExcelTempFileCreationStrategy.java b/fastexcel/src/main/java/cn/idev/excel/util/FastExcelTempFileCreationStrategy.java similarity index 96% rename from fastexcel/src/main/java/cn/idev/excel/util/EasyExcelTempFileCreationStrategy.java rename to fastexcel/src/main/java/cn/idev/excel/util/FastExcelTempFileCreationStrategy.java index a540df145..0d6e765bf 100644 --- a/fastexcel/src/main/java/cn/idev/excel/util/EasyExcelTempFileCreationStrategy.java +++ b/fastexcel/src/main/java/cn/idev/excel/util/FastExcelTempFileCreationStrategy.java @@ -36,7 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more * * */ -public class EasyExcelTempFileCreationStrategy implements TempFileCreationStrategy { +public class FastExcelTempFileCreationStrategy implements TempFileCreationStrategy { /** * Name of POI files directory in temporary directory. */ @@ -62,7 +62,7 @@ public class EasyExcelTempFileCreationStrategy implements TempFileCreationStrate * * @see File#createTempFile(String, String) */ - public EasyExcelTempFileCreationStrategy() { + public FastExcelTempFileCreationStrategy() { this(null); } @@ -73,7 +73,7 @@ public EasyExcelTempFileCreationStrategy() { * directory). * @see Files#createTempFile(Path, String, String, FileAttribute[]) */ - public EasyExcelTempFileCreationStrategy(File dir) { + public FastExcelTempFileCreationStrategy(File dir) { this.dir = dir; } diff --git a/fastexcel/src/main/java/cn/idev/excel/util/FileUtils.java b/fastexcel/src/main/java/cn/idev/excel/util/FileUtils.java index ed5e626f6..850a8df16 100644 --- a/fastexcel/src/main/java/cn/idev/excel/util/FileUtils.java +++ b/fastexcel/src/main/java/cn/idev/excel/util/FileUtils.java @@ -157,7 +157,7 @@ public static void writeToFile(File file, InputStream inputStream, boolean close } public static void createPoiFilesDirectory() { - TempFile.setTempFileCreationStrategy(new EasyExcelTempFileCreationStrategy()); + TempFile.setTempFileCreationStrategy(new FastExcelTempFileCreationStrategy()); } public static File createCacheTmpFile() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationDataTest.java index 19baafb5a..374039897 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.annotation; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.core.StyleTestUtils; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.util.DateUtils; @@ -65,7 +65,7 @@ public void t12Write03() throws Exception { } private void writeStyle(File file) throws Exception { - EasyExcel.write().file(file).head(AnnotationStyleData.class).sheet().doWrite(dataStyle()); + FastExcel.write().file(file).head(AnnotationStyleData.class).sheet().doWrite(dataStyle()); Workbook workbook = WorkbookFactory.create(file); Sheet sheet = workbook.getSheetAt(0); @@ -93,7 +93,7 @@ private void writeStyle(File file) throws Exception { } private void readAndWrite(File file) throws Exception { - EasyExcel.write().file(file).head(AnnotationData.class).sheet().doWrite(dataStyle()); + FastExcel.write().file(file).head(AnnotationData.class).sheet().doWrite(dataStyle()); if (file == fileCsv) { return; diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationIndexAndNameDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationIndexAndNameDataTest.java index 29d53fdde..9d48d02b9 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationIndexAndNameDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationIndexAndNameDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.annotation; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; import java.util.ArrayList; @@ -45,8 +45,8 @@ public void t03ReadAndWriteCsv() { } private void readAndWrite(File file) { - EasyExcel.write(file, AnnotationIndexAndNameData.class).sheet().doWrite(data()); - EasyExcel.read(file, AnnotationIndexAndNameData.class, new AnnotationIndexAndNameDataListener()) + FastExcel.write(file, AnnotationIndexAndNameData.class).sheet().doWrite(data()); + FastExcel.read(file, AnnotationIndexAndNameData.class, new AnnotationIndexAndNameDataListener()) .sheet() .doRead(); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/bom/BomDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/bom/BomDataTest.java index d9a234c22..433cc8ede 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/bom/BomDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/bom/BomDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.bom; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.metadata.data.ReadCellData; import cn.idev.excel.read.listener.ReadListener; @@ -53,14 +53,14 @@ private void readAndWriteCsv(File file, String charsetName, Boolean withBom) thr if (charsetName != null) { charset = Charset.forName(charsetName); } - EasyExcel.write(new FileOutputStream(file), BomData.class) + FastExcel.write(new FileOutputStream(file), BomData.class) .charset(charset) .withBom(withBom) .excelType(ExcelTypeEnum.CSV) .sheet() .doWrite(data()); - EasyExcel.read(file, BomData.class, new ReadListener() { + FastExcel.read(file, BomData.class, new ReadListener() { private final List dataList = Lists.newArrayList(); @@ -89,7 +89,7 @@ public void doAfterAllAnalysed(AnalysisContext context) { } private void readCsv(File file) { - EasyExcel.read(file, BomData.class, new ReadListener() { + FastExcel.read(file, BomData.class, new ReadListener() { private final List dataList = Lists.newArrayList(); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/cache/CacheDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/cache/CacheDataTest.java index 96307db0d..59345d8c4 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/cache/CacheDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/cache/CacheDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.cache; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.enums.CacheLocationEnum; @@ -53,8 +53,8 @@ public void t01ReadAndWrite() throws Exception { ThreadLocal, FieldCache>> fieldThreadLocal = (ThreadLocal, FieldCache>>) field.get(ClassUtils.class.newInstance()); Assertions.assertNull(fieldThreadLocal.get()); - EasyExcel.write(file07, CacheData.class).sheet().doWrite(data()); - EasyExcel.read(file07, CacheData.class, new PageReadListener(dataList -> { + FastExcel.write(file07, CacheData.class).sheet().doWrite(data()); + FastExcel.read(file07, CacheData.class, new PageReadListener(dataList -> { Assertions.assertNotNull(fieldThreadLocal.get()); })) .sheet() @@ -64,8 +64,8 @@ public void t01ReadAndWrite() throws Exception { @Test public void t02ReadAndWriteInvoke() throws Exception { - EasyExcel.write(fileCacheInvoke, CacheInvokeData.class).sheet().doWrite(dataInvoke()); - EasyExcel.read(fileCacheInvoke, CacheInvokeData.class, new AnalysisEventListener() { + FastExcel.write(fileCacheInvoke, CacheInvokeData.class).sheet().doWrite(dataInvoke()); + FastExcel.read(fileCacheInvoke, CacheInvokeData.class, new AnalysisEventListener() { @Override public void invokeHeadMap(Map headMap, AnalysisContext context) { @@ -91,8 +91,8 @@ public void doAfterAllAnalysed(AnalysisContext context) {} Map map = (Map) memberValues.get(invocationHandler); map.put("value", new String[] {"姓名2"}); - EasyExcel.write(fileCacheInvoke2, CacheInvokeData.class).sheet().doWrite(dataInvoke()); - EasyExcel.read(fileCacheInvoke2, CacheInvokeData.class, new AnalysisEventListener() { + FastExcel.write(fileCacheInvoke2, CacheInvokeData.class).sheet().doWrite(dataInvoke()); + FastExcel.read(fileCacheInvoke2, CacheInvokeData.class, new AnalysisEventListener() { @Override public void invokeHeadMap(Map headMap, AnalysisContext context) { @@ -113,11 +113,11 @@ public void doAfterAllAnalysed(AnalysisContext context) {} @Test public void t03ReadAndWriteInvokeMemory() throws Exception { - EasyExcel.write(fileCacheInvokeMemory, CacheInvokeMemoryData.class) + FastExcel.write(fileCacheInvokeMemory, CacheInvokeMemoryData.class) .filedCacheLocation(CacheLocationEnum.MEMORY) .sheet() .doWrite(dataInvokeMemory()); - EasyExcel.read( + FastExcel.read( fileCacheInvokeMemory, CacheInvokeMemoryData.class, new AnalysisEventListener() { @@ -147,11 +147,11 @@ public void doAfterAllAnalysed(AnalysisContext context) {} Map map = (Map) memberValues.get(invocationHandler); map.put("value", new String[] {"姓名2"}); - EasyExcel.write(fileCacheInvokeMemory2, CacheInvokeMemoryData.class) + FastExcel.write(fileCacheInvokeMemory2, CacheInvokeMemoryData.class) .filedCacheLocation(CacheLocationEnum.MEMORY) .sheet() .doWrite(dataInvokeMemory()); - EasyExcel.read( + FastExcel.read( fileCacheInvokeMemory2, CacheInvokeMemoryData.class, new AnalysisEventListener() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/celldata/CellDataDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/celldata/CellDataDataTest.java index c02789d18..a0b937a90 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/celldata/CellDataDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/celldata/CellDataDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.celldata; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.enums.CellDataTypeEnum; import cn.idev.excel.metadata.data.FormulaData; import cn.idev.excel.metadata.data.WriteCellData; @@ -48,8 +48,8 @@ public void t03ReadAndWriteCsv() throws Exception { } private void readAndWrite(File file) throws Exception { - EasyExcel.write(file, CellDataWriteData.class).sheet().doWrite(data()); - EasyExcel.read(file, CellDataReadData.class, new CellDataDataListener()) + FastExcel.write(file, CellDataWriteData.class).sheet().doWrite(data()); + FastExcel.read(file, CellDataReadData.class, new CellDataDataListener()) .sheet() .doRead(); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/charset/CharsetDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/charset/CharsetDataTest.java index 6091b9148..eee6873f4 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/charset/CharsetDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/charset/CharsetDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.charset; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.metadata.data.ReadCellData; import cn.idev.excel.read.listener.ReadListener; @@ -46,8 +46,8 @@ public void t01ReadAndWriteCsv() { @Test public void t02ReadAndWriteCsvError() { - EasyExcel.write(fileCsvError, CharsetData.class).charset(GBK).sheet().doWrite(data()); - EasyExcel.read(fileCsvError, CharsetData.class, new ReadListener() { + FastExcel.write(fileCsvError, CharsetData.class).charset(GBK).sheet().doWrite(data()); + FastExcel.read(fileCsvError, CharsetData.class, new ReadListener() { private final List dataList = Lists.newArrayList(); @@ -71,8 +71,8 @@ public void doAfterAllAnalysed(AnalysisContext context) {} } private void readAndWrite(File file, Charset charset) { - EasyExcel.write(file, CharsetData.class).charset(charset).sheet().doWrite(data()); - EasyExcel.read(file, CharsetData.class, new ReadListener() { + FastExcel.write(file, CharsetData.class).charset(charset).sheet().doWrite(data()); + FastExcel.read(file, CharsetData.class, new ReadListener() { private final List dataList = Lists.newArrayList(); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/compatibility/CompatibilityTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/compatibility/CompatibilityTest.java index fa84c9bb1..665a9b739 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/compatibility/CompatibilityTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/compatibility/CompatibilityTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.compatibility; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.cache.Ehcache; import cn.idev.excel.enums.ReadDefaultReturnEnum; import cn.idev.excel.test.core.simple.SimpleData; @@ -31,7 +31,7 @@ public class CompatibilityTest { @Test public void t01() { // https://github.com/fast-excel/fastexcel/issues/2236 - List> list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t01.xls") + List> list = FastExcel.read(TestFileUtil.getPath() + "compatibility/t01.xls") .sheet() .doReadSync(); Assertions.assertEquals(2, list.size()); @@ -42,7 +42,7 @@ public void t01() { @Test public void t02() { // Exist in `sharedStrings.xml` `x:t` start tag, need to be compatible - List> list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t02.xlsx") + List> list = FastExcel.read(TestFileUtil.getPath() + "compatibility/t02.xlsx") .sheet() .headRowNumber(0) .doReadSync(); @@ -55,7 +55,7 @@ public void t02() { @Test public void t03() { // In the presence of the first line of a lot of null columns, ignore null columns - List> list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t03.xlsx") + List> list = FastExcel.read(TestFileUtil.getPath() + "compatibility/t03.xlsx") .sheet() .doReadSync(); log.info("data:{}", JSON.toJSONString(list)); @@ -67,7 +67,7 @@ public void t03() { @Test public void t04() { // Exist in `sheet1.xml` `ns2:t` start tag, need to be compatible - List> list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t04.xlsx") + List> list = FastExcel.read(TestFileUtil.getPath() + "compatibility/t04.xlsx") .sheet() .doReadSync(); log.info("data:{}", JSON.toJSONString(list)); @@ -80,7 +80,7 @@ public void t04() { public void t05() { // https://github.com/fast-excel/fastexcel/issues/1956 // Excel read date needs to be rounded - List> list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t05.xlsx") + List> list = FastExcel.read(TestFileUtil.getPath() + "compatibility/t05.xlsx") .sheet() .doReadSync(); log.info("data:{}", JSON.toJSONString(list)); @@ -94,7 +94,7 @@ public void t05() { @Test public void t06() { // Keep error precision digital format - List> list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t06.xlsx") + List> list = FastExcel.read(TestFileUtil.getPath() + "compatibility/t06.xlsx") .headRowNumber(0) .sheet() .doReadSync(); @@ -106,7 +106,7 @@ public void t06() { public void t07() { // https://github.com/fast-excel/fastexcel/issues/2805 // Excel read date needs to be rounded - List> list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t07.xlsx") + List> list = FastExcel.read(TestFileUtil.getPath() + "compatibility/t07.xlsx") .readDefaultReturn(ReadDefaultReturnEnum.ACTUAL_DATA) .sheet() .doReadSync(); @@ -114,7 +114,7 @@ public void t07() { Assertions.assertEquals(0, new BigDecimal("24.1998124").compareTo((BigDecimal) list.get(0).get(11))); - list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t07.xlsx") + list = FastExcel.read(TestFileUtil.getPath() + "compatibility/t07.xlsx") .sheet() .doReadSync(); log.info("data:{}", JSON.toJSONString(list)); @@ -126,15 +126,15 @@ public void t08() { // https://github.com/fast-excel/fastexcel/issues/2693 // Temporary files may be deleted if there is no operation for a long time, so they need to be recreated. File file = TestFileUtil.createNewFile("compatibility/t08.xlsx"); - EasyExcel.write(file, SimpleData.class).sheet().doWrite(data()); + FastExcel.write(file, SimpleData.class).sheet().doWrite(data()); List> list = - EasyExcel.read(file).readCache(new Ehcache(null, 20)).sheet().doReadSync(); + FastExcel.read(file).readCache(new Ehcache(null, 20)).sheet().doReadSync(); Assertions.assertEquals(10L, list.size()); FileUtils.delete(new File(System.getProperty(TempFile.JAVA_IO_TMPDIR))); - list = EasyExcel.read(file).readCache(new Ehcache(null, 20)).sheet().doReadSync(); + list = FastExcel.read(file).readCache(new Ehcache(null, 20)).sheet().doReadSync(); Assertions.assertEquals(10L, list.size()); } @@ -143,7 +143,7 @@ public void t09() { // `SH_x005f_x000D_Z002` exists in `ShardingString.xml` and needs to be replaced by: `SH_x000D_Z002` File file = TestFileUtil.readFile("compatibility/t09.xlsx"); List> list = - EasyExcel.read(file).headRowNumber(0).sheet().doReadSync(); + FastExcel.read(file).headRowNumber(0).sheet().doReadSync(); log.info("data:{}", JSON.toJSONString(list)); Assertions.assertEquals(1, list.size()); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/converter/ConverterDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/converter/ConverterDataTest.java index 423fd8f54..f88ce7fbe 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/converter/ConverterDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/converter/ConverterDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.converter; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.metadata.data.WriteCellData; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.test.util.TestUtil; @@ -53,8 +53,8 @@ public void t03ReadAndWriteCsv() throws Exception { } private void readAndWrite(File file) throws Exception { - EasyExcel.write(file, ConverterWriteData.class).sheet().doWrite(data()); - EasyExcel.read(file, ConverterReadData.class, new ConverterDataListener()) + FastExcel.write(file, ConverterWriteData.class).sheet().doWrite(data()); + FastExcel.read(file, ConverterReadData.class, new ConverterDataListener()) .sheet() .doRead(); } @@ -96,7 +96,7 @@ private void writeImage(File file) throws Exception { imageData.setString(imagePath); inputStream = FileUtils.openInputStream(new File(imagePath)); imageData.setInputStream(inputStream); - EasyExcel.write(file, ImageData.class).sheet().doWrite(list); + FastExcel.write(file, ImageData.class).sheet().doWrite(list); } finally { if (inputStream != null) { inputStream.close(); @@ -105,7 +105,7 @@ private void writeImage(File file) throws Exception { } private void readAllConverter(String fileName) { - EasyExcel.read(TestFileUtil.readFile(fileName), ReadAllConverterData.class, new ReadAllConverterDataListener()) + FastExcel.read(TestFileUtil.readFile(fileName), ReadAllConverterData.class, new ReadAllConverterDataListener()) .sheet() .doRead(); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/dataformat/DateFormatTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/dataformat/DateFormatTest.java index 3ec19cc20..850a8761e 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/dataformat/DateFormatTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/dataformat/DateFormatTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.dataformat; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import com.alibaba.fastjson2.JSON; import java.io.File; @@ -48,7 +48,7 @@ public void t02Read03() { @Test public void t03Read() { List> dataMap = - EasyExcel.read(file07V2).headRowNumber(0).doReadAllSync(); + FastExcel.read(file07V2).headRowNumber(0).doReadAllSync(); log.info("dataMap:{}", JSON.toJSONString(dataMap)); Assertions.assertEquals("15:00", dataMap.get(0).get(0)); Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(1).get(0)); @@ -60,7 +60,7 @@ public void t03Read() { } private void readCn(File file) { - List list = EasyExcel.read(file, DateFormatData.class, null) + List list = FastExcel.read(file, DateFormatData.class, null) .locale(Locale.CHINA) .sheet() .doReadSync(); @@ -85,7 +85,7 @@ private void readCn(File file) { } private void readUs(File file) { - List list = EasyExcel.read(file, DateFormatData.class, null) + List list = FastExcel.read(file, DateFormatData.class, null) .locale(Locale.US) .sheet() .doReadSync(); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/exception/ExceptionDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/exception/ExceptionDataTest.java index 9c491dfac..dc0878fbe 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/exception/ExceptionDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/exception/ExceptionDataTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.core.exception; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.write.metadata.WriteSheet; import java.io.File; @@ -80,10 +80,10 @@ public void t22ReadAndWrite03() throws Exception { private void readAndWriteExcelAnalysisStopSheetException(File file) throws Exception { try (ExcelWriter excelWriter = - EasyExcel.write(file, ExceptionData.class).build()) { + FastExcel.write(file, ExceptionData.class).build()) { for (int i = 0; i < 5; i++) { String sheetName = "sheet" + i; - WriteSheet writeSheet = EasyExcel.writerSheet(i, sheetName).build(); + WriteSheet writeSheet = FastExcel.writerSheet(i, sheetName).build(); List data = data(sheetName); excelWriter.write(data, writeSheet); } @@ -91,7 +91,7 @@ private void readAndWriteExcelAnalysisStopSheetException(File file) throws Excep ExcelAnalysisStopSheetExceptionDataListener excelAnalysisStopSheetExceptionDataListener = new ExcelAnalysisStopSheetExceptionDataListener(); - EasyExcel.read(file, ExceptionData.class, excelAnalysisStopSheetExceptionDataListener) + FastExcel.read(file, ExceptionData.class, excelAnalysisStopSheetExceptionDataListener) .doReadAll(); Map> dataMap = excelAnalysisStopSheetExceptionDataListener.getDataMap(); Assertions.assertEquals(5, dataMap.size()); @@ -108,8 +108,8 @@ private void readAndWriteExcelAnalysisStopSheetException(File file) throws Excep } private void readAndWriteException(File file) throws Exception { - EasyExcel.write(new FileOutputStream(file), ExceptionData.class).sheet().doWrite(data()); - ArithmeticException exception = Assertions.assertThrows(ArithmeticException.class, () -> EasyExcel.read( + FastExcel.write(new FileOutputStream(file), ExceptionData.class).sheet().doWrite(data()); + ArithmeticException exception = Assertions.assertThrows(ArithmeticException.class, () -> FastExcel.read( new FileInputStream(file), ExceptionData.class, new ExceptionThrowDataListener()) .sheet() .doRead()); @@ -117,8 +117,8 @@ private void readAndWriteException(File file) throws Exception { } private void readAndWrite(File file) throws Exception { - EasyExcel.write(new FileOutputStream(file), ExceptionData.class).sheet().doWrite(data()); - EasyExcel.read(new FileInputStream(file), ExceptionData.class, new ExceptionDataListener()) + FastExcel.write(new FileOutputStream(file), ExceptionData.class).sheet().doWrite(data()); + FastExcel.read(new FileInputStream(file), ExceptionData.class, new ExceptionDataListener()) .sheet() .doRead(); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java index 1103c3dda..4806133e2 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.excludeorinclude; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; import java.util.ArrayList; @@ -156,11 +156,11 @@ private void excludeIndex(File file) { Set excludeColumnIndexes = new HashSet(); excludeColumnIndexes.add(0); excludeColumnIndexes.add(3); - EasyExcel.write(file, ExcludeOrIncludeData.class) + FastExcel.write(file, ExcludeOrIncludeData.class) .excludeColumnIndexes(excludeColumnIndexes) .sheet() .doWrite(data()); - List> dataMap = EasyExcel.read(file).sheet().doReadSync(); + List> dataMap = FastExcel.read(file).sheet().doReadSync(); Assertions.assertEquals(1, dataMap.size()); Map record = dataMap.get(0); Assertions.assertEquals(2, record.size()); @@ -173,11 +173,11 @@ private void excludeFieldName(File file) { excludeColumnFieldNames.add("column1"); excludeColumnFieldNames.add("column3"); excludeColumnFieldNames.add("column4"); - EasyExcel.write(file, ExcludeOrIncludeData.class) + FastExcel.write(file, ExcludeOrIncludeData.class) .excludeColumnFieldNames(excludeColumnFieldNames) .sheet() .doWrite(data()); - List> dataMap = EasyExcel.read(file).sheet().doReadSync(); + List> dataMap = FastExcel.read(file).sheet().doReadSync(); Assertions.assertEquals(1, dataMap.size()); Map record = dataMap.get(0); Assertions.assertEquals(1, record.size()); @@ -188,11 +188,11 @@ private void includeIndex(File file) { Set includeColumnIndexes = new HashSet(); includeColumnIndexes.add(1); includeColumnIndexes.add(2); - EasyExcel.write(file, ExcludeOrIncludeData.class) + FastExcel.write(file, ExcludeOrIncludeData.class) .includeColumnIndexes(includeColumnIndexes) .sheet() .doWrite(data()); - List> dataMap = EasyExcel.read(file).sheet().doReadSync(); + List> dataMap = FastExcel.read(file).sheet().doReadSync(); Assertions.assertEquals(1, dataMap.size()); Map record = dataMap.get(0); Assertions.assertEquals(2, record.size()); @@ -204,11 +204,11 @@ private void includeFieldName(File file) { Set includeColumnFieldNames = new HashSet(); includeColumnFieldNames.add("column2"); includeColumnFieldNames.add("column3"); - EasyExcel.write(file, ExcludeOrIncludeData.class) + FastExcel.write(file, ExcludeOrIncludeData.class) .sheet() .includeColumnFieldNames(includeColumnFieldNames) .doWrite(data()); - List> dataMap = EasyExcel.read(file).sheet().doReadSync(); + List> dataMap = FastExcel.read(file).sheet().doReadSync(); Assertions.assertEquals(1, dataMap.size()); Map record = dataMap.get(0); Assertions.assertEquals(2, record.size()); @@ -222,12 +222,12 @@ private void includeFieldNameOrderIndex(File file) { includeColumnIndexes.add(1); includeColumnIndexes.add(2); includeColumnIndexes.add(0); - EasyExcel.write(file, ExcludeOrIncludeData.class) + FastExcel.write(file, ExcludeOrIncludeData.class) .includeColumnIndexes(includeColumnIndexes) .orderByIncludeColumn(true) .sheet() .doWrite(data()); - List> dataMap = EasyExcel.read(file).sheet().doReadSync(); + List> dataMap = FastExcel.read(file).sheet().doReadSync(); Assertions.assertEquals(1, dataMap.size()); Map record = dataMap.get(0); Assertions.assertEquals(4, record.size()); @@ -242,12 +242,12 @@ private void includeFieldNameOrder(File file) { includeColumnFieldNames.add("column4"); includeColumnFieldNames.add("column2"); includeColumnFieldNames.add("column3"); - EasyExcel.write(file, ExcludeOrIncludeData.class) + FastExcel.write(file, ExcludeOrIncludeData.class) .includeColumnFieldNames(includeColumnFieldNames) .orderByIncludeColumn(true) .sheet() .doWrite(data()); - List> dataMap = EasyExcel.read(file).sheet().doReadSync(); + List> dataMap = FastExcel.read(file).sheet().doReadSync(); Assertions.assertEquals(1, dataMap.size()); Map record = dataMap.get(0); Assertions.assertEquals(3, record.size()); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/extra/ExtraDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/extra/ExtraDataTest.java index 962fe0bfe..57fbb779d 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/extra/ExtraDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/extra/ExtraDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.extra; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.enums.CellExtraTypeEnum; import cn.idev.excel.metadata.CellExtra; @@ -42,7 +42,7 @@ public void t02Read03() { @Test public void t03Read() { - EasyExcel.read(extraRelationships, ExtraData.class, new ReadListener() { + FastExcel.read(extraRelationships, ExtraData.class, new ReadListener() { @Override public void invoke(Object data, AnalysisContext context) {} @@ -74,7 +74,7 @@ public void extra(CellExtra extra, AnalysisContext context) { } private void read(File file) { - EasyExcel.read(file, ExtraData.class, new ExtraDataListener()) + FastExcel.read(file, ExtraData.class, new ExtraDataListener()) .extraRead(CellExtraTypeEnum.COMMENT) .extraRead(CellExtraTypeEnum.HYPERLINK) .extraRead(CellExtraTypeEnum.MERGE) diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/fill/FillDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/fill/FillDataTest.java index ef2d170f3..b2f056045 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/fill/FillDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/fill/FillDataTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.core.fill; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.enums.WriteDirectionEnum; import cn.idev.excel.exception.ExcelGenerateException; import cn.idev.excel.test.util.TestFileUtil; @@ -136,7 +136,7 @@ private void byNameFill(File file, File template) { FillData fillData = new FillData(); fillData.setName("Zhang San"); fillData.setNumber(5.2); - EasyExcel.write(file, FillData.class) + FastExcel.write(file, FillData.class) .withTemplate(template) .sheet("Sheet2") .doFill(fillData); @@ -144,8 +144,8 @@ private void byNameFill(File file, File template) { private void compositeFill(File file, File template) { try (ExcelWriter excelWriter = - EasyExcel.write(file).withTemplate(template).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(file).withTemplate(template).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder() .direction(WriteDirectionEnum.HORIZONTAL) @@ -161,7 +161,7 @@ private void compositeFill(File file, File template) { excelWriter.fill(map, writeSheet); } - List list = EasyExcel.read(file) + List list = FastExcel.read(file) .ignoreEmptyRow(false) .sheet() .headRowNumber(0) @@ -176,8 +176,8 @@ private void compositeFill(File file, File template) { private void horizontalFill(File file, File template) { try (ExcelWriter excelWriter = - EasyExcel.write(file).withTemplate(template).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(file).withTemplate(template).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder() .direction(WriteDirectionEnum.HORIZONTAL) .build(); @@ -189,7 +189,7 @@ private void horizontalFill(File file, File template) { excelWriter.finish(); } - List list = EasyExcel.read(file).sheet().headRowNumber(0).doReadSync(); + List list = FastExcel.read(file).sheet().headRowNumber(0).doReadSync(); Assertions.assertEquals(list.size(), 5L); Map map0 = (Map) list.get(0); Assertions.assertEquals("Zhang San", map0.get(2)); @@ -197,8 +197,8 @@ private void horizontalFill(File file, File template) { private void complexFill(File file, File template) { try (ExcelWriter excelWriter = - EasyExcel.write(file).withTemplate(template).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet() + FastExcel.write(file).withTemplate(template).build()) { + WriteSheet writeSheet = FastExcel.writerSheet() .registerWriteHandler(new LoopMergeStrategy(2, 0)) .build(); FillConfig fillConfig = @@ -210,7 +210,7 @@ private void complexFill(File file, File template) { map.put("total", 1000); excelWriter.fill(map, writeSheet); } - List list = EasyExcel.read(file).sheet().headRowNumber(3).doReadSync(); + List list = FastExcel.read(file).sheet().headRowNumber(3).doReadSync(); Assertions.assertEquals(list.size(), 21L); Map map19 = (Map) list.get(19); Assertions.assertEquals("Zhang San", map19.get(0)); @@ -220,7 +220,7 @@ private void fill(File file, File template) { FillData fillData = new FillData(); fillData.setName("Zhang San"); fillData.setNumber(5.2); - EasyExcel.write(file, FillData.class).withTemplate(template).sheet().doFill(fillData); + FastExcel.write(file, FillData.class).withTemplate(template).sheet().doFill(fillData); } private List data() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/fill/annotation/FillAnnotationDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/fill/annotation/FillAnnotationDataTest.java index ac0371496..93c3c2261 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/fill/annotation/FillAnnotationDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/fill/annotation/FillAnnotationDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.fill.annotation; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.util.DateUtils; import java.io.File; @@ -57,7 +57,7 @@ public void t02ReadAndWrite03() throws Exception { } private void readAndWrite(File file, File fileTemplate) throws Exception { - EasyExcel.write() + FastExcel.write() .file(file) .head(FillAnnotationData.class) .withTemplate(fileTemplate) diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleAnnotatedTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleAnnotatedTest.java index ed78a7c38..a18f794b7 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleAnnotatedTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleAnnotatedTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.fill.style; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.metadata.Head; import cn.idev.excel.test.core.fill.FillData; import cn.idev.excel.test.util.TestFileUtil; @@ -190,7 +190,7 @@ private void t02Fill03check(HSSFWorkbook workbook, HSSFRow row) { } private void fill(File file, File template) throws Exception { - EasyExcel.write(file, FillStyleAnnotatedData.class) + FastExcel.write(file, FillStyleAnnotatedData.class) .withTemplate(template) .sheet() .doFill(data()); @@ -320,7 +320,7 @@ private void t12FillStyleHandler03check(HSSFWorkbook workbook, HSSFRow row) { } private void fillStyleHandler(File file, File template) throws Exception { - EasyExcel.write(file, FillData.class) + FastExcel.write(file, FillData.class) .withTemplate(template) .sheet() .registerWriteHandler(new AbstractVerticalCellStyleStrategy() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleDataTest.java index 139c30970..aa355a1f6 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.fill.style; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.metadata.Head; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.util.DateUtils; @@ -194,7 +194,7 @@ private void t02Fill03check(HSSFWorkbook workbook, HSSFRow row) { } private void fill(File file, File template) throws Exception { - EasyExcel.write(file, FillStyleData.class) + FastExcel.write(file, FillStyleData.class) .withTemplate(template) .sheet() .doFill(data()); @@ -342,7 +342,7 @@ private void t12FillStyleHandler03check(HSSFWorkbook workbook, HSSFRow row) { } private void fillStyleHandler(File file, File template) throws Exception { - EasyExcel.write(file, FillStyleData.class) + FastExcel.write(file, FillStyleData.class) .withTemplate(template) .sheet() .registerWriteHandler(new AbstractVerticalCellStyleStrategy() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/handler/WriteHandlerTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/handler/WriteHandlerTest.java index 81d969ddf..0cec1f8bc 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/handler/WriteHandlerTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/handler/WriteHandlerTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.handler; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; import java.util.ArrayList; @@ -74,7 +74,7 @@ public void t23TableWriteCsv() throws Exception { private void workbookWrite(File file) { WriteHandler writeHandler = new WriteHandler(); - EasyExcel.write(file) + FastExcel.write(file) .head(WriteHandlerData.class) .registerWriteHandler(writeHandler) .sheet() @@ -84,7 +84,7 @@ private void workbookWrite(File file) { private void sheetWrite(File file) { WriteHandler writeHandler = new WriteHandler(); - EasyExcel.write(file) + FastExcel.write(file) .head(WriteHandlerData.class) .sheet() .registerWriteHandler(writeHandler) @@ -94,7 +94,7 @@ private void sheetWrite(File file) { private void tableWrite(File file) { WriteHandler writeHandler = new WriteHandler(); - EasyExcel.write(file) + FastExcel.write(file) .head(WriteHandlerData.class) .sheet() .table(0) diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/head/ComplexHeadDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/head/ComplexHeadDataTest.java index 848a37e4e..73abb42a3 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/head/ComplexHeadDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/head/ComplexHeadDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.head; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; import java.util.ArrayList; @@ -49,8 +49,8 @@ public void t03ReadAndWriteCsv() { } private void readAndWrite(File file) { - EasyExcel.write(file, ComplexHeadData.class).sheet().doWrite(data()); - EasyExcel.read(file, ComplexHeadData.class, new ComplexDataListener()) + FastExcel.write(file, ComplexHeadData.class).sheet().doWrite(data()); + FastExcel.read(file, ComplexHeadData.class, new ComplexDataListener()) .xlsxSAXParserFactoryName("com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl") .sheet() .doRead(); @@ -72,11 +72,11 @@ public void t13ReadAndWriteAutomaticMergeHeadCsv() { } private void readAndWriteAutomaticMergeHead(File file) { - EasyExcel.write(file, ComplexHeadData.class) + FastExcel.write(file, ComplexHeadData.class) .automaticMergeHead(Boolean.FALSE) .sheet() .doWrite(data()); - EasyExcel.read(file, ComplexHeadData.class, new ComplexDataListener()) + FastExcel.read(file, ComplexHeadData.class, new ComplexDataListener()) .sheet() .doRead(); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/head/ListHeadDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/head/ListHeadDataTest.java index f96c00a0e..968be0dc3 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/head/ListHeadDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/head/ListHeadDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.head; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.util.DateUtils; import java.io.File; @@ -45,8 +45,8 @@ public void t03ReadAndWriteCsv() throws Exception { } private void readAndWrite(File file) throws Exception { - EasyExcel.write(file).head(head()).sheet().doWrite(data()); - EasyExcel.read(file) + FastExcel.write(file).head(head()).sheet().doWrite(data()); + FastExcel.read(file) .registerReadListener(new ListHeadDataListener()) .sheet() .doRead(); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/head/NoHeadDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/head/NoHeadDataTest.java index 52fbeac7d..4306b4b48 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/head/NoHeadDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/head/NoHeadDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.head; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; import java.util.ArrayList; @@ -43,8 +43,8 @@ public void t03ReadAndWriteCsv() { } private void readAndWrite(File file) { - EasyExcel.write(file, NoHeadData.class).needHead(Boolean.FALSE).sheet().doWrite(data()); - EasyExcel.read(file, NoHeadData.class, new NoHeadDataListener()) + FastExcel.write(file, NoHeadData.class).needHead(Boolean.FALSE).sheet().doWrite(data()); + FastExcel.read(file, NoHeadData.class, new NoHeadDataListener()) .headRowNumber(0) .sheet() .doRead(); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/large/LargeDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/large/LargeDataTest.java index a2be15df9..2da4ce66d 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/large/LargeDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/large/LargeDataTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.core.large; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.write.metadata.WriteSheet; import java.io.File; @@ -48,7 +48,7 @@ public static void init() { @Test public void t01Read() throws Exception { long start = System.currentTimeMillis(); - EasyExcel.read( + FastExcel.read( TestFileUtil.getPath() + "large" + File.separator + "large07.xlsx", LargeData.class, new LargeDataListener()) @@ -61,8 +61,8 @@ public void t01Read() throws Exception { @Test public void t02Fill() { try (ExcelWriter excelWriter = - EasyExcel.write(fileFill07).withTemplate(template07).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileFill07).withTemplate(template07).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 5000; j++) { excelWriter.fill(data(), writeSheet); log.info("{} fill success.", j); @@ -74,8 +74,8 @@ public void t02Fill() { public void t03ReadAndWriteCsv() { // write long start = System.currentTimeMillis(); - try (ExcelWriter excelWriter = EasyExcel.write(fileCsv).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + try (ExcelWriter excelWriter = FastExcel.write(fileCsv).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 5000; j++) { excelWriter.write(data(), writeSheet); log.info("{} write success.", j); @@ -85,7 +85,7 @@ public void t03ReadAndWriteCsv() { // read start = System.currentTimeMillis(); - EasyExcel.read(fileCsv, LargeData.class, new LargeDataListener()) + FastExcel.read(fileCsv, LargeData.class, new LargeDataListener()) .sheet() .doRead(); log.info("CSV large data total time spent:{}", System.currentTimeMillis() - start); @@ -94,16 +94,16 @@ public void t03ReadAndWriteCsv() { @Test public void t04Write() throws Exception { ExcelWriter excelWriter = - EasyExcel.write(fileWriteTemp07, LargeData.class).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileWriteTemp07, LargeData.class).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 2; j++) { excelWriter.write(data(), writeSheet); } excelWriter.finish(); long start = System.currentTimeMillis(); - excelWriter = EasyExcel.write(fileWrite07, LargeData.class).build(); - writeSheet = EasyExcel.writerSheet().build(); + excelWriter = FastExcel.write(fileWrite07, LargeData.class).build(); + writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 5000; j++) { excelWriter.write(data(), writeSheet); log.info("{} write success.", j); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/multiplesheets/MultipleSheetsDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/multiplesheets/MultipleSheetsDataTest.java index cfa41d6a3..e3e84989f 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/multiplesheets/MultipleSheetsDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/multiplesheets/MultipleSheetsDataTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.core.multiplesheets; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelReader; +import cn.idev.excel.FastExcel; import cn.idev.excel.read.metadata.ReadSheet; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; @@ -49,7 +49,7 @@ public void t04Read03All() { private void read(File file) { MultipleSheetsListener multipleSheetsListener = new MultipleSheetsListener(); - try (ExcelReader excelReader = EasyExcel.read(file, MultipleSheetsData.class, multipleSheetsListener) + try (ExcelReader excelReader = FastExcel.read(file, MultipleSheetsData.class, multipleSheetsListener) .build()) { List sheets = excelReader.excelExecutor().sheetList(); int count = 1; @@ -62,7 +62,7 @@ private void read(File file) { } private void readAll(File file) { - EasyExcel.read(file, MultipleSheetsData.class, new MultipleSheetsListener()) + FastExcel.read(file, MultipleSheetsData.class, new MultipleSheetsListener()) .doReadAll(); } } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/nomodel/NoModelDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/nomodel/NoModelDataTest.java index 3b5e79dbb..913901593 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/nomodel/NoModelDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/nomodel/NoModelDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.nomodel; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.enums.ReadDefaultReturnEnum; import cn.idev.excel.metadata.data.ReadCellData; import cn.idev.excel.test.util.TestFileUtil; @@ -59,16 +59,16 @@ public void t03ReadAndWriteCsv() throws Exception { } private void readAndWrite(File file, File fileRepeat, boolean isCsv) throws Exception { - EasyExcel.write(file).sheet().doWrite(data()); + FastExcel.write(file).sheet().doWrite(data()); List> result = - EasyExcel.read(file).headRowNumber(0).sheet().doReadSync(); + FastExcel.read(file).headRowNumber(0).sheet().doReadSync(); Assertions.assertEquals(10, result.size()); Map data10 = result.get(9); Assertions.assertEquals("string19", data10.get(0)); Assertions.assertEquals("109", data10.get(1)); Assertions.assertEquals("2020-01-01 01:01:01", data10.get(2)); - List> actualDataList = EasyExcel.read(file) + List> actualDataList = FastExcel.read(file) .headRowNumber(0) .readDefaultReturn(ReadDefaultReturnEnum.ACTUAL_DATA) .sheet() @@ -86,7 +86,7 @@ private void readAndWrite(File file, File fileRepeat, boolean isCsv) throws Exce Assertions.assertEquals(LocalDateTime.of(2020, 1, 1, 1, 1, 1), actualData10.get(2)); } - List>> readCellDataList = EasyExcel.read(file) + List>> readCellDataList = FastExcel.read(file) .headRowNumber(0) .readDefaultReturn(ReadDefaultReturnEnum.READ_CELL_DATA) .sheet() @@ -106,8 +106,8 @@ private void readAndWrite(File file, File fileRepeat, boolean isCsv) throws Exce LocalDateTime.of(2020, 1, 1, 1, 1, 1), readCellData10.get(2).getData()); } - EasyExcel.write(fileRepeat).sheet().doWrite(result); - result = EasyExcel.read(fileRepeat).headRowNumber(0).sheet().doReadSync(); + FastExcel.write(fileRepeat).sheet().doWrite(result); + result = FastExcel.read(fileRepeat).headRowNumber(0).sheet().doReadSync(); Assertions.assertEquals(10, result.size()); data10 = result.get(9); Assertions.assertEquals("string19", data10.get(0)); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/noncamel/UnCamelDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/noncamel/UnCamelDataTest.java index 8ddb7d530..321734676 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/noncamel/UnCamelDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/noncamel/UnCamelDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.noncamel; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; import java.util.ArrayList; @@ -43,8 +43,8 @@ public void t03ReadAndWriteCsv() { } private void readAndWrite(File file) { - EasyExcel.write(file, UnCamelData.class).sheet().doWrite(data()); - EasyExcel.read(file, UnCamelData.class, new UnCamelDataListener()) + FastExcel.write(file, UnCamelData.class).sheet().doWrite(data()); + FastExcel.read(file, UnCamelData.class, new UnCamelDataListener()) .sheet() .doRead(); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/parameter/ParameterDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/parameter/ParameterDataTest.java index 2e4840249..0d337e042 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/parameter/ParameterDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/parameter/ParameterDataTest.java @@ -1,8 +1,8 @@ package cn.idev.excel.test.core.parameter; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelReader; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.cache.MapCache; import cn.idev.excel.converters.string.StringStringConverter; import cn.idev.excel.read.metadata.ReadSheet; @@ -57,8 +57,8 @@ public void t02ReadAndWrite() throws Exception { } private void readAndWrite1(File file, ExcelTypeEnum type) { - EasyExcel.write(file.getPath()).head(ParameterData.class).sheet().doWrite(data()); - EasyExcel.read(file.getPath()) + FastExcel.write(file.getPath()).head(ParameterData.class).sheet().doWrite(data()); + FastExcel.read(file.getPath()) .head(ParameterData.class) .registerReadListener(new ParameterDataListener()) .sheet() @@ -66,19 +66,19 @@ private void readAndWrite1(File file, ExcelTypeEnum type) { } private void readAndWrite2(File file, ExcelTypeEnum type) { - EasyExcel.write(file.getPath(), ParameterData.class).sheet().doWrite(data()); - EasyExcel.read(file.getPath(), ParameterData.class, new ParameterDataListener()) + FastExcel.write(file.getPath(), ParameterData.class).sheet().doWrite(data()); + FastExcel.read(file.getPath(), ParameterData.class, new ParameterDataListener()) .sheet() .doRead(); } private void readAndWrite3(File file, ExcelTypeEnum type) throws Exception { - EasyExcel.write(new FileOutputStream(file)) + FastExcel.write(new FileOutputStream(file)) .excelType(type) .head(ParameterData.class) .sheet() .doWrite(data()); - EasyExcel.read(file.getPath()) + FastExcel.read(file.getPath()) .head(ParameterData.class) .registerReadListener(new ParameterDataListener()) .sheet() @@ -86,40 +86,40 @@ private void readAndWrite3(File file, ExcelTypeEnum type) throws Exception { } private void readAndWrite4(File file, ExcelTypeEnum type) throws Exception { - EasyExcel.write(new FileOutputStream(file), ParameterData.class) + FastExcel.write(new FileOutputStream(file), ParameterData.class) .excelType(type) .sheet() .doWrite(data()); - EasyExcel.read(file.getPath(), new ParameterDataListener()) + FastExcel.read(file.getPath(), new ParameterDataListener()) .head(ParameterData.class) .sheet() .doRead(); } private void readAndWrite5(File file, ExcelTypeEnum type) throws Exception { - ExcelWriter excelWriter = EasyExcel.write(new FileOutputStream(file)) + ExcelWriter excelWriter = FastExcel.write(new FileOutputStream(file)) .excelType(type) .head(ParameterData.class) .relativeHeadRowIndex(0) .build(); - WriteSheet writeSheet = EasyExcel.writerSheet(0) + WriteSheet writeSheet = FastExcel.writerSheet(0) .relativeHeadRowIndex(0) .needHead(Boolean.FALSE) .build(); - WriteTable writeTable = EasyExcel.writerTable(0) + WriteTable writeTable = FastExcel.writerTable(0) .relativeHeadRowIndex(0) .needHead(Boolean.TRUE) .build(); excelWriter.write(data(), writeSheet, writeTable); excelWriter.finish(); - ExcelReader excelReader = EasyExcel.read(file.getPath(), new ParameterDataListener()) + ExcelReader excelReader = FastExcel.read(file.getPath(), new ParameterDataListener()) .head(ParameterData.class) .mandatoryUseInputStream(Boolean.FALSE) .autoCloseStream(Boolean.TRUE) .readCache(new MapCache()) .build(); - ReadSheet readSheet = EasyExcel.readSheet() + ReadSheet readSheet = FastExcel.readSheet() .head(ParameterData.class) .use1904windowing(Boolean.FALSE) .headRowNumber(1) @@ -129,7 +129,7 @@ private void readAndWrite5(File file, ExcelTypeEnum type) throws Exception { excelReader.read(readSheet); excelReader.finish(); - excelReader = EasyExcel.read(file.getPath(), new ParameterDataListener()) + excelReader = FastExcel.read(file.getPath(), new ParameterDataListener()) .head(ParameterData.class) .mandatoryUseInputStream(Boolean.FALSE) .autoCloseStream(Boolean.TRUE) @@ -140,16 +140,16 @@ private void readAndWrite5(File file, ExcelTypeEnum type) throws Exception { } private void readAndWrite6(File file, ExcelTypeEnum type) throws Exception { - ExcelWriter excelWriter = EasyExcel.write(new FileOutputStream(file)) + ExcelWriter excelWriter = FastExcel.write(new FileOutputStream(file)) .excelType(type) .head(ParameterData.class) .relativeHeadRowIndex(0) .build(); - WriteSheet writeSheet = EasyExcel.writerSheet(0) + WriteSheet writeSheet = FastExcel.writerSheet(0) .relativeHeadRowIndex(0) .needHead(Boolean.FALSE) .build(); - WriteTable writeTable = EasyExcel.writerTable(0) + WriteTable writeTable = FastExcel.writerTable(0) .registerConverter(new StringStringConverter()) .relativeHeadRowIndex(0) .needHead(Boolean.TRUE) @@ -157,13 +157,13 @@ private void readAndWrite6(File file, ExcelTypeEnum type) throws Exception { excelWriter.write(data(), writeSheet, writeTable); excelWriter.finish(); - ExcelReader excelReader = EasyExcel.read(file.getPath(), new ParameterDataListener()) + ExcelReader excelReader = FastExcel.read(file.getPath(), new ParameterDataListener()) .head(ParameterData.class) .mandatoryUseInputStream(Boolean.FALSE) .autoCloseStream(Boolean.TRUE) .readCache(new MapCache()) .build(); - ReadSheet readSheet = EasyExcel.readSheet("0") + ReadSheet readSheet = FastExcel.readSheet("0") .head(ParameterData.class) .use1904windowing(Boolean.FALSE) .headRowNumber(1) @@ -172,7 +172,7 @@ private void readAndWrite6(File file, ExcelTypeEnum type) throws Exception { excelReader.read(readSheet); excelReader.finish(); - excelReader = EasyExcel.read(file.getPath(), new ParameterDataListener()) + excelReader = FastExcel.read(file.getPath(), new ParameterDataListener()) .head(ParameterData.class) .mandatoryUseInputStream(Boolean.FALSE) .autoCloseStream(Boolean.TRUE) @@ -183,7 +183,7 @@ private void readAndWrite6(File file, ExcelTypeEnum type) throws Exception { } private void readAndWrite7(File file, ExcelTypeEnum type) { - EasyExcel.write(file, ParameterData.class) + FastExcel.write(file, ParameterData.class) .registerConverter(new StringStringConverter()) .sheet() .registerConverter(new StringStringConverter()) @@ -191,7 +191,7 @@ private void readAndWrite7(File file, ExcelTypeEnum type) { .table(0) .needHead(Boolean.TRUE) .doWrite(data()); - EasyExcel.read(file.getPath()) + FastExcel.read(file.getPath()) .head(ParameterData.class) .registerReadListener(new ParameterDataListener()) .sheet() diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/repetition/RepetitionDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/repetition/RepetitionDataTest.java index e245fec68..86f612b3d 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/repetition/RepetitionDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/repetition/RepetitionDataTest.java @@ -1,8 +1,8 @@ package cn.idev.excel.test.core.repetition; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelReader; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.read.metadata.ReadSheet; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.write.metadata.WriteSheet; @@ -55,13 +55,13 @@ public void t03ReadAndWriteCsv() { private void readAndWrite(File file) { try (ExcelWriter excelWriter = - EasyExcel.write(file, RepetitionData.class).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet(0).build(); + FastExcel.write(file, RepetitionData.class).build()) { + WriteSheet writeSheet = FastExcel.writerSheet(0).build(); excelWriter.write(data(), writeSheet).write(data(), writeSheet); } - try (ExcelReader excelReader = EasyExcel.read(file, RepetitionData.class, new RepetitionDataListener()) + try (ExcelReader excelReader = FastExcel.read(file, RepetitionData.class, new RepetitionDataListener()) .build()) { - ReadSheet readSheet = EasyExcel.readSheet(0).build(); + ReadSheet readSheet = FastExcel.readSheet(0).build(); excelReader.read(readSheet); } } @@ -83,15 +83,15 @@ public void t13ReadAndWriteTableCsv() { private void readAndWriteTable(File file) { try (ExcelWriter excelWriter = - EasyExcel.write(file, RepetitionData.class).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet(0).build(); + FastExcel.write(file, RepetitionData.class).build()) { + WriteSheet writeSheet = FastExcel.writerSheet(0).build(); WriteTable writeTable = - EasyExcel.writerTable(0).relativeHeadRowIndex(0).build(); + FastExcel.writerTable(0).relativeHeadRowIndex(0).build(); excelWriter.write(data(), writeSheet, writeTable).write(data(), writeSheet, writeTable); } - try (ExcelReader excelReader = EasyExcel.read(file, RepetitionData.class, new RepetitionDataListener()) + try (ExcelReader excelReader = FastExcel.read(file, RepetitionData.class, new RepetitionDataListener()) .build()) { - ReadSheet readSheet = EasyExcel.readSheet(0).headRowNumber(2).build(); + ReadSheet readSheet = FastExcel.readSheet(0).headRowNumber(2).build(); excelReader.read(readSheet); } } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/simple/SimpleDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/simple/SimpleDataTest.java index b6742d767..4e61c527c 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/simple/SimpleDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/simple/SimpleDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.simple; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.read.listener.PageReadListener; import cn.idev.excel.support.ExcelTypeEnum; import cn.idev.excel.test.util.TestFileUtil; @@ -65,9 +65,9 @@ public void t03ReadAndWriteCsv() { * @param file file */ private void readAndWrite(File file) { - EasyExcel.write(file, SimpleData.class).sheet().doWrite(data()); + FastExcel.write(file, SimpleData.class).sheet().doWrite(data()); // use a SimpleDataListener object to handle and check result - EasyExcel.read(file, SimpleData.class, new SimpleDataListener()).sheet().doRead(); + FastExcel.read(file, SimpleData.class, new SimpleDataListener()).sheet().doRead(); } @Test @@ -93,12 +93,12 @@ public void t06ReadAndWriteCsv() throws Exception { * @throws Exception exception */ private void readAndWriteInputStream(File file, ExcelTypeEnum excelTypeEnum) throws Exception { - EasyExcel.write(new FileOutputStream(file), SimpleData.class) + FastExcel.write(new FileOutputStream(file), SimpleData.class) .excelType(excelTypeEnum) .sheet() .doWrite(data()); // use a SimpleDataListener object to handle and check result - EasyExcel.read(new FileInputStream(file), SimpleData.class, new SimpleDataListener()) + FastExcel.read(new FileInputStream(file), SimpleData.class, new SimpleDataListener()) .sheet() .doRead(); } @@ -132,7 +132,7 @@ public void t13SynchronousReadCsv() { */ @Test public void t21SheetNameRead07() { - List> list = EasyExcel.read( + List> list = FastExcel.read( TestFileUtil.readFile("simple" + File.separator + "simple07.xlsx")) // set the sheet name to read .sheet("simple") @@ -145,7 +145,7 @@ public void t21SheetNameRead07() { */ @Test public void t22SheetNoRead07() { - List> list = EasyExcel.read( + List> list = FastExcel.read( TestFileUtil.readFile("simple" + File.separator + "simple07.xlsx")) // sheetNo begin with 0 .sheet(1) @@ -164,7 +164,7 @@ public void t22SheetNoRead07() { @Test public void t23PageReadListener07() { // Read the first 5 rows of an Excel file - EasyExcel.read( + FastExcel.read( file07, SimpleData.class, new PageReadListener( @@ -187,7 +187,7 @@ public void t23PageReadListener07() { */ private void synchronousRead(File file) { // Synchronous read file - List list = EasyExcel.read(file).head(SimpleData.class).sheet().doReadSync(); + List list = FastExcel.read(file).head(SimpleData.class).sheet().doReadSync(); Assertions.assertEquals(list.size(), 10); Assertions.assertTrue(list.get(0) instanceof SimpleData); Assertions.assertEquals(((SimpleData) list.get(0)).getName(), "姓名0"); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/skip/SkipDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/skip/SkipDataTest.java index 5b78ac473..52f47e053 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/skip/SkipDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/skip/SkipDataTest.java @@ -1,8 +1,8 @@ package cn.idev.excel.test.core.skip; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelReader; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.event.SyncReadListener; import cn.idev.excel.exception.ExcelGenerateException; import cn.idev.excel.read.metadata.ReadSheet; @@ -51,11 +51,11 @@ public void t03ReadAndWriteCsv() { } private void readAndWrite(File file) { - try (ExcelWriter excelWriter = EasyExcel.write(file, SimpleData.class).build(); ) { - WriteSheet writeSheet0 = EasyExcel.writerSheet(0, "第一个").build(); - WriteSheet writeSheet1 = EasyExcel.writerSheet(1, "第二个").build(); - WriteSheet writeSheet2 = EasyExcel.writerSheet(2, "第三个").build(); - WriteSheet writeSheet3 = EasyExcel.writerSheet(3, "第四个").build(); + try (ExcelWriter excelWriter = FastExcel.write(file, SimpleData.class).build(); ) { + WriteSheet writeSheet0 = FastExcel.writerSheet(0, "第一个").build(); + WriteSheet writeSheet1 = FastExcel.writerSheet(1, "第二个").build(); + WriteSheet writeSheet2 = FastExcel.writerSheet(2, "第三个").build(); + WriteSheet writeSheet3 = FastExcel.writerSheet(3, "第四个").build(); excelWriter.write(data("name1"), writeSheet0); excelWriter.write(data("name2"), writeSheet1); excelWriter.write(data("name3"), writeSheet2); @@ -63,16 +63,16 @@ private void readAndWrite(File file) { } List list = - EasyExcel.read(file, SkipData.class, null).sheet("第二个").doReadSync(); + FastExcel.read(file, SkipData.class, null).sheet("第二个").doReadSync(); Assertions.assertEquals(1, list.size()); Assertions.assertEquals("name2", list.get(0).getName()); SyncReadListener syncReadListener = new SyncReadListener(); - try (ExcelReader excelReader = EasyExcel.read(file, SkipData.class, null) + try (ExcelReader excelReader = FastExcel.read(file, SkipData.class, null) .registerReadListener(syncReadListener) .build()) { - ReadSheet readSheet1 = EasyExcel.readSheet("第二个").build(); - ReadSheet readSheet3 = EasyExcel.readSheet("第四个").build(); + ReadSheet readSheet1 = FastExcel.readSheet("第二个").build(); + ReadSheet readSheet3 = FastExcel.readSheet("第四个").build(); excelReader.read(readSheet1, readSheet3); List syncList = syncReadListener.getList(); Assertions.assertEquals(2, syncList.size()); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/sort/SortDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/sort/SortDataTest.java index 2a051f9a5..1d4748b54 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/sort/SortDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/sort/SortDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.sort; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; import java.util.ArrayList; @@ -67,8 +67,8 @@ public void t13ReadAndWriteNoHeadCsv() { } private void readAndWrite(File file) { - EasyExcel.write(file, SortData.class).sheet().doWrite(data()); - List> dataMap = EasyExcel.read(file).sheet().doReadSync(); + FastExcel.write(file, SortData.class).sheet().doWrite(data()); + List> dataMap = FastExcel.read(file).sheet().doReadSync(); Assertions.assertEquals(1, dataMap.size()); Map record = dataMap.get(0); Assertions.assertEquals("column1", record.get(0)); @@ -78,12 +78,12 @@ private void readAndWrite(File file) { Assertions.assertEquals("column5", record.get(4)); Assertions.assertEquals("column6", record.get(5)); - EasyExcel.read(file, SortData.class, new SortDataListener()).sheet().doRead(); + FastExcel.read(file, SortData.class, new SortDataListener()).sheet().doRead(); } private void readAndWriteNoHead(File file) { - EasyExcel.write(file).head(head()).sheet().doWrite(data()); - List> dataMap = EasyExcel.read(file).sheet().doReadSync(); + FastExcel.write(file).head(head()).sheet().doWrite(data()); + List> dataMap = FastExcel.read(file).sheet().doReadSync(); Assertions.assertEquals(1, dataMap.size()); Map record = dataMap.get(0); Assertions.assertEquals("column1", record.get(0)); @@ -92,7 +92,7 @@ private void readAndWriteNoHead(File file) { Assertions.assertEquals("column4", record.get(3)); Assertions.assertEquals("column5", record.get(4)); Assertions.assertEquals("column6", record.get(5)); - EasyExcel.read(file, SortData.class, new SortDataListener()).sheet().doRead(); + FastExcel.read(file, SortData.class, new SortDataListener()).sheet().doRead(); } private List> head() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/style/StyleDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/style/StyleDataTest.java index f8d51e38f..53d841998 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/style/StyleDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/style/StyleDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.style; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.annotation.write.style.HeadFontStyle; import cn.idev.excel.annotation.write.style.HeadStyle; import cn.idev.excel.metadata.Head; @@ -124,7 +124,7 @@ protected WriteCellStyle contentCellStyle(Head head) { return writeCellStyle; } }; - EasyExcel.write(fileVerticalCellStyleStrategy07, StyleData.class) + FastExcel.write(fileVerticalCellStyleStrategy07, StyleData.class) .registerWriteHandler(verticalCellStyleStrategy) .sheet() .doWrite(data()); @@ -166,7 +166,7 @@ protected WriteCellStyle contentCellStyle(Head head) { return writeCellStyle; } }; - EasyExcel.write(fileVerticalCellStyleStrategy207, StyleData.class) + FastExcel.write(fileVerticalCellStyleStrategy207, StyleData.class) .registerWriteHandler(verticalCellStyleStrategy) .sheet() .doWrite(data()); @@ -174,7 +174,7 @@ protected WriteCellStyle contentCellStyle(Head head) { @Test public void t05LoopMergeStrategy() { - EasyExcel.write(fileLoopMergeStrategy, StyleData.class) + FastExcel.write(fileLoopMergeStrategy, StyleData.class) .sheet() .registerWriteHandler(new LoopMergeStrategy(2, 1)) .doWrite(data10()); @@ -202,14 +202,14 @@ private void readAndWrite(File file) throws Exception { new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); OnceAbsoluteMergeStrategy onceAbsoluteMergeStrategy = new OnceAbsoluteMergeStrategy(2, 2, 0, 1); - EasyExcel.write(file, StyleData.class) + FastExcel.write(file, StyleData.class) .registerWriteHandler(simpleColumnWidthStyleStrategy) .registerWriteHandler(simpleRowHeightStyleStrategy) .registerWriteHandler(horizontalCellStyleStrategy) .registerWriteHandler(onceAbsoluteMergeStrategy) .sheet() .doWrite(data()); - EasyExcel.read(file, StyleData.class, new StyleDataListener()).sheet().doRead(); + FastExcel.read(file, StyleData.class, new StyleDataListener()).sheet().doRead(); Workbook workbook = WorkbookFactory.create(file); Sheet sheet = workbook.getSheetAt(0); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/core/template/TemplateDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/core/template/TemplateDataTest.java index 8da14a376..3206b0999 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/core/template/TemplateDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/core/template/TemplateDataTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.core.template; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.io.File; import java.util.ArrayList; @@ -36,22 +36,22 @@ public void t02ReadAndWrite03() { } private void readAndWrite07(File file) { - EasyExcel.write(file, TemplateData.class) + FastExcel.write(file, TemplateData.class) .withTemplate(TestFileUtil.readFile("template" + File.separator + "template07.xlsx")) .sheet() .doWrite(data()); - EasyExcel.read(file, TemplateData.class, new TemplateDataListener()) + FastExcel.read(file, TemplateData.class, new TemplateDataListener()) .headRowNumber(3) .sheet() .doRead(); } private void readAndWrite03(File file) { - EasyExcel.write(file, TemplateData.class) + FastExcel.write(file, TemplateData.class) .withTemplate(TestFileUtil.readFile("template" + File.separator + "template03.xls")) .sheet() .doWrite(data()); - EasyExcel.read(file, TemplateData.class, new TemplateDataListener()) + FastExcel.read(file, TemplateData.class, new TemplateDataListener()) .headRowNumber(3) .sheet() .doRead(); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/demo/fill/FillTest.java b/fastexcel/src/test/java/cn/idev/excel/test/demo/fill/FillTest.java index 27fa66616..f0125e487 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/demo/fill/FillTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/demo/fill/FillTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.demo.fill; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.enums.WriteDirectionEnum; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.util.ListUtils; @@ -41,7 +41,7 @@ public void simpleFill() { FillData fillData = new FillData(); fillData.setName("Zhang San"); fillData.setNumber(5.2); - EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(fillData); + FastExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(fillData); // Option 2: Fill based on a Map fileName = TestFileUtil.getPath() + "simpleFill" + System.currentTimeMillis() + ".xlsx"; @@ -49,7 +49,7 @@ public void simpleFill() { Map map = MapUtils.newHashMap(); map.put("name", "Zhang San"); map.put("number", 5.2); - EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(map); + FastExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(map); } /** @@ -70,13 +70,13 @@ public void listFill() { // Option 1: Load all data into memory at once and fill String fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; // This will fill the first sheet, and the file stream will be automatically closed. - EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(data()); + FastExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(data()); // Option 2: Fill in multiple passes, using file caching (saves memory) fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; try (ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); excelWriter.fill(data(), writeSheet); excelWriter.fill(data(), writeSheet); } @@ -98,8 +98,8 @@ public void complexFill() { String fileName = TestFileUtil.getPath() + "complexFill" + System.currentTimeMillis() + ".xlsx"; // Option 1 try (ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); // Note: The forceNewRow parameter is used here. When writing a list, it will always create a new row, and // the data below will be shifted down. Default is false, which will use the next row if available, // otherwise create a new one. @@ -138,8 +138,8 @@ public void complexFillWithTable() { // Option 1 try (ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); // Directly write data excelWriter.fill(data(), writeSheet); excelWriter.fill(data(), writeSheet); @@ -184,8 +184,8 @@ public void horizontalFill() { String fileName = TestFileUtil.getPath() + "horizontalFill" + System.currentTimeMillis() + ".xlsx"; // Option 1 try (ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder() .direction(WriteDirectionEnum.HORIZONTAL) .build(); @@ -216,8 +216,8 @@ public void compositeFill() { // Option 1 try (ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build()) { + WriteSheet writeSheet = FastExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder() .direction(WriteDirectionEnum.HORIZONTAL) .build(); @@ -257,7 +257,7 @@ public void dateFormatFill() { // Fill the template with data. // The dates in the data will be formatted according to the template's settings. - EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(data()); + FastExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(data()); } private List data() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/demo/rare/WriteTest.java b/fastexcel/src/test/java/cn/idev/excel/test/demo/rare/WriteTest.java index 3c9b1a279..76a70498b 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/demo/rare/WriteTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/demo/rare/WriteTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.demo.rare; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.demo.write.DemoData; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.util.FileUtils; @@ -42,7 +42,7 @@ public void compressedTemporaryFile() { File file = TestFileUtil.createNewFile("rare/compressedTemporaryFile" + System.currentTimeMillis() + ".xlsx"); // Specify which class to use for writing here - try (ExcelWriter excelWriter = EasyExcel.write(file, DemoData.class) + try (ExcelWriter excelWriter = FastExcel.write(file, DemoData.class) .registerWriteHandler(new WorkbookWriteHandler() { /** @@ -64,7 +64,7 @@ public void afterWorkbookCreate(WorkbookWriteHandlerContext context) { }) .build()) { // Note that the same sheet should only be created once - WriteSheet writeSheet = EasyExcel.writerSheet("Template").build(); + WriteSheet writeSheet = FastExcel.writerSheet("Template").build(); // 100,000 data entries to ensure sufficient space for (int i = 0; i < 10000; i++) { // Query data from the database page by page. Here you can query data for each page from the database @@ -88,7 +88,7 @@ public void specifiedCellWrite() { // event // If it is after the last row, since there will be no more data afterwards, just intercept the // afterWorkbookDispose event and write the data when the Excel file is almost done - EasyExcel.write(file, DemoData.class) + FastExcel.write(file, DemoData.class) // Writing value before the last row .registerWriteHandler(new RowWriteHandler() { @Override diff --git a/fastexcel/src/test/java/cn/idev/excel/test/demo/read/ReadTest.java b/fastexcel/src/test/java/cn/idev/excel/test/demo/read/ReadTest.java index df75be8af..ac9c71a34 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/demo/read/ReadTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/demo/read/ReadTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.demo.read; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelReader; +import cn.idev.excel.FastExcel; import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.format.NumberFormat; @@ -36,7 +36,7 @@ public class ReadTest { *

* 1. Create an entity class corresponding to the Excel data structure. Refer to {@link DemoData}. *

- * 2. Since EasyExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link DemoDataListener}. + * 2. Since FastExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link DemoDataListener}. *

* 3. Directly read the file. */ @@ -48,7 +48,7 @@ public void simpleRead() { // Specify the class to read the data, then read the first sheet. The file stream will be automatically closed. // By default, it reads 100 rows at a time. You can process the data directly. // The number of rows to read can be set in the constructor of `PageReadListener`. - EasyExcel.read(fileName, DemoData.class, new PageReadListener(dataList -> { + FastExcel.read(fileName, DemoData.class, new PageReadListener(dataList -> { for (DemoData demoData : dataList) { log.info("Reading a row of data: {}", JSON.toJSONString(demoData)); } @@ -61,7 +61,7 @@ public void simpleRead() { // Anonymous inner class, no need to create a separate DemoDataListener fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Specify the class to read the data, then read the first sheet. The file stream will be automatically closed. - EasyExcel.read(fileName, DemoData.class, new ReadListener() { + FastExcel.read(fileName, DemoData.class, new ReadListener() { /** * Batch size for caching data */ @@ -102,15 +102,15 @@ private void saveData() { // Approach 3: fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Specify the class to read the data, then read the first sheet. The file stream will be automatically closed. - EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).sheet().doRead(); + FastExcel.read(fileName, DemoData.class, new DemoDataListener()).sheet().doRead(); // Approach 4 fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // One reader per file try (ExcelReader excelReader = - EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).build()) { + FastExcel.read(fileName, DemoData.class, new DemoDataListener()).build()) { // Build a sheet. You can specify the name or index. - ReadSheet readSheet = EasyExcel.readSheet(0).build(); + ReadSheet readSheet = FastExcel.readSheet(0).build(); readSheet.setNumRows(2); // Read a single sheet excelReader.read(readSheet); @@ -122,7 +122,7 @@ public void genericHeaderTypeRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "generic-demo.xlsx"; // Simulate obtaining the Excel header's Class object through any possible means Class excelHeaderClass = DemoDataAnother.class; - EasyExcel.read(fileName, excelHeaderClass, GenericHeaderTypeDataListener.build(excelHeaderClass)) + FastExcel.read(fileName, excelHeaderClass, GenericHeaderTypeDataListener.build(excelHeaderClass)) .sheet() .doRead(); } @@ -132,7 +132,7 @@ public void genericHeaderTypeRead() { *

* 1. Create an entity class corresponding to the Excel data structure and use the {@link ExcelProperty} annotation. Refer to {@link IndexOrNameData}. *

- * 2. Since EasyExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link IndexOrNameDataListener}. + * 2. Since FastExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link IndexOrNameDataListener}. *

* 3. Directly read the file. */ @@ -140,7 +140,7 @@ public void genericHeaderTypeRead() { public void indexOrNameRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // By default, read the first sheet - EasyExcel.read(fileName, IndexOrNameData.class, new IndexOrNameDataListener()) + FastExcel.read(fileName, IndexOrNameData.class, new IndexOrNameDataListener()) .numRows(1) .sheet() .doRead(); @@ -151,7 +151,7 @@ public void indexOrNameRead() { *

* 1. Create an entity class corresponding to the Excel data structure. Refer to {@link DemoData}. *

- * 2. Since EasyExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link DemoDataListener}. + * 2. Since FastExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link DemoDataListener}. *

* 3. Directly read the file. */ @@ -161,20 +161,20 @@ public void repeatedRead() { // Read all sheets // Note: The `doAfterAllAnalysed` method of DemoDataListener will be called once after each sheet is read. // All sheets will write to the same DemoDataListener. - EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).doReadAll(); + FastExcel.read(fileName, DemoData.class, new DemoDataListener()).doReadAll(); // Read some sheets fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Method 1 - try (ExcelReader excelReader = EasyExcel.read(fileName).build()) { + try (ExcelReader excelReader = FastExcel.read(fileName).build()) { // For simplicity, the same head and Listener are registered here. // In actual use, different Listeners must be used. - ReadSheet readSheet1 = EasyExcel.readSheet(0) + ReadSheet readSheet1 = FastExcel.readSheet(0) .head(DemoData.class) .registerReadListener(new DemoDataListener()) .build(); - ReadSheet readSheet2 = EasyExcel.readSheet(1) + ReadSheet readSheet2 = FastExcel.readSheet(1) .head(DemoData.class) .registerReadListener(new DemoDataListener()) .build(); @@ -192,7 +192,7 @@ public void repeatedRead() { * 1. Create an entity class corresponding to the Excel data structure. Refer to {@link ConverterData}. * Annotations such as {@link DateTimeFormat}, {@link NumberFormat}, or custom annotations can be used. *

- * 2. Since EasyExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link ConverterDataListener}. + * 2. Since FastExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link ConverterDataListener}. *

* 3. Directly read the file. */ @@ -200,7 +200,7 @@ public void repeatedRead() { public void converterRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Specify the class to read, then read the first sheet - EasyExcel.read(fileName, ConverterData.class, new ConverterDataListener()) + FastExcel.read(fileName, ConverterData.class, new ConverterDataListener()) // Note: We can also register a custom converter using `registerConverter`. // However, this converter will be global, and all fields with Java type `String` and Excel type // `String` will use this converter. @@ -217,7 +217,7 @@ public void converterRead() { *

* 1. Create an entity class corresponding to the Excel data structure. Refer to {@link DemoData}. *

- * 2. Since EasyExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link DemoDataListener}. + * 2. Since FastExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link DemoDataListener}. *

* 3. Set the `headRowNumber` parameter, then read. Note that if `headRowNumber` is not specified, * the number of rows will be determined by the number of headers in the `@ExcelProperty#value()` of the class you provide. @@ -227,7 +227,7 @@ public void converterRead() { public void complexHeaderRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Specify the class to read, then read the first sheet - EasyExcel.read(fileName, DemoData.class, new DemoDataListener()) + FastExcel.read(fileName, DemoData.class, new DemoDataListener()) .sheet() // Set to 1 here because the header is one row. For multi-row headers, set to other values. // You can also omit this, as the default behavior will parse based on DemoData, which does not specify @@ -246,7 +246,7 @@ public void complexHeaderRead() { *

* *

- * 2. Since EasyExcel reads the Excel file row by row by default, you need to create a listener that handles each + * 2. Since FastExcel reads the Excel file row by row by default, you need to create a listener that handles each * row's data accordingly. Refer to {@link DemoCompatibleHeaderDataListener} for implementation details. In this * listener, you should override the `invokeHead` method to transform the uploaded headers as needed. *

@@ -259,7 +259,7 @@ public void complexHeaderRead() { public void compatibleHeaderRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Specify the class used for reading and choose to read the first sheet. - EasyExcel.read(fileName, DemoCompatibleHeaderData.class, new DemoCompatibleHeaderDataListener()) + FastExcel.read(fileName, DemoCompatibleHeaderData.class, new DemoCompatibleHeaderDataListener()) .sheet() .doRead(); } @@ -270,7 +270,7 @@ public void compatibleHeaderRead() { *

* 1. Create an entity object corresponding to the Excel data structure. Refer to {@link DemoData}. *

- * 2. Since EasyExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link DemoHeadDataListener}. + * 2. Since FastExcel reads Excel files row by row, you need to create a callback listener for each row. Refer to {@link DemoHeadDataListener}. *

* 3. Directly read the file. */ @@ -278,7 +278,7 @@ public void compatibleHeaderRead() { public void headerRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Specify the class to read, then read the first sheet - EasyExcel.read(fileName, DemoData.class, new DemoHeadDataListener()) + FastExcel.read(fileName, DemoData.class, new DemoHeadDataListener()) .sheet() .doRead(); } @@ -292,7 +292,7 @@ public void headerRead() { *

* 1. Create an entity object corresponding to the Excel data structure. Refer to {@link DemoExtraData}. *

- * 2. Since EasyExcel reads Excel files row by row by default, you need to create a callback listener for each row. Refer to {@link DemoExtraListener}. + * 2. Since FastExcel reads Excel files row by row by default, you need to create a callback listener for each row. Refer to {@link DemoExtraListener}. *

* 3. Directly read the file. * @@ -302,7 +302,7 @@ public void headerRead() { public void extraRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "extra.xlsx"; // Specify the class to read, then read the first sheet - EasyExcel.read(fileName, DemoExtraData.class, new DemoExtraListener()) + FastExcel.read(fileName, DemoExtraData.class, new DemoExtraListener()) // Read comments (default is not to read) .extraRead(CellExtraTypeEnum.COMMENT) // Read hyperlinks (default is not to read) @@ -319,7 +319,7 @@ public void extraRead() { *

* 1. Create an entity object corresponding to the Excel data structure. Refer to {@link CellDataReadDemoData}. *

- * 2. Since EasyExcel reads Excel files row by row by default, you need to create a callback listener for each row. Refer to {@link CellDataDemoHeadDataListener}. + * 2. Since FastExcel reads Excel files row by row by default, you need to create a callback listener for each row. Refer to {@link CellDataDemoHeadDataListener}. *

* 3. Directly read the file. * @@ -329,7 +329,7 @@ public void extraRead() { public void cellDataRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "cellDataDemo.xlsx"; // Specify the class to read, then read the first sheet - EasyExcel.read(fileName, CellDataReadDemoData.class, new CellDataDemoHeadDataListener()) + FastExcel.read(fileName, CellDataReadDemoData.class, new CellDataDemoHeadDataListener()) .sheet() .doRead(); } @@ -340,7 +340,7 @@ public void cellDataRead() { *

* 1. Create an entity object corresponding to the Excel data structure. Refer to {@link ExceptionDemoData}. *

- * 2. Since EasyExcel reads Excel files row by row by default, you need to create a callback listener for each row. Refer to {@link DemoExceptionListener}. + * 2. Since FastExcel reads Excel files row by row by default, you need to create a callback listener for each row. Refer to {@link DemoExceptionListener}. *

* 3. Directly read the file. */ @@ -348,7 +348,7 @@ public void cellDataRead() { public void exceptionRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Specify the class to read, then read the first sheet - EasyExcel.read(fileName, ExceptionDemoData.class, new DemoExceptionListener()) + FastExcel.read(fileName, ExceptionDemoData.class, new DemoExceptionListener()) .sheet() .doRead(); } @@ -361,14 +361,14 @@ public void synchronousRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Specify the class to read, then read the first sheet. Synchronous reading will automatically finish. List list = - EasyExcel.read(fileName).head(DemoData.class).sheet().doReadSync(); + FastExcel.read(fileName).head(DemoData.class).sheet().doReadSync(); for (DemoData data : list) { log.info("Read data:{}", JSON.toJSONString(data)); } // Alternatively, you can read without specifying a class, returning a list, then read the first sheet. // Synchronous reading will automatically finish. - List> listMap = EasyExcel.read(fileName).sheet().doReadSync(); + List> listMap = FastExcel.read(fileName).sheet().doReadSync(); for (Map data : listMap) { // Return key-value pairs for each data item, representing the column index and its value. log.info("Read data:{}", JSON.toJSONString(data)); @@ -382,7 +382,7 @@ public void synchronousRead() { public void noModelRead() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; // Simply read the first sheet. Synchronous reading will automatically finish. - EasyExcel.read(fileName, new NoModelDataListener()).sheet().doRead(); + FastExcel.read(fileName, new NoModelDataListener()).sheet().doRead(); } /** @@ -394,7 +394,7 @@ class ReadCsvFormat { @Test void asNormalJavaBean() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.csv"; - try (ExcelReader excelReader = EasyExcel.read(fileName, DemoData.class, new DemoDataListener()) + try (ExcelReader excelReader = FastExcel.read(fileName, DemoData.class, new DemoDataListener()) .build()) { // Check if it is a CSV file if (excelReader.analysisContext().readWorkbookHolder() instanceof CsvReadWorkbookHolder) { @@ -409,7 +409,7 @@ void asNormalJavaBean() { // Get all sheets List readSheetList = excelReader.excelExecutor().sheetList(); // If you only want to read the first sheet, you can pass the parameter accordingly. - // ReadSheet readSheet = EasyExcel.readSheet(0).build(); + // ReadSheet readSheet = FastExcel.readSheet(0).build(); excelReader.read(readSheetList); } } @@ -417,7 +417,7 @@ void asNormalJavaBean() { @Test void asChainedAccessorsJavaBean() { String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.csv"; - try (ExcelReader excelReader = EasyExcel.read( + try (ExcelReader excelReader = FastExcel.read( fileName, DemoChainAccessorsData.class, new ReadListener() { @Override public void invoke(DemoChainAccessorsData data, AnalysisContext context) { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/demo/web/EasyexcelApplication.java b/fastexcel/src/test/java/cn/idev/excel/test/demo/web/FastExcelApplication.java similarity index 70% rename from fastexcel/src/test/java/cn/idev/excel/test/demo/web/EasyexcelApplication.java rename to fastexcel/src/test/java/cn/idev/excel/test/demo/web/FastExcelApplication.java index 572059291..4899648ca 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/demo/web/EasyexcelApplication.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/demo/web/FastExcelApplication.java @@ -4,9 +4,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class EasyexcelApplication { +public class FastExcelApplication { public static void main(String[] args) { - SpringApplication.run(EasyexcelApplication.class, args); + SpringApplication.run(FastExcelApplication.class, args); } } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/demo/web/WebTest.java b/fastexcel/src/test/java/cn/idev/excel/test/demo/web/WebTest.java index 4c2004a05..e58af8f4f 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/demo/web/WebTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/demo/web/WebTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.demo.web; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.util.ListUtils; import cn.idev.excel.util.MapUtils; import com.alibaba.fastjson2.JSON; @@ -43,11 +43,11 @@ public void download(HttpServletResponse response) throws IOException { // Postman response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); - // Here URLEncoder.encode can prevent Chinese character encoding issues, which is unrelated to EasyExcel + // Here URLEncoder.encode can prevent Chinese character encoding issues, which is unrelated to FastExcel String fileName = URLEncoder.encode("test", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(response.getOutputStream(), DownloadData.class) + FastExcel.write(response.getOutputStream(), DownloadData.class) .sheet("Template") .doWrite(data()); } @@ -64,11 +64,11 @@ public void downloadFailedUsingJson(HttpServletResponse response) throws IOExcep try { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); - // Here URLEncoder.encode can prevent Chinese character encoding issues, which is unrelated to EasyExcel + // Here URLEncoder.encode can prevent Chinese character encoding issues, which is unrelated to FastExcel String fileName = URLEncoder.encode("test", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); // Here we need to set not to close the stream - EasyExcel.write(response.getOutputStream(), DownloadData.class) + FastExcel.write(response.getOutputStream(), DownloadData.class) .autoCloseStream(Boolean.FALSE) .sheet("Template") .doWrite(data()); @@ -96,7 +96,7 @@ public void downloadFailedUsingJson(HttpServletResponse response) throws IOExcep @PostMapping("upload") @ResponseBody public String upload(MultipartFile file) throws IOException { - EasyExcel.read(file.getInputStream(), UploadData.class, new UploadDataListener(uploadDAO)) + FastExcel.read(file.getInputStream(), UploadData.class, new UploadDataListener(uploadDAO)) .sheet() .doRead(); return "success"; diff --git a/fastexcel/src/test/java/cn/idev/excel/test/demo/write/WriteTest.java b/fastexcel/src/test/java/cn/idev/excel/test/demo/write/WriteTest.java index b19adcc80..972f7890a 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/demo/write/WriteTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/demo/write/WriteTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.demo.write; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.format.DateTimeFormat; import cn.idev.excel.annotation.format.NumberFormat; @@ -69,7 +69,7 @@ public void simpleWrite() { String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, DemoData.class).sheet("模板").doWrite(() -> { + FastExcel.write(fileName, DemoData.class).sheet("模板").doWrite(() -> { // 分页查询数据 return data(); }); @@ -78,13 +78,13 @@ public void simpleWrite() { fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, DemoData.class).sheet("模板").doWrite(data()); + FastExcel.write(fileName, DemoData.class).sheet("模板").doWrite(data()); // 写法3 fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写 - try (ExcelWriter excelWriter = EasyExcel.write(fileName, DemoData.class).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet("模板").build(); + try (ExcelWriter excelWriter = FastExcel.write(fileName, DemoData.class).build()) { + WriteSheet writeSheet = FastExcel.writerSheet("模板").build(); excelWriter.write(data(), writeSheet); } } @@ -92,7 +92,7 @@ public void simpleWrite() { @Test public void testEscapeHex() { String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".xlsx"; - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .sheet("template") .registerWriteHandler(new EscapeHexCellWriteHandler()) .doWrite(() -> { @@ -120,7 +120,7 @@ public void excludeOrIncludeWrite() { Set excludeColumnFieldNames = new HashSet<>(); excludeColumnFieldNames.add("date"); // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .excludeColumnFieldNames(excludeColumnFieldNames) .sheet("模板") .doWrite(data()); @@ -130,7 +130,7 @@ public void excludeOrIncludeWrite() { Set includeColumnFieldNames = new HashSet<>(); includeColumnFieldNames.add("date"); // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .includeColumnFieldNames(includeColumnFieldNames) .sheet("模板") .doWrite(data()); @@ -149,7 +149,7 @@ public void excludeOrIncludeWrite() { public void indexWrite() { String fileName = TestFileUtil.getPath() + "indexWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, IndexData.class).sheet("模板").doWrite(data()); + FastExcel.write(fileName, IndexData.class).sheet("模板").doWrite(data()); } /** @@ -165,7 +165,7 @@ public void indexWrite() { public void complexHeadWrite() { String fileName = TestFileUtil.getPath() + "complexHeadWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, ComplexHeadData.class).sheet("模板").doWrite(data()); + FastExcel.write(fileName, ComplexHeadData.class).sheet("模板").doWrite(data()); } /** @@ -182,9 +182,9 @@ public void repeatedWrite() { // 方法1: 如果写到同一个sheet String fileName = TestFileUtil.getPath() + "repeatedWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写 - try (ExcelWriter excelWriter = EasyExcel.write(fileName, DemoData.class).build()) { + try (ExcelWriter excelWriter = FastExcel.write(fileName, DemoData.class).build()) { // 这里注意 如果同一个sheet只要创建一次 - WriteSheet writeSheet = EasyExcel.writerSheet("模板").build(); + WriteSheet writeSheet = FastExcel.writerSheet("模板").build(); // 去调用写入,这里我调用了五次，实际使用时根据数据库分页的总的页数来 for (int i = 0; i < 5; i++) { // 分页去数据库查询数据 这里可以去数据库查询每一页的数据 @@ -196,11 +196,11 @@ public void repeatedWrite() { // 方法2: 如果写到不同的sheet 同一个对象 fileName = TestFileUtil.getPath() + "repeatedWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 指定文件 - try (ExcelWriter excelWriter = EasyExcel.write(fileName, DemoData.class).build()) { + try (ExcelWriter excelWriter = FastExcel.write(fileName, DemoData.class).build()) { // 去调用写入,这里我调用了五次，实际使用时根据数据库分页的总的页数来。这里最终会写到5个sheet里面 for (int i = 0; i < 5; i++) { // 每次都要创建writeSheet 这里注意必须指定sheetNo 而且sheetName必须不一样 - WriteSheet writeSheet = EasyExcel.writerSheet(i, "模板" + i).build(); + WriteSheet writeSheet = FastExcel.writerSheet(i, "模板" + i).build(); // 分页去数据库查询数据 这里可以去数据库查询每一页的数据 List data = data(); excelWriter.write(data, writeSheet); @@ -210,13 +210,13 @@ public void repeatedWrite() { // 方法3 如果写到不同的sheet 不同的对象 fileName = TestFileUtil.getPath() + "repeatedWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 指定文件 - try (ExcelWriter excelWriter = EasyExcel.write(fileName).build()) { + try (ExcelWriter excelWriter = FastExcel.write(fileName).build()) { // 去调用写入,这里我调用了五次，实际使用时根据数据库分页的总的页数来。这里最终会写到5个sheet里面 for (int i = 0; i < 5; i++) { // 每次都要创建writeSheet 这里注意必须指定sheetNo 而且sheetName必须不一样。这里注意DemoData.class 可以每次都变，我这里为了方便 所以用的同一个class // 实际上可以一直变 WriteSheet writeSheet = - EasyExcel.writerSheet(i, "模板" + i).head(DemoData.class).build(); + FastExcel.writerSheet(i, "模板" + i).head(DemoData.class).build(); // 分页去数据库查询数据 这里可以去数据库查询每一页的数据 List data = data(); excelWriter.write(data, writeSheet); @@ -237,7 +237,7 @@ public void repeatedWrite() { public void converterWrite() { String fileName = TestFileUtil.getPath() + "converterWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, ConverterData.class).sheet("模板").doWrite(data()); + FastExcel.write(fileName, ConverterData.class).sheet("模板").doWrite(data()); } /** @@ -315,10 +315,10 @@ public void imageWrite() throws Exception { imageData.setRelativeLastColumnIndex(1); // 写入数据 - EasyExcel.write(fileName, ImageDemoData.class).sheet().doWrite(list); + FastExcel.write(fileName, ImageDemoData.class).sheet().doWrite(list); // 如果图片资源不可访问，XLSX格式会报错 SXSSFWorkbook - Failed to dispose sheet // 也可以考虑声明为XLS格式 - // EasyExcel.write(fileName, ImageDemoData.class).excelType(ExcelTypeEnum.XLS).sheet().doWrite(list); + // FastExcel.write(fileName, ImageDemoData.class).excelType(ExcelTypeEnum.XLS).sheet().doWrite(list); } } @@ -394,7 +394,7 @@ public void writeCellDataWrite() { List data = new ArrayList<>(); data.add(writeCellDemoData); - EasyExcel.write(fileName, WriteCellDemoData.class) + FastExcel.write(fileName, WriteCellDemoData.class) .inMemory(true) .sheet("模板") .doWrite(data); @@ -418,7 +418,7 @@ public void templateWrite() { // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 这里要注意 withTemplate 的模板文件会全量存储在内存里面，所以尽量不要用于追加文件，如果文件模板文件过大会OOM // 如果要再文件中追加（无法在一个线程里面处理，可以在一个线程的建议参照多次写入的demo） 建议临时存储到数据库 或者 磁盘缓存(ehcache) 然后再一次性写入 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .withTemplate(templateFileName) .sheet() .doWrite(data()); @@ -437,7 +437,7 @@ public void templateWrite() { public void widthAndHeightWrite() { String fileName = TestFileUtil.getPath() + "widthAndHeightWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, WidthAndHeightData.class).sheet("模板").doWrite(data()); + FastExcel.write(fileName, WidthAndHeightData.class).sheet("模板").doWrite(data()); } /** @@ -453,7 +453,7 @@ public void widthAndHeightWrite() { public void annotationStyleWrite() { String fileName = TestFileUtil.getPath() + "annotationStyleWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoStyleData.class).sheet("模板").doWrite(data()); + FastExcel.write(fileName, DemoStyleData.class).sheet("模板").doWrite(data()); } /** @@ -493,15 +493,15 @@ public void handlerStyleWrite() { new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .registerWriteHandler(horizontalCellStyleStrategy) .sheet("模板") .doWrite(data()); - // 方法2: 使用easyexcel的方式完全自己写 不太推荐 尽量使用已有策略 + // 方法2: 使用FastExcel的方式完全自己写 不太推荐 尽量使用已有策略 // @since 3.0.0-beta2 fileName = TestFileUtil.getPath() + "handlerStyleWrite" + System.currentTimeMillis() + ".xlsx"; - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .registerWriteHandler(new CellWriteHandler() { @Override public void afterCellDispose(CellWriteHandlerContext context) { @@ -532,7 +532,7 @@ public void afterCellDispose(CellWriteHandlerContext context) { // 坑1：style里面有dataformat 用来格式化数据的 所以自己设置可能导致格式化注解不生效 // 坑2：不要一直去创建style 记得缓存起来 最多创建6W个就挂了 fileName = TestFileUtil.getPath() + "handlerStyleWrite" + System.currentTimeMillis() + ".xlsx"; - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .registerWriteHandler(new CellWriteHandler() { @Override public void afterCellDispose(CellWriteHandlerContext context) { @@ -579,14 +579,14 @@ public void mergeWrite() { String fileName = TestFileUtil.getPath() + "mergeWrite" + System.currentTimeMillis() + ".xlsx"; // 在DemoStyleData里面加上ContentLoopMerge注解 // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoMergeData.class).sheet("模板").doWrite(data()); + FastExcel.write(fileName, DemoMergeData.class).sheet("模板").doWrite(data()); // 方法2 自定义合并单元格策略 fileName = TestFileUtil.getPath() + "mergeWrite" + System.currentTimeMillis() + ".xlsx"; // 每隔2行会合并 把eachColumn 设置成 3 也就是我们数据的长度，所以就第一列会合并。当然其他合并策略也可以自己写 LoopMergeStrategy loopMergeStrategy = new LoopMergeStrategy(2, 0); // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .registerWriteHandler(loopMergeStrategy) .sheet("模板") .doWrite(data()); @@ -604,15 +604,15 @@ public void tableWrite() { String fileName = TestFileUtil.getPath() + "tableWrite" + System.currentTimeMillis() + ".xlsx"; // 方法1 这里直接写多个table的案例了，如果只有一个 也可以直一行代码搞定，参照其他案 // 这里 需要指定写用哪个class去写 - try (ExcelWriter excelWriter = EasyExcel.write(fileName, DemoData.class).build()) { + try (ExcelWriter excelWriter = FastExcel.write(fileName, DemoData.class).build()) { // 把sheet设置为不需要头 不然会输出sheet的头 这样看起来第一个table 就有2个头了 WriteSheet writeSheet = - EasyExcel.writerSheet("模板").needHead(Boolean.FALSE).build(); + FastExcel.writerSheet("模板").needHead(Boolean.FALSE).build(); // 这里必须指定需要头，table 会继承sheet的配置，sheet配置了不需要，table 默认也是不需要 WriteTable writeTable0 = - EasyExcel.writerTable(0).needHead(Boolean.TRUE).build(); + FastExcel.writerTable(0).needHead(Boolean.TRUE).build(); WriteTable writeTable1 = - EasyExcel.writerTable(1).needHead(Boolean.TRUE).build(); + FastExcel.writerTable(1).needHead(Boolean.TRUE).build(); // 第一次写入会创建头 excelWriter.write(data(), writeSheet, writeTable0); // 第二次写如也会创建头，然后在第一次的后面写入数据 @@ -633,7 +633,7 @@ public void tableWrite() { @Test public void dynamicHeadWrite() { String fileName = TestFileUtil.getPath() + "dynamicHeadWrite" + System.currentTimeMillis() + ".xlsx"; - EasyExcel.write(fileName) + FastExcel.write(fileName) // 这里放入动态头 .head(head()) .sheet("模板") @@ -661,7 +661,7 @@ public void longestMatchColumnWidthWrite() { String fileName = TestFileUtil.getPath() + "longestMatchColumnWidthWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, LongestMatchColumnWidthData.class) + FastExcel.write(fileName, LongestMatchColumnWidthData.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .sheet("模板") .doWrite(dataLong()); @@ -682,7 +682,7 @@ public void longestMatchColumnWidthWrite() { public void customHandlerWrite() { String fileName = TestFileUtil.getPath() + "customHandlerWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .registerWriteHandler(new CustomSheetWriteHandler()) .registerWriteHandler(new CustomCellWriteHandler()) .sheet("模板") @@ -703,7 +703,7 @@ public void commentWrite() { String fileName = TestFileUtil.getPath() + "commentWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 这里要注意inMemory 要设置为true，才能支持批注。目前没有好的办法解决 不在内存处理批注。这个需要自己选择。 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .inMemory(Boolean.TRUE) .registerWriteHandler(new CommentWriteHandler()) .sheet("模板") @@ -724,7 +724,7 @@ public void variableTitleWrite() { // 写法1 String fileName = TestFileUtil.getPath() + "variableTitleWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, ConverterData.class) + FastExcel.write(fileName, ConverterData.class) .head(variableTitleHead()) .sheet("模板") .doWrite(data()); @@ -738,7 +738,7 @@ public void noModelWrite() { // 写法1 String fileName = TestFileUtil.getPath() + "noModelWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList()); + FastExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList()); } private List dataLong() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/demo/write/WriteWithColorTest.java b/fastexcel/src/test/java/cn/idev/excel/test/demo/write/WriteWithColorTest.java index c0be3918b..89ef78c45 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/demo/write/WriteWithColorTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/demo/write/WriteWithColorTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.demo.write; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.util.LinkedList; import java.util.List; @@ -15,7 +15,7 @@ public class WriteWithColorTest { @Test public void write() { String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".xlsx"; - EasyExcel.write(fileName, ColorDemoData.class).sheet("模板").doWrite(this::data); + FastExcel.write(fileName, ColorDemoData.class).sheet("模板").doWrite(this::data); System.out.println(fileName); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/FillTempTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/FillTempTest.java index d6a1ad6cb..a593155ae 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/FillTempTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/FillTempTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.temp; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.demo.fill.FillData; import cn.idev.excel.test.temp.fill.FillData2; import cn.idev.excel.test.util.TestFileUtil; @@ -33,12 +33,12 @@ public void complexFill() { OnceAbsoluteMergeStrategy onceAbsoluteMergeStrategy = new OnceAbsoluteMergeStrategy(2, 2, 0, 1); String fileName = TestFileUtil.getPath() + "complexFill" + System.currentTimeMillis() + ".xlsx"; - ExcelWriter excelWriter = EasyExcel.write(fileName) + ExcelWriter excelWriter = FastExcel.write(fileName) .registerWriteHandler(onceAbsoluteMergeStrategy) .withTemplate("src/test/resources/demo/fill/simple.xlsx") .build(); - WriteSheet writeSheet0 = EasyExcel.writerSheet(0).build(); - WriteSheet writeSheet1 = EasyExcel.writerSheet(1).build(); + WriteSheet writeSheet0 = FastExcel.writerSheet(0).build(); + WriteSheet writeSheet1 = FastExcel.writerSheet(1).build(); excelWriter.fill(teamp(), writeSheet0); excelWriter.fill(teamp(), writeSheet1); @@ -67,8 +67,8 @@ public void complexFillWithTable() { String fileName = TestFileUtil.getPath() + "complexFillWithTable" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); // 直接写入数据 excelWriter.fill(data(), writeSheet); excelWriter.fill(data2(), writeSheet); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/Lock2Test.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/Lock2Test.java index 1d2acf705..389d2150a 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/Lock2Test.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/Lock2Test.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.metadata.data.ReadCellData; import cn.idev.excel.test.demo.write.DemoData; import cn.idev.excel.test.util.TestFileUtil; @@ -43,7 +43,7 @@ public class Lock2Test { @Test public void test() throws Exception { - List list = EasyExcel.read("src/test/resources/converter/converter07.xlsx") + List list = FastExcel.read("src/test/resources/converter/converter07.xlsx") // .useDefaultListener(false) .sheet(0) .headRowNumber(0) @@ -59,7 +59,7 @@ public void test() throws Exception { public void test33() throws Exception { File file = new File("src/test/resources/temp/lock_data.xlsx"); - EasyExcel.read(file, LockData.class, new LockDataListener()) + FastExcel.read(file, LockData.class, new LockDataListener()) .sheet(0) .headRowNumber(0) .doRead(); @@ -90,7 +90,7 @@ public void write() throws Exception { new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .registerWriteHandler(horizontalCellStyleStrategy) .sheet("模板") .doWrite(data()); @@ -100,7 +100,7 @@ public void write() throws Exception { public void simpleWrite() { String fileName = TestFileUtil.getPath() + System.currentTimeMillis() + ".xlsx"; System.out.println(fileName); - EasyExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList()); + FastExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList()); } private List> head() { @@ -132,7 +132,7 @@ public void simpleRead() { // 写法1： String fileName = "src/test/resources/temp/lock_data.xlsx"; // 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭 - EasyExcel.read(fileName, LockData.class, new LockDataListener()) + FastExcel.read(fileName, LockData.class, new LockDataListener()) .useDefaultListener(false) .sheet() .doRead(); @@ -141,8 +141,8 @@ public void simpleRead() { @Test public void test2(@TempDir Path tempDir) throws Exception { File file = tempDir.resolve(System.currentTimeMillis() + ".xlsx").toFile(); - EasyExcel.write().file(file).sheet().doWrite(dataList()); - List list = EasyExcel.read(file).sheet().headRowNumber(0).doReadSync(); + FastExcel.write().file(file).sheet().doWrite(dataList()); + List list = FastExcel.read(file).sheet().headRowNumber(0).doReadSync(); log.info("数据：{}", list.size()); for (Object data : list) { log.info("返回数据：{}", JSON.toJSONString(data)); @@ -332,7 +332,7 @@ public void testDateAll() throws Exception { public void numberforamt3() throws Exception { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - List> list = EasyExcel.read("src/test/resources/temp/number_format.xlsx") + List> list = FastExcel.read("src/test/resources/temp/number_format.xlsx") .useDefaultListener(false) .sheet(0) .headRowNumber(0) @@ -359,7 +359,7 @@ public void numberforamt4() throws Exception { String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, DemoData.class).sheet("模板").doWrite(() -> { + FastExcel.write(fileName, DemoData.class).sheet("模板").doWrite(() -> { // 分页查询数据 return data2(); }); @@ -370,7 +370,7 @@ public void numberforamt77() throws Exception { String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, DemoData3.class).sheet("模板").doWrite(() -> { + FastExcel.write(fileName, DemoData3.class).sheet("模板").doWrite(() -> { List list = new ArrayList<>(); DemoData3 demoData3 = new DemoData3(); demoData3.setLocalDateTime(LocalDateTime.of(2023, 1, 1, 0, 0, 0, 400000000)); @@ -402,7 +402,7 @@ public void numberforamt5() throws Exception { String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, DemoData.class).sheet("模板").doWrite(() -> { + FastExcel.write(fileName, DemoData.class).sheet("模板").doWrite(() -> { // 分页查询数据 return data3(); }); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/LockTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/LockTest.java index 148e4cbf9..e739b71d1 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/LockTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/LockTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import com.alibaba.fastjson2.JSON; import java.io.FileInputStream; import java.util.List; @@ -18,7 +18,7 @@ public class LockTest { @Test public void test() throws Exception { - List list = EasyExcel.read(new FileInputStream("src/test/resources/simple/simple07.xlsx")) + List list = FastExcel.read(new FileInputStream("src/test/resources/simple/simple07.xlsx")) .useDefaultListener(false) .doReadAllSync(); for (Object data : list) { @@ -28,7 +28,7 @@ public void test() throws Exception { @Test public void test2() throws Exception { - List list = EasyExcel.read(new FileInputStream("src/test/resources/simple/simple07.xlsx")) + List list = FastExcel.read(new FileInputStream("src/test/resources/simple/simple07.xlsx")) .sheet() .headRowNumber(0) .doReadSync(); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteLargeTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteLargeTest.java index 16116992e..c0918c5fc 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteLargeTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteLargeTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.temp; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.read.listener.PageReadListener; import cn.idev.excel.test.core.large.LargeData; import cn.idev.excel.test.util.TestFileUtil; @@ -63,10 +63,10 @@ public void test() throws Exception { HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); - ExcelWriter excelWriter = EasyExcel.write(fileName, LargeData.class) + ExcelWriter excelWriter = FastExcel.write(fileName, LargeData.class) .registerWriteHandler(horizontalCellStyleStrategy) .build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 100; j++) { excelWriter.write(data(), writeSheet); log.info("{} fill success.", j); @@ -81,7 +81,7 @@ public void read() throws Exception { // 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭 // 这里默认每次会读取100条数据 然后返回过来 直接调用使用数据就行 // 具体需要返回多少行可以在`PageReadListener`的构造函数设置 - EasyExcel.read(fileName, new PageReadListener>>(dataList -> { + FastExcel.read(fileName, new PageReadListener>>(dataList -> { log.info("SIZEL：{}", dataList.size()); })) .sheet() @@ -164,8 +164,8 @@ public void test2() throws Exception { // 方法2 如果写到不同的sheet 同一个对象 String fileName = TestFileUtil.getPath() + "large" + System.currentTimeMillis() + ".xlsx"; - ExcelWriter excelWriter = EasyExcel.write(fileName, LargeData.class).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + ExcelWriter excelWriter = FastExcel.write(fileName, LargeData.class).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 100; j++) { excelWriter.write(data(), writeSheet); log.info("{} fill success.", j); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteV33Test.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteV33Test.java index 9574319f9..49c628823 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteV33Test.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteV33Test.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.demo.write.DemoData; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.util.BooleanUtils; @@ -54,14 +54,14 @@ public void handlerStyleWrite() { // new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); // //// 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - // EasyExcel.write(fileName, DemoData.class) + // FastExcel.write(fileName, DemoData.class) // .registerWriteHandler(horizontalCellStyleStrategy) // .sheet("模板") // .doWrite(data()); // - // 方法2: 使用easyexcel的方式完全自己写 不太推荐 尽量使用已有策略 + // 方法2: 使用FastExcel的方式完全自己写 不太推荐 尽量使用已有策略 // fileName = TestFileUtil.getPath() + "handlerStyleWrite" + System.currentTimeMillis() + ".xlsx"; - // EasyExcel.write(fileName, DemoData.class) + // FastExcel.write(fileName, DemoData.class) // .registerWriteHandler(new CellWriteHandler() { // @Override // public void afterCellDispose(CellWriteHandlerContext context) { @@ -90,7 +90,7 @@ public void handlerStyleWrite() { // 坑1：style里面有dataformat 用来格式化数据的 所以自己设置可能导致格式化注解不生效 // 坑2：不要一直去创建style 记得缓存起来 最多创建6W个就挂了 fileName = TestFileUtil.getPath() + "handlerStyleWrite" + System.currentTimeMillis() + ".xlsx"; - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .registerWriteHandler(new CellWriteHandler() { @Override public void afterCellDispose(CellWriteHandlerContext context) { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteV34Test.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteV34Test.java index b33aaba3f..93f024eff 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteV34Test.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/WriteV34Test.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.demo.write.DemoData; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.write.metadata.style.WriteCellStyle; @@ -44,7 +44,7 @@ public void test() throws Exception { new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .head(head()) .registerWriteHandler(horizontalCellStyleStrategy) .sheet("模板") diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/Xls03Test.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/Xls03Test.java index 66372c6fe..620ea0efb 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/Xls03Test.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/Xls03Test.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.support.cglib.beans.BeanMap; import cn.idev.excel.support.cglib.core.DebuggingClassWriter; import cn.idev.excel.util.BeanMapUtils; @@ -24,7 +24,7 @@ public class Xls03Test { @Test public void test() { - List list = EasyExcel.read("src/test/resources/compatibility/t07.xlsx") + List list = FastExcel.read("src/test/resources/compatibility/t07.xlsx") .sheet() .doReadSync(); for (Object data : list) { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/bug/ExcelCreat.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/bug/ExcelCreat.java index b223f7295..5c333b4db 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/bug/ExcelCreat.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/bug/ExcelCreat.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.temp.bug; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.write.metadata.WriteSheet; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -15,9 +15,9 @@ public class ExcelCreat { public static void main(String[] args) throws FileNotFoundException { List data = getData(); ExcelWriter excelWriter = null; - excelWriter = EasyExcel.write(new FileOutputStream("all.xlsx")).build(); + excelWriter = FastExcel.write(new FileOutputStream("all.xlsx")).build(); WriteSheet writeSheet = - EasyExcel.writerSheet(1, "test").head(HeadType.class).build(); + FastExcel.writerSheet(1, "test").head(HeadType.class).build(); excelWriter.write(data, writeSheet); excelWriter.finish(); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/csv/CsvFormatTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/csv/CsvFormatTest.java index dc207cb0f..bdb3be824 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/csv/CsvFormatTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/csv/CsvFormatTest.java @@ -151,7 +151,7 @@ public void testHolder() { excelWriter.write(csvDataList, writeSheet); } - // https://github.com/alibaba/easyexcel/issues/3868 + // https://github.com/alibaba/FastExcel/issues/3868 csvFile = TestFileUtil.readFile(CSV_BASE + "csv-delimiter.csv"); try (ExcelReader excelReader = FastExcel.read(csvFile, CsvData.class, new CsvDataListener()).build()) { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/csv/CsvReadTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/csv/CsvReadTest.java index 27c6d637e..3fd1f1868 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/csv/CsvReadTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/csv/CsvReadTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp.csv; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import com.alibaba.fastjson2.JSON; import java.io.File; @@ -51,10 +51,10 @@ public void csvWrite() throws Exception { String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".csv"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, CsvData.class).sheet().doWrite(data()); + FastExcel.write(fileName, CsvData.class).sheet().doWrite(data()); // 读 - List list = EasyExcel.read(fileName).sheet(0).headRowNumber(0).doReadSync(); + List list = FastExcel.read(fileName).sheet(0).headRowNumber(0).doReadSync(); log.info("数据：{}", list.size()); for (Object data : list) { log.info("返回数据：{}", JSON.toJSONString(data)); @@ -67,9 +67,9 @@ public void writev2() throws Exception { String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + ".csv"; // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, CsvData.class).sheet().doWrite(data()); + FastExcel.write(fileName, CsvData.class).sheet().doWrite(data()); - EasyExcel.read(fileName, CsvData.class, new CsvDataListener()).sheet().doRead(); + FastExcel.read(fileName, CsvData.class, new CsvDataListener()).sheet().doRead(); } @Test diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/dataformat/DataFormatTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/dataformat/DataFormatTest.java index 00b27a624..280899854 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/dataformat/DataFormatTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/dataformat/DataFormatTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp.dataformat; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.metadata.data.FormulaData; import cn.idev.excel.test.core.dataformat.DateFormatData; import cn.idev.excel.test.util.TestFileUtil; @@ -34,7 +34,7 @@ public void test() throws Exception { File file = TestFileUtil.readFile("dataformat" + File.separator + "dataformat.xlsx"); - List list = EasyExcel.read(file, DataFormatData.class, null) + List list = FastExcel.read(file, DataFormatData.class, null) .sheet() .headRowNumber(1) .doReadSync(); @@ -63,7 +63,7 @@ public void test() throws Exception { public void testxls() throws Exception { File file = TestFileUtil.readFile("dataformat" + File.separator + "dataformat.xls"); - List list = EasyExcel.read(file, DataFormatData.class, null) + List list = FastExcel.read(file, DataFormatData.class, null) .sheet() .headRowNumber(1) .doReadSync(); @@ -150,7 +150,7 @@ public void tests1() throws IOException, InvalidFormatException { File file = TestFileUtil.readFile("dataformat" + File.separator + "dataformat.xlsx"); List list = - EasyExcel.read(file, DateFormatData.class, null).sheet().doReadSync(); + FastExcel.read(file, DateFormatData.class, null).sheet().doReadSync(); for (DateFormatData data : list) { log.info("返回:{}", JSON.toJSONString(data)); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/fill/FillTempTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/fill/FillTempTest.java index f9c82af0b..c922612e5 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/fill/FillTempTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/fill/FillTempTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.temp.fill; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.enums.WriteDirectionEnum; import cn.idev.excel.test.demo.fill.FillData; import cn.idev.excel.test.util.TestFileUtil; @@ -40,7 +40,7 @@ public void simpleFill() { FillData fillData = new FillData(); fillData.setName("Zhang San"); fillData.setNumber(5.2); - EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(fillData); + FastExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(fillData); /* // Option 2: Fill using a Map @@ -49,7 +49,7 @@ public void simpleFill() { Map map = new HashMap(); map.put("name", "Zhang San"); map.put("number", 5.2); - EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(map); + FastExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(map); */ } @@ -69,13 +69,13 @@ public void listFill() { // Option 1: Load all data into memory at once and fill String fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; // This will fill the first sheet, and the file stream will be closed automatically. - EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(data()); + FastExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(data()); // Option 2: Fill in multiple passes using file caching (saves memory) fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); excelWriter.fill(data(), writeSheet); excelWriter.fill(data(), writeSheet); // Do not forget to close the stream @@ -97,8 +97,8 @@ public void complexFill() { String fileName = TestFileUtil.getPath() + "complexFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); // Note: The `forceNewRow` parameter ensures that a new row is created when writing a list, even if there are no // empty rows below it. // By default, it is false, meaning it will use the next row if available, or create one if not. @@ -135,8 +135,8 @@ public void complexFillWithTable() { String fileName = TestFileUtil.getPath() + "complexFillWithTable" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); // Directly write data excelWriter.fill(data(), writeSheet); excelWriter.fill(data(), writeSheet); @@ -179,8 +179,8 @@ public void horizontalFill() { String fileName = TestFileUtil.getPath() + "horizontalFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.HORIZONTAL).build(); excelWriter.fill(data(), fillConfig, writeSheet); @@ -210,8 +210,8 @@ public void compositeFill() { String fileName = TestFileUtil.getPath() + "compositeFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.HORIZONTAL).build(); // If there are multiple lists, the template must use {prefix.}, where "data1" is the prefix. diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/issue1662/Issue1662Test.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/issue1662/Issue1662Test.java index c93b26150..21145bb02 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/issue1662/Issue1662Test.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/issue1662/Issue1662Test.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp.issue1662; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import java.util.ArrayList; import java.util.Date; @@ -12,7 +12,7 @@ public class Issue1662Test { public void test1662() { String fileName = TestFileUtil.getPath() + "Test1939" + ".xlsx"; System.out.println(fileName); - EasyExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList()); + FastExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList()); } private List> head() { diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/issue1663/FillTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/issue1663/FillTest.java index 6c022366c..9575cc428 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/issue1663/FillTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/issue1663/FillTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.temp.issue1663; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.enums.WriteDirectionEnum; import cn.idev.excel.test.demo.fill.FillData; import cn.idev.excel.test.util.TestFileUtil; @@ -22,8 +22,8 @@ public void TestFillNullPoint() { String fileName = TestFileUtil.getPath() + "temp/issue1663" + File.separator + "issue1663.xlsx"; ExcelWriter excelWriter = - EasyExcel.write(fileName).withTemplate(templateFileName).build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FastExcel.write(fileName).withTemplate(templateFileName).build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build(); excelWriter.fill(new FillWrapper("data1", data()), fillConfig, writeSheet); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/issue2319/Issue2319Test.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/issue2319/Issue2319Test.java index 07e8447aa..cac296227 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/issue2319/Issue2319Test.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/issue2319/Issue2319Test.java @@ -22,7 +22,7 @@ public void IssueTest1() { .doRead(); } - // CS304 (manually written) Issue link: https://github.com/alibaba/easyexcel/issues/2319 + // CS304 (manually written) Issue link: https://github.com/alibaba/FastExcel/issues/2319 @Test public void IssueTest2() { String fileName = TestFileUtil.getPath() + "temp/issue2319" + File.separator + "test2.xlsx"; diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/issue2443/Issue2443Test.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/issue2443/Issue2443Test.java index acc664771..fe52b4d6c 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/issue2443/Issue2443Test.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/issue2443/Issue2443Test.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp.issue2443; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.metadata.property.ExcelContentProperty; import cn.idev.excel.read.listener.PageReadListener; import cn.idev.excel.test.util.TestFileUtil; @@ -18,7 +18,7 @@ public class Issue2443Test { @Test public void IssueTest1() { String fileName = TestFileUtil.getPath() + "temp/issue2443" + File.separator + "date1.xlsx"; - EasyExcel.read(fileName, Issue2443.class, new PageReadListener(dataList -> { + FastExcel.read(fileName, Issue2443.class, new PageReadListener(dataList -> { for (Issue2443 issueData : dataList) { log.info("读取到一条数据{}", JSON.toJSONString(issueData)); } @@ -31,7 +31,7 @@ public void IssueTest1() { @Test public void IssueTest2() { String fileName = TestFileUtil.getPath() + "temp/issue2443" + File.separator + "date2.xlsx"; - EasyExcel.read(fileName, Issue2443.class, new PageReadListener(dataList -> { + FastExcel.read(fileName, Issue2443.class, new PageReadListener(dataList -> { for (Issue2443 issueData : dataList) { log.info("读取到一条数据{}", JSON.toJSONString(issueData)); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/large/TempLargeDataTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/large/TempLargeDataTest.java index 8bf0ae973..3dca2ac92 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/large/TempLargeDataTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/large/TempLargeDataTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.temp.large; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.util.TestFileUtil; import cn.idev.excel.write.metadata.WriteSheet; import java.io.File; @@ -54,7 +54,7 @@ public static void init() { @Test public void read() throws Exception { long start = System.currentTimeMillis(); - EasyExcel.read( + FastExcel.read( Files.newInputStream(Paths.get("src/test/resources/simple/LargeData.xlsx")), LargeData.class, new LargeDataListener()) @@ -68,7 +68,7 @@ public void read() throws Exception { public void noModelRead() throws Exception { ZipSecureFile.setMaxEntrySize(Long.MAX_VALUE); long start = System.currentTimeMillis(); - EasyExcel.read("src/test/resources/simple/no_model_10000_rows.xlsx", new NoModelLargeDataListener()) + FastExcel.read("src/test/resources/simple/no_model_10000_rows.xlsx", new NoModelLargeDataListener()) .sheet() .doRead(); log.info("Large data total time spent:{}", System.currentTimeMillis() - start); @@ -76,18 +76,18 @@ public void noModelRead() throws Exception { @Test public void t04Write() throws Exception { - ExcelWriter excelWriter = EasyExcel.write(fileWriteTemp07, cn.idev.excel.test.core.large.LargeData.class) + ExcelWriter excelWriter = FastExcel.write(fileWriteTemp07, cn.idev.excel.test.core.large.LargeData.class) .build(); - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 2; j++) { excelWriter.write(data(), writeSheet); } excelWriter.finish(); long start = System.currentTimeMillis(); - excelWriter = EasyExcel.write(fileWrite07, cn.idev.excel.test.core.large.LargeData.class) + excelWriter = FastExcel.write(fileWrite07, cn.idev.excel.test.core.large.LargeData.class) .build(); - writeSheet = EasyExcel.writerSheet().build(); + writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 5000; j++) { excelWriter.write(data(), writeSheet); log.info("{} write success.", j); @@ -121,10 +121,10 @@ public void t04Write() throws Exception { @Test public void t04WriteExcel() { IntStream.rangeClosed(0, 100).forEach(index -> { - try (ExcelWriter excelWriter = EasyExcel.write( + try (ExcelWriter excelWriter = FastExcel.write( fileWriteTemp07, cn.idev.excel.test.core.large.LargeData.class) .build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 5000; j++) { excelWriter.write(data(), writeSheet); } @@ -137,10 +137,10 @@ public void t04WriteExcel() { @Test public void t04WriteExcelNo() throws Exception { IntStream.rangeClosed(0, 10000).forEach(index -> { - try (ExcelWriter excelWriter = EasyExcel.write( + try (ExcelWriter excelWriter = FastExcel.write( fileWriteTemp07, cn.idev.excel.test.core.large.LargeData.class) .build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); + WriteSheet writeSheet = FastExcel.writerSheet().build(); for (int j = 0; j < 50; j++) { excelWriter.write(data(), writeSheet); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/poi/PoiEncryptTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/poi/PoiEncryptTest.java index 5e77bcee0..18d55a6e5 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/poi/PoiEncryptTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/poi/PoiEncryptTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp.poi; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.core.encrypt.EncryptData; import cn.idev.excel.test.core.simple.SimpleData; import cn.idev.excel.test.util.TestFileUtil; @@ -54,7 +54,7 @@ public void encrypt() throws Exception { @Test public void encryptExcel() throws Exception { - EasyExcel.write( + FastExcel.write( TestFileUtil.createNewFile("encryptv2" + System.currentTimeMillis() + ".xlsx"), EncryptData.class) .password("123456") diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/read/HeadReadTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/read/HeadReadTest.java index 67d030421..cda10758c 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/read/HeadReadTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/read/HeadReadTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp.read; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.cache.Ehcache; import java.io.File; import lombok.extern.slf4j.Slf4j; @@ -17,7 +17,7 @@ public class HeadReadTest { @Test public void test() throws Exception { File file = new File("src/test/resources/cache/t2.xlsx"); - EasyExcel.read(file, HeadReadData.class, new HeadListener()) + FastExcel.read(file, HeadReadData.class, new HeadListener()) .ignoreEmptyRow(false) .sheet(0) .doRead(); @@ -26,18 +26,18 @@ public void test() throws Exception { @Test public void testCache() throws Exception { File file = new File("src/test/resources/cache/headt1.xls"); - EasyExcel.read(file, HeadReadData.class, new HDListener()) + FastExcel.read(file, HeadReadData.class, new HDListener()) .readCache(new Ehcache(20)) .sheet(0) .doRead(); log.info("------------------"); - EasyExcel.read(file, HeadReadData.class, new HDListener()) + FastExcel.read(file, HeadReadData.class, new HDListener()) .readCache(new Ehcache(20)) .sheet(0) .doRead(); log.info("------------------"); - EasyExcel.read(file, HeadReadData.class, new HDListener()) + FastExcel.read(file, HeadReadData.class, new HDListener()) .readCache(new Ehcache(20)) .sheet(0) .doRead(); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/read/WebStreamReadTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/read/WebStreamReadTest.java index ab59970ad..265b7e93f 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/read/WebStreamReadTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/read/WebStreamReadTest.java @@ -2,7 +2,7 @@ import static org.mockserver.model.HttpRequest.request; import static org.mockserver.model.HttpResponse.response; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.read.listener.ReadListener; import cn.idev.excel.test.demo.read.Sample; @@ -39,7 +39,7 @@ public void urlLoadInputStreamTest() throws IOException { URL url = new URL("http://localhost:" + mockServer.getPort() + "/sample.xlsx"); InputStream is = url.openStream(); List body = new LinkedList<>(); - EasyExcel.read(is, Sample.class, new ReadListener() { + FastExcel.read(is, Sample.class, new ReadListener() { @Override public void invoke(Sample data, AnalysisContext context) { body.add(data.getHeader()); diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/simple/RepeatTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/simple/RepeatTest.java index 1f031c3f9..13c0ecfa2 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/simple/RepeatTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/simple/RepeatTest.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.temp.simple; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelReader; +import cn.idev.excel.FastExcel; import cn.idev.excel.read.metadata.ReadSheet; import cn.idev.excel.test.temp.LockData; import java.io.IOException; @@ -18,14 +18,14 @@ public class RepeatTest { @Test public void xlsTest1() throws IOException { - try (ExcelReader reader = EasyExcel.read( + try (ExcelReader reader = FastExcel.read( Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xls")), LockData.class, new RepeatListener()) .headRowNumber(0) .build()) { - ReadSheet r1 = EasyExcel.readSheet(0).build(); - ReadSheet r2 = EasyExcel.readSheet(2).build(); + ReadSheet r1 = FastExcel.readSheet(0).build(); + ReadSheet r2 = FastExcel.readSheet(2).build(); reader.read(r1); reader.read(r2); reader.finish(); @@ -34,13 +34,13 @@ public void xlsTest1() throws IOException { @Test public void xlsTest2() throws IOException { - try (ExcelReader reader = EasyExcel.read( + try (ExcelReader reader = FastExcel.read( Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xls")), LockData.class, new RepeatListener()) .headRowNumber(0) .build()) { - ReadSheet r2 = EasyExcel.readSheet(1).build(); + ReadSheet r2 = FastExcel.readSheet(1).build(); reader.read(r2); reader.finish(); } @@ -48,13 +48,13 @@ public void xlsTest2() throws IOException { @Test public void xlsTest3() throws IOException { - try (ExcelReader reader = EasyExcel.read( + try (ExcelReader reader = FastExcel.read( Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xls")), LockData.class, new RepeatListener()) .headRowNumber(0) .build()) { - ReadSheet r2 = EasyExcel.readSheet(0).build(); + ReadSheet r2 = FastExcel.readSheet(0).build(); reader.read(r2); reader.finish(); } @@ -62,14 +62,14 @@ public void xlsTest3() throws IOException { @Test public void xlsxTest1() throws IOException { - try (ExcelReader reader = EasyExcel.read( + try (ExcelReader reader = FastExcel.read( Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xlsx")), LockData.class, new RepeatListener()) .headRowNumber(0) .build()) { - ReadSheet r1 = EasyExcel.readSheet(0).build(); - ReadSheet r2 = EasyExcel.readSheet(2).build(); + ReadSheet r1 = FastExcel.readSheet(0).build(); + ReadSheet r2 = FastExcel.readSheet(2).build(); reader.read(r1); reader.read(r2); reader.finish(); @@ -78,13 +78,13 @@ public void xlsxTest1() throws IOException { @Test public void xlsxTest2() throws IOException { - try (ExcelReader reader = EasyExcel.read( + try (ExcelReader reader = FastExcel.read( Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xlsx")), LockData.class, new RepeatListener()) .headRowNumber(0) .build()) { - ReadSheet r2 = EasyExcel.readSheet(1).build(); + ReadSheet r2 = FastExcel.readSheet(1).build(); reader.read(r2); reader.finish(); } @@ -92,13 +92,13 @@ public void xlsxTest2() throws IOException { @Test public void xlsxTest3() throws IOException { - try (ExcelReader reader = EasyExcel.read( + try (ExcelReader reader = FastExcel.read( Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xlsx")), LockData.class, new RepeatListener()) .headRowNumber(0) .build()) { - ReadSheet r2 = EasyExcel.readSheet(0).build(); + ReadSheet r2 = FastExcel.readSheet(0).build(); reader.read(r2); reader.finish(); } diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/simple/Write.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/simple/Write.java index 9d9e2856a..43f2100f9 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/simple/Write.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/simple/Write.java @@ -1,7 +1,7 @@ package cn.idev.excel.test.temp.simple; -import cn.idev.excel.EasyExcel; import cn.idev.excel.ExcelWriter; +import cn.idev.excel.FastExcel; import cn.idev.excel.test.core.large.LargeData; import cn.idev.excel.test.demo.write.DemoData; import cn.idev.excel.test.util.TestFileUtil; @@ -42,7 +42,7 @@ public void simpleWrite() { String fileName = TestFileUtil.getPath() + "t22" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, DemoData.class) + FastExcel.write(fileName, DemoData.class) .relativeHeadRowIndex(10) .sheet("模板") .doWrite(data()); @@ -54,7 +54,7 @@ public void simpleWrite2() { String fileName = TestFileUtil.getPath() + "t22" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName, WriteData.class) + FastExcel.write(fileName, WriteData.class) .sheet("模板") .registerWriteHandler(new WriteHandler()) .doWrite(data1()); @@ -66,7 +66,7 @@ public void simpleWrite3() { String fileName = TestFileUtil.getPath() + "t33" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭 // 如果这里想使用03 则 传入excelType参数即可 - EasyExcel.write(fileName) + FastExcel.write(fileName) .head(head()) .inMemory(true) .sheet("模板") @@ -96,11 +96,11 @@ public void tableWrite() { String fileName = TestFileUtil.getPath() + "tableWrite" + System.currentTimeMillis() + ".xlsx"; // 这里直接写多个table的案例了，如果只有一个 也可以直一行代码搞定，参照其他案例 // 这里 需要指定写用哪个class去写 - ExcelWriter excelWriter = EasyExcel.write(fileName).build(); + ExcelWriter excelWriter = FastExcel.write(fileName).build(); // 把sheet设置为不需要头 不然会输出sheet的头 这样看起来第一个table 就有2个头了 - WriteSheet writeSheet = EasyExcel.writerSheet("模板").build(); + WriteSheet writeSheet = FastExcel.writerSheet("模板").build(); // 这里必须指定需要头，table 会继承sheet的配置，sheet配置了不需要，table 默认也是不需要 - WriteTable writeTable0 = EasyExcel.writerTable(0).head(DemoData1.class).build(); + WriteTable writeTable0 = FastExcel.writerTable(0).head(DemoData1.class).build(); // 第一次写入会创建头 excelWriter.write(data(), writeSheet, writeTable0); // 第二次写如也会创建头，然后在第一次的后面写入数据 diff --git a/fastexcel/src/test/java/cn/idev/excel/test/temp/write/TempWriteTest.java b/fastexcel/src/test/java/cn/idev/excel/test/temp/write/TempWriteTest.java index c79f2f117..026a299b5 100644 --- a/fastexcel/src/test/java/cn/idev/excel/test/temp/write/TempWriteTest.java +++ b/fastexcel/src/test/java/cn/idev/excel/test/temp/write/TempWriteTest.java @@ -1,6 +1,6 @@ package cn.idev.excel.test.temp.write; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import cn.idev.excel.support.cglib.beans.BeanMap; import cn.idev.excel.test.demo.read.CustomStringStringConverter; import cn.idev.excel.test.util.TestFileUtil; @@ -32,14 +32,14 @@ public class TempWriteTest { public void write() { TempWriteData tempWriteData = new TempWriteData(); tempWriteData.setName("zs\r\n \\ \r\n t4"); - EasyExcel.write( + FastExcel.write( TestFileUtil.getPath() + "TempWriteTest" + System.currentTimeMillis() + ".xlsx", TempWriteData.class) .sheet() .registerConverter(new CustomStringStringConverter()) .doWrite(ListUtils.newArrayList(tempWriteData)); - EasyExcel.write( + FastExcel.write( TestFileUtil.getPath() + "TempWriteTest" + System.currentTimeMillis() + ".xlsx", TempWriteData.class) .sheet() @@ -70,9 +70,9 @@ public void imageWrite() throws Exception { // String fileName = TestFileUtil.getPath() + "imageWrite" + System.currentTimeMillis() + ".xlsx"; // //// 这里 需要指定写用哪个class去写 - // try (ExcelWriter excelWriter = EasyExcel.write(fileName, DemoData.class).build()) { + // try (ExcelWriter excelWriter = FastExcel.write(fileName, DemoData.class).build()) { // // 这里注意 如果同一个sheet只要创建一次 - // WriteSheet writeSheet = EasyExcel.writerSheet("模板").build(); + // WriteSheet writeSheet = FastExcel.writerSheet("模板").build(); // // 去调用写入,这里我调用了五次，实际使用时根据数据库分页的总的页数来 // for (int i = 0; i < 5; i++) { // // 分页去数据库查询数据 这里可以去数据库查询每一页的数据