Merge branch 'main' into feature-issues-854

Author: bengbengbalabalabeng

.github/instructions/code-review.instructions.md

@@ -18,7 +18,6 @@ The project targets Java 8 (`source/target = 1.8`) but CI runs on JDK 8 through
 
 Builder methods that accept or return mutable collections must protect internal state:
 
-- **`head(Consumer)` pattern**: When `AbstractParameterBuilder.head(Consumer<HeadBuilder>)` stores the result of `DefaultHeadBuilder.define()`, it must wrap it with `toMutableListIfNecessary()` to create a defensive copy. Otherwise, `ExcelHeadProperty.initHeadRowNumber()` will mutate the builder's internal list during write, corrupting subsequent reuses.
 - **General rule**: Any builder method that stores a collection from an external source must copy it. Any getter that returns an internal collection should document whether it's modifiable.
 
 ### 3. Input Validation & Boundary Values
@@ -57,6 +56,7 @@ The same operation may be implemented in multiple places. When fixing a bug in o
 - **License header**: Every new `.java` file must have the ASF Apache 2.0 header (see `tools/spotless/license-header.txt`). License headers are enforced by the Hawkeye workflow (`.github/workflows/license-check.yml`), not Spotless.
 - **Package naming**: All code must be under `org.apache.fesod.*`. Never use `com.alibaba.*` or `cn.idev.*` (legacy packages from EasyExcel era).
 - **Lombok**: `toString.callSuper = CALL` and `equalsAndHashCode.callSuper = CALL` are enforced via `lombok.config`. Subclasses must call super.
+- **No wildcard imports**: Avoid using wildcard imports (e.g., `import java.util.*;`). Always import classes individually. This enhances code readability, makes dependencies explicit, and prevents class name collisions during library upgrades.
 - **No checked exceptions in public API**: Wrap checked exceptions in `ExcelGenerateException` or `ExcelAnalysisException` rather than declaring `throws` on builder methods.
 
 ### 8. Common Pitfalls (from real bug fixes)
@@ -66,6 +66,5 @@ The same operation may be implemented in multiple places. When fixing a bug in o
 | `value.toInstant()` on `java.sql.Date`/`Time` | `UnsupportedOperationException` on Java 9+ | Use `instanceof` + `toLocalDate()`/`toLocalTime()` |
 | `value == -1` validation | Misses other negative values | Check `value == null` or `value < 0` |
 | `try { setThreadLocal(x); } finally { setThreadLocal(null); }` | Clears state needed by later phase | Remove premature cleanup; clean up at end of full operation |
-| `parameter().setHead(DefaultHeadBuilder.define(c))` | Stores internal list reference | Wrap with `toMutableListIfNecessary()` |
 | `new FileWriter(file)` in tests | Platform-default charset | Use `Files.newBufferedWriter(path, StandardCharsets.UTF_8)` |
 | `new FileOutputStream(file)` outside try-with-resources | Resource leak on exception | Wrap in `try (FileOutputStream fos = new FileOutputStream(file)) { ... }` |

.github/skills/fastexcel-to-fesod/SKILL.md

@@ -69,7 +69,6 @@ with deprecation warnings. It is always safe to stop here first and run tests.
 In `pom.xml`, find the FastExcel dependency block:
 
 ```xml
-
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
@@ -80,7 +79,6 @@ In `pom.xml`, find the FastExcel dependency block:
 Replace it with:
 
 ```xml
-
 <dependency>
     <groupId>org.apache.fesod</groupId>
     <artifactId>fesod-sheet</artifactId>
@@ -91,7 +89,6 @@ Replace it with:
 Also remove the FastExcel version property if it exists, e.g.:
 
 ```xml
-
 <fastexcel.version>1.3.0</fastexcel.version>
 ```
 

README.md

@@ -77,7 +77,6 @@ new features in the latest version will enhance your experience.
 If you are using Maven for project building, add the following configuration in the `pom.xml` file:
 
 ```xml
-
 <dependency>
     <groupId>org.apache.fesod</groupId>
     <artifactId>fesod-sheet</artifactId>
@@ -188,10 +187,6 @@ list.
 |:----------------------------------------------------|:--------------------------------------------------------------------------------------------------------------|
 | [dev@fesod.apache.org](mailto:dev@fesod.apache.org) | [Subscribe](mailto:dev-subscribe@fesod.apache.org)  ｜  [Unsubscribe](mailto:dev-unsubscribe@fesod.apache.org) |
 
-### Star History
-
-[![Star History Chart](https://api.star-history.com/svg?repos=apache/fesod&type=Date)](https://www.star-history.com/#apache/fesod&Date)
-
 ## License
 
 Apache Fesod (Incubating) project is licensed under the [Apache License 2.0](LICENSE).

README_CN.md

@@ -170,10 +170,6 @@ public static void main(String[] args) {
 |:----------------------------------------------------|:--------------------------------------------------------------------------------------------------------------|
 | [dev@fesod.apache.org](mailto:dev@fesod.apache.org) | [订阅](mailto:dev-subscribe@fesod.apache.org)  ｜  [取消订阅](mailto:dev-unsubscribe@fesod.apache.org) |
 
-### Star 历史
-
-[![Star History Chart](https://api.star-history.com/svg?repos=apache/fesod&type=Date)](https://www.star-history.com/#apache/fesod&Date)
-
 ## 许可证
 
 Apache Fesod (Incubating) 项目采用 [Apache License 2.0](LICENSE) 许可证。

fesod-examples/fesod-sheet-examples/src/main/java/org/apache/fesod/sheet/examples/util/ExampleDataGenerator.java

@@ -55,7 +55,7 @@ public static List<Date> generateDates(int count) {
         List<Date> list = new ArrayList<>();
         long now = System.currentTimeMillis();
         for (int i = 0; i < count; i++) {
-            list.add(new Date(now + i * 1000 * 60 * 60 * 24));
+            list.add(new Date(now + (long) i * 1000 * 60 * 60 * 24));
         }
         return list;
     }

fesod-sheet/src/main/java/org/apache/fesod/sheet/analysis/csv/CsvExcelReadExecutor.java

@@ -223,13 +223,28 @@ private void dealRecord(CSVRecord record, int rowIndex) {
                 csvReadContext.csvReadWorkbookHolder().globalConfiguration().getAutoTrim();
         Boolean autoStrip =
                 csvReadContext.csvReadWorkbookHolder().globalConfiguration().getAutoStrip();
+        List<Integer> includeColumnIndexes =
+                csvReadContext.readSheetHolder().getReadSheet().getColumnIndexes();
+
         while (cellIterator.hasNext()) {
             String cellString = cellIterator.next();
+            int currentColumnIndex = columnIndex++;
+            int targetColumnIndex;
+
+            if (includeColumnIndexes == null) {
+                targetColumnIndex = currentColumnIndex;
+            } else {
+                targetColumnIndex = includeColumnIndexes.indexOf(currentColumnIndex);
+                if (targetColumnIndex < 0) {
+                    continue;
+                }
+            }
+
             ReadCellData<String> readCellData = new ReadCellData<>();
             readCellData.setRowIndex(rowIndex);
-            readCellData.setColumnIndex(columnIndex);
 
-            // csv is an empty string of whether <code>,,</code> is read or <code>,"",</code>
+            readCellData.setColumnIndex(targetColumnIndex);
+
             if (StringUtils.isNotBlank(cellString)) {
                 readCellData.setType(CellDataTypeEnum.STRING);
                 if (autoStrip) {
@@ -242,7 +257,8 @@ private void dealRecord(CSVRecord record, int rowIndex) {
             } else {
                 readCellData.setType(CellDataTypeEnum.EMPTY);
             }
-            cellMap.put(columnIndex++, readCellData);
+
+            cellMap.put(targetColumnIndex, readCellData);
         }
 
         RowTypeEnum rowType = MapUtils.isEmpty(cellMap) ? RowTypeEnum.EMPTY : RowTypeEnum.DATA;

fesod-sheet/src/main/java/org/apache/fesod/sheet/analysis/v07/handlers/CellTagHandler.java

@@ -33,6 +33,7 @@
 import org.apache.fesod.sheet.constant.FesodSheetConstants;
 import org.apache.fesod.sheet.context.xlsx.XlsxReadContext;
 import org.apache.fesod.sheet.enums.CellDataTypeEnum;
+import org.apache.fesod.sheet.exception.ExcelAnalysisException;
 import org.apache.fesod.sheet.metadata.GlobalConfiguration;
 import org.apache.fesod.sheet.metadata.data.ReadCellData;
 import org.apache.fesod.sheet.read.metadata.holder.xlsx.XlsxReadSheetHolder;
@@ -49,8 +50,8 @@ public class CellTagHandler extends AbstractXlsxTagHandler {
     @Override
     public void startElement(XlsxReadContext xlsxReadContext, String name, Attributes attributes) {
         XlsxReadSheetHolder xlsxReadSheetHolder = xlsxReadContext.xlsxReadSheetHolder();
-        xlsxReadSheetHolder.setColumnIndex(PositionUtils.getCol(
-                attributes.getValue(ExcelXmlConstants.ATTRIBUTE_R), xlsxReadSheetHolder.getColumnIndex()));
+        String cellReference = attributes.getValue(ExcelXmlConstants.ATTRIBUTE_R);
+        xlsxReadSheetHolder.setColumnIndex(PositionUtils.getCol(cellReference, xlsxReadSheetHolder.getColumnIndex()));
 
         // t="s" ,it means String
         // t="str" ,it means String,but does not need to be read in the 'sharedStrings.xml'
@@ -59,7 +60,11 @@ public void startElement(XlsxReadContext xlsxReadContext, String name, Attribute
         // t="e" ,it means Error
         // t="n" ,it means Number
         // t is null ,it means Empty or Number
-        CellDataTypeEnum type = CellDataTypeEnum.buildFromCellType(attributes.getValue(ExcelXmlConstants.ATTRIBUTE_T));
+        String cellType = attributes.getValue(ExcelXmlConstants.ATTRIBUTE_T);
+        CellDataTypeEnum type = CellDataTypeEnum.buildFromCellType(cellType);
+        if (type == null) {
+            throw new ExcelAnalysisException("Invalid cell data type: '" + cellType + "' in cell " + cellReference);
+        }
         xlsxReadSheetHolder.setTempCellData(new ReadCellData<>(type));
         xlsxReadSheetHolder.setTempData(new StringBuilder());
 

fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/DefaultConverterLoader.java

@@ -25,6 +25,8 @@
 
 package org.apache.fesod.sheet.converters;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.fesod.common.util.MapUtils;
 import org.apache.fesod.sheet.converters.ConverterKeyBuild.ConverterKey;
@@ -139,6 +141,7 @@ private static void initAllConverter() {
         putAllConverter(new StringNumberConverter());
         putAllConverter(new StringStringConverter());
         putAllConverter(new StringErrorConverter());
+        allConverter = Collections.unmodifiableMap(allConverter);
     }
 
     private static void initDefaultWriteConverter() {
@@ -176,6 +179,7 @@ private static void initDefaultWriteConverter() {
         putWriteStringConverter(new LongStringConverter());
         putWriteStringConverter(new ShortStringConverter());
         putWriteStringConverter(new StringStringConverter());
+        defaultWriteConverter = Collections.unmodifiableMap(defaultWriteConverter);
     }
 
     /**
@@ -187,6 +191,15 @@ public static Map<ConverterKey, Converter<?>> loadDefaultWriteConverter() {
         return defaultWriteConverter;
     }
 
+    /**
+     * Copy default write converter
+     *
+     * @return
+     */
+    public static Map<ConverterKey, Converter<?>> copyDefaultWriteConverter() {
+        return new HashMap<>(loadDefaultWriteConverter());
+    }
+
     private static void putWriteConverter(Converter<?> converter) {
         defaultWriteConverter.put(ConverterKeyBuild.buildKey(converter.supportJavaTypeKey()), converter);
     }
@@ -205,6 +218,15 @@ public static Map<ConverterKey, Converter<?>> loadDefaultReadConverter() {
         return loadAllConverter();
     }
 
+    /**
+     * Copy default read converter
+     *
+     * @return
+     */
+    public static Map<ConverterKey, Converter<?>> copyDefaultReadConverter() {
+        return new HashMap<>(loadDefaultReadConverter());
+    }
+
     /**
      * Load all converter
      *
@@ -214,6 +236,15 @@ public static Map<ConverterKey, Converter<?>> loadAllConverter() {
         return allConverter;
     }
 
+    /**
+     * Copy all converter
+     *
+     * @return
+     */
+    public static Map<ConverterKey, Converter<?>> copyAllConverter() {
+        return new HashMap<>(loadAllConverter());
+    }
+
     private static void putAllConverter(Converter<?> converter) {
         allConverter.put(
                 ConverterKeyBuild.buildKey(converter.supportJavaTypeKey(), converter.supportExcelTypeKey()), converter);

fesod-sheet/src/main/java/org/apache/fesod/sheet/enums/CellDataTypeEnum.java

@@ -83,8 +83,9 @@ public enum CellDataTypeEnum {
     /**
      * Build data types
      *
-     * @param cellType
-     * @return
+     * @param cellType the raw {@code t} attribute value of a cell
+     * @return the matching type, {@link #EMPTY} when {@code cellType} is empty, or {@code null} when
+     *         {@code cellType} is not a recognized type; callers are expected to handle the {@code null} case.
      */
     public static CellDataTypeEnum buildFromCellType(String cellType) {
         if (StringUtils.isEmpty(cellType)) {

fesod-sheet/src/main/java/org/apache/fesod/sheet/metadata/CellExtra.java

@@ -25,6 +25,8 @@
 
 package org.apache.fesod.sheet.metadata;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.fesod.sheet.constant.ExcelXmlConstants;
 import org.apache.fesod.sheet.enums.CellExtraTypeEnum;
 import org.apache.poi.ss.util.CellReference;
@@ -34,6 +36,8 @@
  *
  *
  */
+@Getter
+@Setter
 public class CellExtra extends AbstractCell {
     /**
      * Cell extra type
@@ -99,52 +103,4 @@ public CellExtra(
         this.lastRowIndex = lastRowIndex;
         this.lastColumnIndex = lastColumnIndex;
     }
-
-    public CellExtraTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CellExtraTypeEnum type) {
-        this.type = type;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public Integer getFirstRowIndex() {
-        return firstRowIndex;
-    }
-
-    public void setFirstRowIndex(Integer firstRowIndex) {
-        this.firstRowIndex = firstRowIndex;
-    }
-
-    public Integer getFirstColumnIndex() {
-        return firstColumnIndex;
-    }
-
-    public void setFirstColumnIndex(Integer firstColumnIndex) {
-        this.firstColumnIndex = firstColumnIndex;
-    }
-
-    public Integer getLastRowIndex() {
-        return lastRowIndex;
-    }
-
-    public void setLastRowIndex(Integer lastRowIndex) {
-        this.lastRowIndex = lastRowIndex;
-    }
-
-    public Integer getLastColumnIndex() {
-        return lastColumnIndex;
-    }
-
-    public void setLastColumnIndex(Integer lastColumnIndex) {
-        this.lastColumnIndex = lastColumnIndex;
-    }
 }