FINERACT-2326: Refractor redundant and some deprecated code as per new Java 21 style (Phase 2)

Author: Aman-Mittal

custom/acme/event/starter/src/main/java/com/acme/fineract/event/starter/AcmeEventAutoConfiguration.java

@@ -20,8 +20,7 @@
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScans;
 
 @AutoConfiguration
-@ComponentScans({ @ComponentScan("com.acme.fineract.event.externalevent") })
+@ComponentScan("com.acme.fineract.event.externalevent")
 public class AcmeEventAutoConfiguration {}

custom/acme/loan/starter/src/main/java/com/acme/fineract/loan/starter/AcmeLoanAutoConfiguration.java

@@ -26,11 +26,9 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScans;
 
 @AutoConfiguration
-@ComponentScans({ @ComponentScan("com.acme.fineract.loan.cob"), @ComponentScan("com.acme.fineract.loan.processor"),
-        @ComponentScan("com.acme.fineract.loan.job") })
+@ComponentScan(basePackages = { "com.acme.fineract.loan.cob", "com.acme.fineract.loan.processor", "com.acme.fineract.loan.job" })
 @ConditionalOnProperty("acme.loan.enabled")
 public class AcmeLoanAutoConfiguration {
 

fineract-accounting/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java

@@ -24,7 +24,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.POST;
@@ -52,9 +51,13 @@ public class AccrualAccountingApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(summary = "Executes Periodic Accrual Accounting", method = "POST", description = "Mandatory Fields\n" + "\n" + "tillDate\n")
+    @Operation(summary = "Executes Periodic Accrual Accounting", method = "POST", description = """
+            Mandatory Fields
+
+            tillDate
+            """)
     @RequestBody(required = true, content = @Content(schema = @Schema(implementation = AccrualAccountingApiResourceSwagger.PostRunaccrualsRequest.class)))
-    @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK") })
+    @ApiResponse(responseCode = "200", description = "OK")
     public CommandProcessingResult executePeriodicAccrualAccounting(@Parameter(hidden = true) AccrualAccountRequest accrualAccountRequest) {
         final CommandWrapper commandRequest = new CommandWrapperBuilder().excuteAccrualAccounting()
                 .withJson(apiJsonSerializerService.serialize(accrualAccountRequest)).build();

fineract-accounting/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java

@@ -24,7 +24,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
@@ -69,13 +68,15 @@
 
 @Path("/v1/accountingrules")
 @Component
-@Tag(name = "Accounting Rules", description = "It is typical scenario in MFI's that non accountants pass journal entries on a regular basis. For Ex: A branch office might deposit their entire cash at hand to their Bank account at the end of a working day. The branch office users might not understand enough of accounting to figure out which account needs to get credited and which account needs to be debited to represent this transaction.\n"
-        + "\n"
-        + "Enter accounting rules, an abstraction on top of manual Journal entires for enabling simpler data entry. An accounting rule can define any of the following abstractions\n"
-        + "\n" + "A Simple journal entry where both the credit and debit account have been preselected\n"
-        + "A Simple journal entry where either credit or debit accounts have been limited to a pre-selected list of accounts (Ex: Debit account should be one of \"Bank of America\" of \"JP Morgan\" and credit account should be \"Cash\")\n"
-        + "A Compound journal entry where multiple debits and / or multiple credits may be made amongst a set of preselected list of accounts (Ex: Credit account should be either \"Bank Of America\" or \"Cash\" and debit account can be \"Employee Salary\" and/or \"Miscellenous Expenses\")\n"
-        + "An accounting rule can also be optionally associated with a branch, so that only a particular Branch's users have access to the rule")
+@Tag(name = "Accounting Rules", description = """
+        It is typical scenario in MFI's that non accountants pass journal entries on a regular basis. For Ex: A branch office might deposit their entire cash at hand to their Bank account at the end of a working day. The branch office users might not understand enough of accounting to figure out which account needs to get credited and which account needs to be debited to represent this transaction.
+
+        Enter accounting rules, an abstraction on top of manual Journal entires for enabling simpler data entry. An accounting rule can define any of the following abstractions
+
+        A Simple journal entry where both the credit and debit account have been preselected
+        A Simple journal entry where either credit or debit accounts have been limited to a pre-selected list of accounts (Ex: Debit account should be one of "Bank of America" of "JP Morgan" and credit account should be "Cash")
+        A Compound journal entry where multiple debits and / or multiple credits may be made amongst a set of preselected list of accounts (Ex: Credit account should be either "Bank Of America" or "Cash" and debit account can be "Employee Salary" and/or "Miscellenous Expenses")
+        An accounting rule can also be optionally associated with a branch, so that only a particular Branch's users have access to the rule""")
 @RequiredArgsConstructor
 public class AccountingRuleApiResource {
 
@@ -94,8 +95,14 @@ public class AccountingRuleApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(summary = "Retrieve Accounting Rule Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
-            + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "Example Request:\n" + "\n" + "accountingrules/template")
+    @Operation(summary = "Retrieve Accounting Rule Details Template", description = """
+            This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:
+
+            Field Defaults
+            Allowed Value Lists
+            Example Request:
+
+            accountingrules/template""")
     public AccountingRuleData retrieveTemplate() {
         context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSION);
         return handleTemplate(null);
@@ -104,8 +111,12 @@ public AccountingRuleData retrieveTemplate() {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(summary = "Retrieve Accounting Rules", description = "Returns the list of defined accounting rules.\n" + "\n"
-            + "Example Requests:\n" + "\n" + "accountingrules")
+    @Operation(summary = "Retrieve Accounting Rules", description = """
+            Returns the list of defined accounting rules.
+
+            Example Requests:
+
+            accountingrules""")
     public List<AccountingRuleData> retrieveAllAccountingRules(@Context final UriInfo uriInfo) {
         final AppUser currentUser = context.authenticatedUser();
         currentUser.validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSION);
@@ -122,8 +133,12 @@ public List<AccountingRuleData> retrieveAllAccountingRules(@Context final UriInf
     @Path("{accountingRuleId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(summary = "Retrieve a Accounting rule", description = "Returns the details of a defined Accounting rule.\n" + "\n"
-            + "Example Requests:\n" + "\n" + "accountingrules/1")
+    @Operation(summary = "Retrieve a Accounting rule", description = """
+            Returns the details of a defined Accounting rule.
+
+            Example Requests:
+
+            accountingrules/1""")
     public AccountingRuleData retreiveAccountingRule(
             @PathParam("accountingRuleId") @Parameter(description = "accountingRuleId") final Long accountingRuleId,
             @Context final UriInfo uriInfo) {
@@ -138,12 +153,18 @@ public AccountingRuleData retreiveAccountingRule(
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(summary = "Create/Define a Accounting rule", description = "Define a new Accounting rule.\n" + "\n" + "Mandatory Fields\n"
-            + "name, officeId,\n" + "accountToDebit OR debitTags,\n" + "accountToCredit OR creditTags.\n" + "\n" + "Optional Fields\n"
-            + "description")
+    @Operation(summary = "Create/Define a Accounting rule", description = """
+            Define a new Accounting rule.
+
+            Mandatory Fields
+            name, officeId,
+            accountToDebit OR debitTags,
+            accountToCredit OR creditTags.
+
+            Optional Fields
+            description""")
     @RequestBody(content = @Content(schema = @Schema(implementation = AccountRuleRequest.class)))
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.PostAccountingRulesResponse.class))) })
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.PostAccountingRulesResponse.class)))
     public CommandProcessingResult createAccountingRule(@Parameter(hidden = true) AccountRuleRequest accountRuleRequest) {
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createAccountingRule()
                 .withJson(apiJsonSerializerService.serialize(accountRuleRequest)).build();
@@ -157,8 +178,7 @@ public CommandProcessingResult createAccountingRule(@Parameter(hidden = true) Ac
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Update a Accounting Rule", description = "Updates the details of a Accounting rule.")
     @RequestBody(content = @Content(schema = @Schema(implementation = AccountRuleRequest.class)))
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.PutAccountingRulesResponse.class))) })
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.PutAccountingRulesResponse.class)))
     public CommandProcessingResult updateAccountingRule(
             @PathParam("accountingRuleId") @Parameter(description = "accountingRuleId") final Long accountingRuleId,
             @Parameter(hidden = true) AccountRuleRequest accountRuleRequest) {
@@ -173,8 +193,7 @@ public CommandProcessingResult updateAccountingRule(
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Delete a Accounting Rule", description = "Deletes a Accounting rule.")
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.DeleteAccountingRulesResponse.class))) })
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.DeleteAccountingRulesResponse.class)))
     public CommandProcessingResult deleteAccountingRule(
             @PathParam("accountingRuleId") @Parameter(description = "accountingRuleId") final Long accountingRuleId) {
 

fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java

@@ -81,8 +81,7 @@ public Integer getValue() {
         }
 
         public static CashAccountsForLoan fromInt(final int i) {
-            final CashAccountsForLoan type = intToEnumMap.get(Integer.valueOf(i));
-            return type;
+            return intToEnumMap.get(i);
         }
     }
 
@@ -142,8 +141,7 @@ public Integer getValue() {
         }
 
         public static AccrualAccountsForLoan fromInt(final int i) {
-            final AccrualAccountsForLoan type = intToEnumMap.get(Integer.valueOf(i));
-            return type;
+            return intToEnumMap.get(i);
         }
 
     }
@@ -297,8 +295,7 @@ public Integer getValue() {
         }
 
         public static CashAccountsForSavings fromInt(final int i) {
-            final CashAccountsForSavings type = intToEnumMap.get(Integer.valueOf(i));
-            return type;
+            return intToEnumMap.get(i);
         }
     }
 
@@ -346,8 +343,7 @@ public Integer getValue() {
         }
 
         public static AccrualAccountsForSavings fromInt(final int i) {
-            final AccrualAccountsForSavings type = intToEnumMap.get(Integer.valueOf(i));
-            return type;
+            return intToEnumMap.get(i);
         }
     }
 
@@ -492,8 +488,7 @@ public String getValueAsString() {
         }
 
         public static FinancialActivity fromInt(final int financialActivityId) {
-            final FinancialActivity type = intToEnumMap.get(Integer.valueOf(financialActivityId));
-            return type;
+            return intToEnumMap.get(financialActivityId);
         }
 
         public static FinancialActivityData toFinancialActivityData(final int financialActivityId) {
@@ -506,8 +501,7 @@ public static List<FinancialActivityData> getAllFinancialActivities() {
         }
 
         private static FinancialActivityData convertToFinancialActivityData(final FinancialActivity type) {
-            FinancialActivityData financialActivityData = new FinancialActivityData(type.value, type.code, type.getMappedGLAccountType());
-            return financialActivityData;
+            return new FinancialActivityData(type.value, type.code, type.getMappedGLAccountType());
         }
     }
 
@@ -545,8 +539,7 @@ public Integer getValue() {
         }
 
         public static CashAccountsForShares fromInt(final int i) {
-            final CashAccountsForShares type = intToEnumMap.get(Integer.valueOf(i));
-            return type;
+            return intToEnumMap.get(i);
         }
     }
 

fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java

@@ -37,9 +37,7 @@ public static EnumOptionData gLAccountType(final int id) {
     }
 
     public static EnumOptionData gLAccountType(final GLAccountType accountType) {
-        final EnumOptionData optionData = new EnumOptionData(accountType.getValue().longValue(), accountType.getCode(),
-                accountType.toString());
-        return optionData;
+        return new EnumOptionData(accountType.getValue().longValue(), accountType.getCode(), accountType.toString());
     }
 
     public static List<EnumOptionData> gLAccountType(final GLAccountType[] accountTypes) {
@@ -55,9 +53,7 @@ public static EnumOptionData gLAccountUsage(final int id) {
     }
 
     public static EnumOptionData gLAccountUsage(final GLAccountUsage accountUsage) {
-        final EnumOptionData optionData = new EnumOptionData(accountUsage.getValue().longValue(), accountUsage.getCode(),
-                accountUsage.toString());
-        return optionData;
+        return new EnumOptionData(accountUsage.getValue().longValue(), accountUsage.getCode(), accountUsage.toString());
     }
 
     public static List<EnumOptionData> gLAccountUsage(final GLAccountUsage[] accountUsages) {
@@ -73,9 +69,7 @@ public static EnumOptionData journalEntryType(final int id) {
     }
 
     public static EnumOptionData journalEntryType(final JournalEntryType journalEntryType) {
-        final EnumOptionData optionData = new EnumOptionData(journalEntryType.getValue().longValue(), journalEntryType.getCode(),
-                journalEntryType.toString());
-        return optionData;
+        return new EnumOptionData(journalEntryType.getValue().longValue(), journalEntryType.getCode(), journalEntryType.toString());
     }
 
     public static List<EnumOptionData> journalEntryTypes(final JournalEntryType[] journalEntryTypes) {
@@ -91,18 +85,16 @@ public static EnumOptionData portfolioProductType(final int id) {
     }
 
     public static EnumOptionData portfolioProductType(final PortfolioProductType portfolioProductType) {
-        final EnumOptionData optionData = new EnumOptionData(portfolioProductType.getValue().longValue(), portfolioProductType.getCode(),
+        return new EnumOptionData(portfolioProductType.getValue().longValue(), portfolioProductType.getCode(),
                 portfolioProductType.toString());
-        return optionData;
     }
 
     public static EnumOptionData accountingRuleType(final int id) {
         return accountingRuleType(AccountingRuleType.fromInt(id));
     }
 
     public static EnumOptionData accountingRuleType(final AccountingRuleType type) {
-        final EnumOptionData optionData = new EnumOptionData(type.getValue().longValue(), type.getCode(), type.toString());
-        return optionData;
+        return new EnumOptionData(type.getValue().longValue(), type.getCode(), type.toString());
     }
 
     public static List<EnumOptionData> accountingRuleTypes(final AccountingRuleType[] accountingRuleTypes) {

fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingRuleType.java

@@ -45,8 +45,7 @@ public enum AccountingRuleType {
     }
 
     public static AccountingRuleType fromInt(final Integer ruleTypeValue) {
-        final AccountingRuleType type = intToEnumMap.get(ruleTypeValue);
-        return type;
+        return intToEnumMap.get(ruleTypeValue);
     }
 
     AccountingRuleType(final Integer value, final String code, final String description) {

fineract-core/src/main/java/org/apache/fineract/portfolio/accountdetails/domain/AccountType.java

@@ -44,26 +44,14 @@ public enum AccountType {
     }
 
     public static AccountType fromInt(final Integer accountTypeValue) {
-
-        AccountType enumeration = AccountType.INVALID;
-        switch (accountTypeValue) {
-            case 1:
-                enumeration = AccountType.INDIVIDUAL;
-            break;
-            case 2:
-                enumeration = AccountType.GROUP;
-            break;
-            case 3:
-                enumeration = AccountType.JLG;
-            break;
-            case 4:
-                enumeration = AccountType.GLIM;
-            break;
-            case 5:
-                enumeration = AccountType.GSIM;
-            break;
-        }
-        return enumeration;
+        return switch (accountTypeValue) {
+            case 1 -> AccountType.INDIVIDUAL;
+            case 2 -> AccountType.GROUP;
+            case 3 -> AccountType.JLG;
+            case 4 -> AccountType.GLIM;
+            case 5 -> AccountType.GSIM;
+            default -> AccountType.INVALID;
+        };
     }
 
     public static AccountType fromName(final String name) {

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/FineractClientConfiguration.java

@@ -42,9 +42,8 @@ public FineractFeignClient fineractFeignClient() {
         String apiBaseUrl = baseUrl + "/fineract-provider/api/";
         boolean debugEnabled = Boolean.parseBoolean(System.getProperty("fineract.feign.debug", "false"));
 
-        FineractFeignClient client = FineractFeignClient.builder().baseUrl(apiBaseUrl).credentials(username, password).tenantId(tenantId)
+        return FineractFeignClient.builder().baseUrl(apiBaseUrl).credentials(username, password).tenantId(tenantId)
                 .disableSslVerification(true).debug(debugEnabled).connectTimeout(60, TimeUnit.SECONDS)
                 .readTimeout((int) readTimeout, TimeUnit.SECONDS).build();
-        return client;
     }
 }