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

126372 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119837 jvonka: FileFolder API - fix build (BCK) & api tests
      - as agreed, for now split test client api models from server-side impl
      - rename existing Node/Document/Folder to FavouriteNode/Document/Folder (for backwards compat')


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

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

@@ -43,7 +43,6 @@ import org.alfresco.service.namespace.QName;
  * @author janv
  *
  */
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Document extends Node
 {
     public Document() {
@@ -66,6 +65,18 @@ public class Document extends Node
         this.isFolder = false;
     }
 
+    @Override
+    public ContentInfo getContent()
+    {
+        return contentInfo;
+    }
+
+    @Override
+    public void setContent(ContentInfo contentInfoIn)
+    {
+        contentInfo = contentInfoIn;
+    }
+
     @Override
     public String toString()
     {