removes currentLimits1 and currentLimits2 for transfos + TU

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

Author: Mathieu-Deharbe

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

@@ -57,13 +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> currentLimits1;
-
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CurrentLimitsData> currentLimits2;
-
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<CurrentLimitsData> currentLimits;
 

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

@@ -82,9 +82,6 @@ private static TwoWindingsTransformerFormInfos toFormInfos(Identifiable<?> ident
 
         mergeCurrentLimits(twoWT.getOperationalLimitsGroups1(), twoWT.getOperationalLimitsGroups2(), builder::currentLimits);
 
-        buildCurrentLimits(twoWT.getOperationalLimitsGroups1(), builder::currentLimits1);
-        buildCurrentLimits(twoWT.getOperationalLimitsGroups2(), builder::currentLimits2);
-
         builder.operatingStatus(toOperatingStatus(twoWT));
         builder.connectablePosition1(toMapConnectablePosition(twoWT, 1))
                 .connectablePosition2(toMapConnectablePosition(twoWT, 2));

src/test/resources/2-windings-transformer-map-data.json

@@ -11,22 +11,6 @@
   "q1": 12.2,
   "p2": 13.33,
   "q2": 14.44,
-  "currentLimits1": [
-    {
-      "id" : "limit set 1",
-      "permanentLimit":750.4,
-      "temporaryLimits":[{"name":"IT5","acceptableDuration":2087,"value":300}],
-      "applicability": null
-    }
-  ],
-  "currentLimits2": [
-    {
-      "id" : "limit set 1",
-      "permanentLimit":780.6,
-      "temporaryLimits":[{"name":"N/A","acceptableDuration":664,"value":2147483647},{"name":"IT20","acceptableDuration":961,"value":1200}],
-      "applicability": null
-    }
-  ],
   "currentLimits": [
     {
       "id" : "limit set 1",

src/test/resources/line-form-data.json

@@ -8,22 +8,6 @@
   "q1": 2.2,
   "p2": 3.33,
   "q2": 4.44,
-  "currentLimits1": [
-    {
-      "id" : "limit set 1",
-      "permanentLimit":700.4,
-      "temporaryLimits":[{"name":"IT5","acceptableDuration":300,"value":250.0}],
-      "applicability": null
-    }
-  ],
-  "currentLimits2": [
-    {
-      "id" : "limit set 1",
-      "permanentLimit":800.8,
-      "temporaryLimits":[{"name":"IT20","acceptableDuration":1200,"value":300.0},{"name":"IT10","acceptableDuration":600,"value":200.0}],
-      "applicability": null
-    }
-  ],
   "currentLimits": [
     {
       "id" : "limit set 1",

src/test/resources/lines-form-data.json

@@ -9,39 +9,6 @@
     "q1": 2.2,
     "p2": 3.33,
     "q2": 4.44,
-    "currentLimits1": [
-      {
-        "id": "limit set 1",
-        "permanentLimit": 700.4,
-        "temporaryLimits": [
-          {
-            "name": "IT5",
-            "value": 250.0,
-            "acceptableDuration": 300
-          }
-        ],
-        "applicability": null
-      }
-    ],
-    "currentLimits2": [
-      {
-        "id": "limit set 1",
-        "permanentLimit": 800.8,
-        "temporaryLimits": [
-          {
-            "name": "IT20",
-            "value": 300.0,
-            "acceptableDuration": 1200
-          },
-          {
-            "name": "IT10",
-            "value": 200.0,
-            "acceptableDuration": 600
-          }
-        ],
-        "applicability": null
-      }
-    ],
     "currentLimits": [
       {
         "id": "limit set 1",
@@ -100,63 +67,6 @@
     "voltageLevelId2": "VLHV2",
     "terminal1Connected": true,
     "terminal2Connected": true,
-    "currentLimits1": [
-      {
-        "id": "group2",
-        "permanentLimit": 250.0,
-        "temporaryLimits": [
-          {
-            "name": "temporary1",
-            "value": 90.0,
-            "acceptableDuration": 200
-          }
-        ],
-        "applicability": null
-      },
-      {
-        "id": "group1",
-        "permanentLimit": 220.0,
-        "temporaryLimits": [
-          {
-            "name": "temporary2",
-            "value": 70.0,
-            "acceptableDuration": 150
-          },
-          {
-            "name": "temporary1",
-            "value": 50.0,
-            "acceptableDuration": 100
-          }
-        ],
-        "applicability": null
-      }
-    ],
-    "currentLimits2": [
-      {
-        "id": "group4",
-        "permanentLimit": 320.0,
-        "temporaryLimits": [
-          {
-            "name": "temporary1",
-            "value": 130.0,
-            "acceptableDuration": 200
-          }
-        ],
-        "applicability": null
-      },
-      {
-        "id": "group3",
-        "permanentLimit": 300.0,
-        "temporaryLimits": [
-          {
-            "name": "temporary1",
-            "value": 110.0,
-            "acceptableDuration": 150
-          }
-        ],
-        "applicability": null
-      }
-    ],
     "currentLimits": [
       {
         "id": "group2",