inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
126493 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122640 gjames: RA-211: Renamed ResponseCallBack to WithResponse (because its not a callback)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:44:37 +00:00
parent a6cf35a715
commit 5e3016c92c
14 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java
View File

@@ -30,7 +30,7 @@ import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelation
import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.rest.framework.webscripts.ResponseCallBack;
import org.alfresco.rest.framework.webscripts.WithResponse;
import org.alfresco.util.ParameterCheck;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.extensions.webscripts.servlet.FormData;
@@ -113,7 +113,7 @@ public class NodeChildrenRelation implements RelationshipResourceAction.Read<Nod
@Override
@WebApiDescription(title = "Upload file content and meta-data into the repository.")
@WebApiParam(name = "formData", title = "A single form data", description = "A single form data which holds FormFields.")
public Node create(String parentFolderNodeId, FormData formData, Parameters parameters, ResponseCallBack withResponse)
public Node create(String parentFolderNodeId, FormData formData, Parameters parameters, WithResponse withResponse)
{
return nodes.upload(parentFolderNodeId, formData, parameters);
}