From af7ebb06caaaf8a89ebf2016eae749befe818697 Mon Sep 17 00:00:00 2001 From: Mohit Singh Date: Tue, 30 Jul 2024 16:53:10 +0530 Subject: [PATCH] [feature/MNT-24127-EndpointToCalculateFolderSize] Added Endpoint to calculate folder size --- .../rest/framework/webscripts/ResourceWebScriptGet.java | 6 +++++- .../org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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 69856741fb..a38dd8805b 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 @@ -57,6 +57,8 @@ import java.util.Map; public class ResourceWebScriptGet extends AbstractResourceWebScript implements ParamsExtractor, RecognizedParamsExtractor { private static Log logger = LogFactory.getLog(ResourceWebScriptGet.class); + + private static final String GET_FOLDERSIZE = "/nodes/{id}/get-folder-size"; public ResourceWebScriptGet() { @@ -279,7 +281,8 @@ public class ResourceWebScriptGet extends AbstractResourceWebScript implements P case PROPERTY: if (StringUtils.isNotBlank(params.getEntityId())) { - if (EntityResourceAction.RetrieveFolderSize.class.isAssignableFrom(resource.getResource().getClass())) + if (EntityResourceAction.RetrieveFolderSize.class.isAssignableFrom(resource.getResource().getClass()) + && GET_FOLDERSIZE.equals(resource.getMetaData().getUniqueId())) { if (resource.getMetaData().isDeleted(EntityResourceAction.RetrieveFolderSize.class)) { @@ -289,6 +292,7 @@ public class ResourceWebScriptGet extends AbstractResourceWebScript implements P Object result = getter.getFolderSize(params.getEntityId()); return result; } + if (BinaryResourceAction.Read.class.isAssignableFrom(resource.getResource().getClass())) { if (resource.getMetaData().isDeleted(BinaryResourceAction.Read.class)) 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 ce4c74921b..a91ba90bfe 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 @@ -151,7 +151,7 @@ public class NodeFolderSizeApiTest extends AbstractBaseApiTest AuthenticationUtil.setFullyAuthenticatedUser(user1); // Check if response and JSON parsing were successful - HttpResponse response = getSingle(getFolderSizeDataUrl(folderId), null, 200); + HttpResponse response = getSingle(getFolderSizeDataUrl(folderId), folderId, 200); assertNotNull(response); String jsonResponse = String.valueOf(response.getJsonResponse());