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>

2 files changed, 5 insertions, 5 deletions

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
--- 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
--- 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);