diff --git a/monitor-server/pom.xml b/monitor-server/pom.xml index 2fe01759..9224a463 100644 --- a/monitor-server/pom.xml +++ b/monitor-server/pom.xml @@ -15,6 +15,8 @@ org.gridsuite.monitor.server 3.3.1 + 1.6.3 + 0.2.0 @@ -29,6 +31,28 @@ + + maven-compiler-plugin + + ${maven.compiler.parameters} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + + + org.projectlombok + lombok-mapstruct-binding + ${lombok-mapstruct-bindings.version} + + + + diff --git a/monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/process/securityanalysis/steps/SecurityAnalysisRunComputationStep.java b/monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/process/securityanalysis/steps/SecurityAnalysisRunComputationStep.java index 1a800f5e..94f5c58d 100644 --- a/monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/process/securityanalysis/steps/SecurityAnalysisRunComputationStep.java +++ b/monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/process/securityanalysis/steps/SecurityAnalysisRunComputationStep.java @@ -19,7 +19,6 @@ import org.gridsuite.monitor.worker.server.dto.parameters.securityanalysis.SecurityAnalysisInputData; import org.gridsuite.monitor.worker.server.process.securityanalysis.SecurityAnalysisStepType; import org.gridsuite.monitor.worker.server.clients.SecurityAnalysisRestClient; -import org.gridsuite.monitor.worker.server.report.MonitorWorkerServerReportResourceBundle; import org.gridsuite.monitor.worker.server.services.SecurityAnalysisParametersService; import org.springframework.stereotype.Component; @@ -62,7 +61,6 @@ public void execute(ProcessStepExecutionContext context) context.setResultInfos(resultInfos); } catch (Exception e) { reportNode.newReportNode() - .withResourceBundles(MonitorWorkerServerReportResourceBundle.BASE_NAME) .withMessageTemplate("monitor.worker.server.securityanalysis.step.error") .withUntypedValue("errorMessage", e.getMessage()) .withSeverity(TypedValue.ERROR_SEVERITY) diff --git a/monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/report/MonitorWorkerServerReportResourceBundleTest.java b/monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/report/MonitorWorkerServerReportResourceBundleTest.java new file mode 100644 index 00000000..f9338746 --- /dev/null +++ b/monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/report/MonitorWorkerServerReportResourceBundleTest.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2026, 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/. + */ +package org.gridsuite.monitor.worker.server.report; + +import com.powsybl.commons.report.ReportResourceBundle; +import org.junit.jupiter.api.Test; + +import java.util.ResourceBundle; +import java.util.ServiceLoader; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNoException; + +/** + * @author Antoine Bouhours + */ +class MonitorWorkerServerReportResourceBundleTest { + + @Test + void reportResourceBundleIsRegisteredViaAutoService() { + ServiceLoader loader = ServiceLoader.load(ReportResourceBundle.class); + + assertThat(loader).anyMatch(MonitorWorkerServerReportResourceBundle.class::isInstance); + } + + @Test + void reportBundleIsFound() { + assertThatNoException().isThrownBy(() -> + ResourceBundle.getBundle(MonitorWorkerServerReportResourceBundle.BASE_NAME) + ); + } +} diff --git a/pom.xml b/pom.xml index 53b011bd..3ba5b7b5 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,6 @@ 49.0.0 gridsuite org.gridsuite:monitor-core - 1.6.3 - 0.2.0 @@ -85,28 +83,6 @@ - - maven-compiler-plugin - - ${maven.compiler.parameters} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - - - org.projectlombok - lombok-mapstruct-binding - ${lombok-mapstruct-bindings.version} - - - -