Sonar cleanup for integrity-audit

Modified classes in integrity-audit module to resolve major sonar issues.

Issue-ID: [POLICY-96]
Change-Id: I5ef0abb8d2a3ea1ae93edc00363c4d2bea1747e2
Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java
index e7e16a64..2e15da5f 100644
--- a/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java
@@ -26,7 +26,6 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-//import org.apache.log4j.Logger;
 
 
 import org.onap.policy.common.ia.jpa.IntegrityAuditEntity;
@@ -146,8 +145,8 @@ public class AuditThread extends Thread {
 
 			DbAudit dbAudit = new DbAudit(dbDAO);
 
-			IntegrityAuditEntity entityCurrentlyDesignated = null;
-			IntegrityAuditEntity thisEntity = null;
+			IntegrityAuditEntity entityCurrentlyDesignated;
+			IntegrityAuditEntity thisEntity;
 			integrityAudit.setThreadInitialized(true); // An exception will set
 														// it to false
 
@@ -702,7 +701,7 @@ public class AuditThread extends Thread {
 					+ thisEntity.getLastUpdated());
 		}
 
-		long timeDifference = -1;
+		long timeDifference;
 
 		Date currentTime = new Date();
 		Date lastUpdated = thisEntity.getLastUpdated();
@@ -752,9 +751,8 @@ public class AuditThread extends Thread {
 					+ this.persistenceUnit + " on resourceName="
 					+ this.resourceName);
 		}
-		if (IntegrityAudit.isUnitTesting) {
-			dbAudit.dbAuditSimulate(this.resourceName, this.persistenceUnit,
-					this.nodeType);
+		if (IntegrityAudit.isUnitTesting()) {
+			dbAudit.dbAuditSimulate(this.resourceName, this.persistenceUnit);
 		} else {
 			dbAudit.dbAudit(this.resourceName, this.persistenceUnit,
 					this.nodeType);