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

127568 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126104 jvonka: Node (Peer) Associations - initial wip
      - /nodes/{srcId}/targets (GET, POST)
      - /nodes/{srcId}/targets/{tgtId} (DELETE)
      - /nodes/{tgtId}/sources (GET)
      - TODO ... assoc tests !
      - RA-742, RA-918, RA-919


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:09:32 +00:00
parent cdd3aa1075
commit 3b51433eb8
7 changed files with 492 additions and 1 deletions

View File

@@ -804,6 +804,11 @@ public class NodesImpl implements Nodes
mapUserInfo = new HashMap<>(2);
}
if (includeParam == null)
{
includeParam = Collections.emptyList();
}
Node node;
Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
@@ -895,7 +900,7 @@ public class NodesImpl implements Nodes
node.setAllowableOperations((allowableOperations.size() > 0 )? allowableOperations : null);
}
node.setNodeType(nodeTypeQName.toPrefixString(namespaceService));
node.setPath(pathInfo);