Merge pull request #1327 from nats-io/better-json-formatter

Better Json Print Formatter - NON PRODUCTION CODE

Author: scottf

src/main/java/io/nats/client/support/JsonUtils.java

@@ -458,63 +458,65 @@ public static String objectString(String name, Object o) {
         return o.toString();
     }
 
-    private static final String INDENT = "                                        ";
-    private static String indent(int level) {
-        return level == 0 ? "" : INDENT.substring(0, level * 4);
-    }
-
-    /**
-     * This isn't perfect but good enough for debugging
-     * @param o the object
-     * @return the formatted string
-     */
+    private static final int INDENT_WIDTH = 4;
     public static String getFormatted(Object o) {
-        StringBuilder sb = new StringBuilder();
-        int level = 0;
-        int arrayLevel = 0;
-        boolean lastWasClose = false;
-        boolean indentNext = true;
-        String indent = "";
         String s = o.toString();
+        String newline = System.lineSeparator();
+
+        StringBuilder sb = new StringBuilder();
+        boolean begin_quotes = false;
+
+        boolean opened = false;
+        int indent = 0;
         for (int x = 0; x < s.length(); x++) {
             char c = s.charAt(x);
-            if (c == '{') {
-                if (arrayLevel > 0 && lastWasClose) {
-                    sb.append(indent);
+
+            if (c == '\"') {
+                if (opened) {
+                    sb.append(newline)
+                        .append(String.format("%" + (indent += INDENT_WIDTH) + "s", ""));
+                    opened = false;
                 }
-                sb.append(c).append('\n');
-                indent = indent(++level);
-                indentNext = true;
-                lastWasClose = false;
+                sb.append(c);
+                begin_quotes = !begin_quotes;
+                continue;
             }
-            else if (c == '}') {
-                indent = indent(--level);
-                sb.append('\n').append(indent).append(c);
-                lastWasClose = true;
-            }
-            else if (c == ',') {
-                sb.append(",\n");
-                indentNext = true;
-            }
-            else {
-                if (c == '[') {
-                    arrayLevel++;
-                }
-                else if (c == ']') {
-                    arrayLevel--;
-                }
-                if (indentNext) {
-                    if (c != ' ') {
-                        sb.append(indent).append(c);
-                        indentNext = false;
-                    }
-                }
-                else {
-                    sb.append(c);
+
+            if (!begin_quotes) {
+                switch (c) {
+                    case '{':
+                    case '[':
+                        sb.append(c);
+                        opened = true;
+                        continue;
+                    case '}':
+                    case ']':
+                        if (!opened) {
+                            sb.append(newline)
+                                .append((indent -= INDENT_WIDTH) > 0 ? String.format("%" + indent + "s", "") : "");
+                        }
+                        sb.append(c);
+                        opened = false;
+                        continue;
+                    case ':':
+                        sb.append(c).append(" ");
+                        continue;
+                    case ',':
+                        sb.append(c).append(newline).append(indent > 0 ? String.format("%" + indent + "s", "") : "");
+                        continue;
+                    default:
+                        if (Character.isWhitespace(c)) continue;
+                        if (opened) {
+                            sb.append(newline)
+                                .append(String.format("%" + (indent += INDENT_WIDTH) + "s", ""));
+                            opened = false;
+                        }
                 }
-                lastWasClose = lastWasClose && Character.isWhitespace(c);
             }
+
+            sb.append(c).append(c == '\\' ? "" + s.charAt(++x) : "");
         }
+
         return sb.toString();
     }