diff --git a/fastexcel-core/src/main/java/cn/idev/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java b/fastexcel-core/src/main/java/cn/idev/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java index b3a685ffe..5fcf8a63c 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java @@ -33,7 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more */ public class SharedStringsTableHandler extends DefaultHandler { - private static final Pattern UTF_PATTTERN = Pattern.compile("_x([0-9A-Fa-f]{4})_"); + private static final Pattern UTF_PATTERN = Pattern.compile("_x([0-9A-Fa-f]{4})_"); /** * The final piece of data @@ -154,7 +154,7 @@ static String utfDecode(String value) { } StringBuilder buf = new StringBuilder(); - Matcher m = UTF_PATTTERN.matcher(value); + Matcher m = UTF_PATTERN.matcher(value); int idx = 0; while (m.find()) { int pos = m.start(); diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/ByteOrderMarkEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/ByteOrderMarkEnum.java index 3823fb003..dac97d4c9 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/ByteOrderMarkEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/ByteOrderMarkEnum.java @@ -4,7 +4,6 @@ import java.util.Map; import cn.idev.excel.util.MapUtils; - import lombok.Getter; import org.apache.commons.io.ByteOrderMark; @@ -35,9 +34,7 @@ public enum ByteOrderMarkEnum { /** * UTF_32LE */ - UTF_32LE(ByteOrderMark.UTF_32LE), - - ; + UTF_32LE(ByteOrderMark.UTF_32LE); final ByteOrderMark byteOrderMark; final String stringPrefix; diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/CacheLocationEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/CacheLocationEnum.java index 34a47de40..7d5e293d4 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/CacheLocationEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/CacheLocationEnum.java @@ -1,7 +1,7 @@ package cn.idev.excel.enums; /** - * cache locaciton + * cache location * * @author Jiaju Zhuang **/ @@ -19,5 +19,5 @@ public enum CacheLocationEnum { /** * No caching.It may lose some of performance. */ - NONE; + NONE } diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/CellDataTypeEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/CellDataTypeEnum.java index a03cb7ba2..66f2f257e 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/CellDataTypeEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/CellDataTypeEnum.java @@ -43,8 +43,7 @@ public enum CellDataTypeEnum { /** * rich text string.Support only when writing. */ - RICH_TEXT_STRING, - ; + RICH_TEXT_STRING; private static final Map TYPE_ROUTING_MAP = new HashMap(16); diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/CellExtraTypeEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/CellExtraTypeEnum.java index fd782333d..9408a5c91 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/CellExtraTypeEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/CellExtraTypeEnum.java @@ -17,5 +17,5 @@ public enum CellExtraTypeEnum { /** * Merge */ - MERGE,; + MERGE } diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/HeadKindEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/HeadKindEnum.java index a65023f4b..6678a85ff 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/HeadKindEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/HeadKindEnum.java @@ -17,5 +17,5 @@ public enum HeadKindEnum { /** * String */ - STRING; + STRING } diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/ReadDefaultReturnEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/ReadDefaultReturnEnum.java index de4505052..c724b6329 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/ReadDefaultReturnEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/ReadDefaultReturnEnum.java @@ -31,7 +31,6 @@ public enum ReadDefaultReturnEnum { /** * Return to {@link ReadCellData}, can decide which field you need. */ - READ_CELL_DATA, - ; + READ_CELL_DATA } diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteLastRowTypeEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteLastRowTypeEnum.java index 21d029eb4..ac4bb89d1 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteLastRowTypeEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteLastRowTypeEnum.java @@ -17,5 +17,5 @@ public enum WriteLastRowTypeEnum { /** * Any data has been written; */ - HAS_DATA,; + HAS_DATA } diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteTemplateAnalysisCellTypeEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteTemplateAnalysisCellTypeEnum.java index 27e9b7d44..e65c255f9 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteTemplateAnalysisCellTypeEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteTemplateAnalysisCellTypeEnum.java @@ -13,5 +13,5 @@ public enum WriteTemplateAnalysisCellTypeEnum { /** * A collection of fields. */ - COLLECTION,; + COLLECTION } diff --git a/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteTypeEnum.java b/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteTypeEnum.java index ef3e10fc4..bcf4d97fe 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteTypeEnum.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/enums/WriteTypeEnum.java @@ -13,5 +13,5 @@ public enum WriteTypeEnum { /** * Fill. */ - FILL,; + FILL } diff --git a/fastexcel-core/src/main/java/cn/idev/excel/read/listener/ModelBuildEventListener.java b/fastexcel-core/src/main/java/cn/idev/excel/read/listener/ModelBuildEventListener.java index 3b20ef554..812ae70c1 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/read/listener/ModelBuildEventListener.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/read/listener/ModelBuildEventListener.java @@ -60,7 +60,7 @@ private Object buildNoModel(Map> cellDataMap, ReadSheet (String) ConverterUtils.convertToJavaObject(cellData, null, null, readSheetHolder.converterMap(), context, context.readRowHolder().getRowIndex(), key)); } else { - // retrun ReadCellData + // return ReadCellData ReadCellData convertedReadCellData = convertReadCellData(cellData, context.readWorkbookHolder().getReadDefaultReturn(), readSheetHolder, context, key); if (readDefaultReturn == ReadDefaultReturnEnum.READ_CELL_DATA) { diff --git a/fastexcel-core/src/main/java/cn/idev/excel/read/metadata/ReadWorkbook.java b/fastexcel-core/src/main/java/cn/idev/excel/read/metadata/ReadWorkbook.java index a103fb112..bfcd8f55f 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/read/metadata/ReadWorkbook.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/read/metadata/ReadWorkbook.java @@ -10,13 +10,12 @@ import cn.idev.excel.cache.ReadCache; import cn.idev.excel.cache.selector.ReadCacheSelector; import cn.idev.excel.cache.selector.SimpleReadCacheSelector; +import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.enums.CellExtraTypeEnum; import cn.idev.excel.enums.ReadDefaultReturnEnum; import cn.idev.excel.event.AnalysisEventListener; -import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.read.listener.ModelBuildEventListener; import cn.idev.excel.support.ExcelTypeEnum; - import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; @@ -97,7 +96,7 @@ public class ReadWorkbook extends ReadBasicParameter { * Whether to use the default listener, which is used by default. *

* The {@link ModelBuildEventListener} is loaded by default to convert the object. - * defualt is true. + * default is true. */ private Boolean useDefaultListener; diff --git a/fastexcel-core/src/main/java/cn/idev/excel/util/StyleUtil.java b/fastexcel-core/src/main/java/cn/idev/excel/util/StyleUtil.java index b6c3478aa..366a3008e 100644 --- a/fastexcel-core/src/main/java/cn/idev/excel/util/StyleUtil.java +++ b/fastexcel-core/src/main/java/cn/idev/excel/util/StyleUtil.java @@ -127,7 +127,7 @@ public static short buildDataFormat(Workbook workbook, DataFormatData dataFormat } if (StringUtils.isNotBlank(dataFormatData.getFormat())) { if (log.isDebugEnabled()) { - log.info("create new data fromat:{}", dataFormatData); + log.info("create new data format:{}", dataFormatData); } DataFormat dataFormatCreate = workbook.createDataFormat(); return dataFormatCreate.getFormat(dataFormatData.getFormat()); diff --git a/fastexcel-test/src/test/java/cn/idev/excel/test/demo/write/WriteTest.java b/fastexcel-test/src/test/java/cn/idev/excel/test/demo/write/WriteTest.java index 510614800..e05dc738d 100644 --- a/fastexcel-test/src/test/java/cn/idev/excel/test/demo/write/WriteTest.java +++ b/fastexcel-test/src/test/java/cn/idev/excel/test/demo/write/WriteTest.java @@ -363,7 +363,7 @@ public void writeCellDataWrite() { writeCellStyleData.setFillForegroundColor(IndexedColors.GREEN.getIndex()); // 设置单个单元格多种样式 - // 这里需要设置 inMomery=true 不然会导致无法展示单个单元格多种样式,所以慎用 + // 这里需要设置 inMemory=true 不然会导致无法展示单个单元格多种样式,所以慎用 WriteCellData richTest = new WriteCellData<>(); richTest.setType(CellDataTypeEnum.RICH_TEXT_STRING); writeCellDemoData.setRichText(richTest); diff --git a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvDataListeer.java b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvDataListener.java similarity index 86% rename from fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvDataListeer.java rename to fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvDataListener.java index 89aa632e6..9aafafd22 100644 --- a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvDataListeer.java +++ b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvDataListener.java @@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j -public class CsvDataListeer extends AnalysisEventListener { +public class CsvDataListener extends AnalysisEventListener { @Override public void invoke(CsvData data, AnalysisContext context) { log.info("data:{}", JSON.toJSONString(data)); diff --git a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvReadTest.java b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvReadTest.java index f82fd949c..b6e47cd05 100644 --- a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvReadTest.java +++ b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/csv/CsvReadTest.java @@ -72,7 +72,7 @@ public void writev2() throws Exception { // 如果这里想使用03 则 传入excelType参数即可 EasyExcel.write(fileName, CsvData.class).sheet().doWrite(data()); - EasyExcel.read(fileName, CsvData.class, new CsvDataListeer()).sheet().doRead(); + EasyExcel.read(fileName, CsvData.class, new CsvDataListener()).sheet().doRead(); } @Test diff --git a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/dataformat/DataFormatter1.java b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/dataformat/DataFormatter1.java index c7a3342c1..8b074b3c2 100644 --- a/fastexcel-test/src/test/java/cn/idev/excel/test/temp/dataformat/DataFormatter1.java +++ b/fastexcel-test/src/test/java/cn/idev/excel/test/temp/dataformat/DataFormatter1.java @@ -102,7 +102,7 @@ * and space ("_ ") in the format adds a space to the end and Excel formats this cell as "12.34 ", but * DataFormatter trims the formatted value and returns "12.34". *

- * You can enable spaces by passing the emulateCSV=true flag in the DateFormatter cosntructor. + * You can enable spaces by passing the emulateCSV=true flag in the DateFormatter constructor. * If set to true, then the output tries to conform to what you get when you take an xls or xlsx in Excel and Save As * CSV file: *