From 1c6f2e556559a70cbee8510fd0bbc23db1a2fedc Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Tue, 9 Jul 2024 10:26:20 +0200 Subject: [PATCH] Upgrade to powsybl dependencies 2024.2.0 Signed-off-by: Franck LECUYER --- pom.xml | 4 +--- .../service/VoltageInitWorkerService.java | 2 +- .../service/parameters/ParametersTest.java | 3 +++ .../reporter_buildOpenReacParameters.json | 22 ++++++++--------- ...dOpenReacParameters_caseRelativeFalse.json | 24 +++++++++---------- ...ldOpenReacParameters_caseRelativeTrue.json | 24 +++++++++---------- ...ReacParameters_withLimitModifications.json | 22 ++++++++--------- ...orter_fourSubstations_noVoltageLimits.json | 22 ++++++++--------- 8 files changed, 62 insertions(+), 61 deletions(-) diff --git a/pom.xml b/pom.xml index 4a7eaea..8cda13a 100644 --- a/pom.xml +++ b/pom.xml @@ -49,11 +49,10 @@ - 30 + 31 0.7.0 3.11.1 org.gridsuite.voltageinit.server - 1.11.0 @@ -122,7 +121,6 @@ com.powsybl powsybl-ws-commons - ${powsybl-ws-commons.version} org.springframework.cloud diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java index 5c63182..e45521b 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java +++ b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java @@ -89,7 +89,7 @@ protected CompletableFuture getCompletableFuture(VoltageInitRunC } @Override - protected void handleNonCancellationException(AbstractResultContext resultContext, Exception exception) { + protected void handleNonCancellationException(AbstractResultContext resultContext, Exception exception, AtomicReference rootReporter) { Map errorIndicators = new HashMap<>(); errorIndicators.put(ERROR, ERROR_DURING_VOLTAGE_PROFILE_INITIALISATION); resultService.insertErrorResult(resultContext.getResultUuid(), errorIndicators); diff --git a/src/test/java/org/gridsuite/voltageinit/server/service/parameters/ParametersTest.java b/src/test/java/org/gridsuite/voltageinit/server/service/parameters/ParametersTest.java index 9a4ba3f..f62f581 100644 --- a/src/test/java/org/gridsuite/voltageinit/server/service/parameters/ParametersTest.java +++ b/src/test/java/org/gridsuite/voltageinit/server/service/parameters/ParametersTest.java @@ -152,6 +152,9 @@ private ListAssert testsBuildSpecificVoltageLimitsCommon(L context.setReportNode(ReportNode.newRootReportNode().withMessageTemplate(COMPUTATION_TYPE, COMPUTATION_TYPE).build()); final OpenReacParameters openReacParameters = voltageInitParametersService.buildOpenReacParameters(context, network); log.debug("openReac build parameters report: {}", mapper.writeValueAsString(context.getReportNode())); + System.out.println("*********** report = "); + System.out.println(mapper.writeValueAsString(context.getReportNode())); + //assertEquals(TestUtils.resourceToString(reportFilename), mapper.writerWithDefaultPrettyPrinter().writeValueAsString(context.getReportNode())); JSONAssert.assertEquals("build parameters logs", TestUtils.resourceToString(reportFilename), mapper.writeValueAsString(context.getReportNode()), REPORTER_COMPARATOR); return assertThat(openReacParameters.getSpecificVoltageLimits()).as("SpecificVoltageLimits"); } diff --git a/src/test/resources/reporter_buildOpenReacParameters.json b/src/test/resources/reporter_buildOpenReacParameters.json index 42bba3b..c56eda3 100644 --- a/src/test/resources/reporter_buildOpenReacParameters.json +++ b/src/test/resources/reporter_buildOpenReacParameters.json @@ -1,5 +1,14 @@ { - "version": "2.0", + "version": "2.1", + "dictionaries": { + "default": { + "VoltageInit": "VoltageInit", + "VoltageInitParameters": "VoltageInit parameters", + "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", + "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", + "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" + } + }, "reportRoot": { "messageKey": "VoltageInit", "children": [ @@ -64,15 +73,6 @@ } ] } - ], - "dictionaries": { - "default": { - "VoltageInit": "VoltageInit", - "VoltageInitParameters": "VoltageInit parameters", - "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", - "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", - "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" - } - } + ] } } diff --git a/src/test/resources/reporter_buildOpenReacParameters_caseRelativeFalse.json b/src/test/resources/reporter_buildOpenReacParameters_caseRelativeFalse.json index 18d81d7..20b8927 100644 --- a/src/test/resources/reporter_buildOpenReacParameters_caseRelativeFalse.json +++ b/src/test/resources/reporter_buildOpenReacParameters_caseRelativeFalse.json @@ -1,5 +1,15 @@ { - "version": "2.0", + "version": "2.1", + "dictionaries": { + "default": { + "restrictedVoltageLevels": "The modifications to the low limits for certain voltage levels have been restricted to avoid negative voltage limits: ${joinedVoltageLevelsIds}", + "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", + "VoltageInitParameters": "VoltageInit parameters", + "VoltageInit": "VoltageInit", + "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", + "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" + } + }, "reportRoot": { "messageKey": "VoltageInit", "children": [ @@ -134,16 +144,6 @@ } ] } - ], - "dictionaries": { - "default": { - "restrictedVoltageLevels": "The modifications to the low limits for certain voltage levels have been restricted to avoid negative voltage limits: ${joinedVoltageLevelsIds}", - "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", - "VoltageInitParameters": "VoltageInit parameters", - "VoltageInit": "VoltageInit", - "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", - "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" - } - } + ] } } diff --git a/src/test/resources/reporter_buildOpenReacParameters_caseRelativeTrue.json b/src/test/resources/reporter_buildOpenReacParameters_caseRelativeTrue.json index dec193d..a61670a 100644 --- a/src/test/resources/reporter_buildOpenReacParameters_caseRelativeTrue.json +++ b/src/test/resources/reporter_buildOpenReacParameters_caseRelativeTrue.json @@ -1,5 +1,15 @@ { - "version": "2.0", + "version": "2.1", + "dictionaries": { + "default": { + "restrictedVoltageLevels": "The modifications to the low limits for certain voltage levels have been restricted to avoid negative voltage limits: ${joinedVoltageLevelsIds}", + "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", + "VoltageInitParameters": "VoltageInit parameters", + "VoltageInit": "VoltageInit", + "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", + "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" + } + }, "reportRoot": { "messageKey": "VoltageInit", "children": [ @@ -113,16 +123,6 @@ } ] } - ], - "dictionaries": { - "default": { - "restrictedVoltageLevels": "The modifications to the low limits for certain voltage levels have been restricted to avoid negative voltage limits: ${joinedVoltageLevelsIds}", - "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", - "VoltageInitParameters": "VoltageInit parameters", - "VoltageInit": "VoltageInit", - "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", - "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" - } - } + ] } } diff --git a/src/test/resources/reporter_buildOpenReacParameters_withLimitModifications.json b/src/test/resources/reporter_buildOpenReacParameters_withLimitModifications.json index e6e2ee4..b9e839c 100644 --- a/src/test/resources/reporter_buildOpenReacParameters_withLimitModifications.json +++ b/src/test/resources/reporter_buildOpenReacParameters_withLimitModifications.json @@ -1,5 +1,14 @@ { - "version": "2.0", + "version": "2.1", + "dictionaries": { + "default": { + "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", + "VoltageInitParameters": "VoltageInit parameters", + "VoltageInit": "VoltageInit", + "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", + "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" + } + }, "reportRoot": { "messageKey": "VoltageInit", "children": [ @@ -122,15 +131,6 @@ } ] } - ], - "dictionaries": { - "default": { - "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", - "VoltageInitParameters": "VoltageInit parameters", - "VoltageInit": "VoltageInit", - "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", - "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" - } - } + ] } } diff --git a/src/test/resources/reporter_fourSubstations_noVoltageLimits.json b/src/test/resources/reporter_fourSubstations_noVoltageLimits.json index ae64e19..353ddcb 100644 --- a/src/test/resources/reporter_fourSubstations_noVoltageLimits.json +++ b/src/test/resources/reporter_fourSubstations_noVoltageLimits.json @@ -1,5 +1,14 @@ { - "version": "2.0", + "version": "2.1", + "dictionaries": { + "default": { + "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", + "VoltageInitParameters": "VoltageInit parameters", + "VoltageInit": "VoltageInit", + "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", + "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" + } + }, "reportRoot": { "messageKey": "VoltageInit", "children": [ @@ -101,15 +110,6 @@ } ] } - ], - "dictionaries": { - "default": { - "voltageLimitModifications": "Voltage limits of ${nbVoltageLimitModifications} voltage levels have been modified according to user input.", - "VoltageInitParameters": "VoltageInit parameters", - "VoltageInit": "VoltageInit", - "missingVoltageLimits": "Missing voltage limits of ${nbMissingVoltageLimits} voltage levels have been replaced with user-defined default values.", - "voltageLimitModified": "Voltage limits of ${voltageLevelId} modified: low voltage limit = ${lowVoltageLimit}, high voltage limit = ${highVoltageLimit}" - } - } + ] } }