From af7e9f97aa8c75d5a41725bd6eb96b331b007349 Mon Sep 17 00:00:00 2001
From: Tom Page <thomas.page@alfresco.com>
Date: Mon, 3 Oct 2022 15:28:00 +0100
Subject: [PATCH] ACS-3376 Simplify method of obtaining rule ids.

---
 .../java/org/alfresco/rest/api/impl/rules/RuleSetLoader.java | 5 ++---
 .../org/alfresco/rest/api/impl/rules/RuleSetLoaderTest.java  | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/rules/RuleSetLoader.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/rules/RuleSetLoader.java
index 2d50a387f9..251bbfdace 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/rules/RuleSetLoader.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/rules/RuleSetLoader.java
@@ -35,7 +35,6 @@ import java.util.List;
 
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 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.service.Experimental;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -152,8 +151,8 @@ public class RuleSetLoader
     private List<String> loadRuleIds(NodeRef folderNodeRef)
     {
         return ruleService.getRules(folderNodeRef, false).stream()
-                          .map(restRuleModelMapper::toRestModel)
-                          .map(Rule::getId)
+                          .map(org.alfresco.service.cmr.rule.Rule::getNodeRef)
+                          .map(NodeRef::getId)
                           .collect(toList());
     }
 
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleSetLoaderTest.java b/remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleSetLoaderTest.java
index bf4f001e99..8d3dfd6c57 100644
--- a/remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleSetLoaderTest.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleSetLoaderTest.java
@@ -90,6 +90,7 @@ public class RuleSetLoaderTest extends TestCase
         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.getFoldersLinkingToRuleSet(RULE_SET_NODE)).willReturn(List.of(LINKING_FOLDER));
     }
 
     @Test