Clean CsarUtils::MainYamlWithDependencies

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / tosca / ToscaRepresentation.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaRepresentation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaRepresentation.java
index 49fd91c..1ca9557 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaRepresentation.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaRepresentation.java
@@ -20,30 +20,36 @@
 
 package org.openecomp.sdc.be.tosca;
 
+import io.vavr.control.Option;
+import lombok.Getter;
 import org.apache.commons.lang3.tuple.Triple;
 import org.openecomp.sdc.be.model.Component;
 
 import java.util.List;
+import org.openecomp.sdc.be.tosca.model.ToscaTemplate;
 
 public class ToscaRepresentation {
 
-    private String mainYaml;
-    private List<Triple<String, String, Component>> dependencies;
+    @Getter
+    private final byte[] mainYaml;
 
-    public String getMainYaml() {
-        return mainYaml;
-    }
+    @Getter
+    private final Option<List<Triple<String, String, Component>>> dependencies;
 
-    public void setMainYaml(String mainYaml) {
+    private ToscaRepresentation(byte[] mainYaml, Option<List<Triple<String, String, Component>>> dependencies) {
         this.mainYaml = mainYaml;
+        this.dependencies = dependencies;
     }
 
-    public List<Triple<String, String, Component>> getDependencies() {
-        return dependencies;
+    public static ToscaRepresentation make(byte[] mainYaml) {
+        return new ToscaRepresentation(mainYaml, Option.none());
     }
 
-    public void setDependencies(List<Triple<String, String, Component>> dependancies) {
-        this.dependencies = dependancies;
+    public static ToscaRepresentation make(byte[] mainYaml, List<Triple<String, String, Component>> dependencies) {
+        return new ToscaRepresentation(mainYaml, Option.of(dependencies));
     }
 
+    public static ToscaRepresentation make(byte[] mainYaml, ToscaTemplate tt) {
+        return new ToscaRepresentation(mainYaml, Option.of(tt.getDependencies()));
+    }
 }