[SDC] rebase 1710 code

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

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
index 036108e..9ffefa6 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
@@ -22,9 +22,12 @@ package org.openecomp.sdc.be.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.openecomp.sdc.be.config.ConfigurationManager;
@@ -288,6 +291,13 @@ public abstract class Component implements Serializable {
                this.deploymentArtifacts = deploymentArtifacts;
        }
 
+       public Map<String, ArtifactDefinition> getAllArtifacts() {
+               HashMap<String, ArtifactDefinition> allArtifacts = new HashMap<>();
+               allArtifacts.putAll(Optional.ofNullable(this.deploymentArtifacts).orElse(Collections.emptyMap()));
+               allArtifacts.putAll(Optional.ofNullable(this.artifacts).orElse(Collections.emptyMap()));
+               return allArtifacts;
+       }
+
        public List<CategoryDefinition> getCategories() {
                return categories;
        }