Avoid linear scanning of the list of bay propertyBag by using a map instead

Signed-off-by: Laurent Garnier <[email protected]>

Author: laurgarn

cgmes/cgmes-measurements/src/main/java/com/powsybl/cgmes/measurements/CgmesAnalogPostProcessor.java

@@ -11,7 +11,7 @@
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.*;
 import com.powsybl.triplestore.api.PropertyBag;
-import com.powsybl.triplestore.api.PropertyBags;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,7 +26,9 @@ public final class CgmesAnalogPostProcessor {
 
     private static final Logger LOG = LoggerFactory.getLogger(CgmesAnalogPostProcessor.class);
 
-    public static void process(Network network, String id, String terminalId, String powerSystemResourceId, String measurementType, PropertyBags bays, Map<String, String> typesMapping) {
+    public static void process(Network network, String id, String terminalId,
+            String powerSystemResourceId, String measurementType,
+            Map<String, PropertyBag> idToBayBag, Map<String, String> typesMapping) {
         if (terminalId != null) {
             Identifiable<?> identifiable = network.getIdentifiable(terminalId);
             if (identifiable != null) {
@@ -40,7 +42,7 @@ public static void process(Network network, String id, String terminalId, String
             createMeas(identifiable, id, terminalId, measurementType, typesMapping);
             return;
         }
-        PropertyBag bay = bays.stream().filter(b -> b.getId("Bay").equals(powerSystemResourceId)).findFirst().orElse(null);
+        PropertyBag bay = idToBayBag.get(powerSystemResourceId);
         if (bay != null) {
             String voltageLevelId = bay.getId("VoltageLevel");
             LOG.info("Power resource system {} of Analog {} is a Bay: Analog is attached to the associated voltage level {}",

cgmes/cgmes-measurements/src/main/java/com/powsybl/cgmes/measurements/CgmesDiscretePostProcessor.java

@@ -10,7 +10,7 @@
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.*;
 import com.powsybl.triplestore.api.PropertyBag;
-import com.powsybl.triplestore.api.PropertyBags;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,7 +27,9 @@ public final class CgmesDiscretePostProcessor {
 
     private static final Logger LOG = LoggerFactory.getLogger(CgmesDiscretePostProcessor.class);
 
-    public static void process(Network network, String id, String terminalId, String powerSystemResourceId, String measurementType, PropertyBags bays, Map<String, String> typesMapping) {
+    public static void process(Network network, String id, String terminalId,
+            String powerSystemResourceId, String measurementType,
+            Map<String, PropertyBag> idToBayBag, Map<String, String> typesMapping) {
         if (terminalId != null) {
             Identifiable<?> identifiable = network.getIdentifiable(terminalId);
             if (identifiable != null) {
@@ -41,7 +43,7 @@ public static void process(Network network, String id, String terminalId, String
             createDisMeas(identifiable, id, measurementType, typesMapping);
             return;
         }
-        PropertyBag bay = bays.stream().filter(b -> b.getId("Bay").equals(powerSystemResourceId)).findFirst().orElse(null);
+        PropertyBag bay = idToBayBag.get(powerSystemResourceId);
         if (bay != null) {
             String voltageLevelId = bay.getId("VoltageLevel");
             LOG.info("Power resource system {} of Discrete {} is a Bay: Discrete is attached to the associated voltage level {}",

cgmes/cgmes-measurements/src/main/java/com/powsybl/cgmes/measurements/CgmesMeasurementsPostProcessor.java

@@ -62,19 +62,24 @@ public String getName() {
     public void process(Network network, TripleStore tripleStore) {
         CgmesMeasurementsModel model = new CgmesMeasurementsModel(tripleStore);
         PropertyBags bays = model.bays();
+        Map<String, PropertyBag> idToBayBag = bays.stream().collect(Collectors.toMap(b -> b.getId("Bay"), b -> b));
+        Map<String, String> analogTypesMapping = createTypesMapping(
+                Parameter.readStringList("CGMES", null, ANALOG_TYPES_MAPPING_PARAMETER, defaultValueConfig));
         for (PropertyBag analog : model.analogs()) {
             CgmesAnalogPostProcessor.process(network, analog.getId("Analog"), analog.getId("Terminal"),
                     analog.getId("powerSystemResource"),
                     analog.getId("type"),
-                    bays,
-                    createTypesMapping(Parameter.readStringList("CGMES", null, ANALOG_TYPES_MAPPING_PARAMETER, defaultValueConfig)));
+                    idToBayBag,
+                    analogTypesMapping);
         }
+        Map<String, String> discreteTypesMapping = createTypesMapping(
+                Parameter.readStringList("CGMES", null, DISCRETE_TYPES_MAPPING_PARAMETER, defaultValueConfig));
         for (PropertyBag discrete : model.discretes()) {
             CgmesDiscretePostProcessor.process(network, discrete.getId("Discrete"), discrete.getId("Terminal"),
                     discrete.getId("powerSystemResource"),
                     discrete.getId("type"),
-                    bays,
-                    createTypesMapping(Parameter.readStringList("CGMES", null, DISCRETE_TYPES_MAPPING_PARAMETER, defaultValueConfig)));
+                    idToBayBag,
+                    discreteTypesMapping);
         }
     }