Merge pull request #57 from companieshouse/KafkaMessageFormatsupport

Adding jsonNode to format logs in json string

pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>uk.gov.companieshouse</groupId>
         <artifactId>companies-house-parent</artifactId>
-        <version>2.1.10</version>
+        <version>2.1.11</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -98,6 +98,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-logging</artifactId>
             <version>${spring-boot-dependencies.version} </version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>uk.gov.companieshouse</groupId>

src/main/java/uk/gov/companieshouse/document/generator/consumer/document/service/impl/MessageServiceImpl.java

@@ -4,6 +4,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -123,24 +126,33 @@ private Map<String, Object> setCompletedDebugMap(DocumentGenerationCompleted com
         Map<String, Object> completedParams = new HashMap<>();
         completedParams.put(DESCRIPTION_IDENTIFIER, completed.getDescriptionIdentifier());
         completedParams.put(DESCRIPTION, completed.getDescription());
-        completedParams.put(COMPLETED_DOCUMENT, completed);
+        completedParams.put(COMPLETED_DOCUMENT, getLogStatusTree(String.valueOf(completed)));
 
         return completedParams;
     }
 
     private Map<String, Object> setFailedDebugMap(DocumentGenerationFailed failed) {
 
         Map<String, Object> failedParams = new HashMap<>();
-        failedParams.put(FAILED_DOCUMENT, failed);
+        failedParams.put(FAILED_DOCUMENT, getLogStatusTree(String.valueOf(failed)));
 
         return failedParams;
     }
 
-    private Map<String, Object> setStartedDebugMap(DocumentGenerationStarted started) {
-
+    private Map<String, Object> setStartedDebugMap(DocumentGenerationStarted started)  {
         Map<String, Object> startedParams = new HashMap<>();
-        startedParams.put(STARTED_DOCUMENT, started);
+        startedParams.put(STARTED_DOCUMENT, getLogStatusTree(String.valueOf(started)));
 
         return startedParams;
     }
+
+    private JsonNode getLogStatusTree(String logStatus) {
+        try {
+            var mapper = new ObjectMapper();
+            return mapper.readTree(logStatus);
+        } catch (JsonProcessingException jsonProcessingException) {
+            LOG.error(" Found issue while converting into json String " + jsonProcessingException.getMessage());
+            return null;
+        }
+    }
 }