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:
@@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.alfresco.rest.api;
|
package org.alfresco.rest.api;
|
||||||
|
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
||||||
|
|
||||||
public interface SizeDetails
|
public interface SizeDetails
|
||||||
{
|
{
|
||||||
|
@@ -29,9 +29,9 @@ import java.io.Serializable;
|
|||||||
|
|
||||||
import org.alfresco.model.ContentModel;
|
import org.alfresco.model.ContentModel;
|
||||||
import org.alfresco.repo.cache.SimpleCache;
|
import org.alfresco.repo.cache.SimpleCache;
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsService;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsService;
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails.STATUS;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails.STATUS;
|
||||||
import org.alfresco.rest.api.Nodes;
|
import org.alfresco.rest.api.Nodes;
|
||||||
import org.alfresco.rest.api.SizeDetails;
|
import org.alfresco.rest.api.SizeDetails;
|
||||||
import org.alfresco.rest.framework.core.exceptions.InvalidNodeTypeException;
|
import org.alfresco.rest.framework.core.exceptions.InvalidNodeTypeException;
|
||||||
|
@@ -28,7 +28,7 @@ package org.alfresco.rest.api.nodes;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
||||||
import org.alfresco.rest.api.SizeDetails;
|
import org.alfresco.rest.api.SizeDetails;
|
||||||
import org.alfresco.rest.framework.WebApiDescription;
|
import org.alfresco.rest.framework.WebApiDescription;
|
||||||
import org.alfresco.rest.framework.WebApiParam;
|
import org.alfresco.rest.framework.WebApiParam;
|
||||||
|
@@ -35,8 +35,8 @@ import java.util.concurrent.ThreadPoolExecutor;
|
|||||||
|
|
||||||
import org.alfresco.model.ContentModel;
|
import org.alfresco.model.ContentModel;
|
||||||
import org.alfresco.repo.cache.SimpleCache;
|
import org.alfresco.repo.cache.SimpleCache;
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl;
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
||||||
import org.alfresco.rest.api.Nodes;
|
import org.alfresco.rest.api.Nodes;
|
||||||
import org.alfresco.rest.api.model.Node;
|
import org.alfresco.rest.api.model.Node;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
|
@@ -34,7 +34,7 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
||||||
import org.alfresco.rest.api.Nodes;
|
import org.alfresco.rest.api.Nodes;
|
||||||
import org.alfresco.rest.api.model.Site;
|
import org.alfresco.rest.api.model.Site;
|
||||||
import org.alfresco.rest.api.tests.client.HttpResponse;
|
import org.alfresco.rest.api.tests.client.HttpResponse;
|
||||||
|
@@ -23,12 +23,12 @@
|
|||||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* #L%
|
* #L%
|
||||||
*/
|
*/
|
||||||
package org.alfresco.repo.node;
|
package org.alfresco.repo.node.sizeDetails;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
import org.alfresco.repo.cache.SimpleCache;
|
import org.alfresco.repo.cache.SimpleCache;
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
|
|
||||||
public interface NodeSizeDetailsService
|
public interface NodeSizeDetailsService
|
@@ -23,7 +23,7 @@
|
|||||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* #L%
|
* #L%
|
||||||
*/
|
*/
|
||||||
package org.alfresco.repo.node;
|
package org.alfresco.repo.node.sizeDetails;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@@ -32,7 +32,7 @@ import java.util.Objects;
|
|||||||
import java.util.concurrent.ThreadPoolExecutor;
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
|
|
||||||
import org.alfresco.repo.cache.SimpleCache;
|
import org.alfresco.repo.cache.SimpleCache;
|
||||||
import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails.STATUS;
|
import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails.STATUS;
|
||||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
@@ -49,8 +49,6 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.InitializingBean;
|
import org.springframework.beans.factory.InitializingBean;
|
||||||
|
|
||||||
import net.sf.acegisecurity.Authentication;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* NodeSizeDetailsServiceImpl
|
* NodeSizeDetailsServiceImpl
|
||||||
* Executing Alfresco FTS Query to find size details of Folder Node
|
* Executing Alfresco FTS Query to find size details of Folder Node
|
||||||
@@ -113,7 +111,6 @@ public class NodeSizeDetailsServiceImpl implements NodeSizeDetailsService, Initi
|
|||||||
|
|
||||||
private void executeSizeCalculation(NodeRef nodeRef, String jobId)
|
private void executeSizeCalculation(NodeRef nodeRef, String jobId)
|
||||||
{
|
{
|
||||||
final Authentication fullAuthentication = AuthenticationUtil.getFullAuthentication();
|
|
||||||
RetryingTransactionCallback<NodeSizeDetails> executionCallback = () -> {
|
RetryingTransactionCallback<NodeSizeDetails> executionCallback = () -> {
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -133,7 +130,6 @@ public class NodeSizeDetailsServiceImpl implements NodeSizeDetailsService, Initi
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
AuthenticationUtil.setFullAuthentication(fullAuthentication);
|
|
||||||
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
|
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
|
||||||
nodeSizeDetails = AuthenticationUtil.runAs(() -> transactionService.getRetryingTransactionHelper()
|
nodeSizeDetails = AuthenticationUtil.runAs(() -> transactionService.getRetryingTransactionHelper()
|
||||||
.doInTransaction(executionCallback, true), AuthenticationUtil.getSystemUserName());
|
.doInTransaction(executionCallback, true), AuthenticationUtil.getSystemUserName());
|
@@ -344,7 +344,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<bean id="NodeSizeDetailsServiceImpl" class="org.alfresco.repo.node.NodeSizeDetailsServiceImpl">
|
<bean id="NodeSizeDetailsServiceImpl" class="org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl">
|
||||||
<property name="searchService" ref="SearchService"/>
|
<property name="searchService" ref="SearchService"/>
|
||||||
<property name="simpleCache" ref="folderSizeSharedCache" />
|
<property name="simpleCache" ref="folderSizeSharedCache" />
|
||||||
<property name="transactionService" ref="transactionService"/>
|
<property name="transactionService" ref="transactionService"/>
|
||||||
@@ -360,7 +360,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="proxyInterfaces">
|
<property name="proxyInterfaces">
|
||||||
<list>
|
<list>
|
||||||
<value>org.alfresco.repo.node.NodeSizeDetailsService</value>
|
<value>org.alfresco.repo.node.sizeDetails.NodeSizeDetailsService</value>
|
||||||
</list>
|
</list>
|
||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
|
Reference in New Issue
Block a user