Merged 5.2.0 (5.2.0) to HEAD (5.2)

133881 rmunteanu: REPO-1746: Merge fixes for 5.2 GA issues to 5.2.0 branch
      Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
         133703 mward: Merged mward/5.2.n-repo1636-customonly (5.2.1) to 5.2.N (5.2.1)
            133683 mward: REPO-1636 (initial commit): Properties from the "cm", "usr", "sys" namespaces should not be exposed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/Nodes.java

@@ -269,13 +269,15 @@ public interface Nodes
      * Convert from node properties (map of QName to Serializable) retrieved from
      * the respository to a map of String to Object that can be formatted/expressed
      * as required by the API JSON response for get nodes, get person etc.
+     * <p>
+     * Returns null if there are no properties to return, rather than an empty map.
      * 
      * @param nodeProps
      * @param selectParam
      * @param mapUserInfo
      * @param excludedNS
      * @param excludedProps
-     * @return
+     * @return The map of properties, or null if none to return.
      */
     Map<String, Object> mapFromNodeProperties(Map<QName, Serializable> nodeProps, List<String> selectParam, Map<String,UserInfo> mapUserInfo, List<String> excludedNS, List<QName> excludedProps);
 
@@ -288,15 +290,26 @@ public interface Nodes
      */
     Map<QName, Serializable> mapToNodeProperties(Map<String, Object> props);
 
+    /**
+     * Map from a String representation of aspect names to a set
+     * of QName objects, as used by the repository.
+     * 
+     * @param aspectNames
+     * @return
+     */
+    Set<QName> mapToNodeAspects(List<String> aspectNames);
+        
     /**
      * Map from aspects (Set of QName) retrieved from the repository to a
      * map List of String required that can be formatted/expressed as required
      * by the API JSON response for get nodes, get person etc.
+     * <p>
+     * Returns null if there are no aspect names to return, rather than an empty list.
      * 
      * @param nodeAspects
      * @param excludedNS
      * @param excludedAspects
-     * @return
+     * @return The list of aspect names, or null if none to return.
      */
     List<String> mapFromNodeAspects(Set<QName> nodeAspects, List<String> excludedNS, List<QName> excludedAspects);