diff options
author | ms236b <ms236b@att.com> | 2019-07-19 08:20:08 -0400 |
---|---|---|
committer | ms236b <ms236b@att.com> | 2019-07-24 09:37:44 -0400 |
commit | 403897151adfd785a14ad3568ba75b3010937307 (patch) | |
tree | afbbbb0ecbb398c29506e95ac102f088d8abf9e6 /blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/DmaapObj.java | |
parent | 686dc4ecb6adddc9299c93f20c0081918c532ee0 (diff) |
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>
Diffstat (limited to 'blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/DmaapObj.java')
-rw-r--r-- | blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/DmaapObj.java | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/DmaapObj.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/DmaapObj.java index 7a96100..10092c8 100644 --- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/DmaapObj.java +++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/DmaapObj.java @@ -25,34 +25,51 @@ import java.util.TreeMap; import org.onap.blueprintgenerator.models.componentspec.ComponentSpec; -import lombok.Getter; import lombok.Setter; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import lombok.Getter; import lombok.Setter; +@JsonInclude(value=Include.NON_NULL) @Getter @Setter public class DmaapObj { - private DmaapInfo dmaap_info; + private String dmaap_info; private String type; - - public TreeMap<String, LinkedHashMap<String, Object>> createOnapDmaapMRObj(TreeMap<String, LinkedHashMap<String, Object>> inps, String config, char type) { + private GetInput pass; + private GetInput user; + + public TreeMap<String, LinkedHashMap<String, Object>> createOnapDmaapMRObj(TreeMap<String, LinkedHashMap<String, Object>> inps, String config, char type, String n, String num) { TreeMap<String, LinkedHashMap<String, Object>> retInputs = new TreeMap<String, LinkedHashMap<String, Object>>(); + LinkedHashMap<String, Object> stringType = new LinkedHashMap(); + stringType.put("type", "string"); retInputs = inps; - + //set the dmaapinfo DmaapInfo info = new DmaapInfo(); - retInputs = info.createOnapDmaapMRInfo(retInputs, config, type); - this.setDmaap_info(info); - + String infoType = "<<" + n + ">>"; + this.setDmaap_info(infoType); + + //set username + GetInput u = new GetInput(); + u.setGet_input(config + "_" + num +"_aaf_username"); + this.setUser(u); + retInputs.put(config + "_" + num +"_aaf_username", stringType); + + //set password + GetInput p = new GetInput(); + p.setGet_input(config + "_" + num +"_aaf_password"); + this.setPass(p); + retInputs.put(config + "_" + num +"_aaf_password", stringType); + return retInputs; } - - public TreeMap<String, LinkedHashMap<String, Object>> createOnapDmaapDRObj(TreeMap<String, LinkedHashMap<String, Object>> inps, String config, char type) { + public TreeMap<String, LinkedHashMap<String, Object>> createOnapDmaapDRObj(TreeMap<String, LinkedHashMap<String, Object>> inps, String config, char type, String n, String num) { TreeMap<String, LinkedHashMap<String, Object>> retInputs = new TreeMap<String, LinkedHashMap<String, Object>>(); retInputs = inps; //set the dmaapinfo DmaapInfo info = new DmaapInfo(); - retInputs = info.createOnapDmaapDRInfo(retInputs, config, type); - this.setDmaap_info(info); - + String infoType = "<<" + n + ">>"; + this.setDmaap_info(infoType); return retInputs; } } |