inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
126400 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121204 gcornwell: Very minor formatting and test fixes spotted during verification of various stories.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:02:04 +00:00
parent ee9dd6465f
commit 92dbce46aa
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -477,8 +477,8 @@ public class NodesImpl implements Nodes
} }
} }
private NodeRef getParentNodeRef(final NodeRef nodeRef) { private NodeRef getParentNodeRef(final NodeRef nodeRef)
{
if (repositoryHelper.getCompanyHome().equals(nodeRef)) if (repositoryHelper.getCompanyHome().equals(nodeRef))
{ {
return null; // note: does not make sense to return parent above C/H return null; // note: does not make sense to return parent above C/H
@@ -700,7 +700,7 @@ public class NodesImpl implements Nodes
} }
String pathStr = null; String pathStr = null;
if(pathElements.size() > 0) if (pathElements.size() > 0)
{ {
StringBuilder sb = new StringBuilder(120); StringBuilder sb = new StringBuilder(120);
for (PathInfo.ElementInfo e : pathElements) for (PathInfo.ElementInfo e : pathElements)
@@ -1592,7 +1592,8 @@ public class NodesImpl implements Nodes
List<QName> result = new ArrayList<>(qnameStrList.size()); List<QName> result = new ArrayList<>(qnameStrList.size());
for (String str : qnameStrList) for (String str : qnameStrList)
{ {
if (str.startsWith(PREFIX)) { if (str.startsWith(PREFIX))
{
str = str.substring(PREFIX.length()); str = str.substring(PREFIX.length());
} }

3
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -368,9 +368,10 @@ public class NodeApiTest extends AbstractBaseApiTest
nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Document.class); nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Document.class);
for (Node n : nodes) for (Node n : nodes)
{ {
assertNotNull("There should be a 'properties' object in the response.", n.getIsLink()); // eg. cm:title, see above assertNotNull("There should be a 'properties' object in the response.", n.getProperties()); // eg. cm:title, see above
assertNotNull("There should be a 'isLink' object in the response.", n.getIsLink()); assertNotNull("There should be a 'isLink' object in the response.", n.getIsLink());
assertNotNull("There should be a 'path' object in the response.", n.getPath()); assertNotNull("There should be a 'path' object in the response.", n.getPath());
assertNotNull("There should be a 'aspectNames' object in the response.", n.getAspectNames());
} }
// request specific property via select // request specific property via select