From c12e300919037eaa53fa6f0304ff56404159c2e4 Mon Sep 17 00:00:00 2001 From: cagache Date: Tue, 6 Aug 2019 16:25:08 +0300 Subject: [PATCH] fix sonar issues --- .../freeze/FreezeServiceImpl.java | 4 ++-- .../hold/HoldServiceImpl.java | 22 +++++++++---------- .../model/rma/aspect/FrozenAspect.java | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java index 63a6c9cdb1..762e3188fb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java @@ -171,7 +171,7 @@ public class FreezeServiceImpl extends ServiceBaseImpl NodeRef hold = null; if (!nodeRefs.isEmpty()) { - List list = new ArrayList<>(nodeRefs); + final List list = new ArrayList<>(nodeRefs); hold = createHold(list.get(0), reason); getHoldService().addToHold(hold, list); } @@ -307,7 +307,7 @@ public class FreezeServiceImpl extends ServiceBaseImpl { for (ChildAssociationRef childAssociationRef : childAssocs) { - NodeRef childRef = childAssociationRef.getChildRef(); + final NodeRef childRef = childAssociationRef.getChildRef(); if (childAssociationRef.isPrimary() && isFrozen(childRef)) { heldCount ++; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java index 167645696f..9045c1144b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java @@ -90,6 +90,9 @@ public class HoldServiceImpl extends ServiceBaseImpl private static final String AUDIT_ADD_TO_HOLD = "addToHold"; private static final String AUDIT_REMOVE_FROM_HOLD = "removeFromHold"; + /** I18N */ + private static final String MSG_ERR_ACCESS_DENIED = "permissions.err_access_denied"; + /** File Plan Service */ private FilePlanService filePlanService; @@ -296,7 +299,7 @@ public class HoldServiceImpl extends ServiceBaseImpl // check whether the record is held by virtue of it's record folder if (isRecord(nodeRef)) { - List recordFolders = recordFolderService.getRecordFolders(nodeRef); + final List recordFolders = recordFolderService.getRecordFolders(nodeRef); for (NodeRef recordFolder : recordFolders) { holdsIncludingNodeRef.addAll(getParentHolds(recordFolder)); @@ -305,7 +308,7 @@ public class HoldServiceImpl extends ServiceBaseImpl if (!includedInHold) { - Set filePlans = filePlanService.getFilePlans(); + final Set filePlans = filePlanService.getFilePlans(); if (!CollectionUtils.isEmpty(filePlans)) { List holdsNotIncludingNodeRef = new ArrayList<>(); @@ -562,7 +565,7 @@ public class HoldServiceImpl extends ServiceBaseImpl if (permissionService.hasPermission(hold, RMPermissionModel.FILING) == AccessStatus.DENIED) { - throw new AccessDeniedException(I18NUtil.getMessage("permissions.err_access_denied")); + throw new AccessDeniedException(I18NUtil.getMessage(MSG_ERR_ACCESS_DENIED)); } // check that the node isn't already in the hold @@ -609,15 +612,12 @@ public class HoldServiceImpl extends ServiceBaseImpl throw new IntegrityException(I18NUtil.getMessage("rm.hold.add-to-hold-invalid-type", nodeName), null); } - if ((isRecord(nodeRef) || isRecordFolder(nodeRef)) && - permissionService.hasPermission(nodeRef, RMPermissionModel.FILING) == AccessStatus.DENIED) + if (((isRecord(nodeRef) || isRecordFolder(nodeRef)) && + permissionService.hasPermission(nodeRef, RMPermissionModel.FILING) == AccessStatus.DENIED) || + (instanceOf(nodeRef, ContentModel.TYPE_CONTENT) && + permissionService.hasPermission(nodeRef, PermissionService.WRITE) == AccessStatus.DENIED)) { - throw new AccessDeniedException(I18NUtil.getMessage("permissions.err_access_denied")); - } - else if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT) && - permissionService.hasPermission(nodeRef, PermissionService.WRITE) == AccessStatus.DENIED) - { - throw new AccessDeniedException(I18NUtil.getMessage("permissions.err_access_denied")); + throw new AccessDeniedException(I18NUtil.getMessage(MSG_ERR_ACCESS_DENIED)); } if (nodeService.hasAspect(nodeRef, ASPECT_ARCHIVED)) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java index 20f9256ec3..deadb823e2 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java @@ -165,7 +165,7 @@ public class FrozenAspect extends BaseBehaviourBean if (nodeService.exists(nodeRef) && (isRecord(nodeRef) || instanceOf(nodeRef, TYPE_CONTENT))) { // get the owning folder - NodeRef parentRef = nodeService.getPrimaryParent(nodeRef).getParentRef(); + final NodeRef parentRef = nodeService.getPrimaryParent(nodeRef).getParentRef(); // check that the aspect has been added if (nodeService.hasAspect(parentRef, ASPECT_HELD_CHILDREN)) {