Skip to content

Commit ed32c13

Browse files
IOhackeradamsaghy
IOhacker
authored and
adamsaghy
committed
Revert "[#FINERACT-2422] standardize use of aging vs. ageing (#5289)"
This reverts commit 61034e6.
1 parent f0692a8 commit ed32c13

File tree

70 files changed

+320
-320
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+320
-320
lines changed

‎fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountDataV1.avsc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
},
414414
{
415415
"default": null,
416-
"name": "graceOnArrearsAging",
416+
"name": "graceOnArrearsAgeing",
417417
"type": [
418418
"null",
419419
"int"

‎fineract-avro-schemas/src/main/avro/loan/v1/LoanProductDataV1.avsc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
},
390390
{
391391
"default": null,
392-
"name": "graceOnArrearsAging",
392+
"name": "graceOnArrearsAgeing",
393393
"type": [
394394
"null",
395395
"int"

‎fineract-core/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobName.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
public enum JobName {
2222

23-
UPDATE_LOAN_ARREARS_AGING("Update Loan Arrears Aging"), //
23+
UPDATE_LOAN_ARREARS_AGEING("Update Loan Arrears Ageing"), //
2424
APPLY_ANNUAL_FEE_FOR_SAVINGS("Apply Annual Fee For Savings"), //
2525
APPLY_HOLIDAYS_TO_LOANS("Apply Holidays To Loans"), //
2626
POST_INTEREST_FOR_SAVINGS("Post Interest For Savings"), //

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1() {
182182
.daysInYearType(DAYS_IN_YEAR_TYPE)//
183183
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
184184
.canDefineInstallmentAmount(true)//
185-
.graceOnArrearsAging(3)//
185+
.graceOnArrearsAgeing(3)//
186186
.overdueDaysForNPA(179)//
187187
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
188188
.principalThresholdForLastInstallment(50)//
@@ -199,7 +199,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1() {
199199
.inArrearsTolerance(true)//
200200
.repaymentEvery(true)//
201201
.graceOnPrincipalAndInterestPayment(true)//
202-
.graceOnArrearsAging(true))//
202+
.graceOnArrearsAgeing(true))//
203203
.allowPartialPeriodInterestCalculation(true)//
204204
.maxTrancheCount(10)//
205205
.outstandingLoanBalance(10000.0)//
@@ -292,7 +292,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestFlat() {
292292
.daysInYearType(DAYS_IN_YEAR_TYPE)//
293293
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
294294
.canDefineInstallmentAmount(true)//
295-
.graceOnArrearsAging(3)//
295+
.graceOnArrearsAgeing(3)//
296296
.overdueDaysForNPA(179)//
297297
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
298298
.principalThresholdForLastInstallment(50)//
@@ -309,7 +309,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestFlat() {
309309
.inArrearsTolerance(true)//
310310
.repaymentEvery(true)//
311311
.graceOnPrincipalAndInterestPayment(true)//
312-
.graceOnArrearsAging(true))
312+
.graceOnArrearsAgeing(true))
313313
.allowPartialPeriodInterestCalculation(true)//
314314
.maxTrancheCount(10)//
315315
.outstandingLoanBalance(10000.0)//
@@ -400,7 +400,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDeclining()
400400
.daysInYearType(DAYS_IN_YEAR_TYPE)//
401401
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
402402
.canDefineInstallmentAmount(true)//
403-
.graceOnArrearsAging(3)//
403+
.graceOnArrearsAgeing(3)//
404404
.overdueDaysForNPA(179)//
405405
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
406406
.principalThresholdForLastInstallment(50)//
@@ -417,7 +417,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDeclining()
417417
.inArrearsTolerance(true)//
418418
.repaymentEvery(true)//
419419
.graceOnPrincipalAndInterestPayment(true)//
420-
.graceOnArrearsAging(true))
420+
.graceOnArrearsAgeing(true))
421421
.allowPartialPeriodInterestCalculation(true)//
422422
.maxTrancheCount(10)//
423423
.outstandingLoanBalance(10000.0)//
@@ -507,7 +507,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP11MonthInterestDeclin
507507
.daysInYearType(DAYS_IN_YEAR_TYPE)//
508508
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
509509
.canDefineInstallmentAmount(true)//
510-
.graceOnArrearsAging(3)//
510+
.graceOnArrearsAgeing(3)//
511511
.overdueDaysForNPA(179)//
512512
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
513513
.principalThresholdForLastInstallment(50)//
@@ -523,7 +523,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP11MonthInterestDeclin
523523
.inArrearsTolerance(true)//
524524
.repaymentEvery(true)//
525525
.graceOnPrincipalAndInterestPayment(true)//
526-
.graceOnArrearsAging(true))
526+
.graceOnArrearsAgeing(true))
527527
.outstandingLoanBalance(10000.0)//
528528
.charges(charges)//
529529
.accountingRule(LOAN_ACCOUNTING_RULE)//
@@ -620,7 +620,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDecliningBal
620620
.daysInYearType(DAYS_IN_YEAR_TYPE)//
621621
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
622622
.canDefineInstallmentAmount(true)//
623-
.graceOnArrearsAging(3)//
623+
.graceOnArrearsAgeing(3)//
624624
.overdueDaysForNPA(179)//
625625
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
626626
.principalThresholdForLastInstallment(50)//
@@ -636,7 +636,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDecliningBal
636636
.inArrearsTolerance(true)//
637637
.repaymentEvery(true)//
638638
.graceOnPrincipalAndInterestPayment(true)//
639-
.graceOnArrearsAging(true))
639+
.graceOnArrearsAgeing(true))
640640
.outstandingLoanBalance(10000.0)//
641641
.charges(charges)//
642642
.accountingRule(LOAN_ACCOUNTING_RULE)//
@@ -705,7 +705,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestDailyRecalcu
705705
.inArrearsTolerance(true)//
706706
.repaymentEvery(true)//
707707
.graceOnPrincipalAndInterestPayment(true)//
708-
.graceOnArrearsAging(true))//
708+
.graceOnArrearsAgeing(true))//
709709
.allowPartialPeriodInterestCalculation(false)//
710710
.allowVariableInstallments(false)//
711711
.amortizationType(AMORTIZATION_TYPE)//
@@ -849,7 +849,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2() {
849849
.daysInYearType(DAYS_IN_YEAR_TYPE)//
850850
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
851851
.canDefineInstallmentAmount(true)//
852-
.graceOnArrearsAging(3)//
852+
.graceOnArrearsAgeing(3)//
853853
.overdueDaysForNPA(179)//
854854
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
855855
.principalThresholdForLastInstallment(50)//
@@ -866,7 +866,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2() {
866866
.inArrearsTolerance(true)//
867867
.repaymentEvery(true)//
868868
.graceOnPrincipalAndInterestPayment(true)//
869-
.graceOnArrearsAging(true))//
869+
.graceOnArrearsAgeing(true))//
870870
.allowPartialPeriodInterestCalculation(true)//
871871
.maxTrancheCount(10)//
872872
.outstandingLoanBalance(10000.0)//
@@ -962,7 +962,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestFlat() {
962962
.daysInYearType(DAYS_IN_YEAR_TYPE)//
963963
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
964964
.canDefineInstallmentAmount(true)//
965-
.graceOnArrearsAging(3)//
965+
.graceOnArrearsAgeing(3)//
966966
.overdueDaysForNPA(179)//
967967
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
968968
.principalThresholdForLastInstallment(50)//
@@ -979,7 +979,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestFlat() {
979979
.inArrearsTolerance(true)//
980980
.repaymentEvery(true)//
981981
.graceOnPrincipalAndInterestPayment(true)//
982-
.graceOnArrearsAging(true))
982+
.graceOnArrearsAgeing(true))
983983
.allowPartialPeriodInterestCalculation(true)//
984984
.maxTrancheCount(10)//
985985
.outstandingLoanBalance(10000.0)//
@@ -1073,7 +1073,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2Emi() {
10731073
.daysInYearType(DAYS_IN_YEAR_TYPE)//
10741074
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
10751075
.canDefineInstallmentAmount(true)//
1076-
.graceOnArrearsAging(3)//
1076+
.graceOnArrearsAgeing(3)//
10771077
.overdueDaysForNPA(179)//
10781078
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
10791079
.principalThresholdForLastInstallment(50)//
@@ -1090,7 +1090,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2Emi() {
10901090
.inArrearsTolerance(true)//
10911091
.repaymentEvery(true)//
10921092
.graceOnPrincipalAndInterestPayment(true)//
1093-
.graceOnArrearsAging(true))//
1093+
.graceOnArrearsAgeing(true))//
10941094
.allowPartialPeriodInterestCalculation(false)//
10951095
.maxTrancheCount(10)//
10961096
.outstandingLoanBalance(10000.0)//
@@ -1199,7 +1199,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiWithChargeOff() {
11991199
.daysInYearType(DAYS_IN_YEAR_TYPE)//
12001200
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
12011201
.canDefineInstallmentAmount(true)//
1202-
.graceOnArrearsAging(3)//
1202+
.graceOnArrearsAgeing(3)//
12031203
.overdueDaysForNPA(179)//
12041204
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
12051205
.principalThresholdForLastInstallment(50)//
@@ -1220,7 +1220,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiWithChargeOff() {
12201220
.inArrearsTolerance(true)//
12211221
.repaymentEvery(true)//
12221222
.graceOnPrincipalAndInterestPayment(true)//
1223-
.graceOnArrearsAging(true))//
1223+
.graceOnArrearsAgeing(true))//
12241224
.allowPartialPeriodInterestCalculation(false)//
12251225
.maxTrancheCount(10)//
12261226
.outstandingLoanBalance(10000.0)//
@@ -1321,7 +1321,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2ChargeOffReasonToExp
13211321
.daysInYearType(DAYS_IN_YEAR_TYPE)//
13221322
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
13231323
.canDefineInstallmentAmount(true)//
1324-
.graceOnArrearsAging(3)//
1324+
.graceOnArrearsAgeing(3)//
13251325
.overdueDaysForNPA(179)//
13261326
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
13271327
.principalThresholdForLastInstallment(50)//
@@ -1338,7 +1338,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2ChargeOffReasonToExp
13381338
.inArrearsTolerance(true)//
13391339
.repaymentEvery(true)//
13401340
.graceOnPrincipalAndInterestPayment(true)//
1341-
.graceOnArrearsAging(true))//
1341+
.graceOnArrearsAgeing(true))//
13421342
.allowPartialPeriodInterestCalculation(true)//
13431343
.maxTrancheCount(10)//
13441344
.outstandingLoanBalance(10000.0)//
@@ -1451,7 +1451,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiCashAccounting()
14511451
.daysInYearType(DAYS_IN_YEAR_TYPE)//
14521452
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
14531453
.canDefineInstallmentAmount(true)//
1454-
.graceOnArrearsAging(3)//
1454+
.graceOnArrearsAgeing(3)//
14551455
.overdueDaysForNPA(179)//
14561456
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
14571457
.principalThresholdForLastInstallment(50)//
@@ -1472,7 +1472,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiCashAccounting()
14721472
.inArrearsTolerance(true)//
14731473
.repaymentEvery(true)//
14741474
.graceOnPrincipalAndInterestPayment(true)//
1475-
.graceOnArrearsAging(true))//
1475+
.graceOnArrearsAgeing(true))//
14761476
.allowPartialPeriodInterestCalculation(false)//
14771477
.maxTrancheCount(10)//
14781478
.outstandingLoanBalance(10000.0)//
@@ -1560,7 +1560,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2CapitalizedIncome()
15601560
.daysInYearType(DAYS_IN_YEAR_TYPE)//
15611561
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
15621562
.canDefineInstallmentAmount(true)//
1563-
.graceOnArrearsAging(3)//
1563+
.graceOnArrearsAgeing(3)//
15641564
.overdueDaysForNPA(179)//
15651565
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
15661566
.principalThresholdForLastInstallment(50)//
@@ -1577,7 +1577,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2CapitalizedIncome()
15771577
.inArrearsTolerance(true)//
15781578
.repaymentEvery(true)//
15791579
.graceOnPrincipalAndInterestPayment(true)//
1580-
.graceOnArrearsAging(true))//
1580+
.graceOnArrearsAgeing(true))//
15811581
.allowPartialPeriodInterestCalculation(true)//
15821582
.maxTrancheCount(10)//
15831583
.outstandingLoanBalance(10000.0)//
@@ -1698,7 +1698,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2BuyDownFees() {
16981698
.daysInYearType(DAYS_IN_YEAR_TYPE_360)//
16991699
.daysInMonthType(DAYS_IN_MONTH_TYPE_30)//
17001700
.canDefineInstallmentAmount(true)//
1701-
.graceOnArrearsAging(3)//
1701+
.graceOnArrearsAgeing(3)//
17021702
.overdueDaysForNPA(179)//
17031703
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
17041704
.principalThresholdForLastInstallment(50)//
@@ -1715,7 +1715,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2BuyDownFees() {
17151715
.inArrearsTolerance(true)//
17161716
.repaymentEvery(true)//
17171717
.graceOnPrincipalAndInterestPayment(true)//
1718-
.graceOnArrearsAging(true))//
1718+
.graceOnArrearsAgeing(true))//
17191719
.allowPartialPeriodInterestCalculation(false)//
17201720
.maxTrancheCount(10)//
17211721
.outstandingLoanBalance(10000.0)//

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanRequestFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public PostLoansRequest defaultLoansRequest(Long clientId) {
119119
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
120120
.transactionProcessingStrategyCode(DEFAULT_TRANSACTION_PROCESSING_STRATEGY_CODE)//
121121
.dateFormat(DATE_FORMAT)//
122-
.graceOnArrearsAging(3)//
122+
.graceOnArrearsAgeing(3)//
123123
.maxOutstandingLoanBalance(new BigDecimal(10000));
124124
}
125125

@@ -143,7 +143,7 @@ public PostLoansRequest defaultProgressiveLoansRequest(final Long clientId) {
143143
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
144144
.transactionProcessingStrategyCode(DEFAULT_PROGRESSIVE_TRANSACTION_PROCESSING_STRATEGY_CODE)//
145145
.dateFormat(DATE_FORMAT)//
146-
.graceOnArrearsAging(3)//
146+
.graceOnArrearsAgeing(3)//
147147
.maxOutstandingLoanBalance(new BigDecimal(10000));
148148
}
149149

@@ -172,7 +172,7 @@ public PutLoansLoanIdRequest modifySubmittedOnDateOnLoan(Long clientId, String n
172172
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
173173
.isEqualAmortization(false)//
174174
.transactionProcessingStrategyCode(DEFAULT_TRANSACTION_PROCESSING_STRATEGY_CODE)//
175-
.graceOnArrearsAging(3)//
175+
.graceOnArrearsAgeing(3)//
176176
.loanIdToClose(null)//
177177
.isTopup(null)//
178178
.maxOutstandingLoanBalance(10000L)//

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4048,7 +4048,7 @@ public void initialize() throws Exception {
40484048
.inArrearsTolerance(10) //
40494049
.graceOnPrincipalPayment(1) //
40504050
.graceOnInterestPayment(1) //
4051-
.graceOnArrearsAging(3) //
4051+
.graceOnArrearsAgeing(3) //
40524052
.numberOfRepayments(6) //
40534053
.allowAttributeOverrides(new AllowAttributeOverrides() //
40544054
.amortizationType(true) //
@@ -4058,7 +4058,7 @@ public void initialize() throws Exception {
40584058
.inArrearsTolerance(true) //
40594059
.repaymentEvery(true) //
40604060
.graceOnPrincipalAndInterestPayment(true) //
4061-
.graceOnArrearsAging(true));
4061+
.graceOnArrearsAgeing(true));
40624062
final PostLoanProductsResponse responseWithOverrides = createLoanProductIdempotent(loanProductsRequestWithOverrides);
40634063
TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP1_WITH_OVERRIDES, responseWithOverrides);
40644064

@@ -4071,7 +4071,7 @@ public void initialize() throws Exception {
40714071
.inArrearsTolerance(10) //
40724072
.graceOnPrincipalPayment(1) //
40734073
.graceOnInterestPayment(1) //
4074-
.graceOnArrearsAging(3) //
4074+
.graceOnArrearsAgeing(3) //
40754075
.numberOfRepayments(6) //
40764076
.allowAttributeOverrides(new AllowAttributeOverrides() //
40774077
.amortizationType(false) //
@@ -4081,7 +4081,7 @@ public void initialize() throws Exception {
40814081
.inArrearsTolerance(false) //
40824082
.repaymentEvery(false) //
40834083
.graceOnPrincipalAndInterestPayment(false) //
4084-
.graceOnArrearsAging(false));
4084+
.graceOnArrearsAgeing(false));
40854085
final PostLoanProductsResponse responseNoOverrides = createLoanProductIdempotent(loanProductsRequestNoOverrides);
40864086
TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP1_NO_OVERRIDES, responseNoOverrides);
40874087

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanOverrideFieldsStepDef.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private Integer getIntFieldValue(final GetLoansLoanIdResponse loanDetails, final
7272
case "inArrearsTolerance" -> loanDetails.getInArrearsTolerance();
7373
case "graceOnPrincipalPayment" -> loanDetails.getGraceOnPrincipalPayment();
7474
case "graceOnInterestPayment" -> loanDetails.getGraceOnInterestPayment();
75-
case "graceOnArrearsAging" -> loanDetails.getGraceOnArrearsAging();
75+
case "graceOnArrearsAgeing" -> loanDetails.getGraceOnArrearsAgeing();
7676
default -> throw new IllegalArgumentException("Unknown override field: " + fieldName);
7777
};
7878
}
@@ -113,7 +113,7 @@ private void applyOverrideField(final PostLoansRequest request, final String fie
113113
case "inArrearsTolerance" -> request.inArrearsTolerance(isNull ? null : new BigDecimal(value));
114114
case "graceOnInterestPayment" -> request.graceOnInterestPayment(isNull ? null : Integer.valueOf(value));
115115
case "graceOnPrincipalPayment" -> request.graceOnPrincipalPayment(isNull ? null : Integer.valueOf(value));
116-
case "graceOnArrearsAging" -> request.graceOnArrearsAging(isNull ? null : Integer.valueOf(value));
116+
case "graceOnArrearsAgeing" -> request.graceOnArrearsAgeing(isNull ? null : Integer.valueOf(value));
117117
default -> throw new IllegalArgumentException("Unknown override field: " + fieldName);
118118
}
119119
}

0 commit comments

Comments
 (0)