community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
geethkokila 2015-11-10 18:09:06 +05:30
commit ae3d5564ff
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -47,6 +47,7 @@ import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
public class DeviceManagementProviderServiceImpl implements DeviceManagementProviderService, public class DeviceManagementProviderServiceImpl implements DeviceManagementProviderService,
PluginInitializationListener { PluginInitializationListener {
@ -635,21 +636,35 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
return device; 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 @Override
public boolean updateDeviceInfo(DeviceIdentifier deviceId, Device device) throws DeviceManagementException { public boolean updateDeviceInfo(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {