From 0f6bb34c725bfc7f6a40e8b69509c675fc09016e Mon Sep 17 00:00:00 2001 From: Mohit Singh Date: Tue, 30 Jul 2024 09:20:29 +0530 Subject: [PATCH] [feature/MNT-24127-EndpointToCalculateFolderSize] Added Endpoint to calculate folder size --- .../alfresco/rest/api/nodes/NodesEntityResource.java | 2 -- .../rest/framework/core/ResourceInspector.java | 12 +++++++++--- .../framework/webscripts/ResourceWebScriptGet.java | 10 ---------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java index 3932691cea..21d426f7f2 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java @@ -97,7 +97,6 @@ public class NodesEntityResource implements private ActionService actionService; private SimpleCache simpleCache; - public void setNodes(Nodes nodes) { this.nodes = nodes; @@ -318,7 +317,6 @@ public class NodesEntityResource implements throw new AlfrescoRuntimeException("Exception occurred in NodesEntityResource:createById",alfrescoRuntimeError); } } - @Operation("get-folder-size") @WebApiDescription(title = "Returns Folder Node Size", description = "Returning a Folder Node Size") @WebApiParameters({@WebApiParam(name = "nodeId", title = "The unique id of Execution Job", description = "A single nodeId")}) diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java index 7ec1574661..7fec9ef5b3 100644 --- a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java +++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java @@ -126,8 +126,6 @@ public class ResourceInspector ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(MultiPartRelationshipResourceAction.Create.class); - - ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.Read.class); ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.Delete.class); ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.Update.class); @@ -727,7 +725,15 @@ public class ResourceInspector Map annotAttribs = AnnotationUtils.getAnnotationAttributes(annot); String actionName = String.valueOf(annotAttribs.get("value")); String actionPath = ResourceDictionary.propertyResourceKey(entityPath, actionName); - ResourceOperation ro = inspectOperation(anyClass, annotatedMethod, POST); + ResourceOperation ro; + if("/nodes/{id}/get-folder-size".equals(actionPath)) + { + ro = inspectOperation(anyClass, annotatedMethod, GET); + } + else + { + ro = inspectOperation(anyClass, annotatedMethod, POST); + } embeds.put(actionPath, new Pair(ro, annotatedMethod)); } } 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 50afa9ad8d..87ee84c074 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 @@ -238,16 +238,6 @@ public class ResourceWebScriptGet extends AbstractResourceWebScript implements P CollectionWithPagingInfo relations = relationGetter.readAll(params.getEntityId(),params); return relations; } - else if (RelationshipResourceAction.ReadById.class.isAssignableFrom(resource.getResource().getClass())) - { - if (resource.getMetaData().isDeleted(RelationshipResourceAction.ReadById.class)) - { - throw new DeletedResourceException("(GET by id) "+resource.getMetaData().getUniqueId()); - } - RelationshipResourceAction.ReadById relationGetter = (RelationshipResourceAction.ReadById) resource.getResource(); - Object result = relationGetter.readById(params.getEntityId(), params.getRelationshipId(), params); - return result; - } else { if (resource.getMetaData().isDeleted(RelationshipResourceAction.ReadWithResponse.class))