From 2da3ce6c15ef84fa1448aa17efc2c63a7d1edec0 Mon Sep 17 00:00:00 2001 From: mohit-singh4 Date: Fri, 30 Aug 2024 13:32:48 +0530 Subject: [PATCH] [feature/MNT-24127-EndpointToCalculateFolderSize] Updated endpoints flow to calculate and retrieve folder size details --- .../rest/api/impl/SizeDetailImpl.java | 2 +- .../rest/api/model/NodeSizeDetail.java | 25 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailImpl.java index 441c7e123c..a34a021527 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailImpl.java @@ -147,7 +147,7 @@ public class SizeDetailImpl implements SizeDetail } else if(result.containsKey(NodeSizeDetailActionExecutor.EXCEPTION)) { - return new NodeSizeDetail((String) result.get(NodeSizeDetailActionExecutor.EXCEPTION)); + return new NodeSizeDetail((String) result.get("nodeId"), 0L, 0, COMPLETED.name()); } // Check for the presence of "size" key. diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NodeSizeDetail.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeSizeDetail.java index f511a23e5b..140ebb6cd5 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/NodeSizeDetail.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeSizeDetail.java @@ -28,19 +28,24 @@ package org.alfresco.rest.api.model; public class NodeSizeDetail { private String nodeId; - private long size; + private Long size; private String calculatedAt; - private int numberOfFiles; + private Integer numberOfFiles; private String status; - public NodeSizeDetail() - { - super(); - } public NodeSizeDetail(String status) { this.status = status; } + + public NodeSizeDetail(String nodeId, Long size, Integer numberOfFiles, String status) + { + this.nodeId = nodeId; + this.size = size; + this.numberOfFiles = numberOfFiles; + this.status = status; + } + public NodeSizeDetail(String nodeId, long size, String calculatedAt, int numberOfFiles, String status) { this.nodeId = nodeId; @@ -60,12 +65,12 @@ public class NodeSizeDetail this.nodeId = nodeId; } - public long getSize() + public Long getSize() { return size; } - public void setSize(long size) + public void setSize(Long size) { this.size = size; } @@ -80,12 +85,12 @@ public class NodeSizeDetail this.calculatedAt = calculatedAt; } - public int getNumberOfFiles() + public Integer getNumberOfFiles() { return numberOfFiles; } - public void setNumberOfFiles(int numberOfFiles) + public void setNumberOfFiles(Integer numberOfFiles) { this.numberOfFiles = numberOfFiles; }