1 files changed, 10 insertions, 85 deletions
diff --git a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
index b7297998..de00df88 100644
--- a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * feature-healthcheck
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -22,6 +22,9 @@ package org.onap.policy.drools.healthcheck;
 
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 import org.onap.policy.common.capabilities.Startable;
 
 /**
@@ -32,6 +35,9 @@ public interface HealthCheck extends Startable {
     /**
      * Healthcheck Report.
      */
+    @Getter
+    @Setter
+    @ToString
     public static class Report {
         /**
          * Named Entity in the report.
@@ -57,98 +63,17 @@ public interface HealthCheck extends Startable {
          * Message from remote entity.
          */
         private String message;
-
-        @Override
-        public String toString() {
-            StringBuilder builder = new StringBuilder();
-            builder.append("Report [name=");
-            builder.append(getName());
-            builder.append(", url=");
-            builder.append(getUrl());
-            builder.append(", healthy=");
-            builder.append(isHealthy());
-            builder.append(", code=");
-            builder.append(getCode());
-            builder.append(", message=");
-            builder.append(getMessage());
-            builder.append("]");
-            return builder.toString();
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getUrl() {
-            return url;
-        }
-
-        public void setUrl(String url) {
-            this.url = url;
-        }
-
-        public boolean isHealthy() {
-            return healthy;
-        }
-
-        public void setHealthy(boolean healthy) {
-            this.healthy = healthy;
-        }
-
-        public int getCode() {
-            return code;
-        }
-
-        public void setCode(int code) {
-            this.code = code;
-        }
-
-        public String getMessage() {
-            return message;
-        }
-
-        public void setMessage(String message) {
-            this.message = message;
-        }
     }
 
     /**
      * Report aggregation.
      */
+    @Getter
+    @Setter
+    @ToString
     public static class Reports {
         private boolean healthy;
         private List<Report> details = new ArrayList<>();
-
-        @Override
-        public String toString() {
-            StringBuilder builder = new StringBuilder();
-            builder.append("Reports [healthy=");
-            builder.append(isHealthy());
-            builder.append(", details=");
-            builder.append(getDetails());
-            builder.append("]");
-            return builder.toString();
-        }
-
-        public boolean isHealthy() {
-            return healthy;
-        }
-
-        public void setHealthy(boolean healthy) {
-            this.healthy = healthy;
-        }
-
-        public List<Report> getDetails() {
-            return details;
-        }
-
-        public void setDetails(List<Report> details) {
-            this.details = details;
-        }
     }
 
     /**