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

127604 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127414 jvonka: Node Associations - create node with assocs (peer &/or secondary child)
      - can be optionally used to create (eg. mandatory) assoc(s) to other existing node(s)
      RA-925


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:18:10 +00:00
parent b2b51abb1e
commit 3f0bba6779
11 changed files with 285 additions and 116 deletions

View File

@@ -53,8 +53,10 @@ import org.springframework.extensions.webscripts.servlet.FormData;
* @author Jamal Kaabi-Mofrad
*/
@RelationshipResource(name = "children", entityResource = NodesEntityResource.class, title = "Folder children")
public class NodeChildrenRelation implements RelationshipResourceAction.Read<Node>, RelationshipResourceAction.Create<Node>,
MultiPartRelationshipResourceAction.Create<Node>, InitializingBean
public class NodeChildrenRelation implements
RelationshipResourceAction.Read<Node>,
RelationshipResourceAction.Create<Node>,
MultiPartRelationshipResourceAction.Create<Node>, InitializingBean
{
private Nodes nodes;
@@ -108,7 +110,6 @@ public class NodeChildrenRelation implements RelationshipResourceAction.Read<Nod
{
List<Node> result = new ArrayList<>(nodeInfos.size());
// TODO should we prevent batch create when we introduce new batch/bulk operation API ?
for (Node nodeInfo : nodeInfos)
{
result.add(nodes.createNode(parentFolderNodeId, nodeInfo, parameters));