fix(exception): better handle non-JSON response bodies (#1404)

* fix(exception): better handle non-JSON response bodies

* unwanted diff

* formatting

* test

Author: sp00m

src/main/java/com/adyen/service/resource/Resource.java

@@ -29,6 +29,8 @@
 import com.adyen.model.ApiError;
 import com.adyen.model.RequestOptions;
 import com.adyen.service.exception.ApiException;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.google.gson.Gson;
 
 import java.io.IOException;
@@ -113,7 +115,11 @@ public String request(String json, RequestOptions requestOptions, ApiConstants.H
         } catch (HTTPClientException e) {
             apiException = new ApiException(e.getMessage(), e.getCode(), e.getResponseHeaders());
             apiException.setResponseBody(e.getResponseBody());
-            apiException.setError(ApiError.fromJson(e.getResponseBody()));
+            try {
+                apiException.setError(ApiError.fromJson(e.getResponseBody()));
+            } catch (Exception ignore) {
+                // Response body could not be parsed (e.g. not JSON), raw response body available in ApiException#responseBody
+            }
         }
         throw apiException;
     }

src/test/java/com/adyen/service/ResourceTest.java

@@ -40,6 +40,8 @@
 import java.util.Map;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -82,6 +84,20 @@ public void testRequestQueryString() throws Exception {
         verify(clientInterfaceMock).request("/companies/adyen/merchants", null, null, false, null, ApiConstants.HttpMethod.GET, queryString);
     }
 
+    @Test
+    public void testNonJsonError() throws Exception {
+        Map<String, String> pathParams = Collections.singletonMap("companyId", "adyen");
+        Map<String, String> queryString = Collections.singletonMap("pageSize", "10");
+        Resource resource = new Resource(serviceMock, "/companies/{companyId}/merchants", null);
+
+        HTTPClientException error = new HTTPClientException(500, "error", Collections.emptyMap(), "not JSON");
+        when(clientInterfaceMock.request(any(), any(), any(), anyBoolean(), any(), any(), any())).thenThrow(error);
+
+        ApiException thrown = assertThrows(ApiException.class, () -> resource.request(null, null, ApiConstants.HttpMethod.GET, pathParams, queryString));
+        assertEquals("not JSON", thrown.getResponseBody());
+        assertNull(thrown.getError());
+    }
+
     @Test
     public void testRequestExceptionEmpty() throws IOException, HTTPClientException {
         try {