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

126350 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118728 jvonka: RA-613 / RA-655
      - fix for TestFavourites failure (+ related backwards compat' for Favorites API response format)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/model/Node.java

@@ -52,13 +52,6 @@ public class Node implements Comparable<Node>
     protected NodeRef nodeRef;
     protected String name;
 
-    // TODO needed for favourties - backwards compat' - we could also choose to split of NodeInfo / Node impl's etc
-    protected String title;
-    protected NodeRef guid;
-    protected String description;
-    protected String createdBy;
-    protected String modifiedBy;
-
     protected Date createdAt;
     protected Date modifiedAt;
     protected UserInfo createdByUser;
@@ -84,7 +77,7 @@ public class Node implements Comparable<Node>
         this.nodeRef = nodeRef;
         this.parentNodeRef = parentNodeRef;
 
-        mapBasicInfo(nodeProps, sr);
+        mapMinimalInfo(nodeProps, sr);
     }
 
     protected Object getValue(Map<String, PropertyData<?>> props, String name)
@@ -98,7 +91,7 @@ public class Node implements Comparable<Node>
     {
     }
 
-    protected void mapBasicInfo(Map<QName, Serializable> nodeProps, ServiceRegistry sr)
+    protected void mapMinimalInfo(Map<QName, Serializable> nodeProps, ServiceRegistry sr)
     {
         PersonService personService = sr.getPersonService();
 
@@ -133,20 +126,6 @@ public class Node implements Comparable<Node>
         }
     }
 
-    public void setGuid(NodeRef guid)
-    {
-        this.guid = guid;
-    }
-
-    public NodeRef getGuid() {
-        return guid;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
     @UniqueId
     public NodeRef getNodeRef()
     {
@@ -173,11 +152,6 @@ public class Node implements Comparable<Node>
         return modifiedAt;
     }
 
-    public String getModifiedBy()
-    {
-        return modifiedBy;
-    }
-
     public UserInfo getModifiedByUser() {
         return modifiedByUser;
     }
@@ -186,11 +160,6 @@ public class Node implements Comparable<Node>
         return createdByUser;
     }
 
-    public String getDescription()
-    {
-        return description;
-    }
-
     public String getName()
     {
         return this.name;
@@ -201,16 +170,6 @@ public class Node implements Comparable<Node>
         this.name = name;
     }
 
-    public String getCreatedBy()
-    {
-        return this.createdBy;
-    }
-
-    public void setCreatedBy(String createdBy)
-    {
-        this.createdBy = createdBy;
-    }
-
     public PathInfo getPath()
     {
         return pathInfo;
@@ -282,4 +241,91 @@ public class Node implements Comparable<Node>
                 + createdAt + ", modifiedAt=" + modifiedAt + ", createdByUser=" + createdByUser + ", modifiedBy="
                 + modifiedByUser + ", pathInfo =" + pathInfo +"]";
     }
+
+    // TODO for backwards compat' - set explicitly when needed (ie. favourites) (note: we could choose to have separate old Node/NodeImpl etc)
+
+    protected String title;
+    protected NodeRef guid;
+    protected String description;
+    protected String createdBy;
+    protected String modifiedBy;
+
+    /**
+     * @deprecated
+     */
+    public NodeRef getGuid() {
+        return guid;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setGuid(NodeRef guid)
+    {
+        this.guid = guid;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getCreatedBy()
+    {
+        return this.createdBy;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setCreatedBy(String createdBy)
+    {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getModifiedBy()
+    {
+        return modifiedBy;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setModifiedBy(String modifiedBy)
+    {
+        this.modifiedBy = modifiedBy;
+    }
 }