* Add highlight to console log output to make transform tool easier to read.

* Catch validation errors.

Author: MartinWheelerMT

service/src/main/java/uk/nhs/adaptors/gp2gp/transformjsontoxmltool/TransformJsonToXml.java

@@ -30,6 +30,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.EhrExtractMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.MessageContext;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.OutputMessageWrapperMapper;
@@ -65,12 +66,12 @@ public void run(String... args) {
             getFiles().forEach(file -> {
                 String xmlResult = mapJsonToXml(file.getJsonFileInput());
                 writeToFile(xmlResult, file.getJsonFileName());
-                LOGGER.info("Successfully validated XML for file: {}", file.getJsonFileName());
             });
         } catch (NHSNumberNotFound | UnreadableJsonFileException | NoJsonFileFound | Hl7TranslatedResponseError e) {
-            LOGGER.error("error: {}", e.getMessage());
+            LOGGER.error("Failed to parse the provided JSON: {}", e.getMessage());
+        } catch (EhrValidationException e) {
+            LOGGER.error("Failed to validate the produced XML");
         }
-        LOGGER.info("end");
     }
 
     private List<InputFile> getFiles() throws UnreadableJsonFileException, NoJsonFileFound {

service/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <configuration>
     <appender name="TEXT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${GP2GP_LOGGING_FORMAT:-%d{yyyy-MM-dd HH:mm:ss.SSS} Level=%-5level Logger=%logger{36} ConversationId=%X{ConversationId} TaskId=%X{TaskId} Thread="%thread" Message="%msg"%n}
+            <pattern>${GP2GP_LOGGING_FORMAT:-%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) Level=%-5level Logger=%logger{36} ConversationId=%X{ConversationId} TaskId=%X{TaskId} Thread="%thread" Message="%msg"%n}
             </pattern>
         </encoder>
     </appender>