From ac6589e9aa86dead8b96a6f8eaaf0643accf2eec Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Thu, 16 Aug 2012 19:49:13 +0100 Subject: [PATCH] rename enum to LoanStatus --- .../DefaultLoanLifecycleStateMachine.java | 70 +++++++++---------- .../mifosng/platform/loan/domain/Loan.java | 34 ++++----- .../domain/LoanLifecycleStateMachine.java | 2 +- .../{LoanStatusEnum.java => LoanStatus.java} | 41 ++++++----- .../platform/loan/service/LoanAssembler.java | 4 +- .../service/LoanReadPlatformServiceImpl.java | 4 +- ...WritePlatformServiceJpaRepositoryImpl.java | 4 +- 7 files changed, 81 insertions(+), 78 deletions(-) rename mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/{LoanStatusEnum.java => LoanStatus.java} (53%) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DefaultLoanLifecycleStateMachine.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DefaultLoanLifecycleStateMachine.java index 3a181b744..f446f4201 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DefaultLoanLifecycleStateMachine.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DefaultLoanLifecycleStateMachine.java @@ -4,84 +4,84 @@ import java.util.List; public class DefaultLoanLifecycleStateMachine implements LoanLifecycleStateMachine { - private final List allowedLoanStatuses; + private final List allowedLoanStatuses; - public DefaultLoanLifecycleStateMachine(List allowedLoanStatuses) { + public DefaultLoanLifecycleStateMachine(List allowedLoanStatuses) { this.allowedLoanStatuses = allowedLoanStatuses; } @Override - public LoanStatusEnum transition(LoanEvent loanEvent, LoanStatusEnum from) { + public LoanStatus transition(LoanEvent loanEvent, LoanStatus from) { - LoanStatusEnum newState = null; + LoanStatus newState = null; switch (loanEvent) { case LOAN_CREATED: if (from == null) { - newState = stateOf(LoanStatusEnum.SUBMITED_AND_PENDING_APPROVAL, + newState = stateOf(LoanStatus.SUBMITED_AND_PENDING_APPROVAL, allowedLoanStatuses); } break; case LOAN_REJECTED: - if (from.hasStateOf(LoanStatusEnum.SUBMITED_AND_PENDING_APPROVAL)) { - newState = stateOf(LoanStatusEnum.REJECTED, allowedLoanStatuses); + if (from.hasStateOf(LoanStatus.SUBMITED_AND_PENDING_APPROVAL)) { + newState = stateOf(LoanStatus.REJECTED, allowedLoanStatuses); } break; case LOAN_APPROVED: - if (from.hasStateOf(LoanStatusEnum.SUBMITED_AND_PENDING_APPROVAL)) { - newState = stateOf(LoanStatusEnum.APPROVED, allowedLoanStatuses); + if (from.hasStateOf(LoanStatus.SUBMITED_AND_PENDING_APPROVAL)) { + newState = stateOf(LoanStatus.APPROVED, allowedLoanStatuses); } break; case LOAN_WITHDRAWN: - if (this.anyOfAllowedWhenComingFrom(from, LoanStatusEnum.SUBMITED_AND_PENDING_APPROVAL, LoanStatusEnum.APPROVED)) { - newState = stateOf(LoanStatusEnum.WITHDRAWN_BY_CLIENT, allowedLoanStatuses); + if (this.anyOfAllowedWhenComingFrom(from, LoanStatus.SUBMITED_AND_PENDING_APPROVAL, LoanStatus.APPROVED)) { + newState = stateOf(LoanStatus.WITHDRAWN_BY_CLIENT, allowedLoanStatuses); } break; case LOAN_DISBURSED: - if (from.hasStateOf(LoanStatusEnum.APPROVED)) { - newState = stateOf(LoanStatusEnum.ACTIVE, allowedLoanStatuses); + if (from.hasStateOf(LoanStatus.APPROVED)) { + newState = stateOf(LoanStatus.ACTIVE, allowedLoanStatuses); } break; case LOAN_APPROVAL_UNDO: - if (from.hasStateOf(LoanStatusEnum.APPROVED)) { - newState = stateOf(LoanStatusEnum.SUBMITED_AND_PENDING_APPROVAL, allowedLoanStatuses); + if (from.hasStateOf(LoanStatus.APPROVED)) { + newState = stateOf(LoanStatus.SUBMITED_AND_PENDING_APPROVAL, allowedLoanStatuses); } break; case LOAN_DISBURSAL_UNDO: - if (this.anyOfAllowedWhenComingFrom(from, LoanStatusEnum.ACTIVE)) { - newState = stateOf(LoanStatusEnum.APPROVED, allowedLoanStatuses); + if (this.anyOfAllowedWhenComingFrom(from, LoanStatus.ACTIVE)) { + newState = stateOf(LoanStatus.APPROVED, allowedLoanStatuses); } break; case LOAN_REPAYMENT: - if (this.anyOfAllowedWhenComingFrom(from, LoanStatusEnum.ACTIVE, LoanStatusEnum.CLOSED, LoanStatusEnum.OVERPAID)) { - newState = stateOf(LoanStatusEnum.ACTIVE, allowedLoanStatuses); + if (this.anyOfAllowedWhenComingFrom(from, LoanStatus.ACTIVE, LoanStatus.CLOSED, LoanStatus.OVERPAID)) { + newState = stateOf(LoanStatus.ACTIVE, allowedLoanStatuses); } else { newState = from; } break; case REPAID_IN_FULL: - if (this.anyOfAllowedWhenComingFrom(from, LoanStatusEnum.ACTIVE)) { - newState = stateOf(LoanStatusEnum.CLOSED, allowedLoanStatuses); + if (this.anyOfAllowedWhenComingFrom(from, LoanStatus.ACTIVE)) { + newState = stateOf(LoanStatus.CLOSED, allowedLoanStatuses); } break; case LOAN_WRITE_OFF: - if (this.anyOfAllowedWhenComingFrom(from,LoanStatusEnum.ACTIVE)) { - newState = stateOf(LoanStatusEnum.CLOSED, allowedLoanStatuses); + if (this.anyOfAllowedWhenComingFrom(from,LoanStatus.ACTIVE)) { + newState = stateOf(LoanStatus.CLOSED, allowedLoanStatuses); } break; case LOAN_RESCHEDULE: - if (this.anyOfAllowedWhenComingFrom(from, LoanStatusEnum.ACTIVE)) { - newState = stateOf(LoanStatusEnum.CLOSED, allowedLoanStatuses); + if (this.anyOfAllowedWhenComingFrom(from, LoanStatus.ACTIVE)) { + newState = stateOf(LoanStatus.CLOSED, allowedLoanStatuses); } break; case INTERST_REBATE_OWED: - if (this.anyOfAllowedWhenComingFrom(from, LoanStatusEnum.CLOSED)) { - newState = stateOf(LoanStatusEnum.CLOSED, allowedLoanStatuses); + if (this.anyOfAllowedWhenComingFrom(from, LoanStatus.CLOSED)) { + newState = stateOf(LoanStatus.CLOSED, allowedLoanStatuses); } break; case LOAN_OVERPAYMENT: - if (this.anyOfAllowedWhenComingFrom(from, LoanStatusEnum.CLOSED, LoanStatusEnum.ACTIVE)) { - newState = stateOf(LoanStatusEnum.OVERPAID, allowedLoanStatuses); + if (this.anyOfAllowedWhenComingFrom(from, LoanStatus.CLOSED, LoanStatus.ACTIVE)) { + newState = stateOf(LoanStatus.OVERPAID, allowedLoanStatuses); } break; } @@ -89,9 +89,9 @@ public class DefaultLoanLifecycleStateMachine implements LoanLifecycleStateMachi return newState; } - private LoanStatusEnum stateOf(LoanStatusEnum state, List allowedLoanStatuses) { - LoanStatusEnum match = null; - for (LoanStatusEnum loanStatus : allowedLoanStatuses) { + private LoanStatus stateOf(LoanStatus state, List allowedLoanStatuses) { + LoanStatus match = null; + for (LoanStatus loanStatus : allowedLoanStatuses) { if (loanStatus.hasStateOf(state)) { match = loanStatus; break; @@ -100,11 +100,11 @@ public class DefaultLoanLifecycleStateMachine implements LoanLifecycleStateMachi return match; } - private boolean anyOfAllowedWhenComingFrom(final LoanStatusEnum state, - final LoanStatusEnum... allowedStates) { + private boolean anyOfAllowedWhenComingFrom(final LoanStatus state, + final LoanStatus... allowedStates) { boolean allowed = false; - for (LoanStatusEnum allowedState : allowedStates) { + for (LoanStatus allowedState : allowedStates) { if (state.hasStateOf(allowedState)) { allowed = true; break; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java index c95adc546..d5ea1128f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java @@ -164,7 +164,7 @@ public class Loan extends AbstractAuditableCustom { public Loan(final Client client, Fund fund, LoanTransactionProcessingStrategy transactionProcessingStrategy, final LoanProduct loanProduct, final LoanProductRelatedDetail loanRepaymentScheduleDetail, - final LoanStatusEnum loanStatus) { + final LoanStatus loanStatus) { this.client = client; this.fund = fund; this.transactionProcessingStrategy = transactionProcessingStrategy; @@ -203,7 +203,7 @@ public class Loan extends AbstractAuditableCustom { final LocalDate interestChargedFromDate, final LoanLifecycleStateMachine lifecycleStateMachine) { - LoanStatusEnum statusEnum = lifecycleStateMachine.transition(LoanEvent.LOAN_CREATED, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = lifecycleStateMachine.transition(LoanEvent.LOAN_CREATED, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.termFrequency = loanTermFrequency; @@ -249,7 +249,7 @@ public class Loan extends AbstractAuditableCustom { public void reject(final LocalDate rejectedOn, LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_REJECTED, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_REJECTED, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.rejectedOnDate = rejectedOn.toDateTimeAtCurrentTime().toDate(); @@ -272,7 +272,7 @@ public class Loan extends AbstractAuditableCustom { public void withdraw(final LocalDate withdrawnOn, LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_WITHDRAWN, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_WITHDRAWN, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.withdrawnOnDate = withdrawnOn.toDateTimeAtCurrentTime().toDate(); @@ -295,7 +295,7 @@ public class Loan extends AbstractAuditableCustom { public void approve(final LocalDate approvedOn, LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_APPROVED, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_APPROVED, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.approvedOnDate = approvedOn.toDateTimeAtCurrentTime().toDate(); @@ -318,7 +318,7 @@ public class Loan extends AbstractAuditableCustom { public void undoApproval(LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_APPROVAL_UNDO, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_APPROVAL_UNDO, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.approvedOnDate = null; @@ -339,7 +339,7 @@ public class Loan extends AbstractAuditableCustom { public void disburse(final LocalDate disbursedOn, LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_DISBURSED, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_DISBURSED, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.disbursedOnDate = disbursedOn.toDateTimeAtCurrentTime().toDate(); @@ -380,7 +380,7 @@ public class Loan extends AbstractAuditableCustom { public void undoDisbursal( LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_DISBURSAL_UNDO, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_DISBURSAL_UNDO, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.loanTransactions.clear(); @@ -389,7 +389,7 @@ public class Loan extends AbstractAuditableCustom { public void waive(final LoanTransaction loanTransaction, final LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_REPAYMENT, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_REPAYMENT, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); loanTransaction.updateLoan(this); @@ -440,7 +440,7 @@ public class Loan extends AbstractAuditableCustom { final LoanTransaction loanTransaction, final LoanLifecycleStateMachine loanLifecycleStateMachine, final boolean adjusted) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_REPAYMENT, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_REPAYMENT, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); loanTransaction.updateLoan(this); @@ -501,7 +501,7 @@ public class Loan extends AbstractAuditableCustom { private void handleLoanRepaymentInFull(final LoanTransaction loanTransaction, final LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.REPAID_IN_FULL, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.REPAID_IN_FULL, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.closedOnDate = loanTransaction.getTransactionDate().toDate(); @@ -510,7 +510,7 @@ public class Loan extends AbstractAuditableCustom { if (isInterestRebateAllowed()) { Money rebateDue = calculateRebateWhenPaidInFullOn(loanTransaction.getTransactionDate()); if (rebateDue.isGreaterThanZero()) { - statusEnum = loanLifecycleStateMachine.transition(LoanEvent.INTERST_REBATE_OWED, LoanStatusEnum.fromInt(this.loanStatus)); + statusEnum = loanLifecycleStateMachine.transition(LoanEvent.INTERST_REBATE_OWED, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.interestRebateOwed = rebateDue.getAmount(); @@ -520,7 +520,7 @@ public class Loan extends AbstractAuditableCustom { private void handleLoanOverpayment(@SuppressWarnings("unused") final LoanTransaction loanTransaction, final LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_OVERPAYMENT, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_OVERPAYMENT, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.closedOnDate = null; @@ -662,7 +662,7 @@ public class Loan extends AbstractAuditableCustom { public void writeOff(final DateTime writtenOffOn, final LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_WRITE_OFF, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_WRITE_OFF, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.closedOnDate = writtenOffOn.toDate(); @@ -687,7 +687,7 @@ public class Loan extends AbstractAuditableCustom { public void reschedule(final DateTime rescheduledOn, final LoanLifecycleStateMachine loanLifecycleStateMachine) { - LoanStatusEnum statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_RESCHEDULE, LoanStatusEnum.fromInt(this.loanStatus)); + LoanStatus statusEnum = loanLifecycleStateMachine.transition(LoanEvent.LOAN_RESCHEDULE, LoanStatus.fromInt(this.loanStatus)); this.loanStatus = statusEnum.getValue(); this.closedOnDate = rescheduledOn.toDate(); @@ -713,8 +713,8 @@ public class Loan extends AbstractAuditableCustom { return !isSubmittedAndPendingApproval(); } - private LoanStatusEnum status() { - return LoanStatusEnum.fromInt(this.loanStatus); + private LoanStatus status() { + return LoanStatus.fromInt(this.loanStatus); } public boolean isSubmittedAndPendingApproval() { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanLifecycleStateMachine.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanLifecycleStateMachine.java index 48e252b1d..c56097b40 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanLifecycleStateMachine.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanLifecycleStateMachine.java @@ -2,6 +2,6 @@ package org.mifosng.platform.loan.domain; public interface LoanLifecycleStateMachine { - LoanStatusEnum transition(LoanEvent loanEvent, LoanStatusEnum from); + LoanStatus transition(LoanEvent loanEvent, LoanStatus from); } diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanStatusEnum.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanStatus.java similarity index 53% rename from mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanStatusEnum.java rename to mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanStatus.java index 7ed89855b..dc18ea989 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanStatusEnum.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanStatus.java @@ -1,6 +1,9 @@ package org.mifosng.platform.loan.domain; -public enum LoanStatusEnum { +/** + * Enum representation of loan status states. + */ +public enum LoanStatus { INVALID(0, "loanStatusType.invalid"), // SUBMITED_AND_PENDING_APPROVAL(100, "loanStatusType.submitted.and.pending.approval"), // @@ -14,41 +17,41 @@ public enum LoanStatusEnum { private final Integer value; private final String code; - public static LoanStatusEnum fromInt(final Integer selectedMethod) { + public static LoanStatus fromInt(final Integer statusValue) { - LoanStatusEnum enumeration = LoanStatusEnum.INVALID; - switch (selectedMethod) { + LoanStatus enumeration = LoanStatus.INVALID; + switch (statusValue) { case 100: - enumeration = LoanStatusEnum.SUBMITED_AND_PENDING_APPROVAL; + enumeration = LoanStatus.SUBMITED_AND_PENDING_APPROVAL; break; case 200: - enumeration = LoanStatusEnum.APPROVED; + enumeration = LoanStatus.APPROVED; break; case 300: - enumeration = LoanStatusEnum.ACTIVE; + enumeration = LoanStatus.ACTIVE; break; case 400: - enumeration = LoanStatusEnum.WITHDRAWN_BY_CLIENT; + enumeration = LoanStatus.WITHDRAWN_BY_CLIENT; break; case 500: - enumeration = LoanStatusEnum.REJECTED; + enumeration = LoanStatus.REJECTED; break; case 600: - enumeration = LoanStatusEnum.CLOSED; + enumeration = LoanStatus.CLOSED; break; case 700: - enumeration = LoanStatusEnum.OVERPAID; + enumeration = LoanStatus.OVERPAID; break; } return enumeration; } - private LoanStatusEnum(final Integer value, final String code) { + private LoanStatus(final Integer value, final String code) { this.value = value; this.code = code; } - public boolean hasStateOf(final LoanStatusEnum state) { + public boolean hasStateOf(final LoanStatus state) { return this.value.equals(state.getValue()); } @@ -61,26 +64,26 @@ public enum LoanStatusEnum { } public boolean isSubmittedAndPendingApproval() { - return this.value.equals(LoanStatusEnum.SUBMITED_AND_PENDING_APPROVAL.getValue()); + return this.value.equals(LoanStatus.SUBMITED_AND_PENDING_APPROVAL.getValue()); } public boolean isApproved() { - return this.value.equals(LoanStatusEnum.APPROVED.getValue()); + return this.value.equals(LoanStatus.APPROVED.getValue()); } public boolean isActive() { - return this.value.equals(LoanStatusEnum.ACTIVE.getValue()); + return this.value.equals(LoanStatus.ACTIVE.getValue()); } public boolean isClosed() { - return this.value.equals(LoanStatusEnum.CLOSED.getValue()); + return this.value.equals(LoanStatus.CLOSED.getValue()); } public boolean isWithdrawnByClient() { - return this.value.equals(LoanStatusEnum.WITHDRAWN_BY_CLIENT.getValue()); + return this.value.equals(LoanStatus.WITHDRAWN_BY_CLIENT.getValue()); } public boolean isRejected() { - return this.value.equals(LoanStatusEnum.REJECTED.getValue()); + return this.value.equals(LoanStatus.REJECTED.getValue()); } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java index be0acc8e8..b4ae1e2d4 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java @@ -27,7 +27,7 @@ import org.mifosng.platform.loan.domain.LoanProduct; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; import org.mifosng.platform.loan.domain.LoanProductRepository; import org.mifosng.platform.loan.domain.LoanRepaymentScheduleInstallment; -import org.mifosng.platform.loan.domain.LoanStatusEnum; +import org.mifosng.platform.loan.domain.LoanStatus; import org.mifosng.platform.loan.domain.LoanTransactionProcessingStrategy; import org.mifosng.platform.loan.domain.LoanTransactionProcessingStrategyRepository; import org.mifosng.platform.loan.domain.PeriodFrequencyType; @@ -121,7 +121,7 @@ public class LoanAssembler { } private LoanLifecycleStateMachine defaultLoanLifecycleStateMachine() { - List allowedLoanStatuses = Arrays.asList(LoanStatusEnum.values()); + List allowedLoanStatuses = Arrays.asList(LoanStatus.values()); return new DefaultLoanLifecycleStateMachine(allowedLoanStatuses); } diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java index f87961326..2f92f987f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java @@ -31,7 +31,7 @@ import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.loan.domain.Loan; import org.mifosng.platform.loan.domain.LoanRepository; -import org.mifosng.platform.loan.domain.LoanStatusEnum; +import org.mifosng.platform.loan.domain.LoanStatus; import org.mifosng.platform.loan.domain.LoanTransaction; import org.mifosng.platform.loan.domain.LoanTransactionRepository; import org.mifosng.platform.loan.domain.LoanTransactionType; @@ -495,7 +495,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { .interestCalculationPeriodType(interestCalculationPeriodTypeInt); Integer lifeCycleStatusId = JdbcSupport.getInteger(rs, "lifeCycleStatusId"); - String lifeCycleStatusText = LoanStatusEnum.fromInt(lifeCycleStatusId).getCode(); + String lifeCycleStatusText = LoanStatus.fromInt(lifeCycleStatusId).getCode(); LocalDate lifeCycleStatusDate = submittedOnDate; if (approvedOnDate != null) { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java index 30d4a7645..5f46f4e95 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -29,7 +29,7 @@ import org.mifosng.platform.loan.domain.Loan; import org.mifosng.platform.loan.domain.LoanLifecycleStateMachine; import org.mifosng.platform.loan.domain.LoanRepaymentScheduleInstallment; import org.mifosng.platform.loan.domain.LoanRepository; -import org.mifosng.platform.loan.domain.LoanStatusEnum; +import org.mifosng.platform.loan.domain.LoanStatus; import org.mifosng.platform.loan.domain.LoanTransaction; import org.mifosng.platform.loan.domain.LoanTransactionRepository; import org.mifosng.platform.loan.domain.PeriodFrequencyType; @@ -67,7 +67,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf } private LoanLifecycleStateMachine defaultLoanLifecycleStateMachine() { - List allowedLoanStatuses = Arrays.asList(LoanStatusEnum.values()); + List allowedLoanStatuses = Arrays.asList(LoanStatus.values()); return new DefaultLoanLifecycleStateMachine(allowedLoanStatuses); }