Adding temporary development code bits for dashboard analytics feature

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml

@@ -64,7 +64,8 @@
                         </Private-Package>
                         <Export-Package>
                             org.wso2.carbon.device.mgt.analytics.dashboard,
-                            org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception
+                            org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception,
+                            org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean
                         </Export-Package>
                         <Import-Package>
                             org.osgi.framework,

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

@@ -18,7 +18,8 @@
 
 package org.wso2.carbon.device.mgt.analytics.dashboard;
 
-import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterException;
+import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet;
+import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 
 import java.sql.SQLException;
@@ -50,43 +51,46 @@ public interface GadgetDataService {
 
     @SuppressWarnings("unused")
     PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount)
-                                                           throws InvalidParameterException, SQLException;
+                                                           throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
-    int getDeviceCount(Map<String, Object> filters) throws SQLException;
+    int getDeviceCount(FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
     int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException;
+                                          FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
-    Map<String, Integer> getDeviceCountsByPlatforms(Map<String, Object> filters) throws SQLException;
+    Map<String, Integer> getDeviceCountsByPlatforms(FilterSet filterSet)
+                                          throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException;
+                                          FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
-    Map<String, Integer> getDeviceCountsByOwnershipTypes(Map<String, Object> filters) throws SQLException;
+    Map<String, Integer> getDeviceCountsByOwnershipTypes(FilterSet filterSet)
+                                          throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException;
+                                          FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
-    PaginationResult getDevicesWithDetails(Map<String, Object> filters,
+    PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount)
-                                      int startIndex, int resultCount) throws InvalidParameterException, SQLException;
+                                                   throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
     PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                       Map<String, Object> filters, int startIndex, int resultCount)
+                                                   FilterSet filterSet, int startIndex, int resultCount)
-                                                            throws InvalidParameterException, SQLException;
+                                                               throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
-    List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) throws SQLException;
+    List<Map<String, Object>> getDevicesWithDetails(FilterSet filterSet)
+                                                    throws InvalidParameterValueException, SQLException;
 
     @SuppressWarnings("unused")
     List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException;
+                                          FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
 }

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

@@ -18,7 +18,8 @@
 
 package org.wso2.carbon.device.mgt.analytics.dashboard.dao;
 
-import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterException;
+import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet;
+import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 
 import java.sql.SQLException;
@@ -70,33 +71,35 @@ public interface GadgetDataServiceDAO {
     int getUnmonitoredDeviceCount() throws SQLException;
 
     PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount)
-            throws InvalidParameterException, SQLException;
+                                          throws InvalidParameterValueException, SQLException;
 
-    int getDeviceCount(Map<String, Object> filters) throws SQLException;
+    int getDeviceCount(FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
     int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException;
+                                          FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
-    Map<String, Integer> getDeviceCountsByPlatforms(Map<String, Object> filters) throws SQLException;
+    Map<String, Integer> getDeviceCountsByPlatforms(FilterSet filterSet)
+                                          throws InvalidParameterValueException, SQLException;
 
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException;
+                                          FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
-    Map<String, Integer> getDeviceCountsByOwnershipTypes(Map<String, Object> filters) throws SQLException;
+    Map<String, Integer> getDeviceCountsByOwnershipTypes(FilterSet filterSet)
+                                          throws InvalidParameterValueException, SQLException;
 
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException;
+                                          FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
-    PaginationResult getDevicesWithDetails(Map<String, Object> filters,
+    PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount)
-                                      int startIndex, int resultCount) throws InvalidParameterException, SQLException;
+                                          throws InvalidParameterValueException, SQLException;
 
     PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                    Map<String, Object> filters, int startIndex, int resultCount)
+         FilterSet filterSet, int startIndex, int resultCount) throws InvalidParameterValueException, SQLException;
-                                            throws InvalidParameterException, SQLException;
 
-    List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) throws SQLException;
+    List<Map<String, Object>> getDevicesWithDetails(FilterSet filterSet)
+                                          throws InvalidParameterValueException, SQLException;
 
     List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException;
+                                          FilterSet filterSet) throws InvalidParameterValueException, SQLException;
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/ConnectivityStatus.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * you may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean;
+
+public enum ConnectivityStatus {
+    active, inactive, removed
+}

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/FilterSet.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * you may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean;
+
+public class FilterSet {
+    private String connectivityStatus;
+    private String potentialVulnerability;
+    private String platform;
+    private String ownership;
+
+    public String getConnectivityStatus() {
+        return connectivityStatus;
+    }
+
+    public void setConnectivityStatus(String connectivityStatus) {
+        this.connectivityStatus = connectivityStatus;
+    }
+
+    public String getPotentialVulnerability() {
+        return potentialVulnerability;
+    }
+
+    public void setPotentialVulnerability(String potentialVulnerability) {
+        this.potentialVulnerability = potentialVulnerability;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
+    public String getOwnership() {
+        return ownership;
+    }
+
+    public void setOwnership(String ownership) {
+        this.ownership = ownership;
+    }
+}

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/Ownership.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * you may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean;
+
+public enum Ownership {
+    byod, cope
+}

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/Platform.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * you may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean;
+
+public enum Platform {
+    android, ios, windows
+}

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/bean/PotentialVulnerability.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * you may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean;
+
+public enum PotentialVulnerability {
+    non_compliant, unmonitored
+}

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/exception/InvalidParameterValueException.java

@@ -22,7 +22,7 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception;
  * Custom exception class for catching invalid parameter issues,
  * relevant to Gadget Data Service DAO layer.
  */
-public class InvalidParameterException extends Exception {
+public class InvalidParameterValueException extends Exception {
 
     private String errorMessage;
     private static final long serialVersionUID = 2021891706072918864L;
@@ -34,7 +34,7 @@ public class InvalidParameterException extends Exception {
      * @param nestedException Nested exception.
      */
     @SuppressWarnings("unused")
-    public InvalidParameterException(String errorMessage, Exception nestedException) {
+    public InvalidParameterValueException(String errorMessage, Exception nestedException) {
         super(errorMessage, nestedException);
         setErrorMessage(errorMessage);
     }
@@ -46,7 +46,7 @@ public class InvalidParameterException extends Exception {
      * @param cause Cause of this exception.
      */
     @SuppressWarnings("unused")
-    public InvalidParameterException(String errorMessage, Throwable cause) {
+    public InvalidParameterValueException(String errorMessage, Throwable cause) {
         super(errorMessage, cause);
         setErrorMessage(errorMessage);
     }
@@ -56,7 +56,7 @@ public class InvalidParameterException extends Exception {
      *
      * @param errorMessage Specific error message.
      */
-    public InvalidParameterException(String errorMessage) {
+    public InvalidParameterValueException(String errorMessage) {
         super(errorMessage);
         setErrorMessage(errorMessage);
     }
@@ -67,7 +67,7 @@ public class InvalidParameterException extends Exception {
      * @param cause Cause of this exception.
      */
     @SuppressWarnings("unused")
-    public InvalidParameterException(Throwable cause) {
+    public InvalidParameterValueException(Throwable cause) {
         super(cause);
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/impl/GadgetDataServiceDAOImpl.java

@@ -21,7 +21,8 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao.impl;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.analytics.dashboard.dao.GadgetDataServiceDAO;
 import org.wso2.carbon.device.mgt.analytics.dashboard.dao.GadgetDataServiceDAOFactory;
-import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterException;
+import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.*;
+import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
 
@@ -29,65 +30,84 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
 
     @Override
     public int getTotalDeviceCount() throws SQLException {
-        return this.getDeviceCount(null);
+        try {
+            return this.getDeviceCount(null);
+        } catch (InvalidParameterValueException e) {
+            throw new AssertionError(e);
+        }
     }
 
     @Override
     public int getActiveDeviceCount() throws SQLException {
-        Map<String, Object> filters = new HashMap<>();
+        FilterSet filterSet = new FilterSet();
-        filters.put("CONNECTIVITY_STATUS", "ACTIVE");
+        filterSet.setConnectivityStatus(ConnectivityStatus.active.toString());
-        return this.getDeviceCount(filters);
+        try {
+            return this.getDeviceCount(filterSet);
+        } catch (InvalidParameterValueException e) {
+            throw new AssertionError(e);
+        }
     }
 
     @Override
     public int getInactiveDeviceCount() throws SQLException {
-        Map<String, Object> filters = new HashMap<>();
+        FilterSet filterSet = new FilterSet();
-        filters.put("CONNECTIVITY_STATUS", "INACTIVE");
+        filterSet.setConnectivityStatus(ConnectivityStatus.inactive.toString());
-        return this.getDeviceCount(filters);
+        try {
+            return this.getDeviceCount(filterSet);
+        } catch (InvalidParameterValueException e) {
+            throw new AssertionError(e);
+        }
     }
 
     @Override
     public int getRemovedDeviceCount() throws SQLException {
-        Map<String, Object> filters = new HashMap<>();
+        FilterSet filterSet = new FilterSet();
-        filters.put("CONNECTIVITY_STATUS", "REMOVED");
+        filterSet.setConnectivityStatus(ConnectivityStatus.removed.toString());
-        return this.getDeviceCount(filters);
+        try {
+            return this.getDeviceCount(filterSet);
+        } catch (InvalidParameterValueException e) {
+            throw new AssertionError(e);
+        }
     }
 
     @Override
     public int getNonCompliantDeviceCount() throws SQLException {
-        Map<String, Object> filters = new HashMap<>();
+        FilterSet filterSet = new FilterSet();
-        filters.put("IS_COMPLIANT", 0);
+        filterSet.setPotentialVulnerability(PotentialVulnerability.non_compliant.toString());
-        return this.getDeviceCount(filters);
+        try {
+            return this.getDeviceCount(filterSet);
+        } catch (InvalidParameterValueException e) {
+            throw new AssertionError(e);
+        }
     }
 
     @Override
     public int getUnmonitoredDeviceCount() throws SQLException {
-        Map<String, Object> filters = new HashMap<>();
+        FilterSet filterSet = new FilterSet();
-        filters.put("POLICY_ID", -1);
+        filterSet.setPotentialVulnerability(PotentialVulnerability.unmonitored.toString());
-        return this.getDeviceCount(filters);
+        try {
+            return this.getDeviceCount(filterSet);
+        } catch (InvalidParameterValueException e) {
+            throw new AssertionError(e);
+        }
     }
 
     @Override
     public PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount)
-                                                                  throws InvalidParameterException, SQLException {
+                                                                  throws InvalidParameterValueException, SQLException {
 
         if (startIndex < 0) {
-            throw new InvalidParameterException("Start index (startIndex) should be " +
+            throw new InvalidParameterValueException("Start index should be equal to 0 or greater than that.");
-                "equal to 0 or greater than that.");
         }
 
         if (resultCount < 5) {
-            throw new InvalidParameterException("Result count (resultCount) should be " +
+            throw new InvalidParameterValueException("Result count should be equal to 5 or greater than that.");
-                "equal to 5 or greater than that.");
         }
 
         Connection con;
@@ -137,7 +157,10 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return paginationResult;
     }
 
-    public int getDeviceCount(Map<String, Object> filters) throws SQLException {
+    public int getDeviceCount(FilterSet filterSet) throws InvalidParameterValueException, SQLException {
+
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -179,13 +202,15 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return filteredDeviceCount;
     }
 
-    public int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, Map<String, Object> filters)
+    public int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, FilterSet filterSet)
-                                                 throws InvalidParameterException, SQLException {
+                                                        throws InvalidParameterValueException, SQLException {
 
         if (nonCompliantFeatureCode == null || "".equals(nonCompliantFeatureCode)) {
-            throw new InvalidParameterException("nonCompliantFeatureCode should not be either null or empty.");
+            throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty.");
         }
 
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -193,7 +218,8 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         int filteredDeviceCount = 0;
         try {
             con = this.getConnection();
-            String sql = "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT FROM DEVICES_VIEW_2 WHERE TENANT_ID = ? AND FEATURE_CODE = ?";
+            String sql = "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT FROM DEVICES_VIEW_2 " +
+                "WHERE TENANT_ID = ? AND FEATURE_CODE = ?";
             // appending filters to support advanced filtering options
             // [1] appending filter columns
             if (filters != null && filters.size() > 0) {
@@ -228,7 +254,11 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return filteredDeviceCount;
     }
 
-    public Map<String, Integer> getDeviceCountsByPlatforms(Map<String, Object> filters) throws SQLException {
+    public Map<String, Integer> getDeviceCountsByPlatforms(FilterSet filterSet)
+                                                           throws InvalidParameterValueException, SQLException {
+
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -273,13 +303,14 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
     }
 
     public Map<String, Integer> getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode,
-                                        Map<String, Object> filters) throws InvalidParameterException, SQLException {
+                                        FilterSet filterSet) throws InvalidParameterValueException, SQLException {
 
         if (nonCompliantFeatureCode == null || "".equals(nonCompliantFeatureCode)) {
-            throw new InvalidParameterException("Non-compliant feature code (nonCompliantFeatureCode) " +
+            throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty.");
-                "should not be either null or empty.");
         }
 
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -324,7 +355,11 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return filteredDeviceCountsByPlatforms;
     }
 
-    public Map<String, Integer> getDeviceCountsByOwnershipTypes(Map<String, Object> filters) throws SQLException {
+    public Map<String, Integer> getDeviceCountsByOwnershipTypes(FilterSet filterSet)
+                                                                throws InvalidParameterValueException, SQLException {
+
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -369,13 +404,14 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
     }
 
     public Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
-                                          Map<String, Object> filters) throws InvalidParameterException, SQLException {
+                                            FilterSet filterSet) throws InvalidParameterValueException, SQLException {
 
         if (nonCompliantFeatureCode == null || "".equals(nonCompliantFeatureCode)) {
-            throw new InvalidParameterException("Non-compliant feature code (nonCompliantFeatureCode) " +
+            throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty.");
-                    "should not be either null or empty.");
         }
 
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -420,19 +456,19 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return filteredDeviceCountsByOwnershipTypes;
     }
 
-    public PaginationResult getDevicesWithDetails(Map<String, Object> filters,
+    public PaginationResult getDevicesWithDetails(FilterSet filterSet, int startIndex, int resultCount)
-                                      int startIndex, int resultCount) throws InvalidParameterException, SQLException {
+                                                                throws InvalidParameterValueException, SQLException {
 
         if (startIndex < 0) {
-            throw new InvalidParameterException("Start index (startIndex) should be " +
+            throw new InvalidParameterValueException("Start index should be equal to 0 or greater than that.");
-                "equal to 0 or greater than that.");
         }
 
         if (resultCount < 5) {
-            throw new InvalidParameterException("Result count (resultCount) should be " +
+            throw new InvalidParameterValueException("Result count should be equal to 5 or greater than that.");
-                "equal to 5 or greater than that.");
         }
 
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -504,24 +540,23 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
     }
 
     public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                            Map<String, Object> filters, int startIndex, int resultCount)
+                                                        FilterSet filterSet, int startIndex, int resultCount)
-                                                                throws InvalidParameterException, SQLException {
+                                                                throws InvalidParameterValueException, SQLException {
 
         if (nonCompliantFeatureCode == null || "".equals(nonCompliantFeatureCode)) {
-            throw new InvalidParameterException("Non-compliant feature code (nonCompliantFeatureCode) " +
+            throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty.");
-                "should not be either null or empty.");
         }
 
         if (startIndex < 0) {
-            throw new InvalidParameterException("Start index (startIndex) should be " +
+            throw new InvalidParameterValueException("Start index should be equal to 0 or greater than that.");
-                "equal to 0 or greater than that.");
         }
 
         if (resultCount < 5) {
-            throw new InvalidParameterException("Result count (resultCount) should be " +
+            throw new InvalidParameterValueException("Result count should be equal to 5 or greater than that.");
-                "equal to 5 or greater than that.");
         }
 
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -595,7 +630,11 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return paginationResult;
     }
 
-    public List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) throws SQLException {
+    public List<Map<String, Object>> getDevicesWithDetails(FilterSet filterSet)
+                                            throws InvalidParameterValueException, SQLException {
+
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -645,13 +684,14 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
     }
 
     public List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                        Map<String, Object> filters) throws InvalidParameterException, SQLException {
+                                           FilterSet filterSet) throws InvalidParameterValueException, SQLException {
 
         if (nonCompliantFeatureCode == null || "".equals(nonCompliantFeatureCode)) {
-            throw new InvalidParameterException("Non-compliant feature code (nonCompliantFeatureCode) " +
+            throw new InvalidParameterValueException("Non-compliant feature code should not be either null or empty.");
-                "should not be either null or empty.");
         }
 
+        Map<String, Object> filters = this.extractDatabaseFiltersFromBean(filterSet);
+
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -702,6 +742,67 @@ public class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return filteredDevicesWithDetails;
     }
 
+    private Map<String, Object> extractDatabaseFiltersFromBean(FilterSet filterSet)
+                                                        throws InvalidParameterValueException {
+        if (filterSet == null) {
+            return null;
+        }
+
+        Map<String, Object> filters = new LinkedHashMap<>();
+
+        String connectivityStatus = filterSet.getConnectivityStatus();
+        if (connectivityStatus != null) {
+            if (ConnectivityStatus.active.toString().equals(connectivityStatus) ||
+                    ConnectivityStatus.inactive.toString().equals(connectivityStatus) ||
+                        ConnectivityStatus.removed.toString().equals(connectivityStatus)) {
+                filters.put("CONNECTIVITY_STATUS", connectivityStatus.toUpperCase());
+            } else {
+                throw new InvalidParameterValueException("Invalid use of value for platform. " +
+                    "Value of platform could only be either android, ios or windows.");
+            }
+        }
+
+        String potentialVulnerability = filterSet.getPotentialVulnerability();
+        if (potentialVulnerability != null) {
+            if (PotentialVulnerability.non_compliant.toString().equals(potentialVulnerability) ||
+                    PotentialVulnerability.unmonitored.toString().equals(potentialVulnerability)) {
+                if (PotentialVulnerability.non_compliant.toString().equals(potentialVulnerability)) {
+                    filters.put("IS_COMPLIANT", 0);
+                } else {
+                    filters.put("POLICY_ID", -1);
+                }
+            } else {
+                throw new InvalidParameterValueException("Invalid use of value for potential vulnerability. " +
+                    "Value of potential vulnerability could only be non_compliant or unmonitored.");
+            }
+        }
+
+        String platform = filterSet.getPlatform();
+        if (platform != null) {
+            if (Platform.android.toString().equals(platform) ||
+                    Platform.ios.toString().equals(platform) ||
+                        Platform.windows.toString().equals(platform)) {
+                filters.put("PLATFORM", platform);
+            } else {
+                throw new InvalidParameterValueException("Invalid use of value for platform. " +
+                    "Value of platform could only be either android, ios or windows.");
+            }
+        }
+
+        String ownership = filterSet.getOwnership();
+        if (ownership != null) {
+            if (Ownership.byod.toString().equals(ownership) ||
+                    Ownership.cope.toString().equals(ownership)) {
+                filters.put("OWNERSHIP", ownership.toUpperCase());
+            } else {
+                throw new InvalidParameterValueException("Invalid use of value for ownership. " +
+                    "Value of ownership could only be either BYOD or COPE.");
+            }
+        }
+
+        return filters;
+    }
+
     private Connection getConnection() throws SQLException {
         return GadgetDataServiceDAOFactory.getConnection();
     }

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

@@ -20,8 +20,8 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.impl;
 
 import org.wso2.carbon.device.mgt.analytics.dashboard.GadgetDataService;
 import org.wso2.carbon.device.mgt.analytics.dashboard.dao.GadgetDataServiceDAOFactory;
-import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterException;
+import org.wso2.carbon.device.mgt.analytics.dashboard.dao.bean.FilterSet;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
+import org.wso2.carbon.device.mgt.analytics.dashboard.dao.exception.InvalidParameterValueException;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 
 import java.sql.SQLException;
@@ -108,7 +108,7 @@ public class GadgetDataServiceImpl implements GadgetDataService {
 
     @Override
     public PaginationResult getNonCompliantDeviceCountsByFeatures(int startIndex, int resultCount)
-                                                            throws SQLException, InvalidParameterException {
+                                                            throws SQLException, InvalidParameterValueException {
         PaginationResult paginationResult;
         try {
             GadgetDataServiceDAOFactory.openConnection();
@@ -121,11 +121,11 @@ public class GadgetDataServiceImpl implements GadgetDataService {
     }
 
     @Override
-    public int getDeviceCount(Map<String, Object> filters) throws SQLException {
+    public int getDeviceCount(FilterSet filterSet) throws InvalidParameterValueException, SQLException {
         int deviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            deviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getDeviceCount(filters);
+            deviceCount = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getDeviceCount(filterSet);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -133,13 +133,13 @@ public class GadgetDataServiceImpl implements GadgetDataService {
     }
 
     @Override
-    public int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, Map<String, Object> filters)
+    public int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode, FilterSet filterSet)
-                                                                    throws SQLException, InvalidParameterException {
+                                                 throws InvalidParameterValueException, SQLException {
         int featureNonCompliantDeviceCount;
         try {
             GadgetDataServiceDAOFactory.openConnection();
             featureNonCompliantDeviceCount = GadgetDataServiceDAOFactory.
-                getGadgetDataServiceDAO().getFeatureNonCompliantDeviceCount(nonCompliantFeatureCode, filters);
+                getGadgetDataServiceDAO().getFeatureNonCompliantDeviceCount(nonCompliantFeatureCode, filterSet);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -147,12 +147,13 @@ public class GadgetDataServiceImpl implements GadgetDataService {
     }
 
     @Override
-    public Map<String, Integer> getDeviceCountsByPlatforms(Map<String, Object> filters) throws SQLException {
+    public Map<String, Integer> getDeviceCountsByPlatforms(FilterSet filterSet)
+                                                           throws InvalidParameterValueException, SQLException {
         Map<String, Integer> deviceCountsByPlatforms;
         try {
             GadgetDataServiceDAOFactory.openConnection();
             deviceCountsByPlatforms = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                getDeviceCountsByPlatforms(filters);
+                getDeviceCountsByPlatforms(filterSet);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -161,12 +162,12 @@ public class GadgetDataServiceImpl implements GadgetDataService {
 
     @Override
     public Map<String, Integer> getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode,
-                                         Map<String, Object> filters) throws SQLException, InvalidParameterException {
+                                           FilterSet filterSet) throws InvalidParameterValueException, SQLException {
         Map<String, Integer> featureNonCompliantDeviceCountsByPlatforms;
         try {
             GadgetDataServiceDAOFactory.openConnection();
             featureNonCompliantDeviceCountsByPlatforms = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                getFeatureNonCompliantDeviceCountsByPlatforms(nonCompliantFeatureCode, filters);
+                getFeatureNonCompliantDeviceCountsByPlatforms(nonCompliantFeatureCode, filterSet);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -174,12 +175,13 @@ public class GadgetDataServiceImpl implements GadgetDataService {
     }
 
     @Override
-    public Map<String, Integer> getDeviceCountsByOwnershipTypes(Map<String, Object> filters) throws SQLException {
+    public Map<String, Integer> getDeviceCountsByOwnershipTypes(FilterSet filterSet)
+                                                                throws InvalidParameterValueException, SQLException {
         Map<String, Integer> deviceCountsByOwnershipTypes;
         try {
             GadgetDataServiceDAOFactory.openConnection();
             deviceCountsByOwnershipTypes = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                getDeviceCountsByOwnershipTypes(filters);
+                getDeviceCountsByOwnershipTypes(filterSet);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -188,12 +190,12 @@ public class GadgetDataServiceImpl implements GadgetDataService {
 
     @Override
     public Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
-                                         Map<String, Object> filters) throws SQLException, InvalidParameterException {
+                                           FilterSet filterSet) throws SQLException, InvalidParameterValueException {
         Map<String, Integer> featureNonCompliantDeviceCountsByOwnershipTypes;
         try {
             GadgetDataServiceDAOFactory.openConnection();
             featureNonCompliantDeviceCountsByOwnershipTypes = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                getFeatureNonCompliantDeviceCountsByOwnershipTypes(nonCompliantFeatureCode, filters);
+                getFeatureNonCompliantDeviceCountsByOwnershipTypes(nonCompliantFeatureCode, filterSet);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -201,13 +203,13 @@ public class GadgetDataServiceImpl implements GadgetDataService {
     }
 
     @Override
-    public PaginationResult getDevicesWithDetails(Map<String, Object> filters,
+    public PaginationResult getDevicesWithDetails(FilterSet filterSet,
-                                     int startIndex, int resultCount) throws InvalidParameterException, SQLException {
+                               int startIndex, int resultCount) throws InvalidParameterValueException, SQLException {
         PaginationResult paginationResult;
         try {
             GadgetDataServiceDAOFactory.openConnection();
             paginationResult = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                getDevicesWithDetails(filters, startIndex, resultCount);
+                getDevicesWithDetails(filterSet, startIndex, resultCount);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -216,13 +218,13 @@ public class GadgetDataServiceImpl implements GadgetDataService {
 
     @Override
     public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                                Map<String, Object> filters, int startIndex, int resultCount)
+                                                FilterSet filterSet, int startIndex, int resultCount)
-                                                                    throws InvalidParameterException, SQLException {
+                                                                throws InvalidParameterValueException, SQLException {
         PaginationResult paginationResult;
         try {
             GadgetDataServiceDAOFactory.openConnection();
             paginationResult = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                    getFeatureNonCompliantDevicesWithDetails(nonCompliantFeatureCode, filters, startIndex, resultCount);
+                getFeatureNonCompliantDevicesWithDetails(nonCompliantFeatureCode, filterSet, startIndex, resultCount);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -230,11 +232,12 @@ public class GadgetDataServiceImpl implements GadgetDataService {
     }
 
     @Override
-    public List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) throws SQLException {
+    public List<Map<String, Object>> getDevicesWithDetails(FilterSet filterSet)
+                                                           throws InvalidParameterValueException, SQLException {
         List<Map<String, Object>> devicesWithDetails;
         try {
             GadgetDataServiceDAOFactory.openConnection();
-            devicesWithDetails = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getDevicesWithDetails(filters);
+            devicesWithDetails = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getDevicesWithDetails(filterSet);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }
@@ -243,12 +246,12 @@ public class GadgetDataServiceImpl implements GadgetDataService {
 
     @Override
     public List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                         Map<String, Object> filters) throws SQLException, InvalidParameterException {
+                                         FilterSet filterSet) throws InvalidParameterValueException, SQLException {
         List<Map<String, Object>> featureNonCompliantDevicesWithDetails;
         try {
             GadgetDataServiceDAOFactory.openConnection();
             featureNonCompliantDevicesWithDetails = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
-                getFeatureNonCompliantDevicesWithDetails(nonCompliantFeatureCode, filters);
+                getFeatureNonCompliantDevicesWithDetails(nonCompliantFeatureCode, filterSet);
         } finally {
             GadgetDataServiceDAOFactory.closeConnection();
         }

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

@@ -72,14 +72,14 @@ public class GadgetDataServiceComponent {
         //do nothing
     }
 
-    public void setDataSourceService(DataSourceService dataSourceService) {
+    protected void setDataSourceService(DataSourceService dataSourceService) {
         if (log.isDebugEnabled()) {
             log.debug("Binding org.wso2.carbon.ndatasource.core.DataSourceService...");
         }
         //do nothing
     }
 
-    public void unsetDataSourceService(DataSourceService dataSourceService) {
+    protected void unsetDataSourceService(DataSourceService dataSourceService) {
         if (log.isDebugEnabled()) {
             log.debug("Unbinding org.wso2.carbon.ndatasource.core.DataSourceService...");
         }