Skip to content

Commit 9e55802

Browse files
EtienneLtEtienneLt
committed
Merge branch 'main' into gridsuite-dependencies-v42.0.0
Signed-off-by: Etienne LESOT <[email protected]>
2 parents 1e1ac4a + 522200f commit 9e55802

8 files changed

+21
-23
lines changed

‎pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@
4949
</developers>
5050

5151
<properties>
52-
5352
<gridsuite-dependencies.version>42.0.0</gridsuite-dependencies.version>
54-
<powsybl-open-reac.version>0.13.0</powsybl-open-reac.version>
53+
<powsybl-open-reac.version>0.14.0</powsybl-open-reac.version>
5554
<powsybl-optimizer-commons.version>0.13.0</powsybl-optimizer-commons.version>
5655
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
5756
<liquibase-hibernate-package>org.gridsuite.voltageinit.server</liquibase-hibernate-package>

‎src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.powsybl.ws.commons.computation.service.NotificationService;
1515
import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
1616
import com.powsybl.ws.commons.computation.utils.FilterUtils;
17-
import org.apache.commons.collections4.CollectionUtils;
1817
import org.gridsuite.voltageinit.server.dto.BusVoltage;
1918
import org.gridsuite.voltageinit.server.dto.ReactiveSlack;
2019
import org.gridsuite.voltageinit.server.dto.VoltageInitResult;
@@ -92,11 +91,11 @@ private static VoltageInitResult fromEntity(VoltageInitResultEntity resultEntity
9291
.sorted(Map.Entry.comparingByKey(String.CASE_INSENSITIVE_ORDER))
9392
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (collisionValue1, collisionValue2) -> collisionValue1, LinkedHashMap::new));
9493
List<ReactiveSlack> reactiveSlacks = resultEntity.getReactiveSlacks().stream()
95-
.filter(slack -> CollectionUtils.isEmpty(voltageLevelIds) || voltageLevelIds.contains(slack.getVoltageLevelId()))
94+
.filter(slack -> voltageLevelIds == null || voltageLevelIds.contains(slack.getVoltageLevelId()))
9695
.map(slack -> new ReactiveSlack(slack.getVoltageLevelId(), slack.getBusId(), slack.getSlack()))
9796
.toList();
9897
List<BusVoltage> busVoltages = resultEntity.getBusVoltages().stream()
99-
.filter(bv -> CollectionUtils.isEmpty(voltageLevelIds) || voltageLevelIds.contains(bv.getVoltageLevelId()))
98+
.filter(bv -> voltageLevelIds == null || voltageLevelIds.contains(bv.getVoltageLevelId()))
10099
.map(bv -> new BusVoltage(bv.getVoltageLevelId(), bv.getBusId(), bv.getV(), bv.getAngle()))
101100
.toList();
102101
return new VoltageInitResult(resultEntity.getResultUuid(), resultEntity.getWriteTimeStamp(), sortedIndicators,

‎src/main/java/org/gridsuite/voltageinit/server/service/parameters/VoltageInitParametersService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ private static void logVoltageLimitsModifications(final ReportNode reporter,
346346
.withTypedValue("voltageLevelId", voltageLevel.getId(), TypedValue.VOLTAGE_LEVEL)
347347
.withTypedValue("lowVoltageLimit", computeRelativeVoltageLevel(initialLowVoltageLimit, voltageLimits.get(VoltageLimitType.LOW_VOLTAGE_LIMIT)), TypedValue.VOLTAGE)
348348
.withTypedValue("highVoltageLimit", computeRelativeVoltageLevel(initialHighVoltage, voltageLimits.get(VoltageLimitType.HIGH_VOLTAGE_LIMIT)), TypedValue.VOLTAGE)
349-
.withSeverity(TypedValue.TRACE_SEVERITY)
349+
.withSeverity(TypedValue.DETAIL_SEVERITY)
350350
.add();
351351
});
352352
}

‎src/test/resources/reporter_buildOpenReacParameters.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"value": "NaN → 10.0 kV",
3131
"type": "VOLTAGE"
3232
},
33-
"reportSeverity": { "value": "TRACE", "type": "SEVERITY" }
33+
"reportSeverity": { "value": "DETAIL", "type": "SEVERITY" }
3434
}
3535
},
3636
{
@@ -39,7 +39,7 @@
3939
"voltageLevelId": { "value": "VLHV1", "type": "VOLTAGE_LEVEL" },
4040
"lowVoltageLimit": { "value": "NaN → 5.0 kV", "type": "VOLTAGE" },
4141
"highVoltageLimit": { "value": "20.0 kV", "type": "VOLTAGE" },
42-
"reportSeverity": { "value": "TRACE", "type": "SEVERITY" }
42+
"reportSeverity": { "value": "DETAIL", "type": "SEVERITY" }
4343
}
4444
},
4545
{
@@ -54,7 +54,7 @@
5454
"value": "NaN → 88.0 kV",
5555
"type": "VOLTAGE"
5656
},
57-
"reportSeverity": { "value": "TRACE", "type": "SEVERITY" }
57+
"reportSeverity": { "value": "DETAIL", "type": "SEVERITY" }
5858
}
5959
},
6060
{

‎src/test/resources/reporter_buildOpenReacParameters_caseRelativeFalse.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"type": "VOLTAGE_LEVEL"
4343
},
4444
"reportSeverity": {
45-
"value": "TRACE",
45+
"value": "DETAIL",
4646
"type": "SEVERITY"
4747
},
4848
"highVoltageLimit": {
@@ -63,7 +63,7 @@
6363
"type": "VOLTAGE_LEVEL"
6464
},
6565
"reportSeverity": {
66-
"value": "TRACE",
66+
"value": "DETAIL",
6767
"type": "SEVERITY"
6868
},
6969
"highVoltageLimit": {
@@ -84,7 +84,7 @@
8484
"type": "VOLTAGE_LEVEL"
8585
},
8686
"reportSeverity": {
87-
"value": "TRACE",
87+
"value": "DETAIL",
8888
"type": "SEVERITY"
8989
},
9090
"highVoltageLimit": {
@@ -105,7 +105,7 @@
105105
"type": "VOLTAGE_LEVEL"
106106
},
107107
"reportSeverity": {
108-
"value": "TRACE",
108+
"value": "DETAIL",
109109
"type": "SEVERITY"
110110
},
111111
"highVoltageLimit": {

‎src/test/resources/reporter_buildOpenReacParameters_caseRelativeTrue.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"type": "VOLTAGE_LEVEL"
4343
},
4444
"reportSeverity": {
45-
"value": "TRACE",
45+
"value": "DETAIL",
4646
"type": "SEVERITY"
4747
},
4848
"highVoltageLimit": {
@@ -63,7 +63,7 @@
6363
"type": "VOLTAGE_LEVEL"
6464
},
6565
"reportSeverity": {
66-
"value": "TRACE",
66+
"value": "DETAIL",
6767
"type": "SEVERITY"
6868
},
6969
"highVoltageLimit": {
@@ -84,7 +84,7 @@
8484
"type": "VOLTAGE_LEVEL"
8585
},
8686
"reportSeverity": {
87-
"value": "TRACE",
87+
"value": "DETAIL",
8888
"type": "SEVERITY"
8989
},
9090
"highVoltageLimit": {

‎src/test/resources/reporter_buildOpenReacParameters_withLimitModifications.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"type": "VOLTAGE_LEVEL"
3030
},
3131
"reportSeverity": {
32-
"value": "TRACE",
32+
"value": "DETAIL",
3333
"type": "SEVERITY"
3434
},
3535
"highVoltageLimit": {
@@ -50,7 +50,7 @@
5050
"type": "VOLTAGE_LEVEL"
5151
},
5252
"reportSeverity": {
53-
"value": "TRACE",
53+
"value": "DETAIL",
5454
"type": "SEVERITY"
5555
},
5656
"highVoltageLimit": {
@@ -71,7 +71,7 @@
7171
"type": "VOLTAGE_LEVEL"
7272
},
7373
"reportSeverity": {
74-
"value": "TRACE",
74+
"value": "DETAIL",
7575
"type": "SEVERITY"
7676
},
7777
"highVoltageLimit": {
@@ -92,7 +92,7 @@
9292
"type": "VOLTAGE_LEVEL"
9393
},
9494
"reportSeverity": {
95-
"value": "TRACE",
95+
"value": "DETAIL",
9696
"type": "SEVERITY"
9797
},
9898
"highVoltageLimit": {

‎src/test/resources/reporter_fourSubstations_noVoltageLimits.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"type": "VOLTAGE_LEVEL"
3030
},
3131
"reportSeverity": {
32-
"value": "TRACE",
32+
"value": "DETAIL",
3333
"type": "SEVERITY"
3434
},
3535
"highVoltageLimit": {
@@ -50,7 +50,7 @@
5050
"type": "VOLTAGE_LEVEL"
5151
},
5252
"reportSeverity": {
53-
"value": "TRACE",
53+
"value": "DETAIL",
5454
"type": "SEVERITY"
5555
},
5656
"highVoltageLimit": {
@@ -71,7 +71,7 @@
7171
"type": "VOLTAGE_LEVEL"
7272
},
7373
"reportSeverity": {
74-
"value": "TRACE",
74+
"value": "DETAIL",
7575
"type": "SEVERITY"
7676
},
7777
"highVoltageLimit": {

0 commit comments

Comments
 (0)