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

126564 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124548 jvonka: RA-834, RA-678: create "renditions" request only applicable when creating/uploading file via multipart/form-data (not when creating empty file via json request)


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

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

@@ -1352,7 +1352,6 @@ public class NodesImpl implements Nodes
         fileFolderService.delete(nodeRef);
     }
 
-    // TODO should we able to specify content properties (eg. mimeType ... or use extension for now, or encoding)
     @Override
     public Node createNode(String parentFolderNodeId, Node nodeInfo, Parameters parameters)
     {
@@ -1391,6 +1390,7 @@ public class NodesImpl implements Nodes
             validateCmObject(nodeTypeQName);
         }
 
+        /* RA-834: commented-out since not currently applicable for empty file
         List<ThumbnailDefinition> thumbnailDefs = null;
         String renditionsParam = parameters.getParameter(PARAM_RENDITIONS);
         if (renditionsParam != null)
@@ -1402,6 +1402,7 @@ public class NodesImpl implements Nodes
 
             thumbnailDefs = getThumbnailDefs(renditionsParam);
         }
+        */
 
         Map<QName, Serializable> props = new HashMap<>(1);
 
@@ -1455,7 +1456,9 @@ public class NodesImpl implements Nodes
 
         Node newNode = getFolderOrDocument(nodeRef.getId(), parameters);
 
+        /* RA-834: commented-out since not currently applicable for empty file
         requestRenditions(thumbnailDefs, newNode); // note: noop for folder
+        */
 
         return newNode;
     }