Merge "Add pretty() method to Coder"

1 files changed, 12 insertions, 1 deletions

diff --git a/utils/src/main/java/org/onap/policy/common/utils/coder/StandardValCoder.java b/utils/src/main/java/org/onap/policy/common/utils/coder/StandardValCoder.java
index 378254b8..6e08e722 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/coder/StandardValCoder.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/coder/StandardValCoder.java
@@ -62,10 +62,21 @@ public class StandardValCoder extends StandardCoder {
     }
 
     @Override
+    protected String toPrettyJson(Object object) {
+        /*
+         * The validator strips off the "pretty" stuff (i.e., spaces), thus we have to validate
+         * and generate the pretty JSON in separate steps.
+         */
+        getGSON().toJson(object, object.getClass(), validatorApi.createJsonWriter(validator, new StringWriter()));
+
+        return super.toPrettyJson(object);
+    }
+
+    @Override
     protected String toJson(@NonNull Object object) {
         StringWriter output = new StringWriter();
         toJson(output, object);
-        return String.valueOf(output);
+        return output.toString();
     }
 
     @Override