new unit tests for sdc-dao

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / GroupInstance.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/GroupInstance.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/GroupInstance.java
index 4ffa843..e9efa8f 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/GroupInstance.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/GroupInstance.java
@@ -71,15 +71,21 @@ public class GroupInstance extends GroupInstanceDataDefinition implements Serial
        private void removeArtifactsDuplicates() {
                List<String> artifacts = getArtifacts();
                Set<String> artifactsSet = new HashSet<>();
-               artifactsSet.addAll(artifacts);
-               artifacts.clear();
-               artifacts.addAll(artifactsSet);
+               
+               if (artifacts != null && !artifacts.isEmpty()) {
+                       artifactsSet.addAll(artifacts);
+                       artifacts.clear();
+                       artifacts.addAll(artifactsSet);
+               }
                
                List<String> giArtifacts = getGroupInstanceArtifacts();
                Set<String> giArtifactsSet = new HashSet<>();
-               giArtifactsSet.addAll(giArtifacts);
-               giArtifacts.clear();
-               giArtifacts.addAll(giArtifactsSet);
+               
+               if (giArtifacts != null && !giArtifacts.isEmpty()) {
+                       giArtifactsSet.addAll(giArtifacts);
+                       giArtifacts.clear();
+                       giArtifacts.addAll(giArtifactsSet);
+               }
        }
 
        private void clearArtifactsUuid() {
@@ -104,7 +110,7 @@ public class GroupInstance extends GroupInstanceDataDefinition implements Serial
         */
        public void alignArtifactsUuid(Map<String, ArtifactDefinition> deploymentArtifacts) {
                List<String> artifactIds = getArtifacts();
-               if(CollectionUtils.isNotEmpty(artifactIds)){
+               if(CollectionUtils.isNotEmpty(artifactIds) && deploymentArtifacts != null){
                        removeArtifactsDuplicates();
                        clearArtifactsUuid();
                        List<String> artifactUuids = getArtifactsUuid();