Skip to content

Commit 96171f4

Browse files
Mathieu-DeharbeMathieu-Deharbe
authored
removes currentLimits1 and currentLimits2 (#271)
Signed-off-by: Mathieu DEHARBE <[email protected]>
1 parent 3ee80f9 commit 96171f4

File tree

8 files changed

+0
-220
lines changed

8 files changed

+0
-220
lines changed

‎src/main/java/org/gridsuite/network/map/dto/definition/branch/line/LineFormInfos.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,6 @@ public class LineFormInfos extends ElementInfosWithProperties {
5858
@JsonInclude(JsonInclude.Include.NON_EMPTY)
5959
private List<CurrentLimitsData> currentLimits;
6060

61-
//TODO : remove when modification is done
62-
@JsonInclude(JsonInclude.Include.NON_EMPTY)
63-
private List<CurrentLimitsData> currentLimits1;
64-
65-
//TODO : remove when modification is done
66-
@JsonInclude(JsonInclude.Include.NON_EMPTY)
67-
private List<CurrentLimitsData> currentLimits2;
68-
6961
@JsonInclude(JsonInclude.Include.NON_NULL)
7062
private String selectedOperationalLimitsGroup1;
7163

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ public class TwoWindingsTransformerFormInfos extends ElementInfosWithProperties
5757
@JsonInclude(JsonInclude.Include.NON_NULL)
5858
private Double i2;
5959

60-
// TODO : remove currentLimits1 and 2 to leave only currentLimits when modification is done
61-
@JsonInclude(JsonInclude.Include.NON_EMPTY)
62-
private List<CurrentLimitsData> currentLimits1;
63-
64-
@JsonInclude(JsonInclude.Include.NON_EMPTY)
65-
private List<CurrentLimitsData> currentLimits2;
66-
6760
@JsonInclude(JsonInclude.Include.NON_EMPTY)
6861
private List<CurrentLimitsData> currentLimits;
6962

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ private static LineFormInfos toFormInfos(Identifiable<?> identifiable) {
7676
.selectedOperationalLimitsGroup1(line.getSelectedOperationalLimitsGroupId1().orElse(null))
7777
.selectedOperationalLimitsGroup2(line.getSelectedOperationalLimitsGroupId2().orElse(null));
7878

79-
buildCurrentLimits(line.getOperationalLimitsGroups1(), builder::currentLimits1);
80-
buildCurrentLimits(line.getOperationalLimitsGroups2(), builder::currentLimits2);
81-
8279
builder.busOrBusbarSectionId1(getBusOrBusbarSection(terminal1))
8380
.busOrBusbarSectionId2(getBusOrBusbarSection(terminal2));
8481

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ private static TwoWindingsTransformerFormInfos toFormInfos(Identifiable<?> ident
9191
builder.selectedOperationalLimitsGroup1(twoWT.getSelectedOperationalLimitsGroupId1().orElse(null));
9292
builder.selectedOperationalLimitsGroup2(twoWT.getSelectedOperationalLimitsGroupId2().orElse(null));
9393

94-
buildCurrentLimits(twoWT.getOperationalLimitsGroups1(), builder::currentLimits1);
95-
buildCurrentLimits(twoWT.getOperationalLimitsGroups2(), builder::currentLimits2);
96-
9794
builder.operatingStatus(ExtensionUtils.toOperatingStatus(twoWT));
9895
builder.connectablePosition1(ExtensionUtils.toMapConnectablePosition(twoWT, 1))
9996
.connectablePosition2(ExtensionUtils.toMapConnectablePosition(twoWT, 2));

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,6 @@
1111
"q1": 12.2,
1212
"p2": 13.33,
1313
"q2": 14.44,
14-
"currentLimits1": [
15-
{
16-
"id" : "limit set 1",
17-
"permanentLimit":750.4,
18-
"temporaryLimits":[{"name":"IT5","acceptableDuration":2087,"value":300}],
19-
"applicability": null
20-
}
21-
],
22-
"currentLimits2": [
23-
{
24-
"id" : "limit set 1",
25-
"permanentLimit":780.6,
26-
"temporaryLimits":[{"name":"N/A","acceptableDuration":664,"value":2147483647},{"name":"IT20","acceptableDuration":961,"value":1200}],
27-
"applicability": null
28-
}
29-
],
3014
"currentLimits": [
3115
{
3216
"id" : "limit set 1",

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,6 @@
88
"q1": 2.2,
99
"p2": 3.33,
1010
"q2": 4.44,
11-
"currentLimits1": [
12-
{
13-
"id" : "limit set 1",
14-
"permanentLimit":700.4,
15-
"temporaryLimits":[{"name":"IT5","acceptableDuration":300,"value":250.0}],
16-
"applicability": null
17-
}
18-
],
19-
"currentLimits2": [
20-
{
21-
"id" : "limit set 1",
22-
"permanentLimit":800.8,
23-
"temporaryLimits":[{"name":"IT20","acceptableDuration":1200,"value":300.0},{"name":"IT10","acceptableDuration":600,"value":200.0}],
24-
"applicability": null
25-
}
26-
],
2711
"currentLimits": [
2812
{
2913
"id" : "limit set 1",

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

Lines changed: 0 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,6 @@
99
"q1": 2.2,
1010
"p2": 3.33,
1111
"q2": 4.44,
12-
"currentLimits1": [
13-
{
14-
"id": "limit set 1",
15-
"permanentLimit": 700.4,
16-
"temporaryLimits": [
17-
{
18-
"name": "IT5",
19-
"value": 250.0,
20-
"acceptableDuration": 300
21-
}
22-
],
23-
"applicability": null
24-
}
25-
],
26-
"currentLimits2": [
27-
{
28-
"id": "limit set 1",
29-
"permanentLimit": 800.8,
30-
"temporaryLimits": [
31-
{
32-
"name": "IT20",
33-
"value": 300.0,
34-
"acceptableDuration": 1200
35-
},
36-
{
37-
"name": "IT10",
38-
"value": 200.0,
39-
"acceptableDuration": 600
40-
}
41-
],
42-
"applicability": null
43-
}
44-
],
4512
"currentLimits": [
4613
{
4714
"id": "limit set 1",
@@ -100,63 +67,6 @@
10067
"voltageLevelId2": "VLHV2",
10168
"terminal1Connected": true,
10269
"terminal2Connected": true,
103-
"currentLimits1": [
104-
{
105-
"id": "group2",
106-
"permanentLimit": 250.0,
107-
"temporaryLimits": [
108-
{
109-
"name": "temporary1",
110-
"value": 90.0,
111-
"acceptableDuration": 200
112-
}
113-
],
114-
"applicability": null
115-
},
116-
{
117-
"id": "group1",
118-
"permanentLimit": 220.0,
119-
"temporaryLimits": [
120-
{
121-
"name": "temporary2",
122-
"value": 70.0,
123-
"acceptableDuration": 150
124-
},
125-
{
126-
"name": "temporary1",
127-
"value": 50.0,
128-
"acceptableDuration": 100
129-
}
130-
],
131-
"applicability": null
132-
}
133-
],
134-
"currentLimits2": [
135-
{
136-
"id": "group4",
137-
"permanentLimit": 320.0,
138-
"temporaryLimits": [
139-
{
140-
"name": "temporary1",
141-
"value": 130.0,
142-
"acceptableDuration": 200
143-
}
144-
],
145-
"applicability": null
146-
},
147-
{
148-
"id": "group3",
149-
"permanentLimit": 300.0,
150-
"temporaryLimits": [
151-
{
152-
"name": "temporary1",
153-
"value": 110.0,
154-
"acceptableDuration": 150
155-
}
156-
],
157-
"applicability": null
158-
}
159-
],
16070
"currentLimits": [
16171
{
16272
"id": "group2",
@@ -212,7 +122,6 @@
212122
"applicability": "SIDE2"
213123
}
214124
],
215-
216125
"selectedOperationalLimitsGroup1": "group1",
217126
"selectedOperationalLimitsGroup2": "group4",
218127
"r": 3.0,
@@ -237,25 +146,6 @@
237146
"voltageLevelId2": "VLGEN3",
238147
"terminal1Connected": true,
239148
"terminal2Connected": true,
240-
"currentLimits1": [
241-
{
242-
"id": "group1",
243-
"permanentLimit": 220.0,
244-
"temporaryLimits": [
245-
{
246-
"name": "temporary2",
247-
"value": 70.0,
248-
"acceptableDuration": 150
249-
},
250-
{
251-
"name": "temporary1",
252-
"value": 50.0,
253-
"acceptableDuration": 100
254-
}
255-
],
256-
"applicability": null
257-
}
258-
],
259149
"currentLimits": [
260150
{
261151
"id": "group1",
@@ -316,25 +206,6 @@
316206
"voltageLevelId2": "VLGEN3",
317207
"terminal1Connected": true,
318208
"terminal2Connected": true,
319-
"currentLimits2": [
320-
{
321-
"id": "group1",
322-
"permanentLimit": 220.0,
323-
"temporaryLimits": [
324-
{
325-
"name": "temporary2",
326-
"value": 70.0,
327-
"acceptableDuration": 150
328-
},
329-
{
330-
"name": "temporary1",
331-
"value": 50.0,
332-
"acceptableDuration": 100
333-
}
334-
],
335-
"applicability": null
336-
}
337-
],
338209
"currentLimits": [
339210
{
340211
"id": "group1",

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

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,6 @@
55
"voltageLevelId2": "VLGEN3",
66
"terminal1Connected": true,
77
"terminal2Connected": true,
8-
"currentLimits2": [
9-
{
10-
"id": "group1",
11-
"permanentLimit": 220.0,
12-
"temporaryLimits": [
13-
{
14-
"name": "temporary2",
15-
"value": 70.0,
16-
"acceptableDuration": 150
17-
},
18-
{
19-
"name": "temporary1",
20-
"value": 50.0,
21-
"acceptableDuration": 100
22-
}
23-
],
24-
"applicability": null
25-
}
26-
],
278
"currentLimits": [
289
{
2910
"id": "group1",
@@ -66,25 +47,6 @@
6647
"voltageLevelId2": "VLGEN3",
6748
"terminal1Connected": true,
6849
"terminal2Connected": true,
69-
"currentLimits1": [
70-
{
71-
"id": "group1",
72-
"permanentLimit": 220.0,
73-
"temporaryLimits": [
74-
{
75-
"name": "temporary2",
76-
"value": 70.0,
77-
"acceptableDuration": 150
78-
},
79-
{
80-
"name": "temporary1",
81-
"value": 50.0,
82-
"acceptableDuration": 100
83-
}
84-
],
85-
"applicability": null
86-
}
87-
],
8850
"currentLimits": [
8951
{
9052
"id": "group1",

0 commit comments

Comments
 (0)