#127 Improve Error Handling for Failed DefectDojo API Requests

Two Problems:
1. We do not pass consequently the causing exception to our own custom
   exception.
2. We do not catch all possible REST client runtime exceptions.

Fixed by consequent logging and passing ofthe origin exception as
cause of our own excpetion. Also catching a more generic exception
type totach all possible errors.

Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>

Author: Weltraumschaf

src/main/java/io/securecodebox/persistence/defectdojo/service/DefaultImportScanService.java

@@ -31,7 +31,7 @@
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.StandardCharsets;
@@ -124,7 +124,7 @@ public String getFilename() {
 
       final var payload = new HttpEntity<MultiValueMap<String, Object>>(body, headers);
       return exchangeRequest(endpoint, payload);
-    } catch (HttpClientErrorException e) {
+    } catch (RestClientException e) {
       log.error("Exception while attaching findings to engagement: {}", e.getMessage());
       throw new PersistenceException("Failed to attach findings to engagement.", e);
     }

src/main/java/io/securecodebox/persistence/defectdojo/service/GenericDefectDojoService.java

@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
 import io.securecodebox.persistence.defectdojo.config.Config;
 import io.securecodebox.persistence.defectdojo.exception.LoopException;
+import io.securecodebox.persistence.defectdojo.exception.PersistenceException;
 import io.securecodebox.persistence.defectdojo.http.Foo;
 import io.securecodebox.persistence.defectdojo.http.ProxyConfigFactory;
 import io.securecodebox.persistence.defectdojo.model.Engagement;
@@ -29,6 +30,7 @@
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -73,14 +75,19 @@ public final T get(long id) {
 
     final var url = this.config.getUrl() + API_PREFIX + this.getUrlPath() + "/" + id;
     log.debug("Requesting URL: {}", url);
-    ResponseEntity<T> response = restTemplate.exchange(
-      url,
-      HttpMethod.GET,
-      payload,
-      getModelClass()
-    );
-
-    return response.getBody();
+    try {
+      ResponseEntity<T> response = restTemplate.exchange(
+        url,
+        HttpMethod.GET,
+        payload,
+        getModelClass()
+      );
+
+      return response.getBody();
+    } catch (RestClientException e) {
+      log.error("Exception while getting data: {}", e.getMessage());
+      throw new PersistenceException("Failed to get data.", e);
+    }
   }
 
   @Override

src/main/java/io/securecodebox/persistence/defectdojo/service/ImportScanService2.java

@@ -22,7 +22,7 @@
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.StandardCharsets;
@@ -94,8 +94,8 @@ public String getFilename() {
       var payload = new HttpEntity<>(mvn, headers);
 
       return restTemplate.exchange(config.getUrl() + "/api/v2/" + endpoint + "/", HttpMethod.POST, payload, ImportScanResponse.class).getBody();
-    } catch (HttpClientErrorException e) {
-      throw new PersistenceException("Failed to attach findings to engagement.");
+    } catch (RestClientException e) {
+      throw new PersistenceException("Failed to attach findings to engagement.", e);
     }
   }