nishan
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the properties implementation to a Map from List. Removed unnecessary utility methods. Changed the conversion util methods.

Browse Source
revert-70aa11f8
Dulitha Wijewantha 10 years ago
parent 6eabb80e47
commit a195844042
2 changed files with 27 additions and 67 deletions
Show Stats Download Patch File Download Diff File

29
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java
Unescape View File

@ -18,6 +18,7 @@ package org.wso2.carbon.device.mgt.common;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import java.util.List; import java.util.List;
import java.util.Map;
@XmlRootElement @XmlRootElement
public class Device { public class Device {
@ -34,7 +35,7 @@ public class Device {
private String deviceIdentifier; private String deviceIdentifier;
private String owner; private String owner;
private List<Feature> features; private List<Feature> features;
private List<Device.Property> properties; private Map<String, String> properties;
@XmlElement @XmlElement
public int getId() { public int getId() {
@ -145,34 +146,12 @@ public class Device {
} }
@XmlElement @XmlElement
public List<Device.Property> getProperties() { public Map<String, String> getProperties() {
return properties; return properties;
} }
public void setProperties(List<Device.Property> properties) { public void setProperties(Map<String, String> properties) {
this.properties = properties; this.properties = properties;
} }
public static class Property {
private String name;
private String value;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}
} }

65
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
Unescape View File

@ -60,39 +60,19 @@ public class MobileDeviceManagementUtil {
} }
} }
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) { public static MobileDevice convertToMobileDevice(Device device) {
MobileDevice mobileDevice = null; MobileDevice mobileDevice = null;
if (device != null) { if (device != null) {
mobileDevice = new MobileDevice(); mobileDevice = new MobileDevice();
mobileDevice.setMobileDeviceId(device.getDeviceIdentifier()); mobileDevice.setMobileDeviceId(device.getDeviceIdentifier());
mobileDevice.setImei(getPropertyValue(device, MOBILE_DEVICE_IMEI)); mobileDevice.setImei(device.getProperties().get(MOBILE_DEVICE_IMEI));
mobileDevice.setImsi(getPropertyValue(device, MOBILE_DEVICE_IMSI)); mobileDevice.setImsi(device.getProperties().get(MOBILE_DEVICE_IMSI));
mobileDevice.setRegId(getPropertyValue(device, MOBILE_DEVICE_REG_ID)); mobileDevice.setRegId(device.getProperties().get(MOBILE_DEVICE_REG_ID));
mobileDevice.setModel(getPropertyValue(device, MOBILE_DEVICE_MODEL)); mobileDevice.setModel(device.getProperties().get(MOBILE_DEVICE_MODEL));
mobileDevice.setOsVersion(getPropertyValue(device, MOBILE_DEVICE_OS_VERSION)); mobileDevice.setOsVersion(device.getProperties().get(MOBILE_DEVICE_OS_VERSION));
mobileDevice.setVendor(getPropertyValue(device, MOBILE_DEVICE_VENDOR)); mobileDevice.setVendor(device.getProperties().get(MOBILE_DEVICE_VENDOR));
mobileDevice.setLatitude(getPropertyValue(device, MOBILE_DEVICE_LATITUDE)); mobileDevice.setLatitude(device.getProperties().get(MOBILE_DEVICE_LATITUDE));
mobileDevice.setLongitude(getPropertyValue(device, MOBILE_DEVICE_LONGITUDE)); mobileDevice.setLongitude(device.getProperties().get(MOBILE_DEVICE_LONGITUDE));
} }
return mobileDevice; return mobileDevice;
} }
@ -101,16 +81,16 @@ public class MobileDeviceManagementUtil {
Device device = null; Device device = null;
if (mobileDevice != null) { if (mobileDevice != null) {
device = new Device(); device = new Device();
List<Device.Property> propertyList = new ArrayList<Device.Property>(); Map<String, String> propertyMap = new HashMap<String, String>();
propertyList.add(getProperty(MOBILE_DEVICE_IMEI, mobileDevice.getImei())); propertyMap.put(MOBILE_DEVICE_IMEI, mobileDevice.getImei());
propertyList.add(getProperty(MOBILE_DEVICE_IMSI, mobileDevice.getImsi())); propertyMap.put(MOBILE_DEVICE_IMSI, mobileDevice.getImsi());
propertyList.add(getProperty(MOBILE_DEVICE_REG_ID, mobileDevice.getRegId())); propertyMap.put(MOBILE_DEVICE_REG_ID, mobileDevice.getRegId());
propertyList.add(getProperty(MOBILE_DEVICE_MODEL, mobileDevice.getModel())); propertyMap.put(MOBILE_DEVICE_MODEL, mobileDevice.getModel());
propertyList.add(getProperty(MOBILE_DEVICE_OS_VERSION, mobileDevice.getOsVersion())); propertyMap.put(MOBILE_DEVICE_OS_VERSION, mobileDevice.getOsVersion());
propertyList.add(getProperty(MOBILE_DEVICE_VENDOR, mobileDevice.getVendor())); propertyMap.put(MOBILE_DEVICE_VENDOR, mobileDevice.getVendor());
propertyList.add(getProperty(MOBILE_DEVICE_LATITUDE, mobileDevice.getLatitude())); propertyMap.put(MOBILE_DEVICE_LATITUDE, mobileDevice.getLatitude());
propertyList.add(getProperty(MOBILE_DEVICE_LONGITUDE, mobileDevice.getLongitude())); propertyMap.put(MOBILE_DEVICE_LONGITUDE, mobileDevice.getLongitude());
device.setProperties(propertyList); device.setProperties(propertyMap);
device.setDeviceIdentifier(mobileDevice.getMobileDeviceId()); device.setDeviceIdentifier(mobileDevice.getMobileDeviceId());
} }
return device; return device;
@ -137,18 +117,19 @@ public class MobileDeviceManagementUtil {
public static List<Integer> getMobileOperationIdsFromMobileDeviceOperations( public static List<Integer> getMobileOperationIdsFromMobileDeviceOperations(
List<MobileDeviceOperation> mobileDeviceOperations) { List<MobileDeviceOperation> mobileDeviceOperations) {
List<Integer> mobileOperationIds = new ArrayList<Integer>(); List<Integer> mobileOperationIds = new ArrayList<Integer>();
for(MobileDeviceOperation mobileDeviceOperation:mobileDeviceOperations){ for (MobileDeviceOperation mobileDeviceOperation : mobileDeviceOperations) {
mobileOperationIds.add(mobileDeviceOperation.getOperationId()); mobileOperationIds.add(mobileDeviceOperation.getOperationId());
} }
return mobileOperationIds; return mobileOperationIds;
} }
public static Operation convertMobileOperationToOperation(MobileOperation mobileOperation){ public static Operation convertMobileOperationToOperation(MobileOperation mobileOperation) {
Operation operation = new Operation(); Operation operation = new Operation();
Properties properties = new Properties(); Properties properties = new Properties();
operation.setCode(mobileOperation.getFeatureCode()); operation.setCode(mobileOperation.getFeatureCode());
for(MobileOperationProperty mobileOperationProperty:mobileOperation.getProperties()){ for (MobileOperationProperty mobileOperationProperty : mobileOperation.getProperties()) {
properties.put(mobileOperationProperty.getProperty(),mobileOperationProperty.getValue()); properties
.put(mobileOperationProperty.getProperty(), mobileOperationProperty.getValue());
} }
operation.setProperties(properties); operation.setProperties(properties);
return operation; return operation;

Write Preview
Loading…
Cancel
Save