Skip to content

Commit e1dac86

Browse files
* Remove unnecessary null checks when populating builder parameters.
1 parent 03ee4a4 commit e1dac86

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ public String mapCodeableConceptToCd(CodeableConcept codeableConcept) {
7070
var mainDisplayName = getMainDisplayName(descriptionExtensions, snomedCodeCoding.get());
7171
mainDisplayName.ifPresent(builder::mainDisplayName);
7272

73-
if (codeableConcept.hasText()) {
74-
builder.mainOriginalText(codeableConcept.getText());
75-
}
73+
builder.mainOriginalText(codeableConcept.getText());
74+
7675

7776
addNonSnomedCodeTranslationsToTemplateParametersBuilder(codeableConcept, builder);
7877
return TemplateUtils.fillTemplate(CODEABLE_CONCEPT_CD_TEMPLATE, builder.build());
@@ -506,8 +505,7 @@ private void addNonSnomedCodeTranslationsToTemplateParametersBuilder(
506505
CodeableConceptCdTemplateParameters.CodeableConceptCdTemplateParametersBuilder builder
507506
) {
508507
var nonSnomedCodeCodings = getNonSnomedCodeCodings(codeableConcept);
509-
if (!nonSnomedCodeCodings.isEmpty()) {
510-
builder.translations(nonSnomedCodeCodings);
511-
}
508+
509+
builder.translations(nonSnomedCodeCodings);
512510
}
513511
}

0 commit comments

Comments
 (0)