Skip to content

Commit 1e85f02

Browse files
AbdelHedhilibenrejebmohjonenst
authored
use springboot managed resttemplate (#724)
Adopt Spring Boot managed RestTemplate so distributed tracing (traceId) is automatically propagated through all REST calls Signed-off-by: Abdelsalem <[email protected]> Co-authored-by: benrejebmoh <[email protected]> Co-authored-by: Jon Harper <[email protected]>
1 parent 0028715 commit 1e85f02

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/java/org/gridsuite/modification/server/service/FilterService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@ public class FilterService implements IFilterService {
4343

4444
private static String filterServerBaseUri;
4545

46-
private final RestTemplate restTemplate = new RestTemplate();
46+
private final RestTemplate restTemplate;
4747

48-
public FilterService(@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}") String filterServerBaseUri) {
48+
public FilterService(@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}") String filterServerBaseUri,
49+
RestTemplate restTemplate) {
4950
setFilterServerBaseUri(filterServerBaseUri);
51+
this.restTemplate = restTemplate;
5052
}
5153

5254
public static void setFilterServerBaseUri(String filterServerBaseUri) {

src/main/java/org/gridsuite/modification/server/service/ReportService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,18 @@ public class ReportService {
3636

3737
private String reportServerBaseUri;
3838

39-
private RestTemplate reportServerRest = new RestTemplate();
39+
private RestTemplate reportServerRest;
4040

4141
private final ObjectMapper objectMapper;
4242

4343
public ReportService(@Value("${gridsuite.services.report-server.base-uri:http://report-server}") String reportServerURI,
44-
ObjectMapper objectMapper) {
44+
ObjectMapper objectMapper,
45+
RestTemplate restTemplate) {
4546
this.reportServerBaseUri = reportServerURI;
4647
this.objectMapper = objectMapper;
4748
this.objectMapper.registerModule(new ReportNodeJsonModule());
4849
this.objectMapper.setInjectableValues(new InjectableValues.Std().addValue(ReportNodeDeserializer.DICTIONARY_VALUE_ID, null));
50+
this.reportServerRest = restTemplate;
4951
}
5052

5153
public void setReportServerBaseUri(String reportServerBaseUri) {

0 commit comments

Comments
 (0)