Cleaning up inconsistencies in ClientDataValidator.java

This commit is contained in:
Vishwas Babu A J
2014-07-03 11:33:24 -07:00
parent 530301cc59
commit 38481b03cf
@@ -332,34 +332,40 @@ public final class ClientDataValidator {
}
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.staffIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Long staffId = this.fromApiJsonHelper.extractLongNamed(ClientApiConstants.staffIdParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.staffIdParamName).value(staffId).ignoreIfNull().longGreaterThanZero();
}
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.savingsProductIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Long savingsProductId = this.fromApiJsonHelper.extractLongNamed(ClientApiConstants.savingsProductIdParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.savingsProductIdParamName).value(savingsProductId).ignoreIfNull()
.longGreaterThanZero();
}
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.dateOfBirthParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final LocalDate dateOfBirth = this.fromApiJsonHelper.extractLocalDateNamed(ClientApiConstants.dateOfBirthParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.dateOfBirthParamName).value(dateOfBirth).notNull()
.validateDateBefore(DateUtils.getLocalDateOfTenant());
}
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.genderIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Integer genderId = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(ClientApiConstants.genderIdParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.genderIdParamName).value(genderId).integerGreaterThanZero();
}
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.clientTypeIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Integer clientType = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(ClientApiConstants.clientTypeIdParamName,
element);
baseDataValidator.reset().parameter(ClientApiConstants.clientTypeIdParamName).value(clientType).integerGreaterThanZero();
}
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.clientClassificationIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Integer clientClassification = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(
ClientApiConstants.clientClassificationIdParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.clientClassificationIdParamName).value(clientClassification)