CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 19 Packages Projects Releases Wiki Activity

FINERACT-2181: Format enums

Browse Source
This commit is contained in:
Adam Saghy
2025-05-22 17:13:49 +02:00
parent 47d5330802
commit ecac6d2153
159 changed files with 757 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
custom/acme/loan/job/src/main/java/com/acme/fineract/loan/job/AcmeJobName.java
+1 -1
View File
@@ -20,7 +20,7 @@ package com.acme.fineract.loan.job;
public enum AcmeJobName { public enum AcmeJobName {
ACME_NOOP_JOB("Acme Noop Job"); ACME_NOOP_JOB("Acme Noop Job"); //
private final String name; private final String name;
fineract-accounting/src/main/java/org/apache/fineract/accounting/closure/api/GLClosureJsonInputParams.java
+6 -1
View File
@@ -26,7 +26,12 @@ import java.util.Set;
***/ ***/
public enum GLClosureJsonInputParams { public enum GLClosureJsonInputParams {
ID("id"), OFFICE_ID("officeId"), CLOSING_DATE("closingDate"), COMMENTS("comments"), LOCALE("locale"), DATE_FORMAT("dateFormat"); ID("id"), //
OFFICE_ID("officeId"), //
CLOSING_DATE("closingDate"), //
COMMENTS("comments"), //
LOCALE("locale"), //
DATE_FORMAT("dateFormat"); //
private final String value; private final String value;
fineract-accounting/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidException.java
+2 -1
View File
@@ -29,7 +29,8 @@ public class GLClosureInvalidException extends AbstractPlatformDomainRuleExcepti
/*** enum of reasons for invalid Accounting Closure **/ /*** enum of reasons for invalid Accounting Closure **/
public enum GlClosureInvalidReason { public enum GlClosureInvalidReason {
FUTURE_DATE, ACCOUNTING_CLOSED; FUTURE_DATE, //
ACCOUNTING_CLOSED; //
public String errorMessage() { public String errorMessage() {
if (name().equalsIgnoreCase("FUTURE_DATE")) { if (name().equalsIgnoreCase("FUTURE_DATE")) {
fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsJsonInputParams.java
+2 -1
View File
@@ -26,7 +26,8 @@ import java.util.Set;
***/ ***/
public enum FinancialActivityAccountsJsonInputParams { public enum FinancialActivityAccountsJsonInputParams {
FINANCIAL_ACTIVITY_ID("financialActivityId"), GL_ACCOUNT_ID("glAccountId"); FINANCIAL_ACTIVITY_ID("financialActivityId"), //
GL_ACCOUNT_ID("glAccountId"); //
private final String value; private final String value;
fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidDeleteException.java
+3 -1
View File
@@ -28,7 +28,9 @@ public class GLAccountInvalidDeleteException extends AbstractPlatformDomainRuleE
/*** Enum of reasons for invalid delete **/ /*** Enum of reasons for invalid delete **/
public enum GlAccountInvalidDeleteReason { public enum GlAccountInvalidDeleteReason {
TRANSACTIONS_LOGGED, HAS_CHILDREN, PRODUCT_MAPPING; TRANSACTIONS_LOGGED, //
HAS_CHILDREN, //
PRODUCT_MAPPING; //
public String errorMessage() { public String errorMessage() {
if (name().equalsIgnoreCase("TRANSACTIONS_LOGGED")) { if (name().equalsIgnoreCase("TRANSACTIONS_LOGGED")) {
fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUpdateException.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class GLAccountInvalidUpdateException extends AbstractPlatformDomainRuleE
/*** Enum of reasons for invalid delete **/ /*** Enum of reasons for invalid delete **/
public enum GlAccountInvalidUpdateReason { public enum GlAccountInvalidUpdateReason {
TRANSANCTIONS_LOGGED; TRANSANCTIONS_LOGGED; //
public String errorMessage() { public String errorMessage() {
if (name().equalsIgnoreCase("TRANSANCTIONS_LOGGED")) { if (name().equalsIgnoreCase("TRANSANCTIONS_LOGGED")) {
fineract-accounting/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntryJsonInputParams.java
+18 -5
View File
@@ -26,11 +26,24 @@ import java.util.Set;
***/ ***/
public enum JournalEntryJsonInputParams { public enum JournalEntryJsonInputParams {
OFFICE_ID("officeId"), TRANSACTION_DATE("transactionDate"), COMMENTS("comments"), CREDITS("credits"), DEBITS("debits"), LOCALE( OFFICE_ID("officeId"), //
"locale"), DATE_FORMAT("dateFormat"), REFERENCE_NUMBER("referenceNumber"), USE_ACCOUNTING_RULE( TRANSACTION_DATE("transactionDate"), //
"useAccountingRule"), ACCOUNTING_RULE("accountingRule"), AMOUNT("amount"), CURRENCY_CODE( COMMENTS("comments"), //
"currencyCode"), PAYMENT_TYPE_ID("paymentTypeId"), ACCOUNT_NUMBER("accountNumber"), CHECK_NUMBER( CREDITS("credits"), //
"checkNumber"), ROUTING_CODE("routingCode"), RECEIPT_NUMBER("receiptNumber"), BANK_NUMBER("bankNumber"); DEBITS("debits"), //
LOCALE("locale"), //
DATE_FORMAT("dateFormat"), //
REFERENCE_NUMBER("referenceNumber"), //
USE_ACCOUNTING_RULE("useAccountingRule"), //
ACCOUNTING_RULE("accountingRule"), //
AMOUNT("amount"), //
CURRENCY_CODE("currencyCode"), //
PAYMENT_TYPE_ID("paymentTypeId"), //
ACCOUNT_NUMBER("accountNumber"), //
CHECK_NUMBER("checkNumber"), //
ROUTING_CODE("routingCode"), //
RECEIPT_NUMBER("receiptNumber"), //
BANK_NUMBER("bankNumber"); //
private final String value; private final String value;
fineract-accounting/src/main/java/org/apache/fineract/accounting/journalentry/exception/JournalEntryInvalidException.java
+9 -1
View File
@@ -29,7 +29,15 @@ public class JournalEntryInvalidException extends AbstractPlatformDomainRuleExce
/*** enum of reasons for invalid Journal Entry **/ /*** enum of reasons for invalid Journal Entry **/
public enum GlJournalEntryInvalidReason { public enum GlJournalEntryInvalidReason {
FUTURE_DATE, ACCOUNTING_CLOSED, NO_DEBITS_OR_CREDITS, DEBIT_CREDIT_SUM_MISMATCH_WITH_AMOUNT, DEBIT_CREDIT_SUM_MISMATCH, DEBIT_CREDIT_ACCOUNT_OR_AMOUNT_EMPTY, GL_ACCOUNT_DISABLED, GL_ACCOUNT_MANUAL_ENTRIES_NOT_PERMITTED, INVALID_DEBIT_OR_CREDIT_ACCOUNTS; FUTURE_DATE, //
ACCOUNTING_CLOSED, //
NO_DEBITS_OR_CREDITS, //
DEBIT_CREDIT_SUM_MISMATCH_WITH_AMOUNT, //
DEBIT_CREDIT_SUM_MISMATCH, //
DEBIT_CREDIT_ACCOUNT_OR_AMOUNT_EMPTY, //
GL_ACCOUNT_DISABLED, //
GL_ACCOUNT_MANUAL_ENTRIES_NOT_PERMITTED, //
INVALID_DEBIT_OR_CREDIT_ACCOUNTS; //
public String errorMessage() { public String errorMessage() {
if (name().equalsIgnoreCase("FUTURE_DATE")) { if (name().equalsIgnoreCase("FUTURE_DATE")) {
fineract-accounting/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java
+11 -4
View File
@@ -26,10 +26,17 @@ import java.util.Set;
***/ ***/
public enum AccountingRuleJsonInputParams { public enum AccountingRuleJsonInputParams {
ID("id"), OFFICE_ID("officeId"), ACCOUNT_TO_DEBIT("accountToDebit"), ACCOUNT_TO_CREDIT("accountToCredit"), NAME("name"), DESCRIPTION( ID("id"), //
"description"), SYSTEM_DEFINED("systemDefined"), DEBIT_ACCOUNT_TAGS("debitTags"), CREDIT_ACCOUNT_TAGS( OFFICE_ID("officeId"), //
"creditTags"), ALLOW_MULTIPLE_CREDIT_ENTRIES( ACCOUNT_TO_DEBIT("accountToDebit"), //
"allowMultipleCreditEntries"), ALLOW_MULTIPLE_DEBIT_ENTRIES("allowMultipleDebitEntries"); ACCOUNT_TO_CREDIT("accountToCredit"), //
NAME("name"), //
DESCRIPTION("description"), //
SYSTEM_DEFINED("systemDefined"), //
DEBIT_ACCOUNT_TAGS("debitTags"), //
CREDIT_ACCOUNT_TAGS("creditTags"), //
ALLOW_MULTIPLE_CREDIT_ENTRIES("allowMultipleCreditEntries"), //
ALLOW_MULTIPLE_DEBIT_ENTRIES("allowMultipleDebitEntries"); //
private final String value; private final String value;
fineract-accounting/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidException.java
+2 -1
View File
@@ -29,7 +29,8 @@ public class AccountingRuleInvalidException extends AbstractPlatformDomainRuleEx
/*** enum of reasons for invalid Accounting Closure **/ /*** enum of reasons for invalid Accounting Closure **/
public enum GlClosureInvalidReason { public enum GlClosureInvalidReason {
FUTURE_DATE, ACCOUNTING_CLOSED; FUTURE_DATE, //
ACCOUNTING_CLOSED; //
public String errorMessage() { public String errorMessage() {
if (name().toString().equalsIgnoreCase("FUTURE_DATE")) { if (name().toString().equalsIgnoreCase("FUTURE_DATE")) {
fineract-branch/src/main/java/org/apache/fineract/organisation/teller/domain/TellerStatus.java
+5 -2
View File
@@ -28,8 +28,11 @@ import lombok.Getter;
@AllArgsConstructor @AllArgsConstructor
public enum TellerStatus { public enum TellerStatus {
INVALID(0, "tellerStatusType.invalid"), PENDING(100, "tellerStatusType.pending"), ACTIVE(300, "tellerStatusType.active"), INACTIVE(400, INVALID(0, "tellerStatusType.invalid"), //
"tellerStatusType.inactive"), CLOSED(600, "tellerStatusType.closed"); PENDING(100, "tellerStatusType.pending"), //
ACTIVE(300, "tellerStatusType.active"), //
INACTIVE(400, "tellerStatusType.inactive"), //
CLOSED(600, "tellerStatusType.closed"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeAppliesTo.java
+2 -1
View File
@@ -23,7 +23,8 @@ public enum ChargeAppliesTo {
INVALID(0, "chargeAppliesTo.invalid"), // INVALID(0, "chargeAppliesTo.invalid"), //
LOAN(1, "chargeAppliesTo.loan"), // LOAN(1, "chargeAppliesTo.loan"), //
SAVINGS(2, "chargeAppliesTo.savings"), // SAVINGS(2, "chargeAppliesTo.savings"), //
CLIENT(3, "chargeAppliesTo.client"), SHARES(4, "chargeAppliesTo.shares"); CLIENT(3, "chargeAppliesTo.client"), //
SHARES(4, "chargeAppliesTo.shares"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java
+1 -1
View File
@@ -25,7 +25,7 @@ public enum ChargeCalculationType {
PERCENT_OF_AMOUNT(2, "chargeCalculationType.percent.of.amount"), // PERCENT_OF_AMOUNT(2, "chargeCalculationType.percent.of.amount"), //
PERCENT_OF_AMOUNT_AND_INTEREST(3, "chargeCalculationType.percent.of.amount.and.interest"), // PERCENT_OF_AMOUNT_AND_INTEREST(3, "chargeCalculationType.percent.of.amount.and.interest"), //
PERCENT_OF_INTEREST(4, "chargeCalculationType.percent.of.interest"), // PERCENT_OF_INTEREST(4, "chargeCalculationType.percent.of.interest"), //
PERCENT_OF_DISBURSEMENT_AMOUNT(5, "chargeCalculationType.percent.of.disbursement.amount"); PERCENT_OF_DISBURSEMENT_AMOUNT(5, "chargeCalculationType.percent.of.disbursement.amount"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargePaymentMode.java
+1 -1
View File
@@ -21,7 +21,7 @@ package org.apache.fineract.portfolio.charge.domain;
public enum ChargePaymentMode { public enum ChargePaymentMode {
REGULAR(0, "chargepaymentmode.regular"), // REGULAR(0, "chargepaymentmode.regular"), //
ACCOUNT_TRANSFER(1, "chargepaymentmode.accounttransfer"); ACCOUNT_TRANSFER(1, "chargepaymentmode.accounttransfer"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeDeletedException.java
+3 -1
View File
@@ -25,7 +25,9 @@ public class LoanChargeCannotBeDeletedException extends AbstractPlatformDomainRu
/*** enum of reasons of why Loan Charge cannot be waived **/ /*** enum of reasons of why Loan Charge cannot be waived **/
public enum LoanChargeCannotBeDeletedReason { public enum LoanChargeCannotBeDeletedReason {
ALREADY_PAID, ALREADY_WAIVED, LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE; ALREADY_PAID, //
ALREADY_WAIVED, //
LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE; //
public String errorMessage() { public String errorMessage() {
if (name().toString().equalsIgnoreCase("ALREADY_PAID")) { if (name().toString().equalsIgnoreCase("ALREADY_PAID")) {
fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBePayedException.java
+5 -1
View File
@@ -25,7 +25,11 @@ public class LoanChargeCannotBePayedException extends AbstractPlatformDomainRule
/*** enum of reasons of why Loan Charge cannot be waived **/ /*** enum of reasons of why Loan Charge cannot be waived **/
public enum LoanChargeCannotBePayedReason { public enum LoanChargeCannotBePayedReason {
ALREADY_PAID, ALREADY_WAIVED, LOAN_INACTIVE, CHARGE_NOT_ACCOUNT_TRANSFER, CHARGE_NOT_PAYABLE; ALREADY_PAID, //
ALREADY_WAIVED, //
LOAN_INACTIVE, //
CHARGE_NOT_ACCOUNT_TRANSFER, //
CHARGE_NOT_PAYABLE; //
public String errorMessage() { public String errorMessage() {
if (name().toString().equalsIgnoreCase("ALREADY_PAID")) { if (name().toString().equalsIgnoreCase("ALREADY_PAID")) {
fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeUpdatedException.java
+3 -1
View File
@@ -25,7 +25,9 @@ public class LoanChargeCannotBeUpdatedException extends AbstractPlatformDomainRu
/*** enum of reasons of why Loan Charge cannot be waived **/ /*** enum of reasons of why Loan Charge cannot be waived **/
public enum LoanChargeCannotBeUpdatedReason { public enum LoanChargeCannotBeUpdatedReason {
ALREADY_PAID, ALREADY_WAIVED, LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE; ALREADY_PAID, //
ALREADY_WAIVED, //
LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE; //
public String errorMessage() { public String errorMessage() {
if (name().toString().equalsIgnoreCase("ALREADY_PAID")) { if (name().toString().equalsIgnoreCase("ALREADY_PAID")) {
fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeWaivedException.java
+4 -1
View File
@@ -25,7 +25,10 @@ public class LoanChargeCannotBeWaivedException extends AbstractPlatformDomainRul
/*** enum of reasons of why Loan Charge cannot be waived **/ /*** enum of reasons of why Loan Charge cannot be waived **/
public enum LoanChargeCannotBeWaivedReason { public enum LoanChargeCannotBeWaivedReason {
ALREADY_PAID, ALREADY_WAIVED, LOAN_INACTIVE, WAIVE_NOT_ALLOWED_FOR_CHARGE; ALREADY_PAID, //
ALREADY_WAIVED, //
LOAN_INACTIVE, //
WAIVE_NOT_ALLOWED_FOR_CHARGE; //
public String errorMessage() { public String errorMessage() {
if (name().toString().equalsIgnoreCase("ALREADY_PAID")) { if (name().toString().equalsIgnoreCase("ALREADY_PAID")) {
fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWaiveCannotBeReversedException.java
+6 -1
View File
@@ -25,7 +25,12 @@ public class LoanChargeWaiveCannotBeReversedException extends AbstractPlatformDo
/*** enum of reasons of why Loan Charge waive cannot undo **/ /*** enum of reasons of why Loan Charge waive cannot undo **/
public enum LoanChargeWaiveCannotUndoReason { public enum LoanChargeWaiveCannotUndoReason {
ALREADY_PAID, ALREADY_WAIVED, LOAN_INACTIVE, WAIVE_NOT_ALLOWED_FOR_CHARGE, NOT_WAIVED, ALREADY_REVERSED; ALREADY_PAID, //
ALREADY_WAIVED, //
LOAN_INACTIVE, //
WAIVE_NOT_ALLOWED_FOR_CHARGE, //
NOT_WAIVED, //
ALREADY_REVERSED; //
public String errorMessage() { public String errorMessage() {
fineract-command/src/main/java/org/apache/fineract/command/core/CommandProperties.java
+3 -1
View File
@@ -52,6 +52,8 @@ public final class CommandProperties implements Serializable {
private ProducerType producerType = ProducerType.SINGLE; private ProducerType producerType = ProducerType.SINGLE;
public enum CommandExecutorType { public enum CommandExecutorType {
sync, async, disruptor sync, //
async, //
disruptor //
} }
} }
fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
+4 -1
View File
@@ -497,7 +497,10 @@ public final class AccountingConstants {
***/ ***/
public enum CashAccountsForShares { public enum CashAccountsForShares {
SHARES_REFERENCE(1), SHARES_SUSPENSE(2), INCOME_FROM_FEES(3), SHARES_EQUITY(4); SHARES_REFERENCE(1), //
SHARES_SUSPENSE(2), //
INCOME_FROM_FEES(3), //
SHARES_EQUITY(4); //
private final Integer value; private final Integer value;
fineract-core/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountJsonInputParams.java
+10 -2
View File
@@ -26,8 +26,16 @@ import java.util.Set;
***/ ***/
public enum GLAccountJsonInputParams { public enum GLAccountJsonInputParams {
ID("id"), NAME("name"), PARENT_ID("parentId"), GL_CODE("glCode"), DISABLED("disabled"), MANUAL_ENTRIES_ALLOWED( ID("id"), //
"manualEntriesAllowed"), TYPE("type"), USAGE("usage"), DESCRIPTION("description"), TAGID("tagId"); NAME("name"), //
PARENT_ID("parentId"), //
GL_CODE("glCode"), //
DISABLED("disabled"), //
MANUAL_ENTRIES_ALLOWED("manualEntriesAllowed"), //
TYPE("type"), //
USAGE("usage"), //
DESCRIPTION("description"), //
TAGID("tagId"); //
private final String value; private final String value;
fineract-core/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java
+5 -2
View File
@@ -22,8 +22,11 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData;
public enum GLAccountType { public enum GLAccountType {
ASSET(1, "accountType.asset"), LIABILITY(2, "accountType.liability"), EQUITY(3, "accountType.equity"), INCOME(4, ASSET(1, "accountType.asset"), //
"accountType.income"), EXPENSE(5, "accountType.expense"); LIABILITY(2, "accountType.liability"), //
EQUITY(3, "accountType.equity"), //
INCOME(4, "accountType.income"), //
EXPENSE(5, "accountType.expense"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountUsage.java
+2 -1
View File
@@ -23,7 +23,8 @@ import java.util.Map;
public enum GLAccountUsage { public enum GLAccountUsage {
DETAIL(1, "accountUsage.detail"), HEADER(2, "accountUsage.header"); DETAIL(1, "accountUsage.detail"), //
HEADER(2, "accountUsage.header"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryType.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.accounting.journalentry.domain;
public enum JournalEntryType { public enum JournalEntryType {
CREDIT(1, "journalEntryType.credit"), DEBIT(2, "journalEntrytType.debit"); CREDIT(1, "journalEntryType.credit"), //
DEBIT(2, "journalEntrytType.debit"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/infrastructure/bulkimport/data/GlobalEntityType.java
+36 -18
View File
@@ -23,24 +23,42 @@ import java.util.Map;
public enum GlobalEntityType { public enum GlobalEntityType {
INVALID(0, "invalid"), CLIENTS_PERSON(1, "clients.person"), CLIENTS_ENTITY(2, "clients.entity"), GROUPS(3, "groups"), CENTERS(4, INVALID(0, "invalid"), //
"centers"), OFFICES(5, "offices"), STAFF(6, "staff"), USERS(7, "users"), SMS(8, "sms"), DOCUMENTS(9, "documents"), TEMPLATES(10, CLIENTS_PERSON(1, "clients.person"), //
"templates"), NOTES(11, "templates"), CALENDAR(12, "calendar"), MEETINGS(13, "meetings"), HOLIDAYS(14, CLIENTS_ENTITY(2, "clients.entity"), //
"holidays"), LOANS(15, "loans"), LOAN_PRODUCTS(16, "loancharges"), LOAN_TRANSACTIONS(18, GROUPS(3, "groups"), //
"loantransactions"), GUARANTORS(19, "guarantors"), COLLATERALS(20, "collaterals"), FUNDS(21, CENTERS(4, "centers"), //
"funds"), CURRENCY(22, "currencies"), SAVINGS_ACCOUNT(23, "savingsaccount"), SAVINGS_CHARGES(24, OFFICES(5, "offices"), //
"savingscharges"), SAVINGS_TRANSACTIONS(25, "savingstransactions"), SAVINGS_PRODUCTS(26, STAFF(6, "staff"), //
"savingsproducts"), GL_JOURNAL_ENTRIES(27, "gljournalentries"), CODE_VALUE(28, USERS(7, "users"), //
"codevalue"), CODE(29, "code"), CHART_OF_ACCOUNTS(30, SMS(8, "sms"), //
"chartofaccounts"), FIXED_DEPOSIT_ACCOUNTS(31, DOCUMENTS(9, "documents"), //
"fixeddepositaccounts"), FIXED_DEPOSIT_TRANSACTIONS(32, TEMPLATES(10, "templates"), //
"fixeddeposittransactions"), SHARE_ACCOUNTS(33, NOTES(11, "templates"), //
"shareaccounts"), RECURRING_DEPOSIT_ACCOUNTS( CALENDAR(12, "calendar"), //
34, MEETINGS(13, "meetings"), //
"recurringdeposits"), RECURRING_DEPOSIT_ACCOUNTS_TRANSACTIONS( HOLIDAYS(14, "holidays"), //
35, LOANS(15, "loans"), //
"recurringdepositstransactions"), CLIENT( LOAN_PRODUCTS(16, "loancharges"), //
36, "client"); LOAN_TRANSACTIONS(18, "loantransactions"), //
GUARANTORS(19, "guarantors"), //
COLLATERALS(20, "collaterals"), //
FUNDS(21, "funds"), //
CURRENCY(22, "currencies"), //
SAVINGS_ACCOUNT(23, "savingsaccount"), //
SAVINGS_CHARGES(24, "savingscharges"), //
SAVINGS_TRANSACTIONS(25, "savingstransactions"), //
SAVINGS_PRODUCTS(26, "savingsproducts"), //
GL_JOURNAL_ENTRIES(27, "gljournalentries"), //
CODE_VALUE(28, "codevalue"), //
CODE(29, "code"), //
CHART_OF_ACCOUNTS(30, "chartofaccounts"), //
FIXED_DEPOSIT_ACCOUNTS(31, "fixeddepositaccounts"), //
FIXED_DEPOSIT_TRANSACTIONS(32, "fixeddeposittransactions"), //
SHARE_ACCOUNTS(33, "shareaccounts"), //
RECURRING_DEPOSIT_ACCOUNTS(34, "recurringdeposits"), //
RECURRING_DEPOSIT_ACCOUNTS_TRANSACTIONS(35, "recurringdepositstransactions"), //
CLIENT(36, "client"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/infrastructure/businessdate/domain/BusinessDateType.java
+2 -1
View File
@@ -25,7 +25,8 @@ import lombok.Getter;
@Getter @Getter
public enum BusinessDateType { public enum BusinessDateType {
BUSINESS_DATE(1, "Business Date"), COB_DATE(2, "Close of Business Date"); BUSINESS_DATE(1, "Business Date"), //
COB_DATE(2, "Close of Business Date"); //
private final Integer id; private final Integer id;
private final String description; private final String description;
fineract-core/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java
+6 -2
View File
@@ -28,8 +28,12 @@ public class CodeConstants {
***/ ***/
public enum CodevalueJSONinputParams { public enum CodevalueJSONinputParams {
CODEVALUE_ID("id"), NAME("name"), POSITION("position"), DESCRIPTION("description"), IS_ACTIVE("isActive"), IS_MANDATORY( CODEVALUE_ID("id"), //
"isMandatory"); NAME("name"), //
POSITION("position"), //
DESCRIPTION("description"), //
IS_ACTIVE("isActive"), //
IS_MANDATORY("isMandatory"); //
private final String value; private final String value;
fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/ActionContext.java
+2 -1
View File
@@ -26,7 +26,8 @@ import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
@AllArgsConstructor @AllArgsConstructor
public enum ActionContext { public enum ActionContext {
DEFAULT(0, "Default context", BusinessDateType.BUSINESS_DATE), COB(1, "Close of Business context", BusinessDateType.COB_DATE); DEFAULT(0, "Default context", BusinessDateType.BUSINESS_DATE), //
COB(1, "Close of Business context", BusinessDateType.COB_DATE); //
private final int order; private final int order;
private final String description; private final String description;
fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/ResultsetColumnHeaderData.java
+12 -1
View File
@@ -241,7 +241,18 @@ public final class ResultsetColumnHeaderData implements Serializable {
// Enum representing the different ways a column can be displayed. // Enum representing the different ways a column can be displayed.
public enum DisplayType { public enum DisplayType {
TEXT, STRING, INTEGER, FLOAT, DECIMAL, DATE, TIME, DATETIME, BOOLEAN, BINARY, CODELOOKUP, CODEVALUE; TEXT, //
STRING, //
INTEGER, //
FLOAT, //
DECIMAL, //
DATE, //
TIME, //
DATETIME, //
BOOLEAN, //
BINARY, //
CODELOOKUP, //
CODEVALUE; //
} }
} }
fineract-core/src/main/java/org/apache/fineract/infrastructure/documentmanagement/domain/StorageType.java
+2 -1
View File
@@ -23,7 +23,8 @@ import java.util.Map;
public enum StorageType { public enum StorageType {
FILE_SYSTEM(1), S3(2); FILE_SYSTEM(1), //
S3(2); //
private final Integer value; private final Integer value;
fineract-core/src/main/java/org/apache/fineract/infrastructure/event/external/repository/domain/ExternalEventStatus.java
Vendored
+2 -1
View File
@@ -19,5 +19,6 @@
package org.apache.fineract.infrastructure.event.external.repository.domain; package org.apache.fineract.infrastructure.event.external.repository.domain;
public enum ExternalEventStatus { public enum ExternalEventStatus {
TO_BE_SENT, SENT TO_BE_SENT, //
SENT //
} }
fineract-core/src/main/java/org/apache/fineract/infrastructure/jobs/service/StepName.java
+2 -1
View File
@@ -19,5 +19,6 @@
package org.apache.fineract.infrastructure.jobs.service; package org.apache.fineract.infrastructure.jobs.service;
public enum StepName { public enum StepName {
PURGE_PROCESSED_COMMANDS_STEP, SEND_ASYNCHRONOUS_EVENTS_STEP PURGE_PROCESSED_COMMANDS_STEP, //
SEND_ASYNCHRONOUS_EVENTS_STEP //
} }
fineract-core/src/main/java/org/apache/fineract/organisation/holiday/domain/RescheduleType.java
+3 -2
View File
@@ -20,8 +20,9 @@ package org.apache.fineract.organisation.holiday.domain;
public enum RescheduleType { public enum RescheduleType {
INVALID(0, "rescheduletype.invalid"), RESCHEDULETOSPECIFICDATE(2, "rescheduletype.rescheduletospecificdate"), // INVALID(0, "rescheduletype.invalid"), //
RESCHEDULETONEXTREPAYMENTDATE(1, "rescheduletype.rescheduletonextrepaymentdate"); RESCHEDULETOSPECIFICDATE(2, "rescheduletype.rescheduletospecificdate"), //
RESCHEDULETONEXTREPAYMENTDATE(1, "rescheduletype.rescheduletonextrepaymentdate"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/PortfolioProductType.java
+5 -2
View File
@@ -20,8 +20,11 @@ package org.apache.fineract.portfolio;
public enum PortfolioProductType { public enum PortfolioProductType {
LOAN(1, "productType.loan"), SAVING(2, "productType.saving"), CLIENT(5, "productType.client"), PROVISIONING(3, LOAN(1, "productType.loan"), //
"productType.provisioning"), SHARES(4, "productType.shares"); SAVING(2, "productType.saving"), //
CLIENT(5, "productType.client"), //
PROVISIONING(3, "productType.provisioning"), //
SHARES(4, "productType.shares"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/accountdetails/domain/AccountType.java
+1 -1
View File
@@ -33,7 +33,7 @@ public enum AccountType {
GROUP(2, "accountType.group"), // GROUP(2, "accountType.group"), //
JLG(3, "accountType.jlg"), // JLG account given in group context JLG(3, "accountType.jlg"), // JLG account given in group context
GLIM(4, "accountType.glim"), // GLIM(4, "accountType.glim"), //
GSIM(5, "accountType.gsim"); GSIM(5, "accountType.gsim"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java
+28 -11
View File
@@ -31,17 +31,34 @@ public final class CalendarConstants {
public enum CalendarSupportedParameters { public enum CalendarSupportedParameters {
CALENDAR_ID("id"), ENTITY_TYPE("entityType"), ENTITY_ID("entityId"), TITLE("title"), DESCRIPTION("description"), LOCATION( CALENDAR_ID("id"), //
"location"), START_DATE("startDate"), END_DATE("endDate"), CREATED_DATE("createdDate"), DURATION("duration"), TYPE_ID( ENTITY_TYPE("entityType"), //
"typeId"), REPEATING("repeating"), REMIND_BY_ID("remindById"), FIRST_REMINDER("firstReminder"), SECOND_REMINDER( ENTITY_ID("entityId"), //
"secondReminder"), LOCALE("locale"), DATE_FORMAT("dateFormat"), FREQUENCY("frequency"), INTERVAL( TITLE("title"), //
"interval"), REPEATS_ON_DAY("repeatsOnDay"), RESCHEDULE_BASED_ON_MEETING_DATES( DESCRIPTION("description"), //
"reschedulebasedOnMeetingDates"), PRESENT_MEETING_DATE( LOCATION("location"), //
"presentMeetingDate"), NEW_MEETING_DATE("newMeetingDate"), MEETING_TIME( START_DATE("startDate"), //
"meetingtime"), Time_Format("timeFormat"), REPEATS_ON_NTH_DAY_OF_MONTH( END_DATE("endDate"), //
"repeatsOnNthDayOfMonth"), REPEATS_ON_LAST_WEEKDAY_OF_MONTH( CREATED_DATE("createdDate"), //
"repeatsOnLastWeekdayOfMonth"), REPEATS_ON_DAY_OF_MONTH( DURATION("duration"), //
"repeatsOnDayOfMonth"); TYPE_ID("typeId"), //
REPEATING("repeating"), //
REMIND_BY_ID("remindById"), //
FIRST_REMINDER("firstReminder"), //
SECOND_REMINDER("secondReminder"), //
LOCALE("locale"), //
DATE_FORMAT("dateFormat"), //
FREQUENCY("frequency"), //
INTERVAL("interval"), //
REPEATS_ON_DAY("repeatsOnDay"), //
RESCHEDULE_BASED_ON_MEETING_DATES("reschedulebasedOnMeetingDates"), //
PRESENT_MEETING_DATE("presentMeetingDate"), //
NEW_MEETING_DATE("newMeetingDate"), //
MEETING_TIME("meetingtime"), //
TIME_FORMAT("timeFormat"), //
REPEATS_ON_NTH_DAY_OF_MONTH("repeatsOnNthDayOfMonth"), //
REPEATS_ON_LAST_WEEKDAY_OF_MONTH("repeatsOnLastWeekdayOfMonth"), //
REPEATS_ON_DAY_OF_MONTH("repeatsOnDayOfMonth"); //
private final String value; private final String value;
fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java
+1 -1
View File
@@ -359,7 +359,7 @@ public class Calendar extends AbstractAuditableWithUTCDateTimeCustom<Long> {
this.secondReminder = newValue; this.secondReminder = newValue;
} }
final String timeFormat = command.stringValueOfParameterNamed(CalendarSupportedParameters.Time_Format.getValue()); final String timeFormat = command.stringValueOfParameterNamed(CalendarSupportedParameters.TIME_FORMAT.getValue());
final String time = CalendarSupportedParameters.MEETING_TIME.getValue(); final String time = CalendarSupportedParameters.MEETING_TIME.getValue();
if (command.isChangeInTimeParameterNamed(CalendarSupportedParameters.MEETING_TIME.getValue(), this.meetingtime, timeFormat)) { if (command.isChangeInTimeParameterNamed(CalendarSupportedParameters.MEETING_TIME.getValue(), this.meetingtime, timeFormat)) {
final String newValue = command.stringValueOfParameterNamed(CalendarSupportedParameters.MEETING_TIME.getValue()); final String newValue = command.stringValueOfParameterNamed(CalendarSupportedParameters.MEETING_TIME.getValue());
fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java
+5 -2
View File
@@ -25,8 +25,11 @@ import org.springframework.util.StringUtils;
public enum CalendarFrequencyType { public enum CalendarFrequencyType {
INVALID(0, "calendarFrequencyType.invalid"), DAILY(1, "calendarFrequencyType.daily"), WEEKLY(2, INVALID(0, "calendarFrequencyType.invalid"), //
"calendarFrequencyType.weekly"), MONTHLY(3, "calendarFrequencyType.monthly"), YEARLY(4, "calendarFrequencyType.yearly"); DAILY(1, "calendarFrequencyType.daily"), //
WEEKLY(2, "calendarFrequencyType.weekly"), //
MONTHLY(3, "calendarFrequencyType.monthly"), //
YEARLY(4, "calendarFrequencyType.yearly"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java
+3 -1
View File
@@ -23,7 +23,9 @@ import java.util.Map;
public enum CalendarRemindBy { public enum CalendarRemindBy {
SMS(1, "calendarRemindBy.sms"), EMAIL(2, "calendarRemindBy.email"), SYSTEMALERT(3, "calendarRemindBy.systemalert"); SMS(1, "calendarRemindBy.sms"), //
EMAIL(2, "calendarRemindBy.email"), //
SYSTEMALERT(3, "calendarRemindBy.systemalert"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java
+4 -2
View File
@@ -23,8 +23,10 @@ import java.util.Map;
public enum CalendarType { public enum CalendarType {
COLLECTION(1, "calendarType.collection"), TRAINING(2, "calendarType.training"), AUDIT(3, "calendarType.audit"), GENERAL(4, COLLECTION(1, "calendarType.collection"), //
"calendarType.general"); TRAINING(2, "calendarType.training"), //
AUDIT(3, "calendarType.audit"), //
GENERAL(4, "calendarType.general"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java
+8 -3
View File
@@ -24,9 +24,14 @@ import org.springframework.util.StringUtils;
public enum CalendarWeekDaysType { public enum CalendarWeekDaysType {
INVALID(0, "calendarWeekDaysType.invalid"), MO(1, "calendarWeekDaysType.monday"), TU(2, "calendarWeekDaysType.tuesday"), WE(3, INVALID(0, "calendarWeekDaysType.invalid"), //
"calendarWeekDaysType.wednesday"), TH(4, "calendarWeekDaysType.thursday"), FR(5, MO(1, "calendarWeekDaysType.monday"), //
"calendarWeekDaysType.friday"), SA(6, "calendarWeekDaysType.saturday"), SU(7, "calendarWeekDaysType.sunday"); TU(2, "calendarWeekDaysType.tuesday"), //
WE(3, "calendarWeekDaysType.wednesday"), //
TH(4, "calendarWeekDaysType.thursday"), //
FR(5, "calendarWeekDaysType.friday"), //
SA(6, "calendarWeekDaysType.saturday"), //
SU(7, "calendarWeekDaysType.sunday"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
+14 -2
View File
@@ -390,7 +390,13 @@ public final class CalendarUtils {
public enum DayNameEnum { public enum DayNameEnum {
MO(1, "Monday"), TU(2, "Tuesday"), WE(3, "Wednesday"), TH(4, "Thursday"), FR(5, "Friday"), SA(6, "Saturday"), SU(7, "Sunday"); MO(1, "Monday"), //
TU(2, "Tuesday"), //
WE(3, "Wednesday"), //
TH(4, "Thursday"), //
FR(5, "Friday"), //
SA(6, "Saturday"), //
SU(7, "Sunday"); //
private final String code; private final String code;
private final Integer value; private final Integer value;
@@ -420,7 +426,13 @@ public final class CalendarUtils {
public enum NthDayNameEnum { public enum NthDayNameEnum {
ONE(1, "First"), TWO(2, "Second"), THREE(3, "Third"), FOUR(4, "Fourth"), FIVE(5, "Fifth"), LAST(-1, "Last"), INVALID(0, "Invalid"); ONE(1, "First"), //
TWO(2, "Second"), //
THREE(3, "Third"), //
FOUR(4, "Fourth"), //
FIVE(5, "Fifth"), //
LAST(-1, "Last"), //
INVALID(0, "Invalid"); //
private final String code; private final String code;
private final Integer value; private final Integer value;
fineract-core/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java
+8 -9
View File
@@ -22,22 +22,21 @@ public enum ChargeTimeType {
INVALID(0, "chargeTimeType.invalid"), // INVALID(0, "chargeTimeType.invalid"), //
DISBURSEMENT(1, "chargeTimeType.disbursement"), // only for loan charges DISBURSEMENT(1, "chargeTimeType.disbursement"), // only for loan charges
SPECIFIED_DUE_DATE(2, "chargeTimeType.specifiedDueDate"), // for loan and SPECIFIED_DUE_DATE(2, "chargeTimeType.specifiedDueDate"), // for loan and savings
SAVINGS_ACTIVATION(3, "chargeTimeType.savingsActivation"), // only for SAVINGS_ACTIVATION(3, "chargeTimeType.savingsActivation"), // only for savings
SAVINGS_CLOSURE(4, "chargeTimeType.savingsClosure"), // only for savings SAVINGS_CLOSURE(4, "chargeTimeType.savingsClosure"), // only for savings
WITHDRAWAL_FEE(5, "chargeTimeType.withdrawalFee"), // only for savings WITHDRAWAL_FEE(5, "chargeTimeType.withdrawalFee"), // only for savings
ANNUAL_FEE(6, "chargeTimeType.annualFee"), // only for savings ANNUAL_FEE(6, "chargeTimeType.annualFee"), // only for savings
MONTHLY_FEE(7, "chargeTimeType.monthlyFee"), // only for savings MONTHLY_FEE(7, "chargeTimeType.monthlyFee"), // only for savings
INSTALMENT_FEE(8, "chargeTimeType.instalmentFee"), // only for loan charges INSTALMENT_FEE(8, "chargeTimeType.instalmentFee"), // only for loan charges
OVERDUE_INSTALLMENT(9, "chargeTimeType.overdueInstallment"), // only for OVERDUE_INSTALLMENT(9, "chargeTimeType.overdueInstallment"), // only for loans
OVERDRAFT_FEE(10, "chargeTimeType.overdraftFee"), // only for savings OVERDRAFT_FEE(10, "chargeTimeType.overdraftFee"), // only for savings
WEEKLY_FEE(11, "chargeTimeType.weeklyFee"), // only for savings WEEKLY_FEE(11, "chargeTimeType.weeklyFee"), // only for savings
TRANCHE_DISBURSEMENT(12, "chargeTimeType.tranchedisbursement"), // only for TRANCHE_DISBURSEMENT(12, "chargeTimeType.tranchedisbursement"), // only for loans
// loan SHAREACCOUNT_ACTIVATION(13, "chargeTimeType.activation"), // only for shares
SHAREACCOUNT_ACTIVATION(13, "chargeTimeType.activation"), // only for loan SHARE_PURCHASE(14, "chargeTimeType.sharespurchase"), // only for shares
SHARE_PURCHASE(14, "chargeTimeType.sharespurchase"), SHARE_REDEEM(15, "chargeTimeType.sharesredeem"), SHARE_REDEEM(15, "chargeTimeType.sharesredeem"), // only for shares
SAVINGS_NOACTIVITY_FEE(16, "chargeTimeType.savingsNoActivityFee"); // only for savings
SAVINGS_NOACTIVITY_FEE(16, "chargeTimeType.savingsNoActivityFee");
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/ClientStatus.java
+3 -1
View File
@@ -30,7 +30,9 @@ public enum ClientStatus {
ACTIVE(300, "clientStatusType.active"), // ACTIVE(300, "clientStatusType.active"), //
TRANSFER_IN_PROGRESS(303, "clientStatusType.transfer.in.progress"), // TRANSFER_IN_PROGRESS(303, "clientStatusType.transfer.in.progress"), //
TRANSFER_ON_HOLD(304, "clientStatusType.transfer.on.hold"), // TRANSFER_ON_HOLD(304, "clientStatusType.transfer.on.hold"), //
CLOSED(600, "clientStatusType.closed"), REJECTED(700, "clientStatusType.rejected"), WITHDRAWN(800, "clientStatusType.withdraw"); CLOSED(600, "clientStatusType.closed"), //
REJECTED(700, "clientStatusType.rejected"), //
WITHDRAWN(800, "clientStatusType.withdraw"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/LegalForm.java
+2 -3
View File
@@ -26,9 +26,8 @@ import lombok.Getter;
@Getter @Getter
public enum LegalForm { public enum LegalForm {
PERSON(1, "legalFormType.person", "Person"), PERSON(1, "legalFormType.person", "Person"), //
ENTITY(2, "legalFormType.entity", "Entity"); //
ENTITY(2, "legalFormType.entity", "Entity");
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/DayOfWeekType.java
+8 -5
View File
@@ -22,11 +22,14 @@ import java.time.DayOfWeek;
public enum DayOfWeekType { public enum DayOfWeekType {
MONDAY(DayOfWeek.MONDAY.getValue(), "weekDayType.monday"), TUESDAY(DayOfWeek.TUESDAY.getValue(), "weekDayType.tuesday"), WEDNESDAY( MONDAY(DayOfWeek.MONDAY.getValue(), "weekDayType.monday"), //
DayOfWeek.WEDNESDAY.getValue(), TUESDAY(DayOfWeek.TUESDAY.getValue(), "weekDayType.tuesday"), //
"weekDayType.wednesday"), THURSDAY(DayOfWeek.THURSDAY.getValue(), "weekDayType.thursday"), FRIDAY(DayOfWeek.FRIDAY.getValue(), WEDNESDAY(DayOfWeek.WEDNESDAY.getValue(), "weekDayType.wednesday"), //
"weekDayType.friday"), SATURDAY(DayOfWeek.SATURDAY.getValue(), "weekDayType.saturday"), SUNDAY( THURSDAY(DayOfWeek.THURSDAY.getValue(), "weekDayType.thursday"), //
DayOfWeek.SUNDAY.getValue(), "weekDayType.sunday"), INVALID(0, "weekDayType.invalid"); FRIDAY(DayOfWeek.FRIDAY.getValue(), "weekDayType.friday"), //
SATURDAY(DayOfWeek.SATURDAY.getValue(), "weekDayType.saturday"), //
SUNDAY(DayOfWeek.SUNDAY.getValue(), "weekDayType.sunday"), //
INVALID(0, "weekDayType.invalid"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/DaysInYearCustomStrategyType.java
+2 -2
View File
@@ -54,10 +54,10 @@ import org.apache.fineract.infrastructure.core.api.ApiFacingEnum;
public enum DaysInYearCustomStrategyType implements ApiFacingEnum<DaysInYearCustomStrategyType> { public enum DaysInYearCustomStrategyType implements ApiFacingEnum<DaysInYearCustomStrategyType> {
/** Always considers 366 days in a leap year. */ /** Always considers 366 days in a leap year. */
FULL_LEAP_YEAR("DaysInYearCustomStrategyType.fullLeapYear", "Full Leap Year"), FULL_LEAP_YEAR("DaysInYearCustomStrategyType.fullLeapYear", "Full Leap Year"), //
/** Considers 366 days only if the period includes February 29th; otherwise, uses 365 days. */ /** Considers 366 days only if the period includes February 29th; otherwise, uses 365 days. */
FEB_29_PERIOD_ONLY("DaysInYearCustomStrategyType.feb29PeriodOnly", "Feb 29 Period Only"),; FEB_29_PERIOD_ONLY("DaysInYearCustomStrategyType.feb29PeriodOnly", "Feb 29 Period Only"); //
private final String code; private final String code;
private final String humanReadableName; private final String humanReadableName;
fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/NthDayType.java
+8 -2
View File
@@ -20,8 +20,14 @@ package org.apache.fineract.portfolio.common.domain;
public enum NthDayType { public enum NthDayType {
ONE(1, "nthDayType.one"), TWO(2, "nthDayType.two"), THREE(3, "nthDayType.three"), FOUR(4, "nthDayType.four"), FIVE(5, ONE(1, "nthDayType.one"), //
"nthDayType.five"), LAST(-1, "nthDayType.last"), ONDAY(-2, "nthDayType.onday"), INVALID(0, "nthDayType.invalid"); TWO(2, "nthDayType.two"), //
THREE(3, "nthDayType.three"), //
FOUR(4, "nthDayType.four"), //
FIVE(5, "nthDayType.five"), //
LAST(-1, "nthDayType.last"), //
ONDAY(-2, "nthDayType.onday"), //
INVALID(0, "nthDayType.invalid"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanStatus.java
+1 -1
View File
@@ -34,7 +34,7 @@ public enum LoanStatus {
CLOSED_OBLIGATIONS_MET(600, "loanStatusType.closed.obligations.met"), // CLOSED_OBLIGATIONS_MET(600, "loanStatusType.closed.obligations.met"), //
CLOSED_WRITTEN_OFF(601, "loanStatusType.closed.written.off"), // CLOSED_WRITTEN_OFF(601, "loanStatusType.closed.written.off"), //
CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT(602, "loanStatusType.closed.reschedule.outstanding.amount"), // CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT(602, "loanStatusType.closed.reschedule.outstanding.amount"), //
OVERPAID(700, "loanStatusType.overpaid"); OVERPAID(700, "loanStatusType.overpaid"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/rate/domain/RateAppliesTo.java
+2 -1
View File
@@ -21,7 +21,8 @@ package org.apache.fineract.portfolio.rate.domain;
public enum RateAppliesTo { public enum RateAppliesTo {
INVALID(0, "rateAppliesTo.invalid"), LOAN(1, "rateAppliesTo.loan"); INVALID(0, "rateAppliesTo.invalid"), //
LOAN(1, "rateAppliesTo.loan"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountOnClosureType.java
+2 -2
View File
@@ -29,8 +29,8 @@ public enum DepositAccountOnClosureType {
INVALID(0, "depositAccountClosureType.invalid"), // INVALID(0, "depositAccountClosureType.invalid"), //
WITHDRAW_DEPOSIT(100, "depositAccountClosureType.withdrawDeposit"), // WITHDRAW_DEPOSIT(100, "depositAccountClosureType.withdrawDeposit"), //
TRANSFER_TO_SAVINGS(200, "depositAccountClosureType.transferToSavings"), // TRANSFER_TO_SAVINGS(200, "depositAccountClosureType.transferToSavings"), //
REINVEST_PRINCIPAL_AND_INTEREST(300, "depositAccountClosureType.reinvestPrincipalAndInterest"), REINVEST_PRINCIPAL_ONLY(400, REINVEST_PRINCIPAL_AND_INTEREST(300, "depositAccountClosureType.reinvestPrincipalAndInterest"), //
"depositAccountClosureType.reinvestPrincipalOnly"); // REINVEST_PRINCIPAL_ONLY(400, "depositAccountClosureType.reinvestPrincipalOnly"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountType.java
+1 -1
View File
@@ -29,7 +29,7 @@ public enum DepositAccountType {
SAVINGS_DEPOSIT(100, "depositAccountType.savingsDeposit"), // SAVINGS_DEPOSIT(100, "depositAccountType.savingsDeposit"), //
FIXED_DEPOSIT(200, "depositAccountType.fixedDeposit"), // FIXED_DEPOSIT(200, "depositAccountType.fixedDeposit"), //
RECURRING_DEPOSIT(300, "depositAccountType.recurringDeposit"), // RECURRING_DEPOSIT(300, "depositAccountType.recurringDeposit"), //
CURRENT_DEPOSIT(400, "depositAccountType.currentDeposit"); CURRENT_DEPOSIT(400, "depositAccountType.currentDeposit"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/PreClosurePenalInterestOnType.java
+2 -1
View File
@@ -25,7 +25,8 @@ import java.util.Arrays;
*/ */
public enum PreClosurePenalInterestOnType { public enum PreClosurePenalInterestOnType {
INVALID(0, "preClosurePenalInterestOnType.invalid"), WHOLE_TERM(1, "preClosurePenalInterestOnType.wholeTerm"), // INVALID(0, "preClosurePenalInterestOnType.invalid"), //
WHOLE_TERM(1, "preClosurePenalInterestOnType.wholeTerm"), //
TILL_PREMATURE_WITHDRAWAL(2, "preClosurePenalInterestOnType.tillPrematureWithdrawal"); // TILL_PREMATURE_WITHDRAWAL(2, "preClosurePenalInterestOnType.tillPrematureWithdrawal"); //
private final Integer value; private final Integer value;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/SavingsCompoundingInterestPeriodType.java
+8 -7
View File
@@ -27,13 +27,14 @@ import java.util.Arrays;
*/ */
public enum SavingsCompoundingInterestPeriodType { public enum SavingsCompoundingInterestPeriodType {
INVALID(0, "savingsCompoundingInterestPeriodType.invalid"), DAILY(1, "savingsCompoundingInterestPeriodType.daily"), INVALID(0, "savingsCompoundingInterestPeriodType.invalid"), //
// WEEKLY(2, "savingsCompoundingInterestPeriodType.weekly"), DAILY(1, "savingsCompoundingInterestPeriodType.daily"), //
// BIWEEKLY(3, "savingsCompoundingInterestPeriodType.biweekly"), // WEEKLY(2, "savingsCompoundingInterestPeriodType.weekly"), //
MONTHLY(4, "savingsCompoundingInterestPeriodType.monthly"), // BIWEEKLY(3, "savingsCompoundingInterestPeriodType.biweekly"), //
MONTHLY(4, "savingsCompoundingInterestPeriodType.monthly"), //
QUATERLY(5, "savingsCompoundingInterestPeriodType.quarterly"), BI_ANNUAL(6, "savingsCompoundingInterestPeriodType.biannual"), ANNUAL(7, QUATERLY(5, "savingsCompoundingInterestPeriodType.quarterly"), //
"savingsCompoundingInterestPeriodType.annual"); BI_ANNUAL(6, "savingsCompoundingInterestPeriodType.biannual"), //
ANNUAL(7, "savingsCompoundingInterestPeriodType.annual"); //
// NO_COMPOUNDING_SIMPLE_INTEREST(8, "savingsCompoundingInterestPeriodType.nocompounding"); // NO_COMPOUNDING_SIMPLE_INTEREST(8, "savingsCompoundingInterestPeriodType.nocompounding");
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationDaysInYearType.java
+1 -1
View File
@@ -32,7 +32,7 @@ public enum SavingsInterestCalculationDaysInYearType {
INVALID(0, "savingsInterestCalculationDaysInYearType.invalid"), // INVALID(0, "savingsInterestCalculationDaysInYearType.invalid"), //
DAYS_360(360, "savingsInterestCalculationDaysInYearType.days360"), // DAYS_360(360, "savingsInterestCalculationDaysInYearType.days360"), //
DAYS_365(365, "savingsInterestCalculationDaysInYearType.days365"); DAYS_365(365, "savingsInterestCalculationDaysInYearType.days365"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationType.java
+1 -1
View File
@@ -45,7 +45,7 @@ public enum SavingsInterestCalculationType {
INVALID(0, "savingsInterestCalculationType.invalid"), // INVALID(0, "savingsInterestCalculationType.invalid"), //
DAILY_BALANCE(1, "savingsInterestCalculationType.dailybalance"), // DAILY_BALANCE(1, "savingsInterestCalculationType.dailybalance"), //
AVERAGE_DAILY_BALANCE(2, "savingsInterestCalculationType.averagedailybalance"); AVERAGE_DAILY_BALANCE(2, "savingsInterestCalculationType.averagedailybalance"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/SavingsPostingInterestPeriodType.java
+2 -1
View File
@@ -30,7 +30,8 @@ public enum SavingsPostingInterestPeriodType {
DAILY(1, "savingsPostingInterestPeriodType.daily"), // DAILY(1, "savingsPostingInterestPeriodType.daily"), //
MONTHLY(4, "savingsPostingInterestPeriodType.monthly"), // MONTHLY(4, "savingsPostingInterestPeriodType.monthly"), //
QUATERLY(5, "savingsPostingInterestPeriodType.quarterly"), // QUATERLY(5, "savingsPostingInterestPeriodType.quarterly"), //
BIANNUAL(6, "savingsPostingInterestPeriodType.biannual"), ANNUAL(7, "savingsPostingInterestPeriodType.annual"); BIANNUAL(6, "savingsPostingInterestPeriodType.biannual"), //
ANNUAL(7, "savingsPostingInterestPeriodType.annual"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/SavingsWithdrawalFeesType.java
+1 -1
View File
@@ -24,7 +24,7 @@ public enum SavingsWithdrawalFeesType {
INVALID(0, "savingsWithdrawalFeesType.invalid"), // INVALID(0, "savingsWithdrawalFeesType.invalid"), //
FLAT(1, "savingsWithdrawalFeesType.flat"), // FLAT(1, "savingsWithdrawalFeesType.flat"), //
PERCENT_OF_AMOUNT(2, "savingsWithdrawalFeesType.percent.of.amount"); PERCENT_OF_AMOUNT(2, "savingsWithdrawalFeesType.percent.of.amount"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountStatusType.java
+3 -2
View File
@@ -31,8 +31,9 @@ public enum SavingsAccountStatusType {
TRANSFER_ON_HOLD(304, "savingsAccountStatusType.transfer.on.hold"), // TRANSFER_ON_HOLD(304, "savingsAccountStatusType.transfer.on.hold"), //
WITHDRAWN_BY_APPLICANT(400, "savingsAccountStatusType.withdrawn.by.applicant"), // WITHDRAWN_BY_APPLICANT(400, "savingsAccountStatusType.withdrawn.by.applicant"), //
REJECTED(500, "savingsAccountStatusType.rejected"), // REJECTED(500, "savingsAccountStatusType.rejected"), //
CLOSED(600, "savingsAccountStatusType.closed"), PRE_MATURE_CLOSURE(700, "savingsAccountStatusType.pre.mature.closure"), MATURED(800, CLOSED(600, "savingsAccountStatusType.closed"), //
"savingsAccountStatusType.matured"); PRE_MATURE_CLOSURE(700, "savingsAccountStatusType.pre.mature.closure"), //
MATURED(800, "savingsAccountStatusType.matured"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountSubStatusEnum.java
+5 -3
View File
@@ -25,9 +25,11 @@ public enum SavingsAccountSubStatusEnum {
NONE(0, "SavingsAccountSubStatusEnum.none"), // NONE(0, "SavingsAccountSubStatusEnum.none"), //
INACTIVE(100, "SavingsAccountSubStatusEnum.inactive"), // INACTIVE(100, "SavingsAccountSubStatusEnum.inactive"), //
DORMANT(200, "SavingsAccountSubStatusEnum.dormant"), ESCHEAT(300, "SavingsAccountSubStatusEnum.escheat"), BLOCK(400, DORMANT(200, "SavingsAccountSubStatusEnum.dormant"), //
"SavingsAccountSubStatusEnum.block"), BLOCK_CREDIT(500, ESCHEAT(300, "SavingsAccountSubStatusEnum.escheat"), //
"SavingsAccountSubStatusEnum.blockCredit"), BLOCK_DEBIT(600, "SavingsAccountSubStatusEnum.blockDebit"); BLOCK(400, "SavingsAccountSubStatusEnum.block"), //
BLOCK_CREDIT(500, "SavingsAccountSubStatusEnum.blockCredit"), //
BLOCK_DEBIT(600, "SavingsAccountSubStatusEnum.blockDebit"); //
private final Integer value; private final Integer value;
private final String code; private final String code;
fineract-core/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java
+21 -6
View File
@@ -39,9 +39,15 @@ public final class SearchConstants {
public enum SearchResponseParameters { public enum SearchResponseParameters {
ENTITY_ID("entityId"), ENTITY_ACCOUNT_NO("entityAccountNo"), ENTITY_EXTERNAL_ID("entityExternalId"), ENTITY_NAME( ENTITY_ID("entityId"), //
"entityName"), ENTITY_TYPE("entityType"), PARENT_ID( ENTITY_ACCOUNT_NO("entityAccountNo"), //
"parentId"), PARENT_NAME("parentName"), ENTITY_MOBILE_NO("entityMobileNo"), ENTITY_STATUS("entityStatus"); ENTITY_EXTERNAL_ID("entityExternalId"), //
ENTITY_NAME("entityName"), //
ENTITY_TYPE("entityType"), //
PARENT_ID("parentId"), //
PARENT_NAME("parentName"), //
ENTITY_MOBILE_NO("entityMobileNo"), //
ENTITY_STATUS("entityStatus"); //
private final String value; private final String value;
@@ -73,7 +79,9 @@ public final class SearchConstants {
public enum SearchSupportedParameters { public enum SearchSupportedParameters {
QUERY("query"), RESOURCE("resource"), EXACTMATCH("exactMatch"); QUERY("query"), //
RESOURCE("resource"), //
EXACTMATCH("exactMatch"); //
private final String value; private final String value;
@@ -105,7 +113,12 @@ public final class SearchConstants {
public enum SearchSupportedResources { public enum SearchSupportedResources {
CLIENTS("clients"), GROUPS("groups"), LOANS("loans"), SAVINGS("savings"), SHARES("shares"), CLIENTIDENTIFIERS("clientIdentifiers"); CLIENTS("clients"), //
GROUPS("groups"), //
LOANS("loans"), //
SAVINGS("savings"), //
SHARES("shares"), //
CLIENTIDENTIFIERS("clientIdentifiers"); //
private final String value; private final String value;
@@ -137,7 +150,9 @@ public final class SearchConstants {
public enum SearchLoanDate { public enum SearchLoanDate {
APPROVAL_DATE("approvalDate"), CREATED_DATE("createdDate"), DISBURSAL_DATE("disbursalDate"); APPROVAL_DATE("approvalDate"), //
CREATED_DATE("createdDate"), //
DISBURSAL_DATE("disbursalDate"); //
private final String value; private final String value;
fineract-document/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java
+2 -1
View File
@@ -202,7 +202,8 @@ public class ImagesApiResource {
/*** Entities for document Management **/ /*** Entities for document Management **/
public enum EntityTypeForImages { public enum EntityTypeForImages {
STAFF, CLIENTS; STAFF, //
CLIENTS; //
@Override @Override
public String toString() { public String toString() {
fineract-document/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java
+10 -4
View File
@@ -38,7 +38,9 @@ public final class ContentRepositoryUtils {
public enum ImageMIMEtype { public enum ImageMIMEtype {
GIF("image/gif"), JPEG("image/jpeg"), PNG("image/png"); GIF("image/gif"), //
JPEG("image/jpeg"), //
PNG("image/png"); //
private final String value; private final String value;
@@ -68,7 +70,10 @@ public final class ContentRepositoryUtils {
public enum ImageFileExtension { public enum ImageFileExtension {
GIF(".gif"), JPEG(".jpeg"), JPG(".jpg"), PNG(".png"); GIF(".gif"), //
JPEG(".jpeg"), //
JPG(".jpg"), //
PNG(".png"); //
private final String value; private final String value;
@@ -100,8 +105,9 @@ public final class ContentRepositoryUtils {
public enum ImageDataURIsuffix { public enum ImageDataURIsuffix {
GIF("data:" + ImageMIMEtype.GIF.getValue() + ";base64,"), JPEG("data:" + ImageMIMEtype.JPEG.getValue() + ";base64,"), PNG( GIF("data:" + ImageMIMEtype.GIF.getValue() + ";base64,"), //
"data:" + ImageMIMEtype.PNG.getValue() + ";base64,"); JPEG("data:" + ImageMIMEtype.JPEG.getValue() + ";base64,"), //
PNG("data:" + ImageMIMEtype.PNG.getValue() + ";base64,");
private final String value; private final String value;
fineract-document/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java
+7 -1
View File
@@ -179,7 +179,13 @@ public class DocumentWritePlatformServiceJpaRepositoryImpl implements DocumentWr
/*** Entities for document Management **/ /*** Entities for document Management **/
public enum DocumentManagementEntity { public enum DocumentManagementEntity {
CLIENTS, CLIENT_IDENTIFIERS, STAFF, LOANS, SAVINGS, GROUPS, IMPORT; CLIENTS, //
CLIENT_IDENTIFIERS, //
STAFF, //
LOANS, //
SAVINGS, //
GROUPS, //
IMPORT; //
@Override @Override
public String toString() { public String toString() {
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AccountTypeAssetOptions.java
+7 -2
View File
@@ -20,8 +20,13 @@ package org.apache.fineract.test.data;
public enum AccountTypeAssetOptions { public enum AccountTypeAssetOptions {
LOANS_RECEIVABLE(1), INTEREST_FEE_RECEIVABLE(2), OTHER_RECEIVABLES(3), UNC_RECEIVABLE(4), FUND_RECEIVABLES( LOANS_RECEIVABLE(1), //
18), TRANSFER_IN_SUSPENSE_ACCOUNT(14), GOODWILL_TRANSFER_ACCOUNT(19); INTEREST_FEE_RECEIVABLE(2), //
OTHER_RECEIVABLES(3), //
UNC_RECEIVABLE(4), //
FUND_RECEIVABLES(18), //
TRANSFER_IN_SUSPENSE_ACCOUNT(14), //
GOODWILL_TRANSFER_ACCOUNT(19); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AccountTypeExpenseOptions.java
+3 -1
View File
@@ -20,7 +20,9 @@ package org.apache.fineract.test.data;
public enum AccountTypeExpenseOptions { public enum AccountTypeExpenseOptions {
CREDIT_LOSS_BAD_DEBT(12), CREDIT_LOSS_BAD_DEBT_FRAUD(13), WRITTEN_OFF(16); CREDIT_LOSS_BAD_DEBT(12), //
CREDIT_LOSS_BAD_DEBT_FRAUD(13), //
WRITTEN_OFF(16); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AccountTypeIncomeOptions.java
+7 -2
View File
@@ -20,8 +20,13 @@ package org.apache.fineract.test.data;
public enum AccountTypeIncomeOptions { public enum AccountTypeIncomeOptions {
DEFERRED_INTEREST_REVENUE(7), RETAINED_EARNINGS_PRIOR_YEAR(8), INTEREST_INCOME(9), FEE_INCOME(10), FEE_CHARGE_OFF(11), RECOVERIES( DEFERRED_INTEREST_REVENUE(7), //
15), INTEREST_INCOME_CHARGE_OFF(20); RETAINED_EARNINGS_PRIOR_YEAR(8), //
INTEREST_INCOME(9), //
FEE_INCOME(10), //
FEE_CHARGE_OFF(11), //
RECOVERIES(15), //
INTEREST_INCOME_CHARGE_OFF(20); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AccountTypeLiabilityOptions.java
+3 -1
View File
@@ -20,7 +20,9 @@ package org.apache.fineract.test.data;
public enum AccountTypeLiabilityOptions { public enum AccountTypeLiabilityOptions {
AA_SUSPENSE_BALANCE(5), SUSPENSE_CLEARING_ACCOUNT(6), OVERPAYMENT_ACCOUNT(17); AA_SUSPENSE_BALANCE(5), //
SUSPENSE_CLEARING_ACCOUNT(6), //
OVERPAYMENT_ACCOUNT(17); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AccountingRule.java
+4 -1
View File
@@ -20,7 +20,10 @@ package org.apache.fineract.test.data;
public enum AccountingRule { public enum AccountingRule {
NONE(1), CASH_BASED(2), ACCRUAL_PERIODIC(3), ACCRUAL_UPFRONT(4); NONE(1), //
CASH_BASED(2), //
ACCRUAL_PERIODIC(3), //
ACCRUAL_UPFRONT(4); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AmortizationType.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum AmortizationType { public enum AmortizationType {
EQUAL_PRINCIPAL_PAYMENTS(0), EQUAL_INSTALLMENTS(1); EQUAL_PRINCIPAL_PAYMENTS(0), //
EQUAL_INSTALLMENTS(1); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AssetExternalizationTransferStatus.java
+3 -1
View File
@@ -20,7 +20,9 @@ package org.apache.fineract.test.data;
public enum AssetExternalizationTransferStatus { public enum AssetExternalizationTransferStatus {
EXECUTED("EXECUTED"), CANCELLED("CANCELLED"), DECLINED("DECLINED"); EXECUTED("EXECUTED"), //
CANCELLED("CANCELLED"), //
DECLINED("DECLINED"); //
public final String value; public final String value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AssetExternalizationTransferStatusReason.java
+3 -1
View File
@@ -20,7 +20,9 @@ package org.apache.fineract.test.data;
public enum AssetExternalizationTransferStatusReason { public enum AssetExternalizationTransferStatusReason {
BALANCE_ZERO("BALANCE_ZERO"), BALANCE_NEGATIVE("BALANCE_NEGATIVE"), SAMEDAY_TRANSFERS("SAMEDAY_TRANSFERS"); BALANCE_ZERO("BALANCE_ZERO"), //
BALANCE_NEGATIVE("BALANCE_NEGATIVE"), //
SAMEDAY_TRANSFERS("SAMEDAY_TRANSFERS"); //
public final String value; public final String value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/ChargeCalculationType.java
+5 -1
View File
@@ -20,7 +20,11 @@ package org.apache.fineract.test.data;
public enum ChargeCalculationType { public enum ChargeCalculationType {
FLAT(1), PERCENTAGE_AMOUNT(2), PERCENTAGE_LOAN_AMOUNT_PLUS_INTEREST(3), PERCENTAGE_INTEREST(4), PERCENTAGE_DISBURSEMENT_AMOUNT(5); FLAT(1), //
PERCENTAGE_AMOUNT(2), //
PERCENTAGE_LOAN_AMOUNT_PLUS_INTEREST(3), //
PERCENTAGE_INTEREST(4), //
PERCENTAGE_DISBURSEMENT_AMOUNT(5); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/ChargeOffBehaviour.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum ChargeOffBehaviour { public enum ChargeOffBehaviour {
ZERO_INTEREST("ZERO_INTEREST"), REGULAR("REGULAR"); ZERO_INTEREST("ZERO_INTEREST"), //
REGULAR("REGULAR"); //
public final String value; public final String value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/ChargePaymentMode.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum ChargePaymentMode { public enum ChargePaymentMode {
REGULAR(0), ACCOUNT_TRANSFER(1); REGULAR(0), //
ACCOUNT_TRANSFER(1); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/ChargeProductAppliesTo.java
+4 -1
View File
@@ -20,7 +20,10 @@ package org.apache.fineract.test.data;
public enum ChargeProductAppliesTo { public enum ChargeProductAppliesTo {
LOAN(1), SAVINGS(2), CLIENT(3), SHARES(4); LOAN(1), //
SAVINGS(2), //
CLIENT(3), //
SHARES(4); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/ChargeProductType.java
+12 -4
View File
@@ -20,10 +20,18 @@ package org.apache.fineract.test.data;
public enum ChargeProductType { public enum ChargeProductType {
LOAN_PERCENTAGE_LATE_FEE(1L), LOAN_PERCENTAGE_PROCESSING_FEE(2L), LOAN_FIXED_LATE_FEE(3L), LOAN_FIXED_RETURNED_PAYMENT_FEE( LOAN_PERCENTAGE_LATE_FEE(1L), //
4L), LOAN_SNOOZE_FEE(5L), LOAN_NSF_FEE(6L), LOAN_DISBURSEMENT_PERCENTAGE_FEE(7L), LOAN_TRANCHE_DISBURSEMENT_PERCENTAGE_FEE( LOAN_PERCENTAGE_PROCESSING_FEE(2L), //
8L), LOAN_INSTALLMENT_PERCENTAGE_FEE(9L), LOAN_PERCENTAGE_LATE_FEE_AMOUNT_PLUS_INTEREST( LOAN_FIXED_LATE_FEE(3L), //
10L), CLIENT_TEST_CHARGE_FEE(11L), LOAN_DISBURSEMENT_CHARGE(12L); LOAN_FIXED_RETURNED_PAYMENT_FEE(4L), //
LOAN_SNOOZE_FEE(5L), //
LOAN_NSF_FEE(6L), //
LOAN_DISBURSEMENT_PERCENTAGE_FEE(7L), //
LOAN_TRANCHE_DISBURSEMENT_PERCENTAGE_FEE(8L), //
LOAN_INSTALLMENT_PERCENTAGE_FEE(9L), //
LOAN_PERCENTAGE_LATE_FEE_AMOUNT_PLUS_INTEREST(10L), //
CLIENT_TEST_CHARGE_FEE(11L), //
LOAN_DISBURSEMENT_CHARGE(12L); //
public final Long value; public final Long value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/ChargeTimeType.java
+15 -3
View File
@@ -20,9 +20,21 @@ package org.apache.fineract.test.data;
public enum ChargeTimeType { public enum ChargeTimeType {
DISBURSEMENT(1), SPECIFIED_DUE_DATE(2), SAVINGS_ACTIVATION(3), WITHDRAWAL_FEE(5), ANNUAL_FEE(6), MONTHLY_FEE(7), INSTALLMENT_FEE( DISBURSEMENT(1), //
8), OVERDUE_FEES(9), OVERDRAFT_FEE(10), WEEKLY_FEE(11), TRANCHE_DISBURSEMENT( SPECIFIED_DUE_DATE(2), //
12), SHARE_ACCOUNT_ACTIVATE(13), SHARE_PURCHASE(14), SHARE_REDEEM(15), SAVING_NO_ACTIVITY_FEE(16); SAVINGS_ACTIVATION(3), //
WITHDRAWAL_FEE(5), //
ANNUAL_FEE(6), //
MONTHLY_FEE(7), //
INSTALLMENT_FEE(8), //
OVERDUE_FEES(9), //
OVERDRAFT_FEE(10), //
WEEKLY_FEE(11), //
TRANCHE_DISBURSEMENT(12), //
SHARE_ACCOUNT_ACTIVATE(13), //
SHARE_PURCHASE(14), //
SHARE_REDEEM(15), //
SAVING_NO_ACTIVITY_FEE(16); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/CurrencyOptions.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum CurrencyOptions { public enum CurrencyOptions {
EUR("EUR"), USD("USD"); EUR("EUR"), //
USD("USD"); //
public final String value; public final String value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/DaysInMonthType.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum DaysInMonthType { public enum DaysInMonthType {
ACTUAL(1), DAYS30(30); ACTUAL(1), //
DAYS30(30); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/DaysInYearType.java
+4 -1
View File
@@ -20,7 +20,10 @@ package org.apache.fineract.test.data;
public enum DaysInYearType { public enum DaysInYearType {
ACTUAL(1), DAYS360(360), DAYS364(364), DAYS365(365); ACTUAL(1), //
DAYS360(360), //
DAYS364(364), //
DAYS365(365); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/DelinquencyRange.java
+11 -4
View File
@@ -20,10 +20,17 @@ package org.apache.fineract.test.data;
public enum DelinquencyRange { public enum DelinquencyRange {
NO_DELINQUENCY("NO_DELINQUENCY"), RANGE_1("Delinquency range 1"), RANGE_3("Delinquency range 3"), RANGE_30( NO_DELINQUENCY("NO_DELINQUENCY"), //
"Delinquency range 30"), RANGE_60("Delinquency range 60"), RANGE_90("Delinquency range 90"), RANGE_120( RANGE_1("Delinquency range 1"), //
"Delinquency range 120"), RANGE_150("Delinquency range 150"), RANGE_180( RANGE_3("Delinquency range 3"), //
"Delinquency range 180"), RANGE_210("Delinquency range 210"), RANGE_240("Delinquency range 240"); RANGE_30("Delinquency range 30"), //
RANGE_60("Delinquency range 60"), //
RANGE_90("Delinquency range 90"), //
RANGE_120("Delinquency range 120"), //
RANGE_150("Delinquency range 150"), //
RANGE_180("Delinquency range 180"), //
RANGE_210("Delinquency range 210"), //
RANGE_240("Delinquency range 240"); //
public final String value; public final String value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/FundId.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum FundId { public enum FundId {
LENDER_A(1L), LENDER_B(2L); LENDER_A(1L), //
LENDER_B(2L); //
public final Long value; public final Long value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/GLAType.java
+5 -1
View File
@@ -20,7 +20,11 @@ package org.apache.fineract.test.data;
public enum GLAType { public enum GLAType {
ASSET(1), LIABILITY(2), EQUITY(3), INCOME(4), EXPENSE(5); ASSET(1), //
LIABILITY(2), //
EQUITY(3), //
INCOME(4), //
EXPENSE(5); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/GLAUsage.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum GLAUsage { public enum GLAUsage {
DETAIL(1), HEADER(2); DETAIL(1), //
HEADER(2); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/InterestCalculationPeriodTime.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum InterestCalculationPeriodTime { public enum InterestCalculationPeriodTime {
DAILY(0), SAME_AS_REPAYMENT_PERIOD(1); DAILY(0), //
SAME_AS_REPAYMENT_PERIOD(1); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/InterestRateFrequencyType.java
+4 -1
View File
@@ -20,7 +20,10 @@ package org.apache.fineract.test.data;
public enum InterestRateFrequencyType { public enum InterestRateFrequencyType {
DAY(1), MONTH(2), YEAR(3), WHOLE_TERM(4); DAY(1), //
MONTH(2), //
YEAR(3), //
WHOLE_TERM(4); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/InterestRecalculationCompoundingMethod.java
+4 -1
View File
@@ -20,7 +20,10 @@ package org.apache.fineract.test.data;
public enum InterestRecalculationCompoundingMethod { public enum InterestRecalculationCompoundingMethod {
NONE(0), INTEREST(1), FEE(2), FEE_AND_INTEREST(3); NONE(0), //
INTEREST(1), //
FEE(2), //
FEE_AND_INTEREST(3); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/InterestType.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum InterestType { public enum InterestType {
DECLINING_BALANCE(0), FLAT(1); DECLINING_BALANCE(0), //
FLAT(1); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/LoanTermFrequencyType.java
+4 -1
View File
@@ -20,7 +20,10 @@ package org.apache.fineract.test.data;
public enum LoanTermFrequencyType { public enum LoanTermFrequencyType {
DAYS(0), WEEKS(1), MONTHS(2), YEARS(4); DAYS(0), //
WEEKS(1), //
MONTHS(2), //
YEARS(4); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/PreClosureInterestCalculationRule.java
+2 -1
View File
@@ -20,7 +20,8 @@ package org.apache.fineract.test.data;
public enum PreClosureInterestCalculationRule { public enum PreClosureInterestCalculationRule {
TILL_PRE_CLOSE_DATE(1), TILL_REST_FREQUENCY_DATE(2); TILL_PRE_CLOSE_DATE(1), //
TILL_REST_FREQUENCY_DATE(2); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/RecalculationCompoundingFrequencyType.java
+4 -1
View File
@@ -20,7 +20,10 @@ package org.apache.fineract.test.data;
public enum RecalculationCompoundingFrequencyType { public enum RecalculationCompoundingFrequencyType {
SAME_AS_REPAYMENT(1), DAILY(2), WEEKLY(3), MONTHLY(4); SAME_AS_REPAYMENT(1), //
DAILY(2), //
WEEKLY(3), //
MONTHLY(4); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/RecalculationRestFrequencyType.java
+4 -1
View File
@@ -20,7 +20,10 @@ package org.apache.fineract.test.data;
public enum RecalculationRestFrequencyType { public enum RecalculationRestFrequencyType {
SAME_AS_REPAYMENT(1), DAILY(2), WEEKLY(3), MONTHLY(4); SAME_AS_REPAYMENT(1), //
DAILY(2), //
WEEKLY(3), //
MONTHLY(4); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/RepaymentFrequencyType.java
+3 -1
View File
@@ -20,7 +20,9 @@ package org.apache.fineract.test.data;
public enum RepaymentFrequencyType { public enum RepaymentFrequencyType {
DAYS(0), WEEKS(1), MONTHS(2); DAYS(0), //
WEEKS(1), //
MONTHS(2); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/TransactionProcessingStrategy.java
+7 -2
View File
@@ -20,8 +20,13 @@ package org.apache.fineract.test.data;
public enum TransactionProcessingStrategy { public enum TransactionProcessingStrategy {
PENALTIES_FEES_INTEREST_PRINCIPAL_ORDER(1), HEAVENSFAMILY_UNIQUE(2), CREOCORE_UNIQUE(3), OVERDUE_DUE_FEE_INT_PRINCIPAL( PENALTIES_FEES_INTEREST_PRINCIPAL_ORDER(1), //
4), PRINCIPAL_INTEREST_PENALTIES_FEES_ORDER(5), INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER(6), EARLY_REPAYMENT_STRATEGY(7); HEAVENSFAMILY_UNIQUE(2), //
CREOCORE_UNIQUE(3), //
OVERDUE_DUE_FEE_INT_PRINCIPAL(4), //
PRINCIPAL_INTEREST_PENALTIES_FEES_ORDER(5), //
INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER(6), //
EARLY_REPAYMENT_STRATEGY(7); //
public final Integer value; public final Integer value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/TransactionProcessingStrategyCode.java
+12 -8
View File
@@ -20,14 +20,18 @@ package org.apache.fineract.test.data;
public enum TransactionProcessingStrategyCode { public enum TransactionProcessingStrategyCode {
PENALTIES_FEES_INTEREST_PRINCIPAL_ORDER("mifos-standard-strategy"), HEAVENSFAMILY_UNIQUE("heavensfamily-strategy"), CREOCORE_UNIQUE( PENALTIES_FEES_INTEREST_PRINCIPAL_ORDER("mifos-standard-strategy"), //
"creocore-strategy"), OVERDUE_DUE_FEE_INT_PRINCIPAL("rbi-india-strategy"), PRINCIPAL_INTEREST_PENALTIES_FEES_ORDER( HEAVENSFAMILY_UNIQUE("heavensfamily-strategy"), //
"principal-interest-penalties-fees-order-strategy"), INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER( CREOCORE_UNIQUE("creocore-strategy"), //
"interest-principal-penalties-fees-order-strategy"), EARLY_REPAYMENT_STRATEGY( OVERDUE_DUE_FEE_INT_PRINCIPAL("rbi-india-strategy"), //
"early-repayment-strategy"), DUE_PENALTY_FEE_INTEREST_PRINCIPAL_IN_ADVANCE_PRINCIPAL_PENALTY_FEE_INTEREST( PRINCIPAL_INTEREST_PENALTIES_FEES_ORDER("principal-interest-penalties-fees-order-strategy"), //
"due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy"), DUE_PENALTY_INTEREST_PRINCIPAL_FEE_IN_ADVANCE_PENALTY_INTEREST_PRINCIPAL_FEE( INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER("interest-principal-penalties-fees-order-strategy"), //
"due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy"), ADVANCED_PAYMENT_ALLOCATION( EARLY_REPAYMENT_STRATEGY("early-repayment-strategy"), //
"advanced-payment-allocation-strategy"); DUE_PENALTY_FEE_INTEREST_PRINCIPAL_IN_ADVANCE_PRINCIPAL_PENALTY_FEE_INTEREST(
"due-penalty-fee-interest-principal-in-advance-principal-penalty-fee-interest-strategy"), //
DUE_PENALTY_INTEREST_PRINCIPAL_FEE_IN_ADVANCE_PENALTY_INTEREST_PRINCIPAL_FEE(
"due-penalty-interest-principal-fee-in-advance-penalty-interest-principal-fee-strategy"), //
ADVANCED_PAYMENT_ALLOCATION("advanced-payment-allocation-strategy"); //
public final String value; public final String value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/TransactionType.java
+1 -2
View File
@@ -35,8 +35,7 @@ public enum TransactionType {
INTEREST_PAYMENT_WAIVER("interestPaymentWaiver"), // INTEREST_PAYMENT_WAIVER("interestPaymentWaiver"), //
REPAYMENT_AT_DISBURSEMENT("repaymentAtDisbursement"), // REPAYMENT_AT_DISBURSEMENT("repaymentAtDisbursement"), //
CAPITALIZED_INCOME("capitalizedIncome"), // CAPITALIZED_INCOME("capitalizedIncome"), //
CAPITALIZED_INCOME_AMORTIZATION("capitalizedIncomeAmortization"), // CAPITALIZED_INCOME_AMORTIZATION("capitalizedIncomeAmortization"); //
;
public final String value; public final String value;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/codevalue/DefaultCodeValue.java
+3 -1
View File
@@ -21,7 +21,9 @@ package org.apache.fineract.test.data.codevalue;
public enum DefaultCodeValue implements CodeValue { public enum DefaultCodeValue implements CodeValue {
// Charge-off reason // Charge-off reason
FRAUD("Fraud"), DELINQUENT("Delinquent"), OTHER("Other"); FRAUD("Fraud"), //
DELINQUENT("Delinquent"), //
OTHER("Other"); //
private final String customName; private final String customName;
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/datatable/DatatableColumnType.java
+8 -2
View File
@@ -26,8 +26,14 @@ import org.apache.fineract.test.support.EnumResolver;
@Getter @Getter
public enum DatatableColumnType { public enum DatatableColumnType {
STRING("string"), NUMBER("number"), BOOLEAN("boolean"), DECIMAL("decimal"), DATE("date"), DATETIME("datetime"), TEXT("text"), DROPDOWN( STRING("string"), //
"dropdown"); NUMBER("number"), //
BOOLEAN("boolean"), //
DECIMAL("decimal"), //
DATE("date"), //
DATETIME("datetime"), //
TEXT("text"), //
DROPDOWN("dropdown"); //
private final String typeString; private final String typeString;

Some files were not shown because too many files have changed in this diff Show More