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

126368 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119796 jvonka: FileFolder API - NodeApiTest - add tests (+ve & -ve) for create folder
      RA-635


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

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

@@ -29,6 +29,7 @@ import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.ContentData;
@@ -42,15 +43,11 @@ import org.alfresco.service.namespace.QName;
  * @author janv
  *
  */
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Document extends Node
 {
     private ContentInfo contentInfo;
 
-    // instance init block
-    {
-        this.isFolder = Boolean.FALSE;
-    }
-
     public Document() {
         super();
     }
@@ -67,6 +64,8 @@ public class Document extends Node
             String mimeTypeName = sr.getMimetypeService().getDisplaysByMimetype().get(mimeType);
             this.contentInfo = new ContentInfo(mimeType, mimeTypeName, cd.getSize(), cd.getEncoding());
         }
+
+        this.isFolder = false;
     }
 
     public ContentInfo getContent()