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 FILE-FOLDER-API (5.2.0) to HEAD (5.2)

Browse Source 
118692 jvonka: Merge from DEV/SABRE_JANV1 (part 2) - RA-613 / RA-655
   - File Folder API (PoC - experimental WIP)
   - TODO add tests +review backwards compat' (eg. favs)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 10:26:33 +00:00
parent 4810279cb7
commit 17012b17b6
12 changed files with 967 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java
View File

@@ -6,6 +6,7 @@ import java.util.Locale;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.web.scripts.BufferedRequest;
import org.alfresco.rest.framework.core.ResourceInspector;
import org.alfresco.rest.framework.core.ResourceLocator;
import org.alfresco.rest.framework.core.ResourceMetadata;
@@ -23,6 +24,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.webscripts.WebScriptRequest;
import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
@@ -127,6 +129,14 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
logger.warn("Failed to get the input stream.", error);
}
}
else if (req instanceof WrappingWebScriptRequest)
{
// TODO review REST fwk change
// eg. BufferredRequest
WrappingWebScriptRequest wrappedRequest = (WrappingWebScriptRequest) req;
return wrappedRequest.getContent().getInputStream();
}
return null;
}