diff options
Diffstat (limited to 'mod/runtimeapi/runtime-core')
| -rw-r--r-- | mod/runtimeapi/runtime-core/pom.xml | 5 | ||||
| -rw-r--r-- | mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java | 19 |
2 files changed, 21 insertions, 3 deletions
diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml index 53c8536..7add43b 100644 --- a/mod/runtimeapi/runtime-core/pom.xml +++ b/mod/runtimeapi/runtime-core/pom.xml @@ -23,11 +23,12 @@ limitations under the License. <parent> <artifactId>runtimeapi</artifactId> <groupId>org.onap.dcaegen2.platform.mod</groupId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>runtime-core</artifactId> + <version>1.0.1</version> <dependencies> <dependency> @@ -43,7 +44,7 @@ limitations under the License. <dependency> <groupId>org.onap.dcaegen2.platform.mod</groupId> <artifactId>blueprint-generator</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> </dependency> <dependency> <groupId>org.json</groupId> diff --git a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java index c12b970..7e11b10 100644 --- a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java +++ b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java @@ -17,12 +17,14 @@ */ package org.onap.dcae.runtime.core.blueprint_creator; +import org.onap.blueprintgenerator.core.Fixes; import org.onap.dcae.runtime.core.Node; import org.onap.blueprintgenerator.models.blueprint.Blueprint; import org.onap.blueprintgenerator.models.componentspec.ComponentSpec; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; +import java.util.LinkedHashMap; import java.util.Map; public class BlueprintCreatorOnap implements BlueprintCreator{ @@ -57,12 +59,27 @@ public class BlueprintCreatorOnap implements BlueprintCreator{ Map<String,Object> obj = yaml.load(blueprintContent); Map<String,Object> inputsObj = (Map<String, Object>) obj.get("inputs"); for(Map.Entry<String,Object> entry: inputsObj.entrySet()){ + LinkedHashMap<String, Object> modified = retainQuotesForDefault(entry.getValue()); + entry.setValue(modified); if(entry.getKey().matches(locationPort+".*url")) { Map<String,String> inputValue = (Map<String, String>) entry.getValue(); inputValue.put("default",topicUrl + "/" + dmaapEntityName); } } - node.getBlueprintData().setBlueprint_content(yaml.dump(obj)); + node.getBlueprintData().setBlueprint_content(Fixes.applyFixes(yaml.dump(obj))); + } + + private LinkedHashMap<String, Object> retainQuotesForDefault(Object valueOfInputObject) { + LinkedHashMap<String, Object> temp = (LinkedHashMap<String, Object>) valueOfInputObject; + if(temp.containsKey("type") && temp.get("type").equals("string")) { + String def = (String) temp.get("default"); + if(def != null){ + def = def.replaceAll("\"$", "").replaceAll("^\"", ""); + } + def = '"' + def + '"'; + temp.replace("default", def); + } + return temp; } private Yaml getYamlInstance() { |