From: Dhrumin Desai <dd303q@att.com>
Date: Tue, 3 Mar 2020 22:56:23 +0000 (-0500)
Subject: fixed input string type issue in bp_gen
X-Git-Tag: 1.3.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8a5d7e7d26429598aa14c1ffc5d9dec85e1ff522;p=dcaegen2%2Fplatform.git

fixed input string type issue in bp_gen

Issue-ID: DCAEGEN2-2120
Change-Id: I95f6c3093377921250adf7089eca96f38b838f93
Signed-off-by: Dhrumin Desai <dd303q@att.com>
---

diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Blueprint.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Blueprint.java
index 7ba4d22..c043a9e 100644
--- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Blueprint.java
+++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Blueprint.java
@@ -80,20 +80,21 @@ public class Blueprint {
 		}
 		return bp;
 	}
+
 	public Blueprint setQuotations(Blueprint bp) {
 		for(String s: bp.getInputs().keySet()) {
 			LinkedHashMap<String, Object> temp = bp.getInputs().get(s);
 			if(temp.get("type") == "string") {
 				String def = (String) temp.get("default");
-				if(def != null && def.equals("")){
-					String emptyString = "\"\"";
-					Object emptyObj = emptyString;
-					temp.put("default", emptyObj);
+				if(def != null){
+					def = def.replaceAll("\"$", "").replaceAll("^\"", "");
 				}
+				def = '"' + def + '"';
+				temp.replace("default", def);
 				bp.getInputs().replace(s, temp);
 			}
 		}
-		
+
 		return bp;
 	}