Inline the MultiStatementObservationHolderFactory dependency (#960)

This factory didn't appear to be providing any value, and is used
only by the ObservationMapper, so inline it to simplify.

Author: Adrian Clay

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

@@ -30,6 +30,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
+import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.CodeableConceptCdMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.CommentType;
@@ -87,12 +88,11 @@ public class ObservationMapper {
     private final StructuredObservationValueMapper structuredObservationValueMapper;
     private final CodeableConceptCdMapper codeableConceptCdMapper;
     private final ParticipantMapper participantMapper;
-    private final MultiStatementObservationHolderFactory multiStatementObservationHolderFactory;
+    private final RandomIdGeneratorService randomIdGeneratorService;
     private final ConfidentialityService confidentialityService;
 
     public String mapObservationToCompoundStatement(Observation observationAssociatedWithSpecimen) {
-        var holder = multiStatementObservationHolderFactory.newInstance(observationAssociatedWithSpecimen);
-        return mapAndVerify(holder);
+        return mapAndVerify(createHolder(observationAssociatedWithSpecimen));
     }
 
     private String mapAndVerify(MultiStatementObservationHolder observationAssociatedWithSpecimen) {
@@ -178,7 +178,7 @@ private List<MultiStatementObservationHolder> getRelatedObservations(
             .map(referenceElement -> messageContext.getInputBundleHolder().getResource(referenceElement))
             .flatMap(Optional::stream)
             .map(Observation.class::cast)
-            .map(multiStatementObservationHolderFactory::newInstance)
+            .map(observation -> createHolder(observation))
             .collect(Collectors.toList());
     }
 
@@ -548,4 +548,8 @@ private boolean hasValidType(Observation.ObservationRelatedComponent observation
     private boolean hasValidComment(Observation observation) {
         return observation.hasComment() && hasCode(observation.getCode(), List.of(COMMENT_NOTE_CODE));
     }
+
+    private MultiStatementObservationHolder createHolder(Observation observationAssociatedWithSpecimen) {
+        return new MultiStatementObservationHolder(observationAssociatedWithSpecimen, messageContext, randomIdGeneratorService);
+    }
 }

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

@@ -19,7 +19,6 @@
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.service.TimestampService;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.DiagnosticReportMapper;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.MultiStatementObservationHolderFactory;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.ObservationMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.SpecimenMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.EhrExtractTemplateParameters;
@@ -148,11 +147,9 @@ public void setUp() {
 
         ParticipantMapper participantMapper = new ParticipantMapper();
         StructuredObservationValueMapper structuredObservationValueMapper = new StructuredObservationValueMapper();
-        MultiStatementObservationHolderFactory multiStatementObservationHolderFactory =
-            new MultiStatementObservationHolderFactory(messageContext, randomIdGeneratorService);
         ObservationMapper specimenObservationMapper = new ObservationMapper(
             messageContext, structuredObservationValueMapper, codeableConceptCdMapper,
-            participantMapper, multiStatementObservationHolderFactory, confidentialityService);
+            participantMapper, randomIdGeneratorService, confidentialityService);
         SpecimenMapper specimenMapper = new SpecimenMapper(messageContext, specimenObservationMapper,
             randomIdGeneratorService, confidentialityService);
         DocumentReferenceToNarrativeStatementMapper documentReferenceToNarrativeStatementMapper

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

@@ -24,7 +24,6 @@
 import uk.nhs.adaptors.gp2gp.common.service.TimestampService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.DiagnosticReportMapper;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.MultiStatementObservationHolderFactory;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.ObservationMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.SpecimenMapper;
 import uk.nhs.adaptors.gp2gp.ehr.utils.BloodPressureValidator;
@@ -207,11 +206,9 @@ public void setUp() {
 
     private @NotNull SpecimenMapper getSpecimenMapper(StructuredObservationValueMapper structuredObservationValueMapper,
                                                       ParticipantMapper participantMapper) {
-        MultiStatementObservationHolderFactory multiStatementObservationHolderFactory =
-            new MultiStatementObservationHolderFactory(messageContext, randomIdGeneratorService);
         ObservationMapper specimenObservationMapper = new ObservationMapper(
             messageContext, structuredObservationValueMapper, codeableConceptCdMapper, participantMapper,
-            multiStatementObservationHolderFactory, confidentialityService);
+            randomIdGeneratorService, confidentialityService);
         return new SpecimenMapper(messageContext, specimenObservationMapper, randomIdGeneratorService, confidentialityService);
     }
 

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

@@ -275,7 +275,7 @@ void When_DiagnosticReport_With_NoReferencedSpecimenAndFilingCommentWithNoCommen
                     new StructuredObservationValueMapper(),
                     codeableConceptCdMapper,
                     new ParticipantMapper(),
-                    new MultiStatementObservationHolderFactory(messageContext, randomIdGeneratorService),
+                    randomIdGeneratorService,
                     confidentialityService
                 ),
                 randomIdGeneratorService,

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

@@ -159,15 +159,12 @@ void setUp() {
         when(idMapper.getOrNew(any(ResourceType.class), any(IdType.class)))
             .thenAnswer(params -> "Mapped-From-" + ((IdType) params.getArgument(1)).getValue());
 
-        MultiStatementObservationHolderFactory multiStatementObservationHolderFactory =
-            new MultiStatementObservationHolderFactory(messageContext, randomIdGeneratorService);
-
         observationMapper = new ObservationMapper(
             messageContext,
             new StructuredObservationValueMapper(),
             new CodeableConceptCdMapper(),
             new ParticipantMapper(),
-            multiStatementObservationHolderFactory,
+            randomIdGeneratorService,
             confidentialityService
         );
     }

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

@@ -45,7 +45,6 @@
 import uk.nhs.adaptors.gp2gp.ehr.mapper.StructuredObservationValueMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.SupportedContentTypes;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.DiagnosticReportMapper;
-import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.MultiStatementObservationHolderFactory;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.ObservationMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.SpecimenMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.EhrExtractTemplateParameters;
@@ -168,11 +167,9 @@ public void setUp() {
                                                                             CodeableConceptCdMapper codeableConceptCdMapper) {
         StructuredObservationValueMapper structuredObservationValueMapper = new StructuredObservationValueMapper();
         ParticipantMapper participantMapper = new ParticipantMapper();
-        MultiStatementObservationHolderFactory multiStatementObservationHolderFactory =
-            new MultiStatementObservationHolderFactory(messageContext, randomIdGeneratorService);
         ObservationMapper specimenObservationMapper = new ObservationMapper(
             messageContext, structuredObservationValueMapper, codeableConceptCdMapper, participantMapper,
-            multiStatementObservationHolderFactory, confidentialityService);
+            randomIdGeneratorService, confidentialityService);
         SpecimenMapper specimenMapper = new SpecimenMapper(messageContext, specimenObservationMapper,
             randomIdGeneratorService, confidentialityService);
         DocumentReferenceToNarrativeStatementMapper documentReferenceToNarrativeStatementMapper