Upgrade to powsybl-dependencies v2025.0.0 (#17)

Signed-off-by: BOUTIER Charly <[email protected]>

Author: EstherDarkish

pom.xml

@@ -42,7 +42,7 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>38.0.0</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>39.0.0</gridsuite-dependencies.version>
         <jib.from.image>powsybl/java-dynawo:3.0.0</jib.from.image>
         <liquibase-hibernate-package>org.gridsuite.dynamicsecurityanalysis.server</liquibase-hibernate-package>
         <sonar.organization>gridsuite</sonar.organization>

src/main/java/org/gridsuite/dynamicsecurityanalysis/server/report/DynamicSecurityAnalysisServerReportResourceBundle.java

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package org.gridsuite.dynamicsecurityanalysis.server.report;
+
+import com.google.auto.service.AutoService;
+import com.powsybl.commons.report.ReportResourceBundle;
+
+/**
+ * @author Charly Boutier {@literal <charly.boutier at rte-france.com>}
+ */
+@AutoService(ReportResourceBundle.class)
+public final class DynamicSecurityAnalysisServerReportResourceBundle implements ReportResourceBundle {
+
+    public static final String BASE_NAME = "org.gridsuite.dynamicsecurityanalysis.server.reports";
+
+    public String getBaseName() {
+        return BASE_NAME;
+    }
+}

src/main/java/org/gridsuite/dynamicsecurityanalysis/server/service/DynamicSecurityAnalysisWorkerService.java

@@ -289,16 +289,16 @@ private static void enrichContingenciesTimelineReport(SecurityAnalysisReport sec
             if (contingencyReportNode != null) {
                 contingencyReportNode.newReportNode()
                         .withSeverity(postContingencyResult.getStatus() == PostContingencyComputationStatus.CONVERGED ? TypedValue.INFO_SEVERITY : TypedValue.ERROR_SEVERITY)
-                        .withMessageTemplate("saContingencyStatus", INDENT_4 + "Status : ${contingencyStatus}")
+                        .withMessageTemplate("dynamicsecurityanalysis.server.saContingencyStatus")
                         .withUntypedValue("contingencyStatus", postContingencyResult.getStatus().name()).add();
                 if (isNotEmpty(limitViolations)) {
                     ReportNode limitViolationsReportNode = contingencyReportNode.newReportNode()
-                            .withMessageTemplate("limitViolations", INDENT_4 + "Limit Violations")
+                            .withMessageTemplate("dynamicsecurityanalysis.server.limitViolations")
                             .add();
                     for (LimitViolation limitViolation : limitViolations) {
                         limitViolationsReportNode.newReportNode()
                                 .withSeverity(TypedValue.TRACE_SEVERITY)
-                                .withMessageTemplate("limitViolation", INDENT_8 + "${count}. ${limitViolation}")
+                                .withMessageTemplate("dynamicsecurityanalysis.server.limitViolation")
                                 .withUntypedValue("count", limitViolations.indexOf(limitViolation) + 1)
                                 .withUntypedValue("limitViolation", limitViolation.toString())
                                 .add();

src/main/java/org/gridsuite/dynamicsecurityanalysis/server/utils/Utils.java

@@ -31,14 +31,6 @@ public final class Utils {
 
     public static final String RESOURCE_PATH_DELIMITER = "/";
 
-    public static final String INDENT = " ";
-
-    public static final String INDENT_2 = INDENT.repeat(2);
-
-    public static final String INDENT_4 = INDENT_2.repeat(2);
-
-    public static final String INDENT_8 = INDENT_4.repeat(2);
-
     private Utils() {
         throw new AssertionError("Utility class should not be instantiated");
     }

src/main/resources/org/gridsuite/dynamicsecurityanalysis/server/reports.properties

@@ -0,0 +1,3 @@
+dynamicsecurityanalysis.server.saContingencyStatus = Status : ${contingencyStatus}
+dynamicsecurityanalysis.server.limitViolations = Limit Violations
+dynamicsecurityanalysis.server.limitViolation = ${count}. ${limitViolation}

src/main/resources/org/gridsuite/dynamicsecurityanalysis/server/reports_en_US.properties

@@ -0,0 +1 @@
+

src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerTest.java

@@ -285,8 +285,10 @@ void testRunWithReport() throws Exception {
         doAnswer(invocation -> {
             Object[] args = invocation.getArguments();
             if (args[0] instanceof DynamicSecurityAnalysisRunContext runContext && runContext.getReportInfos().reportUuid() != null) {
-                ReportNode dsaReportNode = runContext.getReportNode().newReportNode().withMessageTemplate("dsa", "").add();
-                dsaReportNode.newReportNode().withMessageTemplate("saContingency", "Contingency '${contingencyId}'")
+                ReportNode dsaReportNode = runContext.getReportNode().newReportNode()
+                        .withResourceBundles("i18n.reports")
+                        .withMessageTemplate("dsa").add();
+                dsaReportNode.newReportNode().withMessageTemplate("saContingency")
                         .withUntypedValue("contingencyId", "contingencyId01")
                         .add();
             }

src/test/resources/i18n/reports.properties

@@ -0,0 +1,2 @@
+dsa = empty
+saContingency = Contingency '${contingencyId}'