From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Wed, 26 Feb 2020 23:42:42 +0000 (+0000)
Subject: Merge "Updates to onboarding and distributor api's"
X-Git-Tag: 2.12.0~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=77f2732015a0ab038bf6be6afaf924b827f44835;hp=34b776928e1a0fa029d2de13a020873bff8a601f;p=dcaegen2%2Fplatform.git

Merge "Updates to onboarding and distributor api's"
---

diff --git a/mod/bpgenerator/pom.xml b/mod/bpgenerator/pom.xml
index e1a50b4..8f54eee 100644
--- a/mod/bpgenerator/pom.xml
+++ b/mod/bpgenerator/pom.xml
@@ -29,7 +29,7 @@
 	</parent>
 	<groupId>org.onap.dcaegen2.platform.mod</groupId>
 	<artifactId>blueprint-generator</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.3.1-SNAPSHOT</version>
 	<properties>
 		<maven.compiler.source>1.6</maven.compiler.source>
 		<maven.compiler.target>1.6</maven.compiler.target>
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 75c79ba..7ba4d22 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
@@ -85,8 +85,11 @@ public class Blueprint {
 			LinkedHashMap<String, Object> temp = bp.getInputs().get(s);
 			if(temp.get("type") == "string") {
 				String def = (String) temp.get("default");
-				def = '"' + def + '"';
-				temp.replace("default", def);
+				if(def != null && def.equals("")){
+					String emptyString = "\"\"";
+					Object emptyObj = emptyString;
+					temp.put("default", emptyObj);
+				}
 				bp.getInputs().replace(s, temp);
 			}
 		}
@@ -200,7 +203,6 @@ public class Blueprint {
 			throw new RuntimeException(e);
 		}
 
-
 		return Fixes.applyFixes(ret);
 	}
 }
diff --git a/mod/bpgenerator/version.properties b/mod/bpgenerator/version.properties
index 7d6815b..fee4928 100644
--- a/mod/bpgenerator/version.properties
+++ b/mod/bpgenerator/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=3
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
diff --git a/releases/1.3.0-blueprint-generator.yaml b/releases/1.3.0-blueprint-generator.yaml
new file mode 100644
index 0000000..eb2c900
--- /dev/null
+++ b/releases/1.3.0-blueprint-generator.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '1.3.0'
+project: 'dcaegen2/platform'
+log_dir: 'dcaegen2-platform-mod-bpgenerator-maven-stage-master/1'