Fix sonar issues in ONAP-logging

Fixed the Sonar issues in ONAP-logging that required minimal refactoring
of the code.  Many of the System.out and System.err issues I did not
fix, as I don't know what loggers to use.

Issue-ID: POLICY-458
Change-Id: I8eccb932b350a170b9cd680b90009e6612a0abcd
Signed-off-by: Charles Cole <cc847m@att.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java
index 097bc706..12f1af61 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java
@@ -71,11 +71,11 @@ public class EventTrackInfoHandler extends TimerTask {
 
             PolicyLogger.info(className + " duration time : " + ns);
 
-            PolicyLogger.info(className + " PolicyLogger.EXPIRED_TIME : " + PolicyLogger.EXPIRED_TIME);
+            PolicyLogger.info(className + " PolicyLogger.EXPIRED_TIME : " + PolicyLogger.expiredTime);
 
             // if longer than EXPIRED_TIME, remove the object
 
-            if (ns > PolicyLogger.EXPIRED_TIME) {
+            if (ns > PolicyLogger.expiredTime) {
                 if (expiredEvents == null) {
                     expiredEvents = new ArrayList<>();
                 }
@@ -89,7 +89,6 @@ public class EventTrackInfoHandler extends TimerTask {
             if (expiredEvents != null) {
                 for (String expiredKey : expiredEvents) {
                     eventInfo.remove(expiredKey);
-                    System.out.println(className + " removed expired event request ID: " + expiredKey);
                     PolicyLogger.info(className + " removed expired event request ID: " + expiredKey);
                 }
             }