diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java index a48fc55c43..ba12488e8d 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java +++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java @@ -62,6 +62,7 @@ public class ResourceWebScriptDelete extends AbstractResourceWebScript implement { String entityId = req.getServiceMatch().getTemplateVars().get(ResourceLocator.ENTITY_ID); String relationshipId = req.getServiceMatch().getTemplateVars().get(ResourceLocator.RELATIONSHIP_ID); + final Params.RecognizedParams params = ResourceWebScriptHelper.getRecognizedParams(req); switch (resourceMeta.getType()) { @@ -72,7 +73,7 @@ public class ResourceWebScriptDelete extends AbstractResourceWebScript implement } else { - return Params.valueOf(entityId, relationshipId, req); + return Params.valueOf(params, entityId, relationshipId, req); } case RELATIONSHIP: @@ -83,7 +84,7 @@ public class ResourceWebScriptDelete extends AbstractResourceWebScript implement } else { - return Params.valueOf(entityId, relationshipId, req); + return Params.valueOf(params, entityId, relationshipId, req); } case PROPERTY: final String resourceName = req.getServiceMatch().getTemplateVars().get(ResourceLocator.RELATIONSHIP_RESOURCE); @@ -93,11 +94,11 @@ public class ResourceWebScriptDelete extends AbstractResourceWebScript implement { if (StringUtils.isNotBlank(propertyName)) { - return Params.valueOf(entityId, relationshipId, null, null, propertyName, null, null, req); + return Params.valueOf(entityId, relationshipId, null, null, propertyName, params, null, req); } else { - return Params.valueOf(entityId, null, null, null, resourceName, null, null, req); + return Params.valueOf(entityId, null, null, null, resourceName, params, null, req); } } //Fall through to unsupported. diff --git a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java index a3ca73ef3b..1e1c8b308f 100644 --- a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java @@ -201,10 +201,15 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi } protected HttpResponse delete(String url, String runAsUser, String entityId, int expectedStatus) throws Exception + { + return delete(url, runAsUser, entityId, null, expectedStatus); + } + + protected HttpResponse delete(String url, String runAsUser, String entityId, Map params, int expectedStatus) throws Exception { publicApiClient.setRequestContext(new RequestContext(runAsUser)); - HttpResponse response = publicApiClient.delete(getScope(), url, entityId, null, null); + HttpResponse response = publicApiClient.delete(getScope(), 1, url, entityId, null, null, params); checkStatus(expectedStatus, response.getStatusCode()); return response; diff --git a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java index 7a4fe42a5f..e0c103c0d1 100644 --- a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java +++ b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java @@ -577,7 +577,12 @@ public class PublicApiClient public HttpResponse delete(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId) throws IOException { - HttpResponse response = client.delete(getRequestContext(), scope, entityCollectionName, entityId, relationCollectionName, relationshipEntityId); + return delete(scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, null); + } + + public HttpResponse delete(String scope, int version, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId, Map params) throws IOException + { + HttpResponse response = client.delete(getRequestContext(), scope, version, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, params); logger.debug(response.toString()); diff --git a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java index 62876bee39..34906532da 100644 --- a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java +++ b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java @@ -23,7 +23,6 @@ * along with Alfresco. If not, see . * #L% */ - package org.alfresco.rest.api.tests.client; import java.io.BufferedInputStream; @@ -552,14 +551,14 @@ public class PublicApiHttpClient public HttpResponse delete(final RequestContext rq, final String scope, final String entityCollectionName, final Object entityId, final String relationCollectionName, final Object relationshipEntityId) throws IOException { - return delete(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId); + return delete(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, null); } public HttpResponse delete(final RequestContext rq, final String scope, final int version, final String entityCollectionName, final Object entityId, - final String relationCollectionName, final Object relationshipEntityId) throws IOException + final String relationCollectionName, final Object relationshipEntityId, final Map params) throws IOException { RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), scope, version, entityCollectionName, entityId, relationCollectionName, - relationshipEntityId, null); + relationshipEntityId, params); String url = endpoint.getUrl(); DeleteMethod req = new DeleteMethod(url);