make RestClient calls null-saf

Author: Hajarel-moukh

src/main/java/fr/insee/genesis/infrastructure/adapter/SurveyQualityToolPerretAdapter.java

@@ -32,7 +32,9 @@ public SurveyQualityToolPerretAdapter( Config config,OidcService oidcService) {
 
     @Override
     public ResponseEntity<Object> sendProcessedIds(Map<String, Set<String>> processedIdsMap) throws IOException {
-        return HttpUtils.makeApiCall(config.getSurveyQualityToolUrl(), "/interrogations",HttpMethod.POST, processedIdsMap,
+        Map<String, Set<String>> safeBody =
+                processedIdsMap != null ? processedIdsMap : Map.of();
+        return HttpUtils.makeApiCall(config.getSurveyQualityToolUrl(), "/interrogations",HttpMethod.POST, safeBody,
                 Object.class, oidcService);
     }
 }

src/main/java/fr/insee/genesis/infrastructure/utils/http/HttpUtils.java

@@ -12,25 +12,41 @@
 
 @UtilityClass
 public class HttpUtils {
-    public static <T, R> ResponseEntity<R> makeApiCall(String baseUrl,
-                                                       String path,
-                                                       HttpMethod method,
-                                                       T requestBody,
-                                                       Class<R> responseType,
-                                                       OidcService oidcService
-                                                       ) throws IOException {
+    public static <T, R> ResponseEntity<R> makeApiCall(
+            String baseUrl,
+            String path,
+            HttpMethod method,
+            T requestBody,
+            Class<R> responseType,
+            OidcService oidcService
+    ) throws IOException {
+
         WebClient webClient = WebClient.builder()
                 .baseUrl(baseUrl)
                 .filter(PerretAuthWebClientFilter.perretAuthFilter(oidcService))
                 .build();
-        WebClient.ResponseSpec responseSpec = webClient
+
+        WebClient.RequestBodySpec request = webClient
                 .method(method)
                 .uri(path)
-                .bodyValue(requestBody)
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + oidcService.getServiceAccountToken())
-                .retrieve();
-        Mono<ResponseEntity<R>> response = responseSpec.toEntity(responseType);
-        return response.block();
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + oidcService.getServiceAccountToken());
+
+        WebClient.ResponseSpec responseSpec;
+
+        if (requestBody != null) {
+            responseSpec = request
+                    .bodyValue(requestBody)
+                    .retrieve();
+        } else {
+            responseSpec = request
+                    .retrieve();
+        }
+
+        if (responseType == null || responseType == Void.class) {
+            return (ResponseEntity<R>) responseSpec.toBodilessEntity().block();
+        }
+
+        return responseSpec.toEntity(responseType).block();
     }
 }