* Fix whitespace issues.

Author: MartinWheelerMT

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/exception/XmlSchemaValidationException.java

@@ -5,4 +5,4 @@ public class XmlSchemaValidationException extends RuntimeException {
     public XmlSchemaValidationException(String message, Throwable cause) {
         super(message, cause);
     }
-}
+}

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapper.java

@@ -38,8 +38,6 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-
-
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 @Component
 @Slf4j
@@ -67,7 +65,6 @@ public String mapEhrExtractToXml(EhrExtractTemplateParameters ehrExtractTemplate
         return TemplateUtils.fillTemplate(EHR_EXTRACT_TEMPLATE, ehrExtractTemplateParameters);
     }
 
-
     public void validateXmlAgainstSchema(String xml) {
         String interactionId = redactionsContext.ehrExtractInteractionId();
         boolean isRedactionInteraction = RedactionsContext.REDACTION_INTERACTION_ID.equals(interactionId);
@@ -87,7 +84,6 @@ public void validateXmlAgainstSchema(String xml) {
         }
     }
 
-
     public EhrExtractTemplateParameters mapBundleToEhrFhirExtractParams(
             GetGpcStructuredTaskDefinition getGpcStructuredTaskDefinition, Bundle bundle) {
         var ehrExtractTemplateParameters = setSharedExtractParams(getGpcStructuredTaskDefinition);

service/src/main/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingService.java

@@ -59,7 +59,6 @@ public class StructuredRecordMappingService {
     private final SupportedContentTypes supportedContentTypes;
     private final EhrExtractStatusService ehrExtractStatusService;
 
-
     private DocumentBuilder documentBuilder;
 
     public static final String DEFAULT_ATTACHMENT_CONTENT_TYPE = "text/plain";
@@ -157,8 +156,8 @@ public String mapStructuredRecordToEhrExtractXml(GetGpcStructuredTaskDefinition
             ehrExtractMapper.validateXmlAgainstSchema(ehrExtractContent);
         } catch (XmlSchemaValidationException e) {
             LOGGER.error("EHR Extract XML validation failed: {}", e.getMessage());
-
         }
+
         ehrExtractStatusService.saveEhrExtractMessageId(structuredTaskDefinition.getConversationId(),
                 ehrExtractTemplateParameters.getEhrExtractId());
 
@@ -214,4 +213,4 @@ private static Node removeComponentsFromEhrFolder(Document document) throws XPat
 
         return parent;
     }
-}
+}

service/src/test/resources/uat/output/TC4/9465701262_Meyers_full_20210119.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <RCMR_IN030000UK06 xmlns="urn:hl7-org:v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hl7-org:v3 ..\Schemas\RCMR_IN030000UK06.xsd">
     <id root="0D07B623-3926-4245-80AF-97F1098D90C1" />
     <creationTime value="20200101010101" />