From 20ec0e70ce690083d65286815ed5e866042881a2 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Thu, 17 Jun 2021 10:32:25 -0400
Subject: Use lombok annotations in IM and ONAP logging

Issue-ID: POLICY-3394
Change-Id: I25db6b4b13bad8754889eaedb93197cae7d27c4d
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../policy/common/logging/eelf/PolicyLogger.java   | 45 ++++++++--------------
 1 file changed, 15 insertions(+), 30 deletions(-)

(limited to 'common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java')

diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java
index 15659561..662ca764 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java
@@ -61,6 +61,10 @@ import java.util.Timer;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Consumer;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.common.logging.OnapLoggingUtils;
 import org.onap.policy.common.logging.flexlogger.LoggerType;
@@ -69,6 +73,7 @@ import org.slf4j.MDC;
 /**
  * PolicyLogger contains all the static methods for EELF logging.
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class PolicyLogger {
 
     private static EELFLogger errorLogger = EELFManager.getErrorLogger();
@@ -110,7 +115,9 @@ public class PolicyLogger {
     // size drops to this point, stop the Timer
     private static int stopCheckPoint = 2500;
 
-    private static boolean isOverrideLogbackLevel = false;
+    @Getter
+    @Setter
+    private static boolean overrideLogbackLevel = false;
 
     private static Level debugLevel = Level.INFO;
     private static Level auditLevel = Level.INFO;
@@ -133,10 +140,6 @@ public class PolicyLogger {
         }
     }
 
-    private PolicyLogger() {
-
-    }
-
     public static synchronized Level getDebugLevel() {
         return debugLevel;
     }
@@ -150,7 +153,7 @@ public class PolicyLogger {
      */
     public static synchronized void setDebugLevel(String newDebugLevel) {
 
-        if (isOverrideLogbackLevel) {
+        if (overrideLogbackLevel) {
             PolicyLogger.debugLevel = Level.valueOf(newDebugLevel);
             debugLogger.setLevel(debugLevel);
         }
@@ -170,7 +173,7 @@ public class PolicyLogger {
      */
     public static synchronized void setAuditLevel(String newAuditLevel) {
 
-        if (isOverrideLogbackLevel) {
+        if (overrideLogbackLevel) {
             if ("OFF".equalsIgnoreCase(newAuditLevel)) {
                 PolicyLogger.auditLevel = Level.OFF;
                 auditLogger.setLevel(auditLevel);
@@ -195,7 +198,7 @@ public class PolicyLogger {
      */
     public static synchronized void setMetricsLevel(String newMetricsLevel) {
 
-        if (isOverrideLogbackLevel) {
+        if (overrideLogbackLevel) {
             if ("OFF".equalsIgnoreCase(newMetricsLevel)) {
                 PolicyLogger.metricsLevel = Level.OFF;
                 metricsLogger.setLevel(metricsLevel);
@@ -221,7 +224,7 @@ public class PolicyLogger {
      */
     public static synchronized void setErrorLevel(String newErrorLevel) {
 
-        if (isOverrideLogbackLevel) {
+        if (overrideLogbackLevel) {
             if ("OFF".equalsIgnoreCase(newErrorLevel)) {
                 PolicyLogger.errorLevel = Level.OFF;
                 errorLogger.setLevel(errorLevel);
@@ -1373,10 +1376,10 @@ public class PolicyLogger {
     }
 
     private static void setOverrideLogbackLevels(Properties loggerProperties) {
-        final String overrideLogbackLevel = loggerProperties.getProperty("override.logback.level.setup");
+        final var overrideLogbackLevelText = loggerProperties.getProperty("override.logback.level.setup");
 
-        if (!StringUtils.isBlank(overrideLogbackLevel)) {
-            isOverrideLogbackLevel = "TRUE".equalsIgnoreCase(overrideLogbackLevel);
+        if (!StringUtils.isBlank(overrideLogbackLevelText)) {
+            overrideLogbackLevel = "TRUE".equalsIgnoreCase(overrideLogbackLevelText);
         }
     }
 
@@ -1395,24 +1398,6 @@ public class PolicyLogger {
         }
     }
 
-
-    /**
-     * Returns true for overriding logback levels; returns false for not.
-     */
-    public static boolean isOverrideLogbackLevel() {
-
-        return isOverrideLogbackLevel;
-    }
-
-    /**
-     * Sets true for overriding logback levels; sets false for not.
-     */
-    public static void setOverrideLogbackLevel(boolean odl) {
-
-        isOverrideLogbackLevel = odl;
-
-    }
-
     /**
      * Sets server information to MDC.
      */
-- 
cgit 1.2.3-korg