From 4f909d754b638ab4563eb9466836cc2d7a184d63 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 31 Jan 2020 11:15:44 -0500 Subject: Add pretty() method to Coder "Pretty" JSON is often needed, so added Coder.pretty() to facilitate that. Incorporated review comment(s): - changed pretty() to encode(object, pretty) Issue-ID: POLICY-1625 Signed-off-by: Jim Hahn Change-Id: I180fa6de416836008bf1c410132ae30f4dde9271 --- .../onap/policy/common/utils/coder/StandardValCoder.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'utils/src/main/java/org/onap/policy/common/utils/coder/StandardValCoder.java') 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 @@ -61,11 +61,22 @@ public class StandardValCoder extends StandardCoder { this.validator = validatorApi.loadSchema(schemaSource); } + @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 -- cgit 1.2.3-korg