restored white space changes.

Author: stuartmcneill1-nhs

docker/service/src/main/java/uk/nhs/adaptors/scr/mappings/from/fhir/CompositionMapper.java

@@ -20,10 +20,8 @@
 import static uk.nhs.adaptors.scr.utils.FhirHelper.randomUUID;
 
 /**
- * An FHIR SCR will contain multiple resource-types. The parent resourceType
- * will be Bundle.
- * Others may include Composition, Practitioner, PractitionerRole, Organization
- * and Patient.
+ * An FHIR SCR will contain multiple resource-types. The parent resourceType will be Bundle.
+ * Others may include Composition, Practitioner, PractitionerRole, Organization and Patient.
  * This is the FHIR to HL7 mapper of the Composition resource type.
  *
  * See: src/test/resources/gp_summary/standard_gp_summary.json
@@ -75,25 +73,21 @@ private static void validateCategory(Composition composition) {
         }
         Coding category = composition.getCategoryFirstRep().getCodingFirstRep();
         if (!SNOMED_SYSTEM.equals(category.getSystem())) {
-            throw new FhirValidationException(
-                    "Composition.category.coding.system not supported: " + category.getSystem());
+            throw new FhirValidationException("Composition.category.coding.system not supported: " + category.getSystem());
         }
         if (!CARE_PROFESSIONAL_DOC_CODE.equals(category.getCode())) {
             throw new FhirValidationException("Composition.category.coding.code not supported: " + category.getCode());
         }
         if (!CARE_PROFESSIONAL_DOC_DISPLAY.equals(category.getDisplay())) {
-            throw new FhirValidationException(
-                    "Composition.category.coding.display not supported: " + category.getDisplay());
+            throw new FhirValidationException("Composition.category.coding.display not supported: " + category.getDisplay());
         }
     }
 
-    private static void setCompositionRelatesToId(GpSummary gpSummary, Composition composition)
-            throws FhirMappingException {
+    private static void setCompositionRelatesToId(GpSummary gpSummary, Composition composition) throws FhirMappingException {
         if (composition.hasRelatesTo()) {
             var relatesTo = composition.getRelatesToFirstRep();
             if (!REPLACES.equals(relatesTo.getCode())) {
-                throw new FhirValidationException(
-                        "Unsupported Composition.relatesTo.code element: " + relatesTo.getCode());
+                throw new FhirValidationException("Unsupported Composition.relatesTo.code element: " + relatesTo.getCode());
             }
             if (relatesTo.getTargetIdentifier().hasValue()) {
                 gpSummary.setCompositionRelatesToId(relatesTo.getTargetIdentifier().getValue());

docker/service/src/main/java/uk/nhs/adaptors/scr/mappings/from/hl7/HtmlParser.java

@@ -48,45 +48,44 @@ public List<Composition.SectionComponent> parse(Node html) {
         removeEmptyNodes(html);
 
         var bodyNode = xmlUtils.getNodesByXPath(html, "./body").stream()
-                .findFirst()
-                .orElseThrow(() -> new IllegalStateException("Missing body node in html"));
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("Missing body node in html"));
 
         var childNodes = bodyNode.getChildNodes();
         if (childNodes.getLength() != 0 && !H2.equals(childNodes.item(0).getNodeName())) {
             throw new IllegalStateException("First body node must be H2");
         }
 
-        // this will hold a list of paris: H2 node as key and all next nodes (until next
-        // H2 or body end) as a new Document
+        // this will hold a list of paris: H2 node as key and all next nodes (until next H2 or body end) as a new Document
         var items = new ArrayList<Pair<Node, Document>>();
         Document targetDocument = null;
         for (int i = 0; i < childNodes.getLength(); i++) {
             var currentNode = childNodes.item(i);
             if (H2.equals(currentNode.getNodeName())) {
-                // since this is the H2, we begin to capture following nodes as a new Document
+                //since this is the H2, we begin to capture following nodes as a new Document
                 targetDocument = createNewDocument("div", "http://www.w3.org/1999/xhtml");
                 items.add(Pair.of(currentNode, targetDocument));
             } else {
                 if (targetDocument == null) {
                     throw new IllegalStateException("Target document not initialized");
                 }
                 targetDocument.getDocumentElement()
-                        .appendChild(targetDocument.importNode(currentNode, true));
+                    .appendChild(targetDocument.importNode(currentNode, true));
             }
         }
 
         return items.stream()
-                .map(kv -> ParsedHtml
-                        .builder()
-                        .html(serialize(kv.getValue()))
-                        .h2Value(kv.getKey().getTextContent())
-                        .h2Id(Optional.ofNullable(kv.getKey().getAttributes())
-                                .map(h2IdAttribute -> h2IdAttribute.getNamedItem("id"))
-                                .map(Node::getNodeValue)
-                                .orElse(null))
-                        .build())
-                .map(HtmlParser::buildSectionComponent)
-                .collect(Collectors.toList());
+            .map(kv -> ParsedHtml
+                .builder()
+                .html(serialize(kv.getValue()))
+                .h2Value(kv.getKey().getTextContent())
+                .h2Id(Optional.ofNullable(kv.getKey().getAttributes())
+                    .map(h2IdAttribute -> h2IdAttribute.getNamedItem("id"))
+                    .map(Node::getNodeValue)
+                    .orElse(null))
+                .build())
+            .map(HtmlParser::buildSectionComponent)
+            .collect(Collectors.toList());
     }
 
     @SneakyThrows
@@ -108,30 +107,32 @@ public static String serialize(Document document) {
     @SneakyThrows
     public static void removeEmptyNodes(Node document) {
         XPathExpression xpathExp = XPathFactory.newInstance().newXPath()
-                .compile("//text()[normalize-space(.) = '']");
+            .compile("//text()[normalize-space(.) = '']");
         NodeList emptyTextNodes = (NodeList) xpathExp.evaluate(document, XPathConstants.NODESET);
         for (int i = 0; i < emptyTextNodes.getLength(); i++) {
             Node emptyTextNode = emptyTextNodes.item(i);
             emptyTextNode.getParentNode().removeChild(emptyTextNode);
         }
 
+
     }
 
+
     private static Composition.SectionComponent buildSectionComponent(ParsedHtml parsedHtml) {
         var sectionComponent = new Composition.SectionComponent()
-                .setTitle(parsedHtml.h2Value)
-                .setText(buildNarrative(parsedHtml.html));
+            .setTitle(parsedHtml.h2Value)
+            .setText(buildNarrative(parsedHtml.html));
         if (StringUtils.isNotBlank(parsedHtml.h2Id)) {
             sectionComponent.setCode(new CodeableConcept()
-                    .addCoding(new Coding()
-                            .setCode(parsedHtml.h2Id)));
+                .addCoding(new Coding()
+                    .setCode(parsedHtml.h2Id)));
         }
         return sectionComponent;
     }
 
     private static Narrative buildNarrative(String html) {
         var narrative = new Narrative()
-                .setStatus(Narrative.NarrativeStatus.GENERATED);
+            .setStatus(Narrative.NarrativeStatus.GENERATED);
         narrative.setDivAsString(html);
         return narrative;
     }