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

Fixing getDevice method to support status, ownership, etc as query param filters

Browse Source
This commit is contained in:
prabathabey 2016-06-01 01:30:02 +05:30
parent 12a22d86ef
commit 61beca5048
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
View File

@ -77,14 +77,18 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
PaginationResult result;
if (type != null) {
request.setDeviceType(type);
result = dms.getDevicesByType(request);
} else if (user != null) {
request.setOwner(user);
result = dms.getDevicesOfUser(request);
} else if (ownership != null) {
RequestValidationUtil.validateOwnershipType(ownership);
request.setOwnership(ownership);
result = dms.getDevicesByOwnership(request);
} else if (status != null) {
RequestValidationUtil.validateStatus(status);
request.setStatus(status);
result = dms.getDevicesByStatus(request);
} else {
result = dms.getAllDevices(request);

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
View File

@ -79,7 +79,7 @@ public class UserManagementServiceImpl implements UserManagementService {
this.inviteNewlyAddedUserToEnrollDevice(userWrapper.getUsername(), initialUserPassword);
// Outputting debug message upon successful addition of user
if (log.isDebugEnabled()) {
log.debug("User by username: " + userWrapper.getUsername() + " was successfully added.");
log.debug("User '" + userWrapper.getUsername() + "' has successfully been added.");
}
// returning response with success state
return Response.status(Response.Status.OK).entity("User by username: " + userWrapper.getUsername() +