fix: corrected issues from deps update

tglman · tglman · commit 1b0468007f38 · 2026-03-16T22:01:11.000+07:00
diff --git a/etl/src/main/java/com/orientechnologies/orient/etl/extractor/OETLCSVExtractor.java b/etl/src/main/java/com/orientechnologies/orient/etl/extractor/OETLCSVExtractor.java
@@ -36,6 +36,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVFormat.Builder;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 
@@ -90,19 +91,20 @@ public String getUnit() {
   public void configure(ODocument iConfiguration, OCommandContext iContext) {
     super.configure(iConfiguration, iContext);
 
-    csvFormat =
+    Builder builder =
         CSVFormat.newFormat(',')
-            .withNullString(NULL_STRING)
-            .withEscape('\\')
-            .withQuote('"')
-            .withCommentMarker('#');
+            .builder()
+            .setNullString(NULL_STRING)
+            .setEscape('\\')
+            .setQuote('"')
+            .setCommentMarker('#');
 
     if (iConfiguration.containsField("predefinedFormat")) {
-      csvFormat = CSVFormat.valueOf(iConfiguration.<String>field("predefinedFormat"));
+      builder = CSVFormat.valueOf(iConfiguration.<String>field("predefinedFormat")).builder();
     }
 
     if (iConfiguration.containsField("separator")) {
-      csvFormat = csvFormat.withDelimiter(iConfiguration.field("separator").toString().charAt(0));
+      builder = builder.setDelimiter(iConfiguration.field("separator").toString().charAt(0));
     }
 
     if (iConfiguration.containsField("dateFormat")) {
@@ -114,21 +116,24 @@ public void configure(ODocument iConfiguration, OCommandContext iContext) {
 
     if (iConfiguration.containsField("ignoreEmptyLines")) {
       boolean ignoreEmptyLines = iConfiguration.field("ignoreEmptyLines");
-      csvFormat = csvFormat.withIgnoreEmptyLines(ignoreEmptyLines);
+      builder = builder.setIgnoreEmptyLines(ignoreEmptyLines);
     }
 
     if (iConfiguration.containsField("ignoreMissingColumns")) {
       boolean ignoreMissingColumns = iConfiguration.field("ignoreMissingColumns");
-      csvFormat = csvFormat.withAllowMissingColumnNames(ignoreMissingColumns);
+      builder = builder.setAllowMissingColumnNames(ignoreMissingColumns);
     }
 
     if (iConfiguration.containsField("columnsOnFirstLine")) {
       Boolean columnsOnFirstLine = (Boolean) iConfiguration.field("columnsOnFirstLine");
       if (columnsOnFirstLine.equals(Boolean.TRUE)) {
-        csvFormat = csvFormat.withHeader();
+        builder = builder.setHeader();
+      } else {
+        builder = builder.setAllowMissingColumnNames(true);
       }
     } else {
-      csvFormat = csvFormat.withHeader();
+      builder = builder.setHeader();
+      builder = builder.setAllowMissingColumnNames(true);
     }
 
     if (iConfiguration.containsField("columns")) {
@@ -147,7 +152,8 @@ public void configure(ODocument iConfiguration, OCommandContext iContext) {
       }
 
       log(Level.INFO, "column types: %s", columnTypes);
-      csvFormat = csvFormat.withHeader(columnNames.toArray(new String[] {})).withSkipHeaderRecord();
+      builder = builder.setHeader(columnNames.toArray(new String[] {}));
+      builder = builder.setSkipHeaderRecord(true);
     }
 
     if (iConfiguration.containsField("skipFrom")) {
@@ -160,23 +166,24 @@ public void configure(ODocument iConfiguration, OCommandContext iContext) {
 
     if (iConfiguration.containsField("nullValue")) {
       nullValue = iConfiguration.<String>field("nullValue");
-      csvFormat = csvFormat.withNullString(nullValue);
+      builder = builder.setNullString(nullValue);
     }
 
     if (iConfiguration.containsField("quote")) {
       final String value = iConfiguration.field("quote").toString();
       if (!value.isEmpty()) {
-        csvFormat = csvFormat.withQuote(value.charAt(0));
+        builder = builder.setQuote(value.charAt(0));
       }
     }
+    csvFormat = builder.get();
   }
 
   @Override
   public void extract(final Reader iReader) {
     super.extract(iReader);
     try {
 
-      CSVParser parser = new CSVParser(iReader, csvFormat);
+      CSVParser parser = CSVParser.parse(iReader, csvFormat);
 
       recordIterator = parser.iterator();
     } catch (IOException e) {
diff --git a/etl/src/test/java/com/orientechnologies/orient/etl/extractor/OETLCSVExtractorTest.java b/etl/src/test/java/com/orientechnologies/orient/etl/extractor/OETLCSVExtractorTest.java
@@ -538,7 +538,7 @@ public void testCsvParsingFormat() {
   @Test
   public void testMissingColumns() {
     String cfgJson =
-        "{source: { content: { value: 'name,value,,\nfrank,myvalue,,'} }, extractor : { csv : { \"ignoreMissingColumns\": true } }, loader : { test: {} } }";
+        "{source: { content: { value: 'name,value,\nfrank,myvalue,'} }, extractor : { csv : { \"ignoreMissingColumns\": true } }, loader : { test: {} } }";
     configure(cfgJson);
     proc.execute();
 
