fixed VST debug logging

Author: rashtao

driver/src/main/java/com/arangodb/async/internal/velocystream/VstCommunicationAsync.java

@@ -67,6 +67,10 @@ protected CompletableFuture<InternalResponse> execute(final InternalRequest requ
         final CompletableFuture<InternalResponse> rfuture = new CompletableFuture<>();
         try {
             final Message message = createMessage(request);
+            if (LOGGER.isDebugEnabled()) {
+                String body = request.getBody() == null ? "" : util.toJsonString(request.getBody());
+                LOGGER.debug("Send Request [id={}]: {} {}", message.getId(), request, body);
+            }
             send(message, connection).whenComplete((m, ex) -> {
                 if (m != null) {
                     final InternalResponse response;
@@ -102,6 +106,10 @@ protected CompletableFuture<InternalResponse> execute(final InternalRequest requ
                     } catch (ArangoDBException e) {
                         rfuture.completeExceptionally(e);
                     }
+                    if (LOGGER.isDebugEnabled()) {
+                        String body = response.getBody() == null ? "" : util.toJsonString(response.getBody());
+                        LOGGER.debug("Received Response [id={}]: {} {}", m.getId(), response, body);
+                    }
                     rfuture.complete(response);
                 } else if (ex != null) {
                     LOGGER.error(ex.getMessage(), ex);
@@ -118,10 +126,6 @@ protected CompletableFuture<InternalResponse> execute(final InternalRequest requ
     }
 
     private CompletableFuture<Message> send(final Message message, final VstConnectionAsync connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(String.format("Send Message (id=%s, head=%s, body=%s)", message.getId(), message.getHead(),
-                    message.getBody() != null ? message.getBody() : "{}"));
-        }
         return connection.write(message, buildChunks(message));
     }
 

driver/src/main/java/com/arangodb/internal/velocystream/VstCommunicationSync.java

@@ -62,8 +62,16 @@ protected InternalResponse execute(final InternalRequest request, final VstConne
     protected InternalResponse execute(final InternalRequest request, final VstConnectionSync connection, final int attemptCount) {
         try {
             final Message requestMessage = createMessage(request);
+            if (LOGGER.isDebugEnabled()) {
+                String body = request.getBody() == null ? "" : util.toJsonString(request.getBody());
+                LOGGER.debug("Send Request [id={}]: {} {}", requestMessage.getId(), request, body);
+            }
             final Message responseMessage = send(requestMessage, connection);
             final InternalResponse response = createResponse(responseMessage);
+            if (LOGGER.isDebugEnabled()) {
+                String body = response.getBody() == null ? "" : util.toJsonString(response.getBody());
+                LOGGER.debug("Received Response [id={}]: {} {}", responseMessage.getId(), response, body);
+            }
             checkError(response);
             return response;
         } catch (final VPackParserException e) {
@@ -80,10 +88,6 @@ protected InternalResponse execute(final InternalRequest request, final VstConne
     }
 
     private Message send(final Message message, final VstConnectionSync connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(String.format("Send Message (id=%s, head=%s, body=%s)", message.getId(), message.getHead(),
-                    message.getBody() != null ? message.getBody() : "{}"));
-        }
         return connection.write(message, buildChunks(message));
     }
 

driver/src/main/java/com/arangodb/internal/velocystream/internal/MessageStore.java

@@ -54,10 +54,6 @@ public void storeMessage(final long messageId, final FutureTask<Message> future)
     public void consume(final Message message) {
         final FutureTask<Message> future = task.remove(message.getId());
         if (future != null) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(String.format("Received Message (id=%s, head=%s, body=%s)", message.getId(),
-                        message.getHead(), message.getBody() != null ? message.getBody() : "{}"));
-            }
             response.put(message.getId(), message);
             future.run();
         }