From 5c76d3d3777240030635bf33bd060078ae2175bb Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Thu, 23 Oct 2014 19:19:57 -0700 Subject: [PATCH] Cleaning up a few more method signatures on Charge Read Service --- .../charge/service/ChargeReadPlatformService.java | 3 ++- .../charge/service/ChargeReadPlatformServiceImpl.java | 4 ++-- .../loanaccount/api/LoanChargesApiResource.java | 11 ++++++----- .../portfolio/loanaccount/api/LoansApiResource.java | 2 +- .../service/LoanReadPlatformServiceImpl.java | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformService.java index 343196412..b58bc877e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformService.java @@ -26,9 +26,10 @@ public interface ChargeReadPlatformService { * @param feeChargesOnly * If set to "true", only fees are returned * @param excludeChargeTimes + * Excludes Given List of Charge Types from the response * @return */ - Collection retrieveLoanApplicableCharges(boolean feeChargesOnly, Integer[] excludeChargeTimes); + Collection retrieveLoanApplicableCharges(boolean feeChargesOnly, ChargeTimeType[] excludeChargeTimes); /** * Returns all Penalties applicable for loans diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformServiceImpl.java index cfa058727..8c10d8576 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformServiceImpl.java @@ -124,7 +124,7 @@ public class ChargeReadPlatformServiceImpl implements ChargeReadPlatformService } @Override - public Collection retrieveLoanApplicableCharges(final boolean feeChargesOnly, Integer[] excludeChargeTimes) { + public Collection retrieveLoanApplicableCharges(final boolean feeChargesOnly, ChargeTimeType[] excludeChargeTimes) { final ChargeMapper rm = new ChargeMapper(); String excludeClause = ""; Object[] params = new Object[] { ChargeAppliesTo.LOAN.getValue() }; @@ -135,7 +135,7 @@ public class ChargeReadPlatformServiceImpl implements ChargeReadPlatformService if (i != 0) { sb.append(","); } - sb.append(excludeChargeTimes[i]); + sb.append(excludeChargeTimes[i].getValue()); } params = new Object[] { ChargeAppliesTo.LOAN.getValue(), sb.toString() }; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoanChargesApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoanChargesApiResource.java index 589f2c1ee..e21dbbe67 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoanChargesApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoanChargesApiResource.java @@ -48,10 +48,10 @@ import org.springframework.stereotype.Component; @Scope("singleton") public class LoanChargesApiResource { - private final Set RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "chargeId", "name", "penalty", - "chargeTimeType", "dueAsOfDate", "chargeCalculationType", "percentage", "amountPercentageAppliedTo", "currency", - "amountWaived", "amountWrittenOff", "amountOutstanding", "amountOrPercentage", "amount", "amountPaid", "chargeOptions", - "installmentChargeData")); + private final Set RESPONSE_DATA_PARAMETERS = new HashSet<>( + Arrays.asList("id", "chargeId", "name", "penalty", "chargeTimeType", "dueAsOfDate", "chargeCalculationType", "percentage", + "amountPercentageAppliedTo", "currency", "amountWaived", "amountWrittenOff", "amountOutstanding", "amountOrPercentage", + "amount", "amountPaid", "chargeOptions", "installmentChargeData")); private final String resourceNameForPermissions = "LOAN"; @@ -102,7 +102,8 @@ public class LoanChargesApiResource { this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions); final boolean feeChargesOnly = false; - final Collection chargeOptions = this.chargeReadPlatformService.retrieveLoanApplicableCharges(feeChargesOnly, new Integer[]{ChargeTimeType.OVERDUE_INSTALLMENT.getValue()}); + final Collection chargeOptions = this.chargeReadPlatformService.retrieveLoanApplicableCharges(feeChargesOnly, + new ChargeTimeType[] { ChargeTimeType.OVERDUE_INSTALLMENT }); final LoanChargeData loanChargeTemplate = LoanChargeData.template(chargeOptions); final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters()); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java index 05bc16993..0b4fbb219 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java @@ -442,7 +442,7 @@ public class LoansApiResource { repaymentStrategyOptions = this.dropdownReadPlatformService.retreiveTransactionProcessingStrategies(); final boolean feeChargesOnly = false; chargeOptions = this.chargeReadPlatformService.retrieveLoanApplicableCharges(feeChargesOnly, - new Integer[] { ChargeTimeType.OVERDUE_INSTALLMENT.getValue() }); + new ChargeTimeType[] { ChargeTimeType.OVERDUE_INSTALLMENT }); chargeTemplate = this.loanChargeReadPlatformService.retrieveLoanChargeTemplate(); allowedLoanOfficers = this.loanReadPlatformService.retrieveAllowedLoanOfficers(loanBasicDetails.officeId(), diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java index a40a332be..2ac8d4989 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java @@ -1243,7 +1243,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { .retrieveCodeValuesByCode("LoanCollateral"); final boolean feeChargesOnly = false; final Collection chargeOptions = this.chargeReadPlatformService.retrieveLoanApplicableCharges(feeChargesOnly, - new Integer[] { ChargeTimeType.OVERDUE_INSTALLMENT.getValue() }); + new ChargeTimeType[] { ChargeTimeType.OVERDUE_INSTALLMENT }); Integer loanCycleCounter = null; if (loanProduct.useBorrowerCycle()) { if (clientId == null) { @@ -1673,7 +1673,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { final String sql = "select " + rm.getSchema() + " where lrs.loan_id = ? and lrs.interest_waived_derived is not null order by lrs.installment ASC "; - return this.jdbcTemplate.query(sql, rm, new Object[] { loanId}); + return this.jdbcTemplate.query(sql, rm, new Object[] { loanId }); } catch (final EmptyResultDataAccessException e) { return null; }