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

RM-3963: throw an exception if permanent parameter is passed for delete

Browse Source
This commit is contained in:
Silviu Dinuta
2016-10-25 13:40:41 +03:00
parent 2fab18584f
commit 1d22ae2aa2
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/nodes/FileplanComponentsEntityResource.java
View File

@@ -30,6 +30,7 @@ package org.alfresco.rm.rest.api.nodes;
import org.alfresco.rest.api.model.Node; import org.alfresco.rest.api.model.Node;
import org.alfresco.rest.framework.WebApiDescription; import org.alfresco.rest.framework.WebApiDescription;
import org.alfresco.rest.framework.WebApiParam; import org.alfresco.rest.framework.WebApiParam;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.resource.EntityResource; import org.alfresco.rest.framework.resource.EntityResource;
import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction; import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.rest.framework.resource.parameters.Parameters;
@@ -48,6 +49,7 @@ public class FileplanComponentsEntityResource implements
EntityResourceAction.Update<Node> EntityResourceAction.Update<Node>
{ {
private RMNodes nodes; private RMNodes nodes;
private String PARAM_PERMANENT = "permanent";
public void setNodes(RMNodes nodes) public void setNodes(RMNodes nodes)
{ {
@@ -70,6 +72,11 @@ public class FileplanComponentsEntityResource implements
@Override @Override
public void delete(String nodeId, Parameters parameters) public void delete(String nodeId, Parameters parameters)
{ {
String permanentParameter = parameters.getParameter(PARAM_PERMANENT);
if(permanentParameter != null)
{
throw new InvalidArgumentException("Delete does not support parameter: permanent");
}
nodes.deleteNode(nodeId, parameters); nodes.deleteNode(nodeId, parameters);
} }
} }

6
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java
View File

@@ -53,6 +53,7 @@ public class RMSiteEntityResource implements EntityResourceAction.Delete, Entity
{ {
private static final String RM_SITE_ID = "rm"; private static final String RM_SITE_ID = "rm";
private RMSites sites; private RMSites sites;
private String PARAM_PERMANENT = "permanent";
public void setSites(RMSites sites) public void setSites(RMSites sites)
{ {
@@ -74,6 +75,11 @@ public class RMSiteEntityResource implements EntityResourceAction.Delete, Entity
{ {
throw new InvalidParameterException("The Deletion is supported only for siteId = rm."); throw new InvalidParameterException("The Deletion is supported only for siteId = rm.");
} }
String permanentParameter = parameters.getParameter(PARAM_PERMANENT);
if(permanentParameter != null)
{
throw new InvalidArgumentException("Delete does not support parameter: permanent");
}
sites.deleteSite(siteId, parameters); sites.deleteSite(siteId, parameters);
} }