From 403a0560d7b0e644fd5f3381a14ddf926d21af11 Mon Sep 17 00:00:00 2001 From: Abdelsalem Date: Tue, 4 Nov 2025 15:16:09 +0100 Subject: [PATCH] use springboot managed resttemplate Signed-off-by: Abdelsalem --- .../modification/server/service/FilterService.java | 6 ++++-- .../modification/server/service/ReportService.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/service/FilterService.java b/src/main/java/org/gridsuite/modification/server/service/FilterService.java index 8cc1f4c38..9b3060a55 100644 --- a/src/main/java/org/gridsuite/modification/server/service/FilterService.java +++ b/src/main/java/org/gridsuite/modification/server/service/FilterService.java @@ -43,10 +43,12 @@ public class FilterService implements IFilterService { private static String filterServerBaseUri; - private final RestTemplate restTemplate = new RestTemplate(); + private final RestTemplate restTemplate; - public FilterService(@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}") String filterServerBaseUri) { + public FilterService(@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}") String filterServerBaseUri, + RestTemplate restTemplate) { setFilterServerBaseUri(filterServerBaseUri); + this.restTemplate = restTemplate; } public static void setFilterServerBaseUri(String filterServerBaseUri) { diff --git a/src/main/java/org/gridsuite/modification/server/service/ReportService.java b/src/main/java/org/gridsuite/modification/server/service/ReportService.java index 02a228070..9614389d7 100644 --- a/src/main/java/org/gridsuite/modification/server/service/ReportService.java +++ b/src/main/java/org/gridsuite/modification/server/service/ReportService.java @@ -36,16 +36,18 @@ public class ReportService { private String reportServerBaseUri; - private RestTemplate reportServerRest = new RestTemplate(); + private RestTemplate reportServerRest; private final ObjectMapper objectMapper; public ReportService(@Value("${gridsuite.services.report-server.base-uri:http://report-server}") String reportServerURI, - ObjectMapper objectMapper) { + ObjectMapper objectMapper, + RestTemplate restTemplate) { this.reportServerBaseUri = reportServerURI; this.objectMapper = objectMapper; this.objectMapper.registerModule(new ReportNodeJsonModule()); this.objectMapper.setInjectableValues(new InjectableValues.Std().addValue(ReportNodeDeserializer.DICTIONARY_VALUE_ID, null)); + this.reportServerRest = restTemplate; } public void setReportServerBaseUri(String reportServerBaseUri) {