Fixed the streams and the imports issues

Fixed the issues with the streams and with the imports and space

Issue-ID: DCAEGEN2-1517
Change-Id: I856f1fa3fc47faea19388096f739519db0fe41d8
Signed-off-by: ms236b <ms236b@att.com>

diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java
index 5159814..6d5b7d7 100644 (file)
--- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java
+++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java
@@ -39,8 +39,8 @@ import lombok.Setter;
 @Setter
 public class Appconfig {
        private CallsObj[] service_calls;
-       private TreeMap<String, DmaapObj> stream_publishes;
-       private TreeMap<String, DmaapObj> stream_subcribes;
+       private TreeMap<String, DmaapObj> streams_publishes;
+       private TreeMap<String, DmaapObj> streams_subscribes;
        private TreeMap<String, Object> params;
 
        @JsonAnyGetter
@@ -106,8 +106,8 @@ public class Appconfig {
                        }
                }
 
-               this.setStream_publishes(streamPublishes);
-               this.setStream_subcribes(streamSubscribes);
+               this.setStreams_publishes(streamPublishes);
+               this.setStreams_subscribes(streamSubscribes);
 
                //set the parameters into the appconfig
                TreeMap<String, Object> parameters = new TreeMap<String, Object>();

diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java
index 6a06066..25c4c53 100644 (file)
--- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java
+++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java
@@ -56,7 +56,7 @@ public class Properties {
        ArrayList<DmaapStreams> streams_subscribes;
        private TreeMap<String, Object> tls_info;
        private ResourceConfig resource_config;
-       private boolean useExisting;
+       //private boolean useExisting;
 
        public TreeMap<String, LinkedHashMap<String, Object>> createOnapProperties(TreeMap<String, LinkedHashMap<String, Object>> inps, ComponentSpec cs, String override) {
                TreeMap<String, LinkedHashMap<String, Object>> retInputs = new TreeMap<String, LinkedHashMap<String, Object>>();

diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/componentspec/Auxilary.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/componentspec/Auxilary.java
index 6d325db..01844f9 100644 (file)
--- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/componentspec/Auxilary.java
+++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/componentspec/Auxilary.java
@@ -98,7 +98,7 @@ public class Auxilary {
                        for(int i = 0; i < p.length(); i++) {
                                if(p.charAt(i) == ':') {
                                        internal = '"' + internal + '"';
-                                       internal = "concat:['" + internal + "', {get_input: external_port}]"; 
+                                       internal = "concat: ['" + internal + "', {get_input: external_port}]"; 
                                        ports.add(internal);
                                }
                                if(p.charAt(i) == ':' && !foundPort) {

diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapBlueprint.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapBlueprint.java
index ff93307..d3cff67 100644 (file)
--- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapBlueprint.java
+++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapBlueprint.java
@@ -49,13 +49,13 @@ public class DmaapBlueprint extends Blueprint{
                //set the imports
                Imports imps = new Imports();
                if(importPath.equals("")) {
-                       imps.createDmaapImports();
+                       bp.setImports(imps.createDmaapImports());
                }
                else {
-                       imps.createImportsFromFile(importPath);
+                       bp.setImports(imps.createImportsFromFile(importPath));
                }
 
-               bp.setImports(imps.getImports());
+               //bp.setImports(imps.getImports());
 
                //set and create the node templates
                TreeMap<String, Node> nodeTemplate = new TreeMap();

diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapNode.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapNode.java
index 97a6fdb..bfa7ae9 100644 (file)
--- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapNode.java
+++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapNode.java
@@ -124,7 +124,7 @@ public class DmaapNode extends Node{
                GetInput topicInput = new GetInput();
                topicInput.setGet_input(name + "_name");
                props.setFeed_name(topicInput);
-               props.setUseExisting(true);
+               //props.setUseExisting(true);
                retInputs.put(name + "_name", stringType);
                this.setProperties(props);
 
@@ -144,7 +144,7 @@ public class DmaapNode extends Node{
                GetInput topicInput = new GetInput();
                topicInput.setGet_input(name + "_name");
                props.setTopic_name(topicInput);
-               props.setUseExisting(true);
+               //props.setUseExisting(true);
                retInputs.put(name + "_name", stringType);
                this.setProperties(props);
 

diff --git a/blueprint-generator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java b/blueprint-generator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java
index e39cf41..91dec26 100644 (file)
--- a/blueprint-generator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java
+++ b/blueprint-generator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java
@@ -388,7 +388,7 @@ public class BlueprintGeneratorTest {
                OnapNode node = (OnapNode) bp.getNode_templates().get("test.component.spec");
 
                boolean test = false;
-               if(!node.getProperties().getApplication_config().getStream_publishes().isEmpty()) {
+               if(!node.getProperties().getApplication_config().getStreams_publishes().isEmpty()) {
                        test = true;
                        System.out.println("tst");
                }