inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126384 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120464 jkaabimofrad: RA-725: Changed the "userName" property in minimal person response to "id".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:56:17 +00:00
parent ffdfaf608e
commit 08ac84ff25
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/rest/api/model/UserInfo.java
View File

@@ -28,16 +28,16 @@ import java.io.Serializable;
*/
public class UserInfo implements Serializable
{
private String userName;
private String id;
private String displayName;
public UserInfo()
{
}
public UserInfo(String userName, String firstName, String lastName)
public UserInfo(String id, String firstName, String lastName)
{
this.userName = userName;
this.id = id;
this.displayName = ((firstName != null ? firstName + " " : "") + (lastName != null ? lastName : "")).trim();
}
@@ -46,14 +46,14 @@ public class UserInfo implements Serializable
return displayName;
}
public String getUserName()
public String getId()
{
return userName;
return id;
}
@Override
public String toString()
{
return "User [userName=" + userName + ", displayName=" + displayName + "]";
return "User [id=" + id + ", displayName=" + displayName + "]";
}
}