Adding temporary development code bits for dashboard analytics feature

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/GadgetDataService.java

@@ -52,10 +52,21 @@ public interface GadgetDataService {
     @SuppressWarnings("unused")
     int getDeviceCount(Map<String, Object> filters);
 
+    @SuppressWarnings("unused")
+    int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, Map<String, Object> filters);
+
     @SuppressWarnings("unused")
     Map<String, Integer> getDeviceCountsByPlatforms(Map<String, Object> filters);
 
+    @SuppressWarnings("unused")
+    Map<String, Integer> getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode,
+                                                                       Map<String, Object> filters);
+
     @SuppressWarnings("unused")
     Map<String, Integer> getDeviceCountsByOwnershipTypes(Map<String, Object> filters);
 
+    @SuppressWarnings("unused")
+    Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
+                                                                            Map<String, Object> filters);
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java

@@ -42,8 +42,7 @@ class GadgetDataServiceImpl implements GadgetDataService {
         int totalDeviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            totalDeviceCount = GadgetDataServiceDAOFactory.
+            totalDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getTotalDeviceCount();
-                    getGadgetDataServiceDAO().getTotalDeviceCount();
         } catch (GadgetDataServiceDAOException | SQLException e) {
             totalDeviceCount = -1;
             return totalDeviceCount;
@@ -58,8 +57,7 @@ class GadgetDataServiceImpl implements GadgetDataService {
         int activeDeviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            activeDeviceCount = GadgetDataServiceDAOFactory.
+            activeDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getActiveDeviceCount();
-                    getGadgetDataServiceDAO().getActiveDeviceCount();
         } catch (GadgetDataServiceDAOException | SQLException e) {
             activeDeviceCount = -1;
             return activeDeviceCount;
@@ -74,8 +72,7 @@ class GadgetDataServiceImpl implements GadgetDataService {
         int inactiveDeviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            inactiveDeviceCount = GadgetDataServiceDAOFactory.
+            inactiveDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getInactiveDeviceCount();
-                    getGadgetDataServiceDAO().getInactiveDeviceCount();
         } catch (GadgetDataServiceDAOException | SQLException e) {
             inactiveDeviceCount = -1;
             return inactiveDeviceCount;
@@ -90,8 +87,7 @@ class GadgetDataServiceImpl implements GadgetDataService {
         int removedDeviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            removedDeviceCount = GadgetDataServiceDAOFactory.
+            removedDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getRemovedDeviceCount();
-                    getGadgetDataServiceDAO().getRemovedDeviceCount();
         } catch (GadgetDataServiceDAOException | SQLException e) {
             removedDeviceCount = -1;
             return removedDeviceCount;
@@ -106,8 +102,7 @@ class GadgetDataServiceImpl implements GadgetDataService {
         int nonCompliantDeviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            nonCompliantDeviceCount = GadgetDataServiceDAOFactory.
+            nonCompliantDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getNonCompliantDeviceCount();
-                    getGadgetDataServiceDAO().getNonCompliantDeviceCount();
         } catch (GadgetDataServiceDAOException | SQLException e) {
             nonCompliantDeviceCount = -1;
             return nonCompliantDeviceCount;
@@ -122,8 +117,7 @@ class GadgetDataServiceImpl implements GadgetDataService {
         int unmonitoredDeviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            unmonitoredDeviceCount = GadgetDataServiceDAOFactory.
+            unmonitoredDeviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getUnmonitoredDeviceCount();
-                    getGadgetDataServiceDAO().getUnmonitoredDeviceCount();
         } catch (GadgetDataServiceDAOException | SQLException e) {
             unmonitoredDeviceCount = -1;
             return unmonitoredDeviceCount;
@@ -153,8 +147,7 @@ class GadgetDataServiceImpl implements GadgetDataService {
         int deviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            deviceCount = GadgetDataServiceDAOFactory.
+            deviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getDeviceCount(filters);
-                    getGadgetDataServiceDAO().getDeviceCount(filters);
         } catch (GadgetDataServiceDAOException | SQLException e) {
             deviceCount = -1;
             return deviceCount;
@@ -164,13 +157,29 @@ class GadgetDataServiceImpl implements GadgetDataService {
         return deviceCount;
     }
 
+    @Override
+    public int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, Map<String, Object> filters) {
+        int featureNonCompliantDeviceCount;
+        try {
+            GadgetDataServiceDAOFactory.openConnection();
+            featureNonCompliantDeviceCount = GadgetDataServiceDAOFactory.
+                getGadgetDataServiceDAO().getFeatureNonCompliantDeviceCount(nonCompliantFeatureCode, filters);
+        } catch (GadgetDataServiceDAOException | SQLException e) {
+            featureNonCompliantDeviceCount = -1;
+            return featureNonCompliantDeviceCount;
+        } finally {
+            GadgetDataServiceDAOFactory.closeConnection();
+        }
+        return featureNonCompliantDeviceCount;
+    }
+
     @Override
     public Map<String, Integer> getDeviceCountsByPlatforms(Map<String, Object> filters) {
         Map<String, Integer> deviceCountsByPlatforms = null;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            deviceCountsByPlatforms = GadgetDataServiceDAOFactory.
+            deviceCountsByPlatforms = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                    getGadgetDataServiceDAO().getDeviceCountsByPlatforms(filters);
+                getDeviceCountsByPlatforms(filters);
         } catch (GadgetDataServiceDAOException | SQLException e) {
             return null;
         } finally {
@@ -179,13 +188,29 @@ class GadgetDataServiceImpl implements GadgetDataService {
         return deviceCountsByPlatforms;
     }
 
+    @Override
+    public Map<String, Integer> getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode,
+                                                                              Map<String, Object> filters) {
+        Map<String, Integer> featureNonCompliantDeviceCountsByPlatforms = null;
+        try {
+            GadgetDataServiceDAOFactory.openConnection();
+            featureNonCompliantDeviceCountsByPlatforms = GadgetDataServiceDAOFactory.
+                getGadgetDataServiceDAO().getFeatureNonCompliantDeviceCountsByPlatforms(nonCompliantFeatureCode, filters);
+        } catch (GadgetDataServiceDAOException | SQLException e) {
+            return null;
+        } finally {
+            GadgetDataServiceDAOFactory.closeConnection();
+        }
+        return featureNonCompliantDeviceCountsByPlatforms;
+    }
+
     @Override
     public Map<String, Integer> getDeviceCountsByOwnershipTypes(Map<String, Object> filters) {
         Map<String, Integer> deviceCountsByOwnershipTypes = null;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            deviceCountsByOwnershipTypes = GadgetDataServiceDAOFactory.
+            deviceCountsByOwnershipTypes = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                    getGadgetDataServiceDAO().getDeviceCountsByOwnershipTypes(filters);
+                getDeviceCountsByOwnershipTypes(filters);
         } catch (GadgetDataServiceDAOException | SQLException e) {
             return null;
         } finally {
@@ -194,4 +219,21 @@ class GadgetDataServiceImpl implements GadgetDataService {
         return deviceCountsByOwnershipTypes;
     }
 
+    @Override
+    public Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
+                                                                                   Map<String, Object> filters) {
+        Map<String, Integer> featureNonCompliantDeviceCountsByOwnershipTypes = null;
+        try {
+            GadgetDataServiceDAOFactory.openConnection();
+            featureNonCompliantDeviceCountsByOwnershipTypes =
+                GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
+                    getFeatureNonCompliantDeviceCountsByOwnershipTypes(nonCompliantFeatureCode, filters);
+        } catch (GadgetDataServiceDAOException | SQLException e) {
+            return null;
+        } finally {
+            GadgetDataServiceDAOFactory.closeConnection();
+        }
+        return featureNonCompliantDeviceCountsByOwnershipTypes;
+    }
+
 }