withMessageTemplate fix

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

Author: BOUTIER Charly

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java

@@ -228,13 +228,13 @@ private static void logContingencyEquipmentsNotFound(SecurityAnalysisRunContext
         }
 
         ReportNode elementsNotFoundSubReporter = runContext.getReportNode().newReportNode()
-                .withMessageTemplate("notFoundEquipments")
+                .withMessageTemplate("security.analysis.server.notFoundEquipments")
                 .add();
 
         contingencyInfosList.forEach(contingencyInfos -> {
             String elementsIds = String.join(", ", contingencyInfos.getNotFoundElements());
             elementsNotFoundSubReporter.newReportNode()
-                    .withMessageTemplate("contingencyEquipmentNotFound")
+                    .withMessageTemplate("security.analysis.server.contingencyEquipmentNotFound")
                     .withUntypedValue("elementsIds", elementsIds)
                     .withUntypedValue("contingencyId", contingencyInfos.getId())
                     .withSeverity(TypedValue.WARN_SEVERITY)
@@ -251,13 +251,13 @@ private void logContingencyEquipmentsNotConnected(SecurityAnalysisRunContext run
         }
 
         ReportNode elementsNotConnectedSubReporter = runContext.getReportNode().newReportNode()
-                .withMessageTemplate("notConnectedEquipments")
+                .withMessageTemplate("security.analysis.server.notConnectedEquipments")
                 .add();
 
         contingencyInfosList.forEach(contingencyInfos -> {
             String elementsIds = String.join(", ", contingencyInfos.getNotConnectedElements());
             elementsNotConnectedSubReporter.newReportNode()
-                    .withMessageTemplate("contingencyEquipmentNotConnected")
+                    .withMessageTemplate("security.analysis.server.contingencyEquipmentNotConnected")
                     .withUntypedValue("elementsIds", elementsIds)
                     .withUntypedValue("contingencyId", contingencyInfos.getId())
                     .withSeverity(TypedValue.WARN_SEVERITY)

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

@@ -1,4 +1,4 @@
-notFoundEquipments = Equipments not found
-contingencyEquipmentNotFound = Cannot find the following equipments ${elementsIds} in contingency ${contingencyId}
-notConnectedEquipments = Equipments not connected
-contingencyEquipmentNotConnected = The following equipments ${elementsIds} in contingency ${contingencyId} are not connected
+security.analysis.server.notFoundEquipments = Equipments not found
+security.analysis.server.contingencyEquipmentNotFound = Cannot find the following equipments ${elementsIds} in contingency ${contingencyId}
+security.analysis.server.notConnectedEquipments = Equipments not connected
+security.analysis.server.contingencyEquipmentNotConnected = The following equipments ${elementsIds} in contingency ${contingencyId} are not connected

src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java

@@ -721,11 +721,11 @@ void runWithReportTestElementsNotFoundAndNotConnected() throws Exception {
         SecurityAnalysisResult securityAnalysisResult = mapper.readValue(resultAsString, SecurityAnalysisResult.class);
         assertThat(RESULT, new MatcherJson<>(mapper, securityAnalysisResult));
 
-        assertLogMessage("Equipments not found", "notFoundEquipments", reportService);
-        assertLogMessage("Cannot find the following equipments wrongId1, wrongId2 in contingency l1", "contingencyEquipmentNotFound", reportService);
+        assertLogMessage("Equipments not found", "security.analysis.server.notFoundEquipments", reportService);
+        assertLogMessage("Cannot find the following equipments wrongId1, wrongId2 in contingency l1", "security.analysis.server.contingencyEquipmentNotFound", reportService);
 
-        assertLogMessage("Equipments not connected", "notConnectedEquipments", reportService);
-        assertLogMessage("The following equipments notConnectedId1 in contingency l4 are not connected", "contingencyEquipmentNotConnected", reportService);
+        assertLogMessage("Equipments not connected", "security.analysis.server.notConnectedEquipments", reportService);
+        assertLogMessage("The following equipments notConnectedId1 in contingency l4 are not connected", "security.analysis.server.contingencyEquipmentNotConnected", reportService);
     }
 
     @Test