Lombok refactoring continued

ptuomola · Apr 9, 2022 · ab80cc0 · ab80cc0
1 parent ddd97f2
commit ab80cc0
Show file tree

Hide file tree

Showing 24 changed files with 79 additions and 309 deletions.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java
@@ -37,13 +37,13 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.serialization.BatchRequestJsonHelper;
 import org.apache.fineract.batch.service.BatchApiService;
 import org.apache.fineract.infrastructure.core.serialization.ToApiJsonSerializer;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
@@ -70,31 +70,14 @@
         + "Batch API uses Json Path to handle dependent parameters. For example, if request '2' is referencing request '1' and in the \"body\" or in \"relativeUrl\" of request '2', there is a dependent parameter (which will look like \"$.parameter_name\"), then Batch API will internally substitute this dependent parameter from the response body of request '1'.\n"
         + "\n"
         + "Batch API is able to handle deeply nested dependent requests as well nested parameters. As shown in the example, requests are dependent on each other as, 1<--2<--6, i.e a nested dependency, where request '6' is not directly dependent on request '1' but still it is one of the nested child of request '1'. In the same way Batch API could handle a deeply nested dependent value, such as {..[..{..,$.parameter_name,..}..]}.")
+@RequiredArgsConstructor
 public class BatchApiResource {
 
     private final PlatformSecurityContext context;
     private final ToApiJsonSerializer<BatchResponse> toApiJsonSerializer;
     private final BatchApiService service;
     private final BatchRequestJsonHelper batchRequestJsonHelper;
 
-    /**
-     * Constructs a 'BatchApiService' with context, toApiJsonSerializer, service and batchRequestJsonHelper.
-     *
-     * @param context
-     * @param toApiJsonSerializer
-     * @param service
-     * @param batchRequestJsonHelper
-     */
-    @Autowired
-    public BatchApiResource(final PlatformSecurityContext context, final ToApiJsonSerializer<BatchResponse> toApiJsonSerializer,
-            final BatchApiService service, final BatchRequestJsonHelper batchRequestJsonHelper) {
-
-        this.context = context;
-        this.toApiJsonSerializer = toApiJsonSerializer;
-        this.service = service;
-        this.batchRequestJsonHelper = batchRequestJsonHelper;
-    }
-
     /**
      * Rest assured POST method to get {@link BatchRequest} and returns back the consolidated {@link BatchResponse}
      *

diff --git a/...act-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java b/...act-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.fineract.batch.command.internal.UnknownCommandStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
@@ -46,7 +45,6 @@ public class CommandStrategyProvider {
      *
      * @param applicationContext
      */
-    @Autowired
     public CommandStrategyProvider(final ApplicationContext applicationContext) {
 
         // calls init() function of this class.

diff --git a/...c/main/java/org/apache/fineract/batch/command/internal/ActivateClientCommandStrategy.java b/...c/main/java/org/apache/fineract/batch/command/internal/ActivateClientCommandStrategy.java
@@ -21,13 +21,13 @@
 import com.google.common.base.Splitter;
 import java.util.List;
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.client.api.ClientsApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -44,15 +44,11 @@
  * @see org.apache.fineract.batch.domain.BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class ActivateClientCommandStrategy implements CommandStrategy {
 
     private final ClientsApiResource clientsApiResource;
 
-    @Autowired
-    public ActivateClientCommandStrategy(final ClientsApiResource clientsApiResource) {
-        this.clientsApiResource = clientsApiResource;
-    }
-
     @Override
     public BatchResponse execute(final BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {
 

diff --git a/...er/src/main/java/org/apache/fineract/batch/command/internal/ApplyLoanCommandStrategy.java b/...er/src/main/java/org/apache/fineract/batch/command/internal/ApplyLoanCommandStrategy.java
@@ -19,13 +19,13 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.loanaccount.api.LoansApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -42,15 +42,11 @@
  * @see org.apache.fineract.batch.domain.BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class ApplyLoanCommandStrategy implements CommandStrategy {
 
     private final LoansApiResource loansApiResource;
 
-    @Autowired
-    public ApplyLoanCommandStrategy(final LoansApiResource loansApiResource) {
-        this.loansApiResource = loansApiResource;
-    }
-
     @Override
     public BatchResponse execute(BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {
 

diff --git a/...src/main/java/org/apache/fineract/batch/command/internal/ApplySavingsCommandStrategy.java b/...src/main/java/org/apache/fineract/batch/command/internal/ApplySavingsCommandStrategy.java
@@ -19,13 +19,13 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.savings.api.SavingsAccountsApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -42,15 +42,11 @@
  * @see org.apache.fineract.batch.domain.BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class ApplySavingsCommandStrategy implements CommandStrategy {
 
     private final SavingsAccountsApiResource savingsAccountsApiResource;
 
-    @Autowired
-    public ApplySavingsCommandStrategy(final SavingsAccountsApiResource savingsAccountsApiResource) {
-        this.savingsAccountsApiResource = savingsAccountsApiResource;
-    }
-
     @Override
     public BatchResponse execute(BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {
 

diff --git a/.../src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanCommandStrategy.java b/.../src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanCommandStrategy.java
@@ -21,13 +21,13 @@
 import com.google.common.base.Splitter;
 import java.util.List;
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.loanaccount.api.LoansApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -44,15 +44,11 @@
  * @see org.apache.fineract.batch.domain.BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class ApproveLoanCommandStrategy implements CommandStrategy {
 
     private final LoansApiResource loansApiResource;
 
-    @Autowired
-    public ApproveLoanCommandStrategy(final LoansApiResource loansApiResource) {
-        this.loansApiResource = loansApiResource;
-    }
-
     @Override
     public BatchResponse execute(final BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {
 

diff --git a/...java/org/apache/fineract/batch/command/internal/ApproveLoanRescheduleCommandStrategy.java b/...java/org/apache/fineract/batch/command/internal/ApproveLoanRescheduleCommandStrategy.java
@@ -21,25 +21,21 @@
 import com.google.common.base.Splitter;
 import java.util.List;
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.loanaccount.rescheduleloan.api.RescheduleLoansApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class ApproveLoanRescheduleCommandStrategy implements CommandStrategy {
 
     private final RescheduleLoansApiResource rescheduleLoansApiResource;
 
-    @Autowired
-    public ApproveLoanRescheduleCommandStrategy(final RescheduleLoansApiResource rescheduleLoansApiResource) {
-        this.rescheduleLoansApiResource = rescheduleLoansApiResource;
-    }
-
     @Override
     public BatchResponse execute(BatchRequest request, UriInfo uriInfo) {
         final BatchResponse response = new BatchResponse();

diff --git a/...c/main/java/org/apache/fineract/batch/command/internal/CollectChargesCommandStrategy.java b/...c/main/java/org/apache/fineract/batch/command/internal/CollectChargesCommandStrategy.java
@@ -21,13 +21,13 @@
 import com.google.common.base.Splitter;
 import java.util.List;
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -44,15 +44,11 @@
  * @see org.apache.fineract.batch.domain.BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class CollectChargesCommandStrategy implements CommandStrategy {
 
     private final LoanChargesApiResource loanChargesApiResource;
 
-    @Autowired
-    public CollectChargesCommandStrategy(final LoanChargesApiResource loanChargesApiResource) {
-        this.loanChargesApiResource = loanChargesApiResource;
-    }
-
     @Override
     public BatchResponse execute(BatchRequest request, UriInfo uriInfo) {
 

diff --git a/...src/main/java/org/apache/fineract/batch/command/internal/CreateChargeCommandStrategy.java b/...src/main/java/org/apache/fineract/batch/command/internal/CreateChargeCommandStrategy.java
@@ -21,13 +21,13 @@
 import com.google.common.base.Splitter;
 import java.util.List;
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -44,15 +44,11 @@
  * @see org.apache.fineract.batch.domain.BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class CreateChargeCommandStrategy implements CommandStrategy {
 
     private final LoanChargesApiResource loanChargesApiResource;
 
-    @Autowired
-    public CreateChargeCommandStrategy(final LoanChargesApiResource loanChargesApiResource) {
-        this.loanChargesApiResource = loanChargesApiResource;
-    }
-
     @Override
     public BatchResponse execute(BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {
 

diff --git a/...src/main/java/org/apache/fineract/batch/command/internal/CreateClientCommandStrategy.java b/...src/main/java/org/apache/fineract/batch/command/internal/CreateClientCommandStrategy.java
@@ -19,13 +19,13 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.client.api.ClientsApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -42,15 +42,11 @@
  * @see org.apache.fineract.batch.domain.BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class CreateClientCommandStrategy implements CommandStrategy {
 
     private final ClientsApiResource clientsApiResource;
 
-    @Autowired
-    public CreateClientCommandStrategy(final ClientsApiResource clientsApiResource) {
-        this.clientsApiResource = clientsApiResource;
-    }
-
     @Override
     public BatchResponse execute(final BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {
 

diff --git a/...src/main/java/org/apache/fineract/batch/command/internal/DisburseLoanCommandStrategy.java b/...src/main/java/org/apache/fineract/batch/command/internal/DisburseLoanCommandStrategy.java
@@ -21,13 +21,13 @@
 import com.google.common.base.Splitter;
 import java.util.List;
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.loanaccount.api.LoansApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -44,15 +44,11 @@
  * @see org.apache.fineract.batch.domain.BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class DisburseLoanCommandStrategy implements CommandStrategy {
 
     private final LoansApiResource loansApiResource;
 
-    @Autowired
-    public DisburseLoanCommandStrategy(final LoansApiResource loansApiResource) {
-        this.loansApiResource = loansApiResource;
-    }
-
     @Override
     public BatchResponse execute(final BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {
 

diff --git a/...er/src/main/java/org/apache/fineract/batch/command/internal/RepayLoanCommandStrategy.java b/...er/src/main/java/org/apache/fineract/batch/command/internal/RepayLoanCommandStrategy.java
@@ -21,13 +21,13 @@
 import com.google.common.base.Splitter;
 import java.util.List;
 import javax.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.portfolio.loanaccount.api.LoanTransactionsApiResource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -42,15 +42,11 @@
  * @see BatchResponse
  */
 @Component
+@RequiredArgsConstructor
 public class RepayLoanCommandStrategy implements CommandStrategy {
 
     private final LoanTransactionsApiResource loanTransactionsApiResource;
 
-    @Autowired
-    public RepayLoanCommandStrategy(final LoanTransactionsApiResource loanTransactionsApiResource) {
-        this.loanTransactionsApiResource = loanTransactionsApiResource;
-    }
-
     @Override
     public BatchResponse execute(BatchRequest request, @SuppressWarnings("unused") UriInfo uriInfo) {