inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

APPS-139 code review comments

Browse Source
This commit is contained in:
Roxana Lucanu
2020-06-02 19:02:07 +03:00
parent a76384b1eb
commit a0455b6c9d
2 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java
View File

@@ -52,6 +52,7 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.I18NUtil;
/** /**
* Creates a new record from the 'current' document version. * Creates a new record from the 'current' document version.
@@ -150,6 +151,9 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
this.recordService = recordService; this.recordService = recordService;
} }
/**
* @param capabilityService capability service
*/
public void setCapabilityService(CapabilityService capabilityService) public void setCapabilityService(CapabilityService capabilityService)
{ {
this.capabilityService = capabilityService; this.capabilityService = capabilityService;
@@ -177,31 +181,12 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
logger.debug("Can not declare version as record, because " + actionedUponNodeRef.toString() + " is not a supported type."); logger.debug("Can not declare version as record, because " + actionedUponNodeRef.toString() + " is not a supported type.");
} }
} }
else if (!checkAspects(actionedUponNodeRef)) else if (!isActionEligible(actionedUponNodeRef))
{ {
NodeRef filePlan = (NodeRef)action.getParameterValue(PARAM_FILE_PLAN); NodeRef filePlan = (NodeRef)action.getParameterValue(PARAM_FILE_PLAN);
if (filePlan == null) if (filePlan == null)
{ {
// TODO .. eventually make the file plan parameter required filePlan = RecordActionUtils.getDefaultFilePlan(authenticationUtil, filePlanService, NAME);
filePlan = authenticationUtil.runAs(new org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork<NodeRef>()
{
@Override
public NodeRef doWork()
{
return filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID);
}
}, authenticationUtil.getAdminUserName());
// if the file plan is still null, raise an exception
if (filePlan == null)
{
if (logger.isDebugEnabled())
{
logger.debug("Can not declare version record, because the default file plan can not be determined. Make sure at least one file plan has been created.");
}
throw new AlfrescoRuntimeException("Can not declare version record, because the default file plan can not be determined.");
}
} }
else else
{ {
@@ -237,7 +222,7 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
} }
else else
{ {
throw new AccessDeniedException("The" + authenticationUtil.getRunAsUser() + "user doesn't have file permission on the specified location"); throw new AccessDeniedException(I18NUtil.getMessage("permissions.err_access_denied"));
} }
} }
else else
@@ -259,16 +244,16 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
} }
/* Check aspects that stop declaring the version as record.*/ /* Check aspects that stop declaring the version as record.*/
private boolean checkAspects(NodeRef actionedUponNodeRef) private boolean isActionEligible(NodeRef actionedUponNodeRef)
{ {
Map<QName, String> mapedAspects = new HashMap<>(); Map<QName, String> mappedAspects = new HashMap<>();
mapedAspects.put(ASPECT_RECORD, " is already a record."); mappedAspects.put(ASPECT_RECORD, " is already a record.");
mapedAspects.put(ContentModel.ASPECT_WORKING_COPY, " is a working copy."); mappedAspects.put(ContentModel.ASPECT_WORKING_COPY, " is a working copy.");
mapedAspects.put(ASPECT_RECORD_REJECTION_DETAILS, " has previously been rejected."); mappedAspects.put(ASPECT_RECORD_REJECTION_DETAILS, " has previously been rejected.");
mapedAspects.put(ASPECT_SYNCED, " is synched content."); mappedAspects.put(ASPECT_SYNCED, " is synched content.");
for (Map.Entry<QName, String> aspect : mapedAspects.entrySet()) for (Map.Entry<QName, String> aspect : mappedAspects.entrySet())
{ {
if (nodeService.hasAspect(actionedUponNodeRef, aspect.getKey())) if (nodeService.hasAspect(actionedUponNodeRef, aspect.getKey()))
{ {

24
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java
View File

@@ -46,7 +46,12 @@ public class RecordActionUtils
/** /**
* Logger * Logger
*/ */
private static final Log LOGGER = LogFactory.getLog(CreateRecordAction.class); private static final Log LOGGER = LogFactory.getLog(RecordActionUtils.class);
/** Private constructor to prevent instantiation. */
private RecordActionUtils()
{
}
static class Services static class Services
{ {
@@ -94,7 +99,7 @@ public class RecordActionUtils
} }
final String[] pathElementsArray = StringUtils.tokenizeToStringArray(pathParameter, "/", false, true); final String[] pathElementsArray = StringUtils.tokenizeToStringArray(pathParameter, "/", false, true);
if ((pathElementsArray != null) && (pathElementsArray.length > 0)) if (pathElementsArray.length > 0)
{ {
destinationFolder = resolvePath(services.getNodeService(), filePlan, Arrays.asList(pathElementsArray), actionName); destinationFolder = resolvePath(services.getNodeService(), filePlan, Arrays.asList(pathElementsArray), actionName);
@@ -104,7 +109,8 @@ public class RecordActionUtils
{ {
throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path is not a record folder."); throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path is not a record folder.");
} }
} else }
else
{ {
throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path could not be found."); throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path could not be found.");
} }
@@ -128,7 +134,8 @@ public class RecordActionUtils
if (nodeRef == null) if (nodeRef == null)
{ {
throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path could not be found."); throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path could not be found.");
} else }
else
{ {
QName nodeType = nodeService.getType(nodeRef); QName nodeType = nodeService.getType(nodeRef);
if (nodeType.equals(RecordsManagementModel.TYPE_HOLD_CONTAINER) || if (nodeType.equals(RecordsManagementModel.TYPE_HOLD_CONTAINER) ||
@@ -152,14 +159,7 @@ public class RecordActionUtils
*/ */
static NodeRef getDefaultFilePlan(AuthenticationUtil authenticationUtil, FilePlanService filePlanService, String actionName) static NodeRef getDefaultFilePlan(AuthenticationUtil authenticationUtil, FilePlanService filePlanService, String actionName)
{ {
NodeRef filePlan = authenticationUtil.runAsSystem(new org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork<NodeRef>() NodeRef filePlan = authenticationUtil.runAsSystem(() -> filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID));
{
@Override
public NodeRef doWork()
{
return filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID);
}
});
// if the file plan is still null, raise an exception // if the file plan is still null, raise an exception
if (filePlan == null) if (filePlan == null)