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 FILE-FOLDER-API (5.2.0) to HEAD (5.2)

Browse Source 
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/HEAD/root@126384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 10:37:10 +00:00
parent f8a7dcfd4d
commit ff65db22e9
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 + "]";
}
}

6
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -313,15 +313,15 @@ public class NodeApiTest extends AbstractBaseApiTest
assertEquals(3, nodes.size());
assertEquals(folder2, nodes.get(0).getName());
assertEquals(folder1, nodes.get(1).getName());
Document node = (Document) nodes.get(2);
Document node = nodes.get(2);
assertEquals(content1, node.getName());
assertEquals("cm:content", node.getNodeType());
assertEquals(contentNodeRef.getId(), node.getId());
UserInfo createdByUser = node.getCreatedByUser();
assertEquals(user1, createdByUser.getUserName());
assertEquals(user1, createdByUser.getId());
assertEquals(user1 + " " + user1, createdByUser.getDisplayName());
UserInfo modifiedByUser = node.getModifiedByUser();
assertEquals(user1, modifiedByUser.getUserName());
assertEquals(user1, modifiedByUser.getId());
assertEquals(user1 + " " + user1, modifiedByUser.getDisplayName());
assertEquals(MimetypeMap.MIMETYPE_BINARY, node.getContent().getMimeType());
assertNotNull(node.getContent().getMimeTypeName());

12
source/test-java/org/alfresco/rest/api/tests/client/data/UserInfo.java
View File

@@ -28,16 +28,16 @@ import static org.junit.Assert.assertTrue;
*/
public class UserInfo
{
private String userName;
private String id;
private String displayName;
public UserInfo()
{
}
public UserInfo(String userName, String displayName)
public UserInfo(String id, String displayName)
{
this.userName = userName;
this.id = id;
this.displayName = displayName;
}
@@ -46,9 +46,9 @@ public class UserInfo
return displayName;
}
public String getUserName()
public String getId()
{
return userName;
return id;
}
public void expected(Object o)
@@ -57,7 +57,7 @@ public class UserInfo
UserInfo other = (UserInfo) o;
AssertUtil.assertEquals("userName", userName, other.getUserName());
AssertUtil.assertEquals("id", id, other.getId());
AssertUtil.assertEquals("displayName", displayName, other.getDisplayName());
}
}