From 7c91a3a83bbfbd69ddfe899dca72580335999f12 Mon Sep 17 00:00:00 2001 From: goutham-M Date: Wed, 19 Jun 2013 11:43:12 +0530 Subject: [PATCH] officeId attribute is added in HolidayApiConstants class --- .../organisation/holiday/api/HolidayApiConstants.java | 1 + .../organisation/holiday/data/HolidayDataValidator.java | 2 +- .../service/HolidayWritePlatformServiceJpaRepositoryImpl.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/api/HolidayApiConstants.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/api/HolidayApiConstants.java index 463e0d367..c58e64b91 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/api/HolidayApiConstants.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/api/HolidayApiConstants.java @@ -18,6 +18,7 @@ public class HolidayApiConstants { public static final String toDate = "toDate"; public static final String description = "description"; public static final String offices = "offices"; + public static final String officeId = "officeId"; public static final Set HOLIDAY_CREATE_REQUEST_DATA_PARAMETERS = new HashSet(Arrays.asList(localeParamName, dateFormatParamName, name, fromDate, toDate, description, offices)); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/data/HolidayDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/data/HolidayDataValidator.java index cbce94955..c141ac56f 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/data/HolidayDataValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/data/HolidayDataValidator.java @@ -65,7 +65,7 @@ public class HolidayDataValidator { offices = new HashSet(array.size()); for (int i = 0; i < array.size(); i++) { final JsonObject officeElement = array.get(i).getAsJsonObject(); - final Long officeId = this.fromApiJsonHelper.extractLongNamed("officeId", officeElement); + final Long officeId = this.fromApiJsonHelper.extractLongNamed(HolidayApiConstants.officeId, officeElement); baseDataValidator.reset().parameter(HolidayApiConstants.offices).value(officeId).notNull(); offices.add(officeId); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java index b4157e47a..15fff1f08 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java @@ -71,7 +71,7 @@ public class HolidayWritePlatformServiceJpaRepositoryImpl implements HolidayWrit offices = new HashSet(array.size()); for (int i = 0; i < array.size(); i++) { final JsonObject officeElement = array.get(i).getAsJsonObject(); - final Long officeId = this.fromApiJsonHelper.extractLongNamed("officeId", officeElement); + final Long officeId = this.fromApiJsonHelper.extractLongNamed(HolidayApiConstants.officeId, officeElement); final Office office = this.officeRepository.findOne(officeId); if (office == null) { throw new OfficeNotFoundException(officeId); } offices.add(office);