Added and Enforced RedundantModifier Checkstyle(2)(Fineract-821)
This commit is contained in:
committed by
Petri Tuomola
parent
946bff46c1
commit
a52526b9cc
@@ -190,6 +190,7 @@
|
||||
<message key="name.invalidPattern"
|
||||
value="Member name ''{0}'' must match pattern ''{1}''."/>
|
||||
</module>
|
||||
<module name="RedundantModifier"/>
|
||||
<module name="ParenPad" />
|
||||
<module name="ModifierOrder"/>
|
||||
<module name="LocalVariableName">
|
||||
@@ -234,7 +235,7 @@
|
||||
|
||||
|
||||
|
||||
<module name="RedundantModifier"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -34,7 +34,7 @@ public final class ProvisioningHelper {
|
||||
|
||||
}
|
||||
|
||||
public static final Map createProvisioingCriteriaJson(ArrayList<Integer> loanProducts, ArrayList categories, Account liability,
|
||||
public static Map createProvisioingCriteriaJson(ArrayList<Integer> loanProducts, ArrayList categories, Account liability,
|
||||
Account expense) {
|
||||
final HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("loanProducts", addLoanProducts(loanProducts));
|
||||
@@ -48,7 +48,7 @@ public final class ProvisioningHelper {
|
||||
return map;
|
||||
}
|
||||
|
||||
public static final String createProvisioningEntryJson() {
|
||||
public static String createProvisioningEntryJson() {
|
||||
final HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("createjournalentries", Boolean.FALSE);
|
||||
map.put("locale", "en");
|
||||
@@ -59,7 +59,7 @@ public final class ProvisioningHelper {
|
||||
return provisioningEntryCreateJson;
|
||||
}
|
||||
|
||||
public static final String createProvisioningEntryJsonWithJournalsEnabled() {
|
||||
public static String createProvisioningEntryJsonWithJournalsEnabled() {
|
||||
final HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("createjournalentries", Boolean.TRUE);
|
||||
map.put("locale", "en");
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ public enum GLClosureJsonInputParams {
|
||||
|
||||
private final String value;
|
||||
|
||||
private GLClosureJsonInputParams(final String value) {
|
||||
GLClosureJsonInputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
||||
public class GLClosureInvalidException extends AbstractPlatformDomainRuleException {
|
||||
|
||||
/*** enum of reasons for invalid Accounting Closure **/
|
||||
public static enum GlClosureInvalidReason {
|
||||
public enum GlClosureInvalidReason {
|
||||
|
||||
FUTURE_DATE, ACCOUNTING_CLOSED;
|
||||
|
||||
|
||||
+20
-20
@@ -34,14 +34,14 @@ public final class AccountingConstants {
|
||||
/***
|
||||
* Accounting placeholders for cash based accounting for loan products
|
||||
***/
|
||||
public static enum CashAccountsForLoan {
|
||||
public enum CashAccountsForLoan {
|
||||
|
||||
FUND_SOURCE(1), LOAN_PORTFOLIO(2), INTEREST_ON_LOANS(3), INCOME_FROM_FEES(4), INCOME_FROM_PENALTIES(5), LOSSES_WRITTEN_OFF(
|
||||
6), TRANSFERS_SUSPENSE(10), OVERPAYMENT(11), INCOME_FROM_RECOVERY(12);
|
||||
|
||||
private final Integer value;
|
||||
|
||||
private CashAccountsForLoan(final Integer value) {
|
||||
CashAccountsForLoan(final Integer value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ public final class AccountingConstants {
|
||||
/***
|
||||
* Accounting placeholders for accrual based accounting for loan products
|
||||
***/
|
||||
public static enum AccrualAccountsForLoan {
|
||||
public enum AccrualAccountsForLoan {
|
||||
|
||||
FUND_SOURCE(1), LOAN_PORTFOLIO(2), INTEREST_ON_LOANS(3), INCOME_FROM_FEES(4), INCOME_FROM_PENALTIES(5), LOSSES_WRITTEN_OFF(
|
||||
6), INTEREST_RECEIVABLE(
|
||||
@@ -78,7 +78,7 @@ public final class AccountingConstants {
|
||||
|
||||
private final Integer value;
|
||||
|
||||
private AccrualAccountsForLoan(final Integer value) {
|
||||
AccrualAccountsForLoan(final Integer value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ public final class AccountingConstants {
|
||||
/***
|
||||
* Enum of all accounting related input parameter names used while creating/updating a loan product
|
||||
***/
|
||||
public static enum LoanProductAccountingParams {
|
||||
public enum LoanProductAccountingParams {
|
||||
|
||||
FUND_SOURCE("fundSourceAccountId"), LOAN_PORTFOLIO("loanPortfolioAccountId"), INTEREST_ON_LOANS(
|
||||
"interestOnLoanAccountId"), INCOME_FROM_FEES("incomeFromFeeAccountId"), INCOME_FROM_PENALTIES(
|
||||
@@ -126,7 +126,7 @@ public final class AccountingConstants {
|
||||
|
||||
private final String value;
|
||||
|
||||
private LoanProductAccountingParams(final String value) {
|
||||
LoanProductAccountingParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ public final class AccountingConstants {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum LoanProductAccountingDataParams {
|
||||
public enum LoanProductAccountingDataParams {
|
||||
|
||||
FUND_SOURCE("fundSourceAccount"), LOAN_PORTFOLIO("loanPortfolioAccount"), INTEREST_ON_LOANS(
|
||||
"interestOnLoanAccount"), INCOME_FROM_FEES("incomeFromFeeAccount"), INCOME_FROM_PENALTIES(
|
||||
@@ -153,7 +153,7 @@ public final class AccountingConstants {
|
||||
|
||||
private final String value;
|
||||
|
||||
private LoanProductAccountingDataParams(final String value) {
|
||||
LoanProductAccountingDataParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -170,14 +170,14 @@ public final class AccountingConstants {
|
||||
/***
|
||||
* Accounting placeholders for cash based accounting for savings products
|
||||
***/
|
||||
public static enum CashAccountsForSavings {
|
||||
public enum CashAccountsForSavings {
|
||||
|
||||
SAVINGS_REFERENCE(1), SAVINGS_CONTROL(2), INTEREST_ON_SAVINGS(3), INCOME_FROM_FEES(4), INCOME_FROM_PENALTIES(5), TRANSFERS_SUSPENSE(
|
||||
10), OVERDRAFT_PORTFOLIO_CONTROL(11), INCOME_FROM_INTEREST(12), LOSSES_WRITTEN_OFF(13), ESCHEAT_LIABILITY(14);
|
||||
|
||||
private final Integer value;
|
||||
|
||||
private CashAccountsForSavings(final Integer value) {
|
||||
CashAccountsForSavings(final Integer value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -206,7 +206,7 @@ public final class AccountingConstants {
|
||||
/***
|
||||
* Enum of all accounting related input parameter names used while creating/updating a savings product
|
||||
***/
|
||||
public static enum SavingProductAccountingParams {
|
||||
public enum SavingProductAccountingParams {
|
||||
|
||||
SAVINGS_REFERENCE("savingsReferenceAccountId"), SAVINGS_CONTROL("savingsControlAccountId"), INCOME_FROM_FEES(
|
||||
"incomeFromFeeAccountId"), INCOME_FROM_PENALTIES("incomeFromPenaltyAccountId"), INTEREST_ON_SAVINGS(
|
||||
@@ -224,7 +224,7 @@ public final class AccountingConstants {
|
||||
|
||||
private final String value;
|
||||
|
||||
private SavingProductAccountingParams(final String value) {
|
||||
SavingProductAccountingParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -238,7 +238,7 @@ public final class AccountingConstants {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum SavingProductAccountingDataParams {
|
||||
public enum SavingProductAccountingDataParams {
|
||||
|
||||
SAVINGS_REFERENCE("savingsReferenceAccount"), SAVINGS_CONTROL("savingsControlAccount"), INCOME_FROM_FEES(
|
||||
"incomeFromFeeAccount"), INCOME_FROM_PENALTIES("incomeFromPenaltyAccount"), INTEREST_ON_SAVINGS(
|
||||
@@ -251,7 +251,7 @@ public final class AccountingConstants {
|
||||
|
||||
private final String value;
|
||||
|
||||
private SavingProductAccountingDataParams(final String value) {
|
||||
SavingProductAccountingDataParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ public final class AccountingConstants {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum FinancialActivity {
|
||||
public enum FinancialActivity {
|
||||
|
||||
ASSET_TRANSFER(100, "assetTransfer", GLAccountType.ASSET), LIABILITY_TRANSFER(200, "liabilityTransfer",
|
||||
GLAccountType.LIABILITY), CASH_AT_MAINVAULT(101, "cashAtMainVault", GLAccountType.ASSET), CASH_AT_TELLER(102,
|
||||
@@ -286,7 +286,7 @@ public final class AccountingConstants {
|
||||
}
|
||||
}
|
||||
|
||||
private FinancialActivity(final Integer value, final String code, final GLAccountType mappedGLAccountType) {
|
||||
FinancialActivity(final Integer value, final String code, final GLAccountType mappedGLAccountType) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
this.mappedGLAccountType = mappedGLAccountType;
|
||||
@@ -343,13 +343,13 @@ public final class AccountingConstants {
|
||||
/***
|
||||
* Accounting placeholders for cash based accounting for Share products
|
||||
***/
|
||||
public static enum CashAccountsForShares {
|
||||
public enum CashAccountsForShares {
|
||||
|
||||
SHARES_REFERENCE(1), SHARES_SUSPENSE(2), INCOME_FROM_FEES(3), SHARES_EQUITY(4);
|
||||
|
||||
private final Integer value;
|
||||
|
||||
private CashAccountsForShares(final Integer value) {
|
||||
CashAccountsForShares(final Integer value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -378,14 +378,14 @@ public final class AccountingConstants {
|
||||
/***
|
||||
* Enum of all accounting related input parameter names used while creating/updating a savings product
|
||||
***/
|
||||
public static enum SharesProductAccountingParams {
|
||||
public enum SharesProductAccountingParams {
|
||||
|
||||
SHARES_REFERENCE("shareReferenceId"), SHARES_SUSPENSE("shareSuspenseId"), INCOME_FROM_FEES("incomeFromFeeAccountId"), SHARES_EQUITY(
|
||||
"shareEquityId");
|
||||
|
||||
private final String value;
|
||||
|
||||
private SharesProductAccountingParams(final String value) {
|
||||
SharesProductAccountingParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+9
-9
@@ -25,22 +25,22 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData;
|
||||
|
||||
public interface AccountingDropdownReadPlatformService {
|
||||
|
||||
public List<EnumOptionData> retrieveGLAccountTypeOptions();
|
||||
List<EnumOptionData> retrieveGLAccountTypeOptions();
|
||||
|
||||
public List<EnumOptionData> retrieveGLAccountUsageOptions();
|
||||
List<EnumOptionData> retrieveGLAccountUsageOptions();
|
||||
|
||||
public List<EnumOptionData> retrieveJournalEntryTypeOptions();
|
||||
List<EnumOptionData> retrieveJournalEntryTypeOptions();
|
||||
|
||||
public List<EnumOptionData> retrieveAccountingRuleTypeOptions();
|
||||
List<EnumOptionData> retrieveAccountingRuleTypeOptions();
|
||||
|
||||
public Map<String, List<GLAccountData>> retrieveAccountMappingOptionsForLoanProducts();
|
||||
Map<String, List<GLAccountData>> retrieveAccountMappingOptionsForLoanProducts();
|
||||
|
||||
public Map<String, List<GLAccountData>> retrieveAccountMappingOptionsForSavingsProducts();
|
||||
Map<String, List<GLAccountData>> retrieveAccountMappingOptionsForSavingsProducts();
|
||||
|
||||
public Map<String, List<GLAccountData>> retrieveAccountMappingOptionsForCharges();
|
||||
Map<String, List<GLAccountData>> retrieveAccountMappingOptionsForCharges();
|
||||
|
||||
public Map<String, List<GLAccountData>> retrieveAccountMappingOptions();
|
||||
Map<String, List<GLAccountData>> retrieveAccountMappingOptions();
|
||||
|
||||
public Map<String, List<GLAccountData>> retrieveAccountMappingOptionsForShareProducts();
|
||||
Map<String, List<GLAccountData>> retrieveAccountMappingOptionsForShareProducts();
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ public enum AccountingRuleType {
|
||||
return type;
|
||||
}
|
||||
|
||||
private AccountingRuleType(final Integer value, final String code) {
|
||||
AccountingRuleType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ public enum FinancialActivityAccountsJsonInputParams {
|
||||
|
||||
private final String value;
|
||||
|
||||
private FinancialActivityAccountsJsonInputParams(final String value) {
|
||||
FinancialActivityAccountsJsonInputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -89,7 +89,7 @@ public class FinancialActivityAccountReadPlatformServiceImpl implements Financia
|
||||
|
||||
private final String sql;
|
||||
|
||||
public FinancialActivityAccountMapper() {
|
||||
FinancialActivityAccountMapper() {
|
||||
StringBuilder sb = new StringBuilder(300);
|
||||
sb.append(
|
||||
" faa.id as id, faa.financial_activity_type as financialActivityId, glaccount.id as glAccountId,glaccount.name as glAccountName,glaccount.gl_code as glCode ");
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public enum GLAccountJsonInputParams {
|
||||
|
||||
private final String value;
|
||||
|
||||
private GLAccountJsonInputParams(final String value) {
|
||||
GLAccountJsonInputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ public enum GLAccountType {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private GLAccountType(final Integer value, final String code) {
|
||||
GLAccountType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ public enum GLAccountUsage {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private GLAccountUsage(final Integer value, final String code) {
|
||||
GLAccountUsage(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -27,5 +27,5 @@ import org.springframework.data.repository.query.Param;
|
||||
public interface TrialBalanceRepository extends JpaRepository<TrialBalance, Long>, JpaSpecificationExecutor<TrialBalance> {
|
||||
|
||||
@Query(value = "select * from m_trial_balance where office_id=:officeId and account_id=:accountId and closing_balance is null order by created_date, entry_date", nativeQuery = true)
|
||||
List<TrialBalance> findNewByOfficeAndAccount(@Param("officeId") final Long officeId, @Param("accountId") final Long accountId);
|
||||
List<TrialBalance> findNewByOfficeAndAccount(@Param("officeId") Long officeId, @Param("accountId") Long accountId);
|
||||
}
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
||||
public class GLAccountInvalidDeleteException extends AbstractPlatformDomainRuleException {
|
||||
|
||||
/*** Enum of reasons for invalid delete **/
|
||||
public static enum GlAccountInvalidDeleteReason {
|
||||
public enum GlAccountInvalidDeleteReason {
|
||||
|
||||
TRANSANCTIONS_LOGGED, HAS_CHILDREN;
|
||||
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
||||
public class GLAccountInvalidUpdateException extends AbstractPlatformDomainRuleException {
|
||||
|
||||
/*** Enum of reasons for invalid delete **/
|
||||
public static enum GlAccountInvalidUpdateReason {
|
||||
public enum GlAccountInvalidUpdateReason {
|
||||
|
||||
TRANSANCTIONS_LOGGED;
|
||||
|
||||
|
||||
+2
-2
@@ -37,7 +37,7 @@ public interface GLAccountReadPlatformService {
|
||||
|
||||
List<GLAccountData> retrieveAllEnabledHeaderGLAccounts(GLAccountType accountType);
|
||||
|
||||
GLAccountData retrieveNewGLAccountDetails(final Integer type);
|
||||
GLAccountData retrieveNewGLAccountDetails(Integer type);
|
||||
|
||||
List<GLAccountDataForLookup> retrieveAccountsByTagId(final Long ruleId, final Integer transactionType);
|
||||
List<GLAccountDataForLookup> retrieveAccountsByTagId(Long ruleId, Integer transactionType);
|
||||
}
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ public class GLAccountReadPlatformServiceImpl implements GLAccountReadPlatformSe
|
||||
|
||||
private final JournalEntryAssociationParametersData associationParametersData;
|
||||
|
||||
public GLAccountMapper(final JournalEntryAssociationParametersData associationParametersData) {
|
||||
GLAccountMapper(final JournalEntryAssociationParametersData associationParametersData) {
|
||||
if (associationParametersData == null) {
|
||||
this.associationParametersData = new JournalEntryAssociationParametersData();
|
||||
} else {
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ public enum JournalEntryJsonInputParams {
|
||||
|
||||
private final String value;
|
||||
|
||||
private JournalEntryJsonInputParams(final String value) {
|
||||
JournalEntryJsonInputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ public enum JournalEntryType {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private JournalEntryType(final Integer value, final String code) {
|
||||
JournalEntryType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
||||
public class JournalEntryInvalidException extends AbstractPlatformDomainRuleException {
|
||||
|
||||
/*** enum of reasons for invalid Journal Entry **/
|
||||
public static 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;
|
||||
|
||||
|
||||
+1
-1
@@ -95,7 +95,7 @@ public class JournalEntryReadPlatformServiceImpl implements JournalEntryReadPlat
|
||||
|
||||
private final JournalEntryAssociationParametersData associationParametersData;
|
||||
|
||||
public GLJournalEntryMapper(final JournalEntryAssociationParametersData associationParametersData) {
|
||||
GLJournalEntryMapper(final JournalEntryAssociationParametersData associationParametersData) {
|
||||
if (associationParametersData == null) {
|
||||
this.associationParametersData = new JournalEntryAssociationParametersData();
|
||||
} else {
|
||||
|
||||
+3
-3
@@ -39,11 +39,11 @@ public interface JournalEntryWritePlatformService {
|
||||
|
||||
CommandProcessingResult defineOpeningBalance(JsonCommand command);
|
||||
|
||||
public String revertProvisioningJournalEntries(final Date reversalTransactionDate, final Long entityId, final Integer entityType);
|
||||
String revertProvisioningJournalEntries(Date reversalTransactionDate, Long entityId, Integer entityType);
|
||||
|
||||
public String createProvisioningJournalEntries(ProvisioningEntry entry);
|
||||
String createProvisioningJournalEntries(ProvisioningEntry entry);
|
||||
|
||||
void createJournalEntriesForShares(Map<String, Object> accountingBridgeData);
|
||||
|
||||
void revertShareAccountJournalEntries(final ArrayList<Long> transactionId, final Date transactionDate);
|
||||
void revertShareAccountJournalEntries(ArrayList<Long> transactionId, Date transactionDate);
|
||||
}
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ public enum PortfolioProductType {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private PortfolioProductType(final Integer value, final String code) {
|
||||
PortfolioProductType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+11
-11
@@ -25,26 +25,26 @@ import org.apache.fineract.accounting.producttoaccountmapping.data.PaymentTypeTo
|
||||
|
||||
public interface ProductToGLAccountMappingReadPlatformService {
|
||||
|
||||
public Map<String, Object> fetchAccountMappingDetailsForLoanProduct(final Long loanProductId, final Integer accountingType);
|
||||
Map<String, Object> fetchAccountMappingDetailsForLoanProduct(Long loanProductId, Integer accountingType);
|
||||
|
||||
public List<PaymentTypeToGLAccountMapper> fetchPaymentTypeToFundSourceMappingsForLoanProduct(final Long loanProductId);
|
||||
List<PaymentTypeToGLAccountMapper> fetchPaymentTypeToFundSourceMappingsForLoanProduct(Long loanProductId);
|
||||
|
||||
public List<ChargeToGLAccountMapper> fetchFeeToIncomeOrLiabilityAccountMappingsForLoanProduct(final Long loanProductId);
|
||||
List<ChargeToGLAccountMapper> fetchFeeToIncomeOrLiabilityAccountMappingsForLoanProduct(Long loanProductId);
|
||||
|
||||
public List<ChargeToGLAccountMapper> fetchPenaltyToIncomeAccountMappingsForLoanProduct(final Long loanProductId);
|
||||
List<ChargeToGLAccountMapper> fetchPenaltyToIncomeAccountMappingsForLoanProduct(Long loanProductId);
|
||||
|
||||
public Map<String, Object> fetchAccountMappingDetailsForSavingsProduct(final Long savingsProductId, final Integer accountingType);
|
||||
Map<String, Object> fetchAccountMappingDetailsForSavingsProduct(Long savingsProductId, Integer accountingType);
|
||||
|
||||
public List<PaymentTypeToGLAccountMapper> fetchPaymentTypeToFundSourceMappingsForSavingsProduct(final Long savingsProductId);
|
||||
List<PaymentTypeToGLAccountMapper> fetchPaymentTypeToFundSourceMappingsForSavingsProduct(Long savingsProductId);
|
||||
|
||||
public List<ChargeToGLAccountMapper> fetchFeeToIncomeAccountMappingsForSavingsProduct(final Long savingsProductId);
|
||||
List<ChargeToGLAccountMapper> fetchFeeToIncomeAccountMappingsForSavingsProduct(Long savingsProductId);
|
||||
|
||||
public List<ChargeToGLAccountMapper> fetchPenaltyToIncomeAccountMappingsForSavingsProduct(final Long savingsProductId);
|
||||
List<ChargeToGLAccountMapper> fetchPenaltyToIncomeAccountMappingsForSavingsProduct(Long savingsProductId);
|
||||
|
||||
public Map<String, Object> fetchAccountMappingDetailsForShareProduct(final Long productId, final Integer accountingType);
|
||||
Map<String, Object> fetchAccountMappingDetailsForShareProduct(Long productId, Integer accountingType);
|
||||
|
||||
public List<PaymentTypeToGLAccountMapper> fetchPaymentTypeToFundSourceMappingsForShareProduct(final Long productId);
|
||||
List<PaymentTypeToGLAccountMapper> fetchPaymentTypeToFundSourceMappingsForShareProduct(Long productId);
|
||||
|
||||
public List<ChargeToGLAccountMapper> fetchFeeToIncomeAccountMappingsForShareProduct(final Long productId);
|
||||
List<ChargeToGLAccountMapper> fetchFeeToIncomeAccountMappingsForShareProduct(Long productId);
|
||||
|
||||
}
|
||||
|
||||
+6
-6
@@ -20,16 +20,16 @@ package org.apache.fineract.accounting.provisioning.constant;
|
||||
|
||||
public interface ProvisioningEntriesApiConstants {
|
||||
|
||||
public static final String JSON_DATE_PARAM = "date";
|
||||
String JSON_DATE_PARAM = "date";
|
||||
|
||||
public static final String JSON_DATEFORMAT_PARAM = "dateFormat";
|
||||
String JSON_DATEFORMAT_PARAM = "dateFormat";
|
||||
|
||||
public static final String JSON_LOCALE_PARAM = "locale";
|
||||
String JSON_LOCALE_PARAM = "locale";
|
||||
|
||||
public static final String JSON_CREATEJOURNALENTRIES_PARAM = "createjournalentries";
|
||||
String JSON_CREATEJOURNALENTRIES_PARAM = "createjournalentries";
|
||||
|
||||
public static final String PROVISIONINGENTRY_PARAM = "provisioningentry";
|
||||
String PROVISIONINGENTRY_PARAM = "provisioningentry";
|
||||
|
||||
public static final String ENTRIES_PARAM = "entries";
|
||||
String ENTRIES_PARAM = "entries";
|
||||
|
||||
}
|
||||
|
||||
+7
-7
@@ -27,17 +27,17 @@ import org.apache.fineract.infrastructure.core.service.SearchParameters;
|
||||
|
||||
public interface ProvisioningEntriesReadPlatformService {
|
||||
|
||||
public Collection<LoanProductProvisioningEntryData> retrieveLoanProductsProvisioningData(Date date);
|
||||
Collection<LoanProductProvisioningEntryData> retrieveLoanProductsProvisioningData(Date date);
|
||||
|
||||
public ProvisioningEntryData retrieveProvisioningEntryData(Long entryId);
|
||||
ProvisioningEntryData retrieveProvisioningEntryData(Long entryId);
|
||||
|
||||
public Page<ProvisioningEntryData> retrieveAllProvisioningEntries(Integer offset, Integer limit);
|
||||
Page<ProvisioningEntryData> retrieveAllProvisioningEntries(Integer offset, Integer limit);
|
||||
|
||||
public ProvisioningEntryData retrieveProvisioningEntryData(String date);
|
||||
ProvisioningEntryData retrieveProvisioningEntryData(String date);
|
||||
|
||||
public ProvisioningEntryData retrieveProvisioningEntryDataByCriteriaId(Long criteriaId);
|
||||
ProvisioningEntryData retrieveProvisioningEntryDataByCriteriaId(Long criteriaId);
|
||||
|
||||
public ProvisioningEntryData retrieveExistingProvisioningIdDateWithJournals();
|
||||
ProvisioningEntryData retrieveExistingProvisioningIdDateWithJournals();
|
||||
|
||||
public Page<LoanProductProvisioningEntryData> retrieveProvisioningEntries(SearchParameters searchParams);
|
||||
Page<LoanProductProvisioningEntryData> retrieveProvisioningEntries(SearchParameters searchParams);
|
||||
}
|
||||
|
||||
+1
-1
@@ -118,7 +118,7 @@ final class AccountingRuleApiResourceSwagger {
|
||||
|
||||
public static class PutAccountingRulesResponsechangesSwagger {
|
||||
|
||||
public PutAccountingRulesResponsechangesSwagger() {}
|
||||
PutAccountingRulesResponsechangesSwagger() {}
|
||||
|
||||
@Schema(example = "Employee Salary posting rule")
|
||||
public String name;
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ public enum AccountingRuleJsonInputParams {
|
||||
|
||||
private final String value;
|
||||
|
||||
private AccountingRuleJsonInputParams(final String value) {
|
||||
AccountingRuleJsonInputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
|
||||
public class AccountingRuleInvalidException extends AbstractPlatformDomainRuleException {
|
||||
|
||||
/*** enum of reasons for invalid Accounting Closure **/
|
||||
public static enum GlClosureInvalidReason {
|
||||
public enum GlClosureInvalidReason {
|
||||
|
||||
FUTURE_DATE, ACCOUNTING_CLOSED;
|
||||
|
||||
|
||||
+1
-1
@@ -64,7 +64,7 @@ public class AccountingRuleReadPlatformServiceImpl implements AccountingRuleRead
|
||||
private final GLAccountReadPlatformService glAccountReadPlatformService;
|
||||
private final boolean isAssociationParametersExists;
|
||||
|
||||
public AccountingRuleDataExtractor(final JdbcTemplate jdbcTemplate, final GLAccountReadPlatformService glAccountReadPlatformService,
|
||||
AccountingRuleDataExtractor(final JdbcTemplate jdbcTemplate, final GLAccountReadPlatformService glAccountReadPlatformService,
|
||||
final boolean isAssociationParametersExists) {
|
||||
this.jdbcTemplate = jdbcTemplate;
|
||||
this.glAccountReadPlatformService = glAccountReadPlatformService;
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public enum AdHocJsonInputParams {
|
||||
|
||||
private final String value;
|
||||
|
||||
private AdHocJsonInputParams(final String value) {
|
||||
AdHocJsonInputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ public enum ReportRunFrequency {
|
||||
private final long value;
|
||||
private final String code;
|
||||
|
||||
private ReportRunFrequency(final long value, final String code) {
|
||||
ReportRunFrequency(final long value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -40,5 +40,5 @@ public interface CommandStrategy {
|
||||
* @param uriInfo
|
||||
* @return BatchResponse
|
||||
*/
|
||||
public BatchResponse execute(BatchRequest batchRequest, UriInfo uriInfo);
|
||||
BatchResponse execute(BatchRequest batchRequest, UriInfo uriInfo);
|
||||
}
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ public enum CommandProcessingResultType {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private CommandProcessingResultType(final Integer value, final String code) {
|
||||
CommandProcessingResultType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -30,6 +30,6 @@ public interface CommandProcessingService {
|
||||
|
||||
CommandProcessingResult logCommand(CommandSource commandSourceResult);
|
||||
|
||||
boolean validateCommand(final CommandWrapper commandWrapper, final AppUser user);
|
||||
boolean validateCommand(CommandWrapper commandWrapper, AppUser user);
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ import org.springframework.data.repository.query.Param;
|
||||
public interface AccountNumberFormatRepository
|
||||
extends JpaRepository<AccountNumberFormat, Long>, JpaSpecificationExecutor<AccountNumberFormat> {
|
||||
|
||||
public static final String FIND_ACCOUNT_NUMBER_FORMAT_FOR_ENTITY = "select anf from AccountNumberFormat anf where anf.accountTypeEnum = :accountTypeEnum";
|
||||
String FIND_ACCOUNT_NUMBER_FORMAT_FOR_ENTITY = "select anf from AccountNumberFormat anf where anf.accountTypeEnum = :accountTypeEnum";
|
||||
|
||||
@Query(FIND_ACCOUNT_NUMBER_FORMAT_FOR_ENTITY)
|
||||
AccountNumberFormat findOneByAccountTypeEnum(@Param("accountTypeEnum") Integer accountTypeEnum);
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ public enum EntityAccountType {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private EntityAccountType(final Integer value, final String code) {
|
||||
EntityAccountType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ public class AccountNumberFormatReadPlatformServiceImpl implements AccountNumber
|
||||
|
||||
private final String schema;
|
||||
|
||||
public AccountNumberFormatMapper() {
|
||||
AccountNumberFormatMapper() {
|
||||
final StringBuilder builder = new StringBuilder(400);
|
||||
|
||||
builder.append(" anf.id as id, anf.account_type_enum as accountTypeEnum, anf.prefix_type_enum as prefixTypeEnum");
|
||||
|
||||
+1
-1
@@ -68,7 +68,7 @@ public enum GlobalEntityType {
|
||||
}
|
||||
}
|
||||
|
||||
private GlobalEntityType(final Integer value, final String code) {
|
||||
GlobalEntityType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ public enum ImportFormatType {
|
||||
|
||||
private final String format;
|
||||
|
||||
private ImportFormatType(String format) {
|
||||
ImportFormatType(String format) {
|
||||
this.format = format;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -23,5 +23,5 @@ import org.apache.poi.ss.usermodel.Workbook;
|
||||
|
||||
public interface ImportHandler {
|
||||
|
||||
public Count process(Workbook workbook, String locale, String dateFormat);
|
||||
Count process(Workbook workbook, String locale, String dateFormat);
|
||||
}
|
||||
|
||||
+1
-1
@@ -22,5 +22,5 @@ import javax.ws.rs.core.Response;
|
||||
|
||||
public interface BulkImportWorkbookPopulatorService {
|
||||
|
||||
public Response getTemplate(final String entityType, final Long officeId, final Long staffId, final String dateFormat);
|
||||
Response getTemplate(String entityType, Long officeId, Long staffId, String dateFormat);
|
||||
}
|
||||
|
||||
+5
-5
@@ -28,13 +28,13 @@ import org.apache.fineract.infrastructure.documentmanagement.data.DocumentData;
|
||||
|
||||
public interface BulkImportWorkbookService {
|
||||
|
||||
public Long importWorkbook(String entityType, InputStream inputStream, FormDataContentDisposition fileDetail, final String locale,
|
||||
final String dateFormat);
|
||||
Long importWorkbook(String entityType, InputStream inputStream, FormDataContentDisposition fileDetail, String locale,
|
||||
String dateFormat);
|
||||
|
||||
public Collection<ImportData> getImports(GlobalEntityType type);
|
||||
Collection<ImportData> getImports(GlobalEntityType type);
|
||||
|
||||
public DocumentData getOutputTemplateLocation(String importDocumentId);
|
||||
DocumentData getOutputTemplateLocation(String importDocumentId);
|
||||
|
||||
public Response getOutputTemplate(String importDocumentId);
|
||||
Response getOutputTemplate(String importDocumentId);
|
||||
|
||||
}
|
||||
|
||||
Vendored
+1
-1
@@ -47,7 +47,7 @@ public enum CacheType {
|
||||
return type;
|
||||
}
|
||||
|
||||
private CacheType(final Integer value, final String code) {
|
||||
CacheType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ public enum CampaignType {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private CampaignType(Integer value, String code) {
|
||||
CampaignType(Integer value, String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ public enum ScheduledEmailStretchyReportParamDateOption {
|
||||
* @param code
|
||||
* @param value
|
||||
*/
|
||||
private ScheduledEmailStretchyReportParamDateOption(final Integer id, final String code, final String value) {
|
||||
ScheduledEmailStretchyReportParamDateOption(final Integer id, final String code, final String value) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
this.id = id;
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ public class EmailConfigurationReadPlatformServiceImpl implements EmailConfigura
|
||||
|
||||
final String schema;
|
||||
|
||||
public EmailConfigurationRowMapper() {
|
||||
EmailConfigurationRowMapper() {
|
||||
final StringBuilder sql = new StringBuilder(300);
|
||||
sql.append("cnf.id as id, ");
|
||||
sql.append("cnf.name as name, ");
|
||||
|
||||
+3
-3
@@ -31,13 +31,13 @@ public interface EmailReadPlatformService {
|
||||
|
||||
EmailData retrieveOne(Long resourceId);
|
||||
|
||||
Collection<EmailData> retrieveAllPending(final SearchParameters searchParameters);
|
||||
Collection<EmailData> retrieveAllPending(SearchParameters searchParameters);
|
||||
|
||||
Collection<EmailData> retrieveAllSent(final SearchParameters searchParameters);
|
||||
Collection<EmailData> retrieveAllSent(SearchParameters searchParameters);
|
||||
|
||||
Collection<EmailData> retrieveAllDelivered(Integer limit);
|
||||
|
||||
Collection<EmailData> retrieveAllFailed(final SearchParameters searchParameters);
|
||||
Collection<EmailData> retrieveAllFailed(SearchParameters searchParameters);
|
||||
|
||||
Page<EmailData> retrieveEmailByStatus(Integer limit, Integer status, Date dateFrom, Date dateTo);
|
||||
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@ public class EmailReadPlatformServiceImpl implements EmailReadPlatformService {
|
||||
|
||||
final String schema;
|
||||
|
||||
public EmailMapper() {
|
||||
EmailMapper() {
|
||||
final StringBuilder sql = new StringBuilder(300);
|
||||
sql.append(" emo.id as id, ");
|
||||
sql.append("emo.group_id as groupId, ");
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ public enum SmsCampaignStatus {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private SmsCampaignStatus(Integer value, String code) {
|
||||
SmsCampaignStatus(Integer value, String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ public enum SmsCampaignTriggerType {
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
private SmsCampaignTriggerType(Integer value, String code) {
|
||||
SmsCampaignTriggerType(Integer value, String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+5
-7
@@ -27,16 +27,14 @@ import org.springframework.data.repository.query.Param;
|
||||
|
||||
public interface SmsCampaignRepository extends JpaRepository<SmsCampaign, Long>, JpaSpecificationExecutor<SmsCampaign> {
|
||||
|
||||
List<SmsCampaign> findByCampaignType(final Integer campaignType);
|
||||
List<SmsCampaign> findByCampaignType(Integer campaignType);
|
||||
|
||||
Collection<SmsCampaign> findByCampaignTypeAndTriggerTypeAndStatus(final Integer campaignType, final Integer triggerType,
|
||||
final Integer status);
|
||||
Collection<SmsCampaign> findByCampaignTypeAndTriggerTypeAndStatus(Integer campaignType, Integer triggerType, Integer status);
|
||||
|
||||
Collection<SmsCampaign> findByTriggerTypeAndStatus(final Integer triggerType, final Integer status);
|
||||
Collection<SmsCampaign> findByTriggerTypeAndStatus(Integer triggerType, Integer status);
|
||||
|
||||
Collection<SmsCampaign> findByTriggerType(final Integer triggerType);
|
||||
Collection<SmsCampaign> findByTriggerType(Integer triggerType);
|
||||
|
||||
@Query("SELECT campaign FROM SmsCampaign campaign WHERE campaign.paramValue LIKE :reportPattern AND campaign.triggerType=:triggerType AND campaign.status=300")
|
||||
List<SmsCampaign> findActiveSmsCampaigns(@Param("reportPattern") final String reportPattern,
|
||||
@Param("triggerType") final Integer triggerType);
|
||||
List<SmsCampaign> findActiveSmsCampaigns(@Param("reportPattern") String reportPattern, @Param("triggerType") Integer triggerType);
|
||||
}
|
||||
|
||||
+1
-1
@@ -478,7 +478,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
|
||||
|
||||
final boolean isDeposit;
|
||||
|
||||
public SavingsAccountTransactionListener(final boolean isDeposit) {
|
||||
SavingsAccountTransactionListener(final boolean isDeposit) {
|
||||
this.isDeposit = isDeposit;
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -25,11 +25,11 @@ import org.apache.fineract.infrastructure.core.service.SearchParameters;
|
||||
|
||||
public interface SmsCampaignReadPlatformService {
|
||||
|
||||
public SmsCampaignData retrieveOne(final Long campaignId);
|
||||
SmsCampaignData retrieveOne(Long campaignId);
|
||||
|
||||
public Page<SmsCampaignData> retrieveAll(final SearchParameters searchParameters);
|
||||
Page<SmsCampaignData> retrieveAll(SearchParameters searchParameters);
|
||||
|
||||
public SmsCampaignData retrieveTemplate(final String reportType);
|
||||
SmsCampaignData retrieveTemplate(String reportType);
|
||||
|
||||
Collection<SmsCampaignData> retrieveAllScheduleActiveCampaign();
|
||||
|
||||
|
||||
+3
-3
@@ -49,10 +49,10 @@ public interface SmsCampaignWritePlatformService {
|
||||
|
||||
CampaignPreviewData previewMessage(JsonQuery query);
|
||||
|
||||
public void storeTemplateMessageIntoSmsOutBoundTable() throws JobExecutionException;
|
||||
void storeTemplateMessageIntoSmsOutBoundTable() throws JobExecutionException;
|
||||
|
||||
public void insertDirectCampaignIntoSmsOutboundTable(final Client client, final SmsCampaign smsCampaign);
|
||||
void insertDirectCampaignIntoSmsOutboundTable(Client client, SmsCampaign smsCampaign);
|
||||
|
||||
public void insertDirectCampaignIntoSmsOutboundTable(final SavingsAccount savingsAccount, final SmsCampaign smsCampaign);
|
||||
void insertDirectCampaignIntoSmsOutboundTable(SavingsAccount savingsAccount, SmsCampaign smsCampaign);
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -26,14 +26,14 @@ public class CodeConstants {
|
||||
/***
|
||||
* Enum of all parameters passed in while creating/updating a code and code value
|
||||
***/
|
||||
public static enum CodevalueJSONinputParams {
|
||||
public enum CodevalueJSONinputParams {
|
||||
|
||||
CODEVALUE_ID("id"), NAME("name"), POSITION("position"), DESCRIPTION("description"), IS_ACTIVE("isActive"), IS_MANDATORY(
|
||||
"isMandatory");
|
||||
|
||||
private final String value;
|
||||
|
||||
private CodevalueJSONinputParams(final String value) {
|
||||
CodevalueJSONinputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -40,9 +40,9 @@ import org.apache.fineract.infrastructure.codes.data.CodeValueData;
|
||||
*/
|
||||
public interface CodeValueReadPlatformService {
|
||||
|
||||
Collection<CodeValueData> retrieveCodeValuesByCode(final String code);
|
||||
Collection<CodeValueData> retrieveCodeValuesByCode(String code);
|
||||
|
||||
Collection<CodeValueData> retrieveAllCodeValues(final Long codeId);
|
||||
Collection<CodeValueData> retrieveAllCodeValues(Long codeId);
|
||||
|
||||
CodeValueData retrieveCodeValue(final Long codeValueId);
|
||||
CodeValueData retrieveCodeValue(Long codeValueId);
|
||||
}
|
||||
|
||||
+2
-2
@@ -55,9 +55,9 @@ public interface ConfigurationDomainService {
|
||||
|
||||
Integer retrieveFinancialYearBeginningMonth();
|
||||
|
||||
public Integer retrieveMinAllowedClientsInGroup();
|
||||
Integer retrieveMinAllowedClientsInGroup();
|
||||
|
||||
public Integer retrieveMaxAllowedClientsInGroup();
|
||||
Integer retrieveMaxAllowedClientsInGroup();
|
||||
|
||||
boolean isMeetingMandatoryForJLGLoans();
|
||||
|
||||
|
||||
+10
-10
@@ -52,13 +52,13 @@ public final class ExternalServicesConstants {
|
||||
public static final String NOTIFICATION_GCM_END_POINT = "gcm_end_point";
|
||||
public static final String NOTIFICATION_FCM_END_POINT = "fcm_end_point";
|
||||
|
||||
public static enum ExternalservicePropertiesJSONinputParams {
|
||||
public enum ExternalservicePropertiesJSONinputParams {
|
||||
|
||||
EXTERNAL_SERVICE_ID("external_service_id"), NAME("name"), VALUE("value");
|
||||
|
||||
private final String value;
|
||||
|
||||
private ExternalservicePropertiesJSONinputParams(final String value) {
|
||||
ExternalservicePropertiesJSONinputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -84,14 +84,14 @@ public final class ExternalServicesConstants {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum SMTPJSONinputParams {
|
||||
public enum SMTPJSONinputParams {
|
||||
|
||||
USERNAME("username"), PASSWORD("password"), HOST("host"), PORT("port"), USETLS("useTLS"), FROM_EMAIL("fromEmail"), FROM_NAME(
|
||||
"fromName");
|
||||
|
||||
private final String value;
|
||||
|
||||
private SMTPJSONinputParams(final String value) {
|
||||
SMTPJSONinputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -117,13 +117,13 @@ public final class ExternalServicesConstants {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum SMSJSONinputParams {
|
||||
public enum SMSJSONinputParams {
|
||||
|
||||
HASTNAME("host_name"), PORT("port_number"), END_POINT("end_point"), TENANT_APP_KEY("tenant_app_key");
|
||||
|
||||
private final String value;
|
||||
|
||||
private SMSJSONinputParams(final String value) {
|
||||
SMSJSONinputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -149,13 +149,13 @@ public final class ExternalServicesConstants {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum S3JSONinputParams {
|
||||
public enum S3JSONinputParams {
|
||||
|
||||
S3_ACCESS_KEY("s3_access_key"), S3_BUCKET_NAME("s3_bucket_name"), S3_SECRET_KEY("s3_secret_key");
|
||||
|
||||
private final String value;
|
||||
|
||||
private S3JSONinputParams(final String value) {
|
||||
S3JSONinputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -181,13 +181,13 @@ public final class ExternalServicesConstants {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum NotificationJSONinputParams {
|
||||
public enum NotificationJSONinputParams {
|
||||
|
||||
SERVER_KEY("server_key"), GCM_END_POINT("gcm_end_point"), FCM_END_POINT("fcm_end_point");
|
||||
|
||||
private final String value;
|
||||
|
||||
private NotificationJSONinputParams(final String value) {
|
||||
NotificationJSONinputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -24,5 +24,5 @@ package org.apache.fineract.infrastructure.core.serialization;
|
||||
public abstract class AbstractFromApiJsonDeserializer<T> implements FromApiJsonDeserializer<T> {
|
||||
|
||||
@Override
|
||||
public abstract T commandFromApiJson(final String json);
|
||||
public abstract T commandFromApiJson(String json);
|
||||
}
|
||||
|
||||
+1
-1
@@ -23,5 +23,5 @@ package org.apache.fineract.infrastructure.core.serialization;
|
||||
*/
|
||||
public interface FromApiJsonDeserializer<T> {
|
||||
|
||||
T commandFromApiJson(final String json);
|
||||
T commandFromApiJson(String json);
|
||||
}
|
||||
|
||||
+3
-3
@@ -23,9 +23,9 @@ package org.apache.fineract.infrastructure.core.serialization;
|
||||
*/
|
||||
public interface FromCommandJsonDeserializer<T> {
|
||||
|
||||
T commandFromCommandJson(final String json);
|
||||
T commandFromCommandJson(String json);
|
||||
|
||||
T commandFromCommandJson(final Long resourceId, final String json);
|
||||
T commandFromCommandJson(Long resourceId, String json);
|
||||
|
||||
T commandFromCommandJson(final Long resourceId, final String json, final boolean makerCheckerApproval);
|
||||
T commandFromCommandJson(Long resourceId, String json, boolean makerCheckerApproval);
|
||||
}
|
||||
|
||||
+1
-1
@@ -176,7 +176,7 @@ public final class SearchParameters {
|
||||
loanId, savingsId, orphansOnly, isSelfUser);
|
||||
}
|
||||
|
||||
public static final SearchParameters forProvisioningEntries(final Long provisioningEntryId, final Long officeId, final Long productId,
|
||||
public static SearchParameters forProvisioningEntries(final Long provisioningEntryId, final Long officeId, final Long productId,
|
||||
final Long categoryId, final Integer offset, final Integer limit) {
|
||||
return new SearchParameters(provisioningEntryId, officeId, productId, categoryId, offset, limit);
|
||||
}
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ public enum EntityTables {
|
||||
|
||||
private final String foreignKeyColumnNameOnDatatable;
|
||||
|
||||
private EntityTables(String name, ImmutableList<Integer> codes, String foreignKeyColumnNameOnDatatable) {
|
||||
EntityTables(String name, ImmutableList<Integer> codes, String foreignKeyColumnNameOnDatatable) {
|
||||
this.name = name;
|
||||
this.codes = codes;
|
||||
this.foreignKeyColumnNameOnDatatable = foreignKeyColumnNameOnDatatable;
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ public enum StatusEnum {
|
||||
return code;
|
||||
}
|
||||
|
||||
private StatusEnum(String name, Integer code) {
|
||||
StatusEnum(String name, Integer code) {
|
||||
|
||||
this.name = name;
|
||||
this.code = code;
|
||||
|
||||
+5
-5
@@ -27,23 +27,23 @@ import org.springframework.data.repository.query.Param;
|
||||
public interface EntityDatatableChecksRepository
|
||||
extends JpaRepository<EntityDatatableChecks, Long>, JpaSpecificationExecutor<EntityDatatableChecks> {
|
||||
|
||||
public List<EntityDatatableChecks> findByEntityAndStatus(String entityName, Long status);
|
||||
List<EntityDatatableChecks> findByEntityAndStatus(String entityName, Long status);
|
||||
|
||||
@Query("select t from EntityDatatableChecks t WHERE t.status =:status and t.entity=:entity and t.productId = :productId ")
|
||||
public List<EntityDatatableChecks> findByEntityStatusAndProduct(@Param("entity") String entity, @Param("status") Long status,
|
||||
List<EntityDatatableChecks> findByEntityStatusAndProduct(@Param("entity") String entity, @Param("status") Long status,
|
||||
@Param("productId") Long productId);
|
||||
|
||||
@Query("select t from EntityDatatableChecks t WHERE t.status =:status and t.entity=:entity and t.productId IS NULL ")
|
||||
public List<EntityDatatableChecks> findByEntityStatusAndNoProduct(@Param("entity") String entity, @Param("status") Long status);
|
||||
List<EntityDatatableChecks> findByEntityStatusAndNoProduct(@Param("entity") String entity, @Param("status") Long status);
|
||||
|
||||
@Query("select t from EntityDatatableChecks t WHERE t.status =:status "
|
||||
+ "and t.entity=:entity and t.datatableName = :datatableName AND t.productId = :productId")
|
||||
public List<EntityDatatableChecks> findByEntityStatusAndDatatableIdAndProductId(@Param("entity") String entityName,
|
||||
List<EntityDatatableChecks> findByEntityStatusAndDatatableIdAndProductId(@Param("entity") String entityName,
|
||||
@Param("status") Long status, @Param("datatableName") String datatableName, @Param("productId") Long productId);
|
||||
|
||||
@Query("select t from EntityDatatableChecks t WHERE t.status =:status and t.entity=:entity "
|
||||
+ " and t.datatableName = :datatableName AND t.productId IS NULL")
|
||||
public List<EntityDatatableChecks> findByEntityStatusAndDatatableIdAndNoProduct(@Param("entity") String entityName,
|
||||
List<EntityDatatableChecks> findByEntityStatusAndDatatableIdAndNoProduct(@Param("entity") String entityName,
|
||||
@Param("status") Long status, @Param("datatableName") String datatableName);
|
||||
|
||||
}
|
||||
|
||||
+3
-4
@@ -26,12 +26,11 @@ public interface EntityDatatableChecksWritePlatformService {
|
||||
|
||||
CommandProcessingResult createCheck(JsonCommand command);
|
||||
|
||||
CommandProcessingResult deleteCheck(final Long entityDatatableCheckId);
|
||||
CommandProcessingResult deleteCheck(Long entityDatatableCheckId);
|
||||
|
||||
void runTheCheck(final Long entityId, final String entityName, final Long statusCode, String foreignKeyColumn);
|
||||
void runTheCheck(Long entityId, String entityName, Long statusCode, String foreignKeyColumn);
|
||||
|
||||
void runTheCheckForProduct(final Long entityId, final String entityName, final Long statusCode, String foreignKeyColumn,
|
||||
long productLoanId);
|
||||
void runTheCheckForProduct(Long entityId, String entityName, Long statusCode, String foreignKeyColumn, long productLoanId);
|
||||
|
||||
boolean saveDatatables(Long status, String entity, Long entityId, Long productId, JsonArray data);
|
||||
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ import org.apache.fineract.infrastructure.dataqueries.data.ResultsetColumnHeader
|
||||
|
||||
public interface GenericDataService {
|
||||
|
||||
GenericResultsetData fillGenericResultSet(final String sql);
|
||||
GenericResultsetData fillGenericResultSet(String sql);
|
||||
|
||||
String generateJsonFromGenericResultsetData(GenericResultsetData grs);
|
||||
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ public interface ReadReportingService {
|
||||
|
||||
Collection<ReportParameterData> getAllowedParameters();
|
||||
|
||||
ReportData retrieveReport(final Long id);
|
||||
ReportData retrieveReport(Long id);
|
||||
|
||||
Collection<String> getAllowedReportTypes();
|
||||
|
||||
|
||||
+11
-11
@@ -28,28 +28,28 @@ import org.apache.fineract.infrastructure.documentmanagement.domain.StorageType;
|
||||
|
||||
public interface ContentRepository {
|
||||
|
||||
public StorageType type = null;
|
||||
StorageType type = null;
|
||||
|
||||
// TODO:Vishwas Need to move these settings to the Database
|
||||
public static final Integer MAX_FILE_UPLOAD_SIZE_IN_MB = 5;
|
||||
Integer MAX_FILE_UPLOAD_SIZE_IN_MB = 5;
|
||||
|
||||
// TODO:Vishwas Need to move these settings to the Database
|
||||
public static final Integer MAX_IMAGE_UPLOAD_SIZE_IN_MB = 1;
|
||||
Integer MAX_IMAGE_UPLOAD_SIZE_IN_MB = 1;
|
||||
|
||||
public abstract String saveFile(InputStream uploadedInputStream, DocumentCommand documentCommand);
|
||||
String saveFile(InputStream uploadedInputStream, DocumentCommand documentCommand);
|
||||
|
||||
public abstract void deleteFile(String fileName, String documentPath);
|
||||
void deleteFile(String fileName, String documentPath);
|
||||
|
||||
public abstract FileData fetchFile(DocumentData documentData);
|
||||
FileData fetchFile(DocumentData documentData);
|
||||
|
||||
public abstract String saveImage(InputStream uploadedInputStream, Long resourceId, String imageName, Long fileSize);
|
||||
String saveImage(InputStream uploadedInputStream, Long resourceId, String imageName, Long fileSize);
|
||||
|
||||
public abstract String saveImage(Base64EncodedImage base64EncodedImage, Long resourceId, String imageName);
|
||||
String saveImage(Base64EncodedImage base64EncodedImage, Long resourceId, String imageName);
|
||||
|
||||
public abstract void deleteImage(final Long resourceId, final String location);
|
||||
void deleteImage(Long resourceId, String location);
|
||||
|
||||
public abstract ImageData fetchImage(ImageData imageData);
|
||||
ImageData fetchImage(ImageData imageData);
|
||||
|
||||
public abstract StorageType getStorageType();
|
||||
StorageType getStorageType();
|
||||
|
||||
}
|
||||
|
||||
+6
-6
@@ -37,13 +37,13 @@ public final class ContentRepositoryUtils {
|
||||
|
||||
private static final Random random = new Random();
|
||||
|
||||
public static enum ImageMIMEtype {
|
||||
public enum ImageMIMEtype {
|
||||
|
||||
GIF("image/gif"), JPEG("image/jpeg"), PNG("image/png");
|
||||
|
||||
private final String value;
|
||||
|
||||
private ImageMIMEtype(final String value) {
|
||||
ImageMIMEtype(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -67,13 +67,13 @@ public final class ContentRepositoryUtils {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum ImageFileExtension {
|
||||
public enum ImageFileExtension {
|
||||
|
||||
GIF(".gif"), JPEG(".jpeg"), JPG(".jpg"), PNG(".png");
|
||||
|
||||
private final String value;
|
||||
|
||||
private ImageFileExtension(final String value) {
|
||||
ImageFileExtension(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@@ -99,14 +99,14 @@ public final class ContentRepositoryUtils {
|
||||
}
|
||||
}
|
||||
|
||||
public static enum ImageDataURIsuffix {
|
||||
public enum ImageDataURIsuffix {
|
||||
|
||||
GIF("data:" + ImageMIMEtype.GIF.getValue() + ";base64,"), JPEG("data:" + ImageMIMEtype.JPEG.getValue() + ";base64,"), PNG(
|
||||
"data:" + ImageMIMEtype.PNG.getValue() + ";base64,");
|
||||
|
||||
private final String value;
|
||||
|
||||
private ImageDataURIsuffix(final String value) {
|
||||
ImageDataURIsuffix(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -103,7 +103,7 @@ public class DocumentReadPlatformServiceImpl implements DocumentReadPlatformServ
|
||||
private final boolean hideLocation;
|
||||
private final boolean hideStorageType;
|
||||
|
||||
public DocumentMapper(final boolean hideLocation, final boolean hideStorageType) {
|
||||
DocumentMapper(final boolean hideLocation, final boolean hideStorageType) {
|
||||
this.hideLocation = hideLocation;
|
||||
this.hideStorageType = hideStorageType;
|
||||
}
|
||||
|
||||
+1
-1
@@ -177,7 +177,7 @@ public class DocumentWritePlatformServiceJpaRepositoryImpl implements DocumentWr
|
||||
}
|
||||
|
||||
/*** Entities for document Management **/
|
||||
public static enum DocumentManagementEntity {
|
||||
public enum DocumentManagementEntity {
|
||||
|
||||
CLIENTS, CLIENT_IDENTIFIERS, STAFF, LOANS, SAVINGS, GROUPS, IMPORT;
|
||||
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@ public class ImageReadPlatformServiceImpl implements ImageReadPlatformService {
|
||||
|
||||
private final String entityDisplayName;
|
||||
|
||||
public ImageMapper(final String entityDisplayName) {
|
||||
ImageMapper(final String entityDisplayName) {
|
||||
this.entityDisplayName = entityDisplayName;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -31,14 +31,14 @@ public final class FineractEntityAccessConstants {
|
||||
/***
|
||||
* Enum of all parameters passed in while creating/updating an entity access
|
||||
***/
|
||||
public static enum EntityAccessJSONinputParams {
|
||||
public enum EntityAccessJSONinputParams {
|
||||
|
||||
ENTITY_TYPE("entityType"), ENTITY_ID("entityId"), ENTITY_ACCESS_TYPE_ID("entityAccessTypeId"), SECOND_ENTITY_TYPE(
|
||||
"secondEntityType"), SECOND_ENTITY_ID("secondEntityId");
|
||||
|
||||
private final String value;
|
||||
|
||||
private EntityAccessJSONinputParams(final String value) {
|
||||
EntityAccessJSONinputParams(final String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -25,10 +25,10 @@ import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityType
|
||||
|
||||
public interface FineractEntityAccessReadService {
|
||||
|
||||
Collection<FineractEntityToEntityMappingData> retrieveEntityAccessFor(FineractEntityType firstEntityType, final Long relId,
|
||||
final Long fromEntityId, boolean includeAllSubOffices);
|
||||
Collection<FineractEntityToEntityMappingData> retrieveEntityAccessFor(FineractEntityType firstEntityType, Long relId, Long fromEntityId,
|
||||
boolean includeAllSubOffices);
|
||||
|
||||
String getSQLQueryInClause_WithListOfIDsForEntityAccess(FineractEntityType firstEntityType, final Long relId, final Long fromEntityId,
|
||||
String getSQLQueryInClause_WithListOfIDsForEntityAccess(FineractEntityType firstEntityType, Long relId, Long fromEntityId,
|
||||
boolean includeAllOffices);
|
||||
|
||||
String getSQLQueryInClauseIDList_ForLoanProductsForOffice(Long loanProductId, boolean includeAllOffices);
|
||||
|
||||
+2
-2
@@ -221,7 +221,7 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess
|
||||
|
||||
private final String schema;
|
||||
|
||||
public GetOneEntityMapper() {
|
||||
GetOneEntityMapper() {
|
||||
|
||||
StringBuilder str = new StringBuilder("select eem.rel_id as relId, ");
|
||||
str.append("eem.from_id as fromId,eem.to_Id as toId,eem.start_date as startDate,eem.end_date as endDate ");
|
||||
@@ -252,7 +252,7 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess
|
||||
|
||||
private final String schema;
|
||||
|
||||
public EntityToEntityMapper() {
|
||||
EntityToEntityMapper() {
|
||||
|
||||
StringBuilder str = new StringBuilder("select eem.id as mapId, ");
|
||||
str.append("eem.rel_id as relId, ");
|
||||
|
||||
+8
-9
@@ -24,21 +24,20 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
|
||||
public interface FineractEntityAccessWriteService {
|
||||
|
||||
CommandProcessingResult createEntityAccess(final JsonCommand command);
|
||||
CommandProcessingResult createEntityAccess(JsonCommand command);
|
||||
|
||||
CommandProcessingResult createEntityToEntityMapping(final Long relId, final JsonCommand command);
|
||||
CommandProcessingResult createEntityToEntityMapping(Long relId, JsonCommand command);
|
||||
|
||||
CommandProcessingResult updateEntityToEntityMapping(final Long mapId, final JsonCommand command);
|
||||
CommandProcessingResult updateEntityToEntityMapping(Long mapId, JsonCommand command);
|
||||
|
||||
CommandProcessingResult deleteEntityToEntityMapping(final Long mapId);
|
||||
CommandProcessingResult deleteEntityToEntityMapping(Long mapId);
|
||||
|
||||
void addNewEntityAccess(final String entityType, final Long entityId, final CodeValue accessType, final String secondEntityType,
|
||||
final Long secondEntityId);
|
||||
void addNewEntityAccess(String entityType, Long entityId, CodeValue accessType, String secondEntityType, Long secondEntityId);
|
||||
|
||||
/*
|
||||
* CommandProcessingResult updateEntityAccess ( final Long entityAccessId, final JsonCommand command);
|
||||
* CommandProcessingResult updateEntityAccess ( Long entityAccessId, JsonCommand command);
|
||||
*
|
||||
* CommandProcessingResult removeEntityAccess ( final String entityType, final Long entityId, final Long accessType,
|
||||
* final String secondEntityType, final Long secondEntityId);
|
||||
* CommandProcessingResult removeEntityAccess ( String entityType, Long entityId, Long accessType, String
|
||||
* secondEntityType, Long secondEntityId);
|
||||
*/
|
||||
}
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ import org.springframework.data.repository.query.Param;
|
||||
public interface DeviceRegistrationRepository
|
||||
extends JpaRepository<DeviceRegistration, Long>, JpaSpecificationExecutor<DeviceRegistration> {
|
||||
|
||||
public static final String FIND_DEVICE_REGISTRATION_BY_CLIENT = "select dr from DeviceRegistration dr where dr.client.id =:clientId ";
|
||||
String FIND_DEVICE_REGISTRATION_BY_CLIENT = "select dr from DeviceRegistration dr where dr.client.id =:clientId ";
|
||||
|
||||
@Query(FIND_DEVICE_REGISTRATION_BY_CLIENT)
|
||||
DeviceRegistration findDeviceRegistrationByClientId(@Param("clientId") Long clientId);
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ public class DeviceRegistrationReadPlatformServiceImpl implements DeviceRegistra
|
||||
|
||||
private final String schema;
|
||||
|
||||
public DeviceRegistrationDataMapper() {
|
||||
DeviceRegistrationDataMapper() {
|
||||
final StringBuilder sqlBuilder = new StringBuilder(200);
|
||||
sqlBuilder.append(" cdr.id as id, cdr.registration_id as registrationId, cdr.updatedon_date as updatedOnDate, ");
|
||||
sqlBuilder.append(" c.id as clientId, c.display_name as clientName ");
|
||||
|
||||
+3
-3
@@ -22,9 +22,9 @@ import org.apache.fineract.infrastructure.gcm.domain.DeviceRegistration;
|
||||
|
||||
public interface DeviceRegistrationWritePlatformService {
|
||||
|
||||
public DeviceRegistration registerDevice(final Long clientId, final String registrationId);
|
||||
DeviceRegistration registerDevice(Long clientId, String registrationId);
|
||||
|
||||
public DeviceRegistration updateDeviceRegistration(final Long id, final Long clientId, final String registrationId);
|
||||
DeviceRegistration updateDeviceRegistration(Long id, Long clientId, String registrationId);
|
||||
|
||||
public void deleteDeviceRegistration(final Long id);
|
||||
void deleteDeviceRegistration(Long id);
|
||||
}
|
||||
|
||||
+5
-5
@@ -32,11 +32,11 @@ import retrofit.http.POST;
|
||||
|
||||
public interface WebHookService {
|
||||
|
||||
static final String ENTITY_HEADER = "X-Fineract-Entity";
|
||||
static final String ACTION_HEADER = "X-Fineract-Action";
|
||||
static final String TENANT_HEADER = "Fineract-Platform-TenantId";
|
||||
static final String ENDPOINT_HEADER = "X-Fineract-Endpoint";
|
||||
static final String API_KEY_HEADER = "X-Fineract-API-Key";
|
||||
String ENTITY_HEADER = "X-Fineract-Entity";
|
||||
String ACTION_HEADER = "X-Fineract-Action";
|
||||
String TENANT_HEADER = "Fineract-Platform-TenantId";
|
||||
String ENDPOINT_HEADER = "X-Fineract-Endpoint";
|
||||
String API_KEY_HEADER = "X-Fineract-API-Key";
|
||||
|
||||
// Ping
|
||||
@GET("/")
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ public interface HookReadPlatformService {
|
||||
|
||||
HookData retrieveHook(Long hookId);
|
||||
|
||||
List<Hook> retrieveHooksByEvent(final String entityName, final String actionName);
|
||||
List<Hook> retrieveHooksByEvent(String entityName, String actionName);
|
||||
|
||||
HookData retrieveNewHookDetails(String templateName);
|
||||
}
|
||||
|
||||
+2
-2
@@ -119,7 +119,7 @@ public class HookReadPlatformServiceImpl implements HookReadPlatformService {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
|
||||
public HookMapper(final JdbcTemplate jdbcTemplate) {
|
||||
HookMapper(final JdbcTemplate jdbcTemplate) {
|
||||
this.jdbcTemplate = jdbcTemplate;
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ public class HookReadPlatformServiceImpl implements HookReadPlatformService {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
|
||||
public TemplateMapper(final JdbcTemplate jdbcTemplate) {
|
||||
TemplateMapper(final JdbcTemplate jdbcTemplate) {
|
||||
this.jdbcTemplate = jdbcTemplate;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ public enum JobName {
|
||||
|
||||
private final String name;
|
||||
|
||||
private JobName(final String name) {
|
||||
JobName(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
+7
-7
@@ -20,18 +20,18 @@ package org.apache.fineract.infrastructure.jobs.service;
|
||||
|
||||
public interface JobRegisterService {
|
||||
|
||||
public void executeJob(Long jobId);
|
||||
void executeJob(Long jobId);
|
||||
|
||||
public void rescheduleJob(Long jobId);
|
||||
void rescheduleJob(Long jobId);
|
||||
|
||||
public void pauseScheduler();
|
||||
void pauseScheduler();
|
||||
|
||||
public void startScheduler();
|
||||
void startScheduler();
|
||||
|
||||
public boolean isSchedulerRunning();
|
||||
boolean isSchedulerRunning();
|
||||
|
||||
public void stopScheduler(String name);
|
||||
void stopScheduler(String name);
|
||||
|
||||
public void stopAllSchedulers();
|
||||
void stopAllSchedulers();
|
||||
|
||||
}
|
||||
|
||||
+10
-10
@@ -27,24 +27,24 @@ import org.apache.fineract.infrastructure.jobs.domain.SchedulerDetail;
|
||||
|
||||
public interface SchedularWritePlatformService {
|
||||
|
||||
public List<ScheduledJobDetail> retrieveAllJobs();
|
||||
List<ScheduledJobDetail> retrieveAllJobs();
|
||||
|
||||
public ScheduledJobDetail findByJobKey(String triggerKey);
|
||||
ScheduledJobDetail findByJobKey(String triggerKey);
|
||||
|
||||
public void saveOrUpdate(ScheduledJobDetail scheduledJobDetails);
|
||||
void saveOrUpdate(ScheduledJobDetail scheduledJobDetails);
|
||||
|
||||
public void saveOrUpdate(ScheduledJobDetail scheduledJobDetails, ScheduledJobRunHistory scheduledJobRunHistory);
|
||||
void saveOrUpdate(ScheduledJobDetail scheduledJobDetails, ScheduledJobRunHistory scheduledJobRunHistory);
|
||||
|
||||
public Long fetchMaxVersionBy(String triggerKey);
|
||||
Long fetchMaxVersionBy(String triggerKey);
|
||||
|
||||
public ScheduledJobDetail findByJobId(Long jobId);
|
||||
ScheduledJobDetail findByJobId(Long jobId);
|
||||
|
||||
public CommandProcessingResult updateJobDetail(Long jobId, JsonCommand command);
|
||||
CommandProcessingResult updateJobDetail(Long jobId, JsonCommand command);
|
||||
|
||||
public SchedulerDetail retriveSchedulerDetail();
|
||||
SchedulerDetail retriveSchedulerDetail();
|
||||
|
||||
public void updateSchedulerDetail(final SchedulerDetail schedulerDetail);
|
||||
void updateSchedulerDetail(SchedulerDetail schedulerDetail);
|
||||
|
||||
public boolean processJobDetailForExecution(String jobKey, String triggerType);
|
||||
boolean processJobDetailForExecution(String jobKey, String triggerType);
|
||||
|
||||
}
|
||||
|
||||
+17
-17
@@ -20,22 +20,22 @@ package org.apache.fineract.infrastructure.jobs.service;
|
||||
|
||||
public interface SchedulerServiceConstants {
|
||||
|
||||
public static final String JOB_KEY_SEPERATOR = " _ ";
|
||||
public static final String TRIGGER_TYPE_CRON = "cron";
|
||||
public static final String TRIGGER_TYPE_APPLICATION = "application";
|
||||
public static final String TRIGGER_TYPE_REFERENCE = "TRIGGER_TYPE_REFERENCE";
|
||||
public static final String SCHEDULER_EXCEPTION = "SchedulerException";
|
||||
public static final String JOB_EXECUTION_EXCEPTION = "JobExecutionException";
|
||||
public static final String JOB_METHOD_INVOCATION_FAILED_EXCEPTION = "JobMethodInvocationFailedException";
|
||||
public static final String STATUS_SUCCESS = "success";
|
||||
public static final String STATUS_FAILED = "failed";
|
||||
public static final String DEFAULT_LISTENER_NAME = "Global Listner";
|
||||
public static final int STACK_TRACE_LEVEL = 7;
|
||||
public static final String TENANT_IDENTIFIER = "tenantIdentifier";
|
||||
public static final String SCHEDULER = "Scheduler";
|
||||
public static final String SCHEDULER_GROUP = "group";
|
||||
public static final int DEFAULT_THREAD_COUNT = 7;
|
||||
public static final int GROUP_THREAD_COUNT = 1;
|
||||
public static final String SCHEDULER_NAME = "schedulerName";
|
||||
String JOB_KEY_SEPERATOR = " _ ";
|
||||
String TRIGGER_TYPE_CRON = "cron";
|
||||
String TRIGGER_TYPE_APPLICATION = "application";
|
||||
String TRIGGER_TYPE_REFERENCE = "TRIGGER_TYPE_REFERENCE";
|
||||
String SCHEDULER_EXCEPTION = "SchedulerException";
|
||||
String JOB_EXECUTION_EXCEPTION = "JobExecutionException";
|
||||
String JOB_METHOD_INVOCATION_FAILED_EXCEPTION = "JobMethodInvocationFailedException";
|
||||
String STATUS_SUCCESS = "success";
|
||||
String STATUS_FAILED = "failed";
|
||||
String DEFAULT_LISTENER_NAME = "Global Listner";
|
||||
int STACK_TRACE_LEVEL = 7;
|
||||
String TENANT_IDENTIFIER = "tenantIdentifier";
|
||||
String SCHEDULER = "Scheduler";
|
||||
String SCHEDULER_GROUP = "group";
|
||||
int DEFAULT_THREAD_COUNT = 7;
|
||||
int GROUP_THREAD_COUNT = 1;
|
||||
String SCHEDULER_NAME = "schedulerName";
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -103,7 +103,7 @@ public class OpenJpaDialect extends DefaultJpaDialect {
|
||||
|
||||
private int savepointCounter = 0;
|
||||
|
||||
public OpenJpaTransactionData(OpenJPAEntityManager entityManager) {
|
||||
OpenJpaTransactionData(OpenJPAEntityManager entityManager) {
|
||||
this.entityManager = entityManager;
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ public class OpenJpaDialect extends DefaultJpaDialect {
|
||||
|
||||
private final OpenJPAEntityManager entityManager;
|
||||
|
||||
public OpenJpaConnectionHandle(OpenJPAEntityManager entityManager) {
|
||||
OpenJpaConnectionHandle(OpenJPAEntityManager entityManager) {
|
||||
this.entityManager = entityManager;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -27,5 +27,5 @@ public interface ReportMailingJobConfigurationRepository
|
||||
/**
|
||||
* find ReportMailingJobConfiguration by name
|
||||
**/
|
||||
ReportMailingJobConfiguration findByName(final String name);
|
||||
ReportMailingJobConfiguration findByName(String name);
|
||||
}
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
public interface TwoFactorConfigurationRepository
|
||||
extends JpaRepository<TwoFactorConfiguration, Long>, JpaSpecificationExecutor<TwoFactorConfiguration> {
|
||||
|
||||
TwoFactorConfiguration findByName(final String name);
|
||||
TwoFactorConfiguration findByName(String name);
|
||||
|
||||
@Override
|
||||
List<TwoFactorConfiguration> findAll();
|
||||
|
||||
+1
-1
@@ -62,7 +62,7 @@ public class BasicAuthTenantDetailsServiceJdbc implements BasicAuthTenantDetails
|
||||
.append(" ts.deadlock_max_retry_interval as maxIntervalBetweenRetries ")//
|
||||
.append(" from tenants t left join tenant_server_connections ts ");
|
||||
|
||||
public TenantMapper(boolean isReport) {
|
||||
TenantMapper(boolean isReport) {
|
||||
this.isReport = isReport;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -37,7 +37,7 @@ public final class SQLInjectionValidator {
|
||||
|
||||
private static final String SQL_PATTERN = "[a-zA-Z_=,\\-'!><.?\"`% ()0-9*\n\r]*";
|
||||
|
||||
public static final void validateSQLInput(final String sqlSearch) {
|
||||
public static void validateSQLInput(final String sqlSearch) {
|
||||
if (StringUtils.isBlank(sqlSearch)) {
|
||||
return;
|
||||
}
|
||||
@@ -125,7 +125,7 @@ public final class SQLInjectionValidator {
|
||||
}
|
||||
}
|
||||
|
||||
public static final void validateAdhocQuery(final String sqlSearch) {
|
||||
public static void validateAdhocQuery(final String sqlSearch) {
|
||||
if (StringUtils.isBlank(sqlSearch)) {
|
||||
return;
|
||||
}
|
||||
|
||||
+1
-1
@@ -25,5 +25,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
|
||||
public interface SmsMessageRepository extends JpaRepository<SmsMessage, Long>, JpaSpecificationExecutor<SmsMessage> {
|
||||
|
||||
Page<SmsMessage> findByStatusType(final Integer status, Pageable pageable);
|
||||
Page<SmsMessage> findByStatusType(Integer status, Pageable pageable);
|
||||
}
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ public enum SmsMessageStatusType {
|
||||
return enumeration;
|
||||
}
|
||||
|
||||
private SmsMessageStatusType(final Integer value, final String code) {
|
||||
SmsMessageStatusType(final Integer value, final String code) {
|
||||
this.value = value;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
+3
-3
@@ -31,14 +31,14 @@ public interface SmsMessageScheduledJobService {
|
||||
/**
|
||||
* sends a batch of SMS messages to the SMS gateway
|
||||
**/
|
||||
public void sendMessagesToGateway();
|
||||
void sendMessagesToGateway();
|
||||
|
||||
/**
|
||||
* sends triggered batch SMS messages to SMS gateway
|
||||
*
|
||||
* @param smsDataMap
|
||||
*/
|
||||
public void sendTriggeredMessages(Map<SmsCampaign, Collection<SmsMessage>> smsDataMap);
|
||||
void sendTriggeredMessages(Map<SmsCampaign, Collection<SmsMessage>> smsDataMap);
|
||||
|
||||
/**
|
||||
* Sends a triggered batch of SMS messages to SMS gateway using specified provider.
|
||||
@@ -53,5 +53,5 @@ public interface SmsMessageScheduledJobService {
|
||||
/**
|
||||
* get delivery report from the SMS gateway
|
||||
**/
|
||||
public void getDeliveryReports();
|
||||
void getDeliveryReports();
|
||||
}
|
||||
|
||||
+1
-1
@@ -152,7 +152,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob
|
||||
private final FineractPlatformTenant tenant;
|
||||
private final Collection<SmsMessageApiQueueResourceData> apiQueueResourceDatas;
|
||||
|
||||
public SmsTask(final FineractPlatformTenant tenant, final Collection<SmsMessageApiQueueResourceData> apiQueueResourceDatas) {
|
||||
SmsTask(final FineractPlatformTenant tenant, final Collection<SmsMessageApiQueueResourceData> apiQueueResourceDatas) {
|
||||
this.tenant = tenant;
|
||||
this.apiQueueResourceDatas = apiQueueResourceDatas;
|
||||
}
|
||||
|
||||
+1
-1
@@ -62,7 +62,7 @@ public class SmsReadPlatformServiceImpl implements SmsReadPlatformService {
|
||||
|
||||
final String schema;
|
||||
|
||||
public SmsMapper() {
|
||||
SmsMapper() {
|
||||
final StringBuilder sql = new StringBuilder(300);
|
||||
sql.append("smo.id as id, ");
|
||||
sql.append("smo.group_id as groupId, ");
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@ import org.apache.fineract.infrastructure.survey.data.PpiPovertyLineData;
|
||||
|
||||
public interface PovertyLineService {
|
||||
|
||||
PpiPovertyLineData retrieveAll(final String ppiName);
|
||||
PpiPovertyLineData retrieveAll(String ppiName);
|
||||
|
||||
LikeliHoodPovertyLineData retrieveForLikelihood(final String ppiName, final Long likelihood);
|
||||
LikeliHoodPovertyLineData retrieveForLikelihood(String ppiName, Long likelihood);
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -26,7 +26,7 @@ import org.apache.fineract.infrastructure.survey.data.LikelihoodData;
|
||||
*/
|
||||
public interface ReadLikelihoodService {
|
||||
|
||||
public List<LikelihoodData> retrieveAll(final String ppiName);
|
||||
List<LikelihoodData> retrieveAll(String ppiName);
|
||||
|
||||
public LikelihoodData retrieve(final Long likelihoodId);
|
||||
LikelihoodData retrieve(Long likelihoodId);
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user