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 public class UserInfo implements Serializable
{ {
private String userName; private String id;
private String displayName; private String displayName;
public UserInfo() 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(); this.displayName = ((firstName != null ? firstName + " " : "") + (lastName != null ? lastName : "")).trim();
} }
@@ -46,14 +46,14 @@ public class UserInfo implements Serializable
return displayName; return displayName;
} }
public String getUserName() public String getId()
{ {
return userName; return id;
} }
@Override @Override
public String toString() 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(3, nodes.size());
assertEquals(folder2, nodes.get(0).getName()); assertEquals(folder2, nodes.get(0).getName());
assertEquals(folder1, nodes.get(1).getName()); assertEquals(folder1, nodes.get(1).getName());
Document node = (Document) nodes.get(2); Document node = nodes.get(2);
assertEquals(content1, node.getName()); assertEquals(content1, node.getName());
assertEquals("cm:content", node.getNodeType()); assertEquals("cm:content", node.getNodeType());
assertEquals(contentNodeRef.getId(), node.getId()); assertEquals(contentNodeRef.getId(), node.getId());
UserInfo createdByUser = node.getCreatedByUser(); UserInfo createdByUser = node.getCreatedByUser();
assertEquals(user1, createdByUser.getUserName()); assertEquals(user1, createdByUser.getId());
assertEquals(user1 + " " + user1, createdByUser.getDisplayName()); assertEquals(user1 + " " + user1, createdByUser.getDisplayName());
UserInfo modifiedByUser = node.getModifiedByUser(); UserInfo modifiedByUser = node.getModifiedByUser();
assertEquals(user1, modifiedByUser.getUserName()); assertEquals(user1, modifiedByUser.getId());
assertEquals(user1 + " " + user1, modifiedByUser.getDisplayName()); assertEquals(user1 + " " + user1, modifiedByUser.getDisplayName());
assertEquals(MimetypeMap.MIMETYPE_BINARY, node.getContent().getMimeType()); assertEquals(MimetypeMap.MIMETYPE_BINARY, node.getContent().getMimeType());
assertNotNull(node.getContent().getMimeTypeName()); 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 public class UserInfo
{ {
private String userName; private String id;
private String displayName; private String displayName;
public UserInfo() public UserInfo()
{ {
} }
public UserInfo(String userName, String displayName) public UserInfo(String id, String displayName)
{ {
this.userName = userName; this.id = id;
this.displayName = displayName; this.displayName = displayName;
} }
@@ -46,9 +46,9 @@ public class UserInfo
return displayName; return displayName;
} }
public String getUserName() public String getId()
{ {
return userName; return id;
} }
public void expected(Object o) public void expected(Object o)
@@ -57,7 +57,7 @@ public class UserInfo
UserInfo other = (UserInfo) o; UserInfo other = (UserInfo) o;
AssertUtil.assertEquals("userName", userName, other.getUserName()); AssertUtil.assertEquals("id", id, other.getId());
AssertUtil.assertEquals("displayName", displayName, other.getDisplayName()); AssertUtil.assertEquals("displayName", displayName, other.getDisplayName());
} }
} }