Enhance toString methods in factory classes

The factory classes in policy-endpoints have toString() methods that
return "[]" for their list contents.  Updated the code to provide a list
of the keys rather than just an empty list.
Also replaced some toString() methods with lombok.
Also replace StringBuilder with concatenation in some cases.

Issue-ID: POLICY-3298
Change-Id: I64fca21a4b009f7e09fcc482b5d156753fb7e680
Signed-off-by: Jim Hahn <jrh3@att.com>

7 files changed, 26 insertions, 72 deletions

diff --git a/gson/src/test/java/org/onap/policy/common/gson/GsonMessageBodyHandlerTest.java b/gson/src/test/java/org/onap/policy/common/gson/GsonMessageBodyHandlerTest.java
index c05a1e51..eee0c149 100644
--- a/gson/src/test/java/org/onap/policy/common/gson/GsonMessageBodyHandlerTest.java
+++ b/gson/src/test/java/org/onap/policy/common/gson/GsonMessageBodyHandlerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2019-2020 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.
@@ -196,6 +196,7 @@ public class GsonMessageBodyHandlerTest {
     }
 
 
+    @ToString
     public static class MyObject {
         private int id;
 
@@ -206,11 +207,6 @@ public class GsonMessageBodyHandlerTest {
         public MyObject(int id) {
             this.id = id;
         }
-
-        @Override
-        public String toString() {
-            return "MyObject [id=" + id + "]";
-        }
     }
 
     private static class MyMap {
diff --git a/gson/src/test/java/org/onap/policy/common/gson/JacksonExclusionStrategyTest.java b/gson/src/test/java/org/onap/policy/common/gson/JacksonExclusionStrategyTest.java
index 3d7c29d5..41933bc5 100644
--- a/gson/src/test/java/org/onap/policy/common/gson/JacksonExclusionStrategyTest.java
+++ b/gson/src/test/java/org/onap/policy/common/gson/JacksonExclusionStrategyTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2019-2020 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.
@@ -31,6 +31,7 @@ import com.google.gson.JsonElement;
 import java.lang.reflect.GenericArrayType;
 import java.util.LinkedList;
 import java.util.TreeMap;
+import lombok.ToString;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -102,6 +103,7 @@ public class JacksonExclusionStrategyTest {
     /**
      * Used to verify that no fields are exposed.
      */
+    @ToString
     public static class Data {
         private int id;
         public String text;
@@ -121,13 +123,9 @@ public class JacksonExclusionStrategyTest {
         public void setText(String text) {
             this.text = text;
         }
-
-        @Override
-        public String toString() {
-            return "Data [id=" + id + ", text=" + text + "]";
-        }
     }
 
+    @ToString(callSuper = true)
     public static class Derived extends Data {
         protected String value;
 
@@ -138,11 +136,6 @@ public class JacksonExclusionStrategyTest {
         public void setValue(String value) {
             this.value = value;
         }
-
-        @Override
-        public String toString() {
-            return "Derived [value=" + value + ", " + super.toString() + "]";
-        }
     }
 
     /**
diff --git a/gson/src/test/java/org/onap/policy/common/gson/JacksonFieldAdapterFactoryTest.java b/gson/src/test/java/org/onap/policy/common/gson/JacksonFieldAdapterFactoryTest.java
index bbeb1e26..dc62186b 100644
--- a/gson/src/test/java/org/onap/policy/common/gson/JacksonFieldAdapterFactoryTest.java
+++ b/gson/src/test/java/org/onap/policy/common/gson/JacksonFieldAdapterFactoryTest.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.
@@ -31,6 +31,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
 import java.util.ArrayList;
 import java.util.List;
+import lombok.ToString;
 import org.junit.Test;
 import org.onap.policy.common.gson.annotation.GsonJsonIgnore;
 import org.onap.policy.common.gson.annotation.GsonJsonProperty;
@@ -137,6 +138,7 @@ public class JacksonFieldAdapterFactoryTest {
         return text.replaceFirst("@\\w+", "@");
     }
 
+    @ToString
     private static class Data {
         @GsonJsonProperty("my-id")
         private int id;
@@ -155,21 +157,12 @@ public class JacksonFieldAdapterFactoryTest {
         public void setId(int id) {
             this.id = id;
         }
-
-        @Override
-        public String toString() {
-            return "Data [id=" + id + ", text=" + text + "]";
-        }
     }
 
+    @ToString(callSuper = true)
     private static class Derived extends Data {
         // not serialized
         private String unserialized;
-
-        @Override
-        public String toString() {
-            return "Derived [unserialized=" + unserialized + ", toString()=" + super.toString() + "]";
-        }
     }
 
     private static class DataList {
diff --git a/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java b/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java
index 18a6fc73..891c4d31 100644
--- a/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java
+++ b/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.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.
@@ -33,6 +33,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 import javax.ws.rs.core.MediaType;
+import lombok.ToString;
 import org.junit.Test;
 import org.onap.policy.common.gson.annotation.GsonJsonAnyGetter;
 import org.onap.policy.common.gson.annotation.GsonJsonAnySetter;
@@ -109,6 +110,7 @@ public class JacksonHandlerTest {
     /**
      * This class includes all policy-specific gson annotations.
      */
+    @ToString
     public static class Data {
         protected int id;
 
@@ -147,11 +149,6 @@ public class JacksonHandlerTest {
 
             props.put(name, value);
         }
-
-        @Override
-        public String toString() {
-            return "Data [id=" + id + ", value=" + value + ", props=" + props + "]";
-        }
     }
 
     private static class MyMap {
diff --git a/gson/src/test/java/org/onap/policy/common/gson/JacksonMethodAdapterFactoryTest.java b/gson/src/test/java/org/onap/policy/common/gson/JacksonMethodAdapterFactoryTest.java
index 6377420d..7afb0e5a 100644
--- a/gson/src/test/java/org/onap/policy/common/gson/JacksonMethodAdapterFactoryTest.java
+++ b/gson/src/test/java/org/onap/policy/common/gson/JacksonMethodAdapterFactoryTest.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.
@@ -32,6 +32,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
 import java.util.Map;
 import java.util.TreeMap;
+import lombok.ToString;
 import org.junit.Test;
 import org.onap.policy.common.gson.annotation.GsonJsonAnyGetter;
 import org.onap.policy.common.gson.annotation.GsonJsonAnySetter;
@@ -117,6 +118,7 @@ public class JacksonMethodAdapterFactoryTest {
         assertEquals("{'id':500,'nested':{'value':'bye bye'}}".replace('\'', '"'), result);
     }
 
+    @ToString
     protected static class Data {
         private int id;
         private String text;
@@ -142,13 +144,9 @@ public class JacksonMethodAdapterFactoryTest {
         public void unused(String text) {
             // do nothing
         }
-
-        @Override
-        public String toString() {
-            return "Data [id=" + id + ", text=" + text + "]";
-        }
     }
 
+    @ToString(callSuper = true)
     protected static class Derived extends Data {
 
         // overrides private field from Data
@@ -174,11 +172,6 @@ public class JacksonMethodAdapterFactoryTest {
 
             map.put(key, value);
         }
-
-        @Override
-        public String toString() {
-            return "Derived [text=" + text + ", map=" + map + ", toString()=" + super.toString() + "]";
-        }
     }
 
     /**
@@ -258,6 +251,7 @@ public class JacksonMethodAdapterFactoryTest {
     /**
      * Used to test serialization of non-static nested classes.
      */
+    @ToString
     protected static class Container {
         private int id;
         private Nested nested;
@@ -283,12 +277,8 @@ public class JacksonMethodAdapterFactoryTest {
             return nested;
         }
 
-        @Override
-        public String toString() {
-            return "Container [id=" + id + ", nested=" + nested + "]";
-        }
-
 
+        @ToString
         protected class Nested {
             private String value;
 
@@ -299,11 +289,6 @@ public class JacksonMethodAdapterFactoryTest {
             public String getValue() {
                 return value;
             }
-
-            @Override
-            public String toString() {
-                return "Nested [value=" + value + "]";
-            }
         }
     }
 }
diff --git a/gson/src/test/java/org/onap/policy/common/gson/internal/DataAdapterFactory.java b/gson/src/test/java/org/onap/policy/common/gson/internal/DataAdapterFactory.java
index 2799d8ba..d2cdf7f8 100644
--- a/gson/src/test/java/org/onap/policy/common/gson/internal/DataAdapterFactory.java
+++ b/gson/src/test/java/org/onap/policy/common/gson/internal/DataAdapterFactory.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.
@@ -35,6 +35,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import lombok.ToString;
 
 /**
  * Factory used with test Data.
@@ -54,6 +55,7 @@ public class DataAdapterFactory implements TypeAdapterFactory {
     /**
      * Object handled by this factory.
      */
+    @ToString
     public static class Data {
         private int id;
 
@@ -72,16 +74,12 @@ public class DataAdapterFactory implements TypeAdapterFactory {
         public void setId(int id) {
             this.id = id;
         }
-
-        @Override
-        public String toString() {
-            return "Data [id=" + id + "]";
-        }
     }
 
     /**
      * Object derived from Data.
      */
+    @ToString(callSuper = true)
     public static class DerivedData extends Data {
         private String text;
 
@@ -101,11 +99,6 @@ public class DataAdapterFactory implements TypeAdapterFactory {
         public void setText(String text) {
             this.text = text;
         }
-
-        @Override
-        public String toString() {
-            return "DerivedData [text=" + text + ", toString()=" + super.toString() + "]";
-        }
     }
 
     /**
diff --git a/gson/src/test/java/org/onap/policy/common/gson/internal/JacksonTypeAdapterTest.java b/gson/src/test/java/org/onap/policy/common/gson/internal/JacksonTypeAdapterTest.java
index 6be4e590..5e73d06e 100644
--- a/gson/src/test/java/org/onap/policy/common/gson/internal/JacksonTypeAdapterTest.java
+++ b/gson/src/test/java/org/onap/policy/common/gson/internal/JacksonTypeAdapterTest.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.
@@ -33,6 +33,7 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
+import lombok.ToString;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -138,6 +139,7 @@ public class JacksonTypeAdapterTest {
         assertEquals("read text", data);
     }
 
+    @ToString
     private static class Data {
         private String id;
         private String value;
@@ -155,11 +157,6 @@ public class JacksonTypeAdapterTest {
             this.id = id;
             this.value = value;
         }
-
-        @Override
-        public String toString() {
-            return "Data [id=" + id + ", value=" + value + "]";
-        }
     }
 
     private abstract static class NamedSer implements Serializer {