1 files changed, 12 insertions, 24 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 41aea118..66ab307c 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * Integrity Audit
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019, 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.
@@ -21,6 +21,8 @@
 package org.onap.policy.common.ia;
 
 import java.util.Properties;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.common.ia.IntegrityAuditProperties.NodeTypeEnum;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
@@ -34,8 +36,12 @@ public class IntegrityAudit {
 
     private static final Logger logger = FlexLogger.getLogger(IntegrityAudit.class);
 
-    private static boolean isUnitTesting;
-    private boolean isThreadInitialized = false;
+    @Getter
+    @Setter
+    private static boolean unitTesting;
+
+    @Getter
+    private boolean threadInitialized = false;
 
     AuditThread auditThread = null;
 
@@ -54,6 +60,7 @@ public class IntegrityAudit {
      * indicated period
      *
      */
+    @Getter
     private int integrityAuditPeriodSeconds;
 
     /**
@@ -68,7 +75,7 @@ public class IntegrityAudit {
             throws IntegrityAuditException {
 
         logger.info("Constructor: Entering and checking for nulls");
-        StringBuilder parmList = new StringBuilder();
+        var parmList = new StringBuilder();
         if (parmsAreBad(resourceName, persistenceUnit, properties, parmList)) {
             logger.error("Constructor: Parms contain nulls; cannot run audit for resourceName=" + resourceName
                     + ", persistenceUnit=" + persistenceUnit + ", bad parameters: " + parmList);
@@ -94,13 +101,6 @@ public class IntegrityAudit {
     }
 
     /**
-     * Used during JUnit testing by AuditPeriodTest.java
-     */
-    public int getIntegrityAuditPeriodSeconds() {
-        return integrityAuditPeriodSeconds;
-    }
-
-    /**
      * Determine if the nodeType conforms to the required node types.
      */
     public static boolean isNodeTypeEnum(String nt) {
@@ -237,21 +237,9 @@ public class IntegrityAudit {
         logger.info("stopAuditThread: Exiting");
     }
 
-    public boolean isThreadInitialized() {
-        return isThreadInitialized;
-    }
-
     public void setThreadInitialized(boolean isThreadInitialized) {
         logger.info("setThreadInitialized: Setting isThreadInitialized=" + isThreadInitialized);
-        this.isThreadInitialized = isThreadInitialized;
-    }
-
-    public static boolean isUnitTesting() {
-        return isUnitTesting;
-    }
-
-    public static void setUnitTesting(boolean isUnitTesting) {
-        IntegrityAudit.isUnitTesting = isUnitTesting;
+        this.threadInitialized = isThreadInitialized;
     }
 
     /**