From b8972c90198e11bcdeec1aecddbf1ee271825344 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Fri, 29 Apr 2016 05:40:34 +0530
Subject: [PATCH] Adding temporary development code bits for dashboard
 analytics feature

---
 .../dashboard/dao/GadgetDataServiceDAO.java   | 32 ++++++++++---------
 .../internal/GadgetDataServiceImpl.java       | 26 +++++++++++++--
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java
index f54701c716..6cbdba08bc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java
@@ -33,65 +33,67 @@ public interface GadgetDataServiceDAO {
      */
     int getTotalDeviceCount() throws GadgetDataServiceDAOException;
 
+    /**
+     * Method to get active device count from a particular tenant.
+     *
+     * @return active device count.
+     */
     int getActiveDeviceCount() throws GadgetDataServiceDAOException;
 
+    /**
+     * Method to get inactive device count from a particular tenant.
+     *
+     * @return inactive device count.
+     */
     int getInactiveDeviceCount() throws GadgetDataServiceDAOException;
 
+    /**
+     * Method to get removed device count from a particular tenant.
+     *
+     * @return removed device count.
+     */
     int getRemovedDeviceCount() throws GadgetDataServiceDAOException;
 
     /**
-     * Method to get non-compliant device count.
+     * Method to get non-compliant device count from a particular tenant.
      *
      * @return Non-compliant device count.
      */
-    @SuppressWarnings("unused")
     int getNonCompliantDeviceCount() throws GadgetDataServiceDAOException;
 
     /**
-     * Method to get unmonitored device count.
+     * Method to get unmonitored device count from a particular tenant.
      *
      * @return Unmonitored device count.
      */
-    @SuppressWarnings("unused")
     int getUnmonitoredDeviceCount() throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     PaginationResult getNonCompliantDeviceCountsByFeatures(PaginationRequest paginationRequest) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     int getDeviceCount(Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode,
                                           Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     Map<String, Integer> getDeviceCountsByPlatforms(Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode,
                                                     Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     Map<String, Integer> getDeviceCountsByOwnershipTypes(Map<String, Object> filters)
             throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
                                                     Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     PaginationResult getDevicesWithDetails(Map<String, Object> filters,
                                            PaginationRequest paginationRequest) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
             Map<String, Object> filters, PaginationRequest paginationRequest) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
                                             Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java
index c0df361d9f..2f31b84f40 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java
@@ -270,12 +270,32 @@ class GadgetDataServiceImpl implements GadgetDataService {
 
     @Override
     public List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) {
-        return null;
+        List<Map<String, Object>> devicesWithDetails = null;
+        try {
+            GadgetDataServiceDAOFactory.openConnection();
+            devicesWithDetails = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getDevicesWithDetails(filters);
+        } catch (GadgetDataServiceDAOException | SQLException e) {
+            return null;
+        } finally {
+            GadgetDataServiceDAOFactory.closeConnection();
+        }
+        return devicesWithDetails;
     }
 
     @Override
-    public List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, Map<String, Object> filters) {
-        return null;
+    public List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
+                                                                              Map<String, Object> filters) {
+        List<Map<String, Object>> featureNonCompliantDevicesWithDetails = null;
+        try {
+            GadgetDataServiceDAOFactory.openConnection();
+            featureNonCompliantDevicesWithDetails = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
+                getFeatureNonCompliantDevicesWithDetails(nonCompliantFeatureCode, filters);
+        } catch (GadgetDataServiceDAOException | SQLException e) {
+            return null;
+        } finally {
+            GadgetDataServiceDAOFactory.closeConnection();
+        }
+        return featureNonCompliantDevicesWithDetails;
     }
 
 }