From a520d00e005db1b232b9dae0c70d4dc5d73b33e1 Mon Sep 17 00:00:00 2001 From: Ravi Mantena Date: Mon, 21 Dec 2020 11:31:55 -0500 Subject: BpGen refactor Code Quality Issue-ID: DCAEGEN2-2502 Issue-ID: DCAEGEN2-2502 Change-Id: If6e08f0bb88c9039fb27898d50d2645f79175ba4 Signed-off-by: Ravi Mantena --- .../service/common/DmaapService.java | 73 ++++++++++++++-------- 1 file changed, 48 insertions(+), 25 deletions(-) (limited to 'mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java') diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java index d4b2c42..e21b852 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java @@ -35,63 +35,87 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * Common ONAP Service used by ONAP and DMAAP Blueprint to add DMAAP Message and Data Routers + * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service to add DMAAP Message + * and Data Routers */ - - @Service public class DmaapService { @Autowired private InfoService infoService; - // Method is used to create the Dmaap Message Router - public Map createDmaapMessageRouter(Map> inputs,String config, char type, String counter, String num, boolean isDmaap) { - - Map response = new HashMap<>(); + /** + * Creates Dmaap Message Router from given inputs + * + * @param inputs Input Arguments + * @param config Configuration + * @param type BP Type + * @param counter Counter + * @param num Number Incrementor + * @param isDmaap Dmaap Argument + * @return + */ + public Map createDmaapMessageRouter( + Map> inputs, + String config, + char type, + String counter, + String num, + boolean isDmaap) { + + Map response = new HashMap<>(); Dmaap dmaap = new Dmaap(); LinkedHashMap stringType = new LinkedHashMap(); stringType.put("type", "string"); - if(!isDmaap){ - Map infoResponse = infoService.createMessageRouterInfo(inputs, config, type); + if (!isDmaap) { + Map infoResponse = infoService + .createMessageRouterInfo(inputs, config, type); inputs = (Map>) infoResponse.get("inputs"); dmaap.setDmaap_info(infoResponse.get("info")); - } - else{ + } else { String infoType = "<<" + counter + ">>"; dmaap.setDmaap_info(infoType); GetInput u = new GetInput(); - u.setBpInputName(config + "_" + num +"_aaf_username"); + u.setBpInputName(config + "_" + num + "_aaf_username"); dmaap.setUser(u); - inputs.put(config + "_" + num +"_aaf_username", stringType); + inputs.put(config + "_" + num + "_aaf_username", stringType); GetInput p = new GetInput(); - p.setBpInputName(config + "_" + num +"_aaf_password"); + p.setBpInputName(config + "_" + num + "_aaf_password"); dmaap.setPass(p); - inputs.put(config + "_" + num +"_aaf_password", stringType); + inputs.put(config + "_" + num + "_aaf_password", stringType); } response.put("dmaap", dmaap); response.put("inputs", inputs); return response; } - // Method is used to create the Dmaap Data Router - public Map createDmaapDataRouter(Map> inputs, String config, String counter, boolean isDmaap) { - - Map response = new HashMap<>(); + /** + * Creates Dmaap Data Router from given inputs + * + * @param inputs Input Arguments + * @param config Configuration + * @param counter Counter + * @param isDmaap Dmaap Argument + * @return + */ + public Map createDmaapDataRouter( + Map> inputs, + String config, + String counter, + boolean isDmaap) { + + Map response = new HashMap<>(); Dmaap dmaap = new Dmaap(); - if(!isDmaap){ + if (!isDmaap) { Map infoResponse = infoService.createDataRouterInfo(inputs, config); inputs = (Map>) infoResponse.get("inputs"); dmaap.setDmaap_info(infoResponse.get("info")); - } - else { + } else { String infoType = "<<" + counter + ">>"; dmaap.setDmaap_info(infoType); } @@ -99,5 +123,4 @@ public class DmaapService { response.put("inputs", inputs); return response; } - } -- cgit 1.2.3-korg