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

126398 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120807 jvonka: FileFolder API - create/update node will return 400 for unknown property or aspect (not in dictionary models)
      - we no longer ignore invalid property and now also return correct error code for invalid aspect
      - update NodeApiTest and A/C of JIRAs ( RA-635, RA-636, RA-637, RA-638 )
      - note: in the future, we could consider option (eg. via query param) to allow residual props on create or update (or at least ability to nullify)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126743 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:01:47 +00:00
parent 364d57663f
commit b1c54a804f
4 changed files with 67 additions and 38 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2015 Alfresco Software Limited.
* Copyright (C) 2005-2016 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,6 +18,9 @@
*/
package org.alfresco.rest.api.nodes;
import java.util.ArrayList;
import java.util.List;
import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.model.Node;
import org.alfresco.rest.framework.WebApiDescription;
@@ -31,9 +34,6 @@ import org.alfresco.util.ParameterCheck;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.extensions.webscripts.servlet.FormData;
import java.util.ArrayList;
import java.util.List;
/**
* Node Children
*
@@ -83,7 +83,7 @@ public class NodeChildrenRelation implements RelationshipResourceAction.Read<Nod
@WebApiDescription(title = "Return a paged list of nodes for the document/folder identified by parentFolderNodeId")
public CollectionWithPagingInfo<Node> readAll(String parentFolderNodeId, Parameters parameters)
{
return nodes.getChildren(parentFolderNodeId, parameters);
return nodes.listChildren(parentFolderNodeId, parameters);
}
/**