Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
8 changes: 4 additions & 4 deletions fastexcel/src/main/java/cn/idev/excel/util/BeanMapUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand All @@ -62,7 +62,7 @@ public class EasyExcelTempFileCreationStrategy implements TempFileCreationStrate
*
* @see File#createTempFile(String, String)
*/
public EasyExcelTempFileCreationStrategy() {
public FastExcelTempFileCreationStrategy() {
this(null);
}

Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion fastexcel/src/main/java/cn/idev/excel/util/FileUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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<BomData>() {
FastExcel.read(file, BomData.class, new ReadListener<BomData>() {

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

Expand Down Expand Up @@ -89,7 +89,7 @@ public void doAfterAllAnalysed(AnalysisContext context) {
}

private void readCsv(File file) {
EasyExcel.read(file, BomData.class, new ReadListener<BomData>() {
FastExcel.read(file, BomData.class, new ReadListener<BomData>() {

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

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -53,8 +53,8 @@ public void t01ReadAndWrite() throws Exception {
ThreadLocal<Map<Class<?>, FieldCache>> fieldThreadLocal =
(ThreadLocal<Map<Class<?>, 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<DemoData>(dataList -> {
FastExcel.write(file07, CacheData.class).sheet().doWrite(data());
FastExcel.read(file07, CacheData.class, new PageReadListener<DemoData>(dataList -> {
Assertions.assertNotNull(fieldThreadLocal.get());
}))
.sheet()
Expand All @@ -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<CacheInvokeData>() {
FastExcel.write(fileCacheInvoke, CacheInvokeData.class).sheet().doWrite(dataInvoke());
FastExcel.read(fileCacheInvoke, CacheInvokeData.class, new AnalysisEventListener<CacheInvokeData>() {

@Override
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
Expand All @@ -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<CacheInvokeData>() {
FastExcel.write(fileCacheInvoke2, CacheInvokeData.class).sheet().doWrite(dataInvoke());
FastExcel.read(fileCacheInvoke2, CacheInvokeData.class, new AnalysisEventListener<CacheInvokeData>() {

@Override
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
Expand All @@ -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<CacheInvokeMemoryData>() {
Expand Down Expand Up @@ -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<CacheInvokeMemoryData>() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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<CharsetData>() {
FastExcel.write(fileCsvError, CharsetData.class).charset(GBK).sheet().doWrite(data());
FastExcel.read(fileCsvError, CharsetData.class, new ReadListener<CharsetData>() {

private final List<CharsetData> dataList = Lists.newArrayList();

Expand All @@ -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<CharsetData>() {
FastExcel.write(file, CharsetData.class).charset(charset).sheet().doWrite(data());
FastExcel.read(file, CharsetData.class, new ReadListener<CharsetData>() {

private final List<CharsetData> dataList = Lists.newArrayList();

Expand Down
Loading