chore(irs):1105 Refactored.

eclipse-tractusx · Jul 17, 2024 · 47efd8d · 47efd8d
1 parent 33e07f6
commit 47efd8d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/...ctusx/traceability/contracts/infrastructure/repository/ContractAsBuiltRepositoryImpl.java b/...ctusx/traceability/contracts/infrastructure/repository/ContractAsBuiltRepositoryImpl.java
@@ -18,7 +18,7 @@
  ********************************************************************************/
 package org.eclipse.tractusx.traceability.contracts.infrastructure.repository;
 
-import lombok.experimental.SuperBuilder;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.irs.edc.client.contract.model.exception.ContractAgreementException;
 import org.eclipse.tractusx.irs.edc.client.contract.service.EdcContractAgreementService;
@@ -33,13 +33,16 @@
 import java.util.stream.Collectors;
 
 @Component
-@SuperBuilder
 @Slf4j
 public class ContractAsBuiltRepositoryImpl extends ContractRepositoryImplBase implements ContractRepository<ContractAgreementAsBuiltEntity> {
 
-    private final EdcContractAgreementService edcContractAgreementService;
     private final JpaContractAgreementAsBuiltRepository contractAgreementRepository;
 
+    public ContractAsBuiltRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, JpaContractAgreementAsBuiltRepository contractAgreementRepository) {
+        super(edcContractAgreementService, objectMapper);
+        this.contractAgreementRepository = contractAgreementRepository;
+    }
+
     @Override
     public void saveAllContractAgreements(List<String> contractAgreementIds, ContractType contractType) throws ContractAgreementException {
 

diff --git a/...usx/traceability/contracts/infrastructure/repository/ContractAsPlannedRepositoryImpl.java b/...usx/traceability/contracts/infrastructure/repository/ContractAsPlannedRepositoryImpl.java
@@ -18,7 +18,7 @@
  ********************************************************************************/
 package org.eclipse.tractusx.traceability.contracts.infrastructure.repository;
 
-import lombok.experimental.SuperBuilder;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.irs.edc.client.contract.model.exception.ContractAgreementException;
 import org.eclipse.tractusx.irs.edc.client.contract.service.EdcContractAgreementService;
@@ -33,13 +33,16 @@
 import java.util.stream.Collectors;
 
 @Component
-@SuperBuilder
 @Slf4j
 public class ContractAsPlannedRepositoryImpl extends ContractRepositoryImplBase implements ContractRepository<ContractAgreementAsPlannedEntity> {
 
-    private final EdcContractAgreementService edcContractAgreementService;
     private final JpaContractAgreementAsPlannedRepository contractAgreementRepository;
 
+    public ContractAsPlannedRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, JpaContractAgreementAsPlannedRepository contractAgreementRepository) {
+        super(edcContractAgreementService, objectMapper);
+        this.contractAgreementRepository = contractAgreementRepository;
+    }
+
     @Override
     public void saveAllContractAgreements(List<String> contractAgreementIds, ContractType contractType) throws ContractAgreementException {
 

diff --git a/.../traceability/contracts/infrastructure/repository/ContractNotificationRepositoryImpl.java b/.../traceability/contracts/infrastructure/repository/ContractNotificationRepositoryImpl.java
@@ -18,6 +18,7 @@
  ********************************************************************************/
 package org.eclipse.tractusx.traceability.contracts.infrastructure.repository;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.irs.edc.client.contract.model.exception.ContractAgreementException;
@@ -33,13 +34,16 @@
 import java.util.stream.Collectors;
 
 @Component
-@SuperBuilder
 @Slf4j
 public class ContractNotificationRepositoryImpl extends ContractRepositoryImplBase implements ContractRepository<ContractAgreementNotificationEntity> {
 
-    private final EdcContractAgreementService edcContractAgreementService;
     private final JpaContractAgreementNotificationRepository contractAgreementRepository;
 
+    public ContractNotificationRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, EdcContractAgreementService edcContractAgreementService1, JpaContractAgreementNotificationRepository contractAgreementRepository) {
+        super(edcContractAgreementService, objectMapper);
+        this.contractAgreementRepository = contractAgreementRepository;
+    }
+
     @Override
     public void saveAllContractAgreements(List<String> contractAgreementIds, ContractType contractType) throws ContractAgreementException {
 

diff --git a/...tractusx/traceability/contracts/infrastructure/repository/ContractRepositoryImplBase.java b/...tractusx/traceability/contracts/infrastructure/repository/ContractRepositoryImplBase.java
@@ -20,6 +20,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -43,7 +44,7 @@
 import java.util.stream.Collectors;
 
 @Component
-@RequiredArgsConstructor
+@AllArgsConstructor
 @Slf4j
 public class ContractRepositoryImplBase {
 

diff --git a/...tractusx/traceability/contracts/infrastructure/repository/ContractViewRepositoryImpl.java b/...tractusx/traceability/contracts/infrastructure/repository/ContractViewRepositoryImpl.java
@@ -19,7 +19,6 @@
 package org.eclipse.tractusx.traceability.contracts.infrastructure.repository;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.experimental.SuperBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.irs.edc.client.contract.model.exception.ContractAgreementException;
 import org.eclipse.tractusx.irs.edc.client.contract.service.EdcContractAgreementService;
@@ -41,13 +40,15 @@
 import static org.apache.commons.collections4.ListUtils.emptyIfNull;
 
 @Component
-@SuperBuilder
 @Slf4j
 public class ContractViewRepositoryImpl extends ContractRepositoryImplBase implements ContractRepositoryReadOnly<ContractAgreementViewEntity> {
 
-    private final EdcContractAgreementService edcContractAgreementService;
     private final JpaContractAgreementViewRepository contractAgreementRepository;
-    private final ObjectMapper objectMapper;
+
+    public ContractViewRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, EdcContractAgreementService edcContractAgreementService1, JpaContractAgreementViewRepository contractAgreementRepository, ObjectMapper objectMapper1) {
+        super(edcContractAgreementService, objectMapper);
+        this.contractAgreementRepository = contractAgreementRepository;
+    }
 
     @Override
     public PageResult<Contract> getContractsByPageable(Pageable pageable, SearchCriteria searchCriteria) {