Fix sonar issues in feature-state-management

[policy/drools-pdp.git] / feature-state-management / src / main / java / org / onap / policy / drools / statemanagement / StateManagementFeature.java

diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
index 0143c58..3cc2790 100644 (file)
--- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
+++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.util.Observer;
 import java.util.Properties;
 
-import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.im.AllSeemsWellException;
 import org.onap.policy.common.im.StateManagement;
 import org.onap.policy.drools.core.PolicySessionFeatureAPI;
 import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
@@ -58,18 +58,14 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
        /**************************/
 
        public StateManagementFeature(){
-               if(logger.isDebugEnabled()){
-                       logger.debug("StateManagementFeature() constructor");
-               }
+               logger.debug("StateManagementFeature() constructor");
        }
        
        @Override
-       public void globalInit(String args[], String configDir)
+       public void globalInit(String[] args, String configDir)
        {
                // Initialization code associated with 'PolicyContainer'
-               if(logger.isDebugEnabled()){
-                       logger.debug("StateManagementFeature.globalInit({}) entry", configDir);
-               }
+               logger.debug("StateManagementFeature.globalInit({}) entry", configDir);
 
                try
                {
@@ -77,9 +73,7 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
                }
                catch (Exception e)
                {
-                       if(logger.isDebugEnabled()){
-                               logger.debug("DroolsPDPIntegrityMonitor initialization exception: ", e);
-                       }
+                       logger.debug("DroolsPDPIntegrityMonitor initialization exception: ", e);
                        logger.error("DroolsPDPIntegrityMonitor.init()", e);
                }
 
@@ -89,20 +83,16 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
                try {
                        droolsPdpIntegrityMonitor = DroolsPDPIntegrityMonitor.getInstance();
                        stateManagement = droolsPdpIntegrityMonitor.getStateManager();
-                       if(logger.isDebugEnabled()){
-                               logger.debug("StateManagementFeature.globalInit(): "
-                                       + "stateManagement.getAdminState(): {}", stateManagement.getAdminState());
-                       }
+                       
+                       logger.debug("StateManagementFeature.globalInit(): "
+                               + "stateManagement.getAdminState(): {}", stateManagement.getAdminState());
+                       
                        if(stateManagement == null){
-                               if(logger.isDebugEnabled()){
-                                       logger.debug("StateManagementFeature.globalInit(): stateManagement is NULL!");
-                               }
+                               logger.debug("StateManagementFeature.globalInit(): stateManagement is NULL!");
                        }
                } catch (Exception e1) {
-                       if(logger.isDebugEnabled()){
-                               logger.debug("StateManagementFeature.globalInit(): DroolsPDPIntegrityMonitor"
-                                       + " initialization failed with exception:", e1);
-                       }
+                       logger.debug("StateManagementFeature.globalInit(): DroolsPDPIntegrityMonitor"
+                               + " initialization failed with exception:", e1);
                        logger.error("DroolsPDPIntegrityMonitor.init(): StateManagementFeature startup failed "
                                        + "to get DroolsPDPIntegrityMonitor instance:", e1);
                }
@@ -113,15 +103,13 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
         */
        @Override
        public void addObserver(Observer stateChangeObserver) {
-               if(logger.isDebugEnabled()){
-                       logger.debug("StateManagementFeature.addObserver() entry\n"
-                                       + "StateManagementFeature.addObserver(): "
-                                       + "stateManagement.getAdminState(): {}", stateManagement.getAdminState());
-               }
+               logger.debug("StateManagementFeature.addObserver() entry\n"
+                               + "StateManagementFeature.addObserver(): "
+                               + "stateManagement.getAdminState(): {}", stateManagement.getAdminState());
+               
                stateManagement.addObserver(stateChangeObserver);
-               if(logger.isDebugEnabled()){
-                       logger.debug("StateManagementFeature.addObserver() exit");
-               }
+               
+               logger.debug("StateManagementFeature.addObserver() exit");
        }
 
        /**
@@ -185,7 +173,7 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
         * {@inheritDoc}
         */
        @Override
-       public void promote() throws StandbyStatusException, Exception {
+       public void promote() throws Exception {
                stateManagement.promote();              
        }
 
@@ -241,12 +229,7 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
         */
        @Override
        public boolean isLocked(){
-               String admin = stateManagement.getAdminState();
-               if(admin.equals(StateManagement.LOCKED)){
-                       return true;
-               }else{
-                       return false;
-               }
+               return StateManagement.LOCKED.equals(stateManagement.getAdminState());
        }
        
        @Override
@@ -269,4 +252,12 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
                        logger.error("initializeProperties", e1);
                }
        }
+
+       @Override
+       public void allSeemsWell(String key, Boolean asw, String msg)
+                       throws AllSeemsWellException {
+
+               droolsPdpIntegrityMonitor.allSeemsWell(key, asw, msg);
+               
+       }
 }