From ff65db22e9f048fa436e05275519b70df1f1dac0 Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad <Jamal.kaabimofrad@alfresco.com>
Date: Tue, 10 May 2016 10:37:10 +0000
Subject: [PATCH] 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/HEAD/root@126384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/rest/api/model/UserInfo.java   | 12 ++++++------
 .../org/alfresco/rest/api/tests/NodeApiTest.java     |  6 +++---
 .../rest/api/tests/client/data/UserInfo.java         | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/model/UserInfo.java b/source/java/org/alfresco/rest/api/model/UserInfo.java
index 371dc9fcf4..9c7d3eee45 100644
--- a/source/java/org/alfresco/rest/api/model/UserInfo.java
+++ b/source/java/org/alfresco/rest/api/model/UserInfo.java
@@ -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 + "]";
     }
 }
diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
index e7d7a63ab8..8f1538a7b4 100644
--- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
@@ -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());
diff --git a/source/test-java/org/alfresco/rest/api/tests/client/data/UserInfo.java b/source/test-java/org/alfresco/rest/api/tests/client/data/UserInfo.java
index 4e7e7d0dc1..bd7abda394 100644
--- a/source/test-java/org/alfresco/rest/api/tests/client/data/UserInfo.java
+++ b/source/test-java/org/alfresco/rest/api/tests/client/data/UserInfo.java
@@ -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());
     }
 }