corrects TU and imports

Mathieu-Deharbe · Mathieu-Deharbe · commit b237412dc5ee · 2025-07-23T14:43:49.000+02:00
Signed-off-by: Mathieu DEHARBE &lt;mathieu.deharbe@rte-france.com&gt;
diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java
@@ -8,7 +8,6 @@
 
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.Measurement;
-import org.apache.commons.lang3.tuple.Pair;
 import org.gridsuite.network.map.dto.ElementInfos;
 import org.gridsuite.network.map.dto.InfoTypeParameters;
 import org.gridsuite.network.map.dto.common.CurrentLimitsData;
diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java
@@ -10,7 +10,6 @@
 import com.powsybl.iidm.network.extensions.DiscreteMeasurement;
 import com.powsybl.iidm.network.extensions.Measurement;
 import com.powsybl.iidm.network.extensions.TwoWindingsTransformerToBeEstimated;
-import org.apache.commons.lang3.tuple.Pair;
 import org.gridsuite.network.map.dto.ElementInfos;
 import org.gridsuite.network.map.dto.InfoTypeParameters;
 import org.gridsuite.network.map.dto.common.CurrentLimitsData;
diff --git a/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java b/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java
@@ -10,7 +10,6 @@
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.*;
 import com.powsybl.math.graph.TraversalType;
-import org.apache.commons.lang3.tuple.Pair;
 import org.gridsuite.network.map.dto.common.*;
 import org.gridsuite.network.map.dto.definition.extension.*;
 import org.gridsuite.network.map.dto.definition.threewindingstransformer.ThreeWindingsTransformerTabInfos;
@@ -151,7 +150,7 @@ public static void mergeCurrentLimits(Collection<OperationalLimitsGroup> operati
                     // both sides have limits and limits are equals
                     if (limitsData.limitsEquals(limitsData2)) {
                         mergedLimitsData.add(copyCurrentLimitsData(limitsData, EQUIPMENT));
-                        // both side have limits and they are different : create 2 different limit sets with basename_Or and _Ex
+                        // both side have limits and they are different : create 2 different limit sets
                     } else {
                         // Side 1
                         mergedLimitsData.add(copyCurrentLimitsData(limitsData, SIDE1));
diff --git a/src/test/resources/2-windings-transformer-map-data.json b/src/test/resources/2-windings-transformer-map-data.json
@@ -13,36 +13,36 @@
   "q2": 14.44,
   "currentLimits1": [
     {
-      "id" : "limit set 1_OR",
+      "id" : "limit set 1",
       "permanentLimit":750.4,
       "temporaryLimits":[{"name":"IT5","acceptableDuration":2087,"value":300}],
       "applicability": null
     }
   ],
   "currentLimits2": [
     {
-      "id" : "limit set 1_EX",
+      "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_OR",
+      "id" : "limit set 1",
       "permanentLimit":750.4,
       "temporaryLimits":[{"name":"IT5","acceptableDuration":2087,"value":300}],
       "applicability": "SIDE1"
     },
     {
-      "id" : "limit set 1_EX",
+      "id" : "limit set 1",
       "permanentLimit":780.6,
       "temporaryLimits":[{"name":"N/A","acceptableDuration":664,"value":2147483647},{"name":"IT20","acceptableDuration":961,"value":1200}],
       "applicability": "SIDE2"
     }
   ],
-  "selectedOperationalLimitsGroup1": "limit set 1_OR",
-  "selectedOperationalLimitsGroup2": "limit set 1_EX",
+  "selectedOperationalLimitsGroup1": "limit set 1",
+  "selectedOperationalLimitsGroup2": "limit set 1",
   "phaseTapChanger": {
     "lowTapPosition": 0,
     "highTapPosition": 1,
diff --git a/src/test/resources/line-form-data.json b/src/test/resources/line-form-data.json
@@ -10,36 +10,36 @@
   "q2": 4.44,
   "currentLimits1": [
     {
-      "id" : "limit set 1_OR",
+      "id" : "limit set 1",
       "permanentLimit":700.4,
       "temporaryLimits":[{"name":"IT5","acceptableDuration":300,"value":250.0}],
       "applicability": null
     }
   ],
   "currentLimits2": [
     {
-      "id" : "limit set 1_EX",
+      "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_OR",
+      "id" : "limit set 1",
       "permanentLimit":700.4,
       "temporaryLimits":[{"name":"IT5","acceptableDuration":300,"value":250.0}],
       "applicability": "SIDE1"
     },
     {
-      "id" : "limit set 1_EX",
+      "id" : "limit set 1",
       "permanentLimit":800.8,
       "temporaryLimits":[{"name":"IT20","acceptableDuration":1200,"value":300.0},{"name":"IT10","acceptableDuration":600,"value":200.0}],
       "applicability": "SIDE2"
     }
   ],
-  "selectedOperationalLimitsGroup1": "limit set 1_OR",
-  "selectedOperationalLimitsGroup2": "limit set 1_EX",
+  "selectedOperationalLimitsGroup1": "limit set 1",
+  "selectedOperationalLimitsGroup2": "limit set 1",
   "r": 9.0,
   "x": 10.0,
   "g1": 7.0,
diff --git a/src/test/resources/lines-form-data.json b/src/test/resources/lines-form-data.json
@@ -11,7 +11,7 @@
     "q2": 4.44,
     "currentLimits1": [
       {
-        "id": "limit set 1_OR",
+        "id": "limit set 1",
         "permanentLimit": 700.4,
         "temporaryLimits": [
           {
@@ -25,7 +25,7 @@
     ],
     "currentLimits2": [
       {
-        "id": "limit set 1_EX",
+        "id": "limit set 1",
         "permanentLimit": 800.8,
         "temporaryLimits": [
           {
@@ -44,7 +44,7 @@
     ],
     "currentLimits": [
       {
-        "id": "limit set 1_OR",
+        "id": "limit set 1",
         "permanentLimit": 700.4,
         "temporaryLimits": [
           {
@@ -56,7 +56,7 @@
         "applicability": "SIDE1"
       },
       {
-        "id": "limit set 1_EX",
+        "id": "limit set 1",
         "permanentLimit": 800.8,
         "temporaryLimits": [
           {
@@ -73,8 +73,8 @@
         "applicability": "SIDE2"
       }
     ],
-    "selectedOperationalLimitsGroup1": "limit set 1_OR",
-    "selectedOperationalLimitsGroup2": "limit set 1_EX",
+    "selectedOperationalLimitsGroup1": "limit set 1",
+    "selectedOperationalLimitsGroup2": "limit set 1",
     "r": 9.0,
     "x": 10.0,
     "g1": 7.0,

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"q2": 4.44,`
`12`	`12`	`"currentLimits1": [`
`13`	`13`	`{`
`14`		`- "id": "limit set 1_OR",`
	`14`	`+ "id": "limit set 1",`
`15`	`15`	`"permanentLimit": 700.4,`
`16`	`16`	`"temporaryLimits": [`
`17`	`17`	`{`
`@@ -25,7 +25,7 @@`
`25`	`25`	`],`
`26`	`26`	`"currentLimits2": [`
`27`	`27`	`{`
`28`		`- "id": "limit set 1_EX",`
	`28`	`+ "id": "limit set 1",`
`29`	`29`	`"permanentLimit": 800.8,`
`30`	`30`	`"temporaryLimits": [`
`31`	`31`	`{`
`@@ -44,7 +44,7 @@`
`44`	`44`	`],`
`45`	`45`	`"currentLimits": [`
`46`	`46`	`{`
`47`		`- "id": "limit set 1_OR",`
	`47`	`+ "id": "limit set 1",`
`48`	`48`	`"permanentLimit": 700.4,`
`49`	`49`	`"temporaryLimits": [`
`50`	`50`	`{`
`@@ -56,7 +56,7 @@`
`56`	`56`	`"applicability": "SIDE1"`
`57`	`57`	`},`
`58`	`58`	`{`
`59`		`- "id": "limit set 1_EX",`
	`59`	`+ "id": "limit set 1",`
`60`	`60`	`"permanentLimit": 800.8,`
`61`	`61`	`"temporaryLimits": [`
`62`	`62`	`{`
`@@ -73,8 +73,8 @@`
`73`	`73`	`"applicability": "SIDE2"`
`74`	`74`	`}`
`75`	`75`	`],`
`76`		`- "selectedOperationalLimitsGroup1": "limit set 1_OR",`
`77`		`- "selectedOperationalLimitsGroup2": "limit set 1_EX",`
	`76`	`+ "selectedOperationalLimitsGroup1": "limit set 1",`
	`77`	`+ "selectedOperationalLimitsGroup2": "limit set 1",`
`78`	`78`	`"r": 9.0,`
`79`	`79`	`"x": 10.0,`
`80`	`80`	`"g1": 7.0,`