Fix code to avoid potential NPE

hmcts · Jan 23, 2024 · 3304097 · 3304097
1 parent 6154958
commit 3304097
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/uk/gov/hmcts/opal/dto/legacy/DefendantAccountSearchCriteria.java b/src/main/java/uk/gov/hmcts/opal/dto/legacy/DefendantAccountSearchCriteria.java
@@ -9,6 +9,7 @@
 import uk.gov.hmcts.opal.dto.AccountSearchDto;
 import uk.gov.hmcts.opal.dto.ToJsonString;
 
+import java.util.Objects;
 import java.util.Optional;
 
 @Data
@@ -61,7 +62,10 @@ public static DefendantAccountSearchCriteria fromAccountSearchDto(AccountSearchD
             .surname(dto.getSurname())
             .forenames(dto.getForename())
             .initials(dto.getInitials())
-            .birthDate(Optional.ofNullable(dto.getDateOfBirth()).map(d -> d.toLocalDate().toString()).orElse(null))
+            .birthDate(Optional.ofNullable(dto.getDateOfBirth())
+                           .map(d -> d.toLocalDate())
+                           .map(Objects::toString)
+                           .orElse(null))
             .addressLine1(dto.getAddressLineOne())
             .nationalInsuranceNumber(dto.getNiNumber())
             .prosecutorCaseReference(dto.getPcr())