Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java

@@ -65,6 +65,10 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
         return providers.get(type);
     }
 
+    public Map<String, DeviceManagementService> getAllDeviceManagementServices() {
+        return providers;
+    }
+
     @Override
     public void notifyObserver() {
         synchronized (providers) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -47,6 +47,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public class DeviceManagementProviderServiceImpl implements DeviceManagementProviderService,
         PluginInitializationListener {
@@ -637,10 +638,24 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
 
     @Override
     public List<DeviceType> getAvailableDeviceTypes() throws DeviceManagementException {
-		List<DeviceType> deviceTypes;
+        List<DeviceType> deviceTypesInDatabase;
+        List<DeviceType> deviceTypesResponse = new ArrayList<>();
         try {
             DeviceManagementDAOFactory.openConnection();
-			deviceTypes = deviceDAO.getDeviceTypes();
+            deviceTypesInDatabase = deviceDAO.getDeviceTypes();
+            Map<String, DeviceManagementService> registeredTypes = pluginRepository.getAllDeviceManagementServices();
+            DeviceType deviceType;
+
+            if (registeredTypes != null && deviceTypesInDatabase != null) {
+                for (int x = 0; x < deviceTypesInDatabase.size(); x++) {
+                    if (registeredTypes.get(deviceTypesInDatabase.get(x).getName()) != null) {
+                        deviceType = new DeviceType();
+                        deviceType.setId(deviceTypesInDatabase.get(x).getId());
+                        deviceType.setName(deviceTypesInDatabase.get(x).getName());
+                        deviceTypesResponse.add(deviceType);
+                    }
+                }
+            }
         } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException("Error occurred while obtaining the device types.", e);
         } catch (SQLException e) {
@@ -648,7 +663,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
-		return deviceTypes;
+        return deviceTypesResponse;
     }
 
 	@Override