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

Adding isEmpty check

Browse Source
revert-70aa11f8
Megala 8 years ago
parent 0642cc10d7
commit e77d8b8b29
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

@ -107,7 +107,7 @@ public class UserManagementServiceImpl implements UserManagementService {
@Override @Override
public Response getUser(@PathParam("username") String username, @QueryParam("domain") String domain, public Response getUser(@PathParam("username") String username, @QueryParam("domain") String domain,
@HeaderParam("If-Modified-Since") String ifModifiedSince) { @HeaderParam("If-Modified-Since") String ifModifiedSince) {
if (domain != null) { if (domain != null && !domain.isEmpty()) {
username = domain + '/' + username; username = domain + '/' + username;
} }
try { try {
@ -135,7 +135,7 @@ public class UserManagementServiceImpl implements UserManagementService {
@Path("/{username}") @Path("/{username}")
@Override @Override
public Response updateUser(@PathParam("username") String username, @QueryParam("domain") String domain, UserInfo userInfo) { public Response updateUser(@PathParam("username") String username, @QueryParam("domain") String domain, UserInfo userInfo) {
if (domain != null) { if (domain != null && !domain.isEmpty()) {
username = domain + '/' + username; username = domain + '/' + username;
} }
try { try {
@ -212,7 +212,7 @@ public class UserManagementServiceImpl implements UserManagementService {
@Path("/{username}") @Path("/{username}")
@Override @Override
public Response removeUser(@PathParam("username") String username, @QueryParam("domain") String domain) { public Response removeUser(@PathParam("username") String username, @QueryParam("domain") String domain) {
if (domain != null) { if (domain != null && !domain.isEmpty()) {
username = domain + '/' + username; username = domain + '/' + username;
} }
try { try {
@ -243,7 +243,7 @@ public class UserManagementServiceImpl implements UserManagementService {
@Path("/{username}/roles") @Path("/{username}/roles")
@Override @Override
public Response getRolesOfUser(@PathParam("username") String username, @QueryParam("domain") String domain) { public Response getRolesOfUser(@PathParam("username") String username, @QueryParam("domain") String domain) {
if (domain != null) { if (domain != null && !domain.isEmpty()) {
username = domain + '/' + username; username = domain + '/' + username;
} }
try { try {

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

@ -38,7 +38,7 @@ public class UserManagementAdminServiceImpl implements UserManagementAdminServic
public Response resetUserPassword(@PathParam("username") public Response resetUserPassword(@PathParam("username")
@Size(max = 45) @Size(max = 45)
String user, @QueryParam("domain") String domain, PasswordResetWrapper credentials) { String user, @QueryParam("domain") String domain, PasswordResetWrapper credentials) {
if (domain != null) { if (domain != null && !domain.isEmpty()) {
user = domain + '/' + user; user = domain + '/' + user;
} }
return CredentialManagementResponseBuilder.buildResetPasswordResponse(user, credentials); return CredentialManagementResponseBuilder.buildResetPasswordResponse(user, credentials);

Write Preview
Loading…
Cancel
Save