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/HEAD/root@126368 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 10:33:16 +00:00
parent 981f35301b
commit cc94c78812
5 changed files with 158 additions and 39 deletions

View File

@@ -22,6 +22,7 @@ package org.alfresco.rest.api.model;
import java.io.Serializable;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
@@ -32,13 +33,9 @@ import org.alfresco.service.namespace.QName;
* @author steveglover
* @author janv
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Folder extends Node
{
// instance init block
{
this.isFolder = Boolean.TRUE;
}
public Folder()
{
super();
@@ -47,6 +44,7 @@ public class Folder extends Node
public Folder(NodeRef nodeRef, NodeRef parentNodeRef, Map<QName, Serializable> nodeProps, Map<String, UserInfo> mapUserInfo, ServiceRegistry sr)
{
super(nodeRef, parentNodeRef, nodeProps, mapUserInfo, sr);
this.isFolder = true;
}
@Override