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

fix sonar issues

Browse Source
This commit is contained in:
cagache
2019-08-06 16:25:08 +03:00
parent 71b50078cc
commit c12e300919
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
View File

@@ -171,7 +171,7 @@ public class FreezeServiceImpl extends ServiceBaseImpl
NodeRef hold = null;
if (!nodeRefs.isEmpty())
{
List<NodeRef> list = new ArrayList<>(nodeRefs);
final List<NodeRef> 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 ++;

22
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
View File

@@ -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<NodeRef> recordFolders = recordFolderService.getRecordFolders(nodeRef);
final List<NodeRef> recordFolders = recordFolderService.getRecordFolders(nodeRef);
for (NodeRef recordFolder : recordFolders)
{
holdsIncludingNodeRef.addAll(getParentHolds(recordFolder));
@@ -305,7 +308,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
if (!includedInHold)
{
Set<NodeRef> filePlans = filePlanService.getFilePlans();
final Set<NodeRef> filePlans = filePlanService.getFilePlans();
if (!CollectionUtils.isEmpty(filePlans))
{
List<NodeRef> 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))

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java
View File

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