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/geethkokila/product-cdm

Browse Source
This commit is contained in:
manoj 2014-12-15 11:23:33 +05:30
commit 69c730d147
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java
View File

@ -63,7 +63,7 @@ public class AndroidAPIUtils {
}
device.setProperties(parseProperties(properties));
}else{
device.setProperties(new ArrayList<Property>(0));
device.setProperties(new ArrayList<Device.Property>(0));
}
if (obj.get(AndroidConstants.DeviceConstants.DEVICE_FEATURES_KEY) != null) {
@ -78,8 +78,8 @@ public class AndroidAPIUtils {
return device;
}
private static List<Property> parseProperties(JsonObject properties) {
List<Property> propertyList = new ArrayList<Property>(0);
private static List<Device.Property> parseProperties(JsonObject properties) {
List<Device.Property> propertyList = new ArrayList<Device.Property>(0);
for (Map.Entry<String, JsonElement> entry : properties.entrySet()) {
propertyList.add(parseProperty(entry.getKey(), entry.getValue()));
}
@ -93,20 +93,18 @@ public class AndroidAPIUtils {
}
private static List<Feature> parseFeatures(JsonObject features) {
List<Feature> featureList = new ArrayList<Feature>(0);
return featureList;
return new ArrayList<Feature>(0);
}
private static Property parseProperty(String property, JsonElement value) {
Property prop = new Property();
private static Device.Property parseProperty(String property, JsonElement value) {
Device.Property prop = new Device.Property();
prop.setName(property);
prop.setValue(value.getAsString());
return prop;
}
private static Feature parseFeature(JsonElement featureElement) {
Feature feature = new Feature();
return feature;
return new Feature();
}
public static DeviceIdentifier convertToDeviceIdentifierObject(String deviceId) {