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/dmaap/DmaapBlueprintService.java | 197 +++++++++++---------- 1 file changed, 108 insertions(+), 89 deletions(-) (limited to 'mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintService.java') diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintService.java index 002bd6c..9da2074 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintService.java @@ -48,97 +48,116 @@ import java.util.TreeMap; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * Service to create DMAAP Blueprint + * @date 10/16/2020 Application: ONAP - Blueprint Generator Service to create DMAAP Blueprint */ - @Service public class DmaapBlueprintService extends BlueprintService { - @Autowired - protected ImportsService importsService; - - @Autowired - private NodeService nodeService; - - @Autowired - private PolicyNodeService policyNodeService; - - @Autowired - private PgaasNodeService pgaasNodeService; - - @Autowired - private QuotationService quotationService; - - @Autowired - private BlueprintHelperService blueprintHelperService; - - // method to generate Dmaap Blueprint - public OnapBlueprint createBlueprint(OnapComponentSpec onapComponentSpec, Input input) { - try { - OnapBlueprint blueprint = new OnapBlueprint(); - blueprint.setTosca_definitions_version(Constants.TOSCA_DEF_VERSION); - blueprint.setDescription(onapComponentSpec.getSelf().getDescription()); - - Map> inputs = new TreeMap<>(); - - //if (!"".equals(input.getImportPath())) - if (!StringUtils.isEmpty(input.getImportPath()) ) - blueprint.setImports(importsService.createImportsFromFile(input.getImportPath())); - else - blueprint.setImports(importsService.createImports(input.getBpType())); - - Map nodeTemplate = new TreeMap(); - - Map dmaapNodeResponse = nodeService.createDmaapNode(onapComponentSpec, inputs, input.getServiceNameOverride()); - inputs = (Map>) dmaapNodeResponse.get("inputs"); - nodeTemplate.put(onapComponentSpec.getSelf().getName(), (Node) dmaapNodeResponse.get("dmaapNode")); - - if (onapComponentSpec.getStreams() != null) { - if (onapComponentSpec.getStreams().getPublishes() != null) { - for (Publishes publishes : onapComponentSpec.getStreams().getPublishes()) { - if (blueprintHelperService.isMessageRouterType(publishes.getType())) { - String topic = publishes.getConfig_key() + Constants._TOPIC; - Map topicNodeResponse = nodeService.createTopicNode(inputs, topic); - inputs = (Map>) topicNodeResponse.get("inputs"); - nodeTemplate.put(topic, (Node) topicNodeResponse.get("topicNode")); - } else if (blueprintHelperService.isDataRouterType(publishes.getType())) { - String feed = publishes.getConfig_key() + Constants._FEED; - Map feedNodeResponse = nodeService.createFeedNode(inputs, feed); - inputs = (Map>) feedNodeResponse.get("inputs"); - nodeTemplate.put(feed, (Node) feedNodeResponse.get("feedNode")); - } - } - } - if (onapComponentSpec.getStreams().getSubscribes() != null) { - for (Subscribes s : onapComponentSpec.getStreams().getSubscribes()) { - if (blueprintHelperService.isMessageRouterType(s.getType())) { - String topic = s.getConfig_key() + Constants._TOPIC; - Map topicNodeResponse = nodeService.createTopicNode(inputs, topic); - inputs = (Map>) topicNodeResponse.get("inputs"); - nodeTemplate.put(topic, (Node) topicNodeResponse.get("topicNode")); - } else if (blueprintHelperService.isDataRouterType(s.getType())) { - String feed = s.getConfig_key() + Constants._FEED; - Map feedNodeResponse = nodeService.createFeedNode(inputs, feed); - inputs = (Map>) feedNodeResponse.get("inputs"); - nodeTemplate.put(feed, (Node) feedNodeResponse.get("feedNode")); - } - } + @Autowired + protected ImportsService importsService; + + @Autowired + private NodeService nodeService; + + @Autowired + private PolicyNodeService policyNodeService; + + @Autowired + private PgaasNodeService pgaasNodeService; + + @Autowired + private QuotationService quotationService; + + @Autowired + private BlueprintHelperService blueprintHelperService; + + /** + * Creates Dmaap Blueprint + * + * @param onapComponentSpec OnapComponentSpec + * @param input Inputs + * @return + */ + public OnapBlueprint createBlueprint(OnapComponentSpec onapComponentSpec, Input input) { + try { + OnapBlueprint blueprint = new OnapBlueprint(); + blueprint.setTosca_definitions_version(Constants.TOSCA_DEF_VERSION); + blueprint.setDescription(onapComponentSpec.getSelf().getDescription()); + + Map> inputs = new TreeMap<>(); + + // if (!"".equals(input.getImportPath())) + if (!StringUtils.isEmpty(input.getImportPath())) { + blueprint.setImports(importsService.createImportsFromFile(input.getImportPath())); + } else { + blueprint.setImports(importsService.createImports(input.getBpType())); + } + + Map nodeTemplate = new TreeMap(); + + Map dmaapNodeResponse = + nodeService + .createDmaapNode(onapComponentSpec, inputs, input.getServiceNameOverride()); + inputs = (Map>) dmaapNodeResponse.get("inputs"); + nodeTemplate.put( + onapComponentSpec.getSelf().getName(), (Node) dmaapNodeResponse.get("dmaapNode")); + + if (onapComponentSpec.getStreams() != null) { + if (onapComponentSpec.getStreams().getPublishes() != null) { + for (Publishes publishes : onapComponentSpec.getStreams().getPublishes()) { + if (blueprintHelperService.isMessageRouterType(publishes.getType())) { + String topic = publishes.getConfig_key() + Constants._TOPIC; + Map topicNodeResponse = nodeService + .createTopicNode(inputs, topic); + inputs = (Map>) topicNodeResponse + .get("inputs"); + nodeTemplate.put(topic, (Node) topicNodeResponse.get("topicNode")); + } else if (blueprintHelperService.isDataRouterType(publishes.getType())) { + String feed = publishes.getConfig_key() + Constants._FEED; + Map feedNodeResponse = nodeService + .createFeedNode(inputs, feed); + inputs = (Map>) feedNodeResponse + .get("inputs"); + nodeTemplate.put(feed, (Node) feedNodeResponse.get("feedNode")); + } + } + } + if (onapComponentSpec.getStreams().getSubscribes() != null) { + for (Subscribes s : onapComponentSpec.getStreams().getSubscribes()) { + if (blueprintHelperService.isMessageRouterType(s.getType())) { + String topic = s.getConfig_key() + Constants._TOPIC; + Map topicNodeResponse = nodeService + .createTopicNode(inputs, topic); + inputs = (Map>) topicNodeResponse + .get("inputs"); + nodeTemplate.put(topic, (Node) topicNodeResponse.get("topicNode")); + } else if (blueprintHelperService.isDataRouterType(s.getType())) { + String feed = s.getConfig_key() + Constants._FEED; + Map feedNodeResponse = nodeService + .createFeedNode(inputs, feed); + inputs = (Map>) feedNodeResponse + .get("inputs"); + nodeTemplate.put(feed, (Node) feedNodeResponse.get("feedNode")); + } + } + } + } + + if (onapComponentSpec.getPolicyInfo() != null) { + policyNodeService.addPolicyNodesAndInputs(onapComponentSpec, nodeTemplate, inputs); + } + + if (onapComponentSpec.getAuxilary() != null + && onapComponentSpec.getAuxilary().getDatabases() != null) { + pgaasNodeService.addPgaasNodesAndInputs(onapComponentSpec, nodeTemplate, inputs); + } + + blueprint.setNode_templates(nodeTemplate); + blueprint.setInputs(inputs); + return quotationService.setQuotations(blueprint); + } catch (Exception ex) { + throw new BlueprintException( + "Unable to create ONAP DMAAP Blueprint Object from given input parameters", ex); + } } - } - - if (onapComponentSpec.getPolicyInfo() != null) - policyNodeService.addPolicyNodesAndInputs(onapComponentSpec, nodeTemplate, inputs); - - if (onapComponentSpec.getAuxilary() != null && onapComponentSpec.getAuxilary().getDatabases() != null) - pgaasNodeService.addPgaasNodesAndInputs(onapComponentSpec, nodeTemplate, inputs); - - blueprint.setNode_templates(nodeTemplate); - blueprint.setInputs(inputs); - return quotationService.setQuotations(blueprint); - } catch (Exception ex) { - throw new BlueprintException("Unable to create ONAP DMAAP Blueprint Object from given input parameters", ex); - } - } -} \ No newline at end of file +} -- cgit 1.2.3-korg