From 1d0aaaa5b31719c1718700bb0d1a99c413fd513c Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Thu, 6 May 2021 11:28:53 -0400
Subject: Fix sonars in policy-common

Fixed sonars:
- use "var" instead of actual type name
- re-interrupt threads
- use rej2 split() instead of String split()

Issue-ID: POLICY-3285
Change-Id: I82261e0b8a53ee5c5264556fbf5cec37454f014e
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../policy/common/logging/eelf/PolicyLogger.java   | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 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 3f94483b..15659561 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -301,8 +301,8 @@ public class PolicyLogger {
 
         setMdcHostInfo();
 
-        Instant startTime = Instant.now();
-        Instant endTime = Instant.now();
+        var startTime = Instant.now();
+        var endTime = Instant.now();
 
         seTimeStamps(startTime, endTime);
 
@@ -334,8 +334,8 @@ public class PolicyLogger {
         MDC.put(MDC_INSTANCE_UUID, "");
         MDC.put(MDC_ALERT_SEVERITY, "");
 
-        Instant startTime = Instant.now();
-        Instant endTime = Instant.now();
+        var startTime = Instant.now();
+        var endTime = Instant.now();
 
         seTimeStamps(startTime, endTime);
 
@@ -348,7 +348,7 @@ public class PolicyLogger {
     }
 
     private static void seTimeStamps(Instant startTime, Instant endTime) {
-        SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
+        var sdf = new SimpleDateFormat(DATE_FORMAT);
 
         String formatedTime = sdf.format(Date.from(startTime));
         MDC.put(BEGIN_TIME_STAMP, formatedTime);
@@ -874,7 +874,7 @@ public class PolicyLogger {
         if (eventTracker == null) {
             eventTracker = new EventTrackInfo();
         }
-        EventData event = new EventData();
+        var event = new EventData();
         event.setRequestId(eventId);
         event.setStartTime(Instant.now());
         eventTracker.storeEventData(event);
@@ -1007,7 +1007,7 @@ public class PolicyLogger {
             return;
         }
 
-        EventData event = eventTracker.getEventDataByRequestId(eventId);
+        var event = eventTracker.getEventDataByRequestId(eventId);
 
         if (event != null) {
             Instant endTime = event.getEndTime();
@@ -1035,7 +1035,7 @@ public class PolicyLogger {
             return;
         }
 
-        EventData event = eventTracker.getEventDataByRequestId(eventId.toString());
+        var event = eventTracker.getEventDataByRequestId(eventId.toString());
 
         if (event != null) {
             Instant endTime = event.getEndTime();
@@ -1226,13 +1226,13 @@ public class PolicyLogger {
      * @param arguments the messages
      */
     private static String getNormalizedStackTrace(Throwable throwable, String... arguments) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
+        var sw = new StringWriter();
+        var pw = new PrintWriter(sw);
         throwable.printStackTrace(pw);
         String newStValue = sw.toString().replace('|', '!').replace("\n", " - ");
         int curSize = arguments == null ? 0 : arguments.length;
-        StringBuilder newArgument = new StringBuilder();
-        for (int i = 0; i < curSize; i++) {
+        var newArgument = new StringBuilder();
+        for (var i = 0; i < curSize; i++) {
             newArgument.append(arguments[i]);
             newArgument.append(":");
         }
@@ -1246,7 +1246,7 @@ public class PolicyLogger {
     private static void startCleanUp() {
 
         if (!isEventTrackerRunning) {
-            EventTrackInfoHandler ttrcker = new EventTrackInfoHandler();
+            var ttrcker = new EventTrackInfoHandler();
             timer = new Timer(true);
             timer.scheduleAtFixedRate(ttrcker, timerDelayTime, checkInterval);
             debugLogger.info("EventTrackInfoHandler begins! : {}", new Date());
@@ -1279,7 +1279,7 @@ public class PolicyLogger {
      */
     public static LoggerType init(Properties properties) {
 
-        Properties loggerProperties = getLoggerProperties(properties);
+        var loggerProperties = getLoggerProperties(properties);
 
         // fetch and verify definitions of some properties
         try {
@@ -1321,7 +1321,7 @@ public class PolicyLogger {
     }
 
     private static int getIntProp(Properties properties, String propName, int defaultValue) {
-        final int propValue = Integer.parseInt(properties.getProperty(propName, String.valueOf(defaultValue)));
+        final var propValue = Integer.parseInt(properties.getProperty(propName, String.valueOf(defaultValue)));
 
         debugLogger.info("{} value: {}", propName, propValue);
 
-- 
cgit 1.2.3-korg