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

Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes

Browse Source
This commit is contained in:
geethkokila 2016-03-30 23:56:44 +05:30
parent 41ba2f4f0a
commit 73a82f743f
4 changed files with 108 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/device/details/DeviceInfo.java
View File

@ -25,7 +25,7 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
public class DeviceInfo implements Serializable{
public class DeviceInfo implements Serializable {
private static final long serialVersionUID = 1998101733L;
@ -79,7 +79,11 @@ public class DeviceInfo implements Serializable{
}
public String getIMEI() {
return IMEI;
if (IMEI != null) {
return IMEI;
} else {
return "";
}
}
public void setIMEI(String IMEI) {
@ -87,7 +91,11 @@ public class DeviceInfo implements Serializable{
}
public String getIMSI() {
return IMSI;
if (IMSI != null) {
return IMSI;
} else {
return "";
}
}
public void setIMSI(String IMSI) {
@ -95,7 +103,11 @@ public class DeviceInfo implements Serializable{
}
public String getDeviceModel() {
return deviceModel;
if (deviceModel != null) {
return deviceModel;
} else {
return "";
}
}
public void setDeviceModel(String deviceModel) {
@ -103,7 +115,11 @@ public class DeviceInfo implements Serializable{
}
public String getVendor() {
return vendor;
if (vendor != null) {
return vendor;
} else {
return "";
}
}
public void setVendor(String vendor) {
@ -111,7 +127,11 @@ public class DeviceInfo implements Serializable{
}
public String getOsVersion() {
return osVersion;
if (osVersion != null) {
return osVersion;
} else {
return "";
}
}
public void setOsVersion(String osVersion) {
@ -119,7 +139,11 @@ public class DeviceInfo implements Serializable{
}
public Double getBatteryLevel() {
return batteryLevel;
if (batteryLevel != null) {
return batteryLevel;
} else {
return 0.0;
}
}
public void setBatteryLevel(Double batteryLevel) {
@ -127,7 +151,11 @@ public class DeviceInfo implements Serializable{
}
public Double getInternalTotalMemory() {
return internalTotalMemory;
if (internalTotalMemory != null) {
return internalTotalMemory;
} else {
return 0.0;
}
}
public void setInternalTotalMemory(Double internalTotalMemory) {
@ -135,7 +163,11 @@ public class DeviceInfo implements Serializable{
}
public Double getInternalAvailableMemory() {
return internalAvailableMemory;
if (internalAvailableMemory != null) {
return internalAvailableMemory;
} else {
return 0.0;
}
}
public void setInternalAvailableMemory(Double internalAvailableMemory) {
@ -143,7 +175,11 @@ public class DeviceInfo implements Serializable{
}
public Double getExternalTotalMemory() {
return externalTotalMemory;
if (externalTotalMemory != null) {
return externalTotalMemory;
} else {
return 0.0;
}
}
public void setExternalTotalMemory(Double externalTotalMemory) {
@ -151,7 +187,11 @@ public class DeviceInfo implements Serializable{
}
public Double getExternalAvailableMemory() {
return externalAvailableMemory;
if (externalAvailableMemory != null) {
return externalAvailableMemory;
} else {
return 0.0;
}
}
public void setExternalAvailableMemory(Double externalAvailableMemory) {
@ -159,7 +199,11 @@ public class DeviceInfo implements Serializable{
}
public String getOperator() {
return operator;
if (operator != null) {
return operator;
} else {
return "";
}
}
public void setOperator(String operator) {
@ -167,7 +211,11 @@ public class DeviceInfo implements Serializable{
}
public String getConnectionType() {
return connectionType;
if (connectionType != null) {
return connectionType;
} else {
return "";
}
}
public void setConnectionType(String connectionType) {
@ -175,7 +223,11 @@ public class DeviceInfo implements Serializable{
}
public Double getMobileSignalStrength() {
return mobileSignalStrength;
if (mobileSignalStrength != null) {
return mobileSignalStrength;
} else {
return 0.0;
}
}
public void setMobileSignalStrength(Double mobileSignalStrength) {
@ -183,7 +235,11 @@ public class DeviceInfo implements Serializable{
}
public String getSsid() {
return ssid;
if (ssid != null) {
return ssid;
} else {
return "";
}
}
public void setSsid(String ssid) {
@ -191,7 +247,11 @@ public class DeviceInfo implements Serializable{
}
public Double getCpuUsage() {
return cpuUsage;
if (cpuUsage != null) {
return cpuUsage;
} else {
return 0.0;
}
}
public void setCpuUsage(Double cpuUsage) {
@ -199,7 +259,11 @@ public class DeviceInfo implements Serializable{
}
public Double getTotalRAMMemory() {
return totalRAMMemory;
if (totalRAMMemory != null) {
return totalRAMMemory;
} else {
return 0.0;
}
}
public void setTotalRAMMemory(Double totalRAMMemory) {
@ -207,7 +271,11 @@ public class DeviceInfo implements Serializable{
}
public Double getAvailableRAMMemory() {
return availableRAMMemory;
if (availableRAMMemory != null) {
return availableRAMMemory;
} else {
return 0.0;
}
}
public void setAvailableRAMMemory(Double availableRAMMemory) {
@ -222,7 +290,7 @@ public class DeviceInfo implements Serializable{
this.pluggedIn = pluggedIn;
}
public void setDeviceDetailsMap(Map<String,String> deviceDetailsMap) {
public void setDeviceDetailsMap(Map<String, String> deviceDetailsMap) {
this.deviceDetailsMap = deviceDetailsMap;
}

6
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
View File

@ -101,6 +101,9 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
public void addDeviceLocation(DeviceLocation deviceLocation) throws DeviceDetailsMgtException {
try {
Device device = DeviceManagementDataHolder.getInstance().
getDeviceManagementProvider().getDevice(deviceLocation.getDeviceIdentifier());
deviceLocation.setDeviceId(device.getId());
DeviceManagementDAOFactory.beginTransaction();
deviceDetailsDAO.deleteDeviceLocation(deviceLocation.getDeviceId());
deviceDetailsDAO.addDeviceLocation(deviceLocation);
@ -111,6 +114,9 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
} catch (DeviceDetailsMgtDAOException e) {
DeviceManagementDAOFactory.rollbackTransaction();
throw new DeviceDetailsMgtException("Error occurred while adding the device location information.");
} catch (DeviceManagementException e) {
DeviceManagementDAOFactory.rollbackTransaction();
throw new DeviceDetailsMgtException("Error occurred while getting the device information.");
} finally {
DeviceManagementDAOFactory.closeConnection();
}

6
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/SearchDevice.java
View File

@ -27,8 +27,11 @@ import org.wso2.carbon.device.mgt.common.device.details.DeviceWrapper;
import org.wso2.carbon.device.mgt.common.search.Condition;
import org.wso2.carbon.device.mgt.common.search.SearchContext;
import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
import org.wso2.carbon.device.mgt.core.search.mgt.impl.SearchManagerServiceImpl;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
import java.util.ArrayList;
import java.util.List;
@ -40,7 +43,8 @@ public class SearchDevice extends BaseDeviceManagementTest {
@BeforeClass
@Override
public void init() throws Exception {
DeviceManagementProviderService deviceManagementProviderService = new DeviceManagementProviderServiceImpl();
DeviceManagementDataHolder.getInstance().setDeviceManagementProvider(deviceManagementProviderService);
}
@Test

17
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/util/Utils.java
View File

@ -34,13 +34,7 @@ public class Utils {
DeviceInfo deviceInfo = new DeviceInfo();
DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
deviceIdentifier.setType(TestDataHolder.TEST_DEVICE_TYPE);
deviceIdentifier.setId("12345");
deviceInfo.setDeviceIdentifier(deviceIdentifier);
deviceInfo.setDeviceIdentifier(Utils.getDeviceIdentifier());
deviceInfo.setDeviceId(1);
deviceInfo.setIMSI("e6f236ac82537a8e");
@ -88,6 +82,7 @@ public class Utils {
DeviceLocation deviceLocation = new DeviceLocation();
deviceLocation.setDeviceIdentifier(Utils.getDeviceIdentifier());
deviceLocation.setLatitude(76.2422);
deviceLocation.setLongitude(81.43);
deviceLocation.setStreet1("4");
@ -100,6 +95,14 @@ public class Utils {
return deviceLocation;
}
private static DeviceIdentifier getDeviceIdentifier(){
DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
deviceIdentifier.setType(TestDataHolder.TEST_DEVICE_TYPE);
deviceIdentifier.setId("12345");
return deviceIdentifier;
}
}