Minor changes.

Author: Alex-Nita

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

@@ -33,11 +33,7 @@
 
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.CommentType;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.IdMapper;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.MessageContext;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.ParticipantMapper;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.ParticipantType;
+import uk.nhs.adaptors.gp2gp.ehr.mapper.*;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.diagnosticreport.DiagnosticReportCompoundStatementTemplateParameters;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.diagnosticreport.NarrativeStatementTemplateParameters;
 import uk.nhs.adaptors.gp2gp.ehr.utils.CodeableConceptMappingUtils;
@@ -114,6 +110,9 @@ private String fetchExtensionId(List<Identifier> identifiers) {
     }
 
     private List<Specimen> fetchSpecimens(DiagnosticReport diagnosticReport) {
+
+        //if there are any orphan diagnostic reports, add a dummy specimen to each of them
+
         if (!diagnosticReport.hasSpecimen()) {
             return Collections.singletonList(generateDefaultSpecimen(diagnosticReport));
         }
@@ -143,7 +142,7 @@ private List<Observation> fetchObservations(DiagnosticReport diagnosticReport) {
             return Collections.singletonList(generateDefaultObservation(diagnosticReport));
         }
 
-        var inputBundleHolder = messageContext.getInputBundleHolder();
+        InputBundle inputBundleHolder = messageContext.getInputBundleHolder();
         return diagnosticReport.getResult().stream()
             .map(Reference::getReferenceElement)
             .map(inputBundleHolder::getResource)

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

@@ -421,7 +421,7 @@ private String prepareStatementsForDerivedObservations(List<MultiStatementObserv
         StringBuilder derivedObservationsBlock = new StringBuilder();
 
         derivedObservations.forEach(derivedObservationHolder -> {
-            var derivedObservation = derivedObservationHolder.getObservation();
+            Observation derivedObservation = derivedObservationHolder.getObservation();
             Optional<String> observationStatement =
                 prepareObservationStatement(derivedObservationHolder, CompoundStatementClassCode.CLUSTER);
             Optional<String> narrativeStatements = prepareNarrativeStatements(

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

@@ -115,8 +115,6 @@ public void setUp() throws IOException {
         when(idMapper.getOrNew(any(ResourceType.class), any(IdType.class))).thenAnswer(mockIdForResourceAndId());
         when(agentDirectory.getAgentId(any(Reference.class))).thenAnswer(mockIdForReference());
         when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
-        when(specimenMapper.mapSpecimenToCompoundStatement(any(Specimen.class), anyList(), any(DiagnosticReport.class)))
-            .thenAnswer(mockSpecimenMapping());
         when(codeableConceptCdMapper.mapCodeableConceptToCd(any(CodeableConcept.class)))
             .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);