diff options
Diffstat (limited to 'mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp')
2 files changed, 13 insertions, 15 deletions
diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapNode.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapNode.java index e84901c..37d7d2d 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapNode.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapNode.java @@ -1,7 +1,8 @@ -/**============LICENSE_START======================================================= +/*============LICENSE_START======================================================= org.onap.dcae ================================================================================ Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + Copyright (c) 2020 Nokia. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,7 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - */ package org.onap.blueprintgenerator.models.dmaapbp; @@ -33,7 +33,6 @@ import org.onap.blueprintgenerator.models.blueprint.Properties; import org.onap.blueprintgenerator.models.componentspec.ComponentSpec; import org.onap.blueprintgenerator.models.componentspec.Publishes; import org.onap.blueprintgenerator.models.componentspec.Subscribes; -import org.onap.blueprintgenerator.models.onapbp.OnapNode; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -129,7 +128,7 @@ public class DmaapNode extends Node{ //create and set the properties Properties props = new Properties(); GetInput topicInput = new GetInput(); - topicInput.setGet_input(name + "_name"); + topicInput.setBpInputName(name + "_name"); props.setFeed_name(topicInput); //props.setUseExisting(true); retInputs.put(name + "_name", stringType); @@ -149,7 +148,7 @@ public class DmaapNode extends Node{ //create and set the properties Properties props = new Properties(); GetInput topicInput = new GetInput(); - topicInput.setGet_input(name + "_name"); + topicInput.setBpInputName(name + "_name"); props.setTopic_name(topicInput); //props.setUseExisting(true); retInputs.put(name + "_name", stringType); diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapStreams.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapStreams.java index b26d45d..e2847d7 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapStreams.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapStreams.java @@ -1,7 +1,8 @@ -/**============LICENSE_START======================================================= +/*============LICENSE_START======================================================= org.onap.dcae ================================================================================ Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + Copyright (c) 2020 Nokia. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,10 +24,8 @@ package org.onap.blueprintgenerator.models.dmaapbp; import java.util.LinkedHashMap; import java.util.TreeMap; -import org.onap.blueprintgenerator.models.blueprint.Appconfig; import org.onap.blueprintgenerator.models.blueprint.GetInput; import org.onap.blueprintgenerator.models.componentspec.ComponentSpec; -import org.onap.blueprintgenerator.models.componentspec.HealthCheck; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -66,7 +65,7 @@ public class DmaapStreams { //set the location GetInput location = new GetInput(); - location.setGet_input(key + "_" + name + "_location"); + location.setBpInputName(key + "_" + name + "_location"); retInputs.put(key + "_" + name + "_location", stringType); this.setLocation(location); @@ -75,25 +74,25 @@ public class DmaapStreams { if(o == 's') { //set the username GetInput username = new GetInput(); - username.setGet_input(key + "_" + name + "_username"); + username.setBpInputName(key + "_" + name + "_username"); this.setUsername(username); retInputs.put(key + "_" + name + "_username", stringType); //set the password GetInput password = new GetInput(); - password.setGet_input(key + "_" + name + "_password"); + password.setBpInputName(key + "_" + name + "_password"); this.setPassword(password); retInputs.put(key + "_" + name + "_password", stringType); //set privileged GetInput priviliged = new GetInput(); - priviliged.setGet_input(key + "_" + name + "_priviliged"); + priviliged.setBpInputName(key + "_" + name + "_priviliged"); this.setPrivileged(priviliged); retInputs.put(key + "_" + name + "_priviliged", stringType); //set decompress GetInput decompress = new GetInput(); - decompress.setGet_input(key + "_" + name + "_decompress"); + decompress.setBpInputName(key + "_" + name + "_decompress"); this.setDecompress(decompress); retInputs.put(key + "_" + name + "_decompress", stringType); @@ -110,10 +109,10 @@ public class DmaapStreams { } else { //set the client role GetInput client = new GetInput(); - client.setGet_input(key + "_" + name + "_client_role"); + client.setBpInputName(key + "_" + name + "_client_role"); this.setClient_role(client); retInputs.put(key + "_" + name + "_client_role", stringType); } return retInputs; } -}
\ No newline at end of file +} |