1 files changed, 8 insertions, 10 deletions

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 06c42c5..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
@@ -20,11 +20,7 @@
 
 package org.onap.blueprintgenerator.models.blueprint;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.TreeMap;
@@ -50,7 +46,7 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-
+import org.yaml.snakeyaml.Yaml;
 
 
 @Getter @Setter
@@ -84,17 +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 = def.replaceAll("\"$", "").replaceAll("^\"", "");
+				}
 				def = '"' + def + '"';
 				temp.replace("default", def);
 				bp.getInputs().replace(s, temp);
 			}
 		}
-		
+
 		return bp;
 	}
 
@@ -194,7 +194,6 @@ public class Blueprint {
 		System.out.println("Blueprint created");
 	}
 
-
 	public String blueprintToString() {
 		String ret = "";
 
@@ -205,7 +204,6 @@ public class Blueprint {
 			throw new RuntimeException(e);
 		}
 
-
-		return ret;
+		return Fixes.applyFixes(ret);
 	}
 }