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, 11 insertions, 4 deletions

diff --git a/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAudit.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAudit.java
index 5ec6229c..50fc6932 100644
--- a/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAudit.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/IntegrityAudit.java
@@ -22,7 +22,6 @@ package org.onap.policy.common.ia;
 
 import java.util.Properties;
 
-//import org.apache.log4j.Logger;
 
 import org.onap.policy.common.ia.IntegrityAuditProperties.NodeTypeEnum;
 import org.onap.policy.common.logging.flexlogger.FlexLogger; 
@@ -36,7 +35,7 @@ public class IntegrityAudit {
 	
 	private static final Logger logger = FlexLogger.getLogger(IntegrityAudit.class);
 
-	public static boolean isUnitTesting;
+	private static boolean isUnitTesting;
 	private boolean isThreadInitialized = false; 
 	
 	AuditThread auditThread = null;
@@ -65,7 +64,7 @@ public class IntegrityAudit {
 	 * @param properties
 	 * @throws Exception
 	 */
-	public IntegrityAudit(String resourceName, String persistenceUnit, Properties properties) throws Exception {
+	public IntegrityAudit(String resourceName, String persistenceUnit, Properties properties) throws IntegrityAuditException {
 		
 		logger.info("Constructor: Entering and checking for nulls");
 		String parmList = "";
@@ -73,7 +72,7 @@ public class IntegrityAudit {
 			logger.error("Constructor: Parms contain nulls; cannot run audit for resourceName="
 					+ resourceName + ", persistenceUnit=" + persistenceUnit
 					+ ", bad parameters: " + parmList);
-			throw new Exception(
+			throw new IntegrityAuditException(
 					"Constructor: Parms contain nulls; cannot run audit for resourceName="
 							+ resourceName + ", persistenceUnit="
 							+ persistenceUnit
@@ -238,4 +237,12 @@ public class IntegrityAudit {
 		logger.info("setThreadInitialized: Setting isThreadInitialized=" + isThreadInitialized);
 		this.isThreadInitialized = isThreadInitialized;
 	}
+
+	public static boolean isUnitTesting() {
+		return isUnitTesting;
+	}
+
+	public static void setUnitTesting(boolean isUnitTesting) {
+		IntegrityAudit.isUnitTesting = isUnitTesting;
+	}
 }