Refactor PSSE model to handle optional headers more gracefully, improve CSV parsing logic, and enhance delimiter and quote management in Context

Signed-off-by: Nicolas Rol <[email protected]>

Author: rolnico

psse/psse-model/src/main/java/com/powsybl/psse/model/io/AbstractRecordGroup.java

@@ -328,6 +328,9 @@ List<T> parseRecords(List<String> records, String[] headers, Context context) {
     }
 
     private String[] makeRecordsConsistents(StringBuilder sb, List<String> records, String[] headers, Context context) {
+        if (records.stream().anyMatch(Objects::isNull)) {
+            throw new PsseException("Parsing error");
+        }
         int expectedNumFields = records.stream()
             .mapToInt(rec -> Math.toIntExact(rec.chars().filter(c -> c == context.getDelimiter())
                 .count()))

psse/psse-model/src/main/java/com/powsybl/psse/model/io/Context.java

@@ -61,6 +61,8 @@ public FileFormat getFileFormat() {
 
     public Context setFileFormat(FileFormat fileFormat) {
         this.fileFormat = fileFormat;
+        this.delimiter = fileFormat.getDefaultDelimiter();
+        this.quote = fileFormat.getQuote();
         return this;
     }
 

psse/psse-model/src/main/java/com/powsybl/psse/model/pf/internal/PsseSubstationSwitchingDevice.java

@@ -11,6 +11,8 @@
 import com.powsybl.psse.model.PsseVersion;
 import de.siegmar.fastcsv.reader.CsvRecord;
 
+import java.util.Optional;
+
 import static com.powsybl.psse.model.io.Util.parseDoubleFromRecord;
 import static com.powsybl.psse.model.io.Util.parseIntFromRecord;
 import static com.powsybl.psse.model.io.Util.parseStringFromRecord;
@@ -51,24 +53,36 @@ public static PsseSubstationSwitchingDevice fromRecord(CsvRecord rec, PsseVersio
     public static String[] toRecord(PsseSubstationSwitchingDevice psseSubstationSwitchingDevice, String[] headers) {
         String[] row = new String[headers.length];
         for (int i = 0; i < headers.length; i++) {
-            row[i] = switch (headers[i]) {
-                case "ni", "inode" -> String.valueOf(psseSubstationSwitchingDevice.getNi());
-                case "nj", "jnode" -> String.valueOf(psseSubstationSwitchingDevice.getNj());
-                case "ckt", "swdid" -> String.valueOf(psseSubstationSwitchingDevice.getCkt());
-                case "name" -> psseSubstationSwitchingDevice.getName();
-                case "type" -> String.valueOf(psseSubstationSwitchingDevice.getType());
-                case "stat", "status" -> String.valueOf(psseSubstationSwitchingDevice.getStatus());
-                case "nstat" -> String.valueOf(psseSubstationSwitchingDevice.getNstat());
-                case "x", "xpu" -> String.valueOf(psseSubstationSwitchingDevice.getX());
-                case "rate1" -> String.valueOf(psseSubstationSwitchingDevice.getRate1());
-                case "rate2" -> String.valueOf(psseSubstationSwitchingDevice.getRate2());
-                case "rate3" -> String.valueOf(psseSubstationSwitchingDevice.getRate3());
-                default -> throw new PsseException("Unsupported header: " + headers[i]);
-            };
+            if ("rsetnam".equals(headers[i])) {
+                // This header seems to be expected, but no variable seems consistent with it
+                continue;
+            }
+            Optional<String> optionalValue = psseSubstationSwitchingDevice.headerToString(headers[i]);
+            if (optionalValue.isEmpty()) {
+                throw new PsseException("Unsupported header: " + headers[i]);
+            }
+            row[i] = optionalValue.get();
         }
         return row;
     }
 
+    public Optional<String> headerToString(String header) {
+        return switch (header) {
+            case "ni", "inode" -> Optional.of(String.valueOf(getNi()));
+            case "nj", "jnode" -> Optional.of(String.valueOf(getNj()));
+            case "ckt", "swdid" -> Optional.of(String.valueOf(getCkt()));
+            case "name" -> Optional.of(getName());
+            case "type" -> Optional.of(String.valueOf(getType()));
+            case "stat", "status" -> Optional.of(String.valueOf(getStatus()));
+            case "nstat" -> Optional.of(String.valueOf(getNstat()));
+            case "x", "xpu" -> Optional.of(String.valueOf(getX()));
+            case "rate1" -> Optional.of(String.valueOf(getRate1()));
+            case "rate2" -> Optional.of(String.valueOf(getRate2()));
+            case "rate3" -> Optional.of(String.valueOf(getRate3()));
+            default -> Optional.empty();
+        };
+    }
+
     public int getNi() {
         return ni;
     }

psse/psse-model/src/main/java/com/powsybl/psse/model/pf/internal/PsseSubstationSwitchingDevicex.java

@@ -11,6 +11,8 @@
 import com.powsybl.psse.model.PsseVersion;
 import de.siegmar.fastcsv.reader.CsvRecord;
 
+import java.util.Optional;
+
 import static com.powsybl.psse.model.io.Util.parseIntFromRecord;
 
 /**
@@ -42,18 +44,14 @@ public static String[] toRecord(PsseSubstationSwitchingDevicex psseSubstationSwi
         for (int i = 0; i < headers.length; i++) {
             row[i] = switch (headers[i]) {
                 case "isub" -> String.valueOf(psseSubstationSwitchingDevicex.getIsub());
-                case "ni", "inode" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getNi());
-                case "nj", "jnode" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getNj());
-                case "ckt", "swdid" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getCkt());
-                case "name" -> psseSubstationSwitchingDevicex.getSwitchingDevice().getName();
-                case "type" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getType());
-                case "stat", "status" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getStatus());
-                case "nstat" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getNstat());
-                case "x", "xpu" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getX());
-                case "rate1" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getRate1());
-                case "rate2" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getRate2());
-                case "rate3" -> String.valueOf(psseSubstationSwitchingDevicex.getSwitchingDevice().getRate3());
-                default -> throw new PsseException("Unsupported header: " + headers[i]);
+                case "rsetnam" -> null; // This header seems to be expected, but no variable seems consistent with it
+                default -> {
+                    Optional<String> optionalValue = psseSubstationSwitchingDevicex.getSwitchingDevice().headerToString(headers[i]);
+                    if (optionalValue.isPresent()) {
+                        yield optionalValue.get();
+                    }
+                    throw new PsseException("Unsupported header: " + headers[i]);
+                }
             };
         }
         return row;