From 1027bc14cd4ae6c9d9561d3985bcd02f2143687c Mon Sep 17 00:00:00 2001 From: mohit-singh4 Date: Tue, 8 Oct 2024 11:21:53 +0530 Subject: [PATCH] [feature/MNT-24127-EndpointToCalculateFolderSize] Addressing review comments related to calculate and retrieve folder size details --- .../alfresco/rest/api/impl/SizeDetailsImpl.java | 14 ++++++++------ .../rest/api/impl/SizeDetailsImplTest.java | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailsImpl.java index ebdd1e744a..dcee265c85 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailsImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailsImpl.java @@ -78,12 +78,14 @@ public class SizeDetailsImpl implements SizeDetails, InitializingBean Optional optionalDetails = nodeSizeDetailsService.getSizeDetails(nodeId); return optionalDetails.map(details -> { - String cachedJobId = details.getJobId(); - if (cachedJobId != null && !jobId.equalsIgnoreCase(cachedJobId)) { - throw new NotFoundException("jobId does not exist"); - } - return details; - }).orElseGet(() -> new NodeSizeDetails(nodeId, STATUS.NOT_INITIATED)); + String cachedJobId = details.getJobId(); + if (cachedJobId != null && !jobId.equalsIgnoreCase(cachedJobId)) + { + throw new NotFoundException("jobId does not exist"); + } + return details; + }) + .orElseGet(() -> new NodeSizeDetails(nodeId, STATUS.NOT_INITIATED)); } /** diff --git a/remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java b/remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java index c8f2a65fe3..6132ce5646 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java @@ -74,8 +74,8 @@ public class SizeDetailsImplTest verify(nodeSizeDetailsServiceImpl).setSimpleCache(simpleCache); nodeSizeDetailsServiceImpl.setThreadPoolExecutor(threadPoolExecutor); sizeDetailsImpl = new SizeDetailsImpl(nodes, nodeSizeDetailsServiceImpl); -// sizeDetailsImpl.setNodes(nodes); -// sizeDetailsImpl.setNodeSizeDetailsService(nodeSizeDetailsServiceImpl); + // sizeDetailsImpl.setNodes(nodes); + // sizeDetailsImpl.setNodeSizeDetailsService(nodeSizeDetailsServiceImpl); } @Test