Merge branch 'feature/RM-4568_relativePathForUploadRecords' into 'master'

Feature/rm 4568 relative path for upload records

See merge request !21

rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMNodesImpl.java

@@ -64,6 +64,8 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
 import org.alfresco.util.ParameterCheck;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.extensions.webscripts.servlet.FormData;
 
 import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
@@ -205,14 +207,14 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
         boolean isSpecialContainer = isFilePlan || isTransferContainer || isUnfiledContainer || isHoldsContainer;
 
         // DELETE
-        if(!isSpecialContainer && 
+        if(!isSpecialContainer &&
                 capabilityService.getCapability("Delete").evaluate(nodeRef) == AccessDecisionVoter.ACCESS_GRANTED)
         {
             allowableOperations.add(OP_DELETE);
         }
 
         // CREATE
-        if(type != RMNodeType.FILE &&  
+        if(type != RMNodeType.FILE &&
                 !isTransferContainer &&
                 capabilityService.getCapability("FillingPermissionOnly").evaluate(nodeRef) == AccessDecisionVoter.ACCESS_GRANTED)
         {
@@ -350,11 +352,41 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
         NodeRef parentNodeRef = getOrCreatePath(parentFolderNodeId, relativePath, nodeTypeQName);
 
         // Set relative path to null as we pass the last element from the path
-        nodeInfo.setRelativePath(null); 
+        nodeInfo.setRelativePath(null);
 
         return super.createNode(parentNodeRef.getId(), nodeInfo, parameters);
     }
 
+    @Override
+    public Node upload(String parentFolderNodeId, FormData formData, Parameters parameters)
+    {
+        if (formData == null || !formData.getIsMultiPart())
+        {
+            throw new InvalidArgumentException("The request content-type is not multipart: "+parentFolderNodeId);
+        }
+
+        for (FormData.FormField field : formData.getFields())
+        {
+            if(field.getName().equalsIgnoreCase("relativepath"))
+            {
+                // Create the path if it does not exist
+                getOrCreatePath(parentFolderNodeId, getStringOrNull(field.getValue()), ContentModel.TYPE_CONTENT);
+                break;
+            }
+        }
+
+        return super.upload(parentFolderNodeId, formData, parameters);
+    }
+
+    private String getStringOrNull(String value)
+    {
+        if (StringUtils.isNotEmpty(value))
+        {
+            return value.equalsIgnoreCase("null") ? null : value;
+        }
+        return null;
+    }
+
     @Override
     public NodeRef getOrCreatePath(String parentFolderNodeId, String relativePath, QName nodeTypeQName)
     {
@@ -407,7 +439,7 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
          * Starting from the latest existing element create the rest of the elements
          */
         QName parentNodeType = nodeService.getType(parentNodeRef);
-        if(dictionaryService.isSubClass(parentNodeType, RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER) || 
+        if(dictionaryService.isSubClass(parentNodeType, RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER) ||
            dictionaryService.isSubClass(parentNodeType, RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER))
         {
             for (String pathElement : pathElements)
@@ -416,9 +448,9 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
                 parentNodeRef = fileFolderService.create(parentNodeRef, pathElement, RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER).getNodeRef();
             }
         }
-        else 
+        else
         {
-            /* Outside the unfiled record container the path elements are record categories 
+            /* Outside the unfiled record container the path elements are record categories
              * except the last element which is a record folder if the created node is of type content
              */
             Iterator<String> iterator = pathElements.iterator();

rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/ig-core-api.yaml

@@ -289,7 +289,7 @@ paths:
         }
         ```
 
-        You can create an empty electronic record and use the record endpoint to create content:
+        You can create an empty electronic record:
         ```JSON
         {
           "name":"My Electronic Record",