corrections post conflicts

Signed-off-by: Mathieu DEHARBE <[email protected]>

Author: Mathieu-Deharbe

src/main/java/org/gridsuite/network/map/dto/definition/twowindingstransformer/TwoWindingsTransformerFormInfos.java

@@ -57,10 +57,6 @@ public class TwoWindingsTransformerFormInfos extends ElementInfosWithProperties
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Double i2;
 
-    // TODO : remove currentLimits1 and 2 to leave only currentLimits when modification is done
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CurrentLimitsData> currentLimits;
-
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<CurrentLimitsData> currentLimits;
 

src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java

@@ -69,9 +69,6 @@ private static LineFormInfos toFormInfos(Identifiable<?> identifiable) {
                 .selectedOperationalLimitsGroup1(line.getSelectedOperationalLimitsGroupId1().orElse(null))
                 .selectedOperationalLimitsGroup2(line.getSelectedOperationalLimitsGroupId2().orElse(null));
 
-        // TODO pourquoi est-ce en double ?? : 
-        // mergeCurrentLimits(line.getOperationalLimitsGroups1(), line.getOperationalLimitsGroups2(), builder::currentLimits);
-
         mergeCurrentLimits(line.getOperationalLimitsGroups1(), line.getOperationalLimitsGroups2(), builder::currentLimits);
 
         builder.busOrBusbarSectionId1(getBusOrBusbarSection(terminal1))

src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java

@@ -80,8 +80,6 @@ private static TwoWindingsTransformerFormInfos toFormInfos(Identifiable<?> ident
         builder.selectedOperationalLimitsGroup1(twoWT.getSelectedOperationalLimitsGroupId1().orElse(null));
         builder.selectedOperationalLimitsGroup2(twoWT.getSelectedOperationalLimitsGroupId2().orElse(null));
 
-        // TODO double ??
-        // mergeCurrentLimits(twoWT.getOperationalLimitsGroups1(), twoWT.getOperationalLimitsGroups2(), builder::currentLimits);
         mergeCurrentLimits(twoWT.getOperationalLimitsGroups1(), twoWT.getOperationalLimitsGroups2(), builder::currentLimits);
 
         builder.operatingStatus(toOperatingStatus(twoWT));