improved error reporting of responses with unparsable body

rashtao · rashtao · commit adf023ace2ef · 2024-11-27T21:58:05.000+01:00
diff --git a/core/src/main/java/com/arangodb/internal/net/Communication.java b/core/src/main/java/com/arangodb/internal/net/Communication.java
@@ -23,6 +23,8 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static com.arangodb.internal.util.SerdeUtils.toJsonString;
+
 @UsedInApi
 public abstract class Communication implements Closeable {
     private static final Logger LOGGER = LoggerFactory.getLogger(Communication.class);
@@ -57,8 +59,7 @@ private CompletableFuture<InternalResponse> doExecuteAsync(
             final InternalRequest request, final HostHandle hostHandle, final Host host, final int attemptCount, Connection connection, long reqId
     ) {
         if (LOGGER.isDebugEnabled()) {
-            String body = request.getBody() == null ? "" : serde.toJsonString(request.getBody());
-            LOGGER.debug("Send Request [id={}]: {} {}", reqId, request, body);
+            LOGGER.debug("Send Request [id={}]: {} {}", reqId, request, toJsonString(serde, request.getBody()));
         }
         final CompletableFuture<InternalResponse> rfuture = new CompletableFuture<>();
         try {
@@ -84,8 +85,7 @@ private CompletableFuture<InternalResponse> doExecuteAsync(
                             handleException(isSafe(request), e, hostHandle, request, host, reqId, attemptCount, rfuture);
                         } else {
                             if (LOGGER.isDebugEnabled()) {
-                                String body = response.getBody() == null ? "" : serde.toJsonString(response.getBody());
-                                LOGGER.debug("Received Response [id={}]: {} {}", reqId, response, body);
+                                LOGGER.debug("Received Response [id={}]: {} {}", reqId, response, toJsonString(serde, response.getBody()));
                             }
                             ArangoDBException errorEntityEx = ResponseUtils.translateError(serde, response);
                             if (errorEntityEx instanceof ArangoDBRedirectException) {
diff --git a/core/src/main/java/com/arangodb/internal/util/ResponseUtils.java b/core/src/main/java/com/arangodb/internal/util/ResponseUtils.java
@@ -28,6 +28,8 @@
 import com.arangodb.internal.net.ArangoDBUnavailableException;
 import com.arangodb.internal.serde.InternalSerde;
 
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -38,12 +40,14 @@ public final class ResponseUtils {
     private static final int ERROR_STATUS = 300;
     private static final int ERROR_INTERNAL = 503;
     private static final String HEADER_ENDPOINT = "x-arango-endpoint";
+    private static final String CONTENT_TYPE = "content-type";
+    private static final String TEXT_PLAIN = "text/plain";
 
     private ResponseUtils() {
         super();
     }
 
-    public static ArangoDBException translateError(final InternalSerde util, final InternalResponse response) {
+    public static ArangoDBException translateError(InternalSerde serde, InternalResponse response) {
         final int responseCode = response.getResponseCode();
         if (responseCode < ERROR_STATUS) {
             return null;
@@ -52,17 +56,49 @@ public static ArangoDBException translateError(final InternalSerde util, final I
             return new ArangoDBRedirectException(String.format("Response Code: %s", responseCode),
                     response.getMeta(HEADER_ENDPOINT));
         }
-        if (response.getBody() != null) {
-            final ErrorEntity errorEntity = util.deserialize(response.getBody(), ErrorEntity.class);
-            if (errorEntity.getCode() == ERROR_INTERNAL && errorEntity.getErrorNum() == ERROR_INTERNAL) {
-                return ArangoDBUnavailableException.from(errorEntity);
-            }
-            ArangoDBException e = new ArangoDBException(errorEntity);
-            if (ArangoErrors.QUEUE_TIME_VIOLATED.equals(e.getErrorNum())) {
-                return ArangoDBException.of(new TimeoutException().initCause(e));
-            }
-            return e;
+
+        byte[] body = response.getBody();
+        if (body == null) {
+            return new ArangoDBException(String.format("Response Code: %s", responseCode), responseCode);
+        }
+
+        if (isTextPlain(response)) {
+            String payload = new String(body, getContentTypeCharset(response));
+            return new ArangoDBException("Response Code: " + responseCode + "[" + payload + "]", responseCode);
+        }
+
+        ErrorEntity errorEntity;
+        try {
+            errorEntity = serde.deserialize(body, ErrorEntity.class);
+        } catch (Exception e) {
+            ArangoDBException adbEx = new ArangoDBException("Response Code: " + responseCode
+                    + "[Unparsable data] Response: " + response, responseCode);
+            adbEx.addSuppressed(e);
+            return adbEx;
+        }
+
+        if (errorEntity.getCode() == ERROR_INTERNAL && errorEntity.getErrorNum() == ERROR_INTERNAL) {
+            return ArangoDBUnavailableException.from(errorEntity);
         }
-        return new ArangoDBException(String.format("Response Code: %s", responseCode), responseCode);
+        ArangoDBException e = new ArangoDBException(errorEntity);
+        if (ArangoErrors.QUEUE_TIME_VIOLATED.equals(e.getErrorNum())) {
+            return ArangoDBException.of(new TimeoutException().initCause(e));
+        }
+        return e;
+    }
+
+    private static boolean isTextPlain(InternalResponse response) {
+        String contentType = response.getMeta(CONTENT_TYPE);
+        return contentType != null && contentType.startsWith(TEXT_PLAIN);
     }
+
+    private static Charset getContentTypeCharset(InternalResponse response) {
+        String contentType = response.getMeta(CONTENT_TYPE);
+        int paramIdx = contentType.indexOf("charset=");
+        if (paramIdx == -1) {
+            return StandardCharsets.UTF_8;
+        }
+        return Charset.forName(contentType.substring(paramIdx + 8));
+    }
+
 }
diff --git a/core/src/main/java/com/arangodb/internal/util/SerdeUtils.java b/core/src/main/java/com/arangodb/internal/util/SerdeUtils.java
@@ -0,0 +1,19 @@
+package com.arangodb.internal.util;
+
+import com.arangodb.internal.serde.InternalSerde;
+
+public class SerdeUtils {
+    private SerdeUtils() {
+    }
+
+    public static String toJsonString(InternalSerde serde, byte[] data) {
+        if (data == null) {
+            return "";
+        }
+        try {
+            return serde.toJsonString(data);
+        } catch (Exception e) {
+            return "[Unparsable data]";
+        }
+    }
+}
