From e4754b299b46473d7de746e12649c8a4b6a83db5 Mon Sep 17 00:00:00 2001 From: Arnold Galovics Date: Tue, 6 Jun 2023 12:00:44 +0200 Subject: [PATCH] FINERACT-1724: Removed restrictions from renovate.json and upgraded spotless plugin --- build.gradle | 2 +- .../org.apache.fineract.dependencies.gradle | 1 - .../loanproduct/service/LoanEnumerations.java | 60 ++++++++-------- ...auIntegrationWritePlatformServiceImpl.java | 10 +-- .../CollateralReadPlatformServiceImpl.java | 10 +-- .../loanaccount/data/LoanSummaryData.java | 15 ++-- .../GuarantorReadPlatformServiceImpl.java | 26 +++---- .../jobs/filter/LoanCOBApiFilterTest.java | 12 ++-- .../integrationtests/client/ClientTest.java | 2 +- .../integrationtests/client/ReportsTest.java | 4 +- .../integrationtests/client/StaffTest.java | 2 +- renovate.json | 68 ------------------- 12 files changed, 71 insertions(+), 141 deletions(-) diff --git a/build.gradle b/build.gradle index 50e3a9375..ac6b13365 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ buildscript { plugins { id "org.barfuin.gradle.taskinfo" version "2.1.0" id 'com.adarshr.test-logger' version '3.2.0' - id 'com.diffplug.spotless' version '6.15.0' apply false + id 'com.diffplug.spotless' version '6.19.0' apply false id 'org.nosphere.apache.rat' version '0.8.0' apply false id 'com.github.hierynomus.license' version '0.16.1' apply false id 'com.github.jk1.dependency-license-report' version '2.1' apply false diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle index 5fdff77c6..f754958ac 100644 --- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle +++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle @@ -247,6 +247,5 @@ dependencyManagement { dependency 'org.apache.commons:commons-math3:3.6.1' dependency 'org.mockito:mockito-inline:5.2.0' - } } diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanEnumerations.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanEnumerations.java index b6db1df1e..5b57ed8a4 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanEnumerations.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanEnumerations.java @@ -90,8 +90,8 @@ public final class LoanEnumerations { codePrefix + PeriodFrequencyType.MONTHS.getCode(), "Months"); case YEARS -> new EnumOptionData(PeriodFrequencyType.YEARS.getValue().longValue(), codePrefix + PeriodFrequencyType.YEARS.getCode(), "Years"); - default -> new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), - "Invalid"); + default -> + new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), "Invalid"); }; } @@ -110,8 +110,8 @@ public final class LoanEnumerations { codePrefix + PeriodFrequencyType.MONTHS.getCode(), "Months"); case YEARS -> new EnumOptionData(PeriodFrequencyType.YEARS.getValue().longValue(), codePrefix + PeriodFrequencyType.YEARS.getCode(), "Years"); - default -> new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), - "Invalid"); + default -> + new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), "Invalid"); }; } @@ -165,8 +165,8 @@ public final class LoanEnumerations { codePrefix + PeriodFrequencyType.MONTHS.getCode(), "Months"); case YEARS -> new EnumOptionData(PeriodFrequencyType.YEARS.getValue().longValue(), codePrefix + PeriodFrequencyType.YEARS.getCode(), "Years"); - default -> new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), - "Invalid"); + default -> + new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), "Invalid"); }; } @@ -183,8 +183,8 @@ public final class LoanEnumerations { codePrefix + PeriodFrequencyType.YEARS.getCode(), "Per year"); case WHOLE_TERM -> new EnumOptionData(PeriodFrequencyType.WHOLE_TERM.getValue().longValue(), codePrefix + PeriodFrequencyType.WHOLE_TERM.getCode(), "Whole term"); - default -> new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), - "Invalid"); + default -> + new EnumOptionData(PeriodFrequencyType.INVALID.getValue().longValue(), PeriodFrequencyType.INVALID.getCode(), "Invalid"); }; } @@ -198,8 +198,8 @@ public final class LoanEnumerations { AmortizationMethod.EQUAL_INSTALLMENTS.getCode(), "Equal installments"); case EQUAL_PRINCIPAL -> new EnumOptionData(AmortizationMethod.EQUAL_PRINCIPAL.getValue().longValue(), AmortizationMethod.EQUAL_PRINCIPAL.getCode(), "Equal principal payments"); - default -> new EnumOptionData(AmortizationMethod.INVALID.getValue().longValue(), AmortizationMethod.INVALID.getCode(), - "Invalid"); + default -> + new EnumOptionData(AmortizationMethod.INVALID.getValue().longValue(), AmortizationMethod.INVALID.getCode(), "Invalid"); }; } @@ -224,9 +224,9 @@ public final class LoanEnumerations { return switch (type) { case DAILY -> new EnumOptionData(InterestCalculationPeriodMethod.DAILY.getValue().longValue(), InterestCalculationPeriodMethod.DAILY.getCode(), "Daily"); - case SAME_AS_REPAYMENT_PERIOD -> new EnumOptionData( - InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD.getValue().longValue(), - InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD.getCode(), "Same as repayment period"); + case SAME_AS_REPAYMENT_PERIOD -> + new EnumOptionData(InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD.getValue().longValue(), + InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD.getCode(), "Same as repayment period"); default -> new EnumOptionData(InterestCalculationPeriodMethod.INVALID.getValue().longValue(), InterestCalculationPeriodMethod.INVALID.getCode(), "Invalid"); }; @@ -244,9 +244,9 @@ public final class LoanEnumerations { LoanTransactionType.DISBURSEMENT.getCode(), "Disbursement"); case REPAYMENT -> new LoanTransactionEnumData(LoanTransactionType.REPAYMENT.getValue().longValue(), LoanTransactionType.REPAYMENT.getCode(), "Repayment"); - case REPAYMENT_AT_DISBURSEMENT -> new LoanTransactionEnumData( - LoanTransactionType.REPAYMENT_AT_DISBURSEMENT.getValue().longValue(), - LoanTransactionType.REPAYMENT_AT_DISBURSEMENT.getCode(), "Repayment (at time of disbursement)"); + case REPAYMENT_AT_DISBURSEMENT -> + new LoanTransactionEnumData(LoanTransactionType.REPAYMENT_AT_DISBURSEMENT.getValue().longValue(), + LoanTransactionType.REPAYMENT_AT_DISBURSEMENT.getCode(), "Repayment (at time of disbursement)"); case CONTRA -> new LoanTransactionEnumData(LoanTransactionType.CONTRA.getValue().longValue(), LoanTransactionType.CONTRA.getCode(), "Reversal"); case WAIVE_INTEREST -> new LoanTransactionEnumData(LoanTransactionType.WAIVE_INTEREST.getValue().longValue(), @@ -323,9 +323,9 @@ public final class LoanEnumerations { LoanStatus.CLOSED_OBLIGATIONS_MET.getCode(), "Closed (obligations met)"); case CLOSED_WRITTEN_OFF -> new LoanStatusEnumData(LoanStatus.CLOSED_WRITTEN_OFF.getValue().longValue(), LoanStatus.CLOSED_WRITTEN_OFF.getCode(), "Closed (written off)"); - case CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT -> new LoanStatusEnumData( - LoanStatus.CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT.getValue().longValue(), - LoanStatus.CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT.getCode(), "Closed (rescheduled)"); + case CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT -> + new LoanStatusEnumData(LoanStatus.CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT.getValue().longValue(), + LoanStatus.CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT.getCode(), "Closed (rescheduled)"); case OVERPAID -> new LoanStatusEnumData(LoanStatus.OVERPAID.getValue().longValue(), LoanStatus.OVERPAID.getCode(), "Overpaid"); case TRANSFER_IN_PROGRESS -> new LoanStatusEnumData(LoanStatus.TRANSFER_IN_PROGRESS.getValue().longValue(), LoanStatus.TRANSFER_IN_PROGRESS.getCode(), "Transfer in progress"); @@ -361,8 +361,8 @@ public final class LoanEnumerations { LoanProductParamType.INTERESTRATE.getCode(), "Interest rate"); case REPAYMENT -> new EnumOptionData(LoanProductParamType.REPAYMENT.getValue().longValue(), LoanProductParamType.REPAYMENT.getCode(), "repayment"); - default -> new EnumOptionData(LoanProductParamType.INVALID.getValue().longValue(), LoanProductParamType.INVALID.getCode(), - "Invalid"); + default -> + new EnumOptionData(LoanProductParamType.INVALID.getValue().longValue(), LoanProductParamType.INVALID.getCode(), "Invalid"); }; } @@ -390,9 +390,9 @@ public final class LoanEnumerations { LoanTermVariationType.GRACE_ON_PRINCIPAL.getCode(), "graceOnPrincipal"); case EXTEND_REPAYMENT_PERIOD -> new EnumOptionData(LoanTermVariationType.EXTEND_REPAYMENT_PERIOD.getValue().longValue(), LoanTermVariationType.EXTEND_REPAYMENT_PERIOD.getCode(), "extendRepaymentPeriod"); - case INTEREST_RATE_FROM_INSTALLMENT -> new EnumOptionData( - LoanTermVariationType.INTEREST_RATE_FROM_INSTALLMENT.getValue().longValue(), - LoanTermVariationType.INTEREST_RATE_FROM_INSTALLMENT.getCode(), "interestRateForInstallment"); + case INTEREST_RATE_FROM_INSTALLMENT -> + new EnumOptionData(LoanTermVariationType.INTEREST_RATE_FROM_INSTALLMENT.getValue().longValue(), + LoanTermVariationType.INTEREST_RATE_FROM_INSTALLMENT.getCode(), "interestRateForInstallment"); default -> new EnumOptionData(LoanTermVariationType.INVALID.getValue().longValue(), LoanTermVariationType.INVALID.getCode(), "Invalid"); }; @@ -456,12 +456,12 @@ public final class LoanEnumerations { return switch (type) { case REDUCE_EMI_AMOUNT -> new EnumOptionData(LoanRescheduleStrategyMethod.REDUCE_EMI_AMOUNT.getValue().longValue(), LoanRescheduleStrategyMethod.REDUCE_EMI_AMOUNT.getCode(), "Reduce EMI amount"); - case REDUCE_NUMBER_OF_INSTALLMENTS -> new EnumOptionData( - LoanRescheduleStrategyMethod.REDUCE_NUMBER_OF_INSTALLMENTS.getValue().longValue(), - LoanRescheduleStrategyMethod.REDUCE_NUMBER_OF_INSTALLMENTS.getCode(), "Reduce number of installments"); - case RESCHEDULE_NEXT_REPAYMENTS -> new EnumOptionData( - LoanRescheduleStrategyMethod.RESCHEDULE_NEXT_REPAYMENTS.getValue().longValue(), - LoanRescheduleStrategyMethod.RESCHEDULE_NEXT_REPAYMENTS.getCode(), "Reschedule next repayments"); + case REDUCE_NUMBER_OF_INSTALLMENTS -> + new EnumOptionData(LoanRescheduleStrategyMethod.REDUCE_NUMBER_OF_INSTALLMENTS.getValue().longValue(), + LoanRescheduleStrategyMethod.REDUCE_NUMBER_OF_INSTALLMENTS.getCode(), "Reduce number of installments"); + case RESCHEDULE_NEXT_REPAYMENTS -> + new EnumOptionData(LoanRescheduleStrategyMethod.RESCHEDULE_NEXT_REPAYMENTS.getValue().longValue(), + LoanRescheduleStrategyMethod.RESCHEDULE_NEXT_REPAYMENTS.getCode(), "Reschedule next repayments"); default -> new EnumOptionData(LoanRescheduleStrategyMethod.INVALID.getValue().longValue(), LoanRescheduleStrategyMethod.INVALID.getCode(), "Invalid"); }; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/ThitsaWorksCreditBureauIntegrationWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/ThitsaWorksCreditBureauIntegrationWritePlatformServiceImpl.java index fd9099e9e..2a157c905 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/ThitsaWorksCreditBureauIntegrationWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/ThitsaWorksCreditBureauIntegrationWritePlatformServiceImpl.java @@ -125,11 +125,11 @@ public class ThitsaWorksCreditBureauIntegrationWritePlatformServiceImpl implemen Request request = null; Request.Builder baseRequestBuilder = createRequestBuilder(subscriptionKey, subscriptionId, token, okHttpUrl); switch (process) { - case UPLOAD_CREDIT_REPORT -> request = createRequest(baseRequestBuilder, () -> new MultipartBody.Builder() - .setType(MultipartBody.FORM) - .addFormDataPart("file", fileData.getFileName(), RequestBody.create(file, MediaType.parse("multipart/form-data"))) - .addFormDataPart("BODY", "formdata").addFormDataPart("userName", userName).build(), - (requestBody, builder) -> builder.header(CONTENT_TYPE, MULTIPART_FORM_DATA).post(requestBody).build()); + case UPLOAD_CREDIT_REPORT -> + request = createRequest(baseRequestBuilder, () -> new MultipartBody.Builder().setType(MultipartBody.FORM) + .addFormDataPart("file", fileData.getFileName(), RequestBody.create(file, MediaType.parse("multipart/form-data"))) + .addFormDataPart("BODY", "formdata").addFormDataPart("userName", userName).build(), + (requestBody, builder) -> builder.header(CONTENT_TYPE, MULTIPART_FORM_DATA).post(requestBody).build()); case "CreditReport" -> request = createRequest(baseRequestBuilder, builder -> builder.header(CONTENT_TYPE, APPLICATION_FORM_URLENCODED).get().build()); case "token" -> request = createRequest(baseRequestBuilder, diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralReadPlatformServiceImpl.java index 4b47da555..dc1a879ad 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralReadPlatformServiceImpl.java @@ -54,11 +54,11 @@ public class CollateralReadPlatformServiceImpl implements CollateralReadPlatform private final StringBuilder sqlBuilder = new StringBuilder( "lc.id as id, lc.description as description, lc.value as value, cv.id as typeId, cv.code_value as typeName, oc.code as currencyCode, ") - .append(" oc.name as currencyName,oc.decimal_places as currencyDecimalPlaces, oc.currency_multiplesof as inMultiplesOf, oc.display_symbol as currencyDisplaySymbol, oc.internationalized_name_code as currencyNameCode") - .append(" FROM m_loan_collateral lc") // - .append(" JOIN m_code_value cv on lc.type_cv_id = cv.id")// - .append(" JOIN m_loan loan on lc.loan_id = loan.id")// - .append(" JOIN m_organisation_currency oc on loan.currency_code = oc.code"); + .append(" oc.name as currencyName,oc.decimal_places as currencyDecimalPlaces, oc.currency_multiplesof as inMultiplesOf, oc.display_symbol as currencyDisplaySymbol, oc.internationalized_name_code as currencyNameCode") + .append(" FROM m_loan_collateral lc") // + .append(" JOIN m_code_value cv on lc.type_cv_id = cv.id")// + .append(" JOIN m_loan loan on lc.loan_id = loan.id")// + .append(" JOIN m_organisation_currency oc on loan.currency_code = oc.code"); public String schema() { return this.sqlBuilder.toString(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java index 9c141e606..ae47a1ed0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java @@ -199,14 +199,13 @@ public class LoanSummaryData { defaultSummaryData.totalOutstanding, defaultSummaryData.totalOverdue, defaultSummaryData.overdueSinceDate, defaultSummaryData.writeoffReasonId, defaultSummaryData.writeoffReason, defaultSummaryData.totalRecovered, defaultSummaryData.chargeOffReasonId, defaultSummaryData.chargeOffReason).setTotalMerchantRefund(totalMerchantRefund) - .setTotalMerchantRefundReversed(totalMerchantRefundReversed).setTotalPayoutRefund(totalPayoutRefund) - .setTotalPayoutRefundReversed(totalPayoutRefundReversed).setTotalGoodwillCredit(totalGoodwillCredit) - .setTotalGoodwillCreditReversed(totalGoodwillCreditReversed).setTotalChargeAdjustment(totalChargeAdjustment) - .setTotalChargeAdjustmentReversed(totalChargeAdjustmentReversed).setTotalChargeback(totalChargeback) - .setTotalCreditBalanceRefund(totalCreditBalanceRefund) - .setTotalCreditBalanceRefundReversed(totalCreditBalanceRefundReversed) - .setTotalRepaymentTransaction(totalRepaymentTransaction) - .setTotalRepaymentTransactionReversed(totalRepaymentTransactionReversed); + .setTotalMerchantRefundReversed(totalMerchantRefundReversed).setTotalPayoutRefund(totalPayoutRefund) + .setTotalPayoutRefundReversed(totalPayoutRefundReversed).setTotalGoodwillCredit(totalGoodwillCredit) + .setTotalGoodwillCreditReversed(totalGoodwillCreditReversed).setTotalChargeAdjustment(totalChargeAdjustment) + .setTotalChargeAdjustmentReversed(totalChargeAdjustmentReversed).setTotalChargeback(totalChargeback) + .setTotalCreditBalanceRefund(totalCreditBalanceRefund).setTotalCreditBalanceRefundReversed(totalCreditBalanceRefundReversed) + .setTotalRepaymentTransaction(totalRepaymentTransaction) + .setTotalRepaymentTransactionReversed(totalRepaymentTransactionReversed); } private static BigDecimal computeTotalAmountForReversedTransactions(LoanTransactionType transactionType, diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java index c68ecf911..14828eabf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java @@ -120,19 +120,19 @@ public class GuarantorReadPlatformServiceImpl implements GuarantorReadPlatformSe private final StringBuilder sqlBuilder = new StringBuilder( " g.id as id, g.loan_id as loanId, g.client_reln_cv_id clientRelationshipTypeId, g.entity_id as entityId, g.type_enum guarantorType ,g.firstname as firstname, g.lastname as lastname, g.dob as dateOfBirth, g.address_line_1 as addressLine1, g.address_line_2 as addressLine2, g.city as city, g.state as state, g.country as country, g.zip as zip, g.house_phone_number as housePhoneNumber, g.mobile_number as mobilePhoneNumber, g.comment as comment, ") - .append(" g.is_active as guarantorStatus,")// - .append(" cv.code_value as typeName, ")// - .append("gfd.amount,")// - .append(this.guarantorFundingMapper.schema())// - .append(",")// - .append(this.guarantorTransactionMapper.schema())// - .append(" FROM m_guarantor g") // - .append(" left JOIN m_code_value cv on g.client_reln_cv_id = cv.id")// - .append(" left JOIN m_guarantor_funding_details gfd on g.id = gfd.guarantor_id")// - .append(" left JOIN m_portfolio_account_associations aa on gfd.account_associations_id = aa.id and aa.is_active = true and aa.association_type_enum = ?")// - .append(" left JOIN m_savings_account sa on sa.id = aa.linked_savings_account_id ")// - .append(" left join m_guarantor_transaction gt on gt.guarantor_fund_detail_id = gfd.id") // - .append(" left join m_deposit_account_on_hold_transaction oht on oht.id = gt.deposit_on_hold_transaction_id"); + .append(" g.is_active as guarantorStatus,")// + .append(" cv.code_value as typeName, ")// + .append("gfd.amount,")// + .append(this.guarantorFundingMapper.schema())// + .append(",")// + .append(this.guarantorTransactionMapper.schema())// + .append(" FROM m_guarantor g") // + .append(" left JOIN m_code_value cv on g.client_reln_cv_id = cv.id")// + .append(" left JOIN m_guarantor_funding_details gfd on g.id = gfd.guarantor_id")// + .append(" left JOIN m_portfolio_account_associations aa on gfd.account_associations_id = aa.id and aa.is_active = true and aa.association_type_enum = ?")// + .append(" left JOIN m_savings_account sa on sa.id = aa.linked_savings_account_id ")// + .append(" left join m_guarantor_transaction gt on gt.guarantor_fund_detail_id = gfd.id") // + .append(" left join m_deposit_account_on_hold_transaction oht on oht.id = gt.deposit_on_hold_transaction_id"); public String schema() { return this.sqlBuilder.toString(); diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/jobs/filter/LoanCOBApiFilterTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/jobs/filter/LoanCOBApiFilterTest.java index 48ffd909c..8ddfdc10c 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/jobs/filter/LoanCOBApiFilterTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/jobs/filter/LoanCOBApiFilterTest.java @@ -159,7 +159,7 @@ class LoanCOBApiFilterTest { given(fineractQueryProperties.getInClauseParameterSizeLimit()).willReturn(65000); given(loanRepository.findAllNonClosedLoansBehindOrNullByLoanIds( eq(ThreadLocalContextUtil.getBusinessDateByType(BusinessDateType.COB_DATE)), anyList())) - .willReturn(Collections.emptyList()); + .willReturn(Collections.emptyList()); testObj.doFilterInternal(request, response, filterChain); verify(filterChain, times(1)).doFilter(request, response); @@ -202,7 +202,7 @@ class LoanCOBApiFilterTest { given(fineractQueryProperties.getInClauseParameterSizeLimit()).willReturn(65000); given(loanRepository.findAllNonClosedLoansBehindOrNullByLoanIds( eq(ThreadLocalContextUtil.getBusinessDateByType(BusinessDateType.COB_DATE)), anyList())) - .willReturn(Collections.emptyList()); + .willReturn(Collections.emptyList()); testObj.doFilterInternal(request, response, filterChain); verify(filterChain, times(1)).doFilter(request, response); @@ -230,7 +230,7 @@ class LoanCOBApiFilterTest { given(fineractQueryProperties.getInClauseParameterSizeLimit()).willReturn(65000); given(loanRepository.findAllNonClosedLoansBehindOrNullByLoanIds( eq(ThreadLocalContextUtil.getBusinessDateByType(BusinessDateType.COB_DATE)), anyList())) - .willReturn(Collections.emptyList()); + .willReturn(Collections.emptyList()); testObj.doFilterInternal(request, response, filterChain); verify(filterChain, times(1)).doFilter(request, response); @@ -260,7 +260,7 @@ class LoanCOBApiFilterTest { given(loanRepository.findAllNonClosedLoansBehindOrNullByLoanIds( eq(ThreadLocalContextUtil.getBusinessDateByType(BusinessDateType.COB_DATE)), anyList())) - .willReturn(Collections.emptyList()); + .willReturn(Collections.emptyList()); testObj.doFilterInternal(request, response, filterChain); verify(filterChain, times(1)).doFilter(request, response); @@ -290,7 +290,7 @@ class LoanCOBApiFilterTest { given(fineractQueryProperties.getInClauseParameterSizeLimit()).willReturn(65000); given(loanRepository.findAllNonClosedLoansBehindByLoanIds( eq(ThreadLocalContextUtil.getBusinessDateByType(BusinessDateType.COB_DATE)), anyList())) - .willReturn(Collections.singletonList(result)); + .willReturn(Collections.singletonList(result)); given(context.authenticatedUser()).willReturn(appUser); testObj.doFilterInternal(request, response, filterChain); @@ -321,7 +321,7 @@ class LoanCOBApiFilterTest { given(fineractQueryProperties.getInClauseParameterSizeLimit()).willReturn(65000); given(loanRepository.findAllNonClosedLoansBehindOrNullByLoanIds( eq(ThreadLocalContextUtil.getBusinessDateByType(BusinessDateType.COB_DATE)), anyList())) - .willReturn(Collections.emptyList()); + .willReturn(Collections.emptyList()); given(context.authenticatedUser()).willReturn(appUser); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java index 6d395ecd8..2aac4c3a7 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java @@ -57,7 +57,7 @@ public class ClientTest extends IntegrationTest { // https://issues.apache.org/jira/browse/FINERACT-1233 return ok(fineract().clients.create6( new PostClientsRequest().legalFormId(1).officeId(1).fullname("TestClient").dateFormat(dateFormat()).locale("en_US"))) - .getClientId(); + .getClientId(); } Optional retrieveFirst() { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java index 7c538c4f1..86f91c589 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java @@ -102,13 +102,13 @@ public class ReportsTest extends IntegrationTest { void testGeneralLedgerReportTableReportRunsSuccessfully() { assertThat(fineract().reportsRun.runReportGetData("GeneralLedgerReport Table", Map.of("R_endDate", "2013-04-30", "R_officeId", "1", "R_startDate", "2013-04-16", "R_GLAccountNO", "1"), false)) - .hasHttpStatus(200); + .hasHttpStatus(200); } @Test void testBalanceSheetTableReportRunsSuccessfully() { assertThat( fineract().reportsRun.runReportGetData("Balance Sheet Table", Map.of("R_endDate", "2013-04-30", "R_officeId", "1"), false)) - .hasHttpStatus(200); + .hasHttpStatus(200); } } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/StaffTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/StaffTest.java index 29a0f8b13..2a6e4e046 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/StaffTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/StaffTest.java @@ -54,7 +54,7 @@ public class StaffTest extends IntegrationTest { return ok(fineract().staff .create3(new PostStaffRequest().officeId(1L).firstname("StaffTest " + random()).lastname("Staffer " + random()) .externalId(random()).joiningDate(LocalDate.now(ZoneId.of("UTC"))).dateFormat(dateFormat()).locale("en_US"))) - .getResourceId(); + .getResourceId(); } Optional retrieveFirst() { diff --git a/renovate.json b/renovate.json index 27ac89ebf..691fd8071 100644 --- a/renovate.json +++ b/renovate.json @@ -14,22 +14,10 @@ "packageNames": ["com.amazonaws:*"], "schedule": ["monthly"] }, - { - "matchPackageNames": ["org.eclipse.persistence:eclipselink"], - "allowedVersions": "<=2.7.10" - }, - { - "matchPackageNames": ["org.eclipse.persistence:org.eclipse.persistence.jpa"], - "allowedVersions": "<=2.7.10" - }, { "matchPackageNames": ["org.glassfish.jaxb:jaxb-runtime"], "allowedVersions": "<=2.3.6" }, - { - "matchPackageNames": ["com.sun.mail:jakarta.mail"], - "allowedVersions": "<=1.6.7" - }, { "matchPackageNames": ["org.apache.oltu.oauth2:org.apache.oltu.oauth2.common"], "allowedVersions": "<=1.0.1" @@ -42,66 +30,10 @@ "matchPackageNames": ["org.apache.oltu.oauth2:org.apache.oltu.oauth2.httpclient4"], "allowedVersions": "<=1.0.1" }, - { - "matchPackageNames": ["org.glassfish.jersey.media:jersey-media-multipart"], - "allowedVersions": "<=2.36" - }, - { - "matchPackageNames": ["ch.qos.logback:logback-core"], - "allowedVersions": "<=1.2.11" - }, - { - "matchPackageNames": ["ch.qos.logback:logback-classic"], - "allowedVersions": "<=1.2.11" - }, - { - "matchPackageNames": ["org.slf4j:slf4j-api", "org.slf4j:slf4j-simple", "org.slf4j:jcl-over-slf4j", "org.slf4j:jul-to-slf4j", "org.slf4j:log4j-over-slf4j"], - "allowedVersions": "<=1.7.36" - }, - { - "matchPackageNames": ["org.springframework:spring-framework-bom"], - "allowedVersions": "<6.0.0" - }, - { - "matchPackageNames": ["org.springframework.boot"], - "allowedVersions": "<3.0.0" - }, - { - "matchPackageNames": ["jakarta.ws.rs"], - "allowedVersions": "<3.0.0" - }, - { - "matchPackageNames": ["jakarta.jms"], - "allowedVersions": "<3.0.0" - }, - { - "matchPackageNames": ["jakarta.annotation"], - "allowedVersions": "<2.0.0" - }, - { - "matchPackageNames": ["io.rest-assured"], - "allowedVersions": "<5.0.0" - }, - { - "matchPackageNames": ["gradle"], - "allowedVersions": "<=7.5.1" - }, { "matchPackageNames": ["org.mariadb.jdbc:mariadb-java-client"], "allowedVersions": "<=3.0.9" }, - { - "matchPackageNames": ["org.apache.tomcat:tomcat"], - "allowedVersions": "<=9.0.69" - }, - { - "matchPackageNames": ["org.openapi.generator"], - "allowedVersions": "<=6.2.1" - }, - { - "matchPackageNames": ["com.diffplug.spotless"], - "allowedVersions": "<=6.15.0" - }, { "depTypeList": ["dependencies"], "updateTypes": ["patch", "minor"],