1 files changed, 66 insertions, 75 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 8dc7ecb0..097bc706 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,84 +24,75 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.TimerTask;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * 
- * EventTrackInfoHandler is the handler of clean up all expired event objcts
+ *
+ * EventTrackInfoHandler is the handler of clean up all expired event objects
  *
  */
 public class EventTrackInfoHandler extends TimerTask {
 
-	String className = this.getClass().getSimpleName();
-
-	@Override
-	public void run() {
-
-		PolicyLogger.info(className
-				+ " Release expired event records start...");
-
-		CleanUp();
-
-		PolicyLogger.info(className + " Release expired event records done");
-	}
-    
-	/**
-	 * Removes all expired event objects from the ConcurrentHashMap of EventData
-	 */
-	private void CleanUp() {
-
-		if (PolicyLogger.getEventTracker() == null
-				|| PolicyLogger.getEventTracker().getEventInfo() == null
-				|| PolicyLogger.getEventTracker().getEventInfo().isEmpty()) {
-			return;
-		}
-
-		Instant startTime;
-		long ns;
-
-		ArrayList<String> expiredEvents = null;
-
-		for (String key: PolicyLogger.getEventTracker().getEventInfo().keySet()) {
-			EventData event  = PolicyLogger.getEventTracker().getEventInfo().get(key);
-			startTime = event.getStartTime();
-			ns = Duration.between(startTime, Instant.now()).getSeconds();
-
-			PolicyLogger.info(className
-					+ " duration time : " + ns);
-
-			PolicyLogger.info(className
-					+ " PolicyLogger.EXPIRED_TIME : " + PolicyLogger.EXPIRED_TIME);	
-
-			// if longer than EXPIRED_TIME, remove the object
-
-			if (ns > PolicyLogger.EXPIRED_TIME){	
-				if (expiredEvents == null) {
-					expiredEvents = new ArrayList<>();
-				}
-				expiredEvents.add(key);
-
-				PolicyLogger.info(className
-						+ " add expired event request ID: "
-						+ event.getRequestID());
-			}
-		}
-		
-		synchronized (PolicyLogger.getEventTracker().getEventInfo()) {  
-			if (expiredEvents != null) {
-				for (String expiredKey : expiredEvents) {
-					PolicyLogger.getEventTracker().getEventInfo()
-							.remove(expiredKey);
-					System.out.println(className
-							+ " removed expired event request ID: "
-							+ expiredKey);
-					PolicyLogger.info(className
-							+ " removed expired event request ID: "
-							+ expiredKey);
-				}
-			}
-
-		}
-
-	}
+    String className = this.getClass().getSimpleName();
+
+    @Override
+    public void run() {
+
+        PolicyLogger.info(className + " Release expired event records start...");
+
+        cleanUp();
+
+        PolicyLogger.info(className + " Release expired event records done");
+    }
+
+    /**
+     * Removes all expired event objects from the ConcurrentHashMap of EventData
+     */
+    private void cleanUp() {
+
+        EventTrackInfo eventTrackInfo = PolicyLogger.getEventTracker();
+        if (eventTrackInfo == null) {
+            return;
+        }
+        ConcurrentHashMap<String, EventData> eventInfo = eventTrackInfo.getEventInfo();
+        if (eventInfo == null || eventInfo.isEmpty()) {
+            return;
+        }
+
+        Instant startTime;
+        long ns;
+
+        ArrayList<String> expiredEvents = null;
+
+        for (ConcurrentHashMap.Entry<String, EventData> entry : eventInfo.entrySet()) {
+            EventData event = entry.getValue();
+            startTime = event.getStartTime();
+            ns = Duration.between(startTime, Instant.now()).getSeconds();
+
+            PolicyLogger.info(className + " duration time : " + ns);
+
+            PolicyLogger.info(className + " PolicyLogger.EXPIRED_TIME : " + PolicyLogger.EXPIRED_TIME);
+
+            // if longer than EXPIRED_TIME, remove the object
+
+            if (ns > PolicyLogger.EXPIRED_TIME) {
+                if (expiredEvents == null) {
+                    expiredEvents = new ArrayList<>();
+                }
+                expiredEvents.add(entry.getKey());
+
+                PolicyLogger.info(className + " add expired event request ID: " + event.getRequestID());
+            }
+        }
 
+        synchronized (eventInfo) {
+            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);
+                }
+            }
+        }
+    }
 }