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

Minor refactoring related to wso2/product-iots#1035

Browse Source
This commit is contained in:
Harshan Liyanage 2017-09-04 11:56:56 +05:30
parent a3aa259437
commit 5906546dfb
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,9 +167,8 @@ public class UserManagementServiceImpl implements UserManagementService {
} }
userInfoWrapper.setBasicUserInfo(createdUserInfo); userInfoWrapper.setBasicUserInfo(createdUserInfo);
userInfoWrapper.setMessage(message); userInfoWrapper.setMessage(message);
return Response.created(new URI(API_BASE_PATH + "/" + URIEncoder.encode(userInfo.getUsername(), "UTF-8"))) return Response.created(new URI(API_BASE_PATH + "/" + URIEncoder.encode(userInfo.getUsername(),
.entity( "UTF-8"))).entity(userInfoWrapper).build();
userInfoWrapper).build();
} catch (UserStoreException e) { } catch (UserStoreException e) {
String msg = "Error occurred while trying to add user '" + userInfo.getUsername() + "' to the " + String msg = "Error occurred while trying to add user '" + userInfo.getUsername() + "' to the " +
"underlying user management system"; "underlying user management system";
@ -189,8 +188,7 @@ public class UserManagementServiceImpl implements UserManagementService {
return Response.serverError().entity( return Response.serverError().entity(
new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
String msg = "Error occurred while sending registration email to the user " + String msg = "Error occurred while sending registration email to the user " + userInfo.getUsername();
userInfo.getUsername();
log.error(msg, e); log.error(msg, e);
return Response.serverError().entity( return Response.serverError().entity(
new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();

6
components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java
View File

@ -62,8 +62,8 @@ public class EmailSenderServiceImpl implements EmailSenderService {
} }
private boolean isMailServerConfigured() { private boolean isMailServerConfigured() {
if(EmailSenderDataHolder.getInstance().getConfigurationContextService() if(EmailSenderDataHolder.getInstance().getConfigurationContextService().getServerConfigContext().
.getServerConfigContext().getAxisConfiguration().getTransportOut(TRANSPORT_SENDER_NAME) != null) { getAxisConfiguration().getTransportOut(TRANSPORT_SENDER_NAME) != null) {
return true; return true;
} else { } else {
return false; return false;
@ -141,7 +141,5 @@ public class EmailSenderServiceImpl implements EmailSenderService {
"'", e); "'", e);
} }
} }
} }
} }