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 missing annotations, hasSubgroups not required

Browse Source
This commit is contained in:
MichalKinas
2024-01-31 00:51:45 +01:00
parent d3c7342f05
commit 605c3a6ccd
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java
View File

@@ -42,7 +42,7 @@ public class RestGroupsModel extends TestModel implements IRestModel<RestGroupsM
private String description;
@JsonProperty(required = true)
private Boolean isRoot;
@JsonProperty(required = true)
@JsonProperty()
private Boolean hasSubgroups;
@JsonProperty("parentIds")

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

@@ -1444,6 +1444,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
nodeService.setProperty(ref, ContentModel.PROP_AUTHORITY_DISPLAY_NAME, authorityDisplayName);
}
@Override
public Pair<String, String> getAuthorityDisplayNameAndDescription(String authorityName)
{
NodeRef ref = getAuthorityOrNull(authorityName);
@@ -1456,6 +1457,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
return new Pair<>(DefaultTypeConverter.INSTANCE.convert(String.class, displayName), DefaultTypeConverter.INSTANCE.convert(String.class, description));
}
@Override
public void setAuthorityDisplayNameAndDescription(String authorityName, String authorityDisplayName, String description)
{
NodeRef ref = getAuthorityOrNull(authorityName);

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

@@ -700,6 +700,7 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean
/**
* {@inheritDoc}
*/
@Override
public Pair<String, String> getAuthorityDisplayNameAndDescription(String name)
{
Pair<String, String> displayNameAndDescription = authorityDAO.getAuthorityDisplayNameAndDescription(name);
@@ -713,6 +714,7 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean
/**
* {@inheritDoc}
*/
@Override
public void setAuthorityDisplayNameAndDescription(String authorityName, String authorityDisplayName, String description)
{
AuthorityType type = AuthorityType.getAuthorityType(authorityName);

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

@@ -1433,6 +1433,7 @@ public class AuthorityServiceTest extends TestCase
assertEquals(pubAuthorityService.getAuthorityDisplayName("Monkey"), "Monkey");
}
@Test
public void testAuthorityDisplayNameAndDescription()
{
Map<QName, Serializable> props = new HashMap<>();