* Removed unnecessary isEmpty check as fallback was to return an Optional.empty() which so this is already implied.

* Refactor method to functional style for code consistency

Author: MartinWheelerMT

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

@@ -360,21 +360,13 @@ private Optional<String> findOriginalTextForAllergy(
     }
 
     private Optional<String> getOriginalTextForActiveAllergy(Coding coding) {
-        Optional<Extension> extension = retrieveDescriptionExtension(coding);
-
-        if (extension.isPresent()) {
-            Optional<String> originalText = extension
-                .get()
+        return retrieveDescriptionExtension(coding)
+            .flatMap(value -> value
                 .getExtension().stream()
                 .filter(displayExtension -> DESCRIPTION_DISPLAY.equals(displayExtension.getUrl()))
                 .map(extension1 -> extension1.getValue().toString())
-                .findFirst();
-            if (originalText.isPresent()) {
-                return originalText;
-            }
-        }
-
-        return Optional.empty();
+                .findFirst()
+            );
     }
 
     private Optional<String> findDisplayText(Coding coding) {

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

@@ -358,5 +358,4 @@ public void When_MapToCdForMedication_With_RelatedProblemAndTitle_Expect_Concept
 
         assertThat(outputString).isEqualToIgnoringWhitespace(expectedOutput);
     }
-
 }