From 377dee1984fec4f3a5278cc7db7f6b5ff1dd783d Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Tue, 31 Mar 2015 13:52:17 -0700 Subject: [PATCH] removing warnings on portfolio packages --- .../LoanProductToGLAccountMappingHelper.java | 9 +++--- .../ProductToGLAccountMappingHelper.java | 7 ++--- ...avingsProductToGLAccountMappingHelper.java | 9 +++--- .../workingdays/data/WorkingDaysData.java | 15 +++++----- ...WritePlatformServiceJpaRepositoryImpl.java | 29 +++++++++---------- .../domain/LoanAccountDomainServiceJpa.java | 9 +++--- ...RepaymentScheduleTransactionProcessor.java | 5 ++-- ...RepaymentScheduleTransactionProcessor.java | 2 +- ...RepaymentScheduleTransactionProcessor.java | 2 +- .../LoanEventApiJsonValidator.java | 6 ++-- ...WritePlatformServiceJpaRepositoryImpl.java | 2 +- .../api/LoanProductsApiResource.java | 4 --- ...DepositAccountTransactionsApiResource.java | 5 +--- .../api/FixedDepositProductsApiResource.java | 5 +--- ...DepositAccountTransactionsApiResource.java | 5 +--- .../RecurringDepositProductsApiResource.java | 5 +--- ...SavingsAccountTransactionsApiResource.java | 10 ++----- .../api/SavingsProductsApiResource.java | 5 +--- .../domain/DepositAccountAssembler.java | 3 -- ...eMatureCalculationPlatformServiceImpl.java | 5 +--- ...DepositAccountReadPlatformServiceImpl.java | 5 ---- .../data/PasswordValidationPolicyData.java | 7 +++-- 22 files changed, 57 insertions(+), 97 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/LoanProductToGLAccountMappingHelper.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/LoanProductToGLAccountMappingHelper.java index af450b5bc..69fe284e2 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/LoanProductToGLAccountMappingHelper.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/LoanProductToGLAccountMappingHelper.java @@ -17,7 +17,6 @@ import org.mifosplatform.accounting.glaccount.domain.GLAccountRepositoryWrapper; import org.mifosplatform.accounting.glaccount.domain.GLAccountType; import org.mifosplatform.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.mifosplatform.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; -import org.mifosplatform.infrastructure.codes.domain.CodeValueRepositoryWrapper; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper; import org.mifosplatform.portfolio.charge.domain.ChargeRepositoryWrapper; @@ -33,10 +32,10 @@ public class LoanProductToGLAccountMappingHelper extends ProductToGLAccountMappi @Autowired public LoanProductToGLAccountMappingHelper(final GLAccountRepository glAccountRepository, final ProductToGLAccountMappingRepository glAccountMappingRepository, final FromJsonHelper fromApiJsonHelper, - final CodeValueRepositoryWrapper codeValueRepositoryWrapper, final ChargeRepositoryWrapper chargeRepositoryWrapper, - final GLAccountRepositoryWrapper accountRepositoryWrapper, final PaymentTypeRepositoryWrapper paymentTypeRepositoryWrapper) { - super(glAccountRepository, glAccountMappingRepository, fromApiJsonHelper, codeValueRepositoryWrapper, chargeRepositoryWrapper, - accountRepositoryWrapper, paymentTypeRepositoryWrapper); + final ChargeRepositoryWrapper chargeRepositoryWrapper, final GLAccountRepositoryWrapper accountRepositoryWrapper, + final PaymentTypeRepositoryWrapper paymentTypeRepositoryWrapper) { + super(glAccountRepository, glAccountMappingRepository, fromApiJsonHelper, chargeRepositoryWrapper, accountRepositoryWrapper, + paymentTypeRepositoryWrapper); } /*** Set of abstractions for saving Loan Products to GL Account Mappings ***/ diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java index 830befc9c..e80a377cc 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java @@ -23,7 +23,6 @@ import org.mifosplatform.accounting.producttoaccountmapping.domain.ProductToGLAc import org.mifosplatform.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; import org.mifosplatform.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingInvalidException; import org.mifosplatform.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingNotFoundException; -import org.mifosplatform.infrastructure.codes.domain.CodeValueRepositoryWrapper; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper; import org.mifosplatform.portfolio.charge.domain.Charge; @@ -44,19 +43,17 @@ public class ProductToGLAccountMappingHelper { protected final GLAccountRepositoryWrapper accountRepositoryWrapper; protected final ProductToGLAccountMappingRepository accountMappingRepository; protected final FromJsonHelper fromApiJsonHelper; - private final CodeValueRepositoryWrapper codeValueRepositoryWrapper; private final ChargeRepositoryWrapper chargeRepositoryWrapper; private final PaymentTypeRepositoryWrapper paymentTypeRepositoryWrapper; @Autowired public ProductToGLAccountMappingHelper(final GLAccountRepository glAccountRepository, final ProductToGLAccountMappingRepository glAccountMappingRepository, final FromJsonHelper fromApiJsonHelper, - final CodeValueRepositoryWrapper codeValueRepositoryWrapper, final ChargeRepositoryWrapper chargeRepositoryWrapper, - final GLAccountRepositoryWrapper accountRepositoryWrapper, PaymentTypeRepositoryWrapper paymentTypeRepositoryWrapper) { + final ChargeRepositoryWrapper chargeRepositoryWrapper, final GLAccountRepositoryWrapper accountRepositoryWrapper, + PaymentTypeRepositoryWrapper paymentTypeRepositoryWrapper) { this.accountRepository = glAccountRepository; this.accountMappingRepository = glAccountMappingRepository; this.fromApiJsonHelper = fromApiJsonHelper; - this.codeValueRepositoryWrapper = codeValueRepositoryWrapper; this.chargeRepositoryWrapper = chargeRepositoryWrapper; this.accountRepositoryWrapper = accountRepositoryWrapper; this.paymentTypeRepositoryWrapper = paymentTypeRepositoryWrapper; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java index 59537e092..c3c1eb913 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java @@ -16,7 +16,6 @@ import org.mifosplatform.accounting.glaccount.domain.GLAccountRepositoryWrapper; import org.mifosplatform.accounting.glaccount.domain.GLAccountType; import org.mifosplatform.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.mifosplatform.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; -import org.mifosplatform.infrastructure.codes.domain.CodeValueRepositoryWrapper; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper; import org.mifosplatform.portfolio.charge.domain.ChargeRepositoryWrapper; @@ -32,10 +31,10 @@ public class SavingsProductToGLAccountMappingHelper extends ProductToGLAccountMa @Autowired public SavingsProductToGLAccountMappingHelper(final GLAccountRepository glAccountRepository, final ProductToGLAccountMappingRepository glAccountMappingRepository, final FromJsonHelper fromApiJsonHelper, - final CodeValueRepositoryWrapper codeValueRepositoryWrapper, final ChargeRepositoryWrapper chargeRepositoryWrapper, - final GLAccountRepositoryWrapper accountRepositoryWrapper, final PaymentTypeRepositoryWrapper paymentTypeRepositoryWrapper) { - super(glAccountRepository, glAccountMappingRepository, fromApiJsonHelper, codeValueRepositoryWrapper, chargeRepositoryWrapper, - accountRepositoryWrapper, paymentTypeRepositoryWrapper); + final ChargeRepositoryWrapper chargeRepositoryWrapper, final GLAccountRepositoryWrapper accountRepositoryWrapper, + final PaymentTypeRepositoryWrapper paymentTypeRepositoryWrapper) { + super(glAccountRepository, glAccountMappingRepository, fromApiJsonHelper, chargeRepositoryWrapper, accountRepositoryWrapper, + paymentTypeRepositoryWrapper); } /*** Set of abstractions for saving Saving Products to GL Account Mappings ***/ diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/workingdays/data/WorkingDaysData.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/workingdays/data/WorkingDaysData.java index 9955936f5..c9063805a 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/workingdays/data/WorkingDaysData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/workingdays/data/WorkingDaysData.java @@ -5,12 +5,12 @@ */ package org.mifosplatform.organisation.workingdays.data; - import org.mifosplatform.infrastructure.core.data.EnumOptionData; import java.util.Collection; public class WorkingDaysData { + @SuppressWarnings("unused") private final Long id; @SuppressWarnings("unused") @@ -19,10 +19,10 @@ public class WorkingDaysData { @SuppressWarnings("unused") private final EnumOptionData repaymentRescheduleType; - //template date + // template date + @SuppressWarnings("unused") private final Collection repaymentRescheduleOptions; - public WorkingDaysData(Long id, String recurrence, EnumOptionData repaymentRescheduleType) { this.id = id; this.recurrence = recurrence; @@ -30,10 +30,11 @@ public class WorkingDaysData { this.repaymentRescheduleOptions = null; } - public WorkingDaysData(Long id, String recurrence, EnumOptionData repaymentRescheduleType, Collection repaymentRescheduleOptions) { - this.id = null; - this.recurrence = null; - this.repaymentRescheduleType = null; + public WorkingDaysData(Long id, String recurrence, EnumOptionData repaymentRescheduleType, + Collection repaymentRescheduleOptions) { + this.id = id; + this.recurrence = recurrence; + this.repaymentRescheduleType = repaymentRescheduleType; this.repaymentRescheduleOptions = repaymentRescheduleOptions; } } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/workingdays/service/WorkingDaysWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/workingdays/service/WorkingDaysWritePlatformServiceJpaRepositoryImpl.java index 247e950e1..4c4448d5f 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/workingdays/service/WorkingDaysWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/workingdays/service/WorkingDaysWritePlatformServiceJpaRepositoryImpl.java @@ -33,8 +33,7 @@ public class WorkingDaysWritePlatformServiceJpaRepositoryImpl implements Working @Autowired public WorkingDaysWritePlatformServiceJpaRepositoryImpl(final WorkingDaysRepositoryWrapper daysRepositoryWrapper, - final ConfigurationDomainService configurationDomainService, - final WorkingDayValidator fromApiJsonDeserializer) { + final ConfigurationDomainService configurationDomainService, final WorkingDayValidator fromApiJsonDeserializer) { this.daysRepositoryWrapper = daysRepositoryWrapper; this.configurationDomainService = configurationDomainService; this.fromApiJsonDeserializer = fromApiJsonDeserializer; @@ -56,25 +55,25 @@ public class WorkingDaysWritePlatformServiceJpaRepositoryImpl implements Working public CommandProcessingResult updateWorkingDays(JsonCommand command) { String recurrence = ""; RRule rrule = null; - try{ - this.fromApiJsonDeserializer.validateForUpdate(command.json()); - final WorkingDays workingDays = this.daysRepositoryWrapper.findOne(); + try { + this.fromApiJsonDeserializer.validateForUpdate(command.json()); + final WorkingDays workingDays = this.daysRepositoryWrapper.findOne(); - recurrence = command.stringValueOfParameterNamed(WorkingDaysApiConstants.recurrence); - rrule = new RRule(recurrence); - rrule.validate(); + recurrence = command.stringValueOfParameterNamed(WorkingDaysApiConstants.recurrence); + rrule = new RRule(recurrence); + rrule.validate(); - Map changes = workingDays.update(command); - this.daysRepositoryWrapper.saveAndFlush(workingDays); - return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(workingDays.getId()).build(); - }catch (final ValidationException e) { + Map changes = workingDays.update(command); + this.daysRepositoryWrapper.saveAndFlush(workingDays); + return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(workingDays.getId()).with(changes) + .build(); + } catch (final ValidationException e) { throw new PlatformDataIntegrityException("error.msg.invalid.recurring.rule", "The Recurring Rule value: " + recurrence + " is not valid.", "recurrence", recurrence); - } catch (final IllegalArgumentException|ParseException e) { + } catch (final IllegalArgumentException | ParseException e) { throw new PlatformDataIntegrityException("error.msg.recurring.rule.parsing.error", "Error in passing the Recurring Rule value: " + recurrence, "recurrence", e.getMessage()); - } + } } - } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java index ab9d7d8b2..bdde73bb3 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java @@ -572,8 +572,8 @@ public class LoanAccountDomainServiceJpa implements LoanAccountDomainService { checkClientOrGroupActive(loan); this.businessEventNotifierService.notifyBusinessEventToBeExecuted(BUSINESS_EVENTS.LOAN_REFUND, constructEntityMap(BUSINESS_ENTITY.LOAN, loan)); - final List existingTransactionIds = new ArrayList(); - final List existingReversedTransactionIds = new ArrayList(); + final List existingTransactionIds = new ArrayList<>(); + final List existingReversedTransactionIds = new ArrayList<>(); AppUser currentUser = getAppUserIfPresent(); final Money refundAmount = Money.of(loan.getCurrency(), transactionAmount); @@ -585,9 +585,8 @@ public class LoanAccountDomainServiceJpa implements LoanAccountDomainService { final WorkingDays workingDays = this.workingDaysRepository.findOne(); final boolean allowTransactionsOnNonWorkingDay = this.configurationDomainService.allowTransactionsOnNonWorkingDayEnabled(); - final ChangedTransactionDetail changedTransactionDetail = loan.makeRefundForActiveLoan(newRefundTransaction, - defaultLoanLifecycleStateMachine(), existingTransactionIds, existingReversedTransactionIds, allowTransactionsOnHoliday, - holidays, workingDays, allowTransactionsOnNonWorkingDay); + loan.makeRefundForActiveLoan(newRefundTransaction, defaultLoanLifecycleStateMachine(), existingTransactionIds, + existingReversedTransactionIds, allowTransactionsOnHoliday, holidays, workingDays, allowTransactionsOnNonWorkingDay); this.loanTransactionRepository.save(newRefundTransaction); this.loanRepository.save(loan); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/EarlyPaymentLoanRepaymentScheduleTransactionProcessor.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/EarlyPaymentLoanRepaymentScheduleTransactionProcessor.java index 45f8b73e0..cfbd10fb6 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/EarlyPaymentLoanRepaymentScheduleTransactionProcessor.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/EarlyPaymentLoanRepaymentScheduleTransactionProcessor.java @@ -137,13 +137,14 @@ public class EarlyPaymentLoanRepaymentScheduleTransactionProcessor extends Abstr return transactionAmountRemaining; } - + @Override protected Money handleRefundTransactionPaymentOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment, final LoanTransaction loanTransaction, final Money transactionAmountUnprocessed) { final LocalDate transactionDate = loanTransaction.getTransactionDate(); - final MonetaryCurrency currency = transactionAmountUnprocessed.getCurrency(); + // final MonetaryCurrency currency = + // transactionAmountUnprocessed.getCurrency(); Money transactionAmountRemaining = transactionAmountUnprocessed; Money principalPortion = Money.zero(transactionAmountRemaining.getCurrency()); Money interestPortion = Money.zero(transactionAmountRemaining.getCurrency()); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/PrincipalInterestPenaltyFeesOrderLoanRepaymentScheduleTransactionProcessor.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/PrincipalInterestPenaltyFeesOrderLoanRepaymentScheduleTransactionProcessor.java index 531f81f29..d22a0c461 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/PrincipalInterestPenaltyFeesOrderLoanRepaymentScheduleTransactionProcessor.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/PrincipalInterestPenaltyFeesOrderLoanRepaymentScheduleTransactionProcessor.java @@ -110,7 +110,7 @@ public class PrincipalInterestPenaltyFeesOrderLoanRepaymentScheduleTransactionPr final LoanTransaction loanTransaction, final Money transactionAmountUnprocessed) { final LocalDate transactionDate = loanTransaction.getTransactionDate(); - final MonetaryCurrency currency = transactionAmountUnprocessed.getCurrency(); + //final MonetaryCurrency currency = transactionAmountUnprocessed.getCurrency(); Money transactionAmountRemaining = transactionAmountUnprocessed; Money principalPortion = Money.zero(transactionAmountRemaining.getCurrency()); Money interestPortion = Money.zero(transactionAmountRemaining.getCurrency()); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/RBILoanRepaymentScheduleTransactionProcessor.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/RBILoanRepaymentScheduleTransactionProcessor.java index 28c4b2fcb..2d02154b0 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/RBILoanRepaymentScheduleTransactionProcessor.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/transactionprocessor/impl/RBILoanRepaymentScheduleTransactionProcessor.java @@ -215,7 +215,7 @@ public class RBILoanRepaymentScheduleTransactionProcessor extends AbstractLoanRe final LoanTransaction loanTransaction, final Money transactionAmountUnprocessed) { final LocalDate transactionDate = loanTransaction.getTransactionDate(); - final MonetaryCurrency currency = transactionAmountUnprocessed.getCurrency(); + //final MonetaryCurrency currency = transactionAmountUnprocessed.getCurrency(); Money transactionAmountRemaining = transactionAmountUnprocessed; Money principalPortion = Money.zero(transactionAmountRemaining.getCurrency()); Money interestPortion = Money.zero(transactionAmountRemaining.getCurrency()); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java index 7901b4bff..a06c5870e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java @@ -31,9 +31,7 @@ import org.mifosplatform.portfolio.loanaccount.domain.LoanDisbursementDetails; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; @Component @@ -411,14 +409,14 @@ public final class LoanEventApiJsonValidator { if (StringUtils.isBlank(json)) { throw new InvalidJsonException(); } - final Set transactionParameters = new HashSet(Arrays.asList("transactionDate", "transactionAmount", "externalId", + final Set transactionParameters = new HashSet<>(Arrays.asList("transactionDate", "transactionAmount", "externalId", "note", "locale", "dateFormat", "paymentTypeId", "accountNumber", "checkNumber", "routingCode", "receiptNumber", "bankNumber")); final Type typeOfMap = new TypeToken>() {}.getType(); this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, transactionParameters); - final List dataValidationErrors = new ArrayList(); + final List dataValidationErrors = new ArrayList<>(); final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("loan.transaction"); final JsonElement element = this.fromApiJsonHelper.parse(json); 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 95c4a33e4..771b4f063 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 @@ -2893,7 +2893,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf final BigDecimal transactionAmount = command.bigDecimalValueOfParameterNamed("transactionAmount"); checkIfLoanIsPaidInAdvance(loanId, transactionAmount); - final Map changes = new LinkedHashMap(); + final Map changes = new LinkedHashMap<>(); changes.put("transactionDate", command.stringValueOfParameterNamed("transactionDate")); changes.put("transactionAmount", command.stringValueOfParameterNamed("transactionAmount")); changes.put("locale", command.locale()); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/api/LoanProductsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/api/LoanProductsApiResource.java index a4030ed01..4436bd1e3 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/api/LoanProductsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/api/LoanProductsApiResource.java @@ -32,7 +32,6 @@ import org.mifosplatform.accounting.producttoaccountmapping.service.ProductToGLA import org.mifosplatform.commands.domain.CommandWrapper; import org.mifosplatform.commands.service.CommandWrapperBuilder; import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.core.api.ApiParameterHelper; import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; @@ -91,7 +90,6 @@ public class LoanProductsApiResource { private final LoanDropdownReadPlatformService dropdownReadPlatformService; private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; private final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService; private final DefaultToApiJsonSerializer productMixDataApiJsonSerializer; private final ProductMixReadPlatformService productMixReadPlatformService; @@ -106,7 +104,6 @@ public class LoanProductsApiResource { final ApiRequestParameterHelper apiRequestParameterHelper, final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService, final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService, - final CodeValueReadPlatformService codeValueReadPlatformService, final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService, final DefaultToApiJsonSerializer productMixDataApiJsonSerializer, final ProductMixReadPlatformService productMixReadPlatformService, @@ -122,7 +119,6 @@ public class LoanProductsApiResource { this.apiRequestParameterHelper = apiRequestParameterHelper; this.commandsSourceWritePlatformService = commandsSourceWritePlatformService; this.accountMappingReadPlatformService = accountMappingReadPlatformService; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.accountingDropdownReadPlatformService = accountingDropdownReadPlatformService; this.productMixDataApiJsonSerializer = productMixDataApiJsonSerializer; this.productMixReadPlatformService = productMixReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java index 88707e750..7ae3ee47b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java @@ -22,7 +22,6 @@ import org.apache.commons.lang.StringUtils; import org.mifosplatform.commands.domain.CommandWrapper; import org.mifosplatform.commands.service.CommandWrapperBuilder; import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; import org.mifosplatform.infrastructure.core.exception.UnrecognizedQueryParamException; @@ -50,7 +49,6 @@ public class FixedDepositAccountTransactionsApiResource { private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; private final ApiRequestParameterHelper apiRequestParameterHelper; private final SavingsAccountReadPlatformService savingsAccountReadPlatformService; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final PaymentTypeReadPlatformService paymentTypeReadPlatformService; @Autowired @@ -59,13 +57,12 @@ public class FixedDepositAccountTransactionsApiResource { final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService, final ApiRequestParameterHelper apiRequestParameterHelper, final SavingsAccountReadPlatformService savingsAccountReadPlatformService, - final CodeValueReadPlatformService codeValueReadPlatformService, PaymentTypeReadPlatformService paymentTypeReadPlatformService) { + PaymentTypeReadPlatformService paymentTypeReadPlatformService) { this.context = context; this.toApiJsonSerializer = toApiJsonSerializer; this.commandsSourceWritePlatformService = commandsSourceWritePlatformService; this.apiRequestParameterHelper = apiRequestParameterHelper; this.savingsAccountReadPlatformService = savingsAccountReadPlatformService; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.paymentTypeReadPlatformService = paymentTypeReadPlatformService; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/FixedDepositProductsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/FixedDepositProductsApiResource.java index 6bfa488a8..18cabbe78 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/FixedDepositProductsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/FixedDepositProductsApiResource.java @@ -32,7 +32,6 @@ import org.mifosplatform.accounting.producttoaccountmapping.service.ProductToGLA import org.mifosplatform.commands.domain.CommandWrapper; import org.mifosplatform.commands.service.CommandWrapperBuilder; import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; import org.mifosplatform.infrastructure.core.data.EnumOptionData; @@ -77,7 +76,6 @@ public class FixedDepositProductsApiResource { private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; private final ApiRequestParameterHelper apiRequestParameterHelper; private final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService; private final ChargeReadPlatformService chargeReadPlatformService; private final InterestRateChartReadPlatformService chartReadPlatformService; @@ -92,7 +90,7 @@ public class FixedDepositProductsApiResource { final CurrencyReadPlatformService currencyReadPlatformService, final PlatformSecurityContext context, final DefaultToApiJsonSerializer toApiJsonSerializer, final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService, - final ApiRequestParameterHelper apiRequestParameterHelper, final CodeValueReadPlatformService codeValueReadPlatformService, + final ApiRequestParameterHelper apiRequestParameterHelper, final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService, final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService, final ChargeReadPlatformService chargeReadPlatformService, final InterestRateChartReadPlatformService chartReadPlatformService, @@ -107,7 +105,6 @@ public class FixedDepositProductsApiResource { this.toApiJsonSerializer = toApiJsonSerializer; this.commandsSourceWritePlatformService = commandsSourceWritePlatformService; this.apiRequestParameterHelper = apiRequestParameterHelper; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.accountingDropdownReadPlatformService = accountingDropdownReadPlatformService; this.accountMappingReadPlatformService = accountMappingReadPlatformService; this.chargeReadPlatformService = chargeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java index 143d79a1b..910128f5c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java @@ -22,7 +22,6 @@ import org.apache.commons.lang.StringUtils; import org.mifosplatform.commands.domain.CommandWrapper; import org.mifosplatform.commands.service.CommandWrapperBuilder; import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; import org.mifosplatform.infrastructure.core.exception.UnrecognizedQueryParamException; @@ -52,7 +51,6 @@ public class RecurringDepositAccountTransactionsApiResource { private final ApiRequestParameterHelper apiRequestParameterHelper; private final SavingsAccountReadPlatformService savingsAccountReadPlatformService; private final DepositAccountReadPlatformService depositAccountReadPlatformService; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final PaymentTypeReadPlatformService paymentTypeReadPlatformService; @Autowired @@ -62,14 +60,13 @@ public class RecurringDepositAccountTransactionsApiResource { final ApiRequestParameterHelper apiRequestParameterHelper, final SavingsAccountReadPlatformService savingsAccountReadPlatformService, final DepositAccountReadPlatformService depositAccountReadPlatformService, - final CodeValueReadPlatformService codeValueReadPlatformService, PaymentTypeReadPlatformService paymentTypeReadPlatformService) { + final PaymentTypeReadPlatformService paymentTypeReadPlatformService) { this.context = context; this.toApiJsonSerializer = toApiJsonSerializer; this.commandsSourceWritePlatformService = commandsSourceWritePlatformService; this.apiRequestParameterHelper = apiRequestParameterHelper; this.savingsAccountReadPlatformService = savingsAccountReadPlatformService; this.depositAccountReadPlatformService = depositAccountReadPlatformService; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.paymentTypeReadPlatformService = paymentTypeReadPlatformService; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/RecurringDepositProductsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/RecurringDepositProductsApiResource.java index f98127e58..8a7558881 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/RecurringDepositProductsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/RecurringDepositProductsApiResource.java @@ -32,7 +32,6 @@ import org.mifosplatform.accounting.producttoaccountmapping.service.ProductToGLA import org.mifosplatform.commands.domain.CommandWrapper; import org.mifosplatform.commands.service.CommandWrapperBuilder; import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; import org.mifosplatform.infrastructure.core.data.EnumOptionData; @@ -77,7 +76,6 @@ public class RecurringDepositProductsApiResource { private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; private final ApiRequestParameterHelper apiRequestParameterHelper; private final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService; private final ChargeReadPlatformService chargeReadPlatformService; private final InterestRateChartReadPlatformService chartReadPlatformService; @@ -92,7 +90,7 @@ public class RecurringDepositProductsApiResource { final CurrencyReadPlatformService currencyReadPlatformService, final PlatformSecurityContext context, final DefaultToApiJsonSerializer toApiJsonSerializer, final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService, - final ApiRequestParameterHelper apiRequestParameterHelper, final CodeValueReadPlatformService codeValueReadPlatformService, + final ApiRequestParameterHelper apiRequestParameterHelper, final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService, final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService, final ChargeReadPlatformService chargeReadPlatformService, final InterestRateChartReadPlatformService chartReadPlatformService, @@ -107,7 +105,6 @@ public class RecurringDepositProductsApiResource { this.toApiJsonSerializer = toApiJsonSerializer; this.commandsSourceWritePlatformService = commandsSourceWritePlatformService; this.apiRequestParameterHelper = apiRequestParameterHelper; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.accountingDropdownReadPlatformService = accountingDropdownReadPlatformService; this.accountMappingReadPlatformService = accountMappingReadPlatformService; this.chargeReadPlatformService = chargeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountTransactionsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountTransactionsApiResource.java index d3071c4dc..5bdd03e5b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountTransactionsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountTransactionsApiResource.java @@ -22,7 +22,6 @@ import org.apache.commons.lang.StringUtils; import org.mifosplatform.commands.domain.CommandWrapper; import org.mifosplatform.commands.service.CommandWrapperBuilder; import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException; @@ -52,7 +51,6 @@ public class SavingsAccountTransactionsApiResource { private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; private final ApiRequestParameterHelper apiRequestParameterHelper; private final SavingsAccountReadPlatformService savingsAccountReadPlatformService; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final PaymentTypeReadPlatformService paymentTypeReadPlatformService; @Autowired @@ -61,13 +59,12 @@ public class SavingsAccountTransactionsApiResource { final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService, final ApiRequestParameterHelper apiRequestParameterHelper, final SavingsAccountReadPlatformService savingsAccountReadPlatformService, - final CodeValueReadPlatformService codeValueReadPlatformService,PaymentTypeReadPlatformService paymentTypeReadPlatformService) { + PaymentTypeReadPlatformService paymentTypeReadPlatformService) { this.context = context; this.toApiJsonSerializer = toApiJsonSerializer; this.commandsSourceWritePlatformService = commandsSourceWritePlatformService; this.apiRequestParameterHelper = apiRequestParameterHelper; this.savingsAccountReadPlatformService = savingsAccountReadPlatformService; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.paymentTypeReadPlatformService = paymentTypeReadPlatformService; } @@ -89,8 +86,7 @@ public class SavingsAccountTransactionsApiResource { // both deposit/withdrawal templates SavingsAccountTransactionData savingsAccount = this.savingsAccountReadPlatformService.retrieveDepositTransactionTemplate(savingsId, DepositAccountType.SAVINGS_DEPOSIT); - final Collection paymentTypeOptions = this.paymentTypeReadPlatformService - .retrieveAllPaymentTypes(); + final Collection paymentTypeOptions = this.paymentTypeReadPlatformService.retrieveAllPaymentTypes(); savingsAccount = SavingsAccountTransactionData.templateOnTop(savingsAccount, paymentTypeOptions); final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters()); @@ -110,7 +106,7 @@ public class SavingsAccountTransactionsApiResource { transactionId, DepositAccountType.SAVINGS_DEPOSIT); final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters()); if (settings.isTemplate()) { - final Collection paymentTypeOptions = this.paymentTypeReadPlatformService.retrieveAllPaymentTypes(); + final Collection paymentTypeOptions = this.paymentTypeReadPlatformService.retrieveAllPaymentTypes(); transactionData = SavingsAccountTransactionData.templateOnTop(transactionData, paymentTypeOptions); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsProductsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsProductsApiResource.java index 1e5cbe22b..53d90c060 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsProductsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsProductsApiResource.java @@ -32,7 +32,6 @@ import org.mifosplatform.accounting.producttoaccountmapping.service.ProductToGLA import org.mifosplatform.commands.domain.CommandWrapper; import org.mifosplatform.commands.service.CommandWrapperBuilder; import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; import org.mifosplatform.infrastructure.core.data.EnumOptionData; @@ -72,7 +71,6 @@ public class SavingsProductsApiResource { private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; private final ApiRequestParameterHelper apiRequestParameterHelper; private final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService; private final ChargeReadPlatformService chargeReadPlatformService; private final PaymentTypeReadPlatformService paymentTypeReadPlatformService; @@ -83,7 +81,7 @@ public class SavingsProductsApiResource { final CurrencyReadPlatformService currencyReadPlatformService, final PlatformSecurityContext context, final DefaultToApiJsonSerializer toApiJsonSerializer, final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService, - final ApiRequestParameterHelper apiRequestParameterHelper, final CodeValueReadPlatformService codeValueReadPlatformService, + final ApiRequestParameterHelper apiRequestParameterHelper, final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService, final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService, final ChargeReadPlatformService chargeReadPlatformService, PaymentTypeReadPlatformService paymentTypeReadPlatformService) { @@ -94,7 +92,6 @@ public class SavingsProductsApiResource { this.toApiJsonSerializer = toApiJsonSerializer; this.commandsSourceWritePlatformService = commandsSourceWritePlatformService; this.apiRequestParameterHelper = apiRequestParameterHelper; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.accountingDropdownReadPlatformService = accountingDropdownReadPlatformService; this.accountMappingReadPlatformService = accountMappingReadPlatformService; this.chargeReadPlatformService = chargeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountAssembler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountAssembler.java index e2d286a71..773827b9c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountAssembler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountAssembler.java @@ -48,8 +48,6 @@ import org.apache.commons.lang.StringUtils; import org.joda.time.LocalDate; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import org.mifosplatform.infrastructure.codes.domain.CodeValue; -import org.mifosplatform.infrastructure.codes.domain.CodeValueRepositoryWrapper; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.exception.InvalidJsonException; import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper; @@ -68,7 +66,6 @@ import org.mifosplatform.portfolio.group.exception.CenterNotActiveException; import org.mifosplatform.portfolio.group.exception.ClientNotInGroupException; import org.mifosplatform.portfolio.group.exception.GroupNotActiveException; import org.mifosplatform.portfolio.interestratechart.domain.InterestRateChart; -import org.mifosplatform.portfolio.paymentdetail.PaymentDetailConstants; import org.mifosplatform.portfolio.paymentdetail.domain.PaymentDetail; import org.mifosplatform.portfolio.paymentdetail.domain.PaymentDetailAssembler; import org.mifosplatform.portfolio.savings.DepositAccountOnClosureType; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountPreMatureCalculationPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountPreMatureCalculationPlatformServiceImpl.java index 3f371f903..79db19755 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountPreMatureCalculationPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountPreMatureCalculationPlatformServiceImpl.java @@ -10,7 +10,6 @@ import static org.mifosplatform.portfolio.savings.DepositsApiConstants.closedOnD import java.util.Collection; import org.joda.time.LocalDate; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.configuration.domain.ConfigurationDomainService; import org.mifosplatform.infrastructure.core.api.JsonQuery; import org.mifosplatform.infrastructure.core.data.EnumOptionData; @@ -40,7 +39,6 @@ public class DepositAccountPreMatureCalculationPlatformServiceImpl implements De private final FromJsonHelper fromJsonHelper; private final DepositAccountTransactionDataValidator depositAccountTransactionDataValidator; private final DepositAccountAssembler depositAccountAssembler; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final SavingsAccountReadPlatformService savingsAccountReadPlatformService; private final ConfigurationDomainService configurationDomainService; private final PaymentTypeReadPlatformService paymentTypeReadPlatformService; @@ -48,13 +46,12 @@ public class DepositAccountPreMatureCalculationPlatformServiceImpl implements De @Autowired public DepositAccountPreMatureCalculationPlatformServiceImpl(final FromJsonHelper fromJsonHelper, final DepositAccountTransactionDataValidator depositAccountTransactionDataValidator, - final DepositAccountAssembler depositAccountAssembler, final CodeValueReadPlatformService codeValueReadPlatformService, + final DepositAccountAssembler depositAccountAssembler, final SavingsAccountReadPlatformService savingsAccountReadPlatformService, final ConfigurationDomainService configurationDomainService, PaymentTypeReadPlatformService paymentTypeReadPlatformService) { this.fromJsonHelper = fromJsonHelper; this.depositAccountTransactionDataValidator = depositAccountTransactionDataValidator; this.depositAccountAssembler = depositAccountAssembler; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.savingsAccountReadPlatformService = savingsAccountReadPlatformService; this.configurationDomainService = configurationDomainService; this.paymentTypeReadPlatformService = paymentTypeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java index 42091cf67..950cee8c9 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java @@ -15,7 +15,6 @@ import java.util.Map; import org.joda.time.LocalDate; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import org.mifosplatform.infrastructure.codes.service.CodeValueReadPlatformService; import org.mifosplatform.infrastructure.core.data.EnumOptionData; import org.mifosplatform.infrastructure.core.data.PaginationParameters; import org.mifosplatform.infrastructure.core.data.PaginationParametersDataValidator; @@ -48,7 +47,6 @@ import org.mifosplatform.portfolio.group.data.GroupGeneralData; import org.mifosplatform.portfolio.group.service.GroupReadPlatformService; import org.mifosplatform.portfolio.interestratechart.data.InterestRateChartData; import org.mifosplatform.portfolio.interestratechart.service.InterestRateChartReadPlatformService; -import org.mifosplatform.portfolio.paymentdetail.PaymentDetailConstants; import org.mifosplatform.portfolio.paymentdetail.data.PaymentDetailData; import org.mifosplatform.portfolio.paymenttype.data.PaymentTypeData; import org.mifosplatform.portfolio.paymenttype.service.PaymentTypeReadPlatformService; @@ -104,7 +102,6 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead private final ChargeReadPlatformService chargeReadPlatformService; private final StaffReadPlatformService staffReadPlatformService; private final DepositsDropdownReadPlatformService depositsDropdownReadPlatformService; - private final CodeValueReadPlatformService codeValueReadPlatformService; private final SavingsAccountReadPlatformService savingsAccountReadPlatformService; private final RecurringAccountDepositTransactionTemplateMapper rdTransactionTemplateMapper; private final DropdownReadPlatformService dropdownReadPlatformService; @@ -122,7 +119,6 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead final ChargeReadPlatformService chargeReadPlatformService, final StaffReadPlatformService staffReadPlatformService, final DepositsDropdownReadPlatformService depositsDropdownReadPlatformService, final InterestRateChartReadPlatformService productChartReadPlatformService, - final CodeValueReadPlatformService codeValueReadPlatformService, final SavingsAccountReadPlatformService savingsAccountReadPlatformService, final DropdownReadPlatformService dropdownReadPlatformService, final CalendarReadPlatformService calendarReadPlatformService, PaymentTypeReadPlatformService paymentTypeReadPlatformService) { @@ -139,7 +135,6 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead this.staffReadPlatformService = staffReadPlatformService; this.depositsDropdownReadPlatformService = depositsDropdownReadPlatformService; this.productChartReadPlatformService = productChartReadPlatformService; - this.codeValueReadPlatformService = codeValueReadPlatformService; this.savingsAccountReadPlatformService = savingsAccountReadPlatformService; this.rdTransactionTemplateMapper = new RecurringAccountDepositTransactionTemplateMapper(); this.dropdownReadPlatformService = dropdownReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/data/PasswordValidationPolicyData.java b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/data/PasswordValidationPolicyData.java index 978e5b9a9..2839c3205 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/data/PasswordValidationPolicyData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/data/PasswordValidationPolicyData.java @@ -12,16 +12,17 @@ import java.io.Serializable; */ public class PasswordValidationPolicyData implements Serializable { + @SuppressWarnings("unused") private final Long id; + @SuppressWarnings("unused") private final String description; + @SuppressWarnings("unused") private final boolean active; - - public PasswordValidationPolicyData(final Long id, final Boolean active, final String description) { + public PasswordValidationPolicyData(final Long id, final Boolean active, final String description) { this.id = id; this.active = active; this.description = description; } - } \ No newline at end of file