inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-01 14:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[feature/MNT-24127-EndpointToCalculateFolderSize] Addressing review comments related to calculate and retrieve folder size details

Browse Source
This commit is contained in:
mohit-singh4
2024-09-19 09:53:04 +05:30
parent 3b7601ff10
commit 3450f9b2ee
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailsImpl.java
View File

@@ -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;
}

11
remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.java
View File

@@ -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);

14
repository/src/main/java/org/alfresco/repo/node/NodeSizeDetailsService.java
View File

@@ -154,8 +154,6 @@ public class NodeSizeDetailsService implements InitializingBean
try
{
ResultSet results = facetQuery(nodeRef);
LOG.debug(" Number of folder nodes found in results " + results.getNumberFound());
int resultsSize = results.getFieldFacet(FIELD_FACET)
.size();
@@ -197,8 +195,10 @@ public class NodeSizeDetailsService implements InitializingBean
{
SearchParameters searchParameters = createSearchParameters(nodeRef);
ResultSet resultsWithoutFacet = searchService.query(searchParameters);
LOG.debug(" After Executing query, no. of records " + resultsWithoutFacet.getNumberFound());
if (LOG.isDebugEnabled())
{
LOG.debug(" After Executing facet query, no. of records found " + resultsWithoutFacet.getNumberFound());
}
searchParameters.addFacetQuery(FACET_QUERY);
FieldFacet fieldFacet = new FieldFacet(FIELD_FACET);
@@ -274,9 +274,9 @@ public class NodeSizeDetailsService implements InitializingBean
String jobId = (String) jsonObject.get("jobId");
String id = (String) jsonObject.get("id");
STATUS status = (STATUS) jsonObject.get("status");
Long sizeInBytes = (Long) jsonObject.get("sizeInBytes");
return new NodeSizeDetails(id, sizeInBytes, jobId, status);
String status = (String) jsonObject.get("status");
String sizeInBytes = (String) jsonObject.get("sizeInBytes");
return new NodeSizeDetails(id, Long.parseLong(sizeInBytes), jobId, STATUS.valueOf(status));
}
public String getId()