addressing PR comments

Author: ORybak5

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

@@ -255,32 +255,32 @@ private Optional<String> mapDefaultNotImplemented(Resource resource) {
             resource.getIdElement().getIdPart()));
     }
 
-    protected Optional<String> mapAllergyIntolerance(Resource resource) {
+    private Optional<String> mapAllergyIntolerance(Resource resource) {
         return Optional.of(allergyStructureMapper.mapAllergyIntoleranceToAllergyStructure((AllergyIntolerance) resource));
     }
 
-    protected Optional<String> mapCondition(Resource resource) {
+    private Optional<String> mapCondition(Resource resource) {
         return Optional.of(conditionLinkSetMapper.mapConditionToLinkSet((Condition) resource, IS_NESTED));
     }
 
-    protected Optional<String> mapDocumentReference(Resource resource) {
+    private Optional<String> mapDocumentReference(Resource resource) {
         return Optional.of(
             documentReferenceToNarrativeStatementMapper.mapDocumentReferenceToNarrativeStatement((DocumentReference) resource));
     }
 
-    protected Optional<String> mapImmunization(Resource resource) {
+    private Optional<String> mapImmunization(Resource resource) {
         return Optional.of(
             immunizationObservationStatementMapper.mapImmunizationToObservationStatement((Immunization) resource, IS_NESTED));
     }
 
-    protected Optional<String> mapMedicationRequest(Resource resource) {
+    private Optional<String> mapMedicationRequest(Resource resource) {
         return Optional.of(resource)
             .map(MedicationRequest.class::cast)
             .filter(not(MedicationRequestUtils::isStoppedMedicationOrder))
             .map(medicationStatementMapper::mapMedicationRequestToMedicationStatement);
     }
 
-    protected Optional<String> mapObservation(Resource resource) {
+    private Optional<String> mapObservation(Resource resource) {
         Observation observation = (Observation) resource;
         if (CodeableConceptMappingUtils.hasCode(observation.getCode(), List.of(NARRATIVE_STATEMENT_CODE))) {
             return Optional.of(observationToNarrativeStatementMapper.mapObservationToNarrativeStatement(observation, IS_NESTED));
@@ -292,17 +292,17 @@ protected Optional<String> mapObservation(Resource resource) {
         return Optional.of(observationStatementMapper.mapObservationToObservationStatement(observation, IS_NESTED));
     }
 
-    protected Optional<String> mapProcedureRequest(Resource resource) {
+    private Optional<String> mapProcedureRequest(Resource resource) {
         return Optional.ofNullable(
             diaryPlanStatementMapper.mapProcedureRequestToPlanStatement((ProcedureRequest) resource, IS_NESTED)
         );
     }
 
-    protected Optional<String> mapReferralRequest(Resource resource) {
+    private Optional<String> mapReferralRequest(Resource resource) {
         return Optional.of(requestStatementMapper.mapReferralRequestToRequestStatement((ReferralRequest) resource, IS_NESTED));
     }
 
-    protected Optional<String> mapDiagnosticReport(Resource resource) {
+    private Optional<String> mapDiagnosticReport(Resource resource) {
         return Optional.of(diagnosticReportMapper.mapDiagnosticReportToCompoundStatement((DiagnosticReport) resource));
     }
 

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

@@ -230,14 +230,14 @@ public void tearDown() {
     }
 
     @Test
-    public void testObservationWithNOPATGetsTranslatedIntoNarrativeWithConfidentialityCode() {
+    void testObservationWithNOPATGetsTranslatedIntoNarrativeWithConfidentialityCode() {
         var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_AGENT_DIRECTORY);
         Bundle bundle = FHIR_PARSE_SERVICE.parseResource(jsonInput, Bundle.class);
         Resource observation = bundle.getEntry().get(1).getResource();
 
         when(confidentialityService.generateConfidentialityCode(observation)).thenReturn(Optional.of(CONFIDENTIALITY_CODE));
 
-        var result = encounterComponentsMapper.mapObservation(observation);
+        var result = encounterComponentsMapper.mapResourceToComponent(observation);
 
         assertThat(result.get()).contains(CONFIDENTIALITY_CODE);
     }