Replace univocity parsers with FastCSV for CSV handling - PSSE

pom.xml

@@ -110,6 +110,7 @@
         <commonsmath3.version>3.6.1</commonsmath3.version>
         <commonstext.version>1.13.1</commonstext.version>
         <ejml.version>0.44.0</ejml.version>
+        <fastcsv.version>4.0.0</fastcsv.version>
         <!-- findbugs cannot be updated until graphviz is updated/replaced since findbugs groupdId changed -->
         <findbugs-annotations.version>3.0.1</findbugs-annotations.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
@@ -745,6 +746,11 @@
                 <artifactId>commons-io</artifactId>
                 <version>${commonsio.version}</version>
             </dependency>
+            <dependency>
+                <groupId>de.siegmar</groupId>
+                <artifactId>fastcsv</artifactId>
+                <version>${fastcsv.version}</version>
+            </dependency>
             <dependency>
                 <groupId>gov.nist.math</groupId>
                 <artifactId>jama</artifactId>

psse/psse-converter/src/main/java/com/powsybl/psse/converter/AbstractConverter.java

@@ -16,6 +16,7 @@
 import com.powsybl.iidm.network.util.Networks;
 import com.powsybl.psse.model.PsseException;
 import com.powsybl.psse.model.pf.*;
+import com.powsybl.psse.model.pf.internal.PsseSubstationSwitchingDevice;
 import org.apache.commons.math3.complex.Complex;
 
 import com.powsybl.iidm.network.util.ContainersMapping;
@@ -191,7 +192,7 @@ static String getVscConverterId(Network network, PsseVoltageSourceConverterDcTra
         return Identifiables.getUniqueId("VscConverter-" + converter.getIbus() + "-" + psseVscDcTransmissionLine.getName(), id -> network.getVscConverterStation(id) != null);
     }
 
-    static String getSwitchId(String voltageLevelId, PsseSubstation.PsseSubstationSwitchingDevice switchingDevice) {
+    static String getSwitchId(String voltageLevelId, PsseSubstationSwitchingDevice switchingDevice) {
         return voltageLevelId + "-Sw-" + switchingDevice.getNi() + "-" + switchingDevice.getNj() + "-" + switchingDevice.getCkt();
     }
 

psse/psse-converter/src/main/java/com/powsybl/psse/converter/NodeBreakerValidation.java

@@ -8,8 +8,8 @@
 package com.powsybl.psse.converter;
 
 import com.powsybl.psse.model.pf.*;
-import com.powsybl.psse.model.pf.PsseSubstation.PsseSubstationNode;
 import com.powsybl.psse.model.PsseVersion;
+import com.powsybl.psse.model.pf.internal.PsseSubstationNode;
 import org.jgrapht.Graph;
 import org.jgrapht.alg.connectivity.ConnectivityInspector;
 import org.jgrapht.alg.util.Pair;

psse/psse-converter/src/main/java/com/powsybl/psse/converter/TransformerConverter.java

@@ -15,6 +15,7 @@
 import com.powsybl.psse.model.PsseException;
 import com.powsybl.psse.model.PsseVersion;
 import com.powsybl.psse.model.pf.*;
+import com.powsybl.psse.model.pf.internal.TransformerImpedances;
 import org.apache.commons.math3.complex.Complex;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1163,7 +1164,7 @@ private static PsseTransformer createDefaultTransformer() {
     }
 
     private static void createDefaultTransformerImpedances(PsseTransformer psseTransformer) {
-        psseTransformer.setImpedances(new PsseTransformer.TransformerImpedances());
+        psseTransformer.setImpedances(new TransformerImpedances());
         psseTransformer.setR12(0.0);
         psseTransformer.setX12(0.0);
         psseTransformer.setSbase12(0.0);

psse/psse-converter/src/main/java/com/powsybl/psse/converter/VoltageLevelConverter.java

@@ -18,9 +18,10 @@
 import com.powsybl.psse.model.pf.PsseBus;
 import com.powsybl.psse.model.pf.PssePowerFlowModel;
 import com.powsybl.psse.model.pf.PsseSubstation;
-import com.powsybl.psse.model.pf.PsseSubstation.PsseSubstationNode;
-import com.powsybl.psse.model.pf.PsseSubstation.PsseSubstationSwitchingDevice;
-import com.powsybl.psse.model.pf.PsseSubstation.PsseSubstationEquipmentTerminal;
+import com.powsybl.psse.model.pf.internal.PsseSubstationNode;
+import com.powsybl.psse.model.pf.internal.PsseSubstationSwitchingDevice;
+import com.powsybl.psse.model.pf.internal.PsseSubstationEquipmentTerminal;
+import com.powsybl.psse.model.pf.internal.PsseSubstationRecord;
 import org.jgrapht.Graph;
 import org.jgrapht.alg.connectivity.ConnectivityInspector;
 import org.jgrapht.alg.util.Pair;
@@ -468,9 +469,9 @@ static void createSubstations(PssePowerFlowModel psseModel, ContextExport contex
         List<PsseSubstation> psseSubstations = new ArrayList<>();
 
         contextExport.getFullExport().getSortedPsseSubstationIds().forEach(psseSubstationId -> {
-            List<PsseSubstation.PsseSubstationNode> nodes = new ArrayList<>();
-            List<PsseSubstation.PsseSubstationSwitchingDevice> switchingDevices = new ArrayList<>();
-            List<PsseSubstation.PsseSubstationEquipmentTerminal> equipmentTerminals = new ArrayList<>();
+            List<PsseSubstationNode> nodes = new ArrayList<>();
+            List<PsseSubstationSwitchingDevice> switchingDevices = new ArrayList<>();
+            List<PsseSubstationEquipmentTerminal> equipmentTerminals = new ArrayList<>();
 
             contextExport.getFullExport().getVoltageLevelSet(psseSubstationId).forEach(voltageLevel -> {
                 nodes.addAll(createPsseSubstationNodes(voltageLevel, contextExport));
@@ -479,24 +480,24 @@ static void createSubstations(PssePowerFlowModel psseModel, ContextExport contex
             });
 
             PsseSubstation psseSubstation = new PsseSubstation(createPsseSubstationSubstationRecord(psseSubstationId, contextExport),
-                    nodes.stream().sorted(Comparator.comparingInt(PsseSubstation.PsseSubstationNode::getNi)).toList(),
-                    switchingDevices.stream().sorted(Comparator.comparingInt(PsseSubstation.PsseSubstationSwitchingDevice::getNi)
-                            .thenComparingInt(PsseSubstation.PsseSubstationSwitchingDevice::getNj)
-                            .thenComparing(PsseSubstation.PsseSubstationSwitchingDevice::getCkt)).toList(),
-                    equipmentTerminals.stream().sorted(Comparator.comparingInt(PsseSubstation.PsseSubstationEquipmentTerminal::getI)
-                                    .thenComparingInt(PsseSubstation.PsseSubstationEquipmentTerminal::getNi)
-                                    .thenComparingInt(PsseSubstation.PsseSubstationEquipmentTerminal::getJ)
-                                    .thenComparingInt(PsseSubstation.PsseSubstationEquipmentTerminal::getK)
-                                    .thenComparing(PsseSubstation.PsseSubstationEquipmentTerminal::getId)
-                                    .thenComparing(PsseSubstation.PsseSubstationEquipmentTerminal::getType)).toList());
+                    nodes.stream().sorted(Comparator.comparingInt(PsseSubstationNode::getNi)).toList(),
+                    switchingDevices.stream().sorted(Comparator.comparingInt(PsseSubstationSwitchingDevice::getNi)
+                            .thenComparingInt(PsseSubstationSwitchingDevice::getNj)
+                            .thenComparing(PsseSubstationSwitchingDevice::getCkt)).toList(),
+                    equipmentTerminals.stream().sorted(Comparator.comparingInt(PsseSubstationEquipmentTerminal::getI)
+                                    .thenComparingInt(PsseSubstationEquipmentTerminal::getNi)
+                                    .thenComparingInt(PsseSubstationEquipmentTerminal::getJ)
+                                    .thenComparingInt(PsseSubstationEquipmentTerminal::getK)
+                                    .thenComparing(PsseSubstationEquipmentTerminal::getId)
+                                    .thenComparing(PsseSubstationEquipmentTerminal::getType)).toList());
             psseSubstations.add(psseSubstation);
         });
 
         psseModel.addSubstations(psseSubstations);
     }
 
-    private static PsseSubstation.PsseSubstationRecord createPsseSubstationSubstationRecord(String psseSubstationId, ContextExport contextExport) {
-        PsseSubstation.PsseSubstationRecord substationRecord = new PsseSubstation.PsseSubstationRecord();
+    private static PsseSubstationRecord createPsseSubstationSubstationRecord(String psseSubstationId, ContextExport contextExport) {
+        PsseSubstationRecord substationRecord = new PsseSubstationRecord();
         substationRecord.setIs(contextExport.getFullExport().getNewPsseSubstationIs());
         substationRecord.setName(psseSubstationId);
         substationRecord.setLati(0.0);
@@ -505,16 +506,16 @@ private static PsseSubstation.PsseSubstationRecord createPsseSubstationSubstatio
         return substationRecord;
     }
 
-    private static List<PsseSubstation.PsseSubstationNode> createPsseSubstationNodes(VoltageLevel voltageLevel, ContextExport contextExport) {
-        List<PsseSubstation.PsseSubstationNode> nodes = new ArrayList<>();
+    private static List<PsseSubstationNode> createPsseSubstationNodes(VoltageLevel voltageLevel, ContextExport contextExport) {
+        List<PsseSubstationNode> nodes = new ArrayList<>();
 
         for (int node : voltageLevel.getNodeBreakerView().getNodes()) {
             contextExport.getFullExport().getBusI(voltageLevel, node).ifPresent(busI -> {
                 int ni = contextExport.getFullExport().getPsseNode(voltageLevel, node).orElseThrow();
                 Bus voltageBusView = contextExport.getFullExport().getVoltageBus(voltageLevel, node).orElse(null);
                 boolean isDeEnergized = contextExport.getFullExport().isDeEnergized(voltageLevel, node);
 
-                PsseSubstation.PsseSubstationNode psseNode = new PsseSubstationNode();
+                PsseSubstationNode psseNode = new PsseSubstationNode();
                 psseNode.setNi(ni);
                 psseNode.setName(getNodeId(voltageLevel, node));
                 psseNode.setI(busI);
@@ -530,12 +531,12 @@ private static List<PsseSubstation.PsseSubstationNode> createPsseSubstationNodes
     }
 
     // ckt must be unique inside the voltageLevel
-    private static List<PsseSubstation.PsseSubstationSwitchingDevice> createPsseSubstationSwitchingDevices(VoltageLevel voltageLevel, ContextExport contextExport) {
-        List<PsseSubstation.PsseSubstationSwitchingDevice> switchingDevices = new ArrayList<>();
+    private static List<PsseSubstationSwitchingDevice> createPsseSubstationSwitchingDevices(VoltageLevel voltageLevel, ContextExport contextExport) {
+        List<PsseSubstationSwitchingDevice> switchingDevices = new ArrayList<>();
         voltageLevel.getSwitches().forEach(sw -> {
             int ni = contextExport.getFullExport().getPsseNode(voltageLevel, sw.getVoltageLevel().getNodeBreakerView().getNode1(sw.getId())).orElseThrow();
             int nj = contextExport.getFullExport().getPsseNode(voltageLevel, sw.getVoltageLevel().getNodeBreakerView().getNode2(sw.getId())).orElseThrow();
-            PsseSubstation.PsseSubstationSwitchingDevice switchingDevice = new PsseSubstationSwitchingDevice();
+            PsseSubstationSwitchingDevice switchingDevice = new PsseSubstationSwitchingDevice();
             switchingDevice.setNi(ni);
             switchingDevice.setNj(nj);
             switchingDevice.setCkt(contextExport.getFullExport().getEquipmentCkt(voltageLevel, sw.getId(), ni, nj));
@@ -560,8 +561,8 @@ private static int getSwitchingDeviceType(Switch sw) {
         };
     }
 
-    private static List<PsseSubstation.PsseSubstationEquipmentTerminal> createPsseSubstationEquipmentTerminals(VoltageLevel voltageLevel, ContextExport contextExport) {
-        List<PsseSubstation.PsseSubstationEquipmentTerminal> equipmentTerminals = new ArrayList<>();
+    private static List<PsseSubstationEquipmentTerminal> createPsseSubstationEquipmentTerminals(VoltageLevel voltageLevel, ContextExport contextExport) {
+        List<PsseSubstationEquipmentTerminal> equipmentTerminals = new ArrayList<>();
 
         getEquipmentListToBeExported(voltageLevel).forEach(equipmentId -> {
             Identifiable<?> identifiable = getIdentifiable(voltageLevel, equipmentId);
@@ -572,7 +573,7 @@ private static List<PsseSubstation.PsseSubstationEquipmentTerminal> createPsseSu
                 List<Integer> otherBuses = getTwoOtherBusesPreservingOrder(identifiable, terminals, nodeBusR, contextExport);
                 String ckt = contextExport.getFullExport().getEquipmentCkt(equipmentId, type, nodeBusR.busI(), otherBuses.get(0), otherBuses.get(1));
 
-                PsseSubstation.PsseSubstationEquipmentTerminal equipmentTerminal = new PsseSubstationEquipmentTerminal();
+                PsseSubstationEquipmentTerminal equipmentTerminal = new PsseSubstationEquipmentTerminal();
                 equipmentTerminal.setNi(nodeBusR.psseNode);
                 equipmentTerminal.setType(type);
                 equipmentTerminal.setId(getEquipmentTerminalId(type, identifiable, ckt));

psse/psse-model/pom.xml

@@ -43,8 +43,8 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.univocity</groupId>
-            <artifactId>univocity-parsers</artifactId>
+            <groupId>de.siegmar</groupId>
+            <artifactId>fastcsv</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>