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

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java

@@ -31,7 +31,7 @@ public class Device {
 	private Long dateOfEnrolment;
 	private Long dateOfLastUpdate;
 	private String ownership;
-	private boolean status;
+	private Status status;
 	private int deviceTypeId;
 	private String deviceIdentifier;
 	private String owner;
@@ -101,11 +101,11 @@ public class Device {
 	}
 
 	@XmlElement
-	public boolean isStatus() {
+	public Status getStatus() {
 		return status;
 	}
 
-	public void setStatus(boolean status) {
+	public void setStatus(Status status) {
 		this.status = status;
 	}
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java

@@ -126,11 +126,7 @@ public final class DeviceManagementDAOUtil {
 		deviceBO.setId(device.getId());
 		deviceBO.setOwner(device.getOwnerId());
 		deviceBO.setOwnership(device.getOwnerShip());
-		if (device.getStatus() == Status.ACTIVE) {
+		deviceBO.setStatus(device.getStatus());
-			deviceBO.setStatus(true);
-		} else if (device.getStatus() == Status.INACTIVE) {
-			deviceBO.setStatus(false);
-		}
 		return deviceBO;
 	}
 
@@ -141,12 +137,7 @@ public final class DeviceManagementDAOUtil {
 		deviceBO.setName(device.getName());
 		deviceBO.setDateOfEnrollment(device.getDateOfEnrolment());
 		deviceBO.setDateOfLastUpdate(device.getDateOfLastUpdate());
-
+		deviceBO.setStatus(device.getStatus());
-		if (!device.isStatus()) {
-			deviceBO.setStatus(Status.INACTIVE);
-		} else {
-			deviceBO.setStatus(Status.ACTIVE);
-		}
 		deviceBO.setOwnerId(device.getOwner());
 		deviceBO.setOwnerShip(device.getOwnership());
 		deviceBO.setTenantId(DeviceManagementDAOUtil.getTenantId());