ACS-5506 Add PMD fixes

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

@@ -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 {
+        try
-            description = nodeService.getProperty(groupNodeRef, ContentModel.PROP_DESCRIPTION) != null ?
+        {
+            description = groupNodeRef != null && nodeService.getProperty(groupNodeRef, ContentModel.PROP_DESCRIPTION) != null ?
                     nodeService.getProperty(groupNodeRef, ContentModel.PROP_DESCRIPTION).toString() :
                     null;
         } catch (InvalidNodeRefException e)

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

@@ -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;
     }
 }

repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java

@@ -379,13 +379,15 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
         }
     }
 
+    @Override
     public void createAuthority(String name, String authorityDisplayName, Set<String> authorityZones) {
         createAuthority(name, authorityDisplayName, authorityZones, null);
     }
 
+    @Override
     public void createAuthority(String name, String authorityDisplayName, Set<String> authorityZones, Map<QName, Serializable> properties)
     {
-        HashMap<QName, Serializable> props = new HashMap<>();
+        Map<QName, Serializable> props = new HashMap<>();
         /* MNT-11749 : Alfresco allows to create authorities with different char cases, but disallow duplicates */
         props.put(ContentModel.PROP_NAME, DigestUtils.md5Hex(name));
         props.put(ContentModel.PROP_AUTHORITY_NAME, name);
@@ -1443,6 +1445,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
 
     }
 
+    @Override
     public void setAuthorityProperties(String authorityName, Map<QName, Serializable> properties)
     {
         NodeRef ref = getAuthorityOrNull(authorityName);

repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java

@@ -550,6 +550,7 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean
     /**
      * {@inheritDoc}
      */
+    @Override
     public String createAuthority(AuthorityType type, String shortName, Map<QName, Serializable> properties)
     {
         return createAuthority(type, shortName, shortName, getDefaultZones(), properties);
@@ -661,6 +662,7 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean
     /**
      * {@inheritDoc}
      */
+    @Override
     public String createAuthority(AuthorityType type, String shortName, String authorityDisplayName,
                                   Set<String> authorityZones, Map<QName, Serializable> properties)
     {

repository/src/main/java/org/alfresco/service/cmr/security/AuthorityService.java

@@ -244,7 +244,7 @@ public interface AuthorityService
      *         associated with the type appended with the short name)
      */
     @Auditable(parameters = {"type", "shortName"})
-    public String createAuthority(AuthorityType type, String shortName, Map<QName, Serializable> properties);
+    String createAuthority(AuthorityType type, String shortName, Map<QName, Serializable> properties);
 
     /**
      * Create an authority with a display name and zone.
@@ -282,7 +282,7 @@ public interface AuthorityService
      *         the short name)
      */
     @Auditable(parameters = {"type", "shortName", "authorityDisplayName", "authorityZones"})
-    public String createAuthority(AuthorityType type, String shortName, String authorityDisplayName, Set<String> authorityZones, Map<QName, Serializable> properties);
+    String createAuthority(AuthorityType type, String shortName, String authorityDisplayName, Set<String> authorityZones, Map<QName, Serializable> properties);
 
     /**
      * Set an authority to include another authority. For example, adding a

repository/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java

@@ -86,6 +86,7 @@ import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.testing.category.LuceneTests;
 import org.alfresco.util.testing.category.RedundantTests;
 import org.junit.FixMethodOrder;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runners.MethodSorters;
 import org.springframework.context.ApplicationContext;
@@ -582,6 +583,7 @@ public class AuthorityServiceTest extends TestCase
         }
     }
 
+    @Test
     public void testCreateGroupAuthWithProperties()
     {
         String auth;
@@ -589,7 +591,7 @@ public class AuthorityServiceTest extends TestCase
         String prefixedGroupName = "GROUP_TESTGROUP";
         String description = "testDesc";
         String title = "testTitle";
-        HashMap<QName, Serializable> props = new HashMap<>();
+        Map<QName, Serializable> props = new HashMap<>();
         props.put(ContentModel.PROP_DESCRIPTION, description);
         props.put(ContentModel.PROP_TITLE, title);
 
@@ -614,6 +616,7 @@ public class AuthorityServiceTest extends TestCase
         pubAuthorityService.deleteAuthority(auth);
     }
 
+    @Test
     public void testUpdateAuthorityProperties()
     {
         String auth;
@@ -621,7 +624,7 @@ public class AuthorityServiceTest extends TestCase
         String prefixedGroupName = "GROUP_TESTGROUP";
         String description = "testDesc";
         String title = "testTitle";
-        HashMap<QName, Serializable> props = new HashMap<>();
+        Map<QName, Serializable> props = new HashMap<>();
         props.put(ContentModel.PROP_DESCRIPTION, description);
         props.put(ContentModel.PROP_TITLE, title);