FINERACT-1724: Removed restrictions from renovate.json and upgraded spotless plugin

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

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'
-
     }
 }

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(),
+            default ->
-                    "Invalid");
+                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(),
+            default ->
-                    "Invalid");
+                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(),
+            default ->
-                    "Invalid");
+                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(),
+            default ->
-                    "Invalid");
+                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(),
+            default ->
-                    "Invalid");
+                new EnumOptionData(AmortizationMethod.INVALID.getValue().longValue(), AmortizationMethod.INVALID.getCode(), "Invalid");
         };
     }
 
@@ -224,8 +224,8 @@ 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(
+            case SAME_AS_REPAYMENT_PERIOD ->
-                    InterestCalculationPeriodMethod.SAME_AS_REPAYMENT_PERIOD.getValue().longValue(),
+                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,8 +244,8 @@ 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(
+            case REPAYMENT_AT_DISBURSEMENT ->
-                    LoanTransactionType.REPAYMENT_AT_DISBURSEMENT.getValue().longValue(),
+                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");
@@ -323,8 +323,8 @@ 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(
+            case CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT ->
-                    LoanStatus.CLOSED_RESCHEDULE_OUTSTANDING_AMOUNT.getValue().longValue(),
+                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(),
@@ -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(),
+            default ->
-                    "Invalid");
+                new EnumOptionData(LoanProductParamType.INVALID.getValue().longValue(), LoanProductParamType.INVALID.getCode(), "Invalid");
         };
     }
 
@@ -390,8 +390,8 @@ 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(
+            case INTEREST_RATE_FROM_INSTALLMENT ->
-                    LoanTermVariationType.INTEREST_RATE_FROM_INSTALLMENT.getValue().longValue(),
+                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,11 +456,11 @@ 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(
+            case REDUCE_NUMBER_OF_INSTALLMENTS ->
-                    LoanRescheduleStrategyMethod.REDUCE_NUMBER_OF_INSTALLMENTS.getValue().longValue(),
+                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(
+            case RESCHEDULE_NEXT_REPAYMENTS ->
-                    LoanRescheduleStrategyMethod.RESCHEDULE_NEXT_REPAYMENTS.getValue().longValue(),
+                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");

fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/ThitsaWorksCreditBureauIntegrationWritePlatformServiceImpl.java

@@ -125,8 +125,8 @@ 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()
+            case UPLOAD_CREDIT_REPORT ->
-                    .setType(MultipartBody.FORM)
+                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());

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java

@@ -203,8 +203,7 @@ public class LoanSummaryData {
                 .setTotalPayoutRefundReversed(totalPayoutRefundReversed).setTotalGoodwillCredit(totalGoodwillCredit)
                 .setTotalGoodwillCreditReversed(totalGoodwillCreditReversed).setTotalChargeAdjustment(totalChargeAdjustment)
                 .setTotalChargeAdjustmentReversed(totalChargeAdjustmentReversed).setTotalChargeback(totalChargeback)
-                        .setTotalCreditBalanceRefund(totalCreditBalanceRefund)
+                .setTotalCreditBalanceRefund(totalCreditBalanceRefund).setTotalCreditBalanceRefundReversed(totalCreditBalanceRefundReversed)
-                        .setTotalCreditBalanceRefundReversed(totalCreditBalanceRefundReversed)
                 .setTotalRepaymentTransaction(totalRepaymentTransaction)
                 .setTotalRepaymentTransactionReversed(totalRepaymentTransactionReversed);
     }

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"],