From 9fe993342b40d936ad695e89f2f1c9bb13bf3ba1 Mon Sep 17 00:00:00 2001 From: a7med3del1973 Date: Thu, 13 Mar 2025 00:42:54 +0200 Subject: [PATCH] FINERACT-2181: Refactor UpdateTrialBalanceDetailsConfig injection instead of Autowired --- .../UpdateTrialBalanceDetailsConfig.java | 15 ++++++--------- .../fineract/test/api/ApiConfiguration.java | 6 +++--- .../test/api/FineractClientConfiguration.java | 6 +++--- .../test/stepdef/hook/TestRailLifecycleHook.java | 9 ++++----- .../AddPeriodicAccrualEntriesConfig.java | 12 +++++------- .../UpdateLoanArrearsAgeingConfig.java | 12 +++++------- 6 files changed, 26 insertions(+), 34 deletions(-) diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/jobs/updatetrialbalancedetails/UpdateTrialBalanceDetailsConfig.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/jobs/updatetrialbalancedetails/UpdateTrialBalanceDetailsConfig.java index 2ee0314a2..3b764c3e7 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/jobs/updatetrialbalancedetails/UpdateTrialBalanceDetailsConfig.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/jobs/updatetrialbalancedetails/UpdateTrialBalanceDetailsConfig.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.accounting.glaccount.jobs.updatetrialbalancedetails; +import lombok.RequiredArgsConstructor; import org.apache.fineract.accounting.glaccount.domain.TrialBalanceRepositoryWrapper; import org.apache.fineract.infrastructure.core.service.database.RoutingDataSourceServiceFactory; import org.apache.fineract.infrastructure.jobs.service.JobName; @@ -27,22 +28,18 @@ import org.springframework.batch.core.job.builder.JobBuilder; import org.springframework.batch.core.launch.support.RunIdIncrementer; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.builder.StepBuilder; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.PlatformTransactionManager; @Configuration +@RequiredArgsConstructor public class UpdateTrialBalanceDetailsConfig { - @Autowired - private JobRepository jobRepository; - @Autowired - private PlatformTransactionManager transactionManager; - @Autowired - private RoutingDataSourceServiceFactory dataSourceServiceFactory; - @Autowired - private TrialBalanceRepositoryWrapper trialBalanceRepositoryWrapper; + private final JobRepository jobRepository; + private final PlatformTransactionManager transactionManager; + private final RoutingDataSourceServiceFactory dataSourceServiceFactory; + private final TrialBalanceRepositoryWrapper trialBalanceRepositoryWrapper; @Bean protected Step updateTrialBalanceDetailsStep() { diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/ApiConfiguration.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/ApiConfiguration.java index 8054d746a..4ec481857 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/ApiConfiguration.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/ApiConfiguration.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.test.api; +import lombok.RequiredArgsConstructor; import org.apache.fineract.client.services.BatchApiApi; import org.apache.fineract.client.services.BusinessDateManagementApi; import org.apache.fineract.client.services.BusinessStepConfigurationApi; @@ -56,15 +57,14 @@ import org.apache.fineract.client.services.SchedulerJobApi; import org.apache.fineract.client.services.UsersApi; import org.apache.fineract.client.util.FineractClient; import org.apache.fineract.test.stepdef.loan.LoanProductsCustomApi; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration +@RequiredArgsConstructor public class ApiConfiguration { - @Autowired - private FineractClient fineractClient; + private final FineractClient fineractClient; @Bean public SchedulerApi schedulerApi() { diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/FineractClientConfiguration.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/FineractClientConfiguration.java index 5f705b301..27a71041e 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/FineractClientConfiguration.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/FineractClientConfiguration.java @@ -19,18 +19,18 @@ package org.apache.fineract.test.api; import java.time.Duration; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.fineract.client.util.FineractClient; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration @Slf4j +@RequiredArgsConstructor public class FineractClientConfiguration { - @Autowired - private ApiProperties apiProperties; + private final ApiProperties apiProperties; @Bean public FineractClient fineractClient() { diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/hook/TestRailLifecycleHook.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/hook/TestRailLifecycleHook.java index ab39f3bb7..50081d2a4 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/hook/TestRailLifecycleHook.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/hook/TestRailLifecycleHook.java @@ -20,20 +20,19 @@ package org.apache.fineract.test.stepdef.hook; import io.cucumber.java.After; import io.cucumber.java.Scenario; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.fineract.test.testrail.TestRailClient; import org.apache.fineract.test.testrail.TestRailProperties; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @Slf4j +@RequiredArgsConstructor public class TestRailLifecycleHook { - @Autowired - private TestRailProperties testRailProperties; + private final TestRailProperties testRailProperties; - @Autowired - private ApplicationContext applicationContext; + private final ApplicationContext applicationContext; @After public void tearDown(Scenario scenario) { diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/addperiodicaccrualentries/AddPeriodicAccrualEntriesConfig.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/addperiodicaccrualentries/AddPeriodicAccrualEntriesConfig.java index ca952a1d6..49a0d29af 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/addperiodicaccrualentries/AddPeriodicAccrualEntriesConfig.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/addperiodicaccrualentries/AddPeriodicAccrualEntriesConfig.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.portfolio.loanaccount.jobs.addperiodicaccrualentries; +import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.jobs.service.JobName; import org.apache.fineract.portfolio.loanaccount.service.LoanAccrualsProcessingService; import org.springframework.batch.core.Job; @@ -26,20 +27,17 @@ import org.springframework.batch.core.job.builder.JobBuilder; import org.springframework.batch.core.launch.support.RunIdIncrementer; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.builder.StepBuilder; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.PlatformTransactionManager; @Configuration +@RequiredArgsConstructor public class AddPeriodicAccrualEntriesConfig { - @Autowired - private JobRepository jobRepository; - @Autowired - private PlatformTransactionManager transactionManager; - @Autowired - private LoanAccrualsProcessingService loanAccrualsProcessingService; + private final JobRepository jobRepository; + private final PlatformTransactionManager transactionManager; + private final LoanAccrualsProcessingService loanAccrualsProcessingService; @Bean protected Step addPeriodicAccrualEntriesStep() { diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/UpdateLoanArrearsAgeingConfig.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/UpdateLoanArrearsAgeingConfig.java index 773564b40..063285c18 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/UpdateLoanArrearsAgeingConfig.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/UpdateLoanArrearsAgeingConfig.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.portfolio.loanaccount.jobs.updateloanarrearsageing; +import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.jobs.service.JobName; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; @@ -25,21 +26,18 @@ import org.springframework.batch.core.job.builder.JobBuilder; import org.springframework.batch.core.launch.support.RunIdIncrementer; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.builder.StepBuilder; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.PlatformTransactionManager; @Configuration +@RequiredArgsConstructor public class UpdateLoanArrearsAgeingConfig { - @Autowired - private JobRepository jobRepository; - @Autowired - private PlatformTransactionManager transactionManager; + private final JobRepository jobRepository; + private final PlatformTransactionManager transactionManager; - @Autowired - private LoanArrearsAgeingUpdateHandler updateLoanArrearsAgingService; + private final LoanArrearsAgeingUpdateHandler updateLoanArrearsAgingService; @Bean protected Step updateLoanArrearsAgeingStep() {