Moved method to utils

drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java

@@ -226,31 +226,7 @@ public class PlannerService {
     }
 
     public String saveStringContents(String ymlContents, Integer level, String name) {
-        //Remove '\' and 'n' if they are together and replace them with '\n'
-        char[] array = ymlContents.toCharArray();
-        StringBuilder sb = new StringBuilder();
-        int prevChar = -1;
-        for (int i = 0; i < array.length; i++) {
-            int currentChar = (int) array[i];
-            if (prevChar > 0 && prevChar == 92 && currentChar == 110) {
-                sb.delete(sb.length() - 1, sb.length());
-                sb.append('\n');
-
-            } else {
-                sb.append((char) currentChar);
-            }
-            prevChar = (int) array[i];
-        }
-        ymlContents = sb.toString();
-        ymlContents = ymlContents.replaceAll("(?m)^[ \t]*\r?\n", "");
-        for (int i = 0; i < Constants.BAD_CHARS.length; i++) {
-            int hex = Constants.BAD_CHARS[i];
-            ymlContents = ymlContents.replaceAll(String.valueOf((char) hex), "");
-        }
-
-        ymlContents = ymlContents.replaceAll("\\.", "\uff0E");
-//        ymlContents = ymlContents.replaceAll("\uff0E", ".");
-        Map<String, Object> map = Converter.ymlString2Map(ymlContents);
+        Map<String, Object> map = Converter.cleanStringContents(ymlContents);
         PlanResponse pr = new PlanResponse();
         pr.setKvMap(map);
         pr.setLevel(level);

drip-api/src/main/java/nl/uva/sne/drip/api/service/PlaybookService.java

@@ -116,31 +116,7 @@ public class PlaybookService {
     }
 
     public String saveStringContents(String playbookContents) throws IOException {
-
-        //Remove '\' and 'n' if they are together and replace them with '\n'
-        char[] array = playbookContents.toCharArray();
-        StringBuilder sb = new StringBuilder();
-        int prevChar = -1;
-        for (int i = 0; i < array.length; i++) {
-            int currentChar = (int) array[i];
-            if (prevChar > 0 && prevChar == 92 && currentChar == 110) {
-                sb.delete(sb.length() - 1, sb.length());
-                sb.append('\n');
-
-            } else {
-                sb.append((char) currentChar);
-            }
-            prevChar = (int) array[i];
-        }
-        playbookContents = sb.toString();
-        playbookContents = playbookContents.replaceAll("(?m)^[ \t]*\r?\n", "");
-        for (int i = 0; i < Constants.BAD_CHARS.length; i++) {
-            int hex = Constants.BAD_CHARS[i];
-            playbookContents = playbookContents.replaceAll(String.valueOf((char) hex), "");
-        }
-
-        playbookContents = playbookContents.replaceAll("\\.", "\uff0E");
-        Map<String, Object> map = Converter.ymlString2Map(playbookContents);
+        Map<String, Object> map = Converter.cleanStringContents(playbookContents);        
         PlaybookRepresentation t = new PlaybookRepresentation();
         t.setKvMap(map);
         save(t);

drip-api/src/main/java/nl/uva/sne/drip/api/service/ToscaService.java

@@ -120,30 +120,8 @@ public class ToscaService {
 
     public String saveStringContents(String toscaContents, String name) throws IOException {
 
-        //Remove '\' and 'n' if they are together and replace them with '\n'
-        char[] array = toscaContents.toCharArray();
-        StringBuilder sb = new StringBuilder();
-        int prevChar = -1;
-        for (int i = 0; i < array.length; i++) {
-            int currentChar = (int) array[i];
-            if (prevChar > 0 && prevChar == 92 && currentChar == 110) {
-                sb.delete(sb.length() - 1, sb.length());
-                sb.append('\n');
-
-            } else {
-                sb.append((char) currentChar);
-            }
-            prevChar = (int) array[i];
-        }
-        toscaContents = sb.toString();
-        toscaContents = toscaContents.replaceAll("(?m)^[ \t]*\r?\n", "");
-        for (int i = 0; i < Constants.BAD_CHARS.length; i++) {
-            int hex = Constants.BAD_CHARS[i];
-            toscaContents = toscaContents.replaceAll(String.valueOf((char) hex), "");
-        }
+        Map<String, Object> map = Converter.cleanStringContents(toscaContents);
 
-        toscaContents = toscaContents.replaceAll("\\.", "\uff0E");
-        Map<String, Object> map = Converter.ymlString2Map(toscaContents);
         ToscaRepresentation t = new ToscaRepresentation();
         t.setName(name);
         t.setKvMap(map);

drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/Converter.java

@@ -210,4 +210,32 @@ public class Converter {
         return p1;
     }
 
+    public static Map<String, Object> cleanStringContents(String toscaContents) {
+        //Remove '\' and 'n' if they are together and replace them with '\n'
+        char[] array = toscaContents.toCharArray();
+        StringBuilder sb = new StringBuilder();
+        int prevChar = -1;
+        for (int i = 0; i < array.length; i++) {
+            int currentChar = (int) array[i];
+            if (prevChar > 0 && prevChar == 92 && currentChar == 110) {
+                sb.delete(sb.length() - 1, sb.length());
+                sb.append('\n');
+
+            } else {
+                sb.append((char) currentChar);
+            }
+            prevChar = (int) array[i];
+        }
+        toscaContents = sb.toString();
+        toscaContents = toscaContents.replaceAll("(?m)^[ \t]*\r?\n", "");
+        for (int i = 0; i < Constants.BAD_CHARS.length; i++) {
+            int hex = Constants.BAD_CHARS[i];
+            toscaContents = toscaContents.replaceAll(String.valueOf((char) hex), "");
+        }
+
+        toscaContents = toscaContents.replaceAll("\\.", "\uff0E");
+        Map<String, Object> map = Converter.ymlString2Map(toscaContents);
+        return map;
+    }
+
 }