diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java index a38dd8805b..e409f1f590 100644 --- a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java +++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java @@ -282,7 +282,7 @@ public class ResourceWebScriptGet extends AbstractResourceWebScript implements P if (StringUtils.isNotBlank(params.getEntityId())) { if (EntityResourceAction.RetrieveFolderSize.class.isAssignableFrom(resource.getResource().getClass()) - && GET_FOLDERSIZE.equals(resource.getMetaData().getUniqueId())) + && (GET_FOLDERSIZE.equals(resource.getMetaData().getUniqueId()) || params.getEntityId().contains("get-folder-size"))) { if (resource.getMetaData().isDeleted(EntityResourceAction.RetrieveFolderSize.class)) { diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java index b9139c17a9..2f753cff67 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java @@ -106,7 +106,6 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi private static final String URL_CHILDREN = "children"; private static final String URL_CONTENT = "content"; private static final String URL_CALCULATEFOLDERSIZE = "calculate-folder-size"; - private static final String URL_GETFOLDERSIZE = "get-folder-size"; protected static final String TYPE_CM_FOLDER = "cm:folder"; protected static final String TYPE_CM_CONTENT = "cm:content"; @@ -1127,9 +1126,5 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi { return URL_NODES + "/" + nodeId + "/" + URL_CALCULATEFOLDERSIZE; } - protected String getFolderSizeDataUrl(String nodeId) - { - return URL_NODES + "/" + nodeId + "/" + URL_GETFOLDERSIZE; - } } diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java index 92a088f5bd..383c1c8a29 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java @@ -139,7 +139,7 @@ public class NodeFolderSizeApiTest extends AbstractBaseApiTest setRequestContext(user1); // Check if response and JSON parsing were successful - HttpResponse response = getSingle(NodesEntityResource.class, folderId + "/content", null, 200); + HttpResponse response = getSingle(NodesEntityResource.class, folderId + "/get-folder-size", null, 200); String jsonResponse = String.valueOf(response.getJsonResponse()); assertNotNull("JSON response should not be null", jsonResponse);