Skip to content

Commit 17eb760

Browse files
alaahongalaahong
authored
refactor: correct legacy references to latest usage (#532)
1 parent c8dcda2 commit 17eb760

File tree

68 files changed

+441
-441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+441
-441
lines changed

‎fastexcel/src/main/java/cn/idev/excel/analysis/v03/handlers/FormulaRecordHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import cn.idev.excel.analysis.v03.IgnorableXlsRecordHandler;
44
import cn.idev.excel.constant.BuiltinFormats;
5-
import cn.idev.excel.constant.EasyExcelConstants;
5+
import cn.idev.excel.constant.FastExcelConstants;
66
import cn.idev.excel.context.xls.XlsReadContext;
77
import cn.idev.excel.enums.CellDataTypeEnum;
88
import cn.idev.excel.enums.RowTypeEnum;
@@ -55,7 +55,7 @@ public void processRecord(XlsReadContext xlsReadContext, Record record) {
5555
tempCellData.setType(CellDataTypeEnum.NUMBER);
5656
tempCellData.setOriginalNumberValue(BigDecimal.valueOf(frec.getValue()));
5757
tempCellData.setNumberValue(
58-
tempCellData.getOriginalNumberValue().round(EasyExcelConstants.EXCEL_MATH_CONTEXT));
58+
tempCellData.getOriginalNumberValue().round(FastExcelConstants.EXCEL_MATH_CONTEXT));
5959
int dataFormat = xlsReadContext
6060
.xlsReadWorkbookHolder()
6161
.getFormatTrackingHSSFListener()

‎fastexcel/src/main/java/cn/idev/excel/analysis/v07/handlers/CellTagHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cn.idev.excel.analysis.v07.handlers;
22

3-
import cn.idev.excel.constant.EasyExcelConstants;
43
import cn.idev.excel.constant.ExcelXmlConstants;
4+
import cn.idev.excel.constant.FastExcelConstants;
55
import cn.idev.excel.context.xlsx.XlsxReadContext;
66
import cn.idev.excel.enums.CellDataTypeEnum;
77
import cn.idev.excel.metadata.data.ReadCellData;
@@ -89,7 +89,7 @@ public void endElement(XlsxReadContext xlsxReadContext, String name) {
8989
tempCellData.setType(CellDataTypeEnum.NUMBER);
9090
tempCellData.setOriginalNumberValue(new BigDecimal(tempDataString));
9191
tempCellData.setNumberValue(
92-
tempCellData.getOriginalNumberValue().round(EasyExcelConstants.EXCEL_MATH_CONTEXT));
92+
tempCellData.getOriginalNumberValue().round(FastExcelConstants.EXCEL_MATH_CONTEXT));
9393
break;
9494
default:
9595
throw new IllegalStateException("Cannot set values now");

fastexcel/src/main/java/cn/idev/excel/constant/EasyExcelConstants.java renamed to fastexcel/src/main/java/cn/idev/excel/constant/FastExcelConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
*/
11-
public class EasyExcelConstants {
11+
public class FastExcelConstants {
1212

1313
/**
1414
* Excel by default with 15 to store Numbers, and the double in Java can use to store number 17, led to the accuracy

‎fastexcel/src/main/java/cn/idev/excel/metadata/data/ReadCellData.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cn.idev.excel.metadata.data;
22

3-
import cn.idev.excel.constant.EasyExcelConstants;
3+
import cn.idev.excel.constant.FastExcelConstants;
44
import cn.idev.excel.enums.CellDataTypeEnum;
55
import java.math.BigDecimal;
66
import lombok.EqualsAndHashCode;
@@ -135,7 +135,7 @@ public static ReadCellData<?> newInstanceOriginal(BigDecimal numberValue, Intege
135135
cellData.setRowIndex(rowIndex);
136136
cellData.setColumnIndex(columnIndex);
137137
cellData.setOriginalNumberValue(numberValue);
138-
cellData.setNumberValue(numberValue.round(EasyExcelConstants.EXCEL_MATH_CONTEXT));
138+
cellData.setNumberValue(numberValue.round(FastExcelConstants.EXCEL_MATH_CONTEXT));
139139
return cellData;
140140
}
141141

‎fastexcel/src/main/java/cn/idev/excel/util/BeanMapUtils.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ public static BeanMap create(Object bean) {
2525
BeanMap.Generator gen = new BeanMap.Generator();
2626
gen.setBean(bean);
2727
gen.setContextClass(bean.getClass());
28-
gen.setNamingPolicy(EasyExcelNamingPolicy.INSTANCE);
28+
gen.setNamingPolicy(FastExcelNamingPolicy.INSTANCE);
2929
return gen.create();
3030
}
3131

32-
public static class EasyExcelNamingPolicy extends DefaultNamingPolicy {
33-
public static final EasyExcelNamingPolicy INSTANCE = new EasyExcelNamingPolicy();
32+
public static class FastExcelNamingPolicy extends DefaultNamingPolicy {
33+
public static final FastExcelNamingPolicy INSTANCE = new FastExcelNamingPolicy();
3434

3535
@Override
3636
protected String getTag() {
37-
return "ByEasyExcelCGLIB";
37+
return "ByFastExcelCGLIB";
3838
}
3939
}
4040
}

fastexcel/src/main/java/cn/idev/excel/util/EasyExcelTempFileCreationStrategy.java renamed to fastexcel/src/main/java/cn/idev/excel/util/FastExcelTempFileCreationStrategy.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
3636
*
3737
*
3838
*/
39-
public class EasyExcelTempFileCreationStrategy implements TempFileCreationStrategy {
39+
public class FastExcelTempFileCreationStrategy implements TempFileCreationStrategy {
4040
/**
4141
* Name of POI files directory in temporary directory.
4242
*/
@@ -62,7 +62,7 @@ public class EasyExcelTempFileCreationStrategy implements TempFileCreationStrate
6262
*
6363
* @see File#createTempFile(String, String)
6464
*/
65-
public EasyExcelTempFileCreationStrategy() {
65+
public FastExcelTempFileCreationStrategy() {
6666
this(null);
6767
}
6868

@@ -73,7 +73,7 @@ public EasyExcelTempFileCreationStrategy() {
7373
* directory).
7474
* @see Files#createTempFile(Path, String, String, FileAttribute[])
7575
*/
76-
public EasyExcelTempFileCreationStrategy(File dir) {
76+
public FastExcelTempFileCreationStrategy(File dir) {
7777
this.dir = dir;
7878
}
7979

‎fastexcel/src/main/java/cn/idev/excel/util/FileUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public static void writeToFile(File file, InputStream inputStream, boolean close
157157
}
158158

159159
public static void createPoiFilesDirectory() {
160-
TempFile.setTempFileCreationStrategy(new EasyExcelTempFileCreationStrategy());
160+
TempFile.setTempFileCreationStrategy(new FastExcelTempFileCreationStrategy());
161161
}
162162

163163
public static File createCacheTmpFile() {

‎fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationDataTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cn.idev.excel.test.core.annotation;
22

3-
import cn.idev.excel.EasyExcel;
3+
import cn.idev.excel.FastExcel;
44
import cn.idev.excel.test.core.StyleTestUtils;
55
import cn.idev.excel.test.util.TestFileUtil;
66
import cn.idev.excel.util.DateUtils;
@@ -65,7 +65,7 @@ public void t12Write03() throws Exception {
6565
}
6666

6767
private void writeStyle(File file) throws Exception {
68-
EasyExcel.write().file(file).head(AnnotationStyleData.class).sheet().doWrite(dataStyle());
68+
FastExcel.write().file(file).head(AnnotationStyleData.class).sheet().doWrite(dataStyle());
6969

7070
Workbook workbook = WorkbookFactory.create(file);
7171
Sheet sheet = workbook.getSheetAt(0);
@@ -93,7 +93,7 @@ private void writeStyle(File file) throws Exception {
9393
}
9494

9595
private void readAndWrite(File file) throws Exception {
96-
EasyExcel.write().file(file).head(AnnotationData.class).sheet().doWrite(dataStyle());
96+
FastExcel.write().file(file).head(AnnotationData.class).sheet().doWrite(dataStyle());
9797

9898
if (file == fileCsv) {
9999
return;

‎fastexcel/src/test/java/cn/idev/excel/test/core/annotation/AnnotationIndexAndNameDataTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cn.idev.excel.test.core.annotation;
22

3-
import cn.idev.excel.EasyExcel;
3+
import cn.idev.excel.FastExcel;
44
import cn.idev.excel.test.util.TestFileUtil;
55
import java.io.File;
66
import java.util.ArrayList;
@@ -45,8 +45,8 @@ public void t03ReadAndWriteCsv() {
4545
}
4646

4747
private void readAndWrite(File file) {
48-
EasyExcel.write(file, AnnotationIndexAndNameData.class).sheet().doWrite(data());
49-
EasyExcel.read(file, AnnotationIndexAndNameData.class, new AnnotationIndexAndNameDataListener())
48+
FastExcel.write(file, AnnotationIndexAndNameData.class).sheet().doWrite(data());
49+
FastExcel.read(file, AnnotationIndexAndNameData.class, new AnnotationIndexAndNameDataListener())
5050
.sheet()
5151
.doRead();
5252
}

‎fastexcel/src/test/java/cn/idev/excel/test/core/bom/BomDataTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cn.idev.excel.test.core.bom;
22

3-
import cn.idev.excel.EasyExcel;
3+
import cn.idev.excel.FastExcel;
44
import cn.idev.excel.context.AnalysisContext;
55
import cn.idev.excel.metadata.data.ReadCellData;
66
import cn.idev.excel.read.listener.ReadListener;
@@ -53,14 +53,14 @@ private void readAndWriteCsv(File file, String charsetName, Boolean withBom) thr
5353
if (charsetName != null) {
5454
charset = Charset.forName(charsetName);
5555
}
56-
EasyExcel.write(new FileOutputStream(file), BomData.class)
56+
FastExcel.write(new FileOutputStream(file), BomData.class)
5757
.charset(charset)
5858
.withBom(withBom)
5959
.excelType(ExcelTypeEnum.CSV)
6060
.sheet()
6161
.doWrite(data());
6262

63-
EasyExcel.read(file, BomData.class, new ReadListener<BomData>() {
63+
FastExcel.read(file, BomData.class, new ReadListener<BomData>() {
6464

6565
private final List<BomData> dataList = Lists.newArrayList();
6666

@@ -89,7 +89,7 @@ public void doAfterAllAnalysed(AnalysisContext context) {
8989
}
9090

9191
private void readCsv(File file) {
92-
EasyExcel.read(file, BomData.class, new ReadListener<BomData>() {
92+
FastExcel.read(file, BomData.class, new ReadListener<BomData>() {
9393

9494
private final List<BomData> dataList = Lists.newArrayList();
9595

0 commit comments

Comments
 (0)