use springboot managed RestTemplate

src/main/java/org/gridsuite/caseimport/server/CaseService.java

@@ -7,13 +7,15 @@
 package org.gridsuite.caseimport.server;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.*;
 import org.springframework.http.client.MultipartBodyBuilder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.util.DefaultUriBuilderFactory;
 
 import java.util.Objects;
 import java.util.UUID;
@@ -33,9 +35,9 @@ public class CaseService {
     private String caseServerBaseUri;
 
     public CaseService(@Value("${powsybl.services.case-server.base-uri:http://case-server/}") String caseServerBaseUri,
-                       RestTemplate restTemplate) {
+                       RestTemplateBuilder restTemplateBuilder) {
         this.caseServerBaseUri = caseServerBaseUri;
-        this.restTemplate = restTemplate;
+        this.restTemplate = restTemplateBuilder.uriTemplateHandler(new DefaultUriBuilderFactory(caseServerBaseUri)).build();
     }
 
     public void setBaseUri(String caseServerBaseUri) {

src/main/java/org/gridsuite/caseimport/server/DirectoryService.java

@@ -8,12 +8,14 @@
 
 import org.gridsuite.caseimport.server.dto.ElementAttributes;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.DefaultUriBuilderFactory;
 import org.springframework.web.util.UriComponentsBuilder;
 
 /**
@@ -36,9 +38,10 @@ public class DirectoryService {
     public static final String ELEMENT = "ELEMENT";
 
     public DirectoryService(
-            @Value("${gridsuite.services.directory-server.base-uri:http://directory-server/}") String directoryServerBaseUri, RestTemplate restTemplate) {
+            @Value("${gridsuite.services.directory-server.base-uri:http://directory-server/}") String directoryServerBaseUri,
+            RestTemplateBuilder restTemplateBuilder) {
         this.directoryServerBaseUri = directoryServerBaseUri;
-        this.restTemplate = restTemplate;
+        this.restTemplate = restTemplateBuilder.uriTemplateHandler(new DefaultUriBuilderFactory(directoryServerBaseUri)).build();
     }
 
     public void setDirectoryServerBaseUri(String directoryServerBaseUri) {