feat(policy):[TRI-1266] Fix Spring qualifier issues

eclipse-tractusx · Jun 19, 2023 · 36d942b · 36d942b
1 parent d671fb8
commit 36d942b
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 14 deletions.
diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManager.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManager.java
@@ -22,20 +22,23 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.aaswrapper.job;
 
+import static org.eclipse.tractusx.irs.configuration.JobConfiguration.JOB_BLOB_PERSISTENCE;
+
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Consumer;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.irs.aaswrapper.job.delegate.AbstractDelegate;
+import org.eclipse.tractusx.irs.common.persistence.BlobPersistence;
+import org.eclipse.tractusx.irs.common.persistence.BlobPersistenceException;
 import org.eclipse.tractusx.irs.component.JobParameter;
 import org.eclipse.tractusx.irs.connector.job.ResponseStatus;
 import org.eclipse.tractusx.irs.connector.job.TransferInitiateResponse;
 import org.eclipse.tractusx.irs.connector.job.TransferProcessManager;
-import org.eclipse.tractusx.irs.common.persistence.BlobPersistence;
-import org.eclipse.tractusx.irs.common.persistence.BlobPersistenceException;
 import org.eclipse.tractusx.irs.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 /**
  * Process manager for AAS Object transfers.
@@ -51,7 +54,7 @@ public class AASTransferProcessManager implements TransferProcessManager<ItemDat
     private final AbstractDelegate abstractDelegate;
 
     public AASTransferProcessManager(final AbstractDelegate abstractDelegate, final ExecutorService executor,
-            final BlobPersistence blobStore) {
+            @Qualifier(JOB_BLOB_PERSISTENCE) final BlobPersistence blobStore) {
         this.abstractDelegate = abstractDelegate;
         this.executor = executor;
         this.blobStore = blobStore;
@@ -80,7 +83,8 @@ private Runnable getRunnable(final ItemDataRequest dataRequest,
             final String itemId = dataRequest.getItemId();
 
             log.info("Starting processing Digital Twin Registry with itemId {}", itemId);
-            final ItemContainer itemContainer = abstractDelegate.process(ItemContainer.builder(), jobData, aasTransferProcess, itemId);
+            final ItemContainer itemContainer = abstractDelegate.process(ItemContainer.builder(), jobData,
+                    aasTransferProcess, itemId);
             storeItemContainer(processId, itemContainer);
 
             transferProcessCompleted.accept(aasTransferProcess);

diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/TreeRecursiveLogic.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/TreeRecursiveLogic.java
@@ -22,6 +22,8 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.aaswrapper.job;
 
+import static org.eclipse.tractusx.irs.configuration.JobConfiguration.JOB_BLOB_PERSISTENCE;
+
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
@@ -31,6 +33,7 @@
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistence;
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistenceException;
 import org.eclipse.tractusx.irs.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 /**
  * Retrieves item graph from potentially multiple calls to IRS API behind
@@ -49,6 +52,7 @@ public class TreeRecursiveLogic {
     /**
      * Blob store API.
      */
+    @Qualifier(JOB_BLOB_PERSISTENCE)
     private final BlobPersistence blobStoreApi;
     /**
      * Json Converter.

diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/JobConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/JobConfiguration.java
@@ -54,6 +54,7 @@
 import org.eclipse.tractusx.irs.services.MeterRegistryService;
 import org.eclipse.tractusx.irs.services.validation.JsonValidatorService;
 import org.eclipse.tractusx.irs.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
@@ -68,6 +69,7 @@
                     "PMD.TooManyMethods"
 })
 public class JobConfiguration {
+    public static final String JOB_BLOB_PERSISTENCE = "JobPersistence";
     public static final int EXECUTOR_CORE_POOL_SIZE = 5;
     private static final Integer EXPIRE_AFTER_DAYS = 7;
 
@@ -79,8 +81,9 @@ public OutboundMeterRegistryService outboundMeterRegistryService(final MeterRegi
 
     @Bean
     public JobOrchestrator<ItemDataRequest, AASTransferProcess> jobOrchestrator(
-            final DigitalTwinDelegate digitalTwinDelegate, final BlobPersistence blobStore, final JobStore jobStore,
-            final MeterRegistryService meterService, final ApplicationEventPublisher applicationEventPublisher,
+            final DigitalTwinDelegate digitalTwinDelegate, @Qualifier(JOB_BLOB_PERSISTENCE) final BlobPersistence blobStore,
+            final JobStore jobStore, final MeterRegistryService meterService,
+            final ApplicationEventPublisher applicationEventPublisher,
             @Value("${irs.job.jobstore.ttl.failed:}") final Duration ttlFailedJobs,
             @Value("${irs.job.jobstore.ttl.completed:}") final Duration ttlCompletedJobs) {
 
@@ -104,7 +107,7 @@ public Clock clock() {
     }
 
     @Profile("!test")
-    @Bean(name = "JobPersistence")
+    @Bean(JOB_BLOB_PERSISTENCE)
     public BlobPersistence blobStore(final BlobstoreConfiguration config) throws BlobPersistenceException {
         return new MinioBlobPersistence(config.getEndpoint(), config.getAccessKey(), config.getSecretKey(),
                 config.getBucketName(), EXPIRE_AFTER_DAYS);

diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicator.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicator.java
@@ -22,6 +22,8 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.configuration;
 
+import static org.eclipse.tractusx.irs.configuration.JobConfiguration.JOB_BLOB_PERSISTENCE;
+
 import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -36,6 +38,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistence;
 import org.eclipse.tractusx.irs.common.persistence.MinioBlobPersistence;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.stereotype.Component;
@@ -47,16 +50,14 @@
 @RequiredArgsConstructor
 @Slf4j
 class MinioHealthIndicator implements HealthIndicator {
-
+    @Qualifier(JOB_BLOB_PERSISTENCE)
     private final BlobPersistence blobPersistence;
     private final BlobstoreConfiguration blobstoreConfiguration;
 
     @Override
     public Health health() {
         if (thereIsMinioConnection()) {
-            return Health.up()
-                    .withDetail("bucketName", blobstoreConfiguration.getBucketName())
-                    .build();
+            return Health.up().withDetail("bucketName", blobstoreConfiguration.getBucketName()).build();
         } else {
             return Health.down().build();
         }
@@ -66,6 +67,7 @@ public Health health() {
      * Verifies if blobPersistence is instance of {@link MinioBlobPersistence} and if bucket exists.
      * If yes it means that there is Minio connection.
      * If bucket does not exist, method tries to recreate it.
+     *
      * @return true if bucket exists, false otherwise
      */
     private boolean thereIsMinioConnection() {
@@ -76,7 +78,9 @@ private boolean thereIsMinioConnection() {
                 if (minioBlobPersistence.bucketExists(blobstoreConfiguration.getBucketName())) {
                     return true;
                 }
-            } catch (ServerException | InsufficientDataException | ErrorResponseException | IOException | NoSuchAlgorithmException | InvalidKeyException | InvalidResponseException | XmlParserException | InternalException e) {
+            } catch (ServerException | InsufficientDataException | ErrorResponseException | IOException |
+                     NoSuchAlgorithmException | InvalidKeyException | InvalidResponseException | XmlParserException |
+                     InternalException e) {
                 log.error("Lost connection to Minio", e);
             }
         }

diff --git a/...api/src/main/java/org/eclipse/tractusx/irs/connector/batch/PersistentBatchOrderStore.java b/...api/src/main/java/org/eclipse/tractusx/irs/connector/batch/PersistentBatchOrderStore.java
@@ -22,6 +22,8 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.connector.batch;
 
+import static org.eclipse.tractusx.irs.configuration.JobConfiguration.JOB_BLOB_PERSISTENCE;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
@@ -35,6 +37,7 @@
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistence;
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistenceException;
 import org.eclipse.tractusx.irs.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 /**
@@ -49,6 +52,7 @@ public class PersistentBatchOrderStore implements BatchOrderStore {
 
     private final JsonUtil json = new JsonUtil();
 
+    @Qualifier(JOB_BLOB_PERSISTENCE)
     private final BlobPersistence blobStore;
 
     @Override

diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/batch/PersistentBatchStore.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/batch/PersistentBatchStore.java
@@ -22,6 +22,8 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.connector.batch;
 
+import static org.eclipse.tractusx.irs.configuration.JobConfiguration.JOB_BLOB_PERSISTENCE;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
@@ -35,6 +37,7 @@
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistence;
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistenceException;
 import org.eclipse.tractusx.irs.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 /**
@@ -49,6 +52,7 @@ public class PersistentBatchStore implements BatchStore {
 
     private final JsonUtil json = new JsonUtil();
 
+    @Qualifier(JOB_BLOB_PERSISTENCE)
     private final BlobPersistence blobStore;
 
     @Override

diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStore.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStore.java
@@ -22,6 +22,8 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.connector.job;
 
+import static org.eclipse.tractusx.irs.configuration.JobConfiguration.JOB_BLOB_PERSISTENCE;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
@@ -38,6 +40,7 @@
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistenceException;
 import org.eclipse.tractusx.irs.services.MeterRegistryService;
 import org.eclipse.tractusx.irs.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 /**
@@ -53,6 +56,7 @@ public class PersistentJobStore extends BaseJobStore {
      */
     private static final String JOB_PREFIX = "job:";
 
+    @Qualifier(JOB_BLOB_PERSISTENCE)
     private final BlobPersistence blobStore;
 
     private final JsonUtil json = new JsonUtil();

diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java
@@ -22,6 +22,8 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.services;
 
+import static org.eclipse.tractusx.irs.configuration.JobConfiguration.JOB_BLOB_PERSISTENCE;
+
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -72,6 +74,7 @@
 import org.eclipse.tractusx.irs.semanticshub.SemanticsHubFacade;
 import org.eclipse.tractusx.irs.services.validation.SchemaNotFoundException;
 import org.eclipse.tractusx.irs.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PagedListHolder;
@@ -98,6 +101,7 @@ public class IrsItemGraphQueryService implements IIrsItemGraphQueryService {
 
     private final JobStore jobStore;
 
+    @Qualifier(JOB_BLOB_PERSISTENCE)
     private final BlobPersistence blobStore;
 
     private final MeterRegistryService meterRegistryService;

diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsFunctionalTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsFunctionalTest.java
@@ -203,7 +203,10 @@ public void initialize(ConfigurableApplicationContext applicationContext) {
             final String hostAddress = minioContainer.getHostAddress();
             TestPropertySourceUtils.addInlinedPropertiesToEnvironment(applicationContext,
                     "blobstore.endpoint=http://" + hostAddress, "blobstore.accessKey=" + ACCESS_KEY,
-                    "blobstore.secretKey=" + SECRET_KEY);
+                    "blobstore.secretKey=" + SECRET_KEY, "policystore.persistence.endpoint=http://" + hostAddress,
+                    "policystore.persistence.accessKey=" + ACCESS_KEY,
+                    "policystore.persistence.secretKey=" + SECRET_KEY,
+                    "policystore.persistence.bucketName=policy-test");
         }
     }
 

diff --git a/...-store/src/main/java/org/eclipse/tractusx/irs/policystore/config/PolicyConfiguration.java b/...-store/src/main/java/org/eclipse/tractusx/irs/policystore/config/PolicyConfiguration.java
@@ -35,8 +35,10 @@
 @Configuration
 public class PolicyConfiguration {
 
+    public static final String POLICY_BLOB_PERSISTENCE = "PolicyStorePersistence";
+
     @Profile("!test")
-    @Bean(name = "PolicyStorePersistence")
+    @Bean(POLICY_BLOB_PERSISTENCE)
     public BlobPersistence blobStore(final PolicyBlobstoreConfiguration config) throws BlobPersistenceException {
         return new MinioBlobPersistence(config.getEndpoint(), config.getAccessKey(), config.getSecretKey(),
                 config.getBucketName(), config.getDaysToLive());

diff --git a/...ore/src/main/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistence.java b/...ore/src/main/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistence.java
@@ -22,6 +22,8 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.policystore.persistence;
 
+import static org.eclipse.tractusx.irs.policystore.config.PolicyConfiguration.POLICY_BLOB_PERSISTENCE;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +37,7 @@
 import org.eclipse.tractusx.irs.common.persistence.BlobPersistenceException;
 import org.eclipse.tractusx.irs.policystore.exceptions.PolicyStoreException;
 import org.eclipse.tractusx.irs.policystore.models.Policy;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 /**
@@ -43,6 +46,8 @@
 @Service
 @RequiredArgsConstructor
 public class PolicyPersistence {
+
+    @Qualifier(POLICY_BLOB_PERSISTENCE)
     private final BlobPersistence persistence;
 
     private final ObjectMapper mapper;

diff --git a/lombok.config b/lombok.config
@@ -1,2 +1,5 @@
 # Add @Generated annotation to generated code, so that it is skipped by JaCoCo
 lombok.addLombokGeneratedAnnotation = true
+
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Value