Skip to content

Commit 8d9917a

Browse files
EstherDarkishEstherDarkish
authored
Upgrade to powsybl-dependencies v2025.0.1 (#102)
Signed-off-by: BOUTIER Charly <[email protected]>
1 parent a81e02d commit 8d9917a

14 files changed

+140
-79
lines changed

‎pom.xml‎

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

5151
<properties>
52-
<gridsuite-dependencies.version>38.0.0</gridsuite-dependencies.version>
53-
<powsybl-open-reac.version>0.11.0</powsybl-open-reac.version>
52+
<gridsuite-dependencies.version>39.0.0</gridsuite-dependencies.version>
53+
<powsybl-open-reac.version>0.12.0</powsybl-open-reac.version>
54+
<powsybl-optimizer-commons.version>0.12.0</powsybl-optimizer-commons.version>
5455
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
5556
<liquibase-hibernate-package>org.gridsuite.voltageinit.server</liquibase-hibernate-package>
5657
<sonar.organization>gridsuite</sonar.organization>
@@ -113,6 +114,12 @@
113114
<artifactId>powsybl-open-reac</artifactId>
114115
<version>${powsybl-open-reac.version}</version>
115116
</dependency>
117+
118+
<dependency>
119+
<groupId>com.powsybl</groupId>
120+
<artifactId>powsybl-optimizer-commons</artifactId>
121+
<version>${powsybl-optimizer-commons.version}</version>
122+
</dependency>
116123
</dependencies>
117124
</dependencyManagement>
118125

@@ -131,6 +138,10 @@
131138
<groupId>com.powsybl</groupId>
132139
<artifactId>powsybl-open-reac</artifactId>
133140
</dependency>
141+
<dependency>
142+
<groupId>com.powsybl</groupId>
143+
<artifactId>powsybl-optimizer-commons</artifactId>
144+
</dependency>
134145
<dependency>
135146
<groupId>com.powsybl</groupId>
136147
<artifactId>powsybl-ws-commons</artifactId>

‎src/main/java/org/gridsuite/voltageinit/server/report/VoltageInitServerReportResourceBundle.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/**
2+
* Copyright (c) 2025, RTE (http://www.rte-france.com)
3+
* This Source Code Form is subject to the terms of the Mozilla Public
4+
* License, v. 2.0. If a copy of the MPL was not distributed with this
5+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
* SPDX-License-Identifier: MPL-2.0
7+
*/
8+
package org.gridsuite.voltageinit.server.report;
9+
10+
import com.google.auto.service.AutoService;
11+
import com.powsybl.commons.report.ReportResourceBundle;
12+
13+
/**
14+
* @author Charly Boutier {@literal <charly.boutier at rte-france.com>}
15+
*/
16+
@AutoService(ReportResourceBundle.class)
17+
public final class VoltageInitServerReportResourceBundle implements ReportResourceBundle {
18+
19+
public static final String BASE_NAME = "org.gridsuite.voltageinit.server.reports";
20+
21+
public String getBaseName() {
22+
return BASE_NAME;
23+
}
24+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected void postRun(VoltageInitRunContext runContext, AtomicReference<ReportN
142142
boolean resultCheckReactiveSlacks = checkReactiveSlacksOverThreshold(result, reactiveSlacksThreshold);
143143
if (resultCheckReactiveSlacks) {
144144
runContext.getReportNode().newReportNode()
145-
.withMessageTemplate("reactiveSlacksOverThreshold", "Reactive slack exceeds ${threshold} MVar for at least one bus")
145+
.withMessageTemplate("voltage.init.server.reactiveSlacksOverThreshold")
146146
.withUntypedValue("threshold", reactiveSlacksThreshold)
147147
.withSeverity(TypedValue.WARN_SEVERITY)
148148
.add();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private static CounterToIncrement generateHighVoltageLimit(List<VoltageLimitOver
217217
public OpenReacParameters buildOpenReacParameters(VoltageInitRunContext context, Network network) {
218218
final long startTime = System.nanoTime();
219219
final ReportNode reportNode = context.getReportNode().newReportNode()
220-
.withMessageTemplate("VoltageInitParameters", "VoltageInit parameters")
220+
.withMessageTemplate("voltage.init.server.VoltageInitParameters")
221221
.withTypedValue("parameters_id", Objects.toString(context.getParametersUuid()), "ID")
222222
.add();
223223
OpenReacParameters parameters = new OpenReacParameters();
@@ -297,7 +297,7 @@ private List<String> toEquipmentIdsList(UUID networkUuid, String variantId, List
297297
private static void logRestrictedVoltageLevels(final ReportNode reportNode, final Map<String, Double> voltageLevelsIdsRestricted) {
298298
if (!voltageLevelsIdsRestricted.isEmpty()) {
299299
reportNode.newReportNode()
300-
.withMessageTemplate("restrictedVoltageLevels", "The modifications to the low limits for certain voltage levels have been restricted to avoid negative voltage limits: ${joinedVoltageLevelsIds}")
300+
.withMessageTemplate("voltage.init.server.restrictedVoltageLevels")
301301
.withUntypedValue("joinedVoltageLevelsIds", voltageLevelsIdsRestricted
302302
.entrySet()
303303
.stream()
@@ -312,12 +312,12 @@ private static void logVoltageLimitsModificationCounters(final ReportNode report
312312
final MutableInt counterMissingVoltageLimits,
313313
final MutableInt counterVoltageLimitModifications) {
314314
reportNode.newReportNode()
315-
.withMessageTemplate("missingVoltageLimits", "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.")
315+
.withMessageTemplate("voltage.init.server.missingVoltageLimits")
316316
.withUntypedValue("nbMissingVoltageLimits", counterMissingVoltageLimits.longValue())
317317
.withSeverity(TypedValue.INFO_SEVERITY)
318318
.add();
319319
reportNode.newReportNode()
320-
.withMessageTemplate("voltageLimitModifications", "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.")
320+
.withMessageTemplate("voltage.init.server.voltageLimitModifications")
321321
.withUntypedValue("nbVoltageLimitModifications", counterVoltageLimitModifications.longValue())
322322
.withSeverity(TypedValue.INFO_SEVERITY)
323323
.add();
@@ -342,7 +342,7 @@ private static void logVoltageLimitsModifications(final ReportNode reporter,
342342
final double initialLowVoltageLimit = voltageLevel.getLowVoltageLimit();
343343
final double initialHighVoltage = voltageLevel.getHighVoltageLimit();
344344
reporter.newReportNode()
345-
.withMessageTemplate("voltageLimitModified", "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}")
345+
.withMessageTemplate("voltage.init.server.voltageLimitModified")
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)

‎src/main/resources/org/gridsuite/voltageinit/server/reports.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
voltage.init.server.VoltageInitParameters = VoltageInit parameters
2+
voltage.init.server.missingVoltageLimits = Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.
3+
voltage.init.server.reactiveSlacksOverThreshold = Reactive slack exceeds ${threshold} MVar for at least one bus
4+
voltage.init.server.restrictedVoltageLevels = The modifications to the low limits for certain voltage levels have been restricted to avoid negative voltage limits: ${joinedVoltageLevelsIds}
5+
voltage.init.server.voltageLimitModifications = Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.
6+
voltage.init.server.voltageLimitModified = Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}

‎src/main/resources/org/gridsuite/voltageinit/server/reports_en_US.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎src/test/java/org/gridsuite/voltageinit/server/service/parameters/ParametersTest.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class ParametersTest {
8181

8282
private static final JSONComparator REPORTER_COMPARATOR = new CustomComparator(JSONCompareMode.NON_EXTENSIBLE,
8383
// ignore field having uuid changing each run
84-
new Customization("reportRoot.children[*].values.parameters_id.value", (o1, o2) -> (o1 == null) == (o2 == null))
84+
new Customization("reportRoot.children[messageKey=voltage.init.server.VoltageInitParameters].values.parameters_id.value", (o1, o2) -> (o1 == null) == (o2 == null))
8585
);
8686

8787
private Network network;
@@ -149,7 +149,9 @@ private ListAssert<VoltageLimitOverride> testsBuildSpecificVoltageLimitsCommon(L
149149
new VoltageInitParametersEntity(null, null, "", voltageLimits, null, EquipmentsSelectionType.ALL_EXCEPT, null, EquipmentsSelectionType.NONE_EXCEPT, null, EquipmentsSelectionType.NONE_EXCEPT, 100., 0., false)
150150
);
151151
final VoltageInitRunContext context = new VoltageInitRunContext(NETWORK_UUID, VARIANT_ID_1, null, REPORT_UUID, null, "", "", voltageInitParameters.getId());
152-
context.setReportNode(ReportNode.newRootReportNode().withMessageTemplate(COMPUTATION_TYPE, COMPUTATION_TYPE).build());
152+
context.setReportNode(ReportNode.newRootReportNode()
153+
.withResourceBundles("i18n.reports")
154+
.withMessageTemplate(COMPUTATION_TYPE).build());
153155
final OpenReacParameters openReacParameters = voltageInitParametersService.buildOpenReacParameters(context, network);
154156
log.debug("openReac build parameters report: {}", mapper.writeValueAsString(context.getReportNode()));
155157
JSONAssert.assertEquals("build parameters logs", TestUtils.resourceToString(reportFilename), mapper.writeValueAsString(context.getReportNode()), REPORTER_COMPARATOR);
@@ -260,7 +262,9 @@ void testsBuildSpecificVoltageLimitsWithFourSubstationStudy() throws Exception {
260262
);
261263

262264
final VoltageInitRunContext context = new VoltageInitRunContext(networkUuid, variantId, null, REPORT_UUID, null, "", "", voltageInitParameters.getId());
263-
context.setReportNode(ReportNode.newRootReportNode().withMessageTemplate("VoltageInit", "VoltageInit").build());
265+
context.setReportNode(ReportNode.newRootReportNode()
266+
.withResourceBundles("i18n.reports")
267+
.withMessageTemplate("VoltageInit").build());
264268
final OpenReacParameters openReacParameters = voltageInitParametersService.buildOpenReacParameters(context, network);
265269
if (log.isDebugEnabled()) {
266270
log.debug("openReac build parameters report: {}", mapper.writeValueAsString(context.getReportNode()));

‎src/test/java/org/gridsuite/voltageinit/utils/ReportUtilTest.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
class ReportUtilTest {
2020
@Test
2121
void test() {
22-
ReportNode rootNode = ReportNode.newRootReportNode().withMessageTemplate("VoltageInit", "VoltageInit").build();
23-
ReportNode child1Node = rootNode.newReportNode().withMessageTemplate("key1", "template1").add();
24-
ReportNode child2Node = rootNode.newReportNode().withMessageTemplate("key2", "template2").add();
25-
ReportNode child11Node = child1Node.newReportNode().withMessageTemplate("key11", "template11").add();
26-
ReportNode child21Node = child2Node.newReportNode().withMessageTemplate("key21", "template21").add();
27-
ReportNode child22Node = child2Node.newReportNode().withMessageTemplate("key22", "template22").add();
28-
ReportNode child221Node = child22Node.newReportNode().withMessageTemplate("key221", "template221").add();
22+
ReportNode rootNode = ReportNode.newRootReportNode()
23+
.withResourceBundles("i18n.reports")
24+
.withMessageTemplate("VoltageInit").build();
25+
ReportNode child1Node = rootNode.newReportNode().withMessageTemplate("key1").add();
26+
ReportNode child2Node = rootNode.newReportNode().withMessageTemplate("key2").add();
27+
ReportNode child11Node = child1Node.newReportNode().withMessageTemplate("key11").add();
28+
ReportNode child21Node = child2Node.newReportNode().withMessageTemplate("key21").add();
29+
ReportNode child22Node = child2Node.newReportNode().withMessageTemplate("key22").add();
30+
ReportNode child221Node = child22Node.newReportNode().withMessageTemplate("key221").add();
2931

3032
assertTrue(ReportUtil.checkReportWithKey("VoltageInit", rootNode));
3133
assertFalse(ReportUtil.checkReportWithKey("key", rootNode));

‎src/test/resources/i18n/reports.properties‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
VoltageInit = VoltageInit
2+
key1 = template1
3+
key11 = template11
4+
key2 = template2
5+
key21 = template21
6+
key22 = template22
7+
key221 = template221
8+
voltage.init.server.VoltageInitParameters = VoltageInit parameters
9+
voltage.init.server.missingVoltageLimits = Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.
10+
voltage.init.server.reactiveSlacksOverThreshold = Reactive slack exceeds ${threshold} MVar for at least one bus
11+
voltage.init.server.restrictedVoltageLevels = The modifications to the low limits for certain voltage levels have been restricted to avoid negative voltage limits: ${joinedVoltageLevelsIds}
12+
voltage.init.server.voltageLimitModifications = Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.
13+
voltage.init.server.voltageLimitModified = Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}

‎src/test/resources/reporter_buildOpenReacParameters.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"version": "2.1",
2+
"version": "3.0",
33
"dictionaries": {
44
"default": {
55
"VoltageInit": "VoltageInit",
6-
"VoltageInitParameters": "VoltageInit parameters",
7-
"missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.",
8-
"voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.",
9-
"voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}"
6+
"voltage.init.server.VoltageInitParameters": "VoltageInit parameters",
7+
"voltage.init.server.missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.",
8+
"voltage.init.server.voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.",
9+
"voltage.init.server.voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}"
1010
}
1111
},
1212
"reportRoot": {
1313
"messageKey": "VoltageInit",
1414
"children": [
1515
{
16-
"messageKey": "VoltageInitParameters",
16+
"messageKey": "voltage.init.server.VoltageInitParameters",
1717
"values": {
1818
"parameters_id": {
1919
"value": "11111111-1111-1111-1111-111111111111",
@@ -22,7 +22,7 @@
2222
},
2323
"children": [
2424
{
25-
"messageKey": "voltageLimitModified",
25+
"messageKey": "voltage.init.server.voltageLimitModified",
2626
"values": {
2727
"voltageLevelId": { "value": "VLHV2", "type": "VOLTAGE_LEVEL" },
2828
"lowVoltageLimit": { "value": "10.0 kV", "type": "VOLTAGE" },
@@ -34,7 +34,7 @@
3434
}
3535
},
3636
{
37-
"messageKey": "voltageLimitModified",
37+
"messageKey": "voltage.init.server.voltageLimitModified",
3838
"values": {
3939
"voltageLevelId": { "value": "VLHV1", "type": "VOLTAGE_LEVEL" },
4040
"lowVoltageLimit": { "value": "NaN → 5.0 kV", "type": "VOLTAGE" },
@@ -43,7 +43,7 @@
4343
}
4444
},
4545
{
46-
"messageKey": "voltageLimitModified",
46+
"messageKey": "voltage.init.server.voltageLimitModified",
4747
"values": {
4848
"voltageLevelId": { "value": "VLLOAD", "type": "VOLTAGE_LEVEL" },
4949
"lowVoltageLimit": {
@@ -58,14 +58,14 @@
5858
}
5959
},
6060
{
61-
"messageKey": "missingVoltageLimits",
61+
"messageKey": "voltage.init.server.missingVoltageLimits",
6262
"values": {
6363
"nbMissingVoltageLimits": { "value": 3 },
6464
"reportSeverity": { "value": "INFO", "type": "SEVERITY" }
6565
}
6666
},
6767
{
68-
"messageKey": "voltageLimitModifications",
68+
"messageKey": "voltage.init.server.voltageLimitModifications",
6969
"values": {
7070
"nbVoltageLimitModifications": { "value": 0 },
7171
"reportSeverity": { "value": "INFO", "type": "SEVERITY" }

0 commit comments

Comments
 (0)