Merge "Enhance toString methods in factory classes"

3 files changed, 9 insertions, 18 deletions

diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/RestEchoReqResp.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/RestEchoReqResp.java
index 2a3e244d..2748fadd 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/RestEchoReqResp.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/RestEchoReqResp.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.
@@ -21,12 +21,14 @@
 package org.onap.policy.common.endpoints.http.server.test;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.ToString;
 import org.onap.policy.common.gson.annotation.GsonJsonProperty;
 
 /**
  * "ECHO" request and response supporting serialization and de-serialization via
  * both jackson and gson.
  */
+@ToString
 public class RestEchoReqResp {
     @GsonJsonProperty("reqId")
     @SerializedName("reqId")
@@ -51,9 +53,4 @@ public class RestEchoReqResp {
     public void setText(String text) {
         this.text = text;
     }
-
-    @Override
-    public String toString() {
-        return "RestEchoReqResp [requestId=" + requestId + ", text=" + text + "]";
-    }
 }
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/YamlJacksonHandlerTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/YamlJacksonHandlerTest.java
index 7ca131ec..8d65bbd6 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/YamlJacksonHandlerTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/YamlJacksonHandlerTest.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 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.endpoints.http.server.YamlJacksonHandler;
 import org.onap.policy.common.endpoints.http.server.YamlMessageBodyHandler;
@@ -106,6 +107,7 @@ public class YamlJacksonHandlerTest {
     /**
      * This class includes all policy-specific gson annotations.
      */
+    @ToString
     public static class Data {
         protected int id;
 
@@ -144,11 +146,6 @@ public class YamlJacksonHandlerTest {
 
             props.put(name, value);
         }
-
-        @Override
-        public String toString() {
-            return "Data [id=" + id + ", value=" + value + ", props=" + props + "]";
-        }
     }
 
     private static class MyMap {
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/YamlMessageBodyHandlerTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/YamlMessageBodyHandlerTest.java
index 4f2eb316..c0927aa9 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/YamlMessageBodyHandlerTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/YamlMessageBodyHandlerTest.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.
@@ -33,6 +33,7 @@ import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 import javax.ws.rs.core.MediaType;
+import lombok.ToString;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.common.endpoints.http.server.YamlMessageBodyHandler;
@@ -212,6 +213,7 @@ public class YamlMessageBodyHandlerTest {
         }
     }
 
+    @ToString
     public static class MyObject {
         private int id;
 
@@ -222,11 +224,6 @@ public class YamlMessageBodyHandlerTest {
         public MyObject(int id) {
             this.id = id;
         }
-
-        @Override
-        public String toString() {
-            return "MyObject [id=" + id + "]";
-        }
     }
 
     private static class MyMap {