Merge "Fix all bugs reported by Sonar in policy/engine"

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / DashboardController.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
index 901b592..d1483a2 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
@@ -74,12 +74,19 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @RequestMapping({"/"})
 public class DashboardController  extends RestrictedBaseController{
        private static final Logger policyLogger = FlexLogger.getLogger(DashboardController.class);
-       @Autowired
-       SystemLogDbDao systemDAO;
-
        @Autowired
        CommonClassDao commonClassDao;
+       
+       @Autowired
+       SystemLogDbDao systemDAO;
 
+       public void setCommonClassDao(CommonClassDao commonClassDao) {
+               this.commonClassDao = commonClassDao;
+       }
+       public void setSystemLogDbDao(SystemLogDbDao systemDAO){
+               this.systemDAO = systemDAO;
+       }
+        
        private int pdpCount;
        private PDPGroupContainer pdpConatiner;
        private ArrayList<Object> pdpStatusData;
@@ -194,7 +201,6 @@ public class DashboardController  extends RestrictedBaseController{
                        PolicyController controller = getPolicyControllerInstance();
                        Set<OnapPDPGroup> groups = controller.getPapEngine().getOnapPDPGroups();
                        if (groups == null) {
-                               papStatus = "UNKNOWN";
                                throw new PAPException("PAP not running");
                        }else {
                                papStatus = "IS_OK";
@@ -281,14 +287,10 @@ public class DashboardController  extends RestrictedBaseController{
        private long getRequestCounts(String host, int port, String jmxAttribute) {
 
                policyLogger.debug("Create an RMI connector client and connect it to the JMX connector server");
-               HashMap map = new HashMap();
-               map = null;
-               JMXConnector jmxConnection;
-               try {
-                       jmxConnection = JMXConnectorFactory.newJMXConnector(createConnectionURL(host, port), map);
+               HashMap map = null;
+               try (JMXConnector jmxConnection = JMXConnectorFactory.newJMXConnector(createConnectionURL(host, port), map)){
                        jmxConnection.connect();
                        Object o = jmxConnection.getMBeanServerConnection().getAttribute(new ObjectName("PdpRest:type=PdpRestMonitor"), jmxAttribute);
-                       jmxConnection.close();
                        policyLogger.debug("pdpEvaluationNA value retreived: " + o);
                        return (long) o;
                } catch (MalformedURLException e) {
@@ -321,10 +323,10 @@ public class DashboardController  extends RestrictedBaseController{
         */
        private void addPolicyToTable() {
                policyActivityData = new ArrayList<>();
-               String policyID = null;
-               int policyFireCount = 0;
+               String policyID;
+               int policyFireCount;
                Map<String, String> policyMap = new HashMap<>();
-               Object policyList = null;
+               Object policyList;
                //get list of policy
 
                for (PDPGroup group : this.pdpConatiner.getGroups()){
@@ -348,14 +350,12 @@ public class DashboardController  extends RestrictedBaseController{
                                        for (String policyKeyValue : splitPolicy){
                                                policyID = urnPolicyID(policyKeyValue);
                                                policyFireCount = countPolicyID(policyKeyValue);
-                                               if (policyID != null ){
-                                                       if (policyMap.containsKey(policyID)){
-                                                               JSONObject object = new JSONObject();
-                                                               object.put("policyId", policyMap.get(policyID));
-                                                               object.put("fireCount", policyFireCount);
-                                                               object.put("system", pdp.getId());
-                                                               policyActivityData.add(object);
-                                                       }
+                                               if (policyID != null && policyMap.containsKey(policyID)){
+                                                       JSONObject object = new JSONObject();
+                                                       object.put("policyId", policyMap.get(policyID));
+                                                       object.put("fireCount", policyFireCount);
+                                                       object.put("system", pdp.getId());
+                                                       policyActivityData.add(object);
                                                }
                                        }
                                }else {
@@ -383,14 +383,10 @@ public class DashboardController  extends RestrictedBaseController{
        @SuppressWarnings({ "rawtypes", "unchecked" })
        private Object getPolicy(String host, int port, String jmxAttribute){
                policyLogger.debug("Create an RMI connector client and connect it to the JMX connector server for Policy: " + host);
-               HashMap map = new HashMap();
-               map = null;
-               JMXConnector jmxConnection;
-               try {
-                       jmxConnection = JMXConnectorFactory.newJMXConnector(createConnectionURL(host, port), map);
+               HashMap map = null;
+               try (JMXConnector jmxConnection = JMXConnectorFactory.newJMXConnector(createConnectionURL(host, port), map)) {
                        jmxConnection.connect();
                        Object o = jmxConnection.getMBeanServerConnection().getAttribute(new ObjectName("PdpRest:type=PdpRestMonitor"), "policyMap");
-                       jmxConnection.close();
                        policyLogger.debug("policyMap value retreived: " + o);
                        return  o;
                } catch (MalformedURLException e) {