diff options
Diffstat (limited to 'utils/src/main/java/org/onap/policy/common/utils/coder/StandardValCoder.java')
| -rw-r--r-- | utils/src/main/java/org/onap/policy/common/utils/coder/StandardValCoder.java | 28 |
1 files changed, 13 insertions, 15 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 6e08e722..4deeba14 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 @@ -1,6 +1,6 @@ -/* +/*-- * ============LICENSE_START======================================================= - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,8 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Extension to the StandardCoder to support streaming validation - * against a Draft-07 Json schema specification. + * Extension to the StandardCoder to support streaming validation against a Draft-07 Json schema specification. */ @ToString @@ -56,43 +55,42 @@ public class StandardValCoder extends StandardCoder { * StandardCoder with validation. */ public StandardValCoder(@NonNull String jsonSchema, @NonNull String name) { - SchemaSource schemaSource = - new StringSchemaSource(jsonSchema, JsonSchemaVersion.DRAFT07, null, name); + SchemaSource schemaSource = new StringSchemaSource(jsonSchema, JsonSchemaVersion.DRAFT07, null, name); 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. + * 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())); + gson.toJson(object, object.getClass(), validatorApi.createJsonWriter(validator, new StringWriter())); return super.toPrettyJson(object); } @Override protected String toJson(@NonNull Object object) { - StringWriter output = new StringWriter(); + var output = new StringWriter(); toJson(output, object); return output.toString(); } @Override protected void toJson(@NonNull Writer target, @NonNull Object object) { - getGSON().toJson(object, object.getClass(), validatorApi.createJsonWriter(validator, target)); + gson.toJson(object, object.getClass(), validatorApi.createJsonWriter(validator, target)); } @Override protected <T> T fromJson(@NonNull Reader source, @NonNull Class<T> clazz) { - return convertFromDouble(clazz, getGSON().fromJson(validatorApi.createJsonReader(validator, source), clazz)); + return convertFromDouble(clazz, gson.fromJson(validatorApi.createJsonReader(validator, source), clazz)); } @Override protected <T> T fromJson(String json, Class<T> clazz) { - StringReader reader = new StringReader(json); - return convertFromDouble(clazz, getGSON().fromJson(validatorApi.createJsonReader(validator, reader), clazz)); + var reader = new StringReader(json); + return convertFromDouble(clazz, gson.fromJson(validatorApi.createJsonReader(validator, reader), clazz)); } /** @@ -102,7 +100,7 @@ public class StandardValCoder extends StandardCoder { try { conformance(json); } catch (CoderException e) { - logger.info("JSON is not conformant to schema {}", e); + logger.info("JSON is not conformant to schema", e); return false; } return true; |