1 files changed, 23 insertions, 39 deletions

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 3ce16964..9d8d3495 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,8 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+ * Modificaitons Copyright (C) 2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +32,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;
 
@@ -80,39 +82,29 @@ public class JacksonExclusionStrategyTest {
 
     @Test
     public void testIsManaged() {
-        assertTrue(JacksonExclusionStrategy.isManaged(Data.class));
-        assertTrue(JacksonExclusionStrategy.isManaged(Intfc.class));
-        assertTrue(JacksonExclusionStrategy.isManaged(com.google.gson.TypeAdapter.class));
-
-        // generic classes
-        assertFalse(JacksonExclusionStrategy.isManaged(new Data[0].getClass()));
-        assertFalse(JacksonExclusionStrategy.isManaged(Enum.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(boolean.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(byte.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(short.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(int.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(long.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(float.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(double.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(char.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(Boolean.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(Byte.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(Short.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(Integer.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(Long.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(Float.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(Double.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(Character.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(String.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(MyMap.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(MyList.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(MyJson.class));
-        assertFalse(JacksonExclusionStrategy.isManaged(GenericArrayType.class));
+        // these classes SHOULD be managed
+        Class<?>[] managed = {Data.class, Intfc.class, com.google.gson.TypeAdapter.class};
+
+        for (Class<?> clazz : managed) {
+            assertTrue(clazz.getName(), JacksonExclusionStrategy.isManaged(clazz));
+        }
+
+        // generic classes should NOT be managed
+        Class<?>[] unmanaged = {
+            new Data[0].getClass(), Enum.class, boolean.class, byte.class, short.class, int.class,
+            long.class, float.class, double.class, char.class, Boolean.class, Byte.class, Short.class,
+            Integer.class, Long.class, Float.class, Double.class, Character.class, String.class,
+            MyMap.class, MyList.class, MyJson.class, GenericArrayType.class};
+
+        for (Class<?> clazz : unmanaged) {
+            assertFalse(clazz.getName(), JacksonExclusionStrategy.isManaged(clazz));
+        }
     }
 
     /**
      * Used to verify that no fields are exposed.
      */
+    @ToString
     public static class Data {
         private int id;
         public String text;
@@ -132,13 +124,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;
 
@@ -149,11 +137,6 @@ public class JacksonExclusionStrategyTest {
         public void setValue(String value) {
             this.value = value;
         }
-
-        @Override
-        public String toString() {
-            return "Derived [value=" + value + ", " + super.toString() + "]";
-        }
     }
 
     /**
@@ -193,6 +176,7 @@ public class JacksonExclusionStrategyTest {
     /**
      * Used to verify that JsonElements are not managed.
      */
+    @SuppressWarnings("deprecation")
     public static class MyJson extends JsonElement {
         @Override
         public JsonElement deepCopy() {