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/HEAD/root@126380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 10:36:18 +00:00
parent 10d9b76ddb
commit 9ec0c640f3
12 changed files with 325 additions and 79 deletions

View File

@@ -15,16 +15,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

View File

@@ -12,15 +12,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