From 1048c431c0dddf766cbe556cf119b31c34f5c55e Mon Sep 17 00:00:00 2001 From: mohit-singh4 Date: Fri, 20 Sep 2024 14:35:21 +0530 Subject: [PATCH] [feature/MNT-24127-EndpointToCalculateFolderSize] Addressing review comments related to calculate and retrieve folder size details --- .../src/main/java/org/alfresco/rest/api/SizeDetails.java | 2 +- .../java/org/alfresco/rest/api/impl/SizeDetailsImpl.java | 6 +++--- .../alfresco/rest/api/nodes/NodeSizeDetailsRelation.java | 2 +- .../org/alfresco/rest/api/impl/SizeDetailsImplTest.java | 4 ++-- .../org/alfresco/rest/api/tests/NodeSizeDetailsTest.java | 2 +- .../node/{ => sizeDetails}/NodeSizeDetailsService.java | 4 ++-- .../{ => sizeDetails}/NodeSizeDetailsServiceImpl.java | 8 ++------ .../src/main/resources/alfresco/node-services-context.xml | 4 ++-- 8 files changed, 14 insertions(+), 18 deletions(-) rename repository/src/main/java/org/alfresco/repo/node/{ => sizeDetails}/NodeSizeDetailsService.java (91%) rename repository/src/main/java/org/alfresco/repo/node/{ => sizeDetails}/NodeSizeDetailsServiceImpl.java (97%) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/SizeDetails.java b/remote-api/src/main/java/org/alfresco/rest/api/SizeDetails.java index f9afe7a10c..a6e4c5795b 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/SizeDetails.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/SizeDetails.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.api; -import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails; +import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails; public interface SizeDetails { 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 006ac10f98..3ca47143d6 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 @@ -29,9 +29,9 @@ import java.io.Serializable; import org.alfresco.model.ContentModel; import org.alfresco.repo.cache.SimpleCache; -import org.alfresco.repo.node.NodeSizeDetailsService; -import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails; -import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails.STATUS; +import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsService; +import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails; +import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails.STATUS; import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.SizeDetails; import org.alfresco.rest.framework.core.exceptions.InvalidNodeTypeException; diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSizeDetailsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSizeDetailsRelation.java index 08220f8da5..96153eb33e 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSizeDetailsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSizeDetailsRelation.java @@ -28,7 +28,7 @@ package org.alfresco.rest.api.nodes; 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.framework.WebApiDescription; import org.alfresco.rest.framework.WebApiParam; 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 9cf5fbd2b4..8082504dc5 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 @@ -35,8 +35,8 @@ import java.util.concurrent.ThreadPoolExecutor; import org.alfresco.model.ContentModel; import org.alfresco.repo.cache.SimpleCache; -import org.alfresco.repo.node.NodeSizeDetailsServiceImpl; -import org.alfresco.repo.node.NodeSizeDetailsServiceImpl.NodeSizeDetails; +import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl; +import org.alfresco.repo.node.sizeDetails.NodeSizeDetailsServiceImpl.NodeSizeDetails; import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.model.Node; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeSizeDetailsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeSizeDetailsTest.java index 19ef4ec1f7..a576177be7 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeSizeDetailsTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeSizeDetailsTest.java @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.List; 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.model.Site; import org.alfresco.rest.api.tests.client.HttpResponse; diff --git a/repository/src/main/java/org/alfresco/repo/node/NodeSizeDetailsService.java b/repository/src/main/java/org/alfresco/repo/node/sizeDetails/NodeSizeDetailsService.java similarity index 91% rename from repository/src/main/java/org/alfresco/repo/node/NodeSizeDetailsService.java rename to repository/src/main/java/org/alfresco/repo/node/sizeDetails/NodeSizeDetailsService.java index df10828fac..59b348773d 100644 --- a/repository/src/main/java/org/alfresco/repo/node/NodeSizeDetailsService.java +++ b/repository/src/main/java/org/alfresco/repo/node/sizeDetails/NodeSizeDetailsService.java @@ -23,12 +23,12 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.repo.node; +package org.alfresco.repo.node.sizeDetails; import java.io.Serializable; 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; public interface NodeSizeDetailsService diff --git a/repository/src/main/java/org/alfresco/repo/node/NodeSizeDetailsServiceImpl.java b/repository/src/main/java/org/alfresco/repo/node/sizeDetails/NodeSizeDetailsServiceImpl.java similarity index 97% rename from repository/src/main/java/org/alfresco/repo/node/NodeSizeDetailsServiceImpl.java rename to repository/src/main/java/org/alfresco/repo/node/sizeDetails/NodeSizeDetailsServiceImpl.java index 945dacf85d..e9ccc0b255 100644 --- a/repository/src/main/java/org/alfresco/repo/node/NodeSizeDetailsServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/node/sizeDetails/NodeSizeDetailsServiceImpl.java @@ -23,7 +23,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.repo.node; +package org.alfresco.repo.node.sizeDetails; import java.io.Serializable; import java.util.Date; @@ -32,7 +32,7 @@ import java.util.Objects; import java.util.concurrent.ThreadPoolExecutor; 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.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.repository.NodeRef; @@ -49,8 +49,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; -import net.sf.acegisecurity.Authentication; - /** * NodeSizeDetailsServiceImpl * 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) { - final Authentication fullAuthentication = AuthenticationUtil.getFullAuthentication(); RetryingTransactionCallback executionCallback = () -> { try @@ -133,7 +130,6 @@ public class NodeSizeDetailsServiceImpl implements NodeSizeDetailsService, Initi try { - AuthenticationUtil.setFullAuthentication(fullAuthentication); AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName()); nodeSizeDetails = AuthenticationUtil.runAs(() -> transactionService.getRetryingTransactionHelper() .doInTransaction(executionCallback, true), AuthenticationUtil.getSystemUserName()); diff --git a/repository/src/main/resources/alfresco/node-services-context.xml b/repository/src/main/resources/alfresco/node-services-context.xml index 6040282f54..b517f08b25 100644 --- a/repository/src/main/resources/alfresco/node-services-context.xml +++ b/repository/src/main/resources/alfresco/node-services-context.xml @@ -344,7 +344,7 @@ - + @@ -360,7 +360,7 @@ - org.alfresco.repo.node.NodeSizeDetailsService + org.alfresco.repo.node.sizeDetails.NodeSizeDetailsService