Remove new lines from ConfidentialityCode tag (#1083)

* Remove new lines from ConfidentialityCode tag

SystmOne are opinionated about this.

---------

Co-authored-by: hospel <[email protected]>

Author: Adrian Clay

service/src/main/java/uk/nhs/adaptors/gp2gp/common/service/ConfidentialityService.java

@@ -15,12 +15,9 @@
 public class ConfidentialityService {
     private static final String REDACTION_CODE_SYSTEM = "http://hl7.org/fhir/v3/ActCode";
     public static final String NOPAT = "NOPAT";
-    private static final String REDACTION_CONFIDENTIALITY_CODE = """
-        <confidentialityCode
-            code="NOPAT"
-            codeSystem="2.16.840.1.113883.4.642.3.47"
-            displayName="no disclosure to patient, family or caregivers without attending provider's authorization"
-        />""";
+    public static final String REDACTION_CONFIDENTIALITY_CODE = "<confidentialityCode code=\"NOPAT\" "
+                        + "codeSystem=\"2.16.840.1.113883.4.642.3.47\" "
+                        + "displayName=\"no disclosure to patient, family or caregivers without attending provider's authorization\" />";
 
     private final RedactionsContext redactionsContext;
 

service/src/test/java/uk/nhs/adaptors/gp2gp/common/service/ConfidentialityServiceTest.java

@@ -96,15 +96,10 @@ public void When_GenerateAndIsRedactionMessageAndNOPATMetaSecurityIsPresent_Expe
 
         var confidentialityCode = confidentialityService.generateConfidentialityCode(resource);
 
-        assertThat(confidentialityCode)
-            .isPresent();
+        assertThat(confidentialityCode).isPresent();
         assertThat(confidentialityCode.get())
-            .isEqualTo("""
-                <confidentialityCode
-                    code="NOPAT"
-                    codeSystem="2.16.840.1.113883.4.642.3.47"
-                    displayName="no disclosure to patient, family or caregivers without attending provider's authorization"
-                />"""
-            );
+            .isEqualTo(new String("<confidentialityCode code=\"NOPAT\" "
+                      + "codeSystem=\"2.16.840.1.113883.4.642.3.47\" "
+                      + "displayName=\"no disclosure to patient, family or caregivers without attending provider's authorization\" />"));
     }
 }

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AllergyStructureMapperTest.java

@@ -128,12 +128,9 @@ public class AllergyStructureMapperTest {
         + "expected-output-allergy-structure-22.xml";
     private static final String COMMON_ID = "6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73";
 
-    private static final String CONFIDENTIALITY_CODE = """
-        <confidentialityCode
-            code="NOPAT"
-            codeSystem="2.16.840.1.113883.4.642.3.47"
-            displayName="no disclosure to patient, family or caregivers without attending provider's authorization"
-        />""";
+    public static final String CONFIDENTIALITY_CODE = "<confidentialityCode code=\"NOPAT\" "
+                      + "codeSystem=\"2.16.840.1.113883.4.642.3.47\" "
+                      + "displayName=\"no disclosure to patient, family or caregivers without attending provider's authorization\" />";
 
     @Mock
     private RandomIdGeneratorService randomIdGeneratorService;

service/src/test/java/uk/nhs/adaptors/gp2gp/utils/ConfidentialityCodeUtility.java

@@ -10,12 +10,9 @@ public final class ConfidentialityCodeUtility {
     private ConfidentialityCodeUtility() { }
     public static final String NOPAT = "NOPAT";
     public static final String NOSCRUB = "NOSCRUB";
-    public static final String NOPAT_HL7_CONFIDENTIALITY_CODE = """
-        <confidentialityCode
-            code="NOPAT"
-            codeSystem="2.16.840.1.113883.4.642.3.47"
-            displayName="no disclosure to patient, family or caregivers without attending provider's authorization" />
-        """;
+    public static final String NOPAT_HL7_CONFIDENTIALITY_CODE = "<confidentialityCode code=\"NOPAT\" "
+        + "codeSystem=\"2.16.840.1.113883.4.642.3.47\" "
+        + "displayName=\"no disclosure to patient, family or caregivers without attending provider's authorization\" />";
 
     public static <R extends DomainResource> String getSecurityCodeFromResource(R resource) {
         return resource.getMeta()