From dcf222d2c16bcb3002899afa81968ee473b53f67 Mon Sep 17 00:00:00 2001 From: Dulitha Wijewantha Date: Fri, 23 Jan 2015 11:29:33 +0530 Subject: [PATCH] Reverted changes back to the list implementation. The Map conversion is not properly supported in CFX --- .../util/MobileDeviceManagementUtil.java | 54 ++++++++++++------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java index 78b120e48..482136f08 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java @@ -59,20 +59,38 @@ public class MobileDeviceManagementUtil { "to a org.w3c.dom.Document : " + e.getMessage(), e); } } + private static String getPropertyValue(Device device, String property) { + for (Device.Property prop : device.getProperties()) { + if (property.equals(prop.getName())) { + return prop.getValue(); + } + } + return null; + } + private static Device.Property getProperty(String property, String value) { + Device.Property prop = null; + if (property != null) { + prop = new Device.Property(); + prop.setName(property); + prop.setValue(value); + return prop; + } + return prop; + } public static MobileDevice convertToMobileDevice(Device device) { MobileDevice mobileDevice = null; if (device != null) { mobileDevice = new MobileDevice(); mobileDevice.setMobileDeviceId(device.getDeviceIdentifier()); - mobileDevice.setImei(device.getProperties().get(MOBILE_DEVICE_IMEI)); - mobileDevice.setImsi(device.getProperties().get(MOBILE_DEVICE_IMSI)); - mobileDevice.setRegId(device.getProperties().get(MOBILE_DEVICE_REG_ID)); - mobileDevice.setModel(device.getProperties().get(MOBILE_DEVICE_MODEL)); - mobileDevice.setOsVersion(device.getProperties().get(MOBILE_DEVICE_OS_VERSION)); - mobileDevice.setVendor(device.getProperties().get(MOBILE_DEVICE_VENDOR)); - mobileDevice.setLatitude(device.getProperties().get(MOBILE_DEVICE_LATITUDE)); - mobileDevice.setLongitude(device.getProperties().get(MOBILE_DEVICE_LONGITUDE)); + mobileDevice.setImei(getPropertyValue(device, MOBILE_DEVICE_IMEI)); + mobileDevice.setImsi(getPropertyValue(device, MOBILE_DEVICE_IMSI)); + mobileDevice.setRegId(getPropertyValue(device, MOBILE_DEVICE_REG_ID)); + mobileDevice.setModel(getPropertyValue(device, MOBILE_DEVICE_MODEL)); + mobileDevice.setOsVersion(getPropertyValue(device, MOBILE_DEVICE_OS_VERSION)); + mobileDevice.setVendor(getPropertyValue(device, MOBILE_DEVICE_VENDOR)); + mobileDevice.setLatitude(getPropertyValue(device, MOBILE_DEVICE_LATITUDE)); + mobileDevice.setLongitude(getPropertyValue(device, MOBILE_DEVICE_LONGITUDE)); } return mobileDevice; } @@ -81,16 +99,16 @@ public class MobileDeviceManagementUtil { Device device = null; if (mobileDevice != null) { device = new Device(); - Map propertyMap = new HashMap(); - propertyMap.put(MOBILE_DEVICE_IMEI, mobileDevice.getImei()); - propertyMap.put(MOBILE_DEVICE_IMSI, mobileDevice.getImsi()); - propertyMap.put(MOBILE_DEVICE_REG_ID, mobileDevice.getRegId()); - propertyMap.put(MOBILE_DEVICE_MODEL, mobileDevice.getModel()); - propertyMap.put(MOBILE_DEVICE_OS_VERSION, mobileDevice.getOsVersion()); - propertyMap.put(MOBILE_DEVICE_VENDOR, mobileDevice.getVendor()); - propertyMap.put(MOBILE_DEVICE_LATITUDE, mobileDevice.getLatitude()); - propertyMap.put(MOBILE_DEVICE_LONGITUDE, mobileDevice.getLongitude()); - device.setProperties(propertyMap); + List propertyList = new ArrayList(); + propertyList.add(getProperty(MOBILE_DEVICE_IMEI, mobileDevice.getImei())); + propertyList.add(getProperty(MOBILE_DEVICE_IMSI, mobileDevice.getImsi())); + propertyList.add(getProperty(MOBILE_DEVICE_REG_ID, mobileDevice.getRegId())); + propertyList.add(getProperty(MOBILE_DEVICE_MODEL, mobileDevice.getModel())); + propertyList.add(getProperty(MOBILE_DEVICE_OS_VERSION, mobileDevice.getOsVersion())); + propertyList.add(getProperty(MOBILE_DEVICE_VENDOR, mobileDevice.getVendor())); + propertyList.add(getProperty(MOBILE_DEVICE_LATITUDE, mobileDevice.getLatitude())); + propertyList.add(getProperty(MOBILE_DEVICE_LONGITUDE, mobileDevice.getLongitude())); + device.setProperties(propertyList); device.setDeviceIdentifier(mobileDevice.getMobileDeviceId()); } return device;