From 1e437b9cc17b1c44cc12511df7c8fd6aaa1326ca Mon Sep 17 00:00:00 2001 From: Ilya Andreev Date: Thu, 29 Dec 2016 20:46:08 +0200 Subject: [PATCH] Remove unnecessary checking for missing joined date. --- .../StaffCommandFromApiJsonDeserializer.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/serialization/StaffCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/serialization/StaffCommandFromApiJsonDeserializer.java index 1619741d5..d3bb4a96c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/serialization/StaffCommandFromApiJsonDeserializer.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/serialization/StaffCommandFromApiJsonDeserializer.java @@ -98,11 +98,9 @@ public final class StaffCommandFromApiJsonDeserializer { baseDataValidator.reset().parameter("isActive").value(activeFlag).notNull(); } - if (this.fromApiJsonHelper.parameterExists("joiningDate", element)) { - final LocalDate joiningDate = this.fromApiJsonHelper.extractLocalDateNamed("joiningDate", element); - baseDataValidator.reset().parameter("joiningDate").value(joiningDate).notNull(); - } - + final LocalDate joiningDate = this.fromApiJsonHelper.extractLocalDateNamed("joiningDate", element); + baseDataValidator.reset().parameter("joiningDate").value(joiningDate).notNull(); + if (this.fromApiJsonHelper.parameterExists("dateFormat", element)) { final String dateFormat = this.fromApiJsonHelper.extractStringNamed("dateFormat", element); baseDataValidator.reset().parameter("dateFormat").value(dateFormat).notBlank();