Added the dmaap plugin changes needed

Added the dmaap plugin changes along with a few other changes (fixed
format by pressing backspace a lot)

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

1 files changed, 8 insertions, 11 deletions

diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java
index 5131057..2b0b8c0 100644
--- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java
+++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java
@@ -45,30 +45,27 @@ import lombok.NoArgsConstructor;
 @JsonInclude(value=Include.NON_NULL)
 
 public class OnapNode extends Node{
-	
 	private TreeMap<String, Interfaces> interfaces;
 	private Properties properties;
-	
-	
-	public TreeMap<String, LinkedHashMap<String, Object>> createOnapNode(TreeMap<String, LinkedHashMap<String, Object>> inps, ComponentSpec cs) {
+	public TreeMap<String, LinkedHashMap<String, Object>> createOnapNode(TreeMap<String, LinkedHashMap<String, Object>> inps, ComponentSpec cs, String override) {
 		TreeMap<String, LinkedHashMap<String, Object>> retInputs = new TreeMap<String, LinkedHashMap<String, Object>>();
 		retInputs = inps;
-		
+
 		//create and set the interfaces
 		Interfaces inter = new Interfaces();
-		retInputs = inter.createOnapInterface(retInputs, cs);
+		retInputs = inter.createInterface(retInputs, cs);
 		TreeMap<String, Interfaces> interfaces = new TreeMap<String, Interfaces>();
 		interfaces.put("cloudify.interfaces.lifecycle", inter);
 		this.setInterfaces(interfaces);
-		
+
 		//set the type
 		this.setType("dcae.nodes.ContainerizedPlatformComponent");
-		
+
 		//set the properties
 		Properties props = new Properties();
-		retInputs = props.createOnapProperties(retInputs, cs);
+		retInputs = props.createOnapProperties(retInputs, cs, override);
 		this.setProperties(props);
-		
+
 		return retInputs;
 	}
-}
+}
\ No newline at end of file