Merge branch 'NIAD-3240' of https://github.com/NHSDigital/integration-adaptor-gp2gp-sending into NIAD-3240

Author: Alex-Nita

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

@@ -156,7 +156,6 @@ private List<Specimen> fetchSpecimens(DiagnosticReport diagnosticReport, List<Ob
         specimens.addAll(nonDummySpecimens);
 
         return specimens;
-
     }
 
     private boolean hasObservationsWithoutSpecimen(List<Observation> observations) {
@@ -237,7 +236,7 @@ private List<Observation> addDummyObservationsToObservationList(
 
             // Generate a dummy Observation for each Specimen without an Observation
             for (String specimenWithoutObservations : specimensWithoutObservations) {
-                Observation dummyObservation = generateDefaultObservation(diagnosticReport);
+                Observation dummyObservation = generateDummyObservation(diagnosticReport);
                 Reference specimenReference = new Reference(specimenWithoutObservations);
                 dummyObservation.setSpecimen(specimenReference);
                 completeObservations.add(dummyObservation);
@@ -251,7 +250,7 @@ private List<String> getSpecimenIdsWithoutObservation(List<Specimen> specimens,
         List<String> specimenIDList = new ArrayList<>();
         List<String> nonOrphanSpecimenIDList = new ArrayList<>();
         for (Specimen specimen : specimens) {
-            //Dummy Specimens should not have a dummy Observation attached.
+            // Dummy Specimens should not have a dummy observation attached.
             if (!specimen.getId().contains(DUMMY_SPECIMEN_ID_PREFIX)) {
                 specimenIDList.add(specimen.getId());
             }
@@ -278,7 +277,7 @@ private boolean hasSpecimenWithoutObservation(List<Specimen> specimens, List<Obs
         return !specimensWithoutObservations.isEmpty();
     }
 
-    private Observation generateDefaultObservation(DiagnosticReport diagnosticReport) {
+    private Observation generateDummyObservation(DiagnosticReport diagnosticReport) {
         Observation observation = new Observation();
 
         observation.setId(DUMMY_OBSERVATION_ID_PREFIX + randomIdGeneratorService.createNewId());