Sync Integ to Master

[sdc.git] / common-be / src / main / java / org / openecomp / sdc / be / datatypes / elements / ArtifactDataDefinition.java

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinition.java
index 49c13a0..b42ceab 100644 (file)
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinition.java
@@ -20,15 +20,15 @@
 
 package org.openecomp.sdc.be.datatypes.elements;
 
+import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
-import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
-
 //import com.google.gson.reflect.TypeToken;
 
 public class ArtifactDataDefinition extends ToscaDataDefinition implements Serializable {
@@ -86,6 +86,7 @@ public class ArtifactDataDefinition extends ToscaDataDefinition implements Seria
                if (a.getHeatParameters() != null)
                        this.setHeatParameters(new ArrayList<>(a.getHeatParameters()));
                this.setGeneratedFromId( a.getGeneratedFromId());
+               this.setIsFromCsar(a.getIsFromCsar());
 
 
        }
@@ -350,6 +351,13 @@ public class ArtifactDataDefinition extends ToscaDataDefinition implements Seria
        public String getGeneratedFromId() {
                return  (String) getToscaPresentationValue(JsonPresentationFields.GENERATED_FROM_ID);
        }
+       public boolean getIsFromCsar(){
+               Boolean isFromCsar = (Boolean) getToscaPresentationValue(JsonPresentationFields.IS_FROM_CSAR);
+               return  isFromCsar == null ? Boolean.FALSE: isFromCsar;
+       }
+       public void setIsFromCsar(Boolean isFromCsar) {
+               setToscaPresentationValue(JsonPresentationFields.IS_FROM_CSAR, isFromCsar);
+       }
 
        public void setGeneratedFromId(String generatedFromId) {
                setToscaPresentationValue(JsonPresentationFields.GENERATED_FROM_ID, generatedFromId);