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

ACS-5506 Add PMD fixes

Browse Source
This commit is contained in:
MichalKinas
2024-01-17 13:47:40 +01:00
parent 1f72faa90c
commit ecfeb77fb0
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java
View File

@@ -160,7 +160,7 @@ public class GroupsImpl implements Groups
authorityDisplayName = group.getDisplayName();
}
HashMap<QName, Serializable> props = new HashMap<>();
Map<QName, Serializable> props = new HashMap<>();
if (StringUtils.isNotEmpty(group.getDescription()))
{
props.put(ContentModel.PROP_DESCRIPTION, group.getDescription());
@@ -194,7 +194,7 @@ public class GroupsImpl implements Groups
if (StringUtils.isNotEmpty(group.getDescription()))
{
HashMap<QName, Serializable> props = new HashMap<>();
Map<QName, Serializable> props = new HashMap<>();
props.put(ContentModel.PROP_DESCRIPTION, group.getDescription());
authorityDAO.setAuthorityProperties(authorityService.getName(AuthorityType.GROUP, groupId), props);
}
@@ -617,7 +617,8 @@ public class GroupsImpl implements Groups
group.setIsRoot(isRootAuthority(rootAuthorities, authorityInfo.getAuthorityName()));
Set<String> containedAuthorities;
try {
try
{
containedAuthorities = authorityService.getContainedAuthorities(AuthorityType.GROUP, authorityInfo.getAuthorityName(), true);
} catch (UnknownAuthorityException e)
{
@@ -627,8 +628,9 @@ public class GroupsImpl implements Groups
NodeRef groupNodeRef = authorityService.getAuthorityNodeRef(authorityInfo.getAuthorityName());
String description;
try {
description = nodeService.getProperty(groupNodeRef, ContentModel.PROP_DESCRIPTION) != null ?
try
{
description = groupNodeRef != null && nodeService.getProperty(groupNodeRef, ContentModel.PROP_DESCRIPTION) != null ?
nodeService.getProperty(groupNodeRef, ContentModel.PROP_DESCRIPTION).toString() :
null;
} catch (InvalidNodeRefException e)

2
remote-api/src/main/java/org/alfresco/rest/api/model/Group.java
View File

@@ -181,6 +181,6 @@ public class Group implements Comparable<Group>
public boolean wasSet(String fieldName)
{
Boolean b = setFields.get(fieldName);
return b != null ? b : false;
return b != null && b;
}
}