From 0e87901898a23bfdfc993edb312488006299d01a Mon Sep 17 00:00:00 2001 From: "Magnusen, Drew (dm741q)" Date: Thu, 31 Aug 2017 11:32:51 -0500 Subject: Changed logger to slf4j Changed all instances of Sys.out or PolicyLogger to slf4j. Issue-ID: POLICY-178 Change-Id: Ia91af1deb18a9b5c466f6f8a6c546c17c54e14ad Signed-off-by: Magnusen, Drew (dm741q) --- .../onap/policy/common/im/IntegrityMonitor.java | 391 +++++++++++------- .../onap/policy/common/im/StateChangeNotifier.java | 11 +- .../org/onap/policy/common/im/StateElement.java | 33 +- .../org/onap/policy/common/im/StateManagement.java | 298 ++++++++----- .../org/onap/policy/common/im/StateTransition.java | 47 ++- .../onap/policy/common/im/jmx/ComponentAdmin.java | 30 +- .../common/im/test/IntegrityMonitorTest.java | 459 +++++++++++---------- .../common/im/test/StateManagementEntityTest.java | 91 ++-- .../policy/common/im/test/StateManagementTest.java | 111 +++-- .../policy/common/im/test/StateTransitionTest.java | 18 +- 10 files changed, 881 insertions(+), 608 deletions(-) diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java index 9d437938..9ac5adb6 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java @@ -41,11 +41,11 @@ import javax.persistence.Query; import org.onap.policy.common.im.jpa.ForwardProgressEntity; import org.onap.policy.common.im.jpa.ResourceRegistrationEntity; import org.onap.policy.common.im.jpa.StateManagementEntity; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.common.im.jmx.ComponentAdmin; import org.onap.policy.common.im.jmx.ComponentAdminMBean; import org.onap.policy.common.im.jmx.JmxAgentConnection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * IntegrityMonitor @@ -53,7 +53,7 @@ import org.onap.policy.common.im.jmx.JmxAgentConnection; * the X.731 ITU standard. */ public class IntegrityMonitor { - private static final Logger logger = FlexLogger.getLogger(IntegrityMonitor.class.getName()); + private static final Logger logger = LoggerFactory.getLogger(IntegrityMonitor.class.getName()); // only allow one instance of IntegrityMonitor @@ -174,14 +174,18 @@ public class IntegrityMonitor { */ public static IntegrityMonitor getInstance(String resourceName, Properties properties) throws Exception { synchronized(getInstanceLock){ - logger.info("getInstance() called - resourceName=" + resourceName); + if(logger.isDebugEnabled()){ + logger.debug("getInstance() called - resourceName= {}", resourceName); + } if (resourceName == null || resourceName.isEmpty() || properties == null) { logger.error("Error: getIntegrityMonitorInstance() called with invalid input"); return null; } if (instance == null) { - logger.info("Creating new instance of IntegrityMonitor"); + if(logger.isDebugEnabled()){ + logger.debug("Creating new instance of IntegrityMonitor"); + } instance = new IntegrityMonitor(resourceName, properties); } return instance; @@ -189,7 +193,9 @@ public class IntegrityMonitor { } public static IntegrityMonitor getInstance() throws Exception{ - logger.info("getInstance() called"); + if(logger.isDebugEnabled()){ + logger.debug("getInstance() called"); + } if (instance == null) { String msg = "No IntegrityMonitor instance exists." + " Please use the method IntegrityMonitor.getInstance(String resourceName, Properties properties)"; @@ -200,11 +206,15 @@ public class IntegrityMonitor { } public static void deleteInstance(){ - logger.info("deleteInstance() called"); + if(logger.isDebugEnabled()){ + logger.debug("deleteInstance() called"); + } if(isUnitTesting()){ instance=null; } - logger.info("deleteInstance() exit"); + if(logger.isDebugEnabled()){ + logger.debug("deleteInstance() exit"); + } } /** * IntegrityMonitor constructor. It is invoked from the getInstance() method in @@ -221,7 +231,7 @@ public class IntegrityMonitor { // singleton check since this constructor can be called from a child or sub-class if (instance != null) { String msg = "IM object exists and only one instance allowed"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorException("IntegrityMonitor constructor exception: " + msg); } instance = this; @@ -245,8 +255,8 @@ public class IntegrityMonitor { // Did it get created? // if (emf == null) { - logger.error("Error creating IM entity manager factory with persistence unit: " - + PERSISTENCE_UNIT); + logger.error("Error creating IM entity manager factory with persistence unit: {}", + PERSISTENCE_UNIT); throw new IntegrityMonitorException("Unable to create IM Entity Manager Factory"); } @@ -272,11 +282,15 @@ public class IntegrityMonitor { fpx = (ForwardProgressEntity) fpList.get(0); // refresh the object from DB in case cached data was returned em.refresh(fpx); - logger.info("Resource " + resourceName + " exists and will be updated - old fpc=" + fpx.getFpcCount() + ", lastUpdated=" + fpx.getLastUpdated()); + if(logger.isDebugEnabled()){ + logger.debug("Resource {} exists and will be updated - old fpc= {}, lastUpdated= {}", resourceName, fpx.getFpcCount(), fpx.getLastUpdated()); + } fpx.setFpcCount(fpCounter); }else{ //Create a forward progress object - logger.info("Adding resource " + resourceName + " to ForwardProgress table"); + if(logger.isDebugEnabled()){ + logger.debug("Adding resource {} to ForwardProgress table", resourceName); + } fpx = new ForwardProgressEntity(); } //update/set columns in entry @@ -300,11 +314,15 @@ public class IntegrityMonitor { rrx = (ResourceRegistrationEntity) rrList.get(0); // refresh the object from DB in case cached data was returned em.refresh(rrx); - logger.info("Resource " + resourceName + " exists and will be updated - old url=" + rrx.getResourceUrl() + ", createdDate=" + rrx.getCreatedDate()); + if(logger.isDebugEnabled()){ + logger.debug("Resource {} exists and will be updated - old url= {}, createdDate={}", resourceName, rrx.getResourceUrl(), rrx.getCreatedDate()); + } rrx.setLastUpdated(new Date()); }else{ // register resource by adding entry to table in DB - logger.info("Adding resource " + resourceName + " to ResourceRegistration table"); + if(logger.isDebugEnabled()){ + logger.debug("Adding resource {} to ResourceRegistration table", resourceName); + } rrx = new ResourceRegistrationEntity(); } //update/set columns in entry @@ -319,7 +337,7 @@ public class IntegrityMonitor { } } catch (Exception e) { - logger.error("IntegrityMonitor constructor DB table update failed with exception: " + e); + logger.error("IntegrityMonitor constructor DB table update failed with exception: ", e); try { if (et.isActive()) { synchronized(IMFLUSHLOCK){ @@ -327,7 +345,7 @@ public class IntegrityMonitor { } } } catch (Exception e1) { - logger.error("IntegrityMonitor constructor threw exception: " + e1); + logger.error("IntegrityMonitor constructor threw exception: ", e1); } throw e; } @@ -348,7 +366,7 @@ public class IntegrityMonitor { try { new ComponentAdmin(resourceName, this, stateManager); } catch (Exception e) { - logger.error("ComponentAdmin constructor exception: " + e); + logger.error("ComponentAdmin constructor exception: {}", e.toString(), e); } new FPManager(); @@ -364,7 +382,7 @@ public class IntegrityMonitor { String jmx_err_msg; if (jmx_port == null) { jmx_err_msg = "System property com.sun.management.jmxremote.port for JMX remote port is not set"; - logger.error(jmx_err_msg); + logger.error("{}", jmx_err_msg); throw new IntegrityMonitorException("getJmxUrl exception: " + jmx_err_msg); } @@ -373,7 +391,7 @@ public class IntegrityMonitor { port = Integer.parseInt(jmx_port); } catch (NumberFormatException e) { jmx_err_msg = "JMX remote port is not a valid integer value - " + jmx_port; - logger.error(jmx_err_msg); + logger.error("{}", jmx_err_msg); throw new IntegrityMonitorException("getJmxUrl exception: " + jmx_err_msg); } @@ -382,19 +400,22 @@ public class IntegrityMonitor { jmxFqdn = InetAddress.getLocalHost().getCanonicalHostName(); // get FQDN of this host } } catch (Exception e) { - String msg = "getJmxUrl could not get hostname" + e; - logger.error(msg); + String msg = "getJmxUrl could not get hostname"; + logger.error("{}", msg, e); throw new IntegrityMonitorException("getJmxUrl Exception: " + msg); } if (jmxFqdn == null) { String msg = "getJmxUrl encountered null hostname"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorException("getJmxUrl error: " + msg); } // assemble the jmx url String jmx_url = "service:jmx:rmi:///jndi/rmi://" + jmxFqdn + ":" + port + "/jmxrmi"; - logger.info("IntegerityMonitor - jmx url=" + jmx_url); + + if(logger.isDebugEnabled()){ + logger.debug("IntegerityMonitor - jmx url={}", jmx_url); + } return jmx_url; } @@ -405,29 +426,38 @@ public class IntegrityMonitor { * which includes information about any dependency (node) which has failed. */ public void evaluateSanity() throws Exception { - logger.debug("evaluateSanity called ...."); + if(logger.isDebugEnabled()){ + logger.debug("evaluateSanity called ...."); + } synchronized(evaluateSanityLock){ String error_msg = dependencyCheckErrorMsg; - logger.debug("evaluateSanity dependencyCheckErrorMsg = " + error_msg); - + if(logger.isDebugEnabled()){ + logger.debug("evaluateSanity dependencyCheckErrorMsg = {}", error_msg); + } // check op state and throw exception if disabled if ((stateManager.getOpState() != null) && stateManager.getOpState().equals(StateManagement.DISABLED)) { String msg = "Resource " + resourceName + " operation state is disabled. " + error_msg; - logger.debug(msg); + if(logger.isDebugEnabled()){ + logger.debug("{}", msg); + } throw new IntegrityMonitorException(msg); } // check admin state and throw exception if locked if ((stateManager.getAdminState() != null) && stateManager.getAdminState().equals(StateManagement.LOCKED)) { String msg = "Resource " + resourceName + " is administratively locked"; - logger.debug(msg); + if(logger.isDebugEnabled()){ + logger.debug("{}", msg); + } throw new AdministrativeStateException("IntegrityMonitor Admin State Exception: " + msg); } // check standby state and throw exception if cold standby if ((stateManager.getStandbyStatus() != null) && stateManager.getStandbyStatus().equals(StateManagement.COLD_STANDBY)){ String msg = "Resource " + resourceName + " is cold standby"; - logger.debug(msg); + if(logger.isDebugEnabled()){ + logger.debug("{}", msg); + } throw new StandbyStatusException("IntegrityMonitor Standby Status Exception: " + msg); } @@ -443,8 +473,9 @@ public class IntegrityMonitor { * will return an error. */ public String stateCheck(String dep) { - logger.debug("checking state of dependent resource: " + dep); - + if(logger.isDebugEnabled()){ + logger.debug("checking state of dependent resource: {}", dep); + } String error_msg = null; ForwardProgressEntity forwardProgressEntity = null; StateManagementEntity stateManagementEntity = null; @@ -466,11 +497,12 @@ public class IntegrityMonitor { forwardProgressEntity = (ForwardProgressEntity) fpList.get(0); // refresh the object from DB in case cached data was returned em.refresh(forwardProgressEntity); - logger.debug("Found entry in ForwardProgressEntity table for dependent Resource=" + dep); + if(logger.isDebugEnabled()){ + logger.debug("Found entry in ForwardProgressEntity table for dependent Resource={}", dep); + } } else { error_msg = dep + ": resource not found in ForwardProgressEntity database table"; - logger.debug(error_msg); - logger.error(error_msg); + logger.error("{}", error_msg); } synchronized(IMFLUSHLOCK){ et.commit(); @@ -478,9 +510,8 @@ public class IntegrityMonitor { } catch(Exception ex){ // log an error - error_msg = dep + ": ForwardProgressEntity DB operation failed with exception: " + ex; - logger.debug(error_msg); - logger.error(error_msg); + error_msg = dep + ": ForwardProgressEntity DB operation failed with exception: "; + logger.error("{}", error_msg, ex); synchronized(IMFLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -505,11 +536,12 @@ public class IntegrityMonitor { stateManagementEntity = (StateManagementEntity) smList.get(0); // refresh the object from DB in case cached data was returned em.refresh(stateManagementEntity); - logger.debug("Found entry in StateManagementEntity table for dependent Resource=" + dep); + if(logger.isDebugEnabled()){ + logger.debug("Found entry in StateManagementEntity table for dependent Resource={}", dep); + } } else { error_msg = dep + ": resource not found in state management entity database table"; - logger.debug(error_msg); - logger.error(error_msg); + logger.error("{}", error_msg); } synchronized(IMFLUSHLOCK){ @@ -517,9 +549,8 @@ public class IntegrityMonitor { } } catch (Exception e) { // log an error - error_msg = dep + ": StateManagementEntity DB read failed with exception: " + e; - logger.debug(error_msg); - logger.error(error_msg); + error_msg = dep + ": StateManagementEntity DB read failed with exception: "; + logger.error("{}", error_msg, e); synchronized(IMFLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -533,24 +564,29 @@ public class IntegrityMonitor { if (forwardProgressEntity != null && stateManagementEntity != null) { Date date = new Date(); long diffMs = date.getTime() - forwardProgressEntity.getLastUpdated().getTime(); - logger.debug("IntegrityMonitor.stateCheck(): diffMs = " + diffMs); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor.stateCheck(): diffMs = {}", diffMs); + } //Threshold for a stale entry long staleMs = failedCounterThreshold * monitorInterval * (long)1000; - logger.debug("IntegrityMonitor.stateCheck(): staleMs = " + staleMs); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor.stateCheck(): staleMs = {}", staleMs); + } if(diffMs > staleMs){ //ForwardProgress is stale. Disable it try { if(!stateManagementEntity.getOpState().equals(StateManagement.DISABLED)){ - logger.debug("IntegrityMonitor.stateCheck(): Changing OpStat = disabled for " + dep); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor.stateCheck(): Changing OpStat = disabled for {}", dep); + } stateManager.disableFailed(dep); } } catch (Exception e) { String msg = "IntegrityMonitor.stateCheck(): Failed to diableFail dependent resource = " + dep + "; " + e.getMessage(); - logger.debug(msg, e); - logger.error(msg, e); + logger.error("{}",msg, e); } } } @@ -559,15 +595,13 @@ public class IntegrityMonitor { if(forwardProgressEntity == null) { String msg = "IntegrityMonitor.stateCheck(): Failed to diableFail dependent resource = " + dep + "; " + " forwardProgressEntity == null."; - logger.debug(msg); - logger.error(msg); + logger.error("{}", msg); } else { String msg = "IntegrityMonitor.stateCheck(): Failed to diableFail dependent resource = " + dep + "; " + " stateManagementEntity == null."; - logger.debug(msg); - logger.error(msg); + logger.error("{}", msg); } } } @@ -577,32 +611,32 @@ public class IntegrityMonitor { if(stateManagementEntity != null) { if ((stateManager.getAdminState() != null) && stateManagementEntity.getAdminState().equals(StateManagement.LOCKED)) { error_msg = dep + ": resource is administratively locked"; - logger.debug(error_msg); - logger.error(error_msg); + logger.error("{}", error_msg); } else if ((stateManager.getOpState() != null) && stateManagementEntity.getOpState().equals(StateManagement.DISABLED)) { error_msg = dep + ": resource is operationally disabled"; - logger.debug(error_msg); - logger.error(error_msg); + logger.error("{}", error_msg); } else if ((stateManager.getStandbyStatus() != null) && stateManagementEntity.getStandbyStatus().equals(StateManagement.COLD_STANDBY)) { error_msg = dep + ": resource is cold standby"; - logger.debug(error_msg); - logger.error(error_msg); + logger.error("{}", error_msg); } } else { error_msg = dep + ": could not check standy state of resource. stateManagementEntity == null."; - logger.debug(error_msg); - logger.error(error_msg); + logger.error("{}", error_msg); } } String returnMsg = "IntegrityMonitor.stateCheck(): returned error_msg: " + error_msg; - logger.debug(returnMsg); + if(logger.isDebugEnabled()){ + logger.debug("{}", returnMsg); + } return error_msg; } private String fpCheck(String dep) { - logger.debug("checking forward progress count of dependent resource: " + dep); + if(logger.isDebugEnabled()){ + logger.debug("checking forward progress count of dependent resource: {}", dep); + } String error_msg = null; @@ -624,36 +658,40 @@ public class IntegrityMonitor { fpx = (ForwardProgressEntity) fpList.get(0); // refresh the object from DB in case cached data was returned em.refresh(fpx); - logger.debug("Dependent resource " + dep + " - fpc=" + fpx.getFpcCount() + ", lastUpdated=" + fpx.getLastUpdated()); + if(logger.isDebugEnabled()){ + logger.debug("Dependent resource {} - fpc= {}, lastUpdated={}", dep, fpx.getFpcCount(), fpx.getLastUpdated()); + } long currTime = System.currentTimeMillis(); // if dependent resource FPC has not been updated, consider it an error if ((currTime - fpx.getLastUpdated().getTime()) > (1000 * maxFpcUpdateInterval)) { error_msg = dep + ": FP count has not been updated in the last " + maxFpcUpdateInterval + " seconds"; - logger.error(error_msg); + logger.error("{}", error_msg); try { // create instance of StateMangement class for dependent StateManagement depStateManager = new StateManagement(emf, dep); if(!depStateManager.getOpState().equals(StateManagement.DISABLED)){ - logger.info("Forward progress not detected for dependent resource " + dep + ". Setting dependent's state to disable failed."); + if(logger.isDebugEnabled()){ + logger.debug("Forward progress not detected for dependent resource {}. Setting dependent's state to disable failed.", dep); + } depStateManager.disableFailed(); } } catch (Exception e) { // ignore errors - logger.info("Update dependent state failed with exception: " + e); + logger.error("Update dependent state failed with exception: ", e); } } } else { // resource entry not found in FPC table error_msg = dep + ": resource not found in ForwardProgressEntity table in the DB"; - logger.error(error_msg); + logger.error("{}", error_msg); } synchronized(IMFLUSHLOCK){ et.commit(); } } catch (Exception e) { // log an error and continue - error_msg = dep + ": ForwardProgressEntity DB read failed with exception: " + e; - logger.error(error_msg); + error_msg = dep + ": ForwardProgressEntity DB read failed with exception: "; + logger.error("{}", error_msg, e); synchronized(IMFLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -681,13 +719,13 @@ public class IntegrityMonitor { et.commit(); } if(logger.isDebugEnabled()){ - logger.debug("getAllForwardProgressEntity: myList.size(): " + myList.size()); + logger.debug("getAllForwardProgressEntity: myList.size(): {}", myList.size()); } if(!myList.isEmpty()){ for(int i = 0; i < myList.size(); i++){ if(logger.isDebugEnabled()){ - logger.debug("getAllForwardProgressEntity: myList.get(" + i +").getResourceName()" - + ": " + ((ForwardProgressEntity)myList.get(i)).getResourceName()); + logger.debug("getAllForwardProgressEntity: myList.get({}).getResourceName(): {}",i, + ((ForwardProgressEntity)myList.get(i)).getResourceName()); } fpList.add((ForwardProgressEntity) myList.get(i)); } @@ -699,8 +737,8 @@ public class IntegrityMonitor { } } catch (Exception e) { // log an error and continue - String msg = "getAllForwardProgessEntity DB read failed with exception: " + e; - logger.error(msg); + String msg = "getAllForwardProgessEntity DB read failed with exception: "; + logger.error("{}", msg, e); synchronized(IMFLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -712,7 +750,9 @@ public class IntegrityMonitor { private String jmxCheck(String dep) { - logger.debug("checking health of dependent by calling test() via JMX on resource: " + dep); + if(logger.isDebugEnabled()){ + logger.debug("checking health of dependent by calling test() via JMX on resource: {}", dep); + } String error_msg = null; @@ -737,18 +777,20 @@ public class IntegrityMonitor { // refresh the object from DB in case cached data was returned em.refresh(rrx); jmxUrl = rrx.getResourceUrl(); - logger.debug("Dependent Resource=" + dep + ", url=" + jmxUrl + ", createdDate=" + rrx.getCreatedDate()); + if(logger.isDebugEnabled()){ + logger.debug("Dependent Resource={}, url={}, createdDate={}", dep, jmxUrl, rrx.getCreatedDate()); + } } else { error_msg = dep + ": resource not found in ResourceRegistrationEntity table in the DB"; - logger.error(error_msg); + logger.error("{}", error_msg); } synchronized(IMFLUSHLOCK){ et.commit(); } } catch (Exception e) { - error_msg = dep + ": ResourceRegistrationEntity DB read failed with exception: " + e; - logger.error(error_msg); + error_msg = dep + ": ResourceRegistrationEntity DB read failed with exception: "; + logger.error("{}", error_msg, e); synchronized(IMFLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -767,10 +809,12 @@ public class IntegrityMonitor { // invoke the test method via the jmx proxy admin.test(); - logger.debug("Dependent resource " + dep + " sanity test passed"); + if(logger.isDebugEnabled()){ + logger.debug("Dependent resource {} sanity test passed", dep); + } } catch (Exception e) { - error_msg = dep + ": resource sanity test failed with exception: " + e; - logger.error(error_msg); + error_msg = dep + ": resource sanity test failed with exception: "; + logger.error("{}", error_msg, e); // TODO: extract real error message from exception which may be nested } finally { // close the JMX connector @@ -784,7 +828,9 @@ public class IntegrityMonitor { } private String dependencyCheck() { - logger.debug("dependencyCheck: entry - checking health of dependent groups and setting resource's state"); + if(logger.isDebugEnabled()){ + logger.debug("dependencyCheck: entry - checking health of dependent groups and setting resource's state"); + } synchronized(dependencyCheckLock){ // Start with the error message empty @@ -802,7 +848,9 @@ public class IntegrityMonitor { continue; } String [] dependencies = group.split(","); - logger.debug("group dependencies = " + Arrays.toString(dependencies)); + if(logger.isDebugEnabled()){ + logger.debug("group dependencies = {}", Arrays.toString(dependencies)); + } int real_dep_count = 0; int fail_dep_count = 0; for (String dep : dependencies) { @@ -833,7 +881,9 @@ public class IntegrityMonitor { if ((real_dep_count > 0) && (fail_dep_count == real_dep_count)) { dependencyFailure=true; try { - logger.info("All dependents in group " + group + " have failed their health check. Updating this resource's state to disableDependency"); + if(logger.isDebugEnabled()){ + logger.debug("All dependents in group {} have failed their health check. Updating this resource's state to disableDependency", group); + } if( !( (stateManager.getAvailStatus()).equals(StateManagement.DEPENDENCY) || (stateManager.getAvailStatus()).equals(StateManagement.DEPENDENCY_FAILED) ) ){ // Note: redundant calls are made by refreshStateAudit @@ -844,7 +894,7 @@ public class IntegrityMonitor { this.stateManager.disableDependency(); } } catch (Exception e) { - logger.error(e); + logger.error("IntegrityMonitor threw exception.", e); if (!error_msg.isEmpty()) { error_msg = error_msg.concat(","); } @@ -861,14 +911,16 @@ public class IntegrityMonitor { */ if(!dependencyFailure){ try { - logger.debug("All dependency groups have at least one viable member. Updating this resource's state to enableNoDependency"); + if(logger.isDebugEnabled()){ + logger.debug("All dependency groups have at least one viable member. Updating this resource's state to enableNoDependency"); + } if( (stateManager.getAvailStatus()).equals(StateManagement.DEPENDENCY) || (stateManager.getAvailStatus()).equals(StateManagement.DEPENDENCY_FAILED) ){ // Note: redundant calls are made by refreshStateAudit this.stateManager.enableNoDependency(); } // The refreshStateAudit will catch the case where it is disabled but availStatus != failed } catch (Exception e) { - logger.error(e); + logger.error("IntegrityMonitor threw exception.", e); if (!error_msg.isEmpty()) { error_msg = error_msg.concat(","); } @@ -882,14 +934,16 @@ public class IntegrityMonitor { * this happen in the lab, but is not very likely in a production environment...but you never know. */ try { - logger.debug("There are no dependents. Updating this resource's state to enableNoDependency"); + if(logger.isDebugEnabled()){ + logger.debug("There are no dependents. Updating this resource's state to enableNoDependency"); + } if( (stateManager.getAvailStatus()).equals(StateManagement.DEPENDENCY) || (stateManager.getAvailStatus()).equals(StateManagement.DEPENDENCY_FAILED) ){ // Note: redundant calls are made by refreshStateAudit this.stateManager.enableNoDependency(); }// The refreshStateAudit will catch the case where it is disabled but availStatus != failed } catch (Exception e) { - logger.error(e); + logger.error("IntegrityMonitor threw exception.", e); if (!error_msg.isEmpty()) { error_msg = error_msg.concat(","); } @@ -906,10 +960,12 @@ public class IntegrityMonitor { //Test any subsystems that are not covered under the dependency relationship subsystemTest(); }catch (Exception e){ - logger.error(e); + logger.error("IntegrityMonitor threw exception", e); //This indicates a subsystemTest failure try { - logger.info(resourceName + ": There has been a subsystemTest failure with error: " + e.getMessage() + " Updating this resource's state to disableDependency"); + if(logger.isDebugEnabled()){ + logger.debug("{}: There has been a subsystemTest failure with error:{} Updating this resource's state to disableDependency", resourceName, e.getMessage()); + } //Capture the subsystemTest failure info if(!error_msg.isEmpty()){ error_msg = error_msg.concat(","); @@ -917,7 +973,7 @@ public class IntegrityMonitor { error_msg = error_msg.concat(resourceName + ": " + e.getMessage()); this.stateManager.disableDependency(); } catch (Exception ex) { - logger.error(ex); + logger.error("IntegrityMonitor threw exception.", ex); if (!error_msg.isEmpty()) { error_msg = error_msg.concat(","); } @@ -926,7 +982,7 @@ public class IntegrityMonitor { } if (!error_msg.isEmpty()) { - logger.error("Sanity failure detected in a dependent resource: " + error_msg); + logger.error("Sanity failure detected in a dependent resource: {}", error_msg); } @@ -943,12 +999,14 @@ public class IntegrityMonitor { */ public void testTransaction() { synchronized (testTransactionLock){ - logger.debug("testTransaction called..."); + if(logger.isDebugEnabled()){ + logger.debug("testTransaction called..."); + } // start Transaction - resets transaction timer and check admin state try { startTransaction(); } catch (AdministrativeStateException | StandbyStatusException e) { - logger.debug(e); + logger.error("IntegrityMonitor threw exception.", e); } // TODO: add test functionality if needed @@ -964,7 +1022,9 @@ public class IntegrityMonitor { */ public void subsystemTest() throws IntegrityMonitorException { // Testing provided by subsystem - logger.debug("IntegrityMonitor subsystemTest() OK"); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor subsystemTest() OK"); + } } /** @@ -1032,8 +1092,13 @@ public class IntegrityMonitor { fpx = (ForwardProgressEntity) fpList.get(0); // refresh the object from DB in case cached data was returned em.refresh(fpx); - logger.debug("Updating FP entry: Resource=" + resourceName + ", fpcCount=" + fpx.getFpcCount() + - ", lastUpdated=" + fpx.getLastUpdated() + ", new fpcCount=" + fpCounter); + if(logger.isDebugEnabled()){ + logger.debug("Updating FP entry: Resource={}, fpcCount={}, lastUpdated={}, new fpcCount={}", + resourceName, + fpx.getFpcCount(), + fpx.getLastUpdated(), + fpCounter); + } fpx.setFpcCount(fpCounter); em.persist(fpx); // flush to the DB and commit @@ -1054,9 +1119,9 @@ public class IntegrityMonitor { } } } catch (Exception e1) { - logger.debug(e1); + logger.error("IntegrityMonitor threw exception.", e1); } - logger.error("writeFpc DB table commit failed with exception: " + e); + logger.error("writeFpc DB table commit failed with exception: {}", e); throw e; } } @@ -1074,25 +1139,25 @@ public class IntegrityMonitor { if (prop.getProperty(IntegrityMonitorProperties.DB_DRIVER)== null){ String msg = IntegrityMonitorProperties.DB_DRIVER + " property is null"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorPropertiesException("IntegrityMonitor Property Exception: " + msg); } if (prop.getProperty(IntegrityMonitorProperties.DB_URL)== null){ String msg = IntegrityMonitorProperties.DB_URL + " property is null"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorPropertiesException("IntegrityMonitor Property Exception: " + msg); } if (prop.getProperty(IntegrityMonitorProperties.DB_USER)== null){ String msg = IntegrityMonitorProperties.DB_USER + " property is null"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorPropertiesException("IntegrityMonitor Property Exception: " + msg); } if (prop.getProperty(IntegrityMonitorProperties.DB_PWD)== null){ String msg = IntegrityMonitorProperties.DB_PWD + " property is null"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorPropertiesException("IntegrityMonitor Property Exception: " + msg); } @@ -1100,7 +1165,7 @@ public class IntegrityMonitor { try { monitorInterval = Integer.parseInt(prop.getProperty(IntegrityMonitorProperties.FP_MONITOR_INTERVAL).trim()); } catch (NumberFormatException e) { - logger.warn("Ignored invalid property: " + IntegrityMonitorProperties.FP_MONITOR_INTERVAL); + logger.warn("Ignored invalid property: {}", IntegrityMonitorProperties.FP_MONITOR_INTERVAL, e); } } @@ -1108,7 +1173,7 @@ public class IntegrityMonitor { try { failedCounterThreshold = Integer.parseInt(prop.getProperty(IntegrityMonitorProperties.FAILED_COUNTER_THRESHOLD).trim()); } catch (NumberFormatException e) { - logger.warn("Ignored invalid property: " + IntegrityMonitorProperties.FAILED_COUNTER_THRESHOLD); + logger.warn("Ignored invalid property: {}", IntegrityMonitorProperties.FAILED_COUNTER_THRESHOLD, e); } } @@ -1116,7 +1181,7 @@ public class IntegrityMonitor { try { testTransInterval = Integer.parseInt(prop.getProperty(IntegrityMonitorProperties.TEST_TRANS_INTERVAL).trim()); } catch (NumberFormatException e) { - logger.warn("Ignored invalid property: " + IntegrityMonitorProperties.TEST_TRANS_INTERVAL); + logger.warn("Ignored invalid property: {}", IntegrityMonitorProperties.TEST_TRANS_INTERVAL, e); } } @@ -1124,7 +1189,7 @@ public class IntegrityMonitor { try { writeFpcInterval = Integer.parseInt(prop.getProperty(IntegrityMonitorProperties.WRITE_FPC_INTERVAL).trim()); } catch (NumberFormatException e) { - logger.warn("Ignored invalid property: " + IntegrityMonitorProperties.WRITE_FPC_INTERVAL); + logger.warn("Ignored invalid property: {}", IntegrityMonitorProperties.WRITE_FPC_INTERVAL, e); } } @@ -1134,16 +1199,18 @@ public class IntegrityMonitor { if (prop.getProperty(IntegrityMonitorProperties.DEPENDENCY_GROUPS) != null) { try { dep_groups = prop.getProperty(IntegrityMonitorProperties.DEPENDENCY_GROUPS).split(";"); - logger.info("dependency groups property = " + Arrays.toString(dep_groups)); + if(logger.isDebugEnabled()){ + logger.debug("dependency groups property = {}", Arrays.toString(dep_groups)); + } } catch (Exception e) { - logger.warn("Ignored invalid property: " + IntegrityMonitorProperties.DEPENDENCY_GROUPS, e); + logger.warn("Ignored invalid property: {}", IntegrityMonitorProperties.DEPENDENCY_GROUPS, e); } } site_name = prop.getProperty(IntegrityMonitorProperties.SITE_NAME); if (site_name == null) { String msg = IntegrityMonitorProperties.SITE_NAME + " property is null"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorPropertiesException("IntegrityMonitor Property Exception: " + msg); }else{ site_name = site_name.trim(); @@ -1152,13 +1219,13 @@ public class IntegrityMonitor { node_type = prop.getProperty(IntegrityMonitorProperties.NODE_TYPE); if (node_type == null) { String msg = IntegrityMonitorProperties.NODE_TYPE + " property is null"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorPropertiesException("IntegrityMonitor Property Exception: " + msg); } else { node_type = node_type.trim(); if (!isNodeTypeEnum(node_type)) { String msg = IntegrityMonitorProperties.NODE_TYPE + " property " + node_type + " is invalid"; - logger.error(msg); + logger.error("{}", msg); throw new IntegrityMonitorPropertiesException("IntegrityMonitor Property Exception: " + msg); } } @@ -1180,7 +1247,7 @@ public class IntegrityMonitor { try { maxFpcUpdateInterval = Integer.parseInt(prop.getProperty(IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL).trim()); } catch (NumberFormatException e) { - logger.warn("Ignored invalid property: " + IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL); + logger.warn("Ignored invalid property: {}", IntegrityMonitorProperties.MAX_FPC_UPDATE_INTERVAL, e); } } @@ -1188,7 +1255,7 @@ public class IntegrityMonitor { try{ stateAuditIntervalMs = Long.parseLong(prop.getProperty(IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS)); }catch(NumberFormatException e){ - logger.warn("Ignored invalid property: " + IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS); + logger.warn("Ignored invalid property: {}", IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS, e); } } @@ -1196,7 +1263,7 @@ public class IntegrityMonitor { try{ refreshStateAuditIntervalMs = Long.parseLong(prop.getProperty(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS)); }catch(NumberFormatException e){ - logger.warn("Ignored invalid property: " + IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS); + logger.warn("Ignored invalid property: {}", IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS, e); } } @@ -1208,11 +1275,13 @@ public class IntegrityMonitor { try { validateProperties(newprop); } catch (IntegrityMonitorPropertiesException e) { - logger.debug(e); + logger.error("IntegrityMonitor threw exception.", e); } } else { - logger.info("Update integrity monitor properties not allowed"); + if(logger.isDebugEnabled()){ + logger.debug("Update integrity monitor properties not allowed"); + } } } @@ -1253,7 +1322,9 @@ public class IntegrityMonitor { // no forward progress missedCycles += 1; if (missedCycles >= failedCounterThreshold && !alarmExists) { - logger.info("Forward progress not detected for resource " + resourceName + ". Setting state to disable failed."); + if(logger.isDebugEnabled()){ + logger.debug("Forward progress not detected for resource {}. Setting state to disable failed.", resourceName); + } if(!(stateManager.getOpState()).equals(StateManagement.DISABLED)){ // Note: The refreshStateAudit will make redundant calls stateManager.disableFailed(); @@ -1266,7 +1337,9 @@ public class IntegrityMonitor { lastFpCounter = fpCounter; missedCycles = 0; // set op state to enabled - logger.debug("Forward progress detected for resource " + resourceName + ". Setting state to enable not failed."); + if(logger.isDebugEnabled()){ + logger.debug("Forward progress detected for resource {}. Setting state to enable not failed.", resourceName); + } if(!(stateManager.getOpState()).equals(StateManagement.ENABLED)){ // Note: The refreshStateAudit will make redundant calls stateManager.enableNotFailed(); @@ -1324,11 +1397,15 @@ public class IntegrityMonitor { //Make sure you are not getting a cached version em.refresh(fpe); long diffMs = date.getTime() - fpe.getLastUpdated().getTime(); - logger.debug("IntegrityMonitor.stateAudit(): diffMs = " + diffMs); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor.stateAudit(): diffMs = {}", diffMs); + } //Threshold for a stale entry long staleMs = maxFpcUpdateInterval * (long)1000; - logger.debug("IntegrityMonitor.stateAudit(): staleMs = " + staleMs); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor.stateAudit(): staleMs = {}", staleMs); + } if(diffMs > staleMs){ //ForwardProgress is stale. Disable it @@ -1349,20 +1426,19 @@ public class IntegrityMonitor { sme = (StateManagementEntity) smList.get(0); // refresh the object from DB in case cached data was returned em.refresh(sme); - logger.debug("IntegrityMonitor.stateAudit(): Found entry in StateManagementEntity table for Resource=" + sme.getResourceName()); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor.stateAudit(): Found entry in StateManagementEntity table for Resource={}", sme.getResourceName()); + } } else { String msg = "IntegrityMonitor.stateAudit(): " + fpe.getResourceName() + ": resource not found in state management entity database table"; - logger.debug(msg); - logger.error(msg); + logger.error("{}", msg); } synchronized(IMFLUSHLOCK){ et.commit(); } } catch (Exception e) { // log an error - String msg = "IntegrityMonitor.stateAudit(): " + fpe.getResourceName() + ": StateManagementEntity DB read failed with exception: "; - logger.error(msg, e); - logger.debug(msg); + logger.error("IntegrityMonitor.stateAudit(): {}: StateManagementEntity DB read failed with exception: ", fpe.getResourceName(), e); synchronized(IMFLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -1371,13 +1447,14 @@ public class IntegrityMonitor { } if(sme != null && !sme.getOpState().equals(StateManagement.DISABLED)){ - logger.debug("IntegrityMonitor.stateAudit(): Changing OpStat = disabled for " + sme.getResourceName()); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor.stateAudit(): Changing OpStat = disabled for {}", sme.getResourceName()); + } try { stateManager.disableFailed(sme.getResourceName()); } catch (Exception e) { String msg = "IntegrityMonitor.stateAudit(): Failed to disable " + sme.getResourceName(); - logger.debug(msg); - logger.error(msg, e); + logger.error("{}", msg, e); } } }// end if(diffMs > staleMs) @@ -1432,7 +1509,7 @@ public class IntegrityMonitor { try { writeFpc(); } catch (Exception e) { - logger.debug(e); + logger.error("IntegrityMonitor threw exception.", e); } } } @@ -1441,10 +1518,14 @@ public class IntegrityMonitor { * Execute a dependency health check periodically which also updates this resource's state. */ private void checkDependentHealth() { - logger.debug("checkDependentHealth: entry"); + if(logger.isDebugEnabled()){ + logger.debug("checkDependentHealth: entry"); + } long currTime = System.currentTimeMillis(); - logger.debug("checkDependentHealth currTime - lastDependencyCheckTime = " + (currTime - lastDependencyCheckTime)); + if(logger.isDebugEnabled()){ + logger.debug("checkDependentHealth currTime - lastDependencyCheckTime = {}", (currTime - lastDependencyCheckTime)); + } if ((currTime - lastDependencyCheckTime) > (1000 * IntegrityMonitorProperties.DEFAULT_TEST_INTERVAL)) { // execute dependency check and update this resource's state @@ -1467,32 +1548,44 @@ public class IntegrityMonitor { return; } synchronized(refreshStateAuditLock){ - logger.debug("refreshStateAudit: entry"); + if(logger.isDebugEnabled()){ + logger.debug("refreshStateAudit: entry"); + } Date now = new Date(); long nowMs = now.getTime(); long lastTimeMs = refreshStateAuditLastRunDate.getTime(); - logger.debug("refreshStateAudit: ms since last run = " + (nowMs - lastTimeMs)); + if(logger.isDebugEnabled()){ + logger.debug("refreshStateAudit: ms since last run = {}", (nowMs - lastTimeMs)); + } if((nowMs - lastTimeMs) > refreshStateAuditIntervalMs){ String adminState = stateManager.getAdminState(); - logger.debug("refreshStateAudit: adminState = " + adminState); + if(logger.isDebugEnabled()){ + logger.debug("refreshStateAudit: adminState = {}", adminState); + } if(adminState.equals(StateManagement.LOCKED)){ try { - logger.debug("refreshStateAudit: calling lock()"); + if(logger.isDebugEnabled()){ + logger.debug("refreshStateAudit: calling lock()"); + } stateManager.lock(); } catch (Exception e) { - logger.error("refreshStateAudit: caught unexpected exception from stateManager.lock(): " + e ); + logger.error("refreshStateAudit: caught unexpected exception from stateManager.lock(): ", e); } }else{//unlocked try { - logger.debug("refreshStateAudit: calling unlock()"); + if(logger.isDebugEnabled()){ + logger.debug("refreshStateAudit: calling unlock()"); + } stateManager.unlock();; } catch (Exception e) { - logger.error("refreshStateAudit: caught unexpected exception from stateManager.unlock(): " + e ); + logger.error("refreshStateAudit: caught unexpected exception from stateManager.unlock(): ", e); } } refreshStateAuditLastRunDate = new Date(); - logger.debug("refreshStateAudit: exit"); + if(logger.isDebugEnabled()){ + logger.debug("refreshStateAudit: exit"); + } } } } @@ -1521,13 +1614,17 @@ public class IntegrityMonitor { @Override public void run() { - logger.info("FPManager thread running"); + if(logger.isDebugEnabled()){ + logger.debug("FPManager thread running"); + } while (true) { try { Thread.sleep(CYCLE_INTERVAL_MILLIS); } catch (InterruptedException e) { // The 'sleep' call was interrupted - logger.debug(e); + if(logger.isDebugEnabled()){ + logger.debug("IntegrityMonitor threw exception.", e); + } Thread.currentThread().interrupt(); continue; } @@ -1570,7 +1667,7 @@ public class IntegrityMonitor { IntegrityMonitor.this.stateAudit(); } catch (Exception e) { - logger.debug("Ignore FPManager thread processing timer(s) exception: " + e); + logger.error("Ignore FPManager thread processing timer(s) exception: ", e); } } } diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java index f3f6958e..0d4bd029 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java @@ -22,6 +22,8 @@ package org.onap.policy.common.im; import java.util.Observable; import java.util.Observer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * This is implementing the Observer interface to make it specific for * state management. @@ -36,8 +38,7 @@ import java.util.Observer; */ -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; + /** * @@ -47,7 +48,7 @@ import org.onap.policy.common.logging.flexlogger.Logger; * */ public class StateChangeNotifier implements Observer { - private static final Logger logger = FlexLogger.getLogger(StateChangeNotifier.class); + private static final Logger logger = LoggerFactory.getLogger(StateChangeNotifier.class); //The observable class StateManagement stateManagement; @@ -63,7 +64,9 @@ public class StateChangeNotifier implements Observer { } public void handleStateChange() { - logger.debug("handleStateChange, message: " + this.message); + if(logger.isDebugEnabled()){ + logger.debug("handleStateChange, message: {}", this.message); + } } public StateManagement getStateManagement() { diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateElement.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateElement.java index 7870e6a3..e38971ea 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateElement.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateElement.java @@ -21,12 +21,12 @@ package org.onap.policy.common.im; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class StateElement { - private static final Logger logger = FlexLogger.getLogger(StateElement.class); - + private static final Logger logger = LoggerFactory.getLogger(StateElement.class); + String adminState = null; String opState = null; String availStatus = null; @@ -144,15 +144,20 @@ public class StateElement { public void displayStateElement() { - logger.debug("adminState=[" + getAdminState() + - "], opState=[" + getOpState() + - "], availStatus=[" + getAvailStatus() + - "], standbyStatus=[" + getStandbyStatus() + - "], actionName=[" + getActionName() + - "], endingAdminState=[" + getEndingAdminState() + - "], endingOpState=[" + getEndingOpState() + - "], endingAvailStatus=[" + getEndingAvailStatus() + - "], endingStandbyStatus=[" + getEndingStandbyStatus() + - "], exception=[" + getException() + "]"); + if(logger.isDebugEnabled()){ + logger.debug("adminState=[{}], opState=[{}], availStatus=[{}], standbyStatus=[{}], " + + "actionName=[{}], endingAdminState=[{}], endingOpState=[{}], " + + "endingAvailStatus=[{}], endingStandbyStatus=[{}], exception=[{}]", + getAdminState(), + getOpState(), + getAvailStatus(), + getStandbyStatus(), + getActionName(), + getEndingAdminState(), + getEndingOpState(), + getEndingAvailStatus(), + getEndingStandbyStatus(), + getException()); + } } } diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java index bcf910f7..cf78b775 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java @@ -33,9 +33,8 @@ import javax.persistence.Query; import org.onap.policy.common.im.jpa.StateManagementEntity; import org.onap.policy.common.im.StateElement; import org.onap.policy.common.im.StandbyStatusException; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * * StateManagement class handles all state changes per the Telecom standard X.731. @@ -45,7 +44,7 @@ import org.onap.policy.common.logging.flexlogger.Logger; * */ public class StateManagement extends Observable { - private static final Logger logger = FlexLogger.getLogger(StateManagement.class); + private static final Logger logger = LoggerFactory.getLogger(StateManagement.class); public static final String LOCKED = "locked"; public static final String UNLOCKED = "unlocked"; public static final String ENABLED = "enabled"; @@ -101,7 +100,9 @@ public class StateManagement extends Observable { */ public StateManagement(EntityManagerFactory emf, String resourceName) throws StateManagementException { - logger.debug("StateManagement: constructor, resourceName: " + resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: constructor, resourceName: {}", resourceName); + } em = emf.createEntityManager(); EntityTransaction et = em.getTransaction(); @@ -109,17 +110,23 @@ public class StateManagement extends Observable { et.begin(); } this.resourceName = resourceName; - logger.info("resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("resourceName = {}", this.resourceName); + } try { //Create a StateManagementEntity object - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); //persist the administrative state if (sm != null) { - logger.debug("Persist adminstrative state, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("Persist adminstrative state, resourceName = {}", this.resourceName); + } em.persist(sm); synchronized(FLUSHLOCK){ et.commit(); @@ -133,15 +140,17 @@ public class StateManagement extends Observable { //Load the StateTransition hash table st = new StateTransition(); - logger.debug("StateManagement: constructor end, resourceName: " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: constructor end, resourceName: {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement: constructor caught unexpected exception: " + ex); + logger.error("StateManagement: constructor caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); } } - throw new StateManagementException("StateManagement: Exception: " + ex.toString()); + throw new StateManagementException("StateManagement: Exception: " + ex.toString(), ex); } } @@ -154,8 +163,12 @@ public class StateManagement extends Observable { public void initializeState() throws StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK initializeState() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: initializeState() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK initializeState() operation for resourceName = {}\n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: initializeState() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ @@ -163,7 +176,9 @@ public class StateManagement extends Observable { } try { - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); // set state sm.setAdminState(sm.getAdminState()); //preserve the Admin state @@ -178,9 +193,11 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(ADMIN_STATE); - logger.debug("StateManagement: initializeState() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: initializeState() operation completed, resourceName = {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement.initializeState() caught unexpected exception: " + ex); + logger.error("StateManagement.initializeState() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -198,8 +215,12 @@ public class StateManagement extends Observable { public void lock() throws StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK lock() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: lock() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK lock() operation for resourceName = {}\n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: lock() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ @@ -207,7 +228,9 @@ public class StateManagement extends Observable { } try { - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), @@ -225,9 +248,11 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(ADMIN_STATE); - logger.debug("StateManagement: lock() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: lock() operation completed, resourceName = {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement.lock() caught unexpected exception: " + ex); + logger.error("StateManagement.lock() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -245,8 +270,12 @@ public class StateManagement extends Observable { public void unlock() throws StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK unlock() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: unlock() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK unlock() operation for resourceName = {}\n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: unlock() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ @@ -254,7 +283,9 @@ public class StateManagement extends Observable { } try { - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), UNLOCK); @@ -271,9 +302,11 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(ADMIN_STATE); - logger.debug("StateManagement: unlock() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: unlock() operation completed, resourceName = {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement.unlock() caught unexpected exception: " + ex); + logger.error("StateManagement.unlock() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -292,8 +325,12 @@ public class StateManagement extends Observable { public void enableNotFailed() throws StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK enabledNotFailed() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: enableNotFailed() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK enabledNotFailed() operation for resourceName = {}\n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: enableNotFailed() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ @@ -301,7 +338,9 @@ public class StateManagement extends Observable { } try { - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), ENABLE_NOT_FAILED); @@ -318,9 +357,11 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(OPERATION_STATE); - logger.debug("StateManagement enableNotFailed() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement enableNotFailed() operation completed, resourceName = {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement.enableNotFailed() caught unexpected exception: " + ex); + logger.error("StateManagement.enableNotFailed() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -338,15 +379,21 @@ public class StateManagement extends Observable { public void disableFailed() throws StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK disabledFailed() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: disableFailed() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK disabledFailed() operation for resourceName = {}\n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: disableFailed() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ et.begin(); } try { - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), DISABLE_FAILED); @@ -363,9 +410,11 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(OPERATION_STATE); - logger.debug("StateManagement: disableFailed() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: disableFailed() operation completed, resourceName = {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement.disableFailed() caught unexpected exception: " + ex); + logger.error("StateManagement.disableFailed() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -387,17 +436,23 @@ public class StateManagement extends Observable { logger.error("\nStateManagement: SYNCLOCK disableFailed(otherResourceName) operation: resourceName is NULL.\n"); return; } - logger.debug("\nStateManagement: SYNCLOCK disabledFailed(otherResourceName) operation for resourceName = " - + otherResourceName + "\n"); - logger.debug("StateManagement: disableFailed(otherResourceName) operation started, resourceName = " - + otherResourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK disabledFailed(otherResourceName) operation for resourceName = {}\n", + otherResourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: disableFailed(otherResourceName) operation started, resourceName = {}", + otherResourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ et.begin(); } try { - logger.debug("findStateManagementEntity for " + otherResourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for " + otherResourceName); + } StateManagementEntity sm = findStateManagementEntity(em, otherResourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), DISABLE_FAILED); @@ -414,10 +469,12 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(OPERATION_STATE); - logger.debug("StateManagement: disableFailed(otherResourceName) operation completed, resourceName = " - + otherResourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: disableFailed(otherResourceName) operation completed, resourceName = {}", + otherResourceName); + } } catch(Exception ex) { - logger.error("StateManagement.disableFailed(otherResourceName) caught unexpected exception: " + ex); + logger.error("StateManagement.disableFailed(otherResourceName) caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -435,8 +492,12 @@ public class StateManagement extends Observable { public void disableDependency() throws StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK disableDependency() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: disableDependency() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK disableDependency() operation for resourceName = {}\n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: disableDependency() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ @@ -444,7 +505,9 @@ public class StateManagement extends Observable { } try { - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), DISABLE_DEPENDENCY); @@ -461,9 +524,11 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(OPERATION_STATE); - logger.debug("StateManagement: disableDependency() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: disableDependency() operation completed, resourceName = {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement.disableDependency() caught unexpected exception: " + ex); + logger.error("StateManagement.disableDependency() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -482,8 +547,12 @@ public class StateManagement extends Observable { public void enableNoDependency() throws StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK enableNoDependency() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: enableNoDependency() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK enableNoDependency() operation for resourceName = {}\n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: enableNoDependency() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ @@ -491,7 +560,9 @@ public class StateManagement extends Observable { } try { - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), ENABLE_NO_DEPENDENCY); @@ -508,9 +579,11 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(OPERATION_STATE); - logger.debug("StateManagement: enableNoDependency() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: enableNoDependency() operation completed, resourceName = {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement.enableNoDependency() caught unexpected exception: " + ex); + logger.error("StateManagement.enableNoDependency() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -529,8 +602,12 @@ public class StateManagement extends Observable { public void promote() throws StandbyStatusException, StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK promote() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: promote() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK promote() operation for resourceName = {}\n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: promote() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ @@ -540,7 +617,9 @@ public class StateManagement extends Observable { StateManagementEntity sm; try{ - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } sm = findStateManagementEntity(em, this.resourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), PROMOTE); @@ -559,7 +638,7 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(STANDBY_STATUS); }catch(Exception ex){ - logger.error("StateManagement.promote() caught unexpected exception: " + ex); + logger.error("StateManagement.promote() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -568,7 +647,9 @@ public class StateManagement extends Observable { throw new StateManagementException("StateManagement.promote() Exception: " + ex); } - logger.debug("StateManagement: promote() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: promote() operation completed, resourceName = ", this.resourceName); + } if (sm.getStandbyStatus().equals(StateManagement.COLD_STANDBY)){ String msg = "Failure to promote " + this.resourceName + " StandbyStatus = " + StateManagement.COLD_STANDBY; throw new StandbyStatusException(msg); @@ -583,8 +664,12 @@ public class StateManagement extends Observable { public void demote() throws StateManagementException { synchronized (SYNCLOCK){ - logger.debug("\nStateManagement: SYNCLOCK demote() operation for resourceName = " + this.resourceName + "\n"); - logger.debug("StateManagement: demote() operation started, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK demote() operation for resourceName = \n", this.resourceName); + } + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: demote() operation started, resourceName = {}", this.resourceName); + } EntityTransaction et = em.getTransaction(); if(!et.isActive()){ @@ -592,7 +677,9 @@ public class StateManagement extends Observable { } try { - logger.debug("findStateManagementEntity for " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("findStateManagementEntity for {}", this.resourceName); + } StateManagementEntity sm = findStateManagementEntity(em, this.resourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), DEMOTE); @@ -609,9 +696,11 @@ public class StateManagement extends Observable { setChanged(); notifyObservers(STANDBY_STATUS); - logger.debug("StateManagement: demote() operation completed, resourceName = " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: demote() operation completed, resourceName = {}", this.resourceName); + } } catch(Exception ex) { - logger.error("StateManagement.demote() caught unexpected exception: " + ex); + logger.error("StateManagement.demote() caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -638,7 +727,9 @@ public class StateManagement extends Observable { logger.error("\nStateManagement: SYNCLOCK demote(otherResourceName) operation: resourceName is NULL.\n"); return; } - logger.debug("\nStateManagement: SYNCLOCK demote(otherResourceName) operation for resourceName = " + otherResourceName + "\n"); + if(logger.isDebugEnabled()){ + logger.debug("\nStateManagement: SYNCLOCK demote(otherResourceName) operation for resourceName = {}\n", otherResourceName); + } EntityTransaction et = em.getTransaction(); @@ -647,7 +738,9 @@ public class StateManagement extends Observable { } try { - logger.debug("StateManagement: SYNCLOCK demote(otherResourceName) findStateManagementEntity for " + otherResourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: SYNCLOCK demote(otherResourceName) findStateManagementEntity for {}", otherResourceName); + } StateManagementEntity sm = findStateManagementEntity(em, otherResourceName); StateElement stateElement = st.getEndingState(sm.getAdminState(), sm.getOpState(), sm.getAvailStatus(), sm.getStandbyStatus(), DEMOTE); @@ -663,9 +756,11 @@ public class StateManagement extends Observable { } //We don't notify observers because this is assumed to be a remote resource - logger.debug("StateManagement: demote(otherResourceName) operation completed, resourceName = " + otherResourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: demote(otherResourceName) operation completed, resourceName = {}", otherResourceName); + } } catch(Exception ex) { - logger.error("StateManagement.demote(otherResourceName) caught unexpected exception: " + ex); + logger.error("StateManagement.demote(otherResourceName) caught unexpected exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -681,7 +776,9 @@ public class StateManagement extends Observable { */ public String getAdminState() { - logger.debug("StateManagement(6/1/16): getAdminState for resourceName " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement(6/1/16): getAdminState for resourceName {}", this.resourceName); + } try { Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource"); @@ -701,7 +798,7 @@ public String getAdminState() this.adminState = null; } } catch(Exception ex) { - logger.error("StateManagement: getAdminState exception: " + ex); + logger.error("StateManagement: getAdminState exception: {}", ex.toString(), ex); } return this.adminState; @@ -712,7 +809,9 @@ public String getAdminState() */ public String getOpState() { - logger.debug("StateManagement(6/1/16): getOpState for resourceName " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement(6/1/16): getOpState for resourceName {}", this.resourceName); + } try { Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource"); @@ -732,7 +831,7 @@ public String getOpState() this.opState = null; } } catch(Exception ex) { - logger.error("StateManagement: getOpState exception: " + ex); + logger.error("StateManagement: getOpState exception: {}", ex.toString(), ex); } return this.opState; @@ -743,7 +842,9 @@ public String getOpState() */ public String getAvailStatus() { - logger.debug("StateManagement(6/1/16): getAvailStatus for resourceName " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement(6/1/16): getAvailStatus for resourceName {}", this.resourceName); + } try { Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource"); @@ -763,7 +864,7 @@ public String getOpState() this.availStatus = null; } } catch(Exception ex) { - logger.error("StateManagement: getAvailStatus exception: ", ex); + logger.error("StateManagement: getAvailStatus exception: {}", ex.toString(), ex); } return this.availStatus; @@ -774,7 +875,9 @@ public String getOpState() */ public String getStandbyStatus() { - logger.debug("StateManagement(6/1/16): getStandbyStatus for resourceName " + this.resourceName); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement(6/1/16): getStandbyStatus for resourceName {}", this.resourceName); + } try { Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource"); @@ -794,7 +897,7 @@ public String getOpState() this.standbyStatus = null; } } catch(Exception ex) { - logger.error("StateManagement: getStandbyStatus exception: " + ex); + logger.error("StateManagement: getStandbyStatus exception: {}", ex.toString(), ex); } return this.standbyStatus; @@ -808,7 +911,9 @@ public String getOpState() */ private static StateManagementEntity findStateManagementEntity(EntityManager em, String otherResourceName) { - logger.debug("StateManagementEntity: findStateManagementEntity: Entry"); + if(logger.isDebugEnabled()){ + logger.debug("StateManagementEntity: findStateManagementEntity: Entry"); + } StateManagementEntity stateManagementEntity = null; try { Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource"); @@ -835,7 +940,7 @@ public String getOpState() stateManagementEntity.setStandbyStatus(NULL_VALUE); // default } } catch(Exception ex) { - logger.error("findStateManagementEntity exception: " + ex); + logger.error("findStateManagementEntity exception: {}", ex.toString(), ex); } return stateManagementEntity; } @@ -848,8 +953,7 @@ public String getOpState() public String getStandbyStatus(String otherResourceName) { if (logger.isDebugEnabled()) { - logger.debug("StateManagement: getStandbyStatus: Entering, resourceName='" - + otherResourceName + "'"); + logger.debug("StateManagement: getStandbyStatus: Entering, resourceName='{}'", otherResourceName); } String tempStandbyStatus = null; @@ -874,19 +978,16 @@ public String getOpState() em.refresh(stateManagementEntity); tempStandbyStatus = stateManagementEntity.getStandbyStatus(); if (logger.isDebugEnabled()) { - logger.debug("getStandbyStatus: resourceName =" + otherResourceName - + " has standbyStatus=" + tempStandbyStatus); + logger.debug("getStandbyStatus: resourceName ={} has standbyStatus={}", otherResourceName, tempStandbyStatus); } } else { - logger.error("getStandbyStatus: resourceName =" + otherResourceName - + " not found in statemanagemententity table"); + logger.error("getStandbyStatus: resourceName ={} not found in statemanagemententity table", otherResourceName); } synchronized(FLUSHLOCK){ et.commit(); } } catch (Exception e) { - logger.error("getStandbyStatus: Caught Exception attempting to get statemanagemententity record, message='" - + e.getMessage() + "'", e); + logger.error("getStandbyStatus: Caught Exception attempting to get statemanagemententity record, message='{}'", e.getMessage(), e); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -894,8 +995,7 @@ public String getOpState() } } if (logger.isDebugEnabled()) { - logger.debug("getStandbyStatus: Returning standbyStatus=" - + tempStandbyStatus); + logger.debug("getStandbyStatus: Returning standbyStatus={}", tempStandbyStatus); } return tempStandbyStatus; @@ -906,7 +1006,9 @@ public String getOpState() */ public void deleteAllStateManagementEntities() { - logger.info("StateManagement: deleteAllStateManagementEntities: Entering"); + if(logger.isDebugEnabled()){ + logger.debug("StateManagement: deleteAllStateManagementEntities: Entering"); + } /* * Start transaction @@ -922,20 +1024,22 @@ public String getOpState() @SuppressWarnings("unchecked") List stateManagementEntityList = stateManagementEntityListQuery.setLockMode( LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList(); - logger.info("deleteAllStateManagementEntities: Deleting " - + stateManagementEntityList.size() - + " StateManagementEntity records"); + if(logger.isDebugEnabled()){ + logger.debug("deleteAllStateManagementEntities: Deleting {} StateManagementEntity records", stateManagementEntityList.size()); + } for (StateManagementEntity stateManagementEntity : stateManagementEntityList) { - logger.info("deleteAllStateManagementEntities: Deleting statemanagemententity with resourceName=" - + stateManagementEntity.getResourceName() + " and standbyStatus=" - + stateManagementEntity.getStandbyStatus()); + if(logger.isDebugEnabled()){ + logger.debug("deleteAllStateManagementEntities: Deleting statemanagemententity with resourceName={} and standbyStatus={}", + stateManagementEntity.getResourceName(), + stateManagementEntity.getStandbyStatus()); + } em.remove(stateManagementEntity); } synchronized(FLUSHLOCK){ et.commit(); } }catch(Exception ex){ - logger.error("StateManagement.deleteAllStateManagementEntities() caught Exception: " + ex); + logger.error("StateManagement.deleteAllStateManagementEntities() caught Exception: ", ex); synchronized(FLUSHLOCK){ if(et.isActive()){ et.rollback(); @@ -943,7 +1047,7 @@ public String getOpState() } } if(logger.isDebugEnabled()){ - logger.info("deleteAllStateManagementEntities: Exiting"); + logger.debug("deleteAllStateManagementEntities: Exiting"); } } diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java index 03f6f4e3..3f690187 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java @@ -24,15 +24,15 @@ import java.util.*; import org.onap.policy.common.im.StateElement; -import org.onap.policy.common.im.StateManagement; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; +import org.onap.policy.common.im.StateManagement; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The StateTransition class coordinates all state transitions. */ public class StateTransition { - private static final Logger logger = FlexLogger.getLogger(StateTransition.class); + private static final Logger logger = LoggerFactory.getLogger(StateTransition.class); public static final String ADMIN_STATE = "adminState"; public static final String OPERATION_STATE = "opState"; @@ -48,14 +48,18 @@ public class StateTransition { */ public StateTransition() throws StateTransitionException { - logger.debug("StateTransition constructor"); + if(logger.isDebugEnabled()){ + logger.debug("StateTransition constructor"); + } try { - logger.debug("Load StateTable started"); + if(logger.isDebugEnabled()){ + logger.debug("Load StateTable started"); + } setupStateTable(); } catch(Exception ex) { - logger.debug(ex); + logger.error("StateTransition threw exception.", ex); throw new StateTransitionException("StateTransition Exception: " + ex.toString()); } } @@ -73,9 +77,17 @@ public class StateTransition { public StateElement getEndingState(String adminState, String opState, String availStatus, String standbyStatus, String actionName) throws StateTransitionException { - logger.info("getEndingState"); - logger.info("adminState=[" + adminState + "], opState=[" + opState + "], availStatus=[" + - availStatus + "], standbyStatus=[" + standbyStatus + "], actionName=[" + actionName + "]"); + if(logger.isDebugEnabled()){ + logger.debug("getEndingState"); + } + if(logger.isDebugEnabled()){ + logger.debug("adminState=[{}], opState=[{}], availStatus=[{}], standbyStatus=[{}], actionName[{}]", + adminState, + opState, + availStatus, + standbyStatus, + actionName); + } if(availStatus==null){ availStatus="null"; } @@ -124,7 +136,9 @@ public class StateTransition { availStatus2 = availStatus.replace(",", "."); } String key = adminState + "," + opState + "," + availStatus2 + "," + standbyStatus + "," + actionName; - logger.debug("Ending State search key: " + key); + if(logger.isDebugEnabled()){ + logger.debug("Ending State search key: {}", key); + } String value = StateTable.get(key); if (value != null) { @@ -143,17 +157,17 @@ public class StateTransition { stateElement.displayStateElement(); } catch(Exception ex) { - logger.error("String split exception: " + ex); + logger.error("String split exception: {}", ex.toString(), ex); } } else { String msg = "Ending state not found, adminState=[" + adminState + "], opState=[" + opState + "], availStatus=[" + availStatus + "], standbyStatus=[" + standbyStatus + "], actionName=[" + actionName + "]"; - logger.error(msg); + logger.error("{}", msg); throw new StateTransitionException(msg); } } catch (Exception ex) { - logger.debug(ex); + logger.error("StateTransition threw exception.", ex); throw new StateTransitionException("Exception: " + ex.toString() + ", adminState=[" + adminState + "], opState=[" + opState + "], availStatus=[" + availStatus + "], standbyStatus=[" + standbyStatus + "], actionName=[" + actionName + "]"); } @@ -720,7 +734,10 @@ public class StateTransition { while(iter.hasNext()) { Map.Entry me = (Map.Entry)iter.next(); - logger.debug((String)me.getKey() + ((String)me.getValue()).replace(".", ",")); + String key = (String)me.getKey() + ((String)me.getValue()).replace(".", ","); + if(logger.isDebugEnabled()){ + logger.debug("{}", key); + } } } } diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java index 8ffb1b74..c9b1c1df 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java @@ -32,7 +32,8 @@ import javax.management.MalformedObjectNameException; import javax.management.NotCompliantMBeanException; import javax.management.ObjectName; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.onap.policy.common.im.IntegrityMonitor; import org.onap.policy.common.im.StateManagement; @@ -41,7 +42,7 @@ import org.onap.policy.common.im.StateManagement; * Base class for component MBeans. */ public class ComponentAdmin implements ComponentAdminMBean { - private static final Logger logger = Logger.getLogger(ComponentAdmin.class.getName()); + private static final Logger logger = LoggerFactory.getLogger(ComponentAdmin.class.getName()); private final String name; private MBeanServer registeredMBeanServer; @@ -69,7 +70,9 @@ public class ComponentAdmin implements ComponentAdminMBean { try { register(); } catch (Exception e) { - logger.info("Failed to register ComponentAdmin MBean"); + if(logger.isDebugEnabled()){ + logger.debug("Failed to register ComponentAdmin MBean"); + } throw e; } } @@ -87,7 +90,9 @@ public class ComponentAdmin implements ComponentAdminMBean { InstanceAlreadyExistsException, NotCompliantMBeanException { - logger.info("Registering " + name + " MBean"); + if(logger.isDebugEnabled()){ + logger.debug("Registering {} MBean", name); + } MBeanServer mbeanServer = findMBeanServer(); @@ -99,8 +104,9 @@ public class ComponentAdmin implements ComponentAdminMBean { ObjectName objectName = new ObjectName(name); if (mbeanServer.isRegistered(objectName)) { - logger.info("Unregistering a previously registered " - + name + " MBean"); + if(logger.isDebugEnabled()){ + logger.debug("Unregistering a previously registered {} MBean", name); + } mbeanServer.unregisterMBean(objectName); } @@ -186,7 +192,9 @@ public class ComponentAdmin implements ComponentAdminMBean { @Override public void test() throws Exception { // Call evaluateSanity on IntegrityMonitor to run the test - logger.info("test() called..."); + if(logger.isDebugEnabled()){ + logger.debug("test() called..."); + } if (integrityMonitor != null) { integrityMonitor.evaluateSanity(); } @@ -199,7 +207,9 @@ public class ComponentAdmin implements ComponentAdminMBean { @Override public void lock() throws Exception { - logger.info("lock() called..."); + if(logger.isDebugEnabled()){ + logger.debug("lock() called..."); + } if (stateManager != null) { stateManager.lock(); } @@ -211,7 +221,9 @@ public class ComponentAdmin implements ComponentAdminMBean { @Override public void unlock() throws Exception { - logger.info("unlock() called..."); + if(logger.isDebugEnabled()){ + logger.debug("unlock() called..."); + } if (stateManager != null) { stateManager.unlock(); } diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java index 743fd26a..2fcc1c01 100644 --- a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java +++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java @@ -46,8 +46,8 @@ import org.onap.policy.common.im.StateManagement; import org.onap.policy.common.im.jpa.ForwardProgressEntity; import org.onap.policy.common.im.jpa.ResourceRegistrationEntity; import org.onap.policy.common.im.jpa.StateManagementEntity; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * All JUnits are designed to run in the local development environment @@ -55,7 +55,7 @@ import org.onap.policy.common.logging.flexlogger.Logger; * tasks. */ public class IntegrityMonitorTest { - private static Logger logger = FlexLogger.getLogger(IntegrityMonitorTest.class); + private static Logger logger = LoggerFactory.getLogger(IntegrityMonitorTest.class); private static Properties myProp; private static EntityManagerFactory emf; private static EntityManager em; @@ -133,7 +133,7 @@ public class IntegrityMonitorTest { * Unlock restart */ public void testSanityJmx() throws Exception { - System.out.println("\nIntegrityMonitorTest: Entering testSanityJmx\n\n"); + logger.debug("\nIntegrityMonitorTest: Entering testSanityJmx\n\n"); String dependent = "group1_logparser"; @@ -143,12 +143,11 @@ public class IntegrityMonitorTest { IntegrityMonitor.updateProperties(myProp); IntegrityMonitor im = IntegrityMonitor.getInstance(resourceName, myProp); - System.out.println("\n\ntestSanityJmx starting im state" - + "\nAdminState = " + im.getStateManager().getAdminState() - + "\nOpState() = " + im.getStateManager().getOpState() - + "\nAvailStatus = " + im.getStateManager().getAvailStatus() - + "\nStandbyStatus = " + im.getStateManager().getStandbyStatus() - + "\n"); + logger.debug("\n\ntestSanityJmx starting im state \nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + im.getStateManager().getAdminState(), + im.getStateManager().getOpState(), + im.getStateManager().getAvailStatus(), + im.getStateManager().getStandbyStatus()); // add an entry to Resource registration table in the DB for the dependent resource @@ -162,7 +161,7 @@ public class IntegrityMonitorTest { ResourceRegistrationEntity rrx = null; if(rrList.isEmpty()){ // register resource by adding entry to table in DB - System.out.println("Adding resource " + dependent + " to ResourceRegistration table"); + logger.debug("Adding resource {} to ResourceRegistration table", dependent); rrx = new ResourceRegistrationEntity(); // set columns in entry rrx.setResourceName(dependent); @@ -183,7 +182,7 @@ public class IntegrityMonitorTest { try { im.evaluateSanity(); } catch (Exception e) { - System.out.println("evaluateSanity exception: " + e); + logger.error("evaluateSanity exception: ", e); sanityPass = false; } assertFalse(sanityPass); // expect sanity test to fail @@ -193,32 +192,31 @@ public class IntegrityMonitorTest { myProp.put(IntegrityMonitorProperties.TEST_VIA_JMX, "false"); IntegrityMonitor.updateProperties(myProp); - System.out.println("\ntestSantityJmx ending properties: " + myProp); + logger.debug("\ntestSantityJmx ending properties: {}", myProp); //We know at this point that the IM is disable-dependency. We want to be //sure it will recover from this condition since the properties were //updated. - System.out.println("\n\ntestSanityJmx ending im state" - + "\nAdminState = " + im.getStateManager().getAdminState() - + "\nOpState() = " + im.getStateManager().getOpState() - + "\nAvailStatus = " + im.getStateManager().getAvailStatus() - + "\nStandbyStatus = " + im.getStateManager().getStandbyStatus() - + "\n"); + logger.debug("\n\ntestSanityJmx ending im state\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + im.getStateManager().getAdminState(), + im.getStateManager().getOpState(), + im.getStateManager().getAvailStatus(), + im.getStateManager().getStandbyStatus()); //Destroy the instance - System.out.println("\ntestSanityJmx restarting the IntegrityMonitor"); + logger.debug("\ntestSanityJmx restarting the IntegrityMonitor"); IntegrityMonitor.deleteInstance(); //Create a new instance. It should recover from the disabled-dependency condition im = IntegrityMonitor.getInstance(resourceName, myProp); - System.out.println("\n\ntestSanityJmx state after creating new im" - + "\nAdminState = " + im.getStateManager().getAdminState() - + "\nOpState() = " + im.getStateManager().getOpState() - + "\nAvailStatus = " + im.getStateManager().getAvailStatus() - + "\nStandbyStatus = " + im.getStateManager().getStandbyStatus() - + "\n"); + logger.debug("\n\ntestSanityJmx state after creating new im\n"+ + "AdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + im.getStateManager().getAdminState(), + im.getStateManager().getOpState(), + im.getStateManager().getAvailStatus(), + im.getStateManager().getStandbyStatus()); //Verify the state assertEquals(im.getStateManager().getAdminState(), StateManagement.UNLOCKED); @@ -231,60 +229,59 @@ public class IntegrityMonitorTest { // Verify lock state sm.lock(); - System.out.println("\n\nsm.lock()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\nsm.lock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); assert(sm.getAdminState().equals(StateManagement.LOCKED)); //Verify lock persists across a restart //Destroy the instance - System.out.println("\ntestSanityJmx restarting the IntegrityMonitor"); + logger.debug("\ntestSanityJmx restarting the IntegrityMonitor"); IntegrityMonitor.deleteInstance(); //Create a new instance. It should come up with the admin state locked im = IntegrityMonitor.getInstance(resourceName, myProp); sm = im.getStateManager(); - System.out.println("\n\ntestSanityJmx restart with AdminState=locked" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\ntestSanityJmx restart with AdminState=locked"+ + "\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); assert(sm.getAdminState().equals(StateManagement.LOCKED)); // Verify unlock sm.unlock(); - System.out.println("\n\ntestSanityJmx sm.unlock" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\ntestSanityJmx sm.unlock\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); assert(sm.getAdminState().equals(StateManagement.UNLOCKED)); // Verify unlock restart //Destroy the instance - System.out.println("\ntestSanityJmx restarting the IntegrityMonitor"); + logger.debug("\ntestSanityJmx restarting the IntegrityMonitor"); IntegrityMonitor.deleteInstance(); //Create a new instance. It should come up with the admin state locked im = IntegrityMonitor.getInstance(resourceName, myProp); sm = im.getStateManager(); - System.out.println("\n\ntestSanityJmx restart with AdminState=unlocked" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\ntestSanityJmx restart with AdminState=unlocked\n" + + "AdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getAdminState().equals(StateManagement.UNLOCKED)); - System.out.println("\n\ntestSanityJmx: Exit\n\n"); + logger.debug("\n\ntestSanityJmx: Exit\n\n"); } public void testIM() throws Exception { - System.out.println("\nIntegrityMonitorTest: Entering testIM\n\n"); + logger.debug("\nIntegrityMonitorTest: Entering testIM\n\n"); // parameters are passed via a properties file @@ -295,29 +292,27 @@ public class IntegrityMonitorTest { */ IntegrityMonitor im = IntegrityMonitor.getInstance(resourceName, myProp); - System.out.println("\n\nim before sleep" - + "\nAdminState = " + im.getStateManager().getAdminState() - + "\nOpState() = " + im.getStateManager().getOpState() - + "\nAvailStatus = " + im.getStateManager().getAvailStatus() - + "\nStandbyStatus = " + im.getStateManager().getStandbyStatus() - + "\n"); + logger.debug("\n\nim before sleep\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + im.getStateManager().getAdminState(), + im.getStateManager().getOpState(), + im.getStateManager().getAvailStatus(), + im.getStateManager().getStandbyStatus()); // wait for test transactions to fire and increment fpc Thread.sleep(20000); - System.out.println("\n\nim after sleep" - + "\nAdminState = " + im.getStateManager().getAdminState() - + "\nOpState() = " + im.getStateManager().getOpState() - + "\nAvailStatus = " + im.getStateManager().getAvailStatus() - + "\nStandbyStatus = " + im.getStateManager().getStandbyStatus() - + "\n"); + logger.debug("\n\nim after sleep\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + im.getStateManager().getAdminState(), + im.getStateManager().getOpState(), + im.getStateManager().getAvailStatus(), + im.getStateManager().getStandbyStatus()); // test evaluate sanity boolean sanityPass = true; try { im.evaluateSanity(); } catch (Exception e) { - System.out.println("evaluateSanity exception: " + e); + logger.error("evaluateSanity exception: ", e); sanityPass = false; } assertTrue(sanityPass); // expect sanity test to pass @@ -327,7 +322,7 @@ public class IntegrityMonitorTest { try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(transPass); @@ -336,12 +331,12 @@ public class IntegrityMonitorTest { StateManagement sm = im.getStateManager(); sm.lock(); - System.out.println("\n\nsm.lock()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\nsm.lock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getAdminState().equals(StateManagement.LOCKED)); //test startTransaction. It should fail since it is locked @@ -349,18 +344,17 @@ public class IntegrityMonitorTest { try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(!transPass); //expect it to fail sm.unlock(); - System.out.println("\n\nsm.unlock()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\nsm.unlock()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); assert(sm.getAdminState().equals(StateManagement.UNLOCKED)); //test startTransaction. It should succeed @@ -368,18 +362,18 @@ public class IntegrityMonitorTest { try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(transPass); //expect it to succeed sm.disableDependency(); - System.out.println("\n\nsm.disableDependency()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\nsm.disableDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getOpState().equals(StateManagement.DISABLED)); assert(sm.getAvailStatus().equals(StateManagement.DEPENDENCY)); @@ -388,18 +382,18 @@ public class IntegrityMonitorTest { try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(transPass); //expect it to succeed sm.enableNoDependency(); - System.out.println("\n\nsm.enableNoDependency()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + + logger.debug("\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); assert(sm.getOpState().equals(StateManagement.ENABLED)); //test startTransaction. It should succeed since standby status is null and unlocked transPass = true; @@ -413,12 +407,12 @@ public class IntegrityMonitorTest { sm.disableFailed(); - System.out.println("\n\nsm.disableFailed()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\nsm.disableFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getOpState().equals(StateManagement.DISABLED)); assert(sm.getAvailStatus().equals(StateManagement.FAILED)); //test startTransaction. It should succeed since standby status is null and unlocked @@ -432,30 +426,32 @@ public class IntegrityMonitorTest { assertTrue(transPass); //expect it to succeed sm.enableNotFailed(); - System.out.println("\n\nsm.enabledNotFailed()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + + logger.debug("\n\nsm.enabledNotFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getOpState().equals(StateManagement.ENABLED)); //test startTransaction. It should succeed since standby status is null and unlocked transPass = true; try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(transPass); //expect it to succeed sm.demote(); - System.out.println("\n\nsm.demote()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + + logger.debug("\n\nsm.demote()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getStandbyStatus().equals(StateManagement.HOT_STANDBY)); //test startTransaction. It should fail since it is standby @@ -463,18 +459,19 @@ public class IntegrityMonitorTest { try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(!transPass); //expect it to fail sm.promote(); - System.out.println("\n\nsm.promote()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + + logger.debug("\n\nsm.promote()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getStandbyStatus().equals(StateManagement.PROVIDING_SERVICE)); //test startTransaction. It should succeed since it is providing service @@ -482,7 +479,7 @@ public class IntegrityMonitorTest { try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(transPass); //expect it to succeed @@ -491,12 +488,13 @@ public class IntegrityMonitorTest { //Test the multi-valued availability status sm.disableDependency(); sm.disableFailed(); - System.out.println("\n\nsm.disableDependency(), sm.disableFailed" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + + logger.debug("\n\nsm.disableDependency(), sm.disableFailed\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getAvailStatus().equals(StateManagement.DEPENDENCY_FAILED)); //Test startTransaction. Should fail since standby status is cold standby @@ -504,72 +502,72 @@ public class IntegrityMonitorTest { try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(!transPass); //expect it to fail sm.enableNoDependency(); - System.out.println("\n\nsm.enableNoDependency()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + + logger.debug("\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); assert(sm.getAvailStatus().equals(StateManagement.FAILED)); //Test startTransaction. Should fail since standby status is cold standby transPass = true; try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(!transPass); //expect it to fail sm.disableDependency(); sm.enableNotFailed(); - System.out.println("\n\nsm.disableDependency(),sm.enableNotFailed()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + + logger.debug("\n\nsm.disableDependency(),sm.enableNotFailed()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); + assert(sm.getAvailStatus().equals(StateManagement.DEPENDENCY)); //Test startTransaction. Should fail since standby status is cold standby transPass = true; try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(!transPass); //expect it to fail sm.enableNoDependency(); - System.out.println("\n\nsm.enableNoDependency()" - + "\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); + logger.debug("\n\nsm.enableNoDependency()\nAdminState = {}\nOpState() = {}\nAvailStatus = {}\nStandbyStatus = {}\n", + sm.getAdminState(), + sm.getOpState(), + sm.getAvailStatus(), + sm.getStandbyStatus()); assert(sm.getOpState().equals(StateManagement.ENABLED)); //test startTransaction. It should fail since standby status is hot standby transPass = true; try{ im.startTransaction(); } catch (Exception e){ - System.out.println("startTransaction exception: " + e); + logger.error("startTransaction exception: ", e); transPass = false; } assertTrue(!transPass); //expect it to fail - System.out.println("\n\ntestIM: Exit\n\n"); + logger.debug("\n\ntestIM: Exit\n\n"); } public void testSanityState() throws Exception { - System.out.println("\nIntegrityMonitorTest: Entering testSanityState\n\n"); + logger.debug("\nIntegrityMonitorTest: Entering testSanityState\n\n"); // parameters are passed via a properties file myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "group1_dep1,group1_dep2; group2_dep1"); @@ -605,7 +603,7 @@ public class IntegrityMonitorTest { try { im.evaluateSanity(); } catch (Exception e) { - System.out.println("evaluateSanity exception: " + e); + logger.error("evaluateSanity exception: ", e); sanityPass = false; } assertFalse(sanityPass); // expect sanity test to fail @@ -626,7 +624,7 @@ public class IntegrityMonitorTest { em.flush(); et.commit(); - System.out.println("\n\ntestSanityState: Exit\n\n"); + logger.debug("\n\ntestSanityState: Exit\n\n"); } public void testRefreshStateAudit() throws Exception { @@ -668,12 +666,13 @@ public class IntegrityMonitorTest { sme = (StateManagementEntity) resourceList.get(0); em.refresh(sme); - logger.debug("??? -- Retrieve StateManagementEntity from database --" - + "\nsme.getResourceName() = " + sme.getResourceName() - + "\nsme.getAdminState() = " + sme.getAdminState() - + "\nsme.getOpState() = " + sme.getOpState() - + "\nsme.getAvailStatus() = " + sme.getAvailStatus() - + "\nsme.getStandbyStatus() = " + sme.getStandbyStatus()); + logger.debug("??? -- Retrieve StateManagementEntity from database --\nsme.getResourceName() = {}\n"+ + "sme.getAdminState() = {}\nsme.getOpState() = {}\nsme.getAvailStatus() = {}\nsme.getStandbyStatus() = {}", + sme.getResourceName(), + sme.getAdminState(), + sme.getOpState(), + sme.getAvailStatus(), + sme.getStandbyStatus()); assertTrue(sme.getAdminState().equals(StateManagement.UNLOCKED)); assertTrue(sme.getOpState().equals(StateManagement.ENABLED)); @@ -709,12 +708,13 @@ public class IntegrityMonitorTest { // exist sme1 = (StateManagementEntity) resourceList1.get(0); em.refresh(sme1); - logger.debug("??? -- Retrieve StateManagementEntity from database --" - + "\nsme1.getResourceName() = " + sme1.getResourceName() - + "\nsme1.getAdminState() = " + sme1.getAdminState() - + "\nsme1.getOpState() = " + sme1.getOpState() - + "\nsme1.getAvailStatus() = " + sme1.getAvailStatus() - + "\nsme1.getStandbyStatus() = " + sme1.getStandbyStatus()); + logger.debug("??? -- Retrieve StateManagementEntity from database --\nsme1.getResourceName() = {}\n" + + "sme1.getAdminState() = {}\nsme1.getOpState() = {}\nsme1.getAvailStatus() = {}\nsme1.getStandbyStatus() = {}", + sme1.getResourceName(), + sme1.getAdminState(), + sme1.getOpState(), + sme1.getAvailStatus(), + sme1.getStandbyStatus()); assertTrue(sme1.getAdminState().equals(StateManagement.UNLOCKED)); assertTrue(sme1.getOpState().equals(StateManagement.ENABLED)); @@ -743,7 +743,7 @@ public class IntegrityMonitorTest { } public void testStateCheck() throws Exception { - System.out.println("\nIntegrityMonitorTest: Entering testStateCheck\n\n"); + logger.debug("\nIntegrityMonitorTest: Entering testStateCheck\n\n"); // parameters are passed via a properties file myProp.put(IntegrityMonitorProperties.DEPENDENCY_GROUPS, "group1_dep1"); @@ -791,7 +791,7 @@ public class IntegrityMonitorTest { try { im.evaluateSanity(); } catch (Exception e) { - System.out.println("testStateCheck: After 15 sec sleep - evaluateSanity exception: " + e); + logger.error("testStateCheck: After 15 sec sleep - evaluateSanity exception: ", e); sanityPass = false; } assertTrue(sanityPass); // expect sanity test to pass @@ -804,7 +804,7 @@ public class IntegrityMonitorTest { try { im.evaluateSanity(); } catch (Exception e) { - System.out.println("testStateCheck: After 10 sec sleep - evaluateSanity exception: " + e); + logger.error("testStateCheck: After 10 sec sleep - evaluateSanity exception: ", e); sanityPass = false; } assertFalse(sanityPass); // expect sanity test to fail @@ -827,11 +827,10 @@ public class IntegrityMonitorTest { em.flush(); et.commit(); - System.out.println("\n\ntestStateCheck: Exit\n\n"); + logger.debug("\n\ntestStateCheck: Exit\n\n"); } public void testGetAllForwardProgressEntity() throws Exception{ - System.out.println("\nIntegrityMonitorTest: Entering testGetAllForwardProgressEntity\n\n"); logger.debug("\nIntegrityMonitorTest: Entering testGetAllForwardProgressEntity\n\n"); // parameters are passed via a properties file @@ -889,11 +888,9 @@ public class IntegrityMonitorTest { et.commit(); logger.debug("\nIntegrityMonitorTest: Exit testGetAllForwardProgressEntity\n\n"); - System.out.println("\n\ntestGetAllForwardProgressEntity: Exit\n\n"); } public void testStateAudit() throws Exception{ - System.out.println("\nIntegrityMonitorTest: Entering testStateAudit\n\n"); logger.debug("\nIntegrityMonitorTest: Entering testStateAudit\n\n"); // parameters are passed via a properties file @@ -975,8 +972,10 @@ public class IntegrityMonitorTest { logger.debug("\n\n"); logger.debug("IntegrityMonitorTest:testStateAudit:ForwardProgressEntity entries"); for(ForwardProgressEntity myFpe : fpeList){ - logger.debug("\n ResourceName: " + myFpe.getResourceName() - + "\n LastUpdated: " + myFpe.getLastUpdated()); + logger.debug("\n ResourceName: {}" + + "\n LastUpdated: {}", + myFpe.getResourceName(), + myFpe.getLastUpdated()); } logger.debug("\n\n"); @@ -989,11 +988,16 @@ public class IntegrityMonitorTest { for(Object mySme : smeList){ StateManagementEntity tmpSme = (StateManagementEntity) mySme; em.refresh(tmpSme); - logger.debug("\n ResourceName: " + tmpSme.getResourceName() - + "\n AdminState: " + tmpSme.getAdminState() - + "\n OpState: " + tmpSme.getOpState() - + "\n AvailStatus: " + tmpSme.getAvailStatus() - + "\n StandbyStatus: " + tmpSme.getStandbyStatus() + logger.debug("\n ResourceName: {}" + + "\n AdminState: {}" + + "\n OpState: {}" + + "\n AvailStatus: {}" + + "\n StandbyStatus: {}", + tmpSme.getResourceName(), + tmpSme.getAdminState(), + tmpSme.getOpState(), + tmpSme.getAvailStatus(), + tmpSme.getStandbyStatus() ); } logger.debug("\n\n"); @@ -1010,11 +1014,16 @@ public class IntegrityMonitorTest { for(Object mySme : smeList){ StateManagementEntity tmpSme = (StateManagementEntity) mySme; em.refresh(tmpSme); - logger.debug("\n ResourceName: " + tmpSme.getResourceName() - + "\n AdminState: " + tmpSme.getAdminState() - + "\n OpState: " + tmpSme.getOpState() - + "\n AvailStatus: " + tmpSme.getAvailStatus() - + "\n StandbyStatus: " + tmpSme.getStandbyStatus() + logger.debug("\n ResourceName: {}" + + "\n AdminState: {}" + + "\n OpState: {}" + + "\n AvailStatus: {}" + + "\n StandbyStatus: {}", + tmpSme.getResourceName(), + tmpSme.getAdminState(), + tmpSme.getOpState(), + tmpSme.getAvailStatus(), + tmpSme.getStandbyStatus() ); } logger.debug("\n\n"); @@ -1051,11 +1060,16 @@ public class IntegrityMonitorTest { for(Object mySme : smeList){ StateManagementEntity tmpSme = (StateManagementEntity) mySme; em.refresh(tmpSme); - logger.debug("\n 2nd ResourceName: " + tmpSme.getResourceName() - + "\n AdminState: " + tmpSme.getAdminState() - + "\n OpState: " + tmpSme.getOpState() - + "\n AvailStatus: " + tmpSme.getAvailStatus() - + "\n StandbyStatus: " + tmpSme.getStandbyStatus() + logger.debug("\n 2nd ResourceName: {}" + + "\n AdminState: {}" + + "\n OpState: {}" + + "\n AvailStatus: {}" + + "\n StandbyStatus: {}", + tmpSme.getResourceName(), + tmpSme.getAdminState(), + tmpSme.getOpState(), + tmpSme.getAvailStatus(), + tmpSme.getStandbyStatus() ); } logger.debug("\n\n"); @@ -1088,12 +1102,19 @@ public class IntegrityMonitorTest { for(Object mySme : smeList){ StateManagementEntity tmpSme = (StateManagementEntity) mySme; em.refresh(tmpSme); - logger.debug("\n (restart) ResourceName: " + tmpSme.getResourceName() - + "\n AdminState: " + tmpSme.getAdminState() - + "\n OpState: " + tmpSme.getOpState() - + "\n AvailStatus: " + tmpSme.getAvailStatus() - + "\n StandbyStatus: " + tmpSme.getStandbyStatus() + + logger.debug("\n (restart) ResourceName: {}" + + "\n AdminState: {}" + + "\n OpState: {}" + + "\n AvailStatus: {}" + + "\n StandbyStatus: {}", + tmpSme.getResourceName(), + tmpSme.getAdminState(), + tmpSme.getOpState(), + tmpSme.getAvailStatus(), + tmpSme.getStandbyStatus() ); + } logger.debug("\n\n"); @@ -1125,11 +1146,17 @@ public class IntegrityMonitorTest { for(Object mySme : smeList){ StateManagementEntity tmpSme = (StateManagementEntity) mySme; em.refresh(tmpSme); - logger.debug("\n (restart2) ResourceName: " + tmpSme.getResourceName() - + "\n AdminState: " + tmpSme.getAdminState() - + "\n OpState: " + tmpSme.getOpState() - + "\n AvailStatus: " + tmpSme.getAvailStatus() - + "\n StandbyStatus: " + tmpSme.getStandbyStatus() + + logger.debug("\n (restart2) ResourceName: {}" + + "\n AdminState: {}" + + "\n OpState: {}" + + "\n AvailStatus: {}" + + "\n StandbyStatus: {}", + tmpSme.getResourceName(), + tmpSme.getAdminState(), + tmpSme.getOpState(), + tmpSme.getAvailStatus(), + tmpSme.getStandbyStatus() ); } logger.debug("\n\n"); @@ -1155,11 +1182,17 @@ public class IntegrityMonitorTest { for(Object mySme : smeList){ StateManagementEntity tmpSme = (StateManagementEntity) mySme; em.refresh(tmpSme); - logger.debug("\n (restart3) ResourceName: " + tmpSme.getResourceName() - + "\n AdminState: " + tmpSme.getAdminState() - + "\n OpState: " + tmpSme.getOpState() - + "\n AvailStatus: " + tmpSme.getAvailStatus() - + "\n StandbyStatus: " + tmpSme.getStandbyStatus() + + logger.debug("\n (restart3) ResourceName: {}" + + "\n AdminState: {}" + + "\n OpState: {}" + + "\n AvailStatus: {}" + + "\n StandbyStatus: {}", + tmpSme.getResourceName(), + tmpSme.getAdminState(), + tmpSme.getOpState(), + tmpSme.getAvailStatus(), + tmpSme.getStandbyStatus() ); } logger.debug("\n\n"); @@ -1196,11 +1229,17 @@ public class IntegrityMonitorTest { for(Object mySme : smeList){ StateManagementEntity tmpSme = (StateManagementEntity) mySme; em.refresh(tmpSme); - logger.debug("\n (restart4) ResourceName: " + tmpSme.getResourceName() - + "\n AdminState: " + tmpSme.getAdminState() - + "\n OpState: " + tmpSme.getOpState() - + "\n AvailStatus: " + tmpSme.getAvailStatus() - + "\n StandbyStatus: " + tmpSme.getStandbyStatus() + + logger.debug("\n (restart4) ResourceName: {}" + + "\n AdminState: {}" + + "\n OpState: {}" + + "\n AvailStatus: {}" + + "\n StandbyStatus: {}", + tmpSme.getResourceName(), + tmpSme.getAdminState(), + tmpSme.getOpState(), + tmpSme.getAvailStatus(), + tmpSme.getStandbyStatus() ); } logger.debug("\n\n"); diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java index 68e53dbe..852a04f6 100644 --- a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java +++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java @@ -34,16 +34,14 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -//import org.apache.commons.logging.Log; -//import org.apache.commons.logging.LogFactory; import org.onap.policy.common.im.StateManagement; import org.onap.policy.common.im.jpa.StateManagementEntity; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class StateManagementEntityTest { - private static Logger logger = FlexLogger.getLogger(StateManagementEntityTest.class); + private static Logger logger = LoggerFactory.getLogger(StateManagementEntityTest.class); private static final String DEFAULT_DB_DRIVER = "org.h2.Driver"; private static final String DEFAULT_DB_URL = "jdbc:h2:file:./sql/smTest"; @@ -83,7 +81,7 @@ public class StateManagementEntityTest { //@Ignore @Test public void testJPA() throws Exception { - System.out.println("\n??? logger.infor StateManagementEntityTest: Entering\n\n"); + logger.debug("\n??? logger.infor StateManagementEntityTest: Entering\n\n"); Properties myProp = new Properties(); myProp.put(DB_DRIVER, DEFAULT_DB_DRIVER); @@ -91,62 +89,62 @@ public class StateManagementEntityTest { myProp.put(DB_USER, DEFAULT_DB_USER); myProp.put(DB_PWD, DEFAULT_DB_PWD); - System.out.println("??? " + DB_DRIVER + "=" + DEFAULT_DB_DRIVER); - System.out.println("??? " + DB_URL + "=" + DEFAULT_DB_URL); - System.out.println("??? " + DB_USER + "=" + DEFAULT_DB_USER); - System.out.println("??? " + DB_PWD + "=" + DEFAULT_DB_PWD); + logger.debug("??? {} = {}", DB_DRIVER, DEFAULT_DB_DRIVER); + logger.debug("??? {} = {}", DB_URL, DEFAULT_DB_URL); + logger.debug("??? {} = {}", DB_USER, DEFAULT_DB_USER); + logger.debug("??? {} = {}", DB_PWD, DEFAULT_DB_PWD); //Create the data schema and entity manager factory - System.out.println("??? createEntityManagerFactory for schemaPU"); + logger.debug("??? createEntityManagerFactory for schemaPU"); EntityManagerFactory emf = Persistence.createEntityManagerFactory("schemaPU", myProp); // Create an entity manager to use the DB - System.out.println("??? createEntityManager"); + logger.debug("??? createEntityManager"); EntityManager em = emf.createEntityManager(); - System.out.println("??? getTransaction"); + logger.debug("??? getTransaction"); EntityTransaction et = em.getTransaction(); et.begin(); // Make sure the DB is clean - System.out.println("??? clean StateManagementEntity"); + logger.debug("??? clean StateManagementEntity"); em.createQuery("DELETE FROM StateManagementEntity").executeUpdate(); //Define the resourceName for the StateManagement constructor String resourceName = "test_resource1"; // - System.out.println("Create StateManagementEntity, resourceName: " + resourceName); - System.out.println("??? instantiate StateManagementEntity object"); + logger.debug("Create StateManagementEntity, resourceName: {}", resourceName); + logger.debug("??? instantiate StateManagementEntity object"); StateManagementEntity sme = new StateManagementEntity(); - System.out.println("??? setResourceName : " + resourceName); + logger.debug("??? setResourceName : {}", resourceName); sme.setResourceName(resourceName); - System.out.println("??? getResourceName : " + sme.getResourceName()); + logger.debug("??? getResourceName : {}", sme.getResourceName()); - System.out.println("??? setAdminState : " + StateManagement.UNLOCKED); + logger.debug("??? setAdminState : {}", StateManagement.UNLOCKED); sme.setAdminState(StateManagement.UNLOCKED); - System.out.println("??? getAdminState : " + sme.getAdminState()); + logger.debug("??? getAdminState : {}", sme.getAdminState()); - System.out.println("??? setOpState : " + StateManagement.ENABLED); + logger.debug("??? setOpState : {}", StateManagement.ENABLED); sme.setOpState(StateManagement.ENABLED); - System.out.println("??? getOpState : " + sme.getOpState()); + logger.debug("??? getOpState : {}", sme.getOpState()); - System.out.println("??? setAvailStatus : " + StateManagement.NULL_VALUE); + logger.debug("??? setAvailStatus : {}", StateManagement.NULL_VALUE); sme.setAvailStatus(StateManagement.NULL_VALUE); - System.out.println("??? getAvailStatus : " + sme.getAvailStatus()); + logger.debug("??? getAvailStatus : {}", sme.getAvailStatus()); - System.out.println("??? setStandbyStatus: " + StateManagement.COLD_STANDBY); + logger.debug("??? setStandbyStatus: {}", StateManagement.COLD_STANDBY); sme.setStandbyStatus(StateManagement.COLD_STANDBY); - System.out.println("??? getStandbyStatus: " + sme.getStandbyStatus()); + logger.debug("??? getStandbyStatus: {}", sme.getStandbyStatus()); - System.out.println("??? before persist"); + logger.debug("??? before persist"); em.persist(sme); - System.out.println("??? after persist"); + logger.debug("??? after persist"); em.flush(); - System.out.println("??? after flush"); + logger.debug("??? after flush"); et.commit(); - System.out.println("??? after commit"); + logger.debug("??? after commit"); try { Query query = em.createQuery("Select p from StateManagementEntity p where p.resourceName=:resource"); @@ -159,17 +157,20 @@ public class StateManagementEntityTest { if (!resourceList.isEmpty()) { // exist StateManagementEntity sme2 = (StateManagementEntity) resourceList.get(0); - System.out.println("??? -- Retrieve StateManagementEntity from database --" - + "\n\nsme.getResourceName() = " + sme.getResourceName() - + "\nsme2getResourceName() = " + sme2.getResourceName() - + "\n\nsme.getAdminState() = " + sme.getAdminState() - + "\nsme2.getAdminState() = " + sme2.getAdminState() - + "\n\nsme.getOpState() = " + sme.getOpState() - + "\nsme2.getOpState() = " + sme2.getOpState() - + "\n\nsme.getAvailStatus() = " + sme.getAvailStatus() - + "\nsme2.getAvailStatus() = " + sme.getAvailStatus() - + "\n\nsme.getStandbyStatus() = " + sme.getStandbyStatus() - + "\nsme2.getStandbyStatus() = " + sme2.getStandbyStatus()); + logger.debug("??? -- Retrieve StateManagementEntity from database --\n\nsme.getResourceName() = {}\n" + + "sme2getResourceName() = {}\n\nsme.getAdminState() = {}\nsme2.getAdminState() = {}\n\n" + + "sme.getOpState() = {}\nsme2.getOpState() = {}\n\nsme.getAvailStatus() = {}\n" + + "sme2.getAvailStatus() = {}\n\nsme.getStandbyStatus() = {}\nsme2.getStandbyStatus() = {}", + sme.getResourceName(), + sme2.getResourceName(), + sme.getAdminState(), + sme2.getAdminState(), + sme.getOpState(), + sme2.getOpState(), + sme.getAvailStatus(), + sme.getAvailStatus(), + sme.getStandbyStatus(), + sme2.getStandbyStatus()); assert(sme2.getResourceName().equals(sme.getResourceName())); @@ -177,16 +178,16 @@ public class StateManagementEntityTest { assert(sme2.getOpState().equals(sme.getOpState())); assert(sme2.getAvailStatus().equals(sme.getAvailStatus())); assert(sme2.getStandbyStatus().equals(sme.getStandbyStatus())); - System.out.println("--"); + logger.debug("--"); } else { - System.out.println("Record not found, resourceName: " + resourceName); + logger.debug("Record not found, resourceName: {}", resourceName); } } catch(Exception ex) { logger.error("Exception on select query: " + ex.toString()); } em.close(); - System.out.println("\n??? after close"); - System.out.println("\n\nJpaTest: Exit\n\n"); + logger.debug("\n??? after close"); + logger.debug("\n\nJpaTest: Exit\n\n"); } } diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java index 53e0825b..a3c0fcd7 100644 --- a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java +++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.onap.policy.common.im.StateManagement; import org.onap.policy.common.im.StandbyStatusException; import org.onap.policy.common.im.StateChangeNotifier; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * All JUnits are designed to run in the local development environment @@ -40,7 +40,7 @@ import org.onap.policy.common.logging.flexlogger.Logger; * tasks. */ public class StateManagementTest { - private static Logger logger = FlexLogger.getLogger(StateManagementTest.class); + private static Logger logger = LoggerFactory.getLogger(StateManagementTest.class); private static final String DEFAULT_DB_DRIVER = "org.h2.Driver"; private static final String DEFAULT_DB_URL = "jdbc:h2:file:./sql/smTest"; @@ -90,47 +90,47 @@ public class StateManagementTest { emf = Persistence.createEntityManagerFactory("schemaPU", myProp); StateManagement sm = new StateManagement(emf, resourceName); - System.out.println("\n\ntest lock()"); + logger.info("\n\ntest lock()"); displayState(resourceName, sm); logger.info("\n??? test lock()"); - logger.info(resourceName + " before adminState = " + sm.getAdminState()); - logger.info(resourceName + " before opState = " + sm.getOpState()); - logger.info(resourceName + " before availStatus = " + sm.getAvailStatus()); - logger.info(resourceName + " before standbyStatus= " + sm.getStandbyStatus()); + logger.info("{} before adminState = {}", resourceName, sm.getAdminState()); + logger.info("{} before opState = {}", resourceName, sm.getOpState()); + logger.info("{} before availStatus = {}", resourceName, sm.getAvailStatus()); + logger.info("{} before standbyStatus= {}", resourceName, sm.getStandbyStatus()); sm.lock(); System.out.println("\n\nafter lock()"); displayState(resourceName, sm); - logger.info(resourceName + " after adminState = " + sm.getAdminState()); - logger.info(resourceName + " after opState = " + sm.getOpState()); - logger.info(resourceName + " after availStatus = " + sm.getAvailStatus()); - logger.info(resourceName + " after standbyStatus= " + sm.getStandbyStatus()); + logger.info("{} after adminState = {}", resourceName, sm.getAdminState()); + logger.info("{} after opState = {}", resourceName, sm.getOpState()); + logger.info("{} after availStatus = {}", resourceName, sm.getAvailStatus()); + logger.info("{} after standbyStatus= {}", resourceName, sm.getStandbyStatus()); logger.info("\n??? test unlock()"); sm.unlock(); System.out.println("\n\nafter unlock()"); displayState(resourceName, sm); - logger.info(resourceName + " adminState = " + sm.getAdminState()); - logger.info(resourceName + " opState = " + sm.getOpState()); - logger.info(resourceName + " availStatus = " + sm.getAvailStatus()); - logger.info(resourceName + " standbyStatus= " + sm.getStandbyStatus()); + logger.info("{} adminState = {}", resourceName, sm.getAdminState()); + logger.info("{} opState = {}", resourceName, sm.getOpState()); + logger.info("{} availStatus = {}", resourceName, sm.getAvailStatus()); + logger.info("{} standbyStatus= {}", resourceName, sm.getStandbyStatus()); logger.info("\n??? test enableNotFailed()"); sm.enableNotFailed(); System.out.println("\n\nafter enableNotFailed()"); displayState(resourceName, sm); - logger.info(resourceName + " adminState = " + sm.getAdminState()); - logger.info(resourceName + " opState = " + sm.getOpState()); - logger.info(resourceName + " availStatus = " + sm.getAvailStatus()); - logger.info(resourceName + " standbyStatus= " + sm.getStandbyStatus()); + logger.info("{} adminState = {}", resourceName, sm.getAdminState()); + logger.info("{} opState = {}", resourceName, sm.getOpState()); + logger.info("{} availStatus = {}", resourceName, sm.getAvailStatus()); + logger.info("{} standbyStatus= {}", resourceName, sm.getStandbyStatus()); logger.info("\n??? test disableFailed()"); sm.disableFailed(); System.out.println("\n\nafter disableFailed()"); displayState(resourceName, sm); - logger.info(resourceName + " adminState = " + sm.getAdminState()); - logger.info(resourceName + " opState = " + sm.getOpState()); - logger.info(resourceName + " availStatus = " + sm.getAvailStatus()); - logger.info(resourceName + " standbyStatus= " + sm.getStandbyStatus()); + logger.info("{} adminState = {}", resourceName, sm.getAdminState()); + logger.info("{} opState = {}", resourceName, sm.getOpState()); + logger.info("{} availStatus = {}", resourceName, sm.getAvailStatus()); + logger.info("{} standbyStatus= {}", resourceName, sm.getStandbyStatus()); // P4 If promote() is called while either the opState is disabled or the adminState is locked, // the standbystatus shall transition to coldstandby and a StandbyStatusException shall be thrown @@ -140,9 +140,9 @@ public class StateManagementTest { sm.lock(); System.out.println("\n\nafter lock() and disableFailed"); displayState(resourceName, sm); - logger.info(resourceName + " adminState = " + sm.getAdminState()); - logger.info(resourceName + " opState = " + sm.getOpState()); - logger.info(resourceName + " standbyStatus= " + sm.getStandbyStatus()); + logger.info("{} adminState = {}", resourceName, sm.getAdminState()); + logger.info("{} opState = {}", resourceName, sm.getOpState()); + logger.info("{} standbyStatus= {}", resourceName, sm.getStandbyStatus()); sm.promote(); System.out.println("\n\nafter promote"); displayState(resourceName, sm); @@ -170,7 +170,7 @@ public class StateManagementTest { } assert(standbyExceptionThrown); assert(sm.getStandbyStatus().equals(StateManagement.COLD_STANDBY)); - System.out.println("\n\nP3 after promote()"); + logger.info("\n\nP3 after promote()"); displayState(resourceName, sm); standbyExceptionThrown = false; @@ -181,13 +181,13 @@ public class StateManagementTest { StateManagement sm2 = new StateManagement(emf, resourceName); sm2.enableNotFailed(); sm2.unlock(); - System.out.println("\n\nafter sm2.enableNotFailed() and sm2.unlock()"); + logger.info("\n\nafter sm2.enableNotFailed() and sm2.unlock()"); displayState(resourceName, sm2); - logger.info(resourceName + " adminState = " + sm2.getAdminState()); - logger.info(resourceName + " opState = " + sm2.getOpState()); - logger.info(resourceName + " standbyStatus= " + sm2.getStandbyStatus()); + logger.info("{} adminState = {}", resourceName, sm2.getAdminState()); + logger.info("{} opState = {}", resourceName, sm2.getOpState()); + logger.info("{} standbyStatus= {}", resourceName, sm2.getStandbyStatus()); sm2.promote(); - System.out.println("\n\nP2 after sm2.promote"); + logger.info("\n\nP2 after sm2.promote"); displayState(resourceName, sm2); assert(sm2.getAdminState().equals(StateManagement.UNLOCKED)); assert(sm2.getOpState().equals(StateManagement.ENABLED)); @@ -197,7 +197,7 @@ public class StateManagementTest { logger.info("\n??? promote() test case P5"); logger.info(resourceName + " standbyStatus= " + sm2.getStandbyStatus()); sm2.promote(); - System.out.println("\n\nP5 after sm2.promote()"); + logger.info("\n\nP5 after sm2.promote()"); displayState(resourceName, sm2); assert(sm2.getStandbyStatus().equals(StateManagement.PROVIDING_SERVICE)); @@ -205,7 +205,7 @@ public class StateManagementTest { logger.info("\n??? demote() test case D1"); logger.info(resourceName + " standbyStatus= " + sm2.getStandbyStatus()); sm2.demote(); - System.out.println("\n\nD1 after sm2.demote()"); + logger.info("\n\nD1 after sm2.demote()"); displayState(resourceName, sm2); assert(sm2.getStandbyStatus().equals(StateManagement.HOT_STANDBY)); @@ -213,7 +213,7 @@ public class StateManagementTest { logger.info("\n??? demote() test case D4"); logger.info(resourceName + " standbyStatus= " + sm2.getStandbyStatus()); sm2.demote(); - System.out.println("\n\nD4 after sm2.demote()"); + logger.info("\n\nD4 after sm2.demote()"); displayState(resourceName, sm2); assert(sm2.getStandbyStatus().equals(StateManagement.HOT_STANDBY)); @@ -224,13 +224,13 @@ public class StateManagementTest { StateManagement sm3 = new StateManagement(emf, resourceName); sm3.lock(); sm3.disableFailed(); - System.out.println("\n\nD3 after sm3.lock() and sm3.disableFailed()"); + logger.info("\n\nD3 after sm3.lock() and sm3.disableFailed()"); displayState(resourceName, sm3); - logger.info(resourceName + " adminState = " + sm3.getAdminState()); - logger.info(resourceName + " opState = " + sm3.getOpState()); - logger.info(resourceName + " standbyStatus= " + sm3.getStandbyStatus()); + logger.info("{} adminState = {}", resourceName, sm3.getAdminState()); + logger.info("{} opState = {}", resourceName, sm3.getOpState()); + logger.info("{} standbyStatus= {}", resourceName, sm3.getStandbyStatus()); sm3.demote(); - System.out.println("\n\nD3 after sm3.demote()"); + logger.info("\n\nD3 after sm3.demote()"); displayState(resourceName, sm3); assert(sm3.getStandbyStatus().equals(StateManagement.COLD_STANDBY)); @@ -238,7 +238,7 @@ public class StateManagementTest { logger.info("\n??? demote() test case D5"); logger.info(resourceName + " standbyStatus= " + sm3.getStandbyStatus()); sm3.demote(); - System.out.println("\n\nD5 after sm3.demote()"); + logger.info("\n\nD5 after sm3.demote()"); displayState(resourceName, sm3); assert(sm3.getStandbyStatus().equals(StateManagement.COLD_STANDBY)); @@ -249,11 +249,11 @@ public class StateManagementTest { StateManagement sm4 = new StateManagement(emf, resourceName); sm4.unlock(); sm4.enableNotFailed(); - System.out.println("\n\nD2 after sm4.unlock() and sm4.enableNotFailed()"); + logger.info("\n\nD2 after sm4.unlock() and sm4.enableNotFailed()"); displayState(resourceName, sm4); - logger.info(resourceName + " adminState = " + sm4.getAdminState()); - logger.info(resourceName + " opState = " + sm4.getOpState()); - logger.info(resourceName + " standbyStatus= " + sm4.getStandbyStatus()); + logger.info("{} adminState = {}", resourceName, sm4.getAdminState()); + logger.info("{} opState = {}", resourceName, sm4.getOpState()); + logger.info("{} standbyStatus= {}", resourceName, sm4.getStandbyStatus()); sm4.demote(); assert(sm4.getStandbyStatus().equals(StateManagement.HOT_STANDBY)); @@ -261,7 +261,7 @@ public class StateManagementTest { logger.info("\n??? promote() test case P1"); logger.info(resourceName + " standbyStatus= " + sm4.getStandbyStatus()); sm4.promote(); - System.out.println("\n\nP1 after sm4.promote()"); + logger.info("\n\nP1 after sm4.promote()"); displayState(resourceName, sm4); assert(sm4.getStandbyStatus().equals(StateManagement.PROVIDING_SERVICE)); @@ -287,14 +287,14 @@ public class StateManagementTest { try { sm.promote(); } catch(Exception ex) { - logger.info("Exception from promote(): " + ex.toString()); + logger.info("Exception from promote(): {}", ex.toString()); } if (emf.isOpen()) { emf.close(); } } catch(Exception ex) { - logger.error("Exception: " + ex.toString()); + logger.error("Exception: {}", ex.toString()); } finally { if (emf.isOpen()) { emf.close(); @@ -306,15 +306,10 @@ public class StateManagementTest { private void displayState(String resourceName, StateManagement sm) { - System.out.println("\nAdminState = " + sm.getAdminState() - + "\nOpState() = " + sm.getOpState() - + "\nAvailStatus = " + sm.getAvailStatus() - + "\nStandbyStatus = " + sm.getStandbyStatus() - + "\n"); - logger.info(resourceName + " adminState = " + sm.getAdminState()); - logger.info(resourceName + " opState = " + sm.getOpState()); - logger.info(resourceName + " availStatus = " + sm.getAvailStatus()); - logger.info(resourceName + " standbyStatus= " + sm.getStandbyStatus()); + logger.info("{} adminState = {}", resourceName, sm.getAdminState()); + logger.info("{} opState = {}", resourceName, sm.getOpState()); + logger.info("{} availStatus = {}", resourceName, sm.getAvailStatus()); + logger.info("{} standbyStatus= {}", resourceName, sm.getStandbyStatus()); } } diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java index ee8ea10f..6d4dc7c6 100644 --- a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java +++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java @@ -30,15 +30,15 @@ import org.junit.Test; import org.onap.policy.common.im.StateTransition; import org.onap.policy.common.im.StateElement; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * All JUnits are designed to run in the local development environment * where they have write privileges and can execute time-sensitive * tasks. */ public class StateTransitionTest { - private static Logger logger = FlexLogger.getLogger(StateTransitionTest.class); + private static Logger logger = LoggerFactory.getLogger(StateTransitionTest.class); private static final String DEFAULT_DB_DRIVER = "org.h2.Driver"; private static final String DEFAULT_DB_URL = "jdbc:h2:file:./sql/smTest"; @@ -2146,7 +2146,7 @@ public class StateTransitionTest { //emf.close(); //} } catch(Exception ex) { - logger.error("Exception: " + ex.toString()); + logger.error("Exception: {}" + ex.toString()); throw new Exception("Failure getting ending state. " + ex ); } finally { if (emf != null && emf.isOpen()) { @@ -2163,10 +2163,10 @@ public class StateTransitionTest { if (endingStandbyStatus != null) { endingStandbyStatus.replace(".", ","); } - logger.info("EndingAdminState = [" + se.getEndingAdminState() +"]"); - logger.info("EndingOpState = [" + se.getEndingOpState() +"]"); - logger.info("EndingAvailStatus = [" + se.getEndingAvailStatus() +"]"); - logger.info("EndingStandbyStatus= [" + endingStandbyStatus +"]"); - logger.info("Exception = [" + se.getException() +"]"); + logger.info("EndingAdminState = [{}]" + se.getEndingAdminState()); + logger.info("EndingOpState = [{}]" + se.getEndingOpState()); + logger.info("EndingAvailStatus = [{}]" + se.getEndingAvailStatus()); + logger.info("EndingStandbyStatus= [{}]" + endingStandbyStatus); + logger.info("Exception = [{}]" + se.getException()); } } \ No newline at end of file -- cgit 1.2.3-korg