fixed parsing 200 status with empty body

Mangopay · Feb 14, 2025 · f7ccc6c · f7ccc6c
1 parent 8c5831b
commit f7ccc6c
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/main/java/com/mangopay/core/RestTool.java b/src/main/java/com/mangopay/core/RestTool.java
@@ -411,9 +411,12 @@ private <T extends Dto, U extends Dto> T doRequest(Class<T> classOfT, String ide
 
                 this.readResponseHeaders(connection);
 
-                response = castResponseToEntity(classOfT, JsonParser.parseString(responseString).getAsJsonObject());
+                // some endpoints return 200 with empty body
+                if (!responseString.isEmpty()) {
+                    response = castResponseToEntity(classOfT, JsonParser.parseString(responseString).getAsJsonObject());
+                    if (this.debugMode) logger.info("Response object: {}", response.toString());
+                }
 
-                if (this.debugMode) logger.info("Response object: {}", response.toString());
             }
 
             this.checkResponseCode(responseString);
@@ -621,20 +624,22 @@ private <T extends Dto> List<T> doRequestList(Class<T[]> classOfT, Class<T> clas
             }
 
             if (responseCodeIsSuccessful() && responseCode != 204) {
-
                 this.readResponseHeaders(connection);
 
-                JsonArray ja = JsonParser.parseString(responseString).getAsJsonArray();
+                // some endpoints return 200 with empty body
+                if (!responseString.isEmpty()) {
+                    JsonArray ja = JsonParser.parseString(responseString).getAsJsonArray();
 
-                for (int x = 0; x < ja.size(); x++) {
-                    JsonObject jo = ja.get(x).getAsJsonObject();
-                    T toAdd = castResponseToEntity(classOfTItem, jo);
-                    response.add(toAdd);
-                }
+                    for (int x = 0; x < ja.size(); x++) {
+                        JsonObject jo = ja.get(x).getAsJsonObject();
+                        T toAdd = castResponseToEntity(classOfTItem, jo);
+                        response.add(toAdd);
+                    }
 
-                if (this.debugMode) {
-                    logger.info("Response object: {}", response.toString());
-                    logger.info("Elements count: {}", response.size());
+                    if (this.debugMode) {
+                        logger.info("Response object: {}", response.toString());
+                        logger.info("Elements count: {}", response.size());
+                    }
                 }
             }