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

126446 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121973 jvonka: Nodes (FileFolder) API - fix list children (fallout & tests -re: nodeType/subTypes 'where' filtering)
      RA-811, RA-634


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/impl/NodesImpl.java

@@ -914,7 +914,9 @@ public class NodesImpl implements Nodes
         boolean includeFiles = true;
 
         QName filterNodeTypeQName = null;
-        boolean filterIncludeSubTypes = false;
+
+        // note: for files/folders, include subtypes by default (unless filtering by a specific nodeType - see below)
+        boolean filterIncludeSubTypes = true;
 
         Query q = parameters.getQuery();
 
@@ -934,6 +936,8 @@ public class NodesImpl implements Nodes
             String nodeTypeStr = propertyWalker.getProperty(PARAM_NODETYPE, WhereClauseParser.EQUALS, String.class);
             if ((nodeTypeStr != null) && (! nodeTypeStr.isEmpty()))
             {
+                filterIncludeSubTypes = false; // default nodeType filtering is without subTypes (unless subTypes = true)
+
                 filterNodeTypeQName = createQName(nodeTypeStr);
                 if (dictionaryService.getType(filterNodeTypeQName) == null)
                 {