re base code

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / datamodel / utils / ArtifactUtils.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ArtifactUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ArtifactUtils.java
index 8310330..9479c80 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ArtifactUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ArtifactUtils.java
@@ -20,13 +20,6 @@
 
 package org.openecomp.sdc.be.datamodel.utils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
 import org.apache.commons.codec.binary.Base64;
 import org.openecomp.sdc.be.info.ArtifactTemplateInfo;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
@@ -34,6 +27,14 @@ import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.util.ValidationUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
 public class ArtifactUtils {
 
     public static ArtifactDefinition findMasterArtifact(Map<String, ArtifactDefinition> deplymentArtifact, List<ArtifactDefinition> artifacts, List<String> artifactsList) {
@@ -68,7 +69,7 @@ public class ArtifactUtils {
                                                                  ArtifactGroupTypeEnum artifactGroupType, String label, String displayName, String description,
                                                                  byte[] artifactContentent, List<ArtifactTemplateInfo> updatedRequiredArtifacts, boolean isFromCsar) {
 
-        Map<String, Object> json = new HashMap<String, Object>();
+        Map<String, Object> json = new HashMap<>();
         if (artifactId != null && !artifactId.isEmpty())
             json.put(Constants.ARTIFACT_ID, artifactId);
 
@@ -77,11 +78,7 @@ public class ArtifactUtils {
         json.put(Constants.ARTIFACT_DESCRIPTION, description);
         json.put(Constants.IS_FROM_CSAR, isFromCsar);
 
-        String encodedPayload = new String(artifactContentent);
-
-
-        encodedPayload = Base64.encodeBase64String(artifactContentent);
-        // }
+        String encodedPayload = Base64.encodeBase64String(artifactContentent);
 
         json.put(Constants.ARTIFACT_PAYLOAD_DATA, encodedPayload);
         json.put(Constants.ARTIFACT_DISPLAY_NAME, displayName);
@@ -90,21 +87,22 @@ public class ArtifactUtils {
         json.put(Constants.REQUIRED_ARTIFACTS,
                 (updatedRequiredArtifacts == null || updatedRequiredArtifacts.isEmpty()) ? new ArrayList<>()
                         : updatedRequiredArtifacts.stream()
-                                .filter(e -> e.getType().equals(ArtifactTypeEnum.HEAT_ARTIFACT.getType())
+                                                  .filter(e -> e.getType().equals(ArtifactTypeEnum.HEAT_ARTIFACT.getType())
                                         || e.getType().equals(ArtifactTypeEnum.HEAT_NESTED.getType()))
-                                .map(e -> e.getFileName()).collect(Collectors.toList()));
+                                                  .map(ArtifactTemplateInfo::getFileName).collect(Collectors.toList()));
         return json;
     }
 
     public static Map<String, Object> buildJsonForArtifact(ArtifactTemplateInfo artifactTemplateInfo,
-            byte[] artifactContentent, int atrifactLabelCounter) {
+                       byte[] artifactContentent, int atrifactLabelCounter, boolean isFromcsar) {
 
-        Map<String, Object> json = new HashMap<String, Object>();
+        Map<String, Object> json = new HashMap<>();
         String artifactName = artifactTemplateInfo.getFileName();
 
         json.put(Constants.ARTIFACT_NAME, artifactTemplateInfo.getFileName());
         json.put(Constants.ARTIFACT_TYPE, artifactTemplateInfo.getType());
         json.put(Constants.ARTIFACT_DESCRIPTION, "created from csar");
+               json.put(Constants.IS_FROM_CSAR, isFromcsar);
 
         String encodedPayload = Base64.encodeBase64String(artifactContentent);
 
@@ -120,9 +118,9 @@ public class ArtifactUtils {
         json.put(Constants.REQUIRED_ARTIFACTS,
                 (requiredArtifacts == null || requiredArtifacts.isEmpty()) ? new ArrayList<>()
                         : requiredArtifacts.stream()
-                                .filter(e -> e.getType().equals(ArtifactTypeEnum.HEAT_ARTIFACT.getType())
+                                           .filter(e -> e.getType().equals(ArtifactTypeEnum.HEAT_ARTIFACT.getType())
                                         || e.getType().equals(ArtifactTypeEnum.HEAT_NESTED.getType()))
-                                .map(e -> e.getFileName()).collect(Collectors.toList()));
+                                           .map(ArtifactTemplateInfo::getFileName).collect(Collectors.toList()));
         return json;
     }