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 {
@@ -635,21 +636,35 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         return device;
     }
 
-	@Override
+    @Override
-	public List<DeviceType> getAvailableDeviceTypes() throws DeviceManagementException {
+    public List<DeviceType> getAvailableDeviceTypes() throws DeviceManagementException {
-		List<DeviceType> deviceTypes;
+        List<DeviceType> deviceTypesInDatabase;
-		try {
+        List<DeviceType> deviceTypesResponse = new ArrayList<>();
-			DeviceManagementDAOFactory.openConnection();
+        try {
-			deviceTypes = deviceDAO.getDeviceTypes();
+            DeviceManagementDAOFactory.openConnection();
-		} catch (DeviceManagementDAOException e) {
+            deviceTypesInDatabase = deviceDAO.getDeviceTypes();
-			throw new DeviceManagementException("Error occurred while obtaining the device types.", e);
+            Map<String, DeviceManagementService> registeredTypes = pluginRepository.getAllDeviceManagementServices();
-		} catch (SQLException e) {
+            DeviceType deviceType;
-			throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
+
-		} finally {
+            if (registeredTypes != null && deviceTypesInDatabase != null) {
-			DeviceManagementDAOFactory.closeConnection();
+                for (int x = 0; x < deviceTypesInDatabase.size(); x++) {
-		}
+                    if (registeredTypes.get(deviceTypesInDatabase.get(x).getName()) != null) {
-		return deviceTypes;
+                        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) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
+        }
+        return deviceTypesResponse;
+    }
 
 	@Override
     public boolean updateDeviceInfo(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {