1 files changed, 22 insertions, 24 deletions

diff --git a/gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.java b/gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.java
index 174b4912..af4a746c 100644
--- a/gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.java
+++ b/gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.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.
@@ -24,11 +24,12 @@ import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.TypeAdapter;
 import com.google.gson.reflect.TypeToken;
+import com.google.re2j.Pattern;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.function.Supplier;
-import java.util.regex.Pattern;
+import lombok.Getter;
 import org.onap.policy.common.gson.annotation.GsonJsonProperty;
 
 /**
@@ -49,6 +50,7 @@ public class Adapter {
     /**
      * Name of the property within the json structure containing the item.
      */
+    @Getter
     private final String propName;
 
     /**
@@ -69,6 +71,7 @@ public class Adapter {
     /**
      * Name of the item being lifted - used when throwing exceptions.
      */
+    @Getter
     private final String fullName;
 
     /**
@@ -83,7 +86,10 @@ public class Adapter {
         this.gson = gson;
         this.fullName = getQualifiedName(field);
 
-        field.setAccessible(true);
+        /*
+         * Turning off sonar, as this is required for emulation of "jackson".
+         */
+        field.setAccessible(true);  // NOSONAR
     }
 
     /**
@@ -100,7 +106,10 @@ public class Adapter {
         this.gson = gson;
         this.fullName = getQualifiedName(accessor);
 
-        accessor.setAccessible(true);
+        /*
+         * Turning off sonar, as this is required for emulation of "jackson".
+         */
+        accessor.setAccessible(true); // NOSONAR
     }
 
     /**
@@ -121,8 +130,8 @@ public class Adapter {
 
         ConvInfo wtr = writer;
 
-        @SuppressWarnings("rawtypes")
-        TypeAdapter conv = (wtr.clazz == clazz ? wtr.getConverter() : gson.getAdapter(clazz));
+        TypeAdapter<Object> conv =
+                        (wtr.clazz == clazz ? wtr.getConverter() : (TypeAdapter<Object>) gson.getAdapter(clazz));
 
         return conv.toJsonTree(object);
     }
@@ -137,14 +146,6 @@ public class Adapter {
         return reader.getConverter().fromJsonTree(tree);
     }
 
-    public final String getPropName() {
-        return propName;
-    }
-
-    public final String getFullName() {
-        return fullName;
-    }
-
     /**
      * Makes an error message, appending the item's full name to the message prefix.
      *
@@ -310,36 +311,33 @@ public class Adapter {
         /**
          * Type on which the converter works.
          */
-        @SuppressWarnings("rawtypes")
-        private TypeToken type;
+        private TypeToken<?> type;
 
         /**
          * Class of object on which the converter works.
          */
-        @SuppressWarnings("rawtypes")
-        private Class clazz;
+        private Class<?> clazz;
 
         /**
          * Converter to use, initialized lazily.
          */
-        @SuppressWarnings("rawtypes")
-        private TypeAdapter conv = null;
+        private TypeAdapter<Object> conv = null;
 
         /**
          * Constructs the object.
          *
          * @param type type of object to be converted
          */
-        public ConvInfo(@SuppressWarnings("rawtypes") TypeToken type) {
+        public ConvInfo(TypeToken<?> type) {
             this.type = type;
             this.clazz = type.getRawType();
         }
 
-        @SuppressWarnings({"rawtypes", "unchecked"})
-        public final TypeAdapter getConverter() {
+        @SuppressWarnings("unchecked")
+        public final TypeAdapter<Object> getConverter() {
             if (conv == null) {
                 // race condition here, but it's ok to overwrite a previous value
-                this.conv = gson.getAdapter(type);
+                this.conv = (TypeAdapter<Object>) gson.getAdapter(type);
             }
 
             return conv;