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

Rename authority and person exceptions for MNT-20764 (#978)

Browse Source
This commit is contained in:
Abdul Mohammed
2020-05-01 17:05:00 +01:00
parent f1f9d6d4a7
commit d5470a3e15
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
View File

@@ -1670,7 +1670,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
{
if (authorityName.indexOf(illegalCharacter) != -1)
{
throw new AlfrescoRuntimeException("Group name contains characters that are not permitted: "+authorityName.charAt(authorityName.indexOf(illegalCharacter)));
throw new AuthorityException("Group name contains characters that are not permitted: "+authorityName.charAt(authorityName.indexOf(illegalCharacter)));
}
}
}

2
src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
View File

@@ -1797,7 +1797,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
{
if (userName.indexOf(illegalCharacter) != -1)
{
throw new AlfrescoRuntimeException("Person name contains characters that are not permitted: "+userName.charAt(userName.indexOf(illegalCharacter)));
throw new PersonException("Person name contains characters that are not permitted: "+userName.charAt(userName.indexOf(illegalCharacter)));
}
}
}

4
src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
View File

@@ -261,9 +261,9 @@ public class AuthorityServiceTest extends TestCase
try
{
authorityService.createAuthority(AuthorityType.GROUP, groupName);
fail("AlfrescoRuntimeException not caught for illegalCharacter: " +groupName.charAt(groupName.indexOf(illegalCharacter)));
fail("AuthorityException not caught for illegalCharacter: " +groupName.charAt(groupName.indexOf(illegalCharacter)));
}
catch (AlfrescoRuntimeException ignored)
catch (AuthorityException ignored)
{
// Expected
}

4
src/test/java/org/alfresco/repo/security/person/PersonTest.java
View File

@@ -467,9 +467,9 @@ public class PersonTest extends TestCase
try
{
personService.createPerson(createDefaultProperties(personName, "Some", "User", "some.user@example.com", "alfresco", rootNodeRef));
fail("AlfrescoRuntimeException not caught for illegalCharacter: " +personName.charAt(personName.indexOf(illegalCharacter)));
fail("PersonException not caught for illegalCharacter: " +personName.charAt(personName.indexOf(illegalCharacter)));
}
catch (AlfrescoRuntimeException ignored)
catch (PersonException ignored)
{
// Expected
}