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 
126380 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120084 jkaabimofrad: RA-640, RA-681: made "update node content" API to return the default JSON representation of the file node. Also added a test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:53:26 +00:00
parent 79848e45da
commit 5fbede5332
12 changed files with 306 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlockEntityResource.java
View File

@@ -40,16 +40,16 @@ import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.util.TempFileProvider;
@EntityResource(name="flock",title="A resource used for testing binary properties")
public class FlockEntityResource implements BinaryResourceAction.Read, BinaryResourceAction.Delete, BinaryResourceAction.Update
public class FlockEntityResource implements BinaryResourceAction.Read, BinaryResourceAction.Delete, BinaryResourceAction.Update<Flock>
{
//versions/1/flock/xyz/photo PUT
@Override
@WebApiDescription(title = "Updates a photo")
@BinaryProperties("photo")
public void updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params)
public Flock updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params)
{
return;
return null;
}
//versions/1/flock/xyz/photo DELETE

6
source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlocketEntityResource.java
View File

@@ -37,15 +37,15 @@ import org.alfresco.rest.framework.resource.content.BinaryResource;
import org.alfresco.rest.framework.resource.parameters.Parameters;
@EntityResource(name="flocket",title="A resource used for testing binary properties with lost of properties")
public class FlocketEntityResource implements BinaryResourceAction.Read, BinaryResourceAction.Delete, BinaryResourceAction.Update
public class FlocketEntityResource implements BinaryResourceAction.Read, BinaryResourceAction.Delete, BinaryResourceAction.Update<Flocket>
{
@Override
@WebApiDescription(title = "Updates a flocket")
@BinaryProperties({"photo","album"})
public void updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params)
public Flocket updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params)
{
return;
return null;
}
@Override