stores and apply several limit sets in the branch creation

src/main/java/org/gridsuite/modification/dto/BranchCreationInfos.java

@@ -14,6 +14,8 @@
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
+import java.util.List;
+
 /**
  * @author Sylvain Bouzols <sylvain.bouzols at rte-france.com>
  */
@@ -43,11 +45,17 @@ public class BranchCreationInfos extends EquipmentCreationInfos {
     @Schema(description = "Bus or Busbar section id Side 2")
     private String busOrBusbarSectionId2;
 
-    @Schema(description = "Current limits Side 1")
-    private CurrentLimitsInfos currentLimits1;
+    @Schema(description = "Current limits on side 1")
+    private List<CurrentLimitsInfos> currentLimits1;
+
+    @Schema(description = "Current limits on side 2")
+    private List<CurrentLimitsInfos> currentLimits2;
+
+    @Schema(description = "Selected operational limits group id on Side 1")
+    private String selectedOperationalLimitsGroupId1;
 
-    @Schema(description = "Current limits Side 2")
-    private CurrentLimitsInfos currentLimits2;
+    @Schema(description = "Selected operational limits group id on Side 2")
+    private String selectedOperationalLimitsGroupId2;
 
     @Schema(description = "Connection Name 1")
     private String connectionName1;

src/main/java/org/gridsuite/modification/dto/CurrentLimitsInfos.java

@@ -7,16 +7,14 @@
 package org.gridsuite.modification.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 
 /**
  * @author Sylvain Bouzols <sylvain.bouzols at rte-france.com>
+ * ~= environ operational limit group, ~= limit set
  */
 
 @SuperBuilder
@@ -27,6 +25,9 @@
 @Schema(description = "Current Limits")
 public class CurrentLimitsInfos {
 
+    @Schema(description = "Operational limit group name")
+    private String operationalLimitGroupId;
+
     @Schema(description = "Permanent current limit")
     private Double permanentLimit;
 

src/main/java/org/gridsuite/modification/modifications/LineCreation.java

@@ -17,6 +17,8 @@
 import org.gridsuite.modification.utils.ModificationUtils;
 import org.gridsuite.modification.utils.PropertiesUtils;
 
+import java.util.List;
+
 import static org.gridsuite.modification.NetworkModificationException.Type.*;
 
 /**
@@ -67,16 +69,25 @@ public void apply(Network network, ReportNode subReportNode) {
         }
 
         // Set permanent and temporary current limits
-        CurrentLimitsInfos currentLimitsInfos1 = modificationInfos.getCurrentLimits1();
-        CurrentLimitsInfos currentLimitsInfos2 = modificationInfos.getCurrentLimits2();
-        if (currentLimitsInfos1 != null || currentLimitsInfos2 != null) {
+        List<CurrentLimitsInfos> currentLimitsSide1 = modificationInfos.getCurrentLimits1();
+        List<CurrentLimitsInfos> currentLimitsSide2 = modificationInfos.getCurrentLimits2();
+        if (currentLimitsSide1 != null && !currentLimitsSide1.isEmpty()) {
+            var line = ModificationUtils.getInstance().getLine(network, modificationInfos.getEquipmentId());
+            ModificationUtils.getInstance().setCurrentLimitsOnASide(currentLimitsSide1, line, ModificationUtils.Side.SIDE1);
+        }
+        if (currentLimitsSide2 != null && !currentLimitsSide2.isEmpty()) {
             var line = ModificationUtils.getInstance().getLine(network, modificationInfos.getEquipmentId());
-            ModificationUtils.getInstance().setCurrentLimits(currentLimitsInfos1, line.newCurrentLimits1());
-            ModificationUtils.getInstance().setCurrentLimits(currentLimitsInfos2, line.newCurrentLimits2());
+            ModificationUtils.getInstance().setCurrentLimitsOnASide(currentLimitsSide2, line, ModificationUtils.Side.SIDE2);
         }
         ModificationUtils.getInstance().disconnectBranch(modificationInfos, network.getLine(modificationInfos.getEquipmentId()), subReportNode);
         // properties
         Line line = network.getLine(modificationInfos.getEquipmentId());
+        if (modificationInfos.getSelectedOperationalLimitsGroupId1() != null) {
+            line.setSelectedOperationalLimitsGroup1(modificationInfos.getSelectedOperationalLimitsGroupId1());
+        }
+        if (modificationInfos.getSelectedOperationalLimitsGroupId2() != null) {
+            line.setSelectedOperationalLimitsGroup2(modificationInfos.getSelectedOperationalLimitsGroupId2());
+        }
         PropertiesUtils.applyProperties(line, subReportNode, modificationInfos.getProperties(), "LineProperties");
     }
 

src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java

@@ -16,6 +16,7 @@
 import org.gridsuite.modification.utils.ModificationUtils;
 import org.gridsuite.modification.utils.PropertiesUtils;
 
+import java.util.List;
 import java.util.Optional;
 
 import static org.gridsuite.modification.NetworkModificationException.Type.*;
@@ -53,11 +54,19 @@ public void apply(Network network, ReportNode subReportNode) {
         }
 
         // Set permanent and temporary current limits
-        CurrentLimitsInfos currentLimitsInfos1 = modificationInfos.getCurrentLimits1();
-        CurrentLimitsInfos currentLimitsInfos2 = modificationInfos.getCurrentLimits2();
-        if (currentLimitsInfos1 != null || currentLimitsInfos2 != null) {
-            ModificationUtils.getInstance().setCurrentLimits(currentLimitsInfos1, twoWindingsTransformer.newCurrentLimits1());
-            ModificationUtils.getInstance().setCurrentLimits(currentLimitsInfos2, twoWindingsTransformer.newCurrentLimits2());
+        List<CurrentLimitsInfos> currentLimitsSide1 = modificationInfos.getCurrentLimits1();
+        List<CurrentLimitsInfos> currentLimitsSide2 = modificationInfos.getCurrentLimits2();
+        if (currentLimitsSide1 != null && !currentLimitsSide1.isEmpty()) {
+            ModificationUtils.getInstance().setCurrentLimitsOnASide(currentLimitsSide1, twoWindingsTransformer, ModificationUtils.Side.SIDE1);
+        }
+        if (currentLimitsSide2 != null && !currentLimitsSide2.isEmpty()) {
+            ModificationUtils.getInstance().setCurrentLimitsOnASide(currentLimitsSide2, twoWindingsTransformer, ModificationUtils.Side.SIDE2);
+        }
+        if (modificationInfos.getSelectedOperationalLimitsGroupId1() != null) {
+            twoWindingsTransformer.setSelectedOperationalLimitsGroup1(modificationInfos.getSelectedOperationalLimitsGroupId1());
+        }
+        if (modificationInfos.getSelectedOperationalLimitsGroupId2() != null) {
+            twoWindingsTransformer.setSelectedOperationalLimitsGroup2(modificationInfos.getSelectedOperationalLimitsGroupId2());
         }
 
         ModificationUtils.getInstance().disconnectBranch(modificationInfos, network.getTwoWindingsTransformer(modificationInfos.getEquipmentId()), subReportNode);

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

@@ -43,6 +43,11 @@
 // TODO remove public qualifier for all methods
 public final class ModificationUtils {
 
+    public enum Side {
+        SIDE1,
+        SIDE2
+    }
+
     public static final String DISCONNECTOR = "disconnector_";
     public static final String BREAKER = "breaker_";
     public static final String BUS_BAR_SECTION_ID = "busbarSectionId";
@@ -1010,24 +1015,34 @@ public Identifiable<?> getEquipmentByIdentifiableType(Network network, Identifia
         };
     }
 
-    public void setCurrentLimits(CurrentLimitsInfos currentLimitsInfos, CurrentLimitsAdder limitsAdder) {
-        if (currentLimitsInfos != null) {
+    /**
+     * @param allCurrentLimitsInfos added current limits
+     * @param branch branch to which limits are going to be added
+     * @param side which side of the branch receives the limits
+     */
+    public void setCurrentLimitsOnASide(List<CurrentLimitsInfos> allCurrentLimitsInfos, Branch<?> branch, Side side) {
+        for (CurrentLimitsInfos currentLimitsInfos : allCurrentLimitsInfos) {
             boolean hasPermanent = currentLimitsInfos.getPermanentLimit() != null;
-            boolean hasTemporary = currentLimitsInfos.getTemporaryLimits() != null && !currentLimitsInfos.getTemporaryLimits().isEmpty();
-            if (hasPermanent) {
-                limitsAdder.setPermanentLimit(currentLimitsInfos.getPermanentLimit());
-            }
-            if (hasTemporary) {
-                for (CurrentTemporaryLimitCreationInfos limit : currentLimitsInfos.getTemporaryLimits()) {
-                    limitsAdder
-                            .beginTemporaryLimit()
-                            .setName(limit.getName())
-                            .setValue(limit.getValue() == null ? Double.MAX_VALUE : limit.getValue())
-                            .setAcceptableDuration(limit.getAcceptableDuration() == null ? Integer.MAX_VALUE : limit.getAcceptableDuration())
-                            .endTemporaryLimit();
+            boolean hasTemporary = !CollectionUtils.isEmpty(currentLimitsInfos.getTemporaryLimits());
+            boolean hasLimits = hasPermanent || hasTemporary;
+            if (hasLimits) {
+                OperationalLimitsGroup opGroup = side == Side.SIDE1
+                        ? branch.newOperationalLimitsGroup1(currentLimitsInfos.getOperationalLimitGroupId())
+                        : branch.newOperationalLimitsGroup2(currentLimitsInfos.getOperationalLimitGroupId());
+                CurrentLimitsAdder limitsAdder = opGroup.newCurrentLimits();
+                if (hasPermanent) {
+                    limitsAdder.setPermanentLimit(currentLimitsInfos.getPermanentLimit());
+                }
+                if (hasTemporary) {
+                    for (CurrentTemporaryLimitCreationInfos limit : currentLimitsInfos.getTemporaryLimits()) {
+                        limitsAdder
+                                .beginTemporaryLimit()
+                                .setName(limit.getName())
+                                .setValue(limit.getValue() == null ? Double.MAX_VALUE : limit.getValue())
+                                .setAcceptableDuration(limit.getAcceptableDuration() == null ? Integer.MAX_VALUE : limit.getAcceptableDuration())
+                                .endTemporaryLimit();
+                    }
                 }
-            }
-            if (hasPermanent || hasTemporary) {
                 limitsAdder.add();
             }
         }

src/test/java/org/gridsuite/modification/modifications/LineCreationInBusBreakerTest.java

@@ -54,7 +54,10 @@ void testCreateLineOptionalParameters5() throws Exception {
                 .busOrBusbarSectionId1("bus1")
                 .voltageLevelId2("v2")
                 .busOrBusbarSectionId2("bus2")
-                .currentLimits1(CurrentLimitsInfos.builder().permanentLimit(-1.0).build())
+                .currentLimits1(
+                        List.of(CurrentLimitsInfos.builder().operationalLimitGroupId("limiSet1").permanentLimit(-1.0).build())
+                )
+                .selectedOperationalLimitsGroupId1("limiSet1")
                 .build();
         ValidationException exception = assertThrows(ValidationException.class, () -> lineCreationInfosPermanentLimitNOK.toModification().apply(getNetwork()));
         assertEquals("AC Line 'idLine2': permanent limit must be >= 0", exception.getMessage());
@@ -82,8 +85,14 @@ protected ModificationInfos buildModification() {
             .b2(20.0)
             .voltageLevelId1("v1")
             .busOrBusbarSectionId1("bus1")
-            .currentLimits1(CurrentLimitsInfos.builder().permanentLimit(5.).temporaryLimits(Collections.emptyList()).build())
-            .currentLimits2(CurrentLimitsInfos.builder().permanentLimit(5.).temporaryLimits(Collections.emptyList()).build())
+            .currentLimits1(
+                    List.of(CurrentLimitsInfos.builder().operationalLimitGroupId("limitSet1").permanentLimit(5.).temporaryLimits(Collections.emptyList()).build())
+            )
+            .currentLimits2(
+                    List.of(CurrentLimitsInfos.builder().operationalLimitGroupId("limitSet2").permanentLimit(5.).temporaryLimits(Collections.emptyList()).build())
+            )
+            .selectedOperationalLimitsGroupId1("limitSet1")
+            .selectedOperationalLimitsGroupId2("limitSet2")
             .voltageLevelId2("v2")
             .busOrBusbarSectionId2("bus2")
             .properties(List.of(FreePropertyInfos.builder().name(PROPERTY_NAME).value(PROPERTY_VALUE).build()))

src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationBusBreakerTest.java

@@ -52,8 +52,26 @@ protected ModificationInfos buildModification() {
                 .voltageLevelId2("v12")
                 .busOrBusbarSectionId2("bus12")
                 .connected2(true)
-                .currentLimits1(CurrentLimitsInfos.builder().permanentLimit(3.).temporaryLimits(List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT5").acceptableDuration(98647).value(45.).build())).build())
-                .currentLimits2(CurrentLimitsInfos.builder().permanentLimit(2.).temporaryLimits(List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT10").acceptableDuration(683647).value(791.).build())).build())
+                .currentLimits1(
+                        List.of(
+                                CurrentLimitsInfos.builder()
+                                        .operationalLimitGroupId("limitSet1")
+                                        .permanentLimit(3.)
+                                        .temporaryLimits(
+                                                List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT5").acceptableDuration(98647).value(45.).build())
+                                        ).build())
+                )
+                .currentLimits2(
+                        List.of(
+                                CurrentLimitsInfos.builder()
+                                        .operationalLimitGroupId("limitSet2")
+                                        .permanentLimit(2.)
+                                        .temporaryLimits(
+                                                List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT10").acceptableDuration(683647).value(791.).build())
+                                        ).build())
+                )
+                .selectedOperationalLimitsGroupId1("limitSet1")
+                .selectedOperationalLimitsGroupId2("limitSet2")
                 .connectionName1("cn201")
                 .connectionDirection1(ConnectablePosition.Direction.TOP)
                 .connectionName2("cn202")

src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java

@@ -52,8 +52,12 @@ protected ModificationInfos buildModification() {
                 .voltageLevelId2("v2")
                 .busOrBusbarSectionId2("1A")
                 .connected2(true)
-                .currentLimits1(CurrentLimitsInfos.builder().permanentLimit(3.).temporaryLimits(List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT5").acceptableDuration(2147483647).value(671.).build())).build())
-                .currentLimits2(CurrentLimitsInfos.builder().permanentLimit(2.).temporaryLimits(List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT10").acceptableDuration(683647).value(791.).build())).build())
+                .currentLimits1(
+                        List.of(CurrentLimitsInfos.builder().permanentLimit(3.).temporaryLimits(List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT5").acceptableDuration(2147483647).value(671.).build())).build())
+                )
+                .currentLimits2(
+                        List.of(CurrentLimitsInfos.builder().permanentLimit(2.).temporaryLimits(List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT10").acceptableDuration(683647).value(791.).build())).build())
+                )
                 .connectionName1("cn201")
                 .connectionDirection1(ConnectablePosition.Direction.TOP)
                 .connected1(true)
@@ -219,7 +223,7 @@ void testCreateTwoWindingsTransformerWithRatioTapChangerInNodeBreaker() throws E
         testCreateTwoWindingsTransformerInNodeBreaker(twoWindingsTransformerCreationInfos2);
 
         assertEquals(
-            "TwoWindingsTransformerCreationInfos(super=BranchCreationInfos(super=EquipmentCreationInfos(super=EquipmentModificationInfos(super=ModificationInfos(uuid=null, type=TWO_WINDINGS_TRANSFORMER_CREATION, date=null, stashed=false, messageType=null, messageValues=null, activated=true), equipmentId=id2wt1WithRatioTapChanger2, properties=null), equipmentName=2wtName), r=400.0, x=300.0, voltageLevelId1=v1, voltageLevelId2=v4, busOrBusbarSectionId1=1.1, busOrBusbarSectionId2=1.A, currentLimits1=null, currentLimits2=null, connectionName1=null, connectionDirection1=TOP, connectionName2=null, connectionDirection2=TOP, connectionPosition1=null, connectionPosition2=null, connected1=true, connected2=true), g=100.0, b=200.0, ratedU1=1000.0, ratedU2=1010.0, ratedS=null, ratioTapChanger=RatioTapChangerCreationInfos(super=TapChangerCreationInfos(lowTapPosition=0, tapPosition=1, regulating=true, targetDeadband=null, regulatingTerminalId=v1load, regulatingTerminalType=LOAD, regulatingTerminalVlId=v1, steps=[TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78473, x=39.784725, g=0.0, b=0.0, alpha=0.0), TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78474, x=39.784726, g=0.0, b=0.0, alpha=0.0), TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78475, x=39.784727, g=0.0, b=0.0, alpha=0.0)]), loadTapChangingCapabilities=true, targetV=220.0), phaseTapChanger=null)",
+            "TwoWindingsTransformerCreationInfos(super=BranchCreationInfos(super=EquipmentCreationInfos(super=EquipmentModificationInfos(super=ModificationInfos(uuid=null, type=TWO_WINDINGS_TRANSFORMER_CREATION, date=null, stashed=false, messageType=null, messageValues=null, activated=true), equipmentId=id2wt1WithRatioTapChanger2, properties=null), equipmentName=2wtName), r=400.0, x=300.0, voltageLevelId1=v1, voltageLevelId2=v4, busOrBusbarSectionId1=1.1, busOrBusbarSectionId2=1.A, currentLimits1=null, currentLimits2=null, selectedOperationalLimitsGroupId1=null, selectedOperationalLimitsGroupId2=null, connectionName1=null, connectionDirection1=TOP, connectionName2=null, connectionDirection2=TOP, connectionPosition1=null, connectionPosition2=null, connected1=true, connected2=true), g=100.0, b=200.0, ratedU1=1000.0, ratedU2=1010.0, ratedS=null, ratioTapChanger=RatioTapChangerCreationInfos(super=TapChangerCreationInfos(lowTapPosition=0, tapPosition=1, regulating=true, targetDeadband=null, regulatingTerminalId=v1load, regulatingTerminalType=LOAD, regulatingTerminalVlId=v1, steps=[TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78473, x=39.784725, g=0.0, b=0.0, alpha=0.0), TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78474, x=39.784726, g=0.0, b=0.0, alpha=0.0), TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78475, x=39.784727, g=0.0, b=0.0, alpha=0.0)]), loadTapChangingCapabilities=true, targetV=220.0), phaseTapChanger=null)",
             twoWindingsTransformerCreationInfos2.toString()
         );