Adjust BP-gen to correctly support DFC component spec - types

[dcaegen2/platform.git] / mod / bpgenerator / src / main / java / org / onap / blueprintgenerator / models / onapbp / OnapBlueprint.java

diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java
index 9f6f560..d9f3c16 100644 (file)
--- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java
+++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java
@@ -1,4 +1,4 @@
-/**============LICENSE_START======================================================= 
+/*============LICENSE_START=======================================================
  org.onap.dcae 
  ================================================================================ 
  Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. 
@@ -22,10 +22,14 @@
 
 package org.onap.blueprintgenerator.models.onapbp;
 
-import java.util.ArrayList;
+import static org.onap.blueprintgenerator.models.blueprint.BpConstants.CLOUDIFY_DSL_1_3;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import java.util.LinkedHashMap;
 import java.util.TreeMap;
-
+import lombok.Getter;
+import lombok.Setter;
 import org.onap.blueprintgenerator.core.PgaasNodeBuilder;
 import org.onap.blueprintgenerator.core.PolicyNodeBuilder;
 import org.onap.blueprintgenerator.models.blueprint.Blueprint;
@@ -33,67 +37,59 @@ import org.onap.blueprintgenerator.models.blueprint.Imports;
 import org.onap.blueprintgenerator.models.blueprint.Node;
 import org.onap.blueprintgenerator.models.componentspec.ComponentSpec;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-
-import lombok.Getter; import lombok.Setter;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
 
-@Getter @Setter
-@JsonInclude(value=Include.NON_NULL)
+@Getter
+@Setter
+@JsonInclude(value = Include.NON_NULL)
 
-public class OnapBlueprint extends Blueprint{
-       public Blueprint createOnapBlueprint(ComponentSpec cs, String importPath, String override) {
+public class OnapBlueprint extends Blueprint {
 
-               //create the inputs that will be used
-               TreeMap<String, LinkedHashMap<String, Object>> inputs = new TreeMap<String, LinkedHashMap<String, Object>>();
-               //set the tosca definition which is the same for everything
-               this.setTosca_definitions_version("cloudify_dsl_1_3");
+    public Blueprint createOnapBlueprint(ComponentSpec cs, String importPath, String override) {
 
-               //set the imports 
-               if(!"".equals(importPath)) {
-                       Imports imps = new Imports();
-                       this.setImports(imps.createImportsFromFile(importPath));
-               }
-               else {
-                       Imports imps = new Imports();
-                       this.setImports(imps.createOnapImports());
-               }
+        //create the inputs that will be used
+        TreeMap<String, LinkedHashMap<String, Object>> inputs = new TreeMap<String, LinkedHashMap<String, Object>>();
+        //set the tosca definition which is the same for everything
+        this.setTosca_definitions_version(CLOUDIFY_DSL_1_3);
 
-               //create the node template
-               TreeMap<String, Node> nodeTemplate = new TreeMap<String, Node>();
-               String nodeName = cs.getSelf().getName();
+        //set the imports
+        if (!"".equals(importPath)) {
+            Imports imps = new Imports();
+            this.setImports(imps.createImportsFromFile(importPath));
+        } else {
+            Imports imps = new Imports();
+            this.setImports(imps.createOnapImports());
+        }
 
-               //create the onap node that will be used
-               OnapNode node = new OnapNode();
-               inputs = node.createOnapNode(inputs, cs, override);
-               nodeTemplate.put(nodeName, node);
-               this.setNode_templates(nodeTemplate);
+        //create the node template
+        TreeMap<String, Node> nodeTemplate = new TreeMap<String, Node>();
+        String nodeName = cs.getSelf().getName();
 
-               //if present in component spec, populate policyNode information in the blueprint
-               if(cs.getPolicyInfo() != null){
-                       PolicyNodeBuilder.addPolicyNodesAndInputs(cs, nodeTemplate, inputs);
-               }
+        //create the onap node that will be used
+        OnapNode node = new OnapNode();
+        inputs = node.createOnapNode(inputs, cs, override);
+        nodeTemplate.put(nodeName, node);
+        this.setNode_templates(nodeTemplate);
 
-               //if present in component spec, populate pgaasNodes information in the blueprint
-               if(cs.getAuxilary().getDatabases() != null){
-                       PgaasNodeBuilder.addPgaasNodesAndInputs(cs, nodeTemplate, inputs);
-               }
+        //if present in component spec, populate policyNode information in the blueprint
+        if (cs.getPolicyInfo() != null) {
+            PolicyNodeBuilder.addPolicyNodesAndInputs(cs, nodeTemplate, inputs);
+        }
 
-               //set the inputs
-               this.setInputs(inputs);
+        //if present in component spec, populate pgaasNodes information in the blueprint
+        if (cs.getAuxilary().getDatabases() != null) {
+            PgaasNodeBuilder.addPgaasNodesAndInputs(cs, nodeTemplate, inputs);
+        }
 
+        //set the inputs
+        this.setInputs(inputs);
 
-               Blueprint bp = new Blueprint();
-               bp.setImports(this.getImports());
-               bp.setInputs(this.getInputs());
-               bp.setNode_templates(this.getNode_templates());
-               bp.setTosca_definitions_version(this.getTosca_definitions_version());
+        Blueprint bp = new Blueprint();
+        bp.setImports(this.getImports());
+        bp.setInputs(this.getInputs());
+        bp.setNode_templates(this.getNode_templates());
+        bp.setTosca_definitions_version(this.getTosca_definitions_version());
 
-               return bp;
+        return bp;
 
-       }
+    }
 }