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-3376 Simplify method of obtaining rule ids.

Browse Source
This commit is contained in:
Tom Page
2022-10-03 15:28:00 +01:00
parent a93dd27674
commit af7e9f97aa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
remote-api/src/main/java/org/alfresco/rest/api/impl/rules/RuleSetLoader.java
View File

@@ -35,7 +35,6 @@ import java.util.List;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.rest.api.impl.mapper.rules.RestRuleModelMapper; import org.alfresco.rest.api.impl.mapper.rules.RestRuleModelMapper;
import org.alfresco.rest.api.model.rules.Rule;
import org.alfresco.rest.api.model.rules.RuleSet; import org.alfresco.rest.api.model.rules.RuleSet;
import org.alfresco.service.Experimental; import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -152,8 +151,8 @@ public class RuleSetLoader
private List<String> loadRuleIds(NodeRef folderNodeRef) private List<String> loadRuleIds(NodeRef folderNodeRef)
{ {
return ruleService.getRules(folderNodeRef, false).stream() return ruleService.getRules(folderNodeRef, false).stream()
.map(restRuleModelMapper::toRestModel) .map(org.alfresco.service.cmr.rule.Rule::getNodeRef)
.map(Rule::getId) .map(NodeRef::getId)
.collect(toList()); .collect(toList());
} }

1
remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleSetLoaderTest.java
View File

@@ -90,6 +90,7 @@ public class RuleSetLoaderTest extends TestCase
given(nodeServiceMock.getParentAssocs(RULE_SET_NODE)).willReturn(List.of(ruleSetAssociationMock, linkAssociationMock)); given(nodeServiceMock.getParentAssocs(RULE_SET_NODE)).willReturn(List.of(ruleSetAssociationMock, linkAssociationMock));
given(ruleServiceMock.getFoldersInheritingRuleSet(eq(RULE_SET_NODE), anyInt())).willReturn(List.of(INHERITING_FOLDER)); given(ruleServiceMock.getFoldersInheritingRuleSet(eq(RULE_SET_NODE), anyInt())).willReturn(List.of(INHERITING_FOLDER));
given(ruleServiceMock.getFoldersLinkingToRuleSet(RULE_SET_NODE)).willReturn(List.of(LINKING_FOLDER));
} }
@Test @Test