1 files changed, 38 insertions, 20 deletions

diff --git a/utils/src/main/java/org/onap/policy/common/utils/coder/YamlJsonTranslator.java b/utils/src/main/java/org/onap/policy/common/utils/coder/YamlJsonTranslator.java
index 906c9fdd..077246bf 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/coder/YamlJsonTranslator.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/coder/YamlJsonTranslator.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-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.
@@ -21,6 +21,7 @@
 package org.onap.policy.common.utils.coder;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
@@ -31,9 +32,12 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
+import lombok.AllArgsConstructor;
+import org.onap.policy.common.gson.InstantTypeAdapter;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.emitter.Emitter;
@@ -50,7 +54,13 @@ import org.yaml.snakeyaml.serializer.Serializer;
 /**
  * YAML-JSON translator. The methods may throw either of the runtime exceptions,
  * YAMLException or JsonSyntaxException.
+ * <p/>
+ * Note: if the invoker wishes Double to be converted to Integer/Long when type
+ * Object.class is requested, then a Gson object must be used that will perform the
+ * translation. In addition, the {@link #convertFromDouble(Class, Object)} method should
+ * be overridden with an appropriate conversion method.
  */
+@AllArgsConstructor
 public class YamlJsonTranslator {
 
     /**
@@ -62,16 +72,9 @@ public class YamlJsonTranslator {
      * Constructs the object.
      */
     public YamlJsonTranslator() {
-        this(new Gson());
-    }
-
-    /**
-     * Constructs the object.
-     *
-     * @param gson the Gson object to be used to serialize and de-serialize
-     */
-    public YamlJsonTranslator(Gson gson) {
-        this.gson = gson;
+        GsonBuilder builder = new GsonBuilder();
+        builder.registerTypeAdapter(Instant.class, new InstantTypeAdapter());
+        gson = builder.create();
     }
 
     /**
@@ -81,7 +84,7 @@ public class YamlJsonTranslator {
      * @return YAML representing the original object
      */
     public String toYaml(Object object) {
-        StringWriter output = new StringWriter();
+        var output = new StringWriter();
         toYaml(output, object);
         return output.toString();
     }
@@ -93,8 +96,8 @@ public class YamlJsonTranslator {
      * @param object POJO to be translated
      */
     public void toYaml(Writer target, Object object) {
-        DumperOptions dumper = new DumperOptions();
-        Serializer serializer = new Serializer(new Emitter(target, dumper), new Resolver(), dumper, null);
+        var dumper = new DumperOptions();
+        var serializer = new Serializer(new Emitter(target, dumper), new Resolver(), dumper, null);
 
         try {
             serializer.open();
@@ -135,7 +138,7 @@ public class YamlJsonTranslator {
      * @return a POJO representing the YAML read from the reader
      */
     public <T> T fromYaml(Reader source, Class<T> clazz) {
-        Node node = new Yaml().compose(source);
+        var node = new Yaml().compose(source);
         return fromJson(makeJson(node), clazz);
     }
 
@@ -147,7 +150,22 @@ public class YamlJsonTranslator {
      * @return a POJO representing the original element
      */
     protected <T> T fromJson(JsonElement jel, Class<T> clazz) {
-        return gson.fromJson(jel, clazz);
+        return convertFromDouble(clazz, gson.fromJson(jel, clazz));
+    }
+
+    /**
+     * Converts a value from Double to Integer/Long, walking the value's contents if it's
+     * a List/Map. Only applies if the specified class refers to the Object class.
+     * Otherwise, it leaves the value unchanged.
+     * <p/>
+     * The default method simply returns the original value.
+     *
+     * @param clazz class of object to be decoded
+     * @param value value to be converted
+     * @return the converted value
+     */
+    protected <T> T convertFromDouble(Class<T> clazz, T value) {
+        return value;
     }
 
     /**
@@ -261,7 +279,7 @@ public class YamlJsonTranslator {
     protected JsonArray makeJsonArray(SequenceNode node) {
         List<Node> nodes = node.getValue();
 
-        JsonArray array = new JsonArray(nodes.size());
+        var array = new JsonArray(nodes.size());
         nodes.forEach(subnode -> array.add(makeJson(subnode)));
 
         return array;
@@ -274,10 +292,10 @@ public class YamlJsonTranslator {
      * @return a gson element corresponding to the node
      */
     protected JsonObject makeJsonObject(MappingNode node) {
-        JsonObject obj = new JsonObject();
+        var obj = new JsonObject();
 
         for (NodeTuple tuple : node.getValue()) {
-            Node key = tuple.getKeyNode();
+            var key = tuple.getKeyNode();
             String skey = ((ScalarNode) key).getValue();
 
             obj.add(skey, makeJson(tuple.getValueNode()));
@@ -294,7 +312,7 @@ public class YamlJsonTranslator {
      */
     protected JsonElement makeJsonPrim(ScalarNode node) {
         try {
-            Tag tag = node.getTag();
+            var tag = node.getTag();
 
             if (tag == Tag.INT) {
                 return new JsonPrimitive(Long.valueOf(node.getValue()));