From e6e8113817cfaa6392ba7e9958afe9ba69f26a49 Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Fri, 20 Mar 2026 09:50:30 +0100 Subject: [PATCH] Fix loadflow-server url Signed-off-by: Franck LECUYER --- .../monitor/worker/server/clients/LoadFlowRestClient.java | 2 +- .../src/main/resources/application-local.yaml | 2 +- .../monitor/worker/server/clients/LoadFlowRestClientTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/clients/LoadFlowRestClient.java b/monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/clients/LoadFlowRestClient.java index fa918cad..a4b590cc 100644 --- a/monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/clients/LoadFlowRestClient.java +++ b/monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/clients/LoadFlowRestClient.java @@ -25,7 +25,7 @@ public class LoadFlowRestClient { public LoadFlowRestClient( RestClient.Builder restClientBuilder, - @Value("${gridsuite.services.load-flow-server.base-uri:http://load-flow-server/}") String loadFlowServerBaseUri) { + @Value("${gridsuite.services.loadflow-server.base-uri:http://loadflow-server/}") String loadFlowServerBaseUri) { this.restClient = restClientBuilder .baseUrl(loadFlowServerBaseUri + "/" + LOADFLOW_API_VERSION) .build(); diff --git a/monitor-worker-server/src/main/resources/application-local.yaml b/monitor-worker-server/src/main/resources/application-local.yaml index af288bd0..ccd061d0 100644 --- a/monitor-worker-server/src/main/resources/application-local.yaml +++ b/monitor-worker-server/src/main/resources/application-local.yaml @@ -24,7 +24,7 @@ gridsuite: base-uri: http://localhost:5007 filter-server: base-uri: http://localhost:5027 - load-flow-server: + loadflow-server: base-uri: http://localhost:5008 actions-server: base-uri: http://localhost:5022 diff --git a/monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/clients/LoadFlowRestClientTest.java b/monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/clients/LoadFlowRestClientTest.java index 22da98ee..22c6075a 100644 --- a/monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/clients/LoadFlowRestClientTest.java +++ b/monitor-worker-server/src/test/java/org/gridsuite/monitor/worker/server/clients/LoadFlowRestClientTest.java @@ -55,7 +55,7 @@ void getParameters() throws JsonProcessingException { server.expect(MockRestRequestMatchers.method(HttpMethod.GET)) .andExpect(MockRestRequestMatchers.requestTo( - "http://load-flow-server/v1/parameters/" + PARAMETERS_UUID)) + "http://loadflow-server/v1/parameters/" + PARAMETERS_UUID)) .andRespond(MockRestResponseCreators.withSuccess() .contentType(MediaType.APPLICATION_JSON) .body(objectMapper.writeValueAsString(expectedParameters))); @@ -69,7 +69,7 @@ void getParameters() throws JsonProcessingException { void getParametersNotFound() { server.expect(MockRestRequestMatchers.method(HttpMethod.GET)) .andExpect(MockRestRequestMatchers.requestTo( - "http://load-flow-server/v1/parameters/" + PARAMETERS_ERROR_UUID)) + "http://loadflow-server/v1/parameters/" + PARAMETERS_ERROR_UUID)) .andRespond(MockRestResponseCreators.withServerError()); assertThatThrownBy(() -> loadFlowRestClient.getParameters(PARAMETERS_ERROR_UUID))