MIFOSX-790: remove warnings.
This commit is contained in:
+1
@@ -59,6 +59,7 @@ public class JournalEntryData {
|
|||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
private final Boolean runningBalanceComputed;
|
private final Boolean runningBalanceComputed;
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private final PaymentDetails paymentDetails;
|
private final PaymentDetails paymentDetails;
|
||||||
|
|
||||||
public JournalEntryData(final Long id, final Long officeId, final String officeName, final String glAccountName,
|
public JournalEntryData(final Long id, final Long officeId, final String officeName, final String glAccountName,
|
||||||
|
|||||||
+9
-9
@@ -2,26 +2,26 @@ package org.mifosplatform.accounting.journalentry.data;
|
|||||||
|
|
||||||
public class PaymentDetails {
|
public class PaymentDetails {
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private final String accountNumber;
|
private final String accountNumber;
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private final String checkNumber;
|
private final String checkNumber;
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private final String receiptNumber;
|
private final String receiptNumber;
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private final String bankNumber;
|
private final String bankNumber;
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private final String routineCode;
|
private final String routineCode;
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private final String paymentType;
|
private final String paymentType;
|
||||||
|
|
||||||
public PaymentDetails(final String accountNumber,
|
public PaymentDetails(final String accountNumber, final String checkNumber, final String receiptNumber, final String bankNumber,
|
||||||
final String checkNumber,
|
final String routineCode, final String paymentType) {
|
||||||
final String receiptNumber,
|
|
||||||
final String bankNumber,
|
|
||||||
final String routineCode,
|
|
||||||
final String paymentType)
|
|
||||||
{
|
|
||||||
this.accountNumber = accountNumber;
|
this.accountNumber = accountNumber;
|
||||||
this.checkNumber = checkNumber;
|
this.checkNumber = checkNumber;
|
||||||
this.receiptNumber = receiptNumber;
|
this.receiptNumber = receiptNumber;
|
||||||
this.bankNumber = bankNumber;
|
this.bankNumber = bankNumber;
|
||||||
this.routineCode = routineCode ;
|
this.routineCode = routineCode;
|
||||||
this.paymentType = paymentType;
|
this.paymentType = paymentType;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+5
-4
@@ -207,7 +207,7 @@ public class LoansApiResource {
|
|||||||
|
|
||||||
officeId = loanAccountClientDetails.officeId();
|
officeId = loanAccountClientDetails.officeId();
|
||||||
|
|
||||||
newLoanAccount = (newLoanAccount == null) ? loanAccountClientDetails : LoanAccountData.populateClientDefaults(
|
newLoanAccount = newLoanAccount == null ? loanAccountClientDetails : LoanAccountData.populateClientDefaults(
|
||||||
newLoanAccount, loanAccountClientDetails);
|
newLoanAccount, loanAccountClientDetails);
|
||||||
|
|
||||||
// if it's JLG loan add group details
|
// if it's JLG loan add group details
|
||||||
@@ -222,7 +222,7 @@ public class LoansApiResource {
|
|||||||
final LoanAccountData loanAccountGroupData = this.loanReadPlatformService.retrieveGroupDetailsTemplate(groupId);
|
final LoanAccountData loanAccountGroupData = this.loanReadPlatformService.retrieveGroupDetailsTemplate(groupId);
|
||||||
officeId = loanAccountGroupData.groupOfficeId();
|
officeId = loanAccountGroupData.groupOfficeId();
|
||||||
calendarOptions = this.loanReadPlatformService.retrieveCalendars(groupId);
|
calendarOptions = this.loanReadPlatformService.retrieveCalendars(groupId);
|
||||||
newLoanAccount = (newLoanAccount == null) ? loanAccountGroupData : LoanAccountData.populateGroupDefaults(newLoanAccount,
|
newLoanAccount = newLoanAccount == null ? loanAccountGroupData : LoanAccountData.populateGroupDefaults(newLoanAccount,
|
||||||
loanAccountGroupData);
|
loanAccountGroupData);
|
||||||
|
|
||||||
} else if (templateType.equals("jlgbulk")) {
|
} else if (templateType.equals("jlgbulk")) {
|
||||||
@@ -230,7 +230,7 @@ public class LoansApiResource {
|
|||||||
final LoanAccountData loanAccountGroupData = this.loanReadPlatformService.retrieveGroupAndMembersDetailsTemplate(groupId);
|
final LoanAccountData loanAccountGroupData = this.loanReadPlatformService.retrieveGroupAndMembersDetailsTemplate(groupId);
|
||||||
officeId = loanAccountGroupData.groupOfficeId();
|
officeId = loanAccountGroupData.groupOfficeId();
|
||||||
calendarOptions = this.loanReadPlatformService.retrieveCalendars(groupId);
|
calendarOptions = this.loanReadPlatformService.retrieveCalendars(groupId);
|
||||||
newLoanAccount = (newLoanAccount == null) ? loanAccountGroupData : LoanAccountData.populateGroupDefaults(newLoanAccount,
|
newLoanAccount = newLoanAccount == null ? loanAccountGroupData : LoanAccountData.populateGroupDefaults(newLoanAccount,
|
||||||
loanAccountGroupData);
|
loanAccountGroupData);
|
||||||
} else {
|
} else {
|
||||||
final String errorMsg = "Loan template type '" + templateType + "' is not supported";
|
final String errorMsg = "Loan template type '" + templateType + "' is not supported";
|
||||||
@@ -422,7 +422,8 @@ public class LoansApiResource {
|
|||||||
@Consumes({ MediaType.APPLICATION_JSON })
|
@Consumes({ MediaType.APPLICATION_JSON })
|
||||||
@Produces({ MediaType.APPLICATION_JSON })
|
@Produces({ MediaType.APPLICATION_JSON })
|
||||||
public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("sqlSearch") final String sqlSearch,
|
public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("sqlSearch") final String sqlSearch,
|
||||||
@QueryParam("externalId") final String externalId, @QueryParam("underHierarchy") final String hierarchy,
|
@QueryParam("externalId") final String externalId,
|
||||||
|
// @QueryParam("underHierarchy") final String hierarchy,
|
||||||
@QueryParam("offset") final Integer offset, @QueryParam("limit") final Integer limit,
|
@QueryParam("offset") final Integer offset, @QueryParam("limit") final Integer limit,
|
||||||
@QueryParam("orderBy") final String orderBy, @QueryParam("sortOrder") final String sortOrder) {
|
@QueryParam("orderBy") final String orderBy, @QueryParam("sortOrder") final String sortOrder) {
|
||||||
|
|
||||||
|
|||||||
+4
-5
@@ -72,7 +72,6 @@ public class LoanCharge extends AbstractPersistable<Long> {
|
|||||||
@Column(name = "calculation_on_amount", scale = 6, precision = 19, nullable = true)
|
@Column(name = "calculation_on_amount", scale = 6, precision = 19, nullable = true)
|
||||||
private BigDecimal amountPercentageAppliedTo;
|
private BigDecimal amountPercentageAppliedTo;
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
@Column(name = "charge_amount_or_percentage", scale = 6, precision = 19, nullable = false)
|
@Column(name = "charge_amount_or_percentage", scale = 6, precision = 19, nullable = false)
|
||||||
private BigDecimal amountOrPercentage;
|
private BigDecimal amountOrPercentage;
|
||||||
|
|
||||||
@@ -369,18 +368,18 @@ public class LoanCharge extends AbstractPersistable<Long> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void update(final BigDecimal amount, final LocalDate dueDate, Integer numberOfRepayments){
|
public void update(final BigDecimal amount, final LocalDate dueDate, final Integer numberOfRepayments){
|
||||||
BigDecimal amountPercentageAppliedTo = BigDecimal.ZERO;
|
BigDecimal amountPercentageAppliedTo = BigDecimal.ZERO;
|
||||||
if(this.loan!=null){
|
if(this.loan!=null){
|
||||||
switch (ChargeCalculationType.fromInt(this.chargeCalculation)) {
|
switch (ChargeCalculationType.fromInt(this.chargeCalculation)) {
|
||||||
case PERCENT_OF_AMOUNT:
|
case PERCENT_OF_AMOUNT:
|
||||||
amountPercentageAppliedTo = loan.getPrincpal().getAmount();
|
amountPercentageAppliedTo = this.loan.getPrincpal().getAmount();
|
||||||
break;
|
break;
|
||||||
case PERCENT_OF_AMOUNT_AND_INTEREST:
|
case PERCENT_OF_AMOUNT_AND_INTEREST:
|
||||||
amountPercentageAppliedTo = loan.getPrincpal().getAmount().add(loan.getTotalInterest());
|
amountPercentageAppliedTo = this.loan.getPrincpal().getAmount().add(this.loan.getTotalInterest());
|
||||||
break;
|
break;
|
||||||
case PERCENT_OF_INTEREST:
|
case PERCENT_OF_INTEREST:
|
||||||
amountPercentageAppliedTo = loan.getTotalInterest();
|
amountPercentageAppliedTo = this.loan.getTotalInterest();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
+2
-1
@@ -96,7 +96,8 @@ public class SavingsAccountsApiResource {
|
|||||||
@Consumes({ MediaType.APPLICATION_JSON })
|
@Consumes({ MediaType.APPLICATION_JSON })
|
||||||
@Produces({ MediaType.APPLICATION_JSON })
|
@Produces({ MediaType.APPLICATION_JSON })
|
||||||
public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("sqlSearch") final String sqlSearch,
|
public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("sqlSearch") final String sqlSearch,
|
||||||
@QueryParam("externalId") final String externalId, @QueryParam("underHierarchy") final String hierarchy,
|
@QueryParam("externalId") final String externalId,
|
||||||
|
// @QueryParam("underHierarchy") final String hierarchy,
|
||||||
@QueryParam("offset") final Integer offset, @QueryParam("limit") final Integer limit,
|
@QueryParam("offset") final Integer offset, @QueryParam("limit") final Integer limit,
|
||||||
@QueryParam("orderBy") final String orderBy, @QueryParam("sortOrder") final String sortOrder) {
|
@QueryParam("orderBy") final String orderBy, @QueryParam("sortOrder") final String sortOrder) {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user