From 92dbce46aa8660ac701f7569e9c6976bc4aa2e59 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 11:02:04 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 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 --- source/java/org/alfresco/rest/api/impl/NodesImpl.java | 9 +++++---- .../org/alfresco/rest/api/tests/NodeApiTest.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java index 6345253abd..7a3754031c 100644 --- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java +++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java @@ -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)) { 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; - if(pathElements.size() > 0) + if (pathElements.size() > 0) { StringBuilder sb = new StringBuilder(120); for (PathInfo.ElementInfo e : pathElements) @@ -1592,7 +1592,8 @@ public class NodesImpl implements Nodes List result = new ArrayList<>(qnameStrList.size()); for (String str : qnameStrList) { - if (str.startsWith(PREFIX)) { + if (str.startsWith(PREFIX)) + { str = str.substring(PREFIX.length()); } diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java index dbc4799ccd..3d8940b1b2 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -368,9 +368,10 @@ public class NodeApiTest extends AbstractBaseApiTest nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Document.class); 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 'path' object in the response.", n.getPath()); + assertNotNull("There should be a 'aspectNames' object in the response.", n.getAspectNames()); } // request specific property via select