From 435c3bd346a5f8050cc22df9df223479e5f32573 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Wed, 16 Jun 2021 17:45:03 -0400
Subject: Use lombok in common params

Also condensed some Map calls.

Issue-ID: POLICY-3394
Change-Id: I850fcad5a72d92271da76b0731195e8b93dd4089
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../java/org/onap/policy/common/gson/DoubleConverter.java  |  7 +++----
 .../java/org/onap/policy/common/gson/internal/Adapter.java | 11 +++--------
 .../org/onap/policy/common/gson/internal/ClassWalker.java  | 14 ++++----------
 3 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'gson/src/main')

diff --git a/gson/src/main/java/org/onap/policy/common/gson/DoubleConverter.java b/gson/src/main/java/org/onap/policy/common/gson/DoubleConverter.java
index cbf5d0e7..4d10bd13 100644
--- a/gson/src/main/java/org/onap/policy/common/gson/DoubleConverter.java
+++ b/gson/src/main/java/org/onap/policy/common/gson/DoubleConverter.java
@@ -25,18 +25,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 
 /**
  * Converter for Double values. By default, GSON treats all Objects that are numbers, as
  * Double. This converts Doubles to Integer or Long, if possible. It converts stand-alone
  * Doubles, as well as those found within Arrays and Maps.
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class DoubleConverter {
 
-    private DoubleConverter() {
-        // do nothing
-    }
-
     /**
      * Performs in-place conversion of all values in a list.
      *
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 c15ccb7d..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
@@ -29,6 +29,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.function.Supplier;
+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;
 
     /**
@@ -143,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.
      *
diff --git a/gson/src/main/java/org/onap/policy/common/gson/internal/ClassWalker.java b/gson/src/main/java/org/onap/policy/common/gson/internal/ClassWalker.java
index ef4eaae3..954d3f4c 100644
--- a/gson/src/main/java/org/onap/policy/common/gson/internal/ClassWalker.java
+++ b/gson/src/main/java/org/onap/policy/common/gson/internal/ClassWalker.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.
@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import lombok.Getter;
 import org.onap.policy.common.gson.annotation.GsonJsonAnyGetter;
 import org.onap.policy.common.gson.annotation.GsonJsonAnySetter;
 import org.onap.policy.common.gson.annotation.GsonJsonIgnore;
@@ -79,23 +80,16 @@ public class ClassWalker {
      * Method having {@link GsonJsonAnyGetter} annotation. Overwritten as new "any-getters"
      * are identified.
      */
+    @Getter
     private Method anyGetter = null;
 
     /**
      * Method having {@link GsonJsonAnySetter} annotation. Overwritten as new "any-setters"
      * are identified.
      */
+    @Getter
     private Method anySetter = null;
 
-
-    public Method getAnyGetter() {
-        return anyGetter;
-    }
-
-    public Method getAnySetter() {
-        return anySetter;
-    }
-
     /**
      * Gets the names of input properties that are not being ignored.
      *
-- 
cgit 1.2.3-korg