diff options
Diffstat (limited to 'mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service')
19 files changed, 133 insertions, 123 deletions
diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/InfoService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/InfoService.java index 66f71da..70ba504 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/InfoService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/InfoService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -53,12 +54,12 @@ public class InfoService { * @return */ public Map<String, Object> createMessageRouterInfo( - Map<String, LinkedHashMap<String, Object>> inputs, String config, char type) { + Map<String, Map<String, Object>> inputs, String config, char type) { Map<String, Object> response = new HashMap<>(); Info info = new Info(); - LinkedHashMap<String, Object> stringType = new LinkedHashMap<>(); + Map<String, Object> stringType = new LinkedHashMap<>(); stringType.put("type", "string"); config = config.replaceAll("-", "_"); @@ -87,12 +88,12 @@ public class InfoService { * @return */ public Map<String, Object> createDataRouterInfo( - Map<String, LinkedHashMap<String, Object>> inputs, String config) { + Map<String, Map<String, Object>> inputs, String config) { Map<String, Object> response = new HashMap<>(); Info info = new Info(); - LinkedHashMap<String, Object> stringType = new LinkedHashMap<>(); + Map<String, Object> stringType = new LinkedHashMap<>(); stringType.put("type", "string"); String userNameInputName = blueprintHelperService.joinUnderscore(config, "username"); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java index b31fc49..a64c297 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java @@ -68,7 +68,7 @@ public class AppConfigService { * @return */ public Map<String, Object> createAppconfig( - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, OnapComponentSpec onapComponentSpec, boolean isDmaap) { @@ -94,7 +94,7 @@ public class AppConfigService { paramInput.setBpInputName(pName); parameters.put(pName, paramInput); if (!"".equals(p.getValue())) { - LinkedHashMap<String, Object> pInputs = createInputFromParameter(p); + Map<String, Object> pInputs = createInputFromParameter(p); inputs.put(pName, pInputs); } else { LinkedHashMap<String, Object> pInputs = new LinkedHashMap<>(); @@ -122,7 +122,7 @@ public class AppConfigService { return response; } - private LinkedHashMap<String, Object> createInputFromParameter(Parameters parameter) { + private Map<String, Object> createInputFromParameter(Parameters parameter) { String inputType = parameter.getType() == null ? "string" : parameter.getType(); return blueprintHelperService.createInputByType(inputType, parameter.getValue()); 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 e21b852..09ed925 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 @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -56,7 +57,7 @@ public class DmaapService { * @return */ public Map<String, Object> createDmaapMessageRouter( - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, String config, char type, String counter, @@ -72,7 +73,7 @@ public class DmaapService { if (!isDmaap) { Map<String, Object> infoResponse = infoService .createMessageRouterInfo(inputs, config, type); - inputs = (Map<String, LinkedHashMap<String, Object>>) infoResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) infoResponse.get("inputs"); dmaap.setDmaap_info(infoResponse.get("info")); } else { String infoType = "<<" + counter + ">>"; @@ -103,7 +104,7 @@ public class DmaapService { * @return */ public Map<String, Object> createDmaapDataRouter( - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, String config, String counter, boolean isDmaap) { @@ -113,7 +114,7 @@ public class DmaapService { if (!isDmaap) { Map<String, Object> infoResponse = infoService.createDataRouterInfo(inputs, config); - inputs = (Map<String, LinkedHashMap<String, Object>>) infoResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) infoResponse.get("inputs"); dmaap.setDmaap_info(infoResponse.get("info")); } else { String infoType = "<<" + counter + ">>"; diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ExternalCertificateParametersFactoryService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ExternalCertificateParametersFactoryService.java index 226a319..1e3386c 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ExternalCertificateParametersFactoryService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ExternalCertificateParametersFactoryService.java @@ -4,7 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. - * * Copyright (c) 2020 Nokia. All rights reserved. + * * Copyright (c) 2020-2021 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. @@ -64,16 +64,16 @@ public class ExternalCertificateParametersFactoryService * * @return */ - public Map<String, LinkedHashMap<String, Object>> createInputList() { - Map<String, LinkedHashMap<String, Object>> retInputs = new LinkedHashMap<>(); + public Map<String, Map<String, Object>> createInputList() { + Map<String, Map<String, Object>> retInputs = new LinkedHashMap<>(); - LinkedHashMap<String, Object> commonNameInputMap = + Map<String, Object> commonNameInputMap = blueprintHelperService.createStringInput( "Common name which should be present in certificate.", Constants.DEFAULT_COMMON_NAME); retInputs.put(addPrefix(Constants.COMMON_NAME_FIELD), commonNameInputMap); - LinkedHashMap<String, Object> sansInputMap = + Map<String, Object> sansInputMap = blueprintHelperService.createStringInput( "\"List of Subject Alternative Names (SANs) which should be present in certificate. " + "Delimiter - , Should contain a common_name value and other FQDNs under which the given " diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ExternalTlsInfoFactoryService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ExternalTlsInfoFactoryService.java index 0694821..f73a9e6 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ExternalTlsInfoFactoryService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ExternalTlsInfoFactoryService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -31,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; /** @@ -76,25 +76,25 @@ public class ExternalTlsInfoFactoryService extends ExternalCertificateDataFactor * @param cs ComponentSpec * @return */ - public Map<String, LinkedHashMap<String, Object>> createInputListFromComponentSpec( + public Map<String, Map<String, Object>> createInputListFromComponentSpec( OnapComponentSpec cs) { - Map<String, LinkedHashMap<String, Object>> retInputs = new HashMap<>(); + Map<String, Map<String, Object>> retInputs = new HashMap<>(); Map<String, Object> externalTlsInfoCs = cs.getAuxilary().getTls_info(); - LinkedHashMap<String, Object> useTlsFlagInput = + Map<String, Object> useTlsFlagInput = blueprintHelperService.createBooleanInput( "Flag to indicate external tls enable/disable.", externalTlsInfoCs.get(Constants.USE_EXTERNAL_TLS_FIELD)); retInputs.put(addPrefix(Constants.USE_EXTERNAL_TLS_FIELD), useTlsFlagInput); - LinkedHashMap<String, Object> caNameInputMap = + Map<String, Object> caNameInputMap = blueprintHelperService.createStringInput( "Name of Certificate Authority configured on CertService side.", Constants.DEFAULT_CA); retInputs.put(addPrefix(Constants.CA_NAME_FIELD), caNameInputMap); - LinkedHashMap<String, Object> certTypeInputMap = + Map<String, Object> certTypeInputMap = blueprintHelperService.createStringInput( "Format of provided certificates", Constants.DEFAULT_CERT_TYPE); retInputs.put(addPrefix(Constants.CERT_TYPE_FIELD), certTypeInputMap); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/InterfacesService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/InterfacesService.java index a14204f..c19ad09 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/InterfacesService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/InterfacesService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -30,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; /** @@ -52,13 +52,13 @@ public class InterfacesService { * @return */ public Map<String, Object> createInterface( - Map<String, LinkedHashMap<String, Object>> inputs, OnapComponentSpec onapComponentSpec) { + Map<String, Map<String, Object>> inputs, OnapComponentSpec onapComponentSpec) { Map<String, Object> response = new HashMap<>(); Interfaces interfaces = new Interfaces(); Map<String, Object> startResponse = startService.createStart(inputs, onapComponentSpec); - inputs = (Map<String, LinkedHashMap<String, Object>>) startResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) startResponse.get("inputs"); interfaces.setStart((Start) startResponse.get("start")); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/NodeService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/NodeService.java index ab1b7f2..50451db 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/NodeService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/NodeService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -74,7 +75,7 @@ public class NodeService { * @return */ public Map<String, Object> createOnapNode( - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, OnapComponentSpec onapComponentSpec, String override) { @@ -83,7 +84,7 @@ public class NodeService { Map<String, Object> onapResponse = interfacesService .createInterface(inputs, onapComponentSpec); - inputs = (Map<String, LinkedHashMap<String, Object>>) onapResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) onapResponse.get("inputs"); Map<String, Interfaces> interfaces = new TreeMap<>(); interfaces.put( @@ -110,7 +111,7 @@ public class NodeService { Map<String, Object> propertiesResponse = propertiesService.createOnapProperties(inputs, onapComponentSpec, override); - inputs = (Map<String, LinkedHashMap<String, Object>>) propertiesResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) propertiesResponse.get("inputs"); onapNode.setProperties( (org.onap.blueprintgenerator.model.common.Properties) propertiesResponse .get("properties")); @@ -130,7 +131,7 @@ public class NodeService { */ public Map<String, Object> createDmaapNode( OnapComponentSpec onapComponentSpec, - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, String override) { Map<String, Object> response = new HashMap<>(); @@ -140,7 +141,7 @@ public class NodeService { Map<String, Object> dmaapResponse = interfacesService.createInterface(inputs, onapComponentSpec); - inputs = (Map<String, LinkedHashMap<String, Object>>) dmaapResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) dmaapResponse.get("inputs"); Map<String, Interfaces> interfaces = new TreeMap<>(); interfaces.put( @@ -154,10 +155,10 @@ public class NodeService { Map<String, String> pubRelations = new LinkedHashMap(); if (blueprintHelperService.isMessageRouterType(publishes.getType())) { pubRelations.put("type", Constants.PUBLISH_EVENTS); - pubRelations.put("target", publishes.getConfig_key() + Constants._TOPIC); + pubRelations.put("target", publishes.getConfig_key() + Constants.A_TOPIC); } else if (blueprintHelperService.isDataRouterType(publishes.getType())) { pubRelations.put("type", Constants.PUBLISH_FILES); - pubRelations.put("target", publishes.getConfig_key() + Constants._FEED); + pubRelations.put("target", publishes.getConfig_key() + Constants.A_FEED); } relationships.add(pubRelations); } @@ -168,10 +169,10 @@ public class NodeService { Map<String, String> subRelations = new LinkedHashMap(); if (blueprintHelperService.isMessageRouterType(subscribes.getType())) { subRelations.put("type", Constants.SUBSCRIBE_TO_EVENTS); - subRelations.put("target", subscribes.getConfig_key() + Constants._TOPIC); + subRelations.put("target", subscribes.getConfig_key() + Constants.A_TOPIC); } else if (blueprintHelperService.isDataRouterType(subscribes.getType())) { subRelations.put("type", Constants.SUBSCRIBE_TO_FILES); - subRelations.put("target", subscribes.getConfig_key() + Constants._FEED); + subRelations.put("target", subscribes.getConfig_key() + Constants.A_FEED); } relationships.add(subRelations); } @@ -193,7 +194,7 @@ public class NodeService { Map<String, Object> propertiesResponse = propertiesService.createDmaapProperties(inputs, onapComponentSpec, override); - inputs = (Map<String, LinkedHashMap<String, Object>>) propertiesResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) propertiesResponse.get("inputs"); dmaapNode.setProperties( (org.onap.blueprintgenerator.model.common.Properties) propertiesResponse .get("properties")); @@ -211,11 +212,11 @@ public class NodeService { * @return */ public Map<String, Object> createFeedNode( - Map<String, LinkedHashMap<String, Object>> inputs, String name) { + Map<String, Map<String, Object>> inputs, String name) { Map<String, Object> response = new HashMap<>(); Node feedNode = new Node(); - LinkedHashMap<String, Object> stringType = new LinkedHashMap(); + Map<String, Object> stringType = new LinkedHashMap(); stringType.put("type", "string"); feedNode.setType(Constants.FEED); @@ -242,11 +243,11 @@ public class NodeService { * @return */ public Map<String, Object> createTopicNode( - Map<String, LinkedHashMap<String, Object>> inputs, String name) { + Map<String, Map<String, Object>> inputs, String name) { Map<String, Object> response = new HashMap<>(); Node topicNode = new Node(); - LinkedHashMap<String, Object> stringType = new LinkedHashMap(); + Map<String, Object> stringType = new LinkedHashMap(); stringType.put("type", "string"); topicNode.setType(Constants.TOPIC); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PgaasNodeService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PgaasNodeService.java index d18ca92..e7dd0ab 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PgaasNodeService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PgaasNodeService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -63,7 +64,7 @@ public class PgaasNodeService { public void addPgaasNodesAndInputs( OnapComponentSpec onapComponentSpec, Map<String, Node> nodeTemplate, - Map<String, LinkedHashMap<String, Object>> inputs) { + Map<String, Map<String, Object>> inputs) { Map<String, String> databases = onapComponentSpec.getAuxilary().getDatabases(); if (databases != null) { for (Map.Entry<String, String> database : databases.entrySet()) { @@ -74,7 +75,7 @@ public class PgaasNodeService { } private void addPgaasInputs( - Map.Entry<String, String> database, Map<String, LinkedHashMap<String, Object>> inputs) { + Map.Entry<String, String> database, Map<String, Map<String, Object>> inputs) { inputs.put( database.getKey() + Constants.NAME_POSTFIX, blueprintHelperService.createStringInput("db name", "")); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PolicyNodeService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PolicyNodeService.java index 43d819f..9fee7c6 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PolicyNodeService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PolicyNodeService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -60,7 +61,7 @@ public class PolicyNodeService { public void addPolicyNodesAndInputs( OnapComponentSpec onapComponentSpec, Map<String, Node> nodeTemplate, - Map<String, LinkedHashMap<String, Object>> inputs) { + Map<String, Map<String, Object>> inputs) { List<TypePolicy> policyList = onapComponentSpec.getPolicyInfo().getTypePolicyList(); for (TypePolicy policy : policyList) { addPolicyNodesToNodeTemplate(policy, nodeTemplate); @@ -69,7 +70,7 @@ public class PolicyNodeService { } private void addPolicyInputs( - TypePolicy policy, Map<String, LinkedHashMap<String, Object>> inputs) { + TypePolicy policy, Map<String, Map<String, Object>> inputs) { String defaultValue = policy.getPolicy_id(); defaultValue = defaultValue != null ? defaultValue : ""; inputs.put( diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PropertiesService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PropertiesService.java index 382cc2b..2758f8c 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PropertiesService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/PropertiesService.java @@ -76,7 +76,7 @@ public class PropertiesService { * @return */ public Map<String, Object> createOnapProperties( - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, OnapComponentSpec onapComponentSpec, String override) { Map<String, Object> response = new HashMap<>(); @@ -103,7 +103,7 @@ public class PropertiesService { replica.setBpInputName("replicas"); properties.setReplicas(replica); - LinkedHashMap<String, Object> replicas = + Map<String, Object> replicas = blueprintHelperService.createIntegerInput("number of instances", 1); inputs.put("replicas", replicas); @@ -113,7 +113,7 @@ public class PropertiesService { Map<String, Object> appConfigResponse = appConfigService.createAppconfig(inputs, onapComponentSpec, false); - inputs = (Map<String, LinkedHashMap<String, Object>>) appConfigResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) appConfigResponse.get("inputs"); properties.setApplication_config((Appconfig) appConfigResponse.get("appconfig")); GetInput always_pull_image = new GetInput(); @@ -121,7 +121,7 @@ public class PropertiesService { properties.setAlways_pull_image(always_pull_image); - LinkedHashMap<String, Object> inputAlwaysPullImage = + Map<String, Object> inputAlwaysPullImage = blueprintHelperService.createBooleanInput( "Set to true if the image should always be pulled", true); inputs.put("always_pull_image", inputAlwaysPullImage); @@ -144,7 +144,7 @@ public class PropertiesService { Map<String, Object> resourceConfigResponse = resourceConfigService .createResourceConfig(inputs, onapComponentSpec.getSelf().getName()); - inputs = (Map<String, LinkedHashMap<String, Object>>) resourceConfigResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) resourceConfigResponse.get("inputs"); properties .setResource_config((ResourceConfig) resourceConfigResponse.get("resourceConfig")); @@ -162,7 +162,7 @@ public class PropertiesService { * @return */ public Map<String, Object> createDmaapProperties( - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, OnapComponentSpec onapComponentSpec, String override) { Map<String, Object> response = new HashMap<>(); @@ -173,7 +173,7 @@ public class PropertiesService { image.setBpInputName("tag_version"); properties.setImage(image); - LinkedHashMap<String, Object> img = new LinkedHashMap<>(); + Map<String, Object> img = new LinkedHashMap<>(); inputs.put( "tag_version", blueprintHelperService.createStringInput(onapComponentSpec.getArtifacts()[0].getUri())); @@ -182,7 +182,7 @@ public class PropertiesService { location.setBpInputName("location_id"); properties.setLocation_id(location); - LinkedHashMap<String, Object> locMap = new LinkedHashMap(); + Map<String, Object> locMap = new LinkedHashMap(); inputs.put("location_id", blueprintHelperService.createStringInput(Constants.EMPTY_VALUE)); properties.setLog_info(onapComponentSpec.getAuxilary().getLog_info()); @@ -206,7 +206,7 @@ public class PropertiesService { replica.setBpInputName("replicas"); properties.setReplicas(replica); - LinkedHashMap<String, Object> rep = + Map<String, Object> rep = blueprintHelperService.createIntegerInput("number of instances", 1); inputs.put("replicas", rep); @@ -216,7 +216,7 @@ public class PropertiesService { Map<String, Object> appConfigResponse = appConfigService.createAppconfig(inputs, onapComponentSpec, true); - inputs = (Map<String, LinkedHashMap<String, Object>>) appConfigResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) appConfigResponse.get("inputs"); properties.setApplication_config((Appconfig) appConfigResponse.get("appconfig")); List<Streams> pubStreams = new ArrayList(); @@ -224,7 +224,7 @@ public class PropertiesService { if (onapComponentSpec.getStreams().getPublishes() != null) { for (Publishes publishes : onapComponentSpec.getStreams().getPublishes()) { if (blueprintHelperService.isMessageRouterType(publishes.getType())) { - String topic = publishes.getConfig_key() + Constants._TOPIC; + String topic = publishes.getConfig_key() + Constants.A_TOPIC; Map<String, Object> streamsMessageRouterResponse = streamsService.createStreams( inputs, @@ -234,11 +234,11 @@ public class PropertiesService { publishes.getRoute(), 'p'); inputs = - (Map<String, LinkedHashMap<String, Object>>) + (Map<String, Map<String, Object>>) streamsMessageRouterResponse.get("inputs"); pubStreams.add((Streams) streamsMessageRouterResponse.get("streams")); } else if (blueprintHelperService.isDataRouterType(publishes.getType())) { - String feed = publishes.getConfig_key() + Constants._FEED; + String feed = publishes.getConfig_key() + Constants.A_FEED; Map<String, Object> streamsDataRouterResponse = streamsService.createStreams( inputs, @@ -248,7 +248,7 @@ public class PropertiesService { publishes.getRoute(), 'p'); inputs = - (Map<String, LinkedHashMap<String, Object>>) + (Map<String, Map<String, Object>>) streamsDataRouterResponse.get("inputs"); pubStreams.add((Streams) streamsDataRouterResponse.get("streams")); } @@ -261,7 +261,7 @@ public class PropertiesService { if (onapComponentSpec.getStreams().getSubscribes() != null) { for (Subscribes subscribes : onapComponentSpec.getStreams().getSubscribes()) { if (blueprintHelperService.isMessageRouterType(subscribes.getType())) { - String topic = subscribes.getConfig_key() + Constants._TOPIC; + String topic = subscribes.getConfig_key() + Constants.A_TOPIC; Map<String, Object> streamsMessageRouterResponse = streamsService.createStreams( inputs, @@ -271,11 +271,11 @@ public class PropertiesService { subscribes.getRoute(), 's'); inputs = - (Map<String, LinkedHashMap<String, Object>>) + (Map<String, Map<String, Object>>) streamsMessageRouterResponse.get("inputs"); subStreams.add((Streams) streamsMessageRouterResponse.get("streams")); } else if (blueprintHelperService.isDataRouterType(subscribes.getType())) { - String feed = subscribes.getConfig_key() + Constants._FEED; + String feed = subscribes.getConfig_key() + Constants.A_FEED; Map<String, Object> streamsDataRouterResponse = streamsService.createStreams( inputs, @@ -285,7 +285,7 @@ public class PropertiesService { subscribes.getRoute(), 's'); inputs = - (Map<String, LinkedHashMap<String, Object>>) + (Map<String, Map<String, Object>>) streamsDataRouterResponse.get("inputs"); subStreams.add((Streams) streamsDataRouterResponse.get("streams")); } @@ -304,7 +304,7 @@ public class PropertiesService { Map<String, Object> resourceConfigResponse = resourceConfigService .createResourceConfig(inputs, onapComponentSpec.getSelf().getName()); - inputs = (Map<String, LinkedHashMap<String, Object>>) resourceConfigResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) resourceConfigResponse.get("inputs"); properties .setResource_config((ResourceConfig) resourceConfigResponse.get("resourceConfig")); @@ -313,7 +313,7 @@ public class PropertiesService { return response; } - private LinkedHashMap<String, Object> addServiceComponentNameOverride(String override, Properties properties) { + private Map<String, Object> addServiceComponentNameOverride(String override, Properties properties) { GetInput overrideGetInput = new GetInput(); overrideGetInput.setBpInputName(Constants.SERVICE_COMPONENT_NAME_OVERRIDE); properties.setService_component_name_override(overrideGetInput); @@ -322,7 +322,7 @@ public class PropertiesService { private void addTlsInfo( OnapComponentSpec onapComponentSpec, - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, Properties properties) { TlsInfo tlsInfo = new TlsInfo(); tlsInfo.setCertDirectory( @@ -331,14 +331,14 @@ public class PropertiesService { useTLSFlag.setBpInputName("use_tls"); tlsInfo.setUseTls(useTLSFlag); properties.setTls_info(tlsInfo); - LinkedHashMap<String, Object> useTlsFlagInput = + Map<String, Object> useTlsFlagInput = blueprintHelperService.createBooleanInput( "flag to indicate tls enable/disable", onapComponentSpec.getAuxilary().getTls_info().get("use_tls")); inputs.put("use_tls", useTlsFlagInput); } - private Map<String, LinkedHashMap<String, Object>> addExternalTlsInfo( + private Map<String, Map<String, Object>> addExternalTlsInfo( OnapComponentSpec onapComponentSpec, Properties properties) { properties.setExternal_cert( externalTlsInfoFactoryService.createFromComponentSpec(onapComponentSpec)); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/QuotationService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/QuotationService.java index 642a13e..fef4447 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/QuotationService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/QuotationService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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,11 +24,10 @@ package org.onap.blueprintgenerator.service.common; +import java.util.Map; import org.onap.blueprintgenerator.model.common.OnapBlueprint; import org.springframework.stereotype.Service; -import java.util.LinkedHashMap; - /** * @author : Ravi Mantena * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service to set Quotations of @@ -44,7 +44,7 @@ public class QuotationService { */ public OnapBlueprint setQuotations(OnapBlueprint bp) { for (String s : bp.getInputs().keySet()) { - LinkedHashMap<String, Object> temp = bp.getInputs().get(s); + Map<String, Object> temp = bp.getInputs().get(s); if (temp.get("type") == "string") { String def = (String) temp.get("default"); if (def != null) { diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ResourceConfigService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ResourceConfigService.java index a3a9c97..d9bc7b5 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ResourceConfigService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ResourceConfigService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -28,10 +29,10 @@ import org.onap.blueprintgenerator.model.common.GetInput; import org.onap.blueprintgenerator.model.common.ResourceConfig; import org.onap.blueprintgenerator.service.base.BlueprintHelperService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; import java.util.TreeMap; @@ -46,6 +47,12 @@ public class ResourceConfigService { @Autowired private BlueprintHelperService blueprintHelperService; + @Value("${resources.cpuLimit}") + private String defaultCpuLimit; + + @Value("${resources.memoryLimit}") + private String defaultMemoryLimit; + /** * Creates Resouce Config for properties * @@ -54,15 +61,15 @@ public class ResourceConfigService { * @return */ public Map<String, Object> createResourceConfig( - Map<String, LinkedHashMap<String, Object>> inputs, String name) { + Map<String, Map<String, Object>> inputs, String name) { Map<String, Object> response = new HashMap<>(); ResourceConfig resourceConfig = new ResourceConfig(); - LinkedHashMap<String, Object> memoryLimit = - blueprintHelperService.createStringInput(Constants.MEMORY_LIMIT_128Mi); + Map<String, Object> memoryLimit = + blueprintHelperService.createStringInput(defaultMemoryLimit); - LinkedHashMap<String, Object> cpuLimit = - blueprintHelperService.createStringInput(Constants.CPU_LIMIT_250m); + Map<String, Object> cpuLimit = + blueprintHelperService.createStringInput(defaultCpuLimit); name = blueprintHelperService.getNamePrefix(name); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StartInputsService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StartInputsService.java index 8ec0024..dc7a86e 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StartInputsService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StartInputsService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -55,7 +56,7 @@ public class StartInputsService { * @return */ public Map<String, Object> createStartInputs( - Map<String, LinkedHashMap<String, Object>> inputs, OnapComponentSpec onapComponentSpec) { + Map<String, Map<String, Object>> inputs, OnapComponentSpec onapComponentSpec) { Map<String, Object> response = new HashMap<>(); StartInputs startInputs = new StartInputs(); @@ -71,7 +72,7 @@ public class StartInputsService { String.format("concat: [\"%s:\", {get_input: external_port_%d}]", ports[0], count)); - LinkedHashMap<String, Object> portType = new LinkedHashMap(); + Map<String, Object> portType = new LinkedHashMap(); portType.put("type", "string"); portType.put("default", ports[1]); inputs.put("external_port_" + count, portType); @@ -81,7 +82,7 @@ public class StartInputsService { startInputs.setPorts(portList); - LinkedHashMap<String, Object> envMap = new LinkedHashMap(); + Map<String, Object> envMap = new LinkedHashMap(); if (onapComponentSpec.getAuxilary().getDatabases() != null) { Map<String, Object> envVars = pgaasNodeService.getEnvVariables(onapComponentSpec.getAuxilary().getDatabases()); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StartService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StartService.java index 6c92c6f..7f3602f 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StartService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StartService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -30,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; /** @@ -51,13 +51,13 @@ public class StartService { * @return */ public Map<String, Object> createStart( - Map<String, LinkedHashMap<String, Object>> inputs, OnapComponentSpec onapComponentSpec) { + Map<String, Map<String, Object>> inputs, OnapComponentSpec onapComponentSpec) { Map<String, Object> response = new HashMap<>(); Start start = new Start(); Map<String, Object> startInputsResponse = startInputsService.createStartInputs(inputs, onapComponentSpec); - inputs = (Map<String, LinkedHashMap<String, Object>>) startInputsResponse.get("inputs"); + inputs = (Map<String,Map<String, Object>>) startInputsResponse.get("inputs"); start.setInputs((StartInputs) startInputsResponse.get("startInputs")); response.put("start", start); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StreamService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StreamService.java index f27ea48..17699a8 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StreamService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/StreamService.java @@ -64,7 +64,7 @@ public class StreamService { OnapComponentSpec onapComponentSpec, BlueprintHelperService blueprintHelperService, DmaapService dmaapService, - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, boolean isDmaap) { Map<String, BaseStream> streamPublishes = new TreeMap<>(); @@ -75,23 +75,23 @@ public class StreamService { for (Publishes publishes : onapComponentSpec.getStreams().getPublishes()) { if (blueprintHelperService.isDataRouterType(publishes.getType())) { String config = publishes.getConfig_key(); - String name = config + Constants._FEED; + String name = config + Constants.A_FEED; Map<String, Object> dmaapDataRouterResponse = dmaapService.createDmaapDataRouter(inputs, config, name, isDmaap); inputs = - (Map<String, LinkedHashMap<String, Object>>) dmaapDataRouterResponse + (Map<String, Map<String, Object>>) dmaapDataRouterResponse .get("inputs"); Dmaap dmaap = (Dmaap) dmaapDataRouterResponse.get("dmaap"); dmaap.setType(publishes.getType()); streamPublishes.put(config, dmaap); } else if (blueprintHelperService.isMessageRouterType(publishes.getType())) { String config = publishes.getConfig_key(); - String name = config + Constants._TOPIC; + String name = config + Constants.A_TOPIC; Map<String, Object> dmaapDataRouterResponse = dmaapService .createDmaapMessageRouter(inputs, config, 'p', name, name, isDmaap); inputs = - (Map<String, LinkedHashMap<String, Object>>) dmaapDataRouterResponse + (Map<String, Map<String, Object>>) dmaapDataRouterResponse .get("inputs"); Dmaap dmaap = (Dmaap) dmaapDataRouterResponse.get("dmaap"); dmaap.setType(publishes.getType()); @@ -118,7 +118,7 @@ public class StreamService { OnapComponentSpec onapComponentSpec, BlueprintHelperService blueprintHelperService, DmaapService dmaapService, - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, boolean isDmaap) { Map<String, BaseStream> streamSubscribes = new TreeMap<>(); @@ -129,23 +129,23 @@ public class StreamService { for (Subscribes subscribes : onapComponentSpec.getStreams().getSubscribes()) { if (blueprintHelperService.isDataRouterType(subscribes.getType())) { String config = subscribes.getConfig_key(); - String name = config + Constants._FEED; + String name = config + Constants.A_FEED; Map<String, Object> dmaapDataRouterResponse = dmaapService.createDmaapDataRouter(inputs, config, name, isDmaap); inputs = - (Map<String, LinkedHashMap<String, Object>>) dmaapDataRouterResponse + (Map<String, Map<String, Object>>) dmaapDataRouterResponse .get("inputs"); Dmaap dmaap = (Dmaap) dmaapDataRouterResponse.get("dmaap"); dmaap.setType(subscribes.getType()); streamSubscribes.put(config, dmaap); } else if (blueprintHelperService.isMessageRouterType(subscribes.getType())) { String config = subscribes.getConfig_key(); - String name = config + Constants._TOPIC; + String name = config + Constants.A_TOPIC; Map<String, Object> dmaapDataRouterResponse = dmaapService .createDmaapMessageRouter(inputs, config, 's', name, name, isDmaap); inputs = - (Map<String, LinkedHashMap<String, Object>>) dmaapDataRouterResponse + (Map<String, Map<String, Object>>) dmaapDataRouterResponse .get("inputs"); Dmaap dmaap = (Dmaap) dmaapDataRouterResponse.get("dmaap"); dmaap.setType(subscribes.getType()); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java index 2090ef0..c36387c 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java @@ -59,7 +59,7 @@ public class KafkaStreamService { * @param streamName Stream name * @return */ - public Map<String, LinkedHashMap<String, Object>> createStreamPublishInputs(String streamName) { + public Map<String, Map<String, Object>> createStreamPublishInputs(String streamName) { return createStreamInputs(streamName + PUBLISH_URL_SUFFIX); } @@ -69,7 +69,7 @@ public class KafkaStreamService { * @param streamName Stream name * @return */ - public Map<String, LinkedHashMap<String, Object>> createStreamSubscribeInputs(String streamName) { + public Map<String, Map<String, Object>> createStreamSubscribeInputs(String streamName) { return createStreamInputs(streamName + SUBSCRIBE_URL_SUFFIX); } @@ -81,7 +81,7 @@ public class KafkaStreamService { */ public Map<String, KafkaStream> createAppPropertiesPublish(String streamName) { - LinkedHashMap<String, KafkaStream> kafkaStreamMap = new LinkedHashMap<>(); + Map<String, KafkaStream> kafkaStreamMap = new LinkedHashMap<>(); KafkaStream kafkaStream = createAppProperties(streamName, PUBLISH_URL_SUFFIX); kafkaStreamMap.put(streamName, kafkaStream); @@ -97,7 +97,7 @@ public class KafkaStreamService { */ public Map<String, KafkaStream> createAppPropertiesSubscribe(String streamName) { - LinkedHashMap<String, KafkaStream> kafkaStreamMap = new LinkedHashMap<>(); + Map<String, KafkaStream> kafkaStreamMap = new LinkedHashMap<>(); KafkaStream kafkaStream = createAppProperties(streamName, SUBSCRIBE_URL_SUFFIX); kafkaStreamMap.put(streamName, kafkaStream); @@ -111,25 +111,25 @@ public class KafkaStreamService { return new KafkaStream(topicName); } - private Map<String, LinkedHashMap<String, Object>> createStreamInputs(String streamName) { - LinkedHashMap<String, LinkedHashMap<String, Object>> streamInputs = createBaseInputs(); - LinkedHashMap<String, Object> stream = + private Map<String, Map<String, Object>> createStreamInputs(String streamName) { + Map<String, Map<String, Object>> streamInputs = createBaseInputs(); + Map<String, Object> stream = blueprintHelperService.createStringInput(DEFAULT_STREAM_URL); streamInputs.put(streamName, stream); return streamInputs; } - private LinkedHashMap<String, LinkedHashMap<String, Object>> createBaseInputs() { - LinkedHashMap<String, LinkedHashMap<String, Object>> baseInputs = new LinkedHashMap<>(); + private Map<String, Map<String, Object>> createBaseInputs() { + Map<String, Map<String, Object>> baseInputs = new LinkedHashMap<>(); - LinkedHashMap<String, Object> kafka_message_router = blueprintHelperService + Map<String, Object> kafka_message_router = blueprintHelperService .createStringInput(DEFAULT_BOOTSTRAP_SERVER); baseInputs.put(KAFKA_INFO_BOOTSTRAP_SERVERS_INPUT_NAME, kafka_message_router); - LinkedHashMap<String, Object> kafka_username = blueprintHelperService.createStringInput(DEFAULT_AAF_USER); + Map<String, Object> kafka_username = blueprintHelperService.createStringInput(DEFAULT_AAF_USER); baseInputs.put(AFF_KAFKA_USER_INPUT_NAME, kafka_username); - LinkedHashMap<String, Object> kafka_password = blueprintHelperService.createStringInput(DEFAULT_AAF_PASSWORD); + Map<String, Object> kafka_password = blueprintHelperService.createStringInput(DEFAULT_AAF_PASSWORD); baseInputs.put(AAF_KAFKA_PASSWORD_INPUT_NAME, kafka_password); return baseInputs; diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintCreatorService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintCreatorService.java index bf68f81..4ab0c84 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintCreatorService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintCreatorService.java @@ -4,7 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. - * * Copyright (c) 2020 Nokia. All rights reserved. + * * Copyright (c) 2020-2021 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. @@ -43,7 +43,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.util.LinkedHashMap; import java.util.Map; import java.util.TreeMap; @@ -85,9 +84,8 @@ public class DmaapBlueprintCreatorService { blueprint.setTosca_definitions_version(Constants.TOSCA_DEF_VERSION); blueprint.setDescription(onapComponentSpec.getSelf().getDescription()); - Map<String, LinkedHashMap<String, Object>> inputs = new TreeMap<>(); + Map<String, Map<String, Object>> inputs = new TreeMap<>(); - // if (!"".equals(input.getImportPath())) if (!StringUtils.isEmpty(input.getImportPath())) { blueprint.setImports(importsService.createImportsFromFile(input.getImportPath())); } else { @@ -99,7 +97,7 @@ public class DmaapBlueprintCreatorService { Map<String, Object> dmaapNodeResponse = nodeService .createDmaapNode(onapComponentSpec, inputs, input.getServiceNameOverride()); - inputs = (Map<String, LinkedHashMap<String, Object>>) dmaapNodeResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) dmaapNodeResponse.get("inputs"); nodeTemplate.put( onapComponentSpec.getSelf().getName(), (Node) dmaapNodeResponse.get("dmaapNode")); @@ -107,17 +105,17 @@ public class DmaapBlueprintCreatorService { if (onapComponentSpec.getStreams().getPublishes() != null) { for (Publishes publishes : onapComponentSpec.getStreams().getPublishes()) { if (blueprintHelperService.isMessageRouterType(publishes.getType())) { - String topic = publishes.getConfig_key() + Constants._TOPIC; + String topic = publishes.getConfig_key() + Constants.A_TOPIC; Map<String, Object> topicNodeResponse = nodeService .createTopicNode(inputs, topic); - inputs = (Map<String, LinkedHashMap<String, Object>>) topicNodeResponse + inputs = (Map<String, Map<String, Object>>) topicNodeResponse .get("inputs"); nodeTemplate.put(topic, (Node) topicNodeResponse.get("topicNode")); } else if (blueprintHelperService.isDataRouterType(publishes.getType())) { - String feed = publishes.getConfig_key() + Constants._FEED; + String feed = publishes.getConfig_key() + Constants.A_FEED; Map<String, Object> feedNodeResponse = nodeService .createFeedNode(inputs, feed); - inputs = (Map<String, LinkedHashMap<String, Object>>) feedNodeResponse + inputs = (Map<String, Map<String, Object>>) feedNodeResponse .get("inputs"); nodeTemplate.put(feed, (Node) feedNodeResponse.get("feedNode")); } @@ -126,17 +124,17 @@ public class DmaapBlueprintCreatorService { if (onapComponentSpec.getStreams().getSubscribes() != null) { for (Subscribes s : onapComponentSpec.getStreams().getSubscribes()) { if (blueprintHelperService.isMessageRouterType(s.getType())) { - String topic = s.getConfig_key() + Constants._TOPIC; + String topic = s.getConfig_key() + Constants.A_TOPIC; Map<String, Object> topicNodeResponse = nodeService .createTopicNode(inputs, topic); - inputs = (Map<String, LinkedHashMap<String, Object>>) topicNodeResponse + inputs = (Map<String, Map<String, Object>>) topicNodeResponse .get("inputs"); nodeTemplate.put(topic, (Node) topicNodeResponse.get("topicNode")); } else if (blueprintHelperService.isDataRouterType(s.getType())) { - String feed = s.getConfig_key() + Constants._FEED; + String feed = s.getConfig_key() + Constants.A_FEED; Map<String, Object> feedNodeResponse = nodeService .createFeedNode(inputs, feed); - inputs = (Map<String, LinkedHashMap<String, Object>>) feedNodeResponse + inputs = (Map<String, Map<String, Object>>) feedNodeResponse .get("inputs"); nodeTemplate.put(feed, (Node) feedNodeResponse.get("feedNode")); } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/StreamsService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/StreamsService.java index 051b060..8437304 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/StreamsService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/StreamsService.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 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. @@ -55,7 +56,7 @@ public class StreamsService { * @return */ public Map<String, Object> createStreams( - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, String name, String type, String key, @@ -64,7 +65,7 @@ public class StreamsService { Map<String, Object> response = new HashMap<>(); Streams streams = new Streams(); - LinkedHashMap<String, Object> stringType = new LinkedHashMap(); + Map<String, Object> stringType = new LinkedHashMap(); stringType.put("type", "string"); streams.setName(name); diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/onap/OnapBlueprintCreatorService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/onap/OnapBlueprintCreatorService.java index afc02f3..8ff235c 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/onap/OnapBlueprintCreatorService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/onap/OnapBlueprintCreatorService.java @@ -4,7 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. - * * Copyright (c) 2020 Nokia. All rights reserved. + * * Copyright (c) 2020-2021 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. @@ -40,7 +40,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.util.LinkedHashMap; import java.util.Map; import java.util.TreeMap; @@ -78,7 +77,6 @@ public class OnapBlueprintCreatorService { OnapBlueprint blueprint = new OnapBlueprint(); blueprint.setTosca_definitions_version(Constants.TOSCA_DEF_VERSION); - // if (!"".equals(input.getImportPath())) if (!StringUtils.isEmpty(input.getImportPath())) { blueprint.setImports(importsService.createImportsFromFile(input.getImportPath())); } else { @@ -87,12 +85,12 @@ public class OnapBlueprintCreatorService { Map<String, Node> nodeTemplate = new TreeMap<>(); String nodeName = onapComponentSpec.getSelf().getName(); - Map<String, LinkedHashMap<String, Object>> inputs = new TreeMap<>(); + Map<String, Map<String, Object>> inputs = new TreeMap<>(); Map<String, Object> onapNodeResponse = nodeService .createOnapNode(inputs, onapComponentSpec, input.getServiceNameOverride()); - inputs = (Map<String, LinkedHashMap<String, Object>>) onapNodeResponse.get("inputs"); + inputs = (Map<String, Map<String, Object>>) onapNodeResponse.get("inputs"); nodeTemplate.put(nodeName, (Node) onapNodeResponse.get("onapNode")); blueprint.setNode_templates(nodeTemplate); |