From 1d22ae2aa2f3537878ace34cfe4d2a641973204a Mon Sep 17 00:00:00 2001 From: Silviu Dinuta Date: Tue, 25 Oct 2016 13:40:41 +0300 Subject: [PATCH] RM-3963: throw an exception if permanent parameter is passed for delete --- .../rest/api/nodes/FileplanComponentsEntityResource.java | 7 +++++++ .../alfresco/rm/rest/api/sites/RMSiteEntityResource.java | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/nodes/FileplanComponentsEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/nodes/FileplanComponentsEntityResource.java index f85ee87f46..d695d585b7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/nodes/FileplanComponentsEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/nodes/FileplanComponentsEntityResource.java @@ -30,6 +30,7 @@ package org.alfresco.rm.rest.api.nodes; import org.alfresco.rest.api.model.Node; import org.alfresco.rest.framework.WebApiDescription; 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.actions.interfaces.EntityResourceAction; import org.alfresco.rest.framework.resource.parameters.Parameters; @@ -48,6 +49,7 @@ public class FileplanComponentsEntityResource implements EntityResourceAction.Update { private RMNodes nodes; + private String PARAM_PERMANENT = "permanent"; public void setNodes(RMNodes nodes) { @@ -70,6 +72,11 @@ public class FileplanComponentsEntityResource implements @Override 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); } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java index 737ba54d75..ca031342d4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResource.java @@ -53,6 +53,7 @@ public class RMSiteEntityResource implements EntityResourceAction.Delete, Entity { private static final String RM_SITE_ID = "rm"; private RMSites sites; + private String PARAM_PERMANENT = "permanent"; 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."); } + String permanentParameter = parameters.getParameter(PARAM_PERMANENT); + if(permanentParameter != null) + { + throw new InvalidArgumentException("Delete does not support parameter: permanent"); + } sites.deleteSite(siteId, parameters); }