This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 0f1d53cbdc FINERACT-2181: Fix for using the proper ChargeData object
in LoanProduct APIs
0f1d53cbdc is described below
commit 0f1d53cbdcdf25f0d3f1c420993a764d99d42058
Author: Arnold Galovics <[email protected]>
AuthorDate: Wed Mar 26 14:09:34 2025 +0100
FINERACT-2181: Fix for using the proper ChargeData object in LoanProduct
APIs
---
.../test/factory/LoanProductsRequestFactory.java | 43 +++++++++++-----------
.../api/LoanProductsApiResourceSwagger.java | 39 +++++++++++++-------
...ChargeOffWithAdvancedPaymentAllocationTest.java | 7 ++--
...eseReplayWithAdvancedPaymentAllocationTest.java | 7 ++--
.../LoanPostChargeOffScenariosTest.java | 7 ++--
.../LoanProductChargeOffReasonMappingsTest.java | 7 ++--
.../LoanTransactionAccrualActivityPostingTest.java | 7 ++--
.../RepaymentReverseExternalIdTest.java | 7 ++--
...ndoRepaymentWithDownPaymentIntegrationTest.java | 7 ++--
9 files changed, 67 insertions(+), 64 deletions(-)
diff --git
a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java
b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java
index 9acfe98445..801777b59f 100644
---
a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java
+++
b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java
@@ -25,10 +25,9 @@ import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.apache.fineract.client.models.AllowAttributeOverrides;
-import org.apache.fineract.client.models.ChargeToGLAccountMapper;
-import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings;
import
org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings;
import org.apache.fineract.client.models.LoanProductChargeData;
+import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper;
import
org.apache.fineract.client.models.PostChargeOffReasonToExpenseAccountMappings;
import org.apache.fineract.client.models.PostLoanProductsRequest;
import org.apache.fineract.test.data.AccountingRule;
@@ -132,8 +131,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -242,8 +241,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -350,8 +349,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -458,8 +457,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -571,8 +570,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -677,8 +676,8 @@ public class LoanProductsRequestFactory {
final String name =
Utils.randomNameGenerator(NAME_PREFIX_INTEREST_RECALCULATION, 4);
final String shortName =
Utils.randomNameGenerator(SHORT_NAME_PREFIX_INTEREST, 3);
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -796,8 +795,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -909,8 +908,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -1020,8 +1019,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
@@ -1130,8 +1129,8 @@ public class LoanProductsRequestFactory {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
diff --git
a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
index 56a557b71e..64fcb0d3ce 100644
---
a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
+++
b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
@@ -23,7 +23,7 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Set;
-import
org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAccountMapper;
+import org.apache.fineract.accounting.glaccount.data.GLAccountData;
import org.apache.fineract.infrastructure.core.data.EnumOptionData;
import org.apache.fineract.infrastructure.core.data.StringEnumOptionData;
import
org.apache.fineract.portfolio.delinquency.api.DelinquencyApiResourceSwagger.GetDelinquencyBucketsResponse;
@@ -35,6 +35,25 @@ final class LoanProductsApiResourceSwagger {
private LoanProductsApiResourceSwagger() {}
+ @Schema(description = "LoanProductChargeData")
+ public static final class LoanProductChargeData {
+
+ private LoanProductChargeData() {}
+
+ @Schema(example = "1")
+ public Long id;
+ }
+
+ @Schema(description = "LoanProductChargeToGLAccountMapper")
+ public static final class LoanProductChargeToGLAccountMapper {
+
+ private LoanProductChargeToGLAccountMapper() {}
+
+ public LoanProductChargeData charge;
+ public GLAccountData incomeAccount;
+
+ }
+
@Schema(description = "PostLoanProductsRequest")
public static final class PostLoanProductsRequest {
@@ -251,9 +270,9 @@ final class LoanProductsApiResourceSwagger {
@Schema(example = "11")
public Long incomeFromGoodwillCreditPenaltyAccountId;
public
List<GetLoanProductsProductIdResponse.GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings;
- public
List<GetLoanProductsProductIdResponse.GetLoanFeeToIncomeAccountMappings>
feeToIncomeAccountMappings;
+ public List<LoanProductChargeToGLAccountMapper>
feeToIncomeAccountMappings;
public List<PostChargeOffReasonToExpenseAccountMappings>
chargeOffReasonToExpenseAccountMappings;
- public List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings;
+ public List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings;
// Multi Disburse
@Schema(example = "true")
@@ -302,14 +321,6 @@ final class LoanProductsApiResourceSwagger {
public boolean graceOnArrearsAgeing;
}
- static final class LoanProductChargeData {
-
- private LoanProductChargeData() {}
-
- @Schema(example = "1")
- public Long id;
- }
-
static final class RateData {
private RateData() {}
@@ -1639,9 +1650,9 @@ final class LoanProductsApiResourceSwagger {
@Schema(example = "11")
public Long incomeFromChargeOffPenaltyAccountId;
public
List<GetLoanProductsProductIdResponse.GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings;
- public
List<GetLoanProductsProductIdResponse.GetLoanFeeToIncomeAccountMappings>
feeToIncomeAccountMappings;
+ public List<LoanProductChargeToGLAccountMapper>
feeToIncomeAccountMappings;
public
List<PostLoanProductsRequest.PostChargeOffReasonToExpenseAccountMappings>
chargeOffReasonToExpenseAccountMappings;
- public List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings;
+ public List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings;
@Schema(example = "false")
public Boolean enableAccrualActivityPosting;
@@ -1657,7 +1668,7 @@ final class LoanProductsApiResourceSwagger {
@Schema(example = "36000.00")
public Double outstandingLoanBalance;
- public List<PostLoanProductsRequest.LoanProductChargeData> charges;
+ public List<LoanProductChargeData> charges;
@Schema(example = "en_GB")
public String locale;
@Schema(example = "dd MMMM yyyy")
diff --git
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java
index 28c3d549de..78c5efe19c 100644
---
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java
+++
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java
@@ -39,15 +39,14 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.fineract.client.models.AdvancedPaymentData;
import org.apache.fineract.client.models.AllowAttributeOverrides;
-import org.apache.fineract.client.models.ChargeToGLAccountMapper;
import
org.apache.fineract.client.models.GetJournalEntriesTransactionIdResponse;
-import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings;
import
org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings;
import org.apache.fineract.client.models.GetLoanTransactionRelation;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import
org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse;
import org.apache.fineract.client.models.JournalEntryTransactionItem;
import org.apache.fineract.client.models.LoanProductChargeData;
+import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper;
import org.apache.fineract.client.models.PaymentTypeRequest;
import org.apache.fineract.client.models.PostClientsResponse;
import org.apache.fineract.client.models.PostLoanProductsRequest;
@@ -663,8 +662,8 @@ public class
LoanAccountChargeOffWithAdvancedPaymentAllocationTest extends BaseL
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
String paymentTypeName = PaymentTypeHelper.randomNameGenerator("P_T",
5);
String description = PaymentTypeHelper.randomNameGenerator("PT_Desc",
15);
diff --git
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java
index e67ba55a59..6e778f3984 100644
---
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java
+++
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java
@@ -35,11 +35,10 @@ import java.util.List;
import java.util.UUID;
import org.apache.fineract.client.models.AdvancedPaymentData;
import org.apache.fineract.client.models.AllowAttributeOverrides;
-import org.apache.fineract.client.models.ChargeToGLAccountMapper;
-import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings;
import
org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import org.apache.fineract.client.models.LoanProductChargeData;
+import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper;
import org.apache.fineract.client.models.PaymentTypeRequest;
import org.apache.fineract.client.models.PostLoanProductsRequest;
import org.apache.fineract.client.models.PostLoanProductsResponse;
@@ -355,8 +354,8 @@ public class
LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest exte
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
String paymentTypeName = PaymentTypeHelper.randomNameGenerator("P_T",
5);
String description = PaymentTypeHelper.randomNameGenerator("PT_Desc",
15);
diff --git
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java
index 8a0f6f7a99..1b45b076d5 100644
---
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java
+++
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java
@@ -34,15 +34,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.apache.fineract.client.models.AllowAttributeOverrides;
-import org.apache.fineract.client.models.ChargeToGLAccountMapper;
import
org.apache.fineract.client.models.GetJournalEntriesTransactionIdResponse;
-import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings;
import
org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings;
import org.apache.fineract.client.models.GetLoanTransactionRelation;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import
org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse;
import org.apache.fineract.client.models.JournalEntryTransactionItem;
import org.apache.fineract.client.models.LoanProductChargeData;
+import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper;
import org.apache.fineract.client.models.PaymentTypeRequest;
import org.apache.fineract.client.models.PostLoanProductsRequest;
import org.apache.fineract.client.models.PostLoanProductsResponse;
@@ -1129,8 +1128,8 @@ public class LoanPostChargeOffScenariosTest extends
BaseLoanIntegrationTest {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
String paymentTypeName = PaymentTypeHelper.randomNameGenerator("P_T",
5);
String description = PaymentTypeHelper.randomNameGenerator("PT_Desc",
15);
diff --git
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java
index 801cd870b1..d06dc42287 100644
---
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java
+++
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductChargeOffReasonMappingsTest.java
@@ -24,11 +24,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.apache.fineract.client.models.AllowAttributeOverrides;
-import org.apache.fineract.client.models.ChargeToGLAccountMapper;
-import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings;
import
org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings;
import org.apache.fineract.client.models.GetLoanProductsProductIdResponse;
import org.apache.fineract.client.models.LoanProductChargeData;
+import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper;
import
org.apache.fineract.client.models.PostChargeOffReasonToExpenseAccountMappings;
import org.apache.fineract.client.models.PostLoanProductsRequest;
import org.apache.fineract.client.models.PutLoanProductsProductIdRequest;
@@ -108,8 +107,8 @@ public class LoanProductChargeOffReasonMappingsTest extends
BaseLoanIntegrationT
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<PostChargeOffReasonToExpenseAccountMappings>
chargeOffReasonToExpenseAccountMappings =
createPostChargeOffReasonToExpenseAccountMappings(
chargeOffReasonId, glAccountId);
diff --git
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java
index 724a760dfc..7b0a7a584c 100644
---
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java
+++
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAccrualActivityPostingTest.java
@@ -36,12 +36,11 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.fineract.client.models.AdvancedPaymentData;
import org.apache.fineract.client.models.AllowAttributeOverrides;
import org.apache.fineract.client.models.ChargeRequest;
-import org.apache.fineract.client.models.ChargeToGLAccountMapper;
-import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings;
import
org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import org.apache.fineract.client.models.GetLoansLoanIdStatus;
import org.apache.fineract.client.models.LoanProductChargeData;
+import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper;
import org.apache.fineract.client.models.PostChargesResponse;
import org.apache.fineract.client.models.PostClientsResponse;
import org.apache.fineract.client.models.PostLoanProductsRequest;
@@ -1433,8 +1432,8 @@ public class LoanTransactionAccrualActivityPostingTest
extends BaseLoanIntegrati
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
diff --git
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/RepaymentReverseExternalIdTest.java
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/RepaymentReverseExternalIdTest.java
index 0e1c93c6ac..254e1d9bfe 100644
---
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/RepaymentReverseExternalIdTest.java
+++
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/RepaymentReverseExternalIdTest.java
@@ -33,12 +33,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.apache.fineract.client.models.AllowAttributeOverrides;
-import org.apache.fineract.client.models.ChargeToGLAccountMapper;
-import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings;
import
org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import org.apache.fineract.client.models.GetLoansLoanIdTransactions;
import org.apache.fineract.client.models.LoanProductChargeData;
+import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper;
import org.apache.fineract.client.models.PostLoanProductsRequest;
import org.apache.fineract.client.models.PostLoansLoanIdRequest;
import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
@@ -141,8 +140,8 @@ public class RepaymentReverseExternalIdTest extends
BaseLoanIntegrationTest {
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
List<GetLoanPaymentChannelToFundSourceMappings>
paymentChannelToFundSourceMappings = new ArrayList<>();
GetLoanPaymentChannelToFundSourceMappings
loanPaymentChannelToFundSourceMappings = new
GetLoanPaymentChannelToFundSourceMappings();
diff --git
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java
index 803a2101c3..78c2501446 100644
---
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java
+++
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java
@@ -36,12 +36,11 @@ import java.util.List;
import java.util.UUID;
import org.apache.fineract.client.models.AdvancedPaymentData;
import org.apache.fineract.client.models.AllowAttributeOverrides;
-import org.apache.fineract.client.models.ChargeToGLAccountMapper;
-import org.apache.fineract.client.models.GetLoanFeeToIncomeAccountMappings;
import
org.apache.fineract.client.models.GetLoanPaymentChannelToFundSourceMappings;
import org.apache.fineract.client.models.GetLoanProductsProductIdResponse;
import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import org.apache.fineract.client.models.LoanProductChargeData;
+import org.apache.fineract.client.models.LoanProductChargeToGLAccountMapper;
import org.apache.fineract.client.models.PaymentTypeRequest;
import org.apache.fineract.client.models.PostLoanProductsRequest;
import org.apache.fineract.client.models.PostLoanProductsResponse;
@@ -204,8 +203,8 @@ public class UndoRepaymentWithDownPaymentIntegrationTest
extends BaseLoanIntegra
List<Integer> numberOfRepaymentVariationsForBorrowerCycle = new
ArrayList<>();
List<Integer> interestRateVariationsForBorrowerCycle = new
ArrayList<>();
List<LoanProductChargeData> charges = new ArrayList<>();
- List<ChargeToGLAccountMapper> penaltyToIncomeAccountMappings = new
ArrayList<>();
- List<GetLoanFeeToIncomeAccountMappings> feeToIncomeAccountMappings =
new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper>
penaltyToIncomeAccountMappings = new ArrayList<>();
+ List<LoanProductChargeToGLAccountMapper> feeToIncomeAccountMappings =
new ArrayList<>();
String paymentTypeName = PaymentTypeHelper.randomNameGenerator("P_T",
5);
String description = PaymentTypeHelper.randomNameGenerator("PT_Desc",
15);
