refactor: refactor code-style (#149)

psxjoy · web-flow · commit 048cc93c8ecf · 2024-12-21T14:19:05.000+08:00
* feat: update pom.xml * refactor: refactor code style * refactor: Remove Redundant Validation in File Encryption Process * refactor: Remove Redundant Validation in File Encryption Process * refactor: refactor code-style * fix: fix typo by @tanpenggood in 3432
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
@@ -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
@@ -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
@@ -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
@@ -43,8 +43,7 @@ public enum CellDataTypeEnum {
     /**
      * rich text string.Support only when writing.
      */
-    RICH_TEXT_STRING,
-    ;
+    RICH_TEXT_STRING;
 
     private static final Map<String, CellDataTypeEnum> TYPE_ROUTING_MAP = new HashMap<String, CellDataTypeEnum>(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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -60,7 +60,7 @@ private Object buildNoModel(Map<Integer, ReadCellData<?>> 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
@@ -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.
      * <p>
      * 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
@@ -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
@@ -363,7 +363,7 @@ public void writeCellDataWrite() {
         writeCellStyleData.setFillForegroundColor(IndexedColors.GREEN.getIndex());
 
         // 设置单个单元格多种样式
-        // 这里需要设置 inMomery=true 不然会导致无法展示单个单元格多种样式，所以慎用
+        // 这里需要设置 inMemory=true 不然会导致无法展示单个单元格多种样式，所以慎用
         WriteCellData<String> 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/CsvDataListener.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<CsvData> {
+public class CsvDataListener extends AnalysisEventListener<CsvData> {
     @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
@@ -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
@@ -102,7 +102,7 @@
  * and space ("_ ") in the format adds a space to the end and Excel formats this cell as <code>"12.34 "</code>, but
  * <code>DataFormatter</code> trims the formatted value and returns <code>"12.34"</code>.
  * </p>
- * You can enable spaces by passing the <code>emulateCSV=true</code> flag in the <code>DateFormatter</code> cosntructor.
+ * You can enable spaces by passing the <code>emulateCSV=true</code> flag in the <code>DateFormatter</code> 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:
  * <ul>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package cn.idev.excel.enums;`
`2`	`2`
`3`	`3`	`/**`
`4`		`- * cache locaciton`
	`4`	`+ * cache location`
`5`	`5`	`*`
`6`	`6`	`* @author Jiaju Zhuang`
`7`	`7`	`**/`
`@@ -19,5 +19,5 @@ public enum CacheLocationEnum {`
`19`	`19`	`/**`
`20`	`20`	`* No caching.It may lose some of performance.`
`21`	`21`	`*/`
`22`		`- NONE;`
	`22`	`+ NONE`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ public enum CellExtraTypeEnum {`
`17`	`17`	`/**`
`18`	`18`	`* Merge`
`19`	`19`	`*/`
`20`		`- MERGE,;`
	`20`	`+ MERGE`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ public enum HeadKindEnum {`
`17`	`17`	`/**`
`18`	`18`	`* String`
`19`	`19`	`*/`
`20`		`- STRING;`
	`20`	`+ STRING`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ public enum ReadDefaultReturnEnum {`
`31`	`31`	`/**`
`32`	`32`	`* Return to {@link ReadCellData}, can decide which field you need.`
`33`	`33`	`*/`
`34`		`- READ_CELL_DATA,`
`35`		`- ;`
	`34`	`+ READ_CELL_DATA`
`36`	`35`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ public enum WriteLastRowTypeEnum {`
`17`	`17`	`/**`
`18`	`18`	`* Any data has been written;`
`19`	`19`	`*/`
`20`		`- HAS_DATA,;`
	`20`	`+ HAS_DATA`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ public enum WriteTemplateAnalysisCellTypeEnum {`
`13`	`13`	`/**`
`14`	`14`	`* A collection of fields.`
`15`	`15`	`*/`
`16`		`- COLLECTION,;`
	`16`	`+ COLLECTION`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ public enum WriteTypeEnum {`
`13`	`13`	`/**`
`14`	`14`	`* Fill.`
`15`	`15`	`*/`
`16`		`- FILL,;`
	`16`	`+ FILL`
`17`	`17`	`}`