Merge branch 'main' into doc-release-version

Author: delei

.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>

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/read/builder/CsvReaderBuilder.java

@@ -117,6 +117,17 @@ public CsvReaderBuilder nullString(String nullString) {
         return this;
     }
 
+    /**
+     * Specific columns to read
+     *
+     * @param columnIndexes
+     * @return
+     */
+    public CsvReaderBuilder includeColumnIndexes(List<Integer> columnIndexes) {
+        readSheet.setColumnIndexes(columnIndexes);
+        return this;
+    }
+
     /**
      * Sets the escape character.
      *

fesod-sheet/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java

@@ -23,11 +23,13 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.io.FileUtils;
 import org.apache.fesod.sheet.read.builder.ExcelReaderBuilder;
 import org.apache.fesod.sheet.read.builder.ExcelReaderSheetBuilder;
 import org.apache.fesod.sheet.read.listener.ReadListener;
@@ -253,6 +255,30 @@ void testReadSheet_withAllParams_shouldReturnBuilder() {
         Assertions.assertNotNull(builder);
     }
 
+    @Test
+    void testReadCsv_withColumnIndexes_shouldFilterColumns() throws Exception {
+
+        String csvContent = "ID,Name,Age,Gender\n2,Bob,25,Male";
+        File csvFile = tempDir.resolve("test_columns.csv").toFile();
+        FileUtils.writeStringToFile(csvFile, csvContent, StandardCharsets.UTF_8);
+
+        List<Integer> targetColumns = Arrays.asList(0, 2);
+
+        List<Map<Integer, String>> readResults = FesodSheet.read(csvFile)
+                .csv()
+                .includeColumnIndexes(targetColumns)
+                .doReadSync();
+
+        Assertions.assertNotNull(readResults);
+        Assertions.assertEquals(1, readResults.size());
+
+        Map<Integer, String> row1 = readResults.get(0);
+        Assertions.assertEquals(
+                2, row1.size(), "Should only contain the 1 filtered columns (excepting the head by default)");
+        Assertions.assertEquals("2", row1.get(0));
+        Assertions.assertEquals("25", row1.get(1));
+    }
+
     @Test
     void testReadSheet_withColumnIndexes_shouldConfigureAll() {
 

pom.xml

@@ -99,7 +99,7 @@
         <slf4j-api.version>1.7.36</slf4j-api.version>
         <lombok.version>1.18.44</lombok.version>
         <spring-core.version>5.3.39</spring-core.version>
-        <fastjson2.version>2.0.63</fastjson2.version>
+        <fastjson2.version>2.0.64</fastjson2.version>
         <spring-boot-starter-web.version>2.7.18</spring-boot-starter-web.version>
         <slf4j-simple.version>1.7.36</slf4j-simple.version>
         <jcl-over-slf4j.version>1.7.36</jcl-over-slf4j.version>

website/docs/quickstart/guide.md

@@ -63,7 +63,6 @@ available versions in the [Maven Central Repository](https://mvnrepository.com/a
 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>

website/docs/sheet/read/spring.md

@@ -37,7 +37,6 @@ parse the data.
 Ensure the necessary dependencies are included in your pom.xml file:
 
 ```xml
-
 <dependency>
     <groupId>org.apache.fesod</groupId>
     <artifactId>fesod</artifactId>

website/i18n/zh-cn/docusaurus-plugin-content-docs/current/quickstart/guide.md

@@ -42,7 +42,6 @@ Apache Fesod(Incubating) 使用了以下核心依赖：
 如果您使用 Maven 进行项目构建，请在 `pom.xml` 文件中引入以下配置：
 
 ```xml
-
 <dependency>
     <groupId>org.apache.fesod</groupId>
     <artifactId>fesod-sheet</artifactId>