Repository: incubator-fineract Updated Branches: refs/heads/develop 7a734ebd5 -> 71b6ca885
Remove unnecessary checking for missing joined date. Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/1e437b9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/1e437b9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/1e437b9c Branch: refs/heads/develop Commit: 1e437b9cc17b1c44cc12511df7c8fd6aaa1326ca Parents: 7f2b2f6 Author: Ilya Andreev <andreev.ily...@gmail.com> Authored: Thu Dec 29 20:46:08 2016 +0200 Committer: Ilya Andreev <andreev.ily...@gmail.com> Committed: Thu Dec 29 20:46:08 2016 +0200 ---------------------------------------------------------------------- .../serialization/StaffCommandFromApiJsonDeserializer.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/1e437b9c/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/serialization/StaffCommandFromApiJsonDeserializer.java ---------------------------------------------------------------------- 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 1619741..d3bb4a9 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();
