mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-01 14:41:46 +00:00
[feature/MNT-24127-EndpointToCalculateFolderSize] Addressing review comments related to calculate and retrieve folder size details
This commit is contained in:
@@ -45,7 +45,6 @@ public class SizeDetailsImpl implements SizeDetails
|
||||
private NodeRef nodeRef;
|
||||
private SimpleCache<Serializable, NodeSizeDetails> simpleCache;
|
||||
private NodeSizeDetailsService nodeSizeDetailsService;
|
||||
private NodeSizeDetails nodeSizeDetails;
|
||||
|
||||
public void setNodes(Nodes nodes)
|
||||
{
|
||||
@@ -77,7 +76,7 @@ public class SizeDetailsImpl implements SizeDetails
|
||||
}
|
||||
else
|
||||
{
|
||||
nodeSizeDetails = simpleCache.get(nodeId);
|
||||
NodeSizeDetails nodeSizeDetails = simpleCache.get(nodeId);
|
||||
actionId = nodeSizeDetails.getJobId();
|
||||
}
|
||||
return new NodeSizeDetails(null, null, actionId, null);
|
||||
@@ -94,12 +93,12 @@ public class SizeDetailsImpl implements SizeDetails
|
||||
|
||||
if (!simpleCache.contains(nodeId))
|
||||
{
|
||||
nodeSizeDetails = new NodeSizeDetails(nodeId, null, null, STATUS.NOT_INITIATED);
|
||||
NodeSizeDetails nodeSizeDetails = new NodeSizeDetails(nodeId, null, null, STATUS.NOT_INITIATED);
|
||||
return nodeSizeDetails;
|
||||
}
|
||||
else
|
||||
{
|
||||
nodeSizeDetails = simpleCache.get(nodeId);
|
||||
NodeSizeDetails nodeSizeDetails = simpleCache.get(nodeId);
|
||||
String cachedJobId = nodeSizeDetails.getJobId();
|
||||
if (cachedJobId != null && !jobId.equalsIgnoreCase(cachedJobId))
|
||||
{
|
||||
@@ -117,7 +116,7 @@ public class SizeDetailsImpl implements SizeDetails
|
||||
{
|
||||
String jobId = GUID.generate();
|
||||
nodeSizeDetailsService.invokeSizeDetailsExecutor(nodeRef, jobId);
|
||||
nodeSizeDetails = new NodeSizeDetails(nodeRef.getId(), null, jobId, STATUS.PENDING);
|
||||
NodeSizeDetails nodeSizeDetails = new NodeSizeDetails(nodeRef.getId(), null, jobId, STATUS.PENDING);
|
||||
simpleCache.put(nodeRef.getId(), nodeSizeDetails);
|
||||
return jobId;
|
||||
}
|
||||
|
@@ -53,20 +53,15 @@ public class SizeDetailsImplTest
|
||||
private static final QName TYPE_FOLDER = QName.createQName(NAMESPACE, "folder");
|
||||
private SizeDetailsImpl sizeDetailsImpl;
|
||||
private Nodes nodes;
|
||||
private NodeSizeDetailsService nodeSizeDetailsService;
|
||||
private NodeSizeDetails nodeSizeDetails;
|
||||
private SearchService searchService;
|
||||
private ThreadPoolExecutor threadPoolExecutor;
|
||||
|
||||
@Before
|
||||
public void setUp()
|
||||
{
|
||||
sizeDetailsImpl = new SizeDetailsImpl();
|
||||
nodes = mock(Nodes.class);
|
||||
searchService = mock(SearchService.class);
|
||||
nodeSizeDetailsService = mock(NodeSizeDetailsService.class);
|
||||
nodeSizeDetails = mock(NodeSizeDetails.class);
|
||||
threadPoolExecutor = mock(ThreadPoolExecutor.class);
|
||||
SearchService searchService = mock(SearchService.class);
|
||||
NodeSizeDetailsService nodeSizeDetailsService = mock(NodeSizeDetailsService.class);
|
||||
ThreadPoolExecutor threadPoolExecutor = mock(ThreadPoolExecutor.class);
|
||||
SimpleCache<Serializable, NodeSizeDetails> simpleCache = mock(SimpleCache.class);
|
||||
|
||||
nodeSizeDetailsService.setSearchService(searchService);
|
||||
|
Reference in New Issue
Block a user