Change value for empty field Name when modification into logs (#262)

* Change value for empty field Name when modification into logs
---------

Signed-off-by: Maissa SOUISSI <[email protected]>

Author: souissimai

src/main/java/org/gridsuite/modification/server/modifications/AbstractBranchModification.java

@@ -42,8 +42,7 @@ protected void modifyBranch(Branch<?> branch, BranchModificationInfos branchModi
                 .withSeverity(TypedValue.INFO_SEVERITY)
                 .build());
         if (branchModificationInfos.getEquipmentName() != null) {
-            subReporter.report(ModificationUtils.getInstance().buildModificationReportWithIndentation(branch.getNameOrId(),
-                    branchModificationInfos.getEquipmentName().getValue(), "Name", 0));
+            subReporter.report(ModificationUtils.getInstance().buildModificationReportWithIndentation(branchModificationInfos.getEquipmentName().getValue(), branch.getOptionalName().isEmpty() ? "No value" : branch.getOptionalName().get(), "Name", 0));
             branch.setName(branchModificationInfos.getEquipmentName().getValue());
         }
 

src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java

@@ -125,7 +125,7 @@ private void modifyGenerator(Generator generator, GeneratorModificationInfos mod
                 .build());
 
         if (modificationInfos.getEquipmentName() != null && modificationInfos.getEquipmentName().getValue() != null) {
-            ModificationUtils.getInstance().applyElementaryModifications(generator::setName, generator::getNameOrId, modificationInfos.getEquipmentName(), subReporter, "Name");
+            ModificationUtils.getInstance().applyElementaryModifications(generator::setName, () -> generator.getOptionalName().orElse("No value"), modificationInfos.getEquipmentName(), subReporter, "Name");
         }
         ModificationUtils.getInstance().applyElementaryModifications(generator::setEnergySource, generator::getEnergySource, modificationInfos.getEnergySource(), subReporter, "Energy source");
 

src/main/java/org/gridsuite/modification/server/modifications/LoadModification.java

@@ -44,7 +44,7 @@ private void modifyLoad(Load load, LoadModificationInfos loadModificationInfos,
             .withSeverity(TypedValue.INFO_SEVERITY)
             .build());
 
-        ModificationUtils.getInstance().applyElementaryModifications(load::setName, load::getNameOrId, loadModificationInfos.getEquipmentName(), subReporter, "Name");
+        ModificationUtils.getInstance().applyElementaryModifications(load::setName, () -> load.getOptionalName().orElse("No value"), loadModificationInfos.getEquipmentName(), subReporter, "Name");
         ModificationUtils.getInstance().applyElementaryModifications(load::setLoadType, load::getLoadType, loadModificationInfos.getLoadType(), subReporter, "Type");
         ModificationUtils.getInstance().applyElementaryModifications(load::setP0, load::getP0, loadModificationInfos.getActivePower(), subReporter, "Active power");
         ModificationUtils.getInstance().applyElementaryModifications(load::setQ0, load::getQ0, loadModificationInfos.getReactivePower(), subReporter, "Reactive power");

src/main/java/org/gridsuite/modification/server/modifications/SubstationModification.java

@@ -37,13 +37,13 @@ public void apply(Network network, Reporter subReporter) {
 
         // modify the substation in the network
         subReporter.report(Report.builder()
-            .withKey("substationModification")
-            .withDefaultMessage("Substation with id=${id} modified :")
-            .withValue("id", modificationInfos.getEquipmentId())
-            .withSeverity(TypedValue.INFO_SEVERITY)
-            .build());
+                .withKey("substationModification")
+                .withDefaultMessage("Substation with id=${id} modified :")
+                .withValue("id", modificationInfos.getEquipmentId())
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .build());
         // name and country
-        ModificationUtils.getInstance().applyElementaryModifications(station::setName, station::getNameOrId, modificationInfos.getEquipmentName(), subReporter, "Name");
+        ModificationUtils.getInstance().applyElementaryModifications(station::setName, () -> station.getOptionalName().orElse("No value"), modificationInfos.getEquipmentName(), subReporter, "Name");
         ModificationUtils.getInstance().applyElementaryModifications(station::setCountry, station::getNullableCountry, modificationInfos.getSubstationCountry(), subReporter, "Country");
         // properties
         if (modificationInfos.getProperties() != null) {

src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java

@@ -52,7 +52,7 @@ private void modifyVoltageLevel(Reporter subReporter, VoltageLevel voltageLevel)
                 .withSeverity(TypedValue.INFO_SEVERITY)
                 .build());
 
-        ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setName, voltageLevel::getNameOrId, modificationInfos.getEquipmentName(), subReporter, "Name");
+        ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setName, () -> voltageLevel.getOptionalName().orElse("No value"), modificationInfos.getEquipmentName(), subReporter, "Name");
         ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setNominalV, voltageLevel::getNominalV, modificationInfos.getNominalVoltage(), subReporter, "Nominal voltage");
         ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setLowVoltageLimit, voltageLevel::getLowVoltageLimit, modificationInfos.getLowVoltageLimit(), subReporter, "Low voltage limit");
         ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setHighVoltageLimit, voltageLevel::getHighVoltageLimit, modificationInfos.getHighVoltageLimit(), subReporter, "High voltage limit");