From 0ee38cfbc82fba241ef439e68125f104e4ddec35 Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Tue, 5 May 2015 07:12:10 -0700 Subject: [PATCH] removing warnings --- ...WritePlatformServiceJpaRepositoryImpl.java | 4 +-- .../handler/CreateClientCommandHandler.java | 1 - .../LoanInterestRecalculationDetails.java | 1 - .../LoanMultiDisbursementException.java | 5 ++-- ...heduleRequestWritePlatformServiceImpl.java | 1 - ...WritePlatformServiceJpaRepositoryImpl.java | 28 +++++++++---------- ...anProductInterestRecalculationDetails.java | 1 - .../api/PaymentTypeApiResource.java | 3 -- .../savings/data/DepositAccountData.java | 2 +- .../savings/data/SavingsAccountData.java | 2 +- .../savings/domain/SavingsAccount.java | 2 +- 11 files changed, 21 insertions(+), 29 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java index 74cb96379..b1798e465 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java @@ -112,8 +112,8 @@ public class AccountingRuleWritePlatformServiceJpaRepositoryImpl implements Acco // get the GL Accounts or tags to Debit and Credit final String[] debitTags = command.arrayValueOfParameterNamed(AccountingRuleJsonInputParams.DEBIT_ACCOUNT_TAGS.getValue()); final String[] creditTags = command.arrayValueOfParameterNamed(AccountingRuleJsonInputParams.CREDIT_ACCOUNT_TAGS.getValue()); - final Set incomingDebitTags = debitTags == null ? new HashSet() : new HashSet<>(Arrays.asList(debitTags)); - final Set incomingCreditTags = creditTags == null ? new HashSet() : new HashSet<>(Arrays.asList(creditTags)); + final Set incomingDebitTags = debitTags == null ? new HashSet<>() : new HashSet<>(Arrays.asList(debitTags)); + final Set incomingCreditTags = creditTags == null ? new HashSet<>() : new HashSet<>(Arrays.asList(creditTags)); final Long accountToDebitId = command.longValueOfParameterNamed(AccountingRuleJsonInputParams.ACCOUNT_TO_DEBIT.getValue()); final Long accountToCreditId = command.longValueOfParameterNamed(AccountingRuleJsonInputParams.ACCOUNT_TO_CREDIT.getValue()); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/handler/CreateClientCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/handler/CreateClientCommandHandler.java index 3b4526175..caaf9d172 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/handler/CreateClientCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/handler/CreateClientCommandHandler.java @@ -7,7 +7,6 @@ package org.mifosplatform.portfolio.client.handler; import org.mifosplatform.commands.annotation.CommandType; import org.mifosplatform.commands.handler.NewCommandSourceHandler; -import org.mifosplatform.commands.provider.CommandHandlerProvider; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; import org.mifosplatform.portfolio.client.service.ClientWritePlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanInterestRecalculationDetails.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanInterestRecalculationDetails.java index f72431145..2234cf5bb 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanInterestRecalculationDetails.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanInterestRecalculationDetails.java @@ -35,7 +35,6 @@ import org.springframework.data.jpa.domain.AbstractPersistable; @Table(name = "m_loan_recalculation_details") public class LoanInterestRecalculationDetails extends AbstractPersistable { - @SuppressWarnings("unused") @OneToOne @JoinColumn(name = "loan_id", nullable = false) private Loan loan; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/exception/LoanMultiDisbursementException.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/exception/LoanMultiDisbursementException.java index 99fa471e2..f2fc5e7f9 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/exception/LoanMultiDisbursementException.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/exception/LoanMultiDisbursementException.java @@ -9,9 +9,8 @@ import org.mifosplatform.infrastructure.core.exception.AbstractPlatformDomainRul public class LoanMultiDisbursementException extends AbstractPlatformDomainRuleException { - public LoanMultiDisbursementException(final String entity, final String defaultUserMessage, - final Object... defaultUserMessageArgs) { - super("error.msg." + defaultUserMessage,defaultUserMessage); + public LoanMultiDisbursementException(final String defaultUserMessage, final Object... defaultUserMessageArgs) { + super("error.msg." + defaultUserMessage, defaultUserMessage, defaultUserMessageArgs); } } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java index 3bd1fe418..ff0aa8ffc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java @@ -460,7 +460,6 @@ public class LoanRescheduleRequestWritePlatformServiceImpl implements LoanResche boolean isHolidayEnabled = false; WorkingDays workingDays = null; LocalDate recalculateFrom = null; - LocalDate lastTransactionDate = null; Long overdurPenaltyWaitPeriod = null; if (loan.repaymentScheduleDetail().isInterestRecalculationEnabled()) { restCalendarInstance = calendarInstanceRepository.findCalendarInstaneByEntityId( diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java index 34ab7e2f7..6be92e9a4 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -2607,21 +2607,21 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf if (!dataValidationErrors.isEmpty()) { throw new PlatformApiDataValidationException(dataValidationErrors); } } - private void validateForAddAndDeleteTranche(final Loan loan){ - + private void validateForAddAndDeleteTranche(final Loan loan) { + BigDecimal totalDisbursedAmount = BigDecimal.ZERO; Collection loanDisburseDetails = loan.getDisbursementDetails(); for (LoanDisbursementDetails disbursementDetails : loanDisburseDetails) { - if(disbursementDetails.actualDisbursementDate() != null){ + if (disbursementDetails.actualDisbursementDate() != null) { totalDisbursedAmount = totalDisbursedAmount.add(disbursementDetails.principal()); } } - if(totalDisbursedAmount.compareTo(loan.getApprovedPrincipal()) == 0){ + if (totalDisbursedAmount.compareTo(loan.getApprovedPrincipal()) == 0) { final String errorMessage = "loan.disbursement.cannot.be.a.edited"; - throw new LoanMultiDisbursementException(LoanApiConstants.disbursementDataParameterName, errorMessage); - } + throw new LoanMultiDisbursementException(errorMessage); + } } - + @Override @Transactional public CommandProcessingResult addAndDeleteLoanDisburseDetails(Long loanId, JsonCommand command) { @@ -2630,17 +2630,17 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf checkClientOrGroupActive(loan); final Map actualChanges = new LinkedHashMap<>(); LocalDate expectedDisbursementDate = loan.getExpectedDisbursedOnLocalDate(); - if(!loan.loanProduct().isMultiDisburseLoan()){ + if (!loan.loanProduct().isMultiDisburseLoan()) { final String errorMessage = "loan.product.does.not.support.multiple.disbursals"; - throw new LoanMultiDisbursementException(LoanApiConstants.disbursementDataParameterName, errorMessage); + throw new LoanMultiDisbursementException(errorMessage); } - if(loan.isSubmittedAndPendingApproval() || loan.isClosed() || loan.isClosedWrittenOff() || loan.status().isClosedObligationsMet() || - loan.status().isOverpaid()){ + if (loan.isSubmittedAndPendingApproval() || loan.isClosed() || loan.isClosedWrittenOff() || loan.status().isClosedObligationsMet() + || loan.status().isOverpaid()) { final String errorMessage = "cannot.modify.tranches.if.loan.is.pendingapproval.closed.overpaid.writtenoff"; - throw new LoanMultiDisbursementException(LoanApiConstants.disbursementDataParameterName, errorMessage); + throw new LoanMultiDisbursementException(errorMessage); } validateMultiDisbursementData(command, expectedDisbursementDate); - + this.validateForAddAndDeleteTranche(loan); loan.updateDisbursementDetails(command, actualChanges); @@ -2704,7 +2704,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf Collection loanDisburseDetails = loan.getDisbursementDetails(); BigDecimal setAmount = BigDecimal.ZERO; for (LoanDisbursementDetails details : loanDisburseDetails) { - if(details.actualDisbursementDate() != null){ + if (details.actualDisbursementDate() != null) { setAmount = setAmount.add(details.principal()); } } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductInterestRecalculationDetails.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductInterestRecalculationDetails.java index 17c95cc2a..56b633b0f 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductInterestRecalculationDetails.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductInterestRecalculationDetails.java @@ -31,7 +31,6 @@ import org.springframework.data.jpa.domain.AbstractPersistable; @Table(name = "m_product_loan_recalculation_details") public class LoanProductInterestRecalculationDetails extends AbstractPersistable { - @SuppressWarnings("unused") @OneToOne @JoinColumn(name = "product_id", nullable = false) private LoanProduct loanProduct; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/paymenttype/api/PaymentTypeApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/paymenttype/api/PaymentTypeApiResource.java index 25c03286b..fbc96804c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/paymenttype/api/PaymentTypeApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/paymenttype/api/PaymentTypeApiResource.java @@ -5,10 +5,7 @@ */ package org.mifosplatform.portfolio.paymenttype.api; -import java.util.Arrays; import java.util.Collection; -import java.util.HashSet; -import java.util.Set; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/DepositAccountData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/DepositAccountData.java index 1efc2eab1..714ef9e70 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/DepositAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/DepositAccountData.java @@ -272,7 +272,7 @@ public class DepositAccountData { } public Collection charges() { - return (this.charges == null) ? new HashSet() : this.charges; + return (this.charges == null) ? new HashSet<>() : this.charges; } public EnumOptionData depositType() { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/SavingsAccountData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/SavingsAccountData.java index 24e8ad231..207ab6820 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/SavingsAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/SavingsAccountData.java @@ -469,6 +469,6 @@ public class SavingsAccountData { } public Collection charges() { - return (this.charges == null) ? new HashSet() : this.charges; + return (this.charges == null) ? new HashSet<>() : this.charges; } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java index d54033ac5..d8d12dbbc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java @@ -2309,7 +2309,7 @@ public class SavingsAccount extends AbstractPersistable { } public Set charges() { - return (this.charges == null) ? new HashSet() : this.charges; + return (this.charges == null) ? new HashSet<>() : this.charges; } public void validateAccountValuesWithProduct() {