1 files changed, 67 insertions, 86 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
index bade8ec66b..dd64bfb137 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.enrichment.impl.external.artifact;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.openecomp.core.enrichment.types.ArtifactCategory;
 import org.openecomp.core.enrichment.types.ComponentProcessInfo;
 import org.openecomp.core.model.dao.EnrichedServiceModelDao;
@@ -39,99 +44,75 @@ import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ProcessEntity;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ProcessType;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class ProcessArtifactEnricher implements ExternalArtifactEnricherInterface {
 
-  private ComponentDao componentDao;
-  private ProcessDao processDao;
-  private EnrichedServiceModelDao enrichedServiceModelDao;
-
-  @Override
-  public Map<String, List<ErrorMessage>> enrich(EnrichmentInfo enrichmentInfo,
-                                                ToscaServiceModel serviceModel) throws IOException {
-    Map<String, List<ErrorMessage>> errors = new HashMap<>();
-    String vspId = enrichmentInfo.getKey();
-    Version version = enrichmentInfo.getVersion();
-
-    Collection<ComponentEntity> components =
-        getComponentDao().list(new ComponentEntity(vspId, version, null));
-    components.forEach(componentEntry -> errors.putAll(enrichComponent(componentEntry,
-        vspId, version)));
-
-    return errors;
-  }
-
-  Map<String, List<ErrorMessage>> enrichComponent(ComponentEntity componentEntry, String vspId,
-                                                  Version version) {
-    Map<String, List<ErrorMessage>> errors = new HashMap<>();
-    enrichComponentProcessArtifact(componentEntry, vspId, version, errors);
-    return errors;
-  }
-
-  void enrichComponentProcessArtifact(ComponentEntity componentEntity,
-                                      String vspId, Version version,
-                                      Map<String, List<ErrorMessage>> errors) {
-    String componentId = componentEntity.getId();
-    ProcessEntity processEntity = new ProcessEntity(vspId, version, componentId, null);
-    final Collection<ProcessEntity> processes = getProcessDao().list(processEntity);
-
-    processes.forEach(entity -> {
-      ProcessEntity artifactEntity = new ProcessEntity(vspId, version,
-          componentId, entity.getId());
-
-          ProcessEntity artifactProcessEntity = getProcessDao().getArtifact(artifactEntity);
-          if (artifactProcessEntity != null && ProcessType.Lifecycle_Operations.equals(
-              artifactProcessEntity.getType())
-              && artifactProcessEntity.getArtifactName() != null ) {
-            String componentName = componentEntity.getComponentCompositionData().getName();
-            String path = componentName + File.separator
-                + ArtifactCategory.DEPLOYMENT.getDisplayName() + File.separator
-                + "Lifecycle Operations" + File.separator + artifactProcessEntity.getArtifactName();
+    private ComponentDao componentDao;
+    private ProcessDao processDao;
+    private EnrichedServiceModelDao enrichedServiceModelDao;
+
+    @Override
+    public Map<String, List<ErrorMessage>> enrich(EnrichmentInfo enrichmentInfo, ToscaServiceModel serviceModel) throws IOException {
+        Map<String, List<ErrorMessage>> errors = new HashMap<>();
+        String vspId = enrichmentInfo.getKey();
+        Version version = enrichmentInfo.getVersion();
+        Collection<ComponentEntity> components = getComponentDao().list(new ComponentEntity(vspId, version, null));
+        components.forEach(componentEntry -> errors.putAll(enrichComponent(componentEntry, vspId, version)));
+        return errors;
+    }
 
-            ComponentProcessInfo componentProcessInfo = new ComponentProcessInfo();
-            componentProcessInfo.setName(path);
-            componentProcessInfo.setContent(artifactProcessEntity.getArtifact().array());
+    Map<String, List<ErrorMessage>> enrichComponent(ComponentEntity componentEntry, String vspId, Version version) {
+        Map<String, List<ErrorMessage>> errors = new HashMap<>();
+        enrichComponentProcessArtifact(componentEntry, vspId, version, errors);
+        return errors;
+    }
 
-            ServiceArtifact processServiceArtifact = new ServiceArtifact();
-            processServiceArtifact.setVspId(vspId);
-            processServiceArtifact.setVersion(version);
-            enrichServiceArtifact(componentProcessInfo, processServiceArtifact);
-          }
+    void enrichComponentProcessArtifact(ComponentEntity componentEntity, String vspId, Version version, Map<String, List<ErrorMessage>> errors) {
+        String componentId = componentEntity.getId();
+        ProcessEntity processEntity = new ProcessEntity(vspId, version, componentId, null);
+        final Collection<ProcessEntity> processes = getProcessDao().list(processEntity);
+        processes.forEach(entity -> {
+            ProcessEntity artifactEntity = new ProcessEntity(vspId, version, componentId, entity.getId());
+            ProcessEntity artifactProcessEntity = getProcessDao().getArtifact(artifactEntity);
+            if (artifactProcessEntity != null && ProcessType.Lifecycle_Operations.equals(artifactProcessEntity.getType())
+                && artifactProcessEntity.getArtifactName() != null) {
+                String componentName = componentEntity.getComponentCompositionData().getName();
+                String path = componentName + File.separator + ArtifactCategory.DEPLOYMENT.getDisplayName() + File.separator + "Lifecycle Operations"
+                    + File.separator + artifactProcessEntity.getArtifactName();
+                ComponentProcessInfo componentProcessInfo = new ComponentProcessInfo();
+                componentProcessInfo.setName(path);
+                componentProcessInfo.setContent(artifactProcessEntity.getArtifact().array());
+                ServiceArtifact processServiceArtifact = new ServiceArtifact();
+                processServiceArtifact.setVspId(vspId);
+                processServiceArtifact.setVersion(version);
+                enrichServiceArtifact(componentProcessInfo, processServiceArtifact);
+            }
         });
-  }
-
-  void enrichServiceArtifact(ComponentProcessInfo componentProcessInfo,
-                             ServiceArtifact processServiceArtifact) {
-    processServiceArtifact.setName(componentProcessInfo.getName());
-    processServiceArtifact.setContentData(FileUtils.toByteArray(componentProcessInfo.getContent()));
-    getEnrichedServiceModelDao().storeExternalArtifact(processServiceArtifact);
-  }
+    }
 
-  private ComponentDao getComponentDao() {
-    if (componentDao == null) {
-      componentDao = ComponentDaoFactory.getInstance().createInterface();
+    void enrichServiceArtifact(ComponentProcessInfo componentProcessInfo, ServiceArtifact processServiceArtifact) {
+        processServiceArtifact.setName(componentProcessInfo.getName());
+        processServiceArtifact.setContentData(FileUtils.toByteArray(componentProcessInfo.getContent()));
+        getEnrichedServiceModelDao().storeExternalArtifact(processServiceArtifact);
     }
-    return componentDao;
-  }
 
-  private ProcessDao getProcessDao() {
-    if (processDao == null) {
-      processDao = ProcessDaoFactory.getInstance().createInterface();
+    private ComponentDao getComponentDao() {
+        if (componentDao == null) {
+            componentDao = ComponentDaoFactory.getInstance().createInterface();
+        }
+        return componentDao;
     }
-    return processDao;
-  }
 
-  private EnrichedServiceModelDao getEnrichedServiceModelDao() {
+    private ProcessDao getProcessDao() {
+        if (processDao == null) {
+            processDao = ProcessDaoFactory.getInstance().createInterface();
+        }
+        return processDao;
+    }
 
-    if (enrichedServiceModelDao == null) {
-      enrichedServiceModelDao = EnrichedServiceModelDaoFactory.getInstance().createInterface();
+    private EnrichedServiceModelDao getEnrichedServiceModelDao() {
+        if (enrichedServiceModelDao == null) {
+            enrichedServiceModelDao = EnrichedServiceModelDaoFactory.getInstance().createInterface();
+        }
+        return enrichedServiceModelDao;
     }
-    return enrichedServiceModelDao;
-  }
 }