Merge pull request #45 from ywy2090/feature-milestone2

read csv header fields in order
WeBankBlockchain · Sep 9, 2024 · e030f06 · e030f06
2 parents b7cb381 + f187a01
commit e030f06
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/...-components/dataset/src/main/java/com/webank/wedpr/components/dataset/utils/CsvUtils.java b/...-components/dataset/src/main/java/com/webank/wedpr/components/dataset/utils/CsvUtils.java
@@ -1,6 +1,6 @@
 package com.webank.wedpr.components.dataset.utils;
 
-import com.opencsv.CSVReaderHeaderAware;
+import com.opencsv.CSVReader;
 import com.webank.wedpr.components.dataset.datasource.DBType;
 import com.webank.wedpr.components.dataset.datasource.category.DBDataSource;
 import com.webank.wedpr.components.dataset.exception.DatasetException;
@@ -13,9 +13,8 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -43,14 +42,10 @@ public static List<String> readCsvHeader(String csvPath) throws DatasetException
 
         try (BufferedReader bufferedReader =
                         Files.newBufferedReader(Paths.get(csvPath), StandardCharsets.UTF_8);
-                CSVReaderHeaderAware csvReaderHeaderAware =
-                        new CSVReaderHeaderAware(bufferedReader)) {
-            Map<String, String> header = csvReaderHeaderAware.readMap();
+                CSVReader csvReader = new CSVReader(bufferedReader)) {
 
-            List<String> fieldList = new ArrayList<>();
-            for (Map.Entry<String, String> entry : header.entrySet()) {
-                fieldList.add(entry.getKey());
-            }
+            String[] headers = csvReader.readNextSilently();
+            List<String> fieldList = Arrays.asList(headers);
 
             String joinString = String.join(CSV_SEPARATOR, fieldList);
             logger.info(