Merge branch 'feature/ACS-3555_Add_CustomEmbeddedWorkflow_license_code' into feature/ACS-3560_Discovery_API_for_customEmbeddedWorkflow_License

* ACS-3364 Add permission handling to linkedToBy.

* ACS-3366 Add support for isLinkedTo to GET rule sets.

.travis.yml

@@ -264,6 +264,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 60 mvn -B verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-restapi"
 
     - name: "REST API TAS tests part2"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
@@ -272,6 +273,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 60 mvn -B verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-restapi"
 
     - name: "REST API TAS tests part3"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
@@ -280,6 +282,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 60 mvn -B verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-restapi"
 
     - name: "CMIS TAS tests - BROWSER binding"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
@@ -288,6 +291,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 40 mvn -B verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-browser -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-cmis"
 
     - name: "CMIS TAS tests - ATOM binding"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
@@ -296,6 +300,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 40 mvn -B verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-atom -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-cmis"
 
     - name: "CMIS TAS tests - WEBSERVICES binding"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
@@ -304,6 +309,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 40 mvn -B verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-webservices -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-cmis"
 
     - name: "Email TAS tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
@@ -312,6 +318,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 30 mvn -B verify -f packaging/tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-email"
 
     - name: "WebDAV TAS tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
@@ -320,6 +327,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 30 mvn -B verify -f packaging/tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-webdav"
 
     - name: "Integration TAS tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
@@ -328,6 +336,7 @@ jobs:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script: travis_wait 30 mvn -B verify -f packaging/tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      after_failure: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/tas-integration"
 
     - name: "Share Services - ShareServicesTestSuite"
       if: commit_message !~ /\[skip repo\]/

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>17.115</version>
+      <version>17.128-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>17.115</version>
+      <version>17.128-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>17.115</version>
+      <version>17.128-SNAPSHOT</version>
    </parent>
 
    <build>

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java

@@ -72,6 +72,7 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 import org.alfresco.utility.model.TestGroup;
 
@@ -259,6 +260,7 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest
      * And the document is not declared as a record
      */
     @Test (dataProvider = "invalidDestinationPaths",groups = { TestGroup.NOT_SUPPORTED_ON_SINGLE_PIPELINE })
+    @Ignore
     public void declareAndFileToInvalidLocationUsingActionsAPI(String containerPath, String expectedException) throws Exception
     {
         STEP("Declare document as record with an invalid location parameter value");

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/FileVersionAsRecordTests.java

@@ -61,6 +61,7 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 import org.alfresco.utility.model.TestGroup;
 
@@ -209,6 +210,7 @@ public class FileVersionAsRecordTests extends BaseRMRestTest
      * And the document is not declared as a version record
      */
     @Test (dataProvider = "invalidDestinationPaths", groups = { TestGroup.NOT_SUPPORTED_ON_SINGLE_PIPELINE })
+    @Ignore
     public void declareVersionAndFileToInvalidLocationUsingActionsAPI(String containerPath, String expectedException) throws Exception
     {
         STEP("Declare document as record version with an invalid location parameter value");

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java

@@ -75,6 +75,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 /**
@@ -291,6 +292,7 @@ public class DeleteRecordTests extends BaseRMRestTest
      * </pre>
      */
     @Test (description = "Destroying record doesn't delete the content for the associated copy")
+    @Ignore
     @AlfrescoTest (jira = "MNT-20145")
     public void destroyOfRecord()
     {

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java

@@ -53,6 +53,7 @@ import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -134,6 +135,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
      * <p/> TestRail Test C775<p/>
      **/
     @Test
+    @Ignore
     @AlfrescoTest(jira = "RM-1622")
     public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
         STEP("Create record category");
@@ -200,6 +202,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
      * When the record is linked to a folder with the same disposition schedule
      * */
     @Test
+    @Ignore
     @AlfrescoTest (jira = "RM-3060")
     public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
 
@@ -363,6 +366,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
     }
 
     @Test
+    @Ignore
     @AlfrescoTest(jira = "RM-1622")
     public void sameLevelDispositionScheduleStepsPeriodsCalculation() throws Exception {
 
@@ -415,6 +419,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
     }
 
     @Test (dependsOnMethods = {"sameLevelDispositionScheduleStepsPeriodsCalculation" })
+    @Ignore
     public void deleteLongestPeriodTestPrecondition() {
         // Delete the RM site
         getRestAPIFactory().getRMSiteAPI().deleteRMSite();
@@ -422,4 +427,4 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
         // Verify the status code
         assertStatusCode(NO_CONTENT);
     }
-    }
+    }

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>17.115</version>
+      <version>17.128-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-community/rm-community-repo/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>17.115</version>
+      <version>17.128-SNAPSHOT</version>
    </parent>
 
    <properties>

amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <properties>

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js

@@ -14,7 +14,7 @@ function main()
       maxResults: (args.maxResults !== null) ? parseInt(args.maxResults, 10) : DEFAULT_MAX_RESULTS,
       pageSize: (args.pageSize !== null) ? parseInt(args.pageSize, 10) : DEFAULT_PAGE_SIZE,
       startIndex: (args.startIndex !== null) ? parseInt(args.startIndex, 10) : 0,
-      facetFields: args.facetFields,
+      facetFields: encodeURIComponent(args.facetFields),
       filters: args.filters,
       encodedFilters: args.encodedFilters,
       spell: (args.spellcheck !== null) ? (args.spellcheck == "true") : false

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>17.115</version>
+      <version>17.128-SNAPSHOT</version>
    </parent>
 
    <dependencies>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.3.0</version>
+            <version>6.3.1</version>
         </dependency>
 
         <!-- the cxf libs were updated, see dependencyManagement section -->

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <dependencies>

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 </project>

packaging/docker-alfresco/Dockerfile

@@ -1,6 +1,6 @@
 # Fetch image based on Tomcat 9.0, Java 17 and Rocky Linux 8
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
-FROM alfresco/alfresco-base-tomcat:tomcat9-jre17-rockylinux8-202205140719
+FROM alfresco/alfresco-base-tomcat:tomcat9-jre17-rockylinux8-202209131110
 
 # Set default docker_context.
 ARG resource_path=target

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/scripts/output_logs_for_failures.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+TAS_DIRECTORY=$1
+
+cd ${TAS_DIRECTORY}
+
+failures=$(grep 'status="FAIL"' target/surefire-reports/testng-results.xml | sed 's|^.*[ ]name="\([^"]*\)".*$|\1|g')
+
+for failure in ${failures}
+do
+    cat target/reports/alfresco-tas.log | sed '/STARTING Test: \['${failure}'\]/,/ENDING Test: \['${failure}'\]/!d;/ENDING Test: \['${failure}'\]/q'
+done

packaging/tests/tas-cmis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java

@@ -67,8 +67,6 @@ import org.testng.annotations.Test;
 @Test(groups = {TestGroup.RULES})
 public class CreateRulesTests extends RestTest
 {
-    private static final String IGNORE_ID = "id";
-    private static final String IGNORE_IS_SHARED = "isShared";
     private UserModel user;
     private SiteModel site;
     private FolderModel ruleFolder;
@@ -97,9 +95,9 @@ public class CreateRulesTests extends RestTest
         RestRuleModel expectedRuleModel = createRuleModelWithModifiedValues();
         expectedRuleModel.setConditions(createEmptyConditionModel());
         restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().isEqualTo(expectedRuleModel, IGNORE_ID, IGNORE_IS_SHARED)
-                .assertThat().field("id").isNotNull()
-                .assertThat().field("isShared").isNull();
+        rule.assertThat().isEqualTo(expectedRuleModel, ID, IS_SHARED)
+                .assertThat().field(ID).isNotNull()
+                .assertThat().field(IS_SHARED).isNull();
     }
 
     /** Check creating a rule in a non-existent folder returns an error. */
@@ -389,8 +387,8 @@ public class CreateRulesTests extends RestTest
         expectedRuleModel.setTriggers(List.of("inbound"));
 
         restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().isEqualTo(expectedRuleModel, IGNORE_ID, IGNORE_IS_SHARED)
-                .assertThat().field("isShared").isNull();
+        rule.assertThat().isEqualTo(expectedRuleModel, ID, IS_SHARED)
+                .assertThat().field(IS_SHARED).isNull();
     }
 
     /**
@@ -419,7 +417,7 @@ public class CreateRulesTests extends RestTest
         final RestActionBodyExecTemplateModel invalidAction = new RestActionBodyExecTemplateModel();
         final String actionDefinitionId = "invalid-definition-value";
         invalidAction.setActionDefinitionId(actionDefinitionId);
-        invalidAction.setParams(Map.of("dummy-key", "dummy-value"));;
+        invalidAction.setParams(Map.of("dummy-key", "dummy-value"));
         ruleModel.setActions(List.of(invalidAction));
 
         restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
@@ -445,7 +443,7 @@ public class CreateRulesTests extends RestTest
         expectedRuleModel.setConditions(createVariousConditions());
         expectedRuleModel.setTriggers(List.of("inbound"));
         restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().isEqualTo(expectedRuleModel, IGNORE_ID, IGNORE_IS_SHARED);
+        rule.assertThat().isEqualTo(expectedRuleModel, ID, IS_SHARED);
     }
 
     /**
@@ -464,7 +462,7 @@ public class CreateRulesTests extends RestTest
         expectedRuleModel.setConditions(createCompositeCondition(null));
         expectedRuleModel.setTriggers(List.of("inbound"));
         restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().isEqualTo(expectedRuleModel, IGNORE_ID, IGNORE_IS_SHARED);
+        rule.assertThat().isEqualTo(expectedRuleModel, ID, IS_SHARED);
     }
 
     /**

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/GetRuleSetsTests.java

@@ -25,17 +25,27 @@
  */
 package org.alfresco.rest.rules;
 
+import static org.alfresco.rest.requests.RuleSettings.IS_INHERITANCE_ENABLED;
 import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModel;
+import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModelWithDefaultValues;
+import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModelWithModifiedValues;
 import static org.alfresco.utility.report.log.Step.STEP;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 import static org.springframework.http.HttpStatus.OK;
 
+import java.util.List;
+
+import com.google.common.collect.ImmutableMap;
+
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestRuleModel;
+import org.alfresco.rest.model.RestRuleSetLinkModel;
 import org.alfresco.rest.model.RestRuleSetModel;
 import org.alfresco.rest.model.RestRuleSetModelsCollection;
 import org.alfresco.rest.model.RestRuleSettingsModel;
+import org.alfresco.rest.requests.coreAPI.RestCoreAPI;
+import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
@@ -198,7 +208,13 @@ public class GetRuleSetsTests extends RestTest
                                              .getRuleSet(ruleSetId);
 
         restClient.assertStatusCodeIs(OK);
-        ruleSet.assertThat().field("id").is(ruleSetId);
+        ruleSet.assertThat().field("id").is(ruleSetId)
+               // Also check that the optional fields are not included by default.
+               .assertThat().field("owningFolder").isNull()
+               .assertThat().field("inheritedBy").isNull()
+               .assertThat().field("linkedToBy").isNull()
+               .assertThat().field("isInherited").isNull()
+               .assertThat().field("isLinkedTo").isNull();
     }
 
     /** Check we can get a rule set using the "-default-" synonym. */
@@ -248,4 +264,252 @@ public class GetRuleSetsTests extends RestTest
         ruleSet.assertThat().field("owningFolder").is(ruleFolder.getNodeRef())
                .assertThat().field("id").is(ruleSetId);
     }
+
+    /**
+     * Check we can find out the id of any folders that inherit a rule set.
+     * <p>
+     * The test checks several different situations:
+     * <pre>
+     *   folder --[owns]-> rule set
+     *   +- publicFolder --[inherits]-> rule set (user has access)
+     *   +- privateFolder --[inherits]-> rule set (user does not have access)
+     *      +- publicGrandchild --[inherits]-> rule set (user has access again)
+     *   +- nonInheritingFolder (inheritance should be prevented)
+     *      +- linkingFolder --[links]-> rule set (not inherited)
+     *         +- descendantFolder --[inherits]-> rule set (inherited via link)
+     * </pre>
+     */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
+    public void getRuleSetAndInheritedBy()
+    {
+        STEP("Create a site owned by admin and add user as a contributor");
+        SiteModel siteModel = dataSite.usingAdmin().createPrivateRandomSite();
+        dataUser.addUserToSite(user, siteModel, UserRole.SiteContributor);
+
+        STEP("Create the folder structure");
+        FolderModel folder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        FolderModel publicFolder = dataContent.usingUser(user).usingResource(folder).createFolder();
+        FolderModel privateFolder = dataContent.usingAdmin().usingResource(folder).createFolder();
+        dataContent.usingAdmin().usingResource(privateFolder).setInheritPermissions(false);
+        // Create the grandchild with user and use admin to move it under the private folder.
+        FolderModel publicGrandchild = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        coreAPIForAdmin().usingActions().executeAction("move", publicGrandchild, ImmutableMap.of("destination-folder", "workspace://SpacesStore/" + privateFolder.getNodeRef()));
+        // Create the non-inheriting folder.
+        FolderModel nonInheritingFolder = dataContent.usingUser(user).usingResource(folder).createFolder();
+        RestRuleSettingsModel nonInheriting = new RestRuleSettingsModel();
+        nonInheriting.setKey(IS_INHERITANCE_ENABLED);
+        nonInheriting.setValue(false);
+        coreAPIForUser().usingNode(nonInheritingFolder).usingIsInheritanceEnabledRuleSetting().updateSetting(nonInheriting);
+        // Create a child that will link to the rule and a child of that to inherit via the link.
+        FolderModel linkingFolder = dataContent.usingUser(user).usingResource(nonInheritingFolder).createFolder();
+        FolderModel descendantFolder = dataContent.usingUser(user).usingResource(linkingFolder).createFolder();
+
+        STEP("Create an inheritable rule in the folder and get the rule set id.");
+        RestRuleModel ruleModel = createRuleModelWithModifiedValues();
+        coreAPIForUser().usingNode(folder).usingDefaultRuleSet().createSingleRule(ruleModel);
+        RestRuleSetModelsCollection ruleSets = coreAPIForUser().usingNode(folder).getListOfRuleSets();
+        String ruleSetId = ruleSets.getEntries().get(0).onModel().getId();
+
+        STEP("Create the link to the rule from the linking folder");
+        RestRuleSetLinkModel ruleSetLink = new RestRuleSetLinkModel();
+        ruleSetLink.setId(folder.getNodeRef());
+        coreAPIForUser().usingNode(linkingFolder).createRuleLink(ruleSetLink);
+
+        STEP("Remove the user from  the site");
+        dataUser.removeUserFromSite(user, siteModel);
+
+        STEP("Get the rule set and inheriting folders");
+        RestRuleSetModel ruleSet = coreAPIForUser().usingNode(folder)
+                                                   .include("inheritedBy")
+                                                   .getRuleSet(ruleSetId);
+
+        restClient.assertStatusCodeIs(OK);
+        List<String> expectedInheritors = List.of(publicFolder.getNodeRef(), descendantFolder.getNodeRef(), publicGrandchild.getNodeRef());
+        ruleSet.assertThat().field("inheritedBy").is(expectedInheritors)
+               .assertThat().field("id").is(ruleSetId);
+    }
+
+    /** Check we can get the folders that link to a rule set and that this respects permissions. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
+    public void getRuleSetsAndLinkedToBy()
+    {
+        STEP("Create a site owned by admin and add user as a contributor");
+        SiteModel siteModel = dataSite.usingAdmin().createPrivateRandomSite();
+        dataUser.addUserToSite(user, siteModel, UserRole.SiteContributor);
+
+        STEP("Create the folder structure");
+        FolderModel ruleFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        FolderModel publicFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        FolderModel privateFolder = dataContent.usingAdmin().usingSite(siteModel).createFolder();
+        dataContent.usingAdmin().usingResource(privateFolder).setInheritPermissions(false);
+
+        STEP("Remove the user from  the site");
+        dataUser.removeUserFromSite(user, siteModel);
+
+        STEP("Create a rule in the folder and link to it from the other two.");
+        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
+        coreAPIForUser().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
+        RestRuleSetModelsCollection ruleSets = coreAPIForAdmin().usingNode(ruleFolder).getListOfRuleSets();
+        String ruleSetId = ruleSets.getEntries().get(0).onModel().getId();
+        RestRuleSetLinkModel ruleSetLink = new RestRuleSetLinkModel();
+        ruleSetLink.setId(ruleFolder.getNodeRef());
+        coreAPIForUser().usingNode(publicFolder).createRuleLink(ruleSetLink);
+        coreAPIForAdmin().usingNode(privateFolder).createRuleLink(ruleSetLink);
+
+        STEP("Get the rule set and linkedToBy field");
+        RestRuleSetModel ruleSet = coreAPIForUser().usingNode(ruleFolder)
+                                                   .include("linkedToBy")
+                                                   .getRuleSet(ruleSetId);
+
+        restClient.assertStatusCodeIs(OK);
+        ruleSet.assertThat().field("linkedToBy").is(List.of(publicFolder.getNodeRef()))
+               .assertThat().field("id").is(ruleSetId);
+    }
+
+    /** Check that a user can see that a rule set is inherited even if they don't have permission to view the inheriting folder. */
+    @Test
+    public void getRuleSetAndIsInheritedWithoutPermission()
+    {
+        STEP("Create a site owned by admin and add user as a contributor");
+        SiteModel siteModel = dataSite.usingAdmin().createPrivateRandomSite();
+        dataUser.addUserToSite(user, siteModel, UserRole.SiteContributor);
+
+        STEP("Create a folder with a rule set and a private child folder to inherit it");
+        FolderModel ruleFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        dataContent.usingAdmin().usingResource(ruleFolder).createFolder();
+        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
+        coreAPIForUser().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
+
+        STEP("Remove the user from  the site");
+        dataUser.removeUserFromSite(user, siteModel);
+
+        STEP("Get the rule set and isInherited field");
+        RestRuleSetModel ruleSet = coreAPIForUser().usingNode(ruleFolder)
+                                                   .include("isInherited", "inheritedBy")
+                                                   .getDefaultRuleSet();
+
+        restClient.assertStatusCodeIs(OK);
+        ruleSet.assertThat().field("isInherited").is(true)
+               .assertThat().field("inheritedBy").isEmpty();
+
+    }
+
+    /** Check that the isInherited field includes rule sets which are only inherited via links. */
+    @Test
+    public void getRuleSetAndIsInheritedViaLink()
+    {
+        STEP("Create a site and a folder with a rule");
+        SiteModel siteModel = dataSite.usingUser(user).createPublicRandomSite();
+        FolderModel ruleFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
+        coreAPIForUser().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
+
+        STEP("Create a second folder in the site that links to the rule set");
+        FolderModel secondFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        dataContent.usingUser(user).usingResource(secondFolder).createFolder();
+        RestRuleSetLinkModel ruleSetLink = new RestRuleSetLinkModel();
+        ruleSetLink.setId(ruleFolder.getNodeRef());
+        coreAPIForUser().usingNode(secondFolder).createRuleLink(ruleSetLink);
+
+        STEP("Get the rule set and isInherited field");
+        RestRuleSetModel ruleSet = coreAPIForUser().usingNode(ruleFolder)
+                                                   .include("isInherited")
+                                                   .getDefaultRuleSet();
+
+        restClient.assertStatusCodeIs(OK);
+        ruleSet.assertThat().field("isInherited").is(true);
+    }
+
+    /**
+     * Check that if a rule set is owned and linked to but not inherited then isInherited returns false.
+     */
+    @Test
+    public void getRuleSetAndIsInheritedCanBeFalse()
+    {
+        STEP("Create a site and a folder with a rule");
+        SiteModel siteModel = dataSite.usingUser(user).createPublicRandomSite();
+        FolderModel ruleFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
+        coreAPIForUser().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
+
+        STEP("Create a second folder in the site that links to the rule set");
+        FolderModel secondFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        RestRuleSetLinkModel ruleSetLink = new RestRuleSetLinkModel();
+        ruleSetLink.setId(ruleFolder.getNodeRef());
+        coreAPIForUser().usingNode(secondFolder).createRuleLink(ruleSetLink);
+
+        STEP("Get the rule set and isInherited field");
+        RestRuleSetModel ruleSet = coreAPIForUser().usingNode(ruleFolder)
+                                                   .include("isInherited")
+                                                   .getDefaultRuleSet();
+
+        restClient.assertStatusCodeIs(OK);
+        ruleSet.assertThat().field("isInherited").is(false);
+    }
+
+
+    /** Check that a user can see that a rule set is linked to even if they don't have permission to view the linking folder. */
+    @Test
+    public void getRuleSetAndIsLinkedToWithoutPermission()
+    {
+        STEP("Create a site owned by admin and add user as a contributor");
+        SiteModel siteModel = dataSite.usingAdmin().createPrivateRandomSite();
+        dataUser.addUserToSite(user, siteModel, UserRole.SiteContributor);
+
+        STEP("Create a folder with a rule set");
+        FolderModel ruleFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
+        coreAPIForUser().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
+
+        STEP("Create a private folder linking to the rule set");
+        FolderModel linkingFolder = dataContent.usingAdmin().usingSite(siteModel).createFolder();
+        RestRuleSetLinkModel linkModel = new RestRuleSetLinkModel();
+        linkModel.setId(ruleFolder.getNodeRef());
+        coreAPIForAdmin().usingNode(linkingFolder).createRuleLink(linkModel);
+
+        STEP("Remove the user from  the site");
+        dataUser.removeUserFromSite(user, siteModel);
+
+        STEP("Get the rule set and isLinkedTo field");
+        RestRuleSetModel ruleSet = coreAPIForUser().usingNode(ruleFolder)
+                                                   .include("isLinkedTo", "linkedToBy", "owningFolder")
+                                                   .getDefaultRuleSet();
+
+        restClient.assertStatusCodeIs(OK);
+        ruleSet.assertThat().field("isLinkedTo").is(true)
+               .assertThat().field("linkedToBy").isEmpty();
+
+    }
+
+    /**
+     * Check that if a rule set is owned and inherited but not linked to then isLinkedTo returns false.
+     */
+    @Test
+    public void getRuleSetAndIsLinkedToCanBeFalse()
+    {
+        STEP("Create a site, a folder with a rule and a child folder that inherits it");
+        SiteModel siteModel = dataSite.usingUser(user).createPublicRandomSite();
+        FolderModel ruleFolder = dataContent.usingUser(user).usingSite(siteModel).createFolder();
+        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
+        coreAPIForUser().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
+        dataContent.usingUser(user).usingResource(ruleFolder).createFolder();
+
+        STEP("Get the rule set and isLinkedTo field");
+        RestRuleSetModel ruleSet = coreAPIForUser().usingNode(ruleFolder)
+                                                   .include("isLinkedTo")
+                                                   .getDefaultRuleSet();
+
+        restClient.assertStatusCodeIs(OK);
+        ruleSet.assertThat().field("isLinkedTo").is(false);
+    }
+
+    private RestCoreAPI coreAPIForUser()
+    {
+        return restClient.authenticateUser(user).withCoreAPI();
+    }
+
+    private RestCoreAPI coreAPIForAdmin()
+    {
+        return restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI();
+    }
 }

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java

@@ -43,9 +43,14 @@ public class RulesTestsUtils
     static final boolean RULE_ASYNC_DEFAULT = true;
     static final boolean RULE_SHARED_DEFAULT = false;
     static final String RULE_ERROR_SCRIPT_DEFAULT = "error-script";
-    static final List<String> ruleTriggersDefault = List.of("inbound", "update", "outbound");
+    static final String INBOUND = "inbound";
+    static final String UPDATE = "update";
+    static final String OUTBOUND = "outbound";
+    static final List<String> RULE_TRIGGERS_DEFAULT = List.of(INBOUND, UPDATE, OUTBOUND);
     static final boolean INVERTED = true;
     static final String AND = "and";
+    static final String ID = "id";
+    static final String IS_SHARED = "isShared";
 
     /**
      * Create a rule model filled with default values.
@@ -60,7 +65,7 @@ public class RulesTestsUtils
         ruleModel.setCascade(RULE_CASCADE_DEFAULT);
         ruleModel.setAsynchronous(RULE_ASYNC_DEFAULT);
         ruleModel.setIsShared(RULE_SHARED_DEFAULT);
-        ruleModel.setTriggers(ruleTriggersDefault);
+        ruleModel.setTriggers(RULE_TRIGGERS_DEFAULT);
         ruleModel.setErrorScript(RULE_ERROR_SCRIPT_DEFAULT);
 
         return ruleModel;

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/UpdateRulesTests.java

@@ -25,13 +25,24 @@
  */
 package org.alfresco.rest.rules;
 
+import static org.alfresco.rest.rules.RulesTestsUtils.ID;
+import static org.alfresco.rest.rules.RulesTestsUtils.INBOUND;
+import static org.alfresco.rest.rules.RulesTestsUtils.INVERTED;
+import static org.alfresco.rest.rules.RulesTestsUtils.IS_SHARED;
+import static org.alfresco.rest.rules.RulesTestsUtils.RULE_ASYNC_DEFAULT;
+import static org.alfresco.rest.rules.RulesTestsUtils.RULE_CASCADE_DEFAULT;
+import static org.alfresco.rest.rules.RulesTestsUtils.RULE_ENABLED_DEFAULT;
+import static org.alfresco.rest.rules.RulesTestsUtils.createCompositeCondition;
 import static org.alfresco.rest.rules.RulesTestsUtils.createDefaultActionModel;
 import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModel;
-import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModelWithDefaultValues;
+import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModelWithModifiedValues;
+import static org.alfresco.rest.rules.RulesTestsUtils.createSimpleCondition;
+import static org.alfresco.rest.rules.RulesTestsUtils.createVariousConditions;
 import static org.alfresco.utility.constants.UserRole.SiteCollaborator;
 import static org.alfresco.utility.report.log.Step.STEP;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.FORBIDDEN;
+import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 import static org.springframework.http.HttpStatus.OK;
 
@@ -39,9 +50,9 @@ import java.util.List;
 import java.util.Map;
 
 import com.google.common.collect.ImmutableMap;
-
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
+import org.alfresco.rest.model.RestCompositeConditionDefinitionModel;
 import org.alfresco.rest.model.RestRuleModel;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
@@ -84,9 +95,9 @@ public class UpdateRulesTests extends RestTest
                                        .updateRule(rule.getId(), updatedRuleModel);
 
         restClient.assertStatusCodeIs(OK);
-        updatedRule.assertThat().field("id").is(rule.getId())
+        updatedRule.assertThat().field(ID).is(rule.getId())
                    .assertThat().field("name").is("Updated rule name")
-                   .assertThat().field("isShared").isNull();
+                   .assertThat().field(IS_SHARED).isNull();
     }
 
     /** Check we get a 404 if trying to update a rule in a folder that doesn't exist. */
@@ -184,7 +195,7 @@ public class UpdateRulesTests extends RestTest
         RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
                                               .updateRule(rule.getId(), updatedRuleModel);
 
-        updatedRule.assertThat().field("id").is(rule.getId());
+        updatedRule.assertThat().field(ID).is(rule.getId());
     }
 
     /** Check we can update a rule and get the included fields. */
@@ -196,10 +207,10 @@ public class UpdateRulesTests extends RestTest
         STEP("Try to update the rule.");
         RestRuleModel updatedRuleModel = createRuleModel("Updated rule name");
         RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                                              .include("isShared")
+                                              .include(IS_SHARED)
                                               .updateRule(rule.getId(), updatedRuleModel);
 
-        updatedRule.assertThat().field("isShared").isNotNull();
+        updatedRule.assertThat().field(IS_SHARED).isNotNull();
     }
 
     /**
@@ -213,7 +224,7 @@ public class UpdateRulesTests extends RestTest
         STEP("Try to update the rule - set no actions.");
         rule.setActions(null);
         restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                .include("isShared")
+                .include(IS_SHARED)
                 .updateRule(rule.getId(), rule);
 
         restClient.assertStatusCodeIs(BAD_REQUEST);
@@ -232,10 +243,10 @@ public class UpdateRulesTests extends RestTest
         final RestActionBodyExecTemplateModel invalidAction = new RestActionBodyExecTemplateModel();
         final String actionDefinitionId = "invalid-definition-value";
         invalidAction.setActionDefinitionId(actionDefinitionId);
-        invalidAction.setParams(Map.of("dummy-key", "dummy-value"));;
+        invalidAction.setParams(Map.of("dummy-key", "dummy-value"));
         rule.setActions(List.of(invalidAction));
         restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                .include("isShared")
+                .include(IS_SHARED)
                 .updateRule(rule.getId(), rule);
 
         restClient.assertStatusCodeIs(NOT_FOUND);
@@ -256,7 +267,7 @@ public class UpdateRulesTests extends RestTest
         STEP("Try to update the rule.");
         rule.setName("Updated rule name");
         RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                                              .include("isShared")
+                                              .include(IS_SHARED)
                                               .updateRule(rule.getId(), rule);
 
         restClient.assertStatusCodeIs(OK);
@@ -265,6 +276,190 @@ public class UpdateRulesTests extends RestTest
                    .assertThat().field("actions.params").is(List.of(ImmutableMap.of("destination-folder", destination.getNodeRef())));
     }
 
+    /** Check we can use the POST response and update rule fields. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleFields()
+    {
+        final RestRuleModel rule = createAndSaveRule(createRuleModelWithModifiedValues());
+
+        STEP("Try to update the rule fields.");
+        rule.setName("Updated rule name");
+        rule.setTriggers(List.of(INBOUND));
+        final String updatedDescription = "Updated description";
+        rule.setDescription(updatedDescription);
+        rule.setEnabled(!RULE_ENABLED_DEFAULT);
+        rule.setCascade(!RULE_CASCADE_DEFAULT);
+        rule.setAsynchronous(!RULE_ASYNC_DEFAULT);
+        final String updatedErrorScript = "updated-error-script";
+        rule.setErrorScript(updatedErrorScript);
+        final RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .updateRule(rule.getId(), rule);
+
+        restClient.assertStatusCodeIs(OK);
+        updatedRule.assertThat().isEqualTo(rule, ID)
+                .assertThat().field(ID).isNotNull();
+    }
+
+    /** Check we can use the POST response and update rule by adding conditions. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleAddConditions()
+    {
+        final RestRuleModel rule = createAndSaveRule(createRuleModelWithModifiedValues());
+
+        STEP("Try to update the rule and add conditions.");
+        rule.setConditions(createVariousConditions());
+
+        final RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .updateRule(rule.getId(), rule);
+
+        restClient.assertStatusCodeIs(OK);
+        updatedRule.assertThat().isEqualTo(rule, ID)
+                .assertThat().field(ID).isNotNull();
+    }
+
+    /** Check we can use the POST response and update a rule rule without any conditions by adding null conditions. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleAddNullConditions()
+    {
+        final RestRuleModel rule = createAndSaveRule(createRuleModelWithModifiedValues());
+
+        STEP("Try to update the rule and add null conditions.");
+        rule.setConditions(createCompositeCondition(null));
+
+        final RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .updateRule(rule.getId(), rule);
+
+        restClient.assertStatusCodeIs(OK);
+        updatedRule.assertThat().isEqualTo(rule, ID)
+                .assertThat().field(ID).isNotNull();
+    }
+
+    /** Check we can use the POST response and update rule by modifying conditions. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleModifyConditions()
+    {
+        final RestRuleModel ruleModelWithInitialValues = createRuleModelWithModifiedValues();
+        ruleModelWithInitialValues.setConditions(createVariousConditions());
+        final RestRuleModel rule = createAndSaveRule(ruleModelWithInitialValues);
+
+        STEP("Try to update the rule and modify conditions.");
+        final RestCompositeConditionDefinitionModel compositeCondition = createCompositeCondition(
+                List.of(createCompositeCondition(false, List.of(createSimpleCondition("tag", "equals", "sample_tag")))));
+        rule.setConditions(compositeCondition);
+
+        final RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .updateRule(rule.getId(), rule);
+
+        restClient.assertStatusCodeIs(OK);
+        updatedRule.assertThat().isEqualTo(rule, ID)
+                .assertThat().field(ID).isNotNull();
+    }
+
+    /** Check we can use the POST response and update rule by removing all conditions. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleRemoveAllConditions()
+    {
+        final RestRuleModel ruleModelWithInitialValues = createRuleModelWithModifiedValues();
+        ruleModelWithInitialValues.setConditions(createVariousConditions());
+        final RestRuleModel rule = createAndSaveRule(ruleModelWithInitialValues);
+
+        STEP("Try to update the rule and remove all conditions.");
+        rule.setConditions(null);
+
+        final RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .updateRule(rule.getId(), rule);
+
+        //set expected object
+        rule.setConditions(createCompositeCondition(null));
+        restClient.assertStatusCodeIs(OK);
+        updatedRule.assertThat().isEqualTo(rule, ID)
+                .assertThat().field(ID).isNotNull();
+    }
+
+    /** Check we get a 400 error when using the POST response and update rule by adding condition with invalid category. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleWithInvalidCategoryInConditionAndFail()
+    {
+        final RestRuleModel ruleModelWithInitialValues = createRuleModelWithModifiedValues();
+        ruleModelWithInitialValues.setConditions(createVariousConditions());
+        final RestRuleModel rule = createAndSaveRule(ruleModelWithInitialValues);
+
+        STEP("Try to update the rule with invalid condition.");
+        final RestCompositeConditionDefinitionModel conditions = createCompositeCondition(
+                List.of(createCompositeCondition(!INVERTED, List.of(createSimpleCondition("category", "equals", "fake-category-id")))));
+        rule.setConditions(conditions);
+
+        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .include(IS_SHARED)
+                .updateRule(rule.getId(), rule);
+
+        restClient.assertStatusCodeIs(BAD_REQUEST);
+        restClient.assertLastError().containsSummary("Category in condition is invalid");
+    }
+
+    /** Check we get a 500 error when using the POST response and update rule by adding condition without comparator. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleWithConditionWithoutComparatorAndFail()
+    {
+        final RestRuleModel ruleModelWithInitialValues = createRuleModelWithModifiedValues();
+        ruleModelWithInitialValues.setConditions(createVariousConditions());
+        final RestRuleModel rule = createAndSaveRule(ruleModelWithInitialValues);
+
+        STEP("Try to update the rule with invalid condition.");
+        final RestCompositeConditionDefinitionModel conditions = createCompositeCondition(
+                List.of(createCompositeCondition(!INVERTED, List.of(createSimpleCondition("size", null, "65500")))));
+        rule.setConditions(conditions);
+
+        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .include(IS_SHARED)
+                .updateRule(rule.getId(), rule);
+
+        //TODO: in next iteration of mapper refactoring this error code will change to 400
+        restClient.assertStatusCodeIs(INTERNAL_SERVER_ERROR);
+    }
+
+    /** Check we get a 500 error when using the POST response and update rule by adding condition without field. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleWithConditionWithoutFieldAndFail()
+    {
+        final RestRuleModel ruleModelWithInitialValues = createRuleModelWithModifiedValues();
+        ruleModelWithInitialValues.setConditions(createVariousConditions());
+        final RestRuleModel rule = createAndSaveRule(ruleModelWithInitialValues);
+
+        STEP("Try to update the rule with invalid condition.");
+        final RestCompositeConditionDefinitionModel conditions = createCompositeCondition(
+                List.of(createCompositeCondition(!INVERTED, List.of(createSimpleCondition(null, "greater_than", "65500")))));
+        rule.setConditions(conditions);
+
+        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .include(IS_SHARED)
+                .updateRule(rule.getId(), rule);
+
+        //TODO: in next iteration of mapper refactoring this error code will change to 400
+        restClient.assertStatusCodeIs(INTERNAL_SERVER_ERROR);
+    }
+
+    /** Check we get a 500 error when using the POST response and update rule by adding condition without parameter value. */
+    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
+    public void updateRuleWithConditionWithoutParamValueAndFail()
+    {
+        final RestRuleModel ruleModelWithInitialValues = createRuleModelWithModifiedValues();
+        ruleModelWithInitialValues.setConditions(createVariousConditions());
+        final RestRuleModel rule = createAndSaveRule(ruleModelWithInitialValues);
+
+        STEP("Try to update the rule with invalid condition.");
+        final RestCompositeConditionDefinitionModel conditions = createCompositeCondition(
+                List.of(createCompositeCondition(!INVERTED, List.of(createSimpleCondition("size", "greater_than", null)))));
+        rule.setConditions(conditions);
+
+        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .include(IS_SHARED)
+                .updateRule(rule.getId(), rule);
+
+        //TODO: in next iteration of mapper refactoring this error code will change to 400
+        restClient.assertStatusCodeIs(INTERNAL_SERVER_ERROR);
+    }
+
     private RestRuleModel createAndSaveRule(String name)
     {
         return createAndSaveRule(name, List.of(createDefaultActionModel()));
@@ -284,4 +479,17 @@ public class UpdateRulesTests extends RestTest
         return restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
             .createSingleRule(ruleModel);
     }
+
+    /**
+     * Create a rule for folder and store it.
+     *
+     * @param ruleModel RuleModel used as create request
+     * @return The created rule.
+     */
+    private RestRuleModel createAndSaveRule(final RestRuleModel ruleModel)
+    {
+        STEP("Create a rule: " + ruleModel);
+        return restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
+                .createSingleRule(ruleModel);
+    }
 }

packaging/tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <properties>

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>17.115</version>
+    <version>17.128-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -56,13 +56,13 @@
         <dependency.alfresco-greenmail.version>6.4</dependency.alfresco-greenmail.version>
         <dependency.acs-event-model.version>0.0.16</dependency.acs-event-model.version>
 
-        <dependency.spring.version>5.3.22</dependency.spring.version>
-        <dependency.antlr.version>3.5.2</dependency.antlr.version>
+        <dependency.spring.version>5.3.23</dependency.spring.version>
+        <dependency.antlr.version>3.5.3</dependency.antlr.version>
         <dependency.jackson.version>2.13.3</dependency.jackson.version>
         <dependency.jackson-databind.version>2.13.3</dependency.jackson-databind.version>
         <dependency.cxf.version>3.5.3</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.31</dependency.webscripts.version>
+        <dependency.webscripts.version>8.32</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
         <dependency.mockito-core.version>4.6.1</dependency.mockito-core.version>
         <dependency.assertj.version>3.23.1</dependency.assertj.version>
@@ -74,11 +74,11 @@
         <dependency.httpcore.version>4.4.15</dependency.httpcore.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
         <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
-        <dependency.slf4j.version>1.7.36</dependency.slf4j.version>
+        <dependency.slf4j.version>2.0.1</dependency.slf4j.version>
         <dependency.gytheio.version>0.17</dependency.gytheio.version>
         <dependency.groovy.version>3.0.12</dependency.groovy.version>
         <dependency.tika.version>2.4.1</dependency.tika.version>
-        <dependency.spring-security.version>5.7.2</dependency.spring-security.version>
+        <dependency.spring-security.version>5.7.3</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>5.2.2</dependency.poi.version>
         <dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>
@@ -117,13 +117,13 @@
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
         <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
 
-        <dependency.postgresql.version>42.4.1</dependency.postgresql.version>
+        <dependency.postgresql.version>42.5.0</dependency.postgresql.version>
         <dependency.mysql.version>8.0.30</dependency.mysql.version>
         <dependency.mysql-image.version>8</dependency.mysql-image.version>
         <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
-        <dependency.tas-utility.version>3.0.49</dependency.tas-utility.version>
-        <dependency.rest-assured.version>5.1.1</dependency.rest-assured.version>
-        <dependency.tas-restapi.version>1.115</dependency.tas-restapi.version>
+        <dependency.tas-utility.version>3.0.56</dependency.tas-utility.version>
+        <dependency.rest-assured.version>5.2.0</dependency.rest-assured.version>
+        <dependency.tas-restapi.version>1.122</dependency.tas-restapi.version>
         <dependency.tas-cmis.version>1.32</dependency.tas-cmis.version>
         <dependency.tas-email.version>1.9</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.7</dependency.tas-webdav.version>
@@ -151,7 +151,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>17.115</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -408,7 +408,7 @@
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
-                <version>5.1.0</version>
+                <version>5.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -664,7 +664,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.15.2</version>
+                <version>1.15.3</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -743,7 +743,7 @@
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.10.14</version>
+                <version>2.11.1</version>
             </dependency>
 
             <!-- provided dependencies -->
@@ -952,7 +952,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <dependencies>

remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleSimpleConditionModelMapper.java

@@ -0,0 +1,220 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.impl.mapper.rules;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.ActionConditionImpl;
+import org.alfresco.repo.action.evaluator.CompareMimeTypeEvaluator;
+import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
+import org.alfresco.repo.action.evaluator.HasAspectEvaluator;
+import org.alfresco.repo.action.evaluator.HasTagEvaluator;
+import org.alfresco.repo.action.evaluator.InCategoryEvaluator;
+import org.alfresco.repo.action.evaluator.IsSubTypeEvaluator;
+import org.alfresco.repo.action.evaluator.NoConditionEvaluator;
+import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
+import org.alfresco.repo.action.evaluator.compare.ContentPropertyName;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
+import org.alfresco.rest.api.model.rules.SimpleCondition;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.collections.MapUtils;
+
+@Experimental
+public class RestRuleSimpleConditionModelMapper implements RestModelMapper<SimpleCondition, ActionCondition>
+{
+    private final NamespaceService namespaceService;
+    private final Nodes nodes;
+
+    public RestRuleSimpleConditionModelMapper(NamespaceService namespaceService, Nodes nodes)
+    {
+        this.namespaceService = namespaceService;
+        this.nodes = nodes;
+    }
+
+    @Override
+    public SimpleCondition toRestModel(ActionCondition actionCondition)
+    {
+        if (actionCondition == null || actionCondition.getActionConditionDefinitionName() == null ||
+                MapUtils.isEmpty(actionCondition.getParameterValues()))
+        {
+            return null;
+        }
+
+        switch (actionCondition.getActionConditionDefinitionName())
+        {
+            case ComparePropertyValueEvaluator.NAME:
+                return createComparePropertyValueCondition(actionCondition, namespaceService);
+            case CompareMimeTypeEvaluator.NAME:
+                return createCompareMimeTypeCondition(actionCondition);
+            case HasAspectEvaluator.NAME:
+                return createHasAspectCondition(actionCondition, namespaceService);
+            case HasTagEvaluator.NAME:
+                return createHasTagCondition(actionCondition);
+            case InCategoryEvaluator.NAME:
+                return createInCategoryCondition(actionCondition);
+            case IsSubTypeEvaluator.NAME:
+                return createIsSubtypeCondition(actionCondition, namespaceService);
+            case NoConditionEvaluator.NAME:
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public ActionCondition toServiceModel(SimpleCondition restModel)
+    {
+        final String field = restModel.getField();
+        if (field == null)
+        {
+            return null;
+        }
+
+        Map<String, Serializable> parameterValues = new HashMap<>();
+        String conditionDefinitionId;
+        String parameter = restModel.getParameter();
+
+        switch (field)
+        {
+            case HasAspectEvaluator.PARAM_ASPECT:
+                conditionDefinitionId = HasAspectEvaluator.NAME;
+                parameterValues.put(HasAspectEvaluator.PARAM_ASPECT, QName.createQName(parameter, namespaceService));
+                break;
+            case HasTagEvaluator.PARAM_TAG:
+                conditionDefinitionId = HasTagEvaluator.NAME;
+                parameterValues.put(HasTagEvaluator.PARAM_TAG, parameter);
+                break;
+            case SimpleCondition.PARAM_CATEGORY:
+                conditionDefinitionId = InCategoryEvaluator.NAME;
+                parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, ContentModel.ASPECT_GEN_CLASSIFIABLE);
+                try
+                {
+                    parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, nodes.validateOrLookupNode(parameter, null));
+                } catch (EntityNotFoundException e) {
+                    throw new InvalidArgumentException(SimpleCondition.CATEGORY_INVALID_MSG);
+                }
+                break;
+            case IsSubTypeEvaluator.PARAM_TYPE:
+                conditionDefinitionId = IsSubTypeEvaluator.NAME;
+                parameterValues.put(IsSubTypeEvaluator.PARAM_TYPE, QName.createQName(parameter, namespaceService));
+                break;
+            case SimpleCondition.PARAM_MIMETYPE:
+                conditionDefinitionId = CompareMimeTypeEvaluator.NAME;
+                parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
+                parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, parameter);
+                break;
+            default:
+                conditionDefinitionId = ComparePropertyValueEvaluator.NAME;
+                try
+                {
+                    // if size or encoding create content property evaluator
+                    ContentPropertyName.valueOf(field.toUpperCase());
+                    parameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, field.toUpperCase());
+                    parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
+                }
+                catch (IllegalArgumentException ignore)
+                {
+                    // else create common property evaluator
+                    parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, QName.createQName(field, namespaceService));
+                }
+                parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, restModel.getComparator().toUpperCase());
+                parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, parameter);
+                break;
+        }
+        return new ActionConditionImpl(UUID.randomUUID().toString(), conditionDefinitionId, parameterValues);
+    }
+
+    private static SimpleCondition createComparePropertyValueCondition(final ActionCondition actionCondition, final NamespaceService namespaceService)
+    {
+        final SimpleCondition.Builder builder = SimpleCondition.builder();
+        if (actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY) != null)
+        {
+            builder.field(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY).toString().toLowerCase());
+        } else {
+            builder.field(((QName) actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_PROPERTY)).toPrefixString(namespaceService));
+        }
+        return builder
+                .comparator(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_OPERATION).toString().toLowerCase())
+                .parameter(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_VALUE).toString())
+                .create();
+    }
+
+    private static SimpleCondition createCompareMimeTypeCondition(final ActionCondition actionCondition)
+    {
+        return SimpleCondition.builder()
+                .field(SimpleCondition.PARAM_MIMETYPE)
+                .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
+                .parameter(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_VALUE).toString())
+                .create();
+    }
+
+    private static SimpleCondition createHasAspectCondition(final ActionCondition actionCondition, final NamespaceService namespaceService)
+    {
+        return SimpleCondition.builder()
+                .field(HasAspectEvaluator.PARAM_ASPECT)
+                .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
+                .parameter(((QName) actionCondition.getParameterValues().get(HasAspectEvaluator.PARAM_ASPECT)).toPrefixString(namespaceService))
+                .create();
+    }
+
+    private static SimpleCondition createHasTagCondition(final ActionCondition actionCondition)
+    {
+        return SimpleCondition.builder()
+                .field(HasTagEvaluator.PARAM_TAG)
+                .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
+                .parameter(actionCondition.getParameterValues().get(HasTagEvaluator.PARAM_TAG).toString())
+                .create();
+    }
+
+    private static SimpleCondition createInCategoryCondition(final ActionCondition actionCondition)
+    {
+        return SimpleCondition.builder()
+                .field(SimpleCondition.PARAM_CATEGORY)
+                .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
+                .parameter(((NodeRef) actionCondition.getParameterValues().get(InCategoryEvaluator.PARAM_CATEGORY_VALUE)).getId())
+                .create();
+    }
+
+    private static SimpleCondition createIsSubtypeCondition(final ActionCondition actionCondition, final NamespaceService namespaceService)
+    {
+        return SimpleCondition.builder()
+                .field(IsSubTypeEvaluator.PARAM_TYPE)
+                .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
+                .parameter(((QName) actionCondition.getParameterValues().get(IsSubTypeEvaluator.PARAM_TYPE)).toPrefixString(namespaceService))
+                .create();
+    }
+}

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

@@ -27,8 +27,11 @@ package org.alfresco.rest.api.impl.rules;
 
 import java.util.List;
 
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.rest.api.model.rules.Rule;
+import org.alfresco.rest.api.model.rules.SimpleCondition;
 import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.rule.RuleService;
 import org.alfresco.service.namespace.NamespaceService;
@@ -40,11 +43,11 @@ public class RuleLoader
     public static final String IS_SHARED = "isShared";
     private RuleService ruleService;
     private NodeValidator nodeValidator;
-    private NamespaceService namespaceService;
+    private RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper;
 
     public Rule loadRule(org.alfresco.service.cmr.rule.Rule ruleModel, List<String> includes)
     {
-        Rule rule = Rule.from(ruleModel, namespaceService);
+        Rule rule = Rule.from(ruleModel, simpleConditionMapper);
         if (includes != null && includes.contains(IS_SHARED))
         {
             NodeRef ruleSet = ruleService.getRuleSetNode(ruleModel.getNodeRef());
@@ -64,8 +67,9 @@ public class RuleLoader
         this.nodeValidator = nodeValidator;
     }
 
-    public void setNamespaceService(NamespaceService namespaceService)
+    public void setSimpleConditionMapper(
+            RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
     {
-        this.namespaceService = namespaceService;
+        this.simpleConditionMapper = simpleConditionMapper;
     }
 }

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

@@ -31,11 +31,13 @@ import static org.alfresco.rest.api.model.rules.InclusionType.OWNED;
 
 import java.util.List;
 
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.rest.api.model.rules.RuleSet;
 import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.rule.RuleService;
 
 /** Responsible for converting a NodeRef into a {@link RuleSet} object. */
 @Experimental
@@ -43,7 +45,13 @@ public class RuleSetLoader
 {
     protected static final String OWNING_FOLDER = "owningFolder";
     protected static final String INCLUSION_TYPE = "inclusionType";
+    protected static final String INHERITED_BY = "inheritedBy";
+    protected static final String LINKED_TO_BY = "linkedToBy";
+    protected static final String IS_INHERITED = "isInherited";
+    protected static final String IS_LINKED_TO = "isLinkedTo";
+    private static final int MAX_INHERITED_BY_SIZE = 100;
     private NodeService nodeService;
+    private RuleService ruleService;
 
     /**
      * Load a rule set for the given node ref.
@@ -79,12 +87,65 @@ public class RuleSetLoader
                     ruleSet.setInclusionType(linked ? LINKED : INHERITED);
                 }
             }
+            if (includes.contains(INHERITED_BY))
+            {
+                ruleSet.setInheritedBy(loadInheritedBy(ruleSetNodeRef));
+            }
+            if (includes.contains(LINKED_TO_BY))
+            {
+                ruleSet.setLinkedToBy(loadLinkedToBy(ruleSetNodeRef));
+            }
+            if (includes.contains(IS_INHERITED))
+            {
+                ruleSet.setIsInherited(loadIsInherited(ruleSetNodeRef));
+            }
+            if (includes.contains(IS_LINKED_TO))
+            {
+                ruleSet.setIsLinkedTo(loadIsLinkedTo(ruleSetNodeRef, parentRef));
+            }
         }
         return ruleSet;
     }
 
+    private List<NodeRef> loadInheritedBy(NodeRef ruleSetNodeRef)
+    {
+        return ruleService.getFoldersInheritingRuleSet(ruleSetNodeRef, MAX_INHERITED_BY_SIZE);
+    }
+
+    private List<NodeRef> loadLinkedToBy(NodeRef ruleSetNodeRef)
+    {
+        return ruleService.getFoldersLinkingToRuleSet(ruleSetNodeRef);
+    }
+
+    private boolean loadIsInherited(NodeRef ruleSetNodeRef)
+    {
+        return AuthenticationUtil.runAsSystem(() -> !ruleService.getFoldersInheritingRuleSet(ruleSetNodeRef, 1).isEmpty());
+    }
+
+    /**
+     * Check if any parents of the rule set node are not the owning folder.
+     *
+     * @param ruleSetNodeRef The rule set node.
+     * @param parentRef The owning folder.
+     * @return True if another folder links to the rule set.
+     */
+    private Boolean loadIsLinkedTo(NodeRef ruleSetNodeRef, NodeRef parentRef)
+    {
+        return AuthenticationUtil.runAsSystem(() ->
+            nodeService.getParentAssocs(ruleSetNodeRef)
+                       .stream()
+                       .map(ChildAssociationRef::getParentRef)
+                       .anyMatch(folder -> !folder.equals(parentRef))
+        );
+    }
+
     public void setNodeService(NodeService nodeService)
     {
         this.nodeService = nodeService;
     }
+
+    public void setRuleService(RuleService ruleService)
+    {
+        this.ruleService = ruleService;
+    }
 }

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

@@ -32,13 +32,17 @@ import java.util.stream.Collectors;
 
 import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.Rules;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.rest.api.model.rules.Rule;
 import org.alfresco.rest.api.model.rules.RuleSet;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.api.model.rules.SimpleCondition;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.ListPage;
 import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
 import org.alfresco.service.cmr.action.CompositeAction;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.rule.RuleService;
@@ -59,7 +63,7 @@ public class RulesImpl implements Rules
     private RuleLoader ruleLoader;
     private ActionParameterConverter actionParameterConverter;
     private ActionPermissionValidator actionPermissionValidator;
-    private NamespaceService namespaceService;
+    private RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper;
 
     @Override
     public CollectionWithPagingInfo<Rule> getRules(final String folderNodeId,
@@ -133,7 +137,7 @@ public class RulesImpl implements Rules
         {
             throw new InvalidArgumentException(MUST_HAVE_AT_LEAST_ONE_ACTION);
         }
-        final org.alfresco.service.cmr.rule.Rule serviceModelRule = rule.toServiceModel(nodes, namespaceService);
+        final org.alfresco.service.cmr.rule.Rule serviceModelRule = rule.toServiceModel(nodes, simpleConditionMapper);
         final CompositeAction compositeAction = (CompositeAction) serviceModelRule.getAction();
         compositeAction.getActions().forEach(action -> action.setParameterValues(
                 actionParameterConverter.getConvertedParams(action.getParameterValues(), action.getActionDefinitionName())));
@@ -184,8 +188,9 @@ public class RulesImpl implements Rules
         this.actionPermissionValidator = actionPermissionValidator;
     }
 
-    public void setNamespaceService(NamespaceService namespaceService)
+    public void setSimpleConditionMapper(
+            RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
     {
-        this.namespaceService = namespaceService;
+        this.simpleConditionMapper = simpleConditionMapper;
     }
 }

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

@@ -284,7 +284,8 @@ public class RepositoryInfo
                         .setMaxDocs(licenseDescriptor.getMaxDocs())
                         .setMaxUsers(licenseDescriptor.getMaxUsers())
                         .setClusterEnabled(licenseDescriptor.isClusterEnabled())
-                        .setCryptodocEnabled(licenseDescriptor.isCryptodocEnabled());
+                        .setCryptodocEnabled(licenseDescriptor.isCryptodocEnabled())
+                        .setCustomEmbeddedWorkflowEnabled(licenseDescriptor.isCustomEmbeddedWorkflowEnabled());
         }
 
         public Date getIssuedAt()
@@ -343,6 +344,7 @@ public class RepositoryInfo
         private Long maxDocs;
         private boolean isClusterEnabled;
         private boolean isCryptodocEnabled;
+        private boolean isCustomEmbeddedWorkflowEnabled;
 
         public LicenseEntitlement()
         {
@@ -392,6 +394,17 @@ public class RepositoryInfo
             return this;
         }
 
+        public boolean getIsCustomEmbeddedWorkflowEnabled()
+        {
+            return isCustomEmbeddedWorkflowEnabled;
+        }
+
+        public LicenseEntitlement setCustomEmbeddedWorkflowEnabled(boolean customEmbeddedWorkflowEnabled)
+        {
+            isCustomEmbeddedWorkflowEnabled = customEmbeddedWorkflowEnabled;
+            return this;
+        }
+
         @Override
         public String toString()
         {
@@ -400,6 +413,7 @@ public class RepositoryInfo
                         .append(", maxDocs=").append(maxDocs)
                         .append(", isClusterEnabled=").append(isClusterEnabled)
                         .append(", isCryptodocEnabled=").append(isCryptodocEnabled)
+                        .append(", isCustomEmbeddedWorkflowEnabled=").append(isCustomEmbeddedWorkflowEnabled)
                         .append(']');
             return sb.toString();
         }

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

@@ -0,0 +1,53 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model.mapper;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.alfresco.service.Experimental;
+import org.apache.commons.lang3.NotImplementedException;
+
+@Experimental
+public interface RestModelMapper<R, S>
+{
+    R toRestModel(S serviceModel);
+    S toServiceModel(R restModel);
+    default R toRestModel(Collection<S> serviceModels) {
+        throw new NotImplementedException();
+    }
+    default S toServiceModel(Collection<R> restModels) {
+        throw new NotImplementedException();
+    }
+    default List<R> toRestModels(Collection<S> serviceModels) {
+        return serviceModels.stream().map(this::toRestModel).collect(Collectors.toList());
+    }
+    default List<S> toServiceModels(Collection<R> restModels) {
+        return restModels.stream().map(this::toServiceModel).collect(Collectors.toList());
+    }
+}

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

@@ -32,10 +32,9 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.action.ActionCondition;
-import org.alfresco.service.namespace.NamespaceService;
 import org.apache.commons.collections.CollectionUtils;
 
 @Experimental
@@ -52,7 +51,7 @@ public class CompositeCondition
      * @param actionConditions - list of {@link ActionCondition} service POJOs
      * @return {@link CompositeCondition} REST model
      */
-    public static CompositeCondition from(final List<ActionCondition> actionConditions, final NamespaceService namespaceService)
+    public static CompositeCondition from(final List<ActionCondition> actionConditions, final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
     {
         if (actionConditions == null)
         {
@@ -64,7 +63,7 @@ public class CompositeCondition
         // group action conditions by inversion flag
         actionConditions.stream().filter(Objects::nonNull).collect(Collectors.groupingBy(ActionCondition::getInvertCondition))
             // map action condition sub lists
-            .forEach((inverted, actionConditionsPart) -> Optional.ofNullable(CompositeCondition.ofActionConditions(actionConditionsPart, namespaceService, inverted, ConditionOperator.AND))
+            .forEach((inverted, actionConditionsPart) -> Optional.ofNullable(CompositeCondition.ofActionConditions(actionConditionsPart, simpleConditionMapper, inverted, ConditionOperator.AND))
                 // if composite condition present add to final list
                 .ifPresent(compositeCondition -> conditions.compositeConditions.add(compositeCondition)));
 
@@ -75,14 +74,16 @@ public class CompositeCondition
         return conditions;
     }
 
-    private static CompositeCondition ofActionConditions(final List<ActionCondition> actionConditions, final NamespaceService namespaceService, final boolean inverted, final ConditionOperator conditionOperator)
+    private static CompositeCondition ofActionConditions(final List<ActionCondition> actionConditions,
+                                                         final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper,
+                                                         final boolean inverted, final ConditionOperator conditionOperator)
     {
         if (actionConditions == null)
         {
             return null;
         }
 
-        return ofSimpleConditions(SimpleCondition.listOf(actionConditions, namespaceService), inverted, conditionOperator);
+        return ofSimpleConditions(SimpleCondition.listOf(actionConditions, simpleConditionMapper), inverted, conditionOperator);
     }
 
     /**
@@ -114,16 +115,16 @@ public class CompositeCondition
             .create();
     }
 
-    public List<ActionCondition> toServiceModels(final Nodes nodes, final NamespaceService namespaceService)
+    public List<ActionCondition> toServiceModels(final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
     {
         final List<ActionCondition> actionConditions = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(simpleConditions))
         {
-            simpleConditions.forEach(simpleCondition -> actionConditions.add(simpleCondition.toServiceModel(inverted, nodes, namespaceService)));
+            simpleConditions.forEach(simpleCondition -> actionConditions.add(simpleCondition.toServiceModel(inverted, simpleConditionMapper)));
         }
         if (CollectionUtils.isNotEmpty(compositeConditions))
         {
-            compositeConditions.forEach(compositeCondition -> actionConditions.addAll(compositeCondition.toServiceModels(nodes, namespaceService)));
+            compositeConditions.forEach(compositeCondition -> actionConditions.addAll(compositeCondition.toServiceModels(simpleConditionMapper)));
         }
 
         return actionConditions;

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

@@ -33,8 +33,10 @@ import java.util.stream.Collectors;
 import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.repo.action.executer.ScriptActionExecuter;
 import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.rest.framework.resource.UniqueId;
 import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
 import org.alfresco.service.cmr.action.CompositeAction;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@@ -61,7 +63,7 @@ public class Rule
      * @param ruleModel - {@link org.alfresco.service.cmr.rule.Rule} service POJO
      * @return {@link Rule} REST model
      */
-    public static Rule from(final org.alfresco.service.cmr.rule.Rule ruleModel, final NamespaceService namespaceService)
+    public static Rule from(final org.alfresco.service.cmr.rule.Rule ruleModel, final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
     {
         if (ruleModel == null)
         {
@@ -84,7 +86,7 @@ public class Rule
         }
         if (ruleModel.getAction() != null)
         {
-            builder.conditions(CompositeCondition.from(ruleModel.getAction().getActionConditions(), namespaceService));
+            builder.conditions(CompositeCondition.from(ruleModel.getAction().getActionConditions(), simpleConditionMapper));
             if (ruleModel.getAction().getCompensatingAction() != null && ruleModel.getAction().getCompensatingAction().getParameterValue(ScriptActionExecuter.PARAM_SCRIPTREF) != null)
             {
                 builder.errorScript(ruleModel.getAction().getCompensatingAction().getParameterValue(ScriptActionExecuter.PARAM_SCRIPTREF).toString());
@@ -104,7 +106,7 @@ public class Rule
      * @param nodes The nodes API.
      * @return The rule service POJO.
      */
-    public org.alfresco.service.cmr.rule.Rule toServiceModel(final Nodes nodes, final NamespaceService namespaceService)
+    public org.alfresco.service.cmr.rule.Rule toServiceModel(final Nodes nodes, final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
     {
         final org.alfresco.service.cmr.rule.Rule ruleModel = new org.alfresco.service.cmr.rule.Rule();
         final NodeRef nodeRef = (id != null) ? nodes.validateOrLookupNode(id, null) : null;
@@ -127,7 +129,7 @@ public class Rule
         }
         if (conditions != null)
         {
-            conditions.toServiceModels(nodes, namespaceService).forEach(condition -> ruleModel.getAction().addActionCondition(condition));
+            conditions.toServiceModels(simpleConditionMapper).forEach(condition -> ruleModel.getAction().addActionCondition(condition));
         }
 
         return ruleModel;

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

@@ -26,6 +26,7 @@
 
 package org.alfresco.rest.api.model.rules;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
 
@@ -40,6 +41,10 @@ public class RuleSet
     private String id;
     private NodeRef owningFolder;
     private InclusionType inclusionType;
+    private List<NodeRef> inheritedBy;
+    private List<NodeRef> linkedToBy;
+    private Boolean isInherited;
+    private Boolean isLinkedTo;
 
     public static RuleSet of(String id)
     {
@@ -86,6 +91,66 @@ public class RuleSet
         this.inclusionType = inclusionType;
     }
 
+    public List<NodeRef> getInheritedBy()
+    {
+        return inheritedBy;
+    }
+
+    public void setInheritedBy(List<NodeRef> inheritedBy)
+    {
+        this.inheritedBy = inheritedBy;
+    }
+
+    public List<NodeRef> getLinkedToBy()
+    {
+        return linkedToBy;
+    }
+
+    public void setLinkedToBy(List<NodeRef> linkedToBy)
+    {
+        this.linkedToBy = linkedToBy;
+    }
+
+    /**
+     * Set a flag indicating that the rule set is inherited by a folder.
+     *
+     * @param inherited The flag.
+     */
+    public void setIsInherited(Boolean inherited)
+    {
+        isInherited = inherited;
+    }
+
+    /**
+     * Find if the rule set is inherited by a folder.
+     *
+     * @return The value of the flag.
+     */
+    public Boolean getIsInherited()
+    {
+        return isInherited;
+    }
+
+    /**
+     * Set a flag indicating that the rule set is linked to by a folder.
+     *
+     * @param isLinkedTo The flag.
+     */
+    public void setIsLinkedTo(Boolean isLinkedTo)
+    {
+        this.isLinkedTo = isLinkedTo;
+    }
+
+    /**
+     * Find if the rule set is linked to by a folder.
+     *
+     * @return The value of the flag.
+     */
+    public Boolean getIsLinkedTo()
+    {
+        return isLinkedTo;
+    }
+
     @Override
     public String toString()
     {
@@ -94,6 +159,10 @@ public class RuleSet
                     .add("id='" + id + "'")
                     .add("owningFolder='" + owningFolder + "'")
                     .add("inclusionType='" + inclusionType + "'")
+                    .add("inheritedBy='" + inheritedBy + "'")
+                    .add("linkedToBy='" + linkedToBy + "'")
+                    .add("isInherited='" + isInherited + "'")
+                    .add("isLinkedTo='" + isLinkedTo + "'")
                     .toString()
                 + '}';
     }
@@ -108,13 +177,17 @@ public class RuleSet
         RuleSet ruleSet = (RuleSet) o;
         return Objects.equals(id, ruleSet.id)
                 && Objects.equals(owningFolder, ruleSet.owningFolder)
-                && inclusionType == ruleSet.inclusionType;
+                && inclusionType == ruleSet.inclusionType
+                && Objects.equals(inheritedBy, ruleSet.inheritedBy)
+                && Objects.equals(linkedToBy, ruleSet.linkedToBy)
+                && Objects.equals(isInherited, ruleSet.isInherited)
+                && Objects.equals(isLinkedTo, ruleSet.isLinkedTo);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(id, owningFolder, inclusionType);
+        return Objects.hash(id, owningFolder, inclusionType, inheritedBy, linkedToBy, isInherited, isLinkedTo);
     }
 
     public static Builder builder()
@@ -127,6 +200,10 @@ public class RuleSet
         private String id;
         private NodeRef owningFolder;
         private InclusionType inclusionType;
+        private List<NodeRef> inheritedBy;
+        private List<NodeRef> linkedToBy;
+        private Boolean isInherited;
+        private Boolean isLinkedTo;
 
         public Builder id(String id)
         {
@@ -146,12 +223,40 @@ public class RuleSet
             return this;
         }
 
+        public Builder inheritedBy(List<NodeRef> inheritedBy)
+        {
+            this.inheritedBy = inheritedBy;
+            return this;
+        }
+
+        public Builder linkedToBy(List<NodeRef> linkedToBy)
+        {
+            this.linkedToBy = linkedToBy;
+            return this;
+        }
+
+        public Builder isInherited(Boolean isInherited)
+        {
+            this.isInherited = isInherited;
+            return this;
+        }
+
+        public Builder isLinkedTo(Boolean isLinkedTo)
+        {
+            this.isLinkedTo = isLinkedTo;
+            return this;
+        }
+
         public RuleSet create()
         {
             final RuleSet ruleSet = new RuleSet();
             ruleSet.setId(id);
             ruleSet.setOwningFolder(owningFolder);
             ruleSet.setInclusionType(inclusionType);
+            ruleSet.setInheritedBy(inheritedBy);
+            ruleSet.setLinkedToBy(linkedToBy);
+            ruleSet.setIsInherited(isInherited);
+            ruleSet.setIsLinkedTo(isLinkedTo);
             return ruleSet;
         }
     }

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

@@ -30,7 +30,7 @@ public class RuleSetLink
 {
 
     /**
-     * This id is referring to the node id of the linked-to-folder which contains the rule set(s)
+     * This id is referring to the node id of either the rule set or the folder that contains the rule set.
      */
     private String id;
 

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

@@ -46,6 +46,7 @@ import org.alfresco.repo.action.evaluator.NoConditionEvaluator;
 import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
 import org.alfresco.repo.action.evaluator.compare.ContentPropertyName;
 import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.service.Experimental;
@@ -58,7 +59,7 @@ import org.apache.commons.collections.CollectionUtils;
 @Experimental
 public class SimpleCondition
 {
-    private static final String CATEGORY_INVALID_MSG = "Category in condition is invalid";
+    public static final String CATEGORY_INVALID_MSG = "Category in condition is invalid";
     public static final String PARAM_CATEGORY = "category";
     public static final String PARAM_MIMETYPE = "mimetype";
 
@@ -72,17 +73,14 @@ public class SimpleCondition
      * @param actionConditions - list of {@link ActionCondition} service POJOs
      * @return list of {@link SimpleCondition} REST models
      */
-    public static List<SimpleCondition> listOf(final List<ActionCondition> actionConditions, final NamespaceService namespaceService)
+    public static List<SimpleCondition> listOf(final List<ActionCondition> actionConditions,
+                                               final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
     {
         if (CollectionUtils.isEmpty(actionConditions))
         {
             return null;
         }
-
-        return actionConditions.stream()
-            .map(actionCondition -> from(actionCondition, namespaceService))
-            .filter(Objects::nonNull)
-            .collect(Collectors.toList());
+        return simpleConditionMapper.toRestModels(actionConditions);
     }
 
     /**
@@ -91,92 +89,15 @@ public class SimpleCondition
      * @param actionCondition - {@link ActionCondition} service POJO
      * @return {@link SimpleCondition} REST model
      */
-    public static SimpleCondition from(final ActionCondition actionCondition, final NamespaceService namespaceService)
+    public static SimpleCondition from(final ActionCondition actionCondition,
+                                       final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
     {
-        if (actionCondition == null || actionCondition.getActionConditionDefinitionName() == null || actionCondition.getParameterValues() == null)
-        {
-            return null;
-        }
-
-        switch (actionCondition.getActionConditionDefinitionName())
-        {
-        case ComparePropertyValueEvaluator.NAME:
-            return createComparePropertyValueCondition(actionCondition, namespaceService);
-        case CompareMimeTypeEvaluator.NAME:
-            return createCompareMimeTypeCondition(actionCondition);
-        case HasAspectEvaluator.NAME:
-            return createHasAspectCondition(actionCondition, namespaceService);
-        case HasTagEvaluator.NAME:
-            return createHasTagCondition(actionCondition);
-        case InCategoryEvaluator.NAME:
-            return createInCategoryCondition(actionCondition);
-        case IsSubTypeEvaluator.NAME:
-            return createIsSubtypeCondition(actionCondition, namespaceService);
-        case NoConditionEvaluator.NAME:
-        default:
-            return null;
-        }
+        return simpleConditionMapper.toRestModel(actionCondition);
     }
 
-    public ActionCondition toServiceModel(final boolean inverted, final Nodes nodes, final NamespaceService namespaceService)
+    public ActionCondition toServiceModel(final boolean inverted, final RestModelMapper<SimpleCondition, ActionCondition> mapper)
     {
-        if (field == null)
-        {
-            return null;
-        }
-
-        Map<String, Serializable> parameterValues = new HashMap<>();
-        String conditionDefinitionId;
-
-        switch (field)
-        {
-        case HasAspectEvaluator.PARAM_ASPECT:
-            conditionDefinitionId = HasAspectEvaluator.NAME;
-            parameterValues.put(HasAspectEvaluator.PARAM_ASPECT, QName.createQName(parameter, namespaceService));
-            break;
-        case HasTagEvaluator.PARAM_TAG:
-            conditionDefinitionId = HasTagEvaluator.NAME;
-            parameterValues.put(HasTagEvaluator.PARAM_TAG, parameter);
-            break;
-        case PARAM_CATEGORY:
-            conditionDefinitionId = InCategoryEvaluator.NAME;
-            parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, ContentModel.ASPECT_GEN_CLASSIFIABLE);
-            try
-            {
-                parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, nodes.validateOrLookupNode(parameter, null));
-            } catch (EntityNotFoundException e) {
-                throw new InvalidArgumentException(CATEGORY_INVALID_MSG);
-            }
-            break;
-        case IsSubTypeEvaluator.PARAM_TYPE:
-            conditionDefinitionId = IsSubTypeEvaluator.NAME;
-            parameterValues.put(IsSubTypeEvaluator.PARAM_TYPE, QName.createQName(parameter, namespaceService));
-            break;
-        case PARAM_MIMETYPE:
-            conditionDefinitionId = CompareMimeTypeEvaluator.NAME;
-            parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
-            parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, parameter);
-            break;
-        default:
-            conditionDefinitionId = ComparePropertyValueEvaluator.NAME;
-            try
-            {
-                // if size or encoding create content property evaluator
-                ContentPropertyName.valueOf(field.toUpperCase());
-                parameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, field.toUpperCase());
-                parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
-            }
-            catch (IllegalArgumentException ignore)
-            {
-                // else create common property evaluator
-                parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, QName.createQName(field, namespaceService));
-            }
-            parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, comparator.toUpperCase());
-            parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, parameter);
-            break;
-        }
-
-        final ActionCondition actionCondition = new ActionConditionImpl(UUID.randomUUID().toString(), conditionDefinitionId, parameterValues);
+        final ActionCondition actionCondition = mapper.toServiceModel(this);
         actionCondition.setInvertCondition(inverted);
         return actionCondition;
     }
@@ -234,66 +155,6 @@ public class SimpleCondition
         return Objects.hash(field, comparator, parameter);
     }
 
-    private static SimpleCondition createComparePropertyValueCondition(final ActionCondition actionCondition, final NamespaceService namespaceService)
-    {
-        final SimpleCondition.Builder builder = builder();
-        if (actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY) != null)
-        {
-            builder.field(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY).toString().toLowerCase());
-        } else {
-            builder.field(((QName) actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_PROPERTY)).toPrefixString(namespaceService));
-        }
-        return builder
-            .comparator(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_OPERATION).toString().toLowerCase())
-            .parameter(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_VALUE).toString())
-            .create();
-    }
-
-    private static SimpleCondition createCompareMimeTypeCondition(final ActionCondition actionCondition)
-    {
-        return builder()
-            .field(PARAM_MIMETYPE)
-            .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
-            .parameter(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_VALUE).toString())
-            .create();
-    }
-
-    private static SimpleCondition createHasAspectCondition(final ActionCondition actionCondition, final NamespaceService namespaceService)
-    {
-        return builder()
-            .field(HasAspectEvaluator.PARAM_ASPECT)
-            .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
-            .parameter(((QName) actionCondition.getParameterValues().get(HasAspectEvaluator.PARAM_ASPECT)).toPrefixString(namespaceService))
-            .create();
-    }
-
-    private static SimpleCondition createHasTagCondition(final ActionCondition actionCondition)
-    {
-        return builder()
-            .field(HasTagEvaluator.PARAM_TAG)
-            .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
-            .parameter(actionCondition.getParameterValues().get(HasTagEvaluator.PARAM_TAG).toString())
-            .create();
-    }
-
-    private static SimpleCondition createInCategoryCondition(final ActionCondition actionCondition)
-    {
-        return builder()
-            .field(PARAM_CATEGORY)
-            .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
-            .parameter(((NodeRef) actionCondition.getParameterValues().get(InCategoryEvaluator.PARAM_CATEGORY_VALUE)).getId())
-            .create();
-    }
-
-    private static SimpleCondition createIsSubtypeCondition(final ActionCondition actionCondition, final NamespaceService namespaceService)
-    {
-        return builder()
-            .field(IsSubTypeEvaluator.PARAM_TYPE)
-            .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
-            .parameter(((QName) actionCondition.getParameterValues().get(IsSubTypeEvaluator.PARAM_TYPE)).toPrefixString(namespaceService))
-            .create();
-    }
-
     public static Builder builder()
     {
         return new Builder();

remote-api/src/main/resources/alfresco/public-rest-context.xml

@@ -863,6 +863,7 @@
 
     <bean id="ruleSetLoader" class="org.alfresco.rest.api.impl.rules.RuleSetLoader">
         <property name="nodeService" ref="NodeService" />
+        <property name="ruleService" ref="RuleService" />
     </bean>
 
     <bean id="ruleSets" class="org.alfresco.rest.api.impl.rules.RuleSetsImpl">
@@ -886,7 +887,7 @@
     <bean id="ruleLoader" class="org.alfresco.rest.api.impl.rules.RuleLoader">
         <property name="ruleService" ref="RuleService" />
         <property name="nodeValidator" ref="nodeValidator" />
-        <property name="namespaceService" ref="NamespaceService"/>
+        <property name="simpleConditionMapper" ref="simpleConditionMapper"/>
     </bean>
 
     <bean class="org.alfresco.rest.api.nodes.NodeRuleSetsRelation">
@@ -910,7 +911,7 @@
         <property name="ruleLoader" ref="ruleLoader"/>
         <property name="actionParameterConverter" ref="actionParameterConverter"/>
         <property name="actionPermissionValidator" ref="actionPermissionValidator"/>
-        <property name="namespaceService" ref="NamespaceService"/>
+        <property name="simpleConditionMapper" ref="simpleConditionMapper"/>
     </bean>
 
     <bean id="Rules" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -946,6 +947,11 @@
         <property name="ruleSettings" ref="RuleSettings" />
     </bean>
 
+    <bean id="simpleConditionMapper" class="org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper">
+        <constructor-arg name="namespaceService" ref="NamespaceService"/>
+        <constructor-arg name="nodes" ref="Nodes"/>
+    </bean>
+
     <bean id="publicapi.mimeTypePropertyLookup" class="org.alfresco.rest.api.lookups.MimeTypePropertyLookup">
         <property name="serviceRegistry" ref="ServiceRegistry"/>
         <property name="supported">

remote-api/src/test/java/org/alfresco/rest/api/RulesUnitTests.java

@@ -26,7 +26,11 @@
 
 package org.alfresco.rest.api;
 
+import org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapperTest;
+import org.alfresco.rest.api.impl.rules.ActionParameterConverterTest;
+import org.alfresco.rest.api.impl.rules.ActionPermissionValidatorTest;
 import org.alfresco.rest.api.impl.rules.NodeValidatorTest;
+import org.alfresco.rest.api.impl.rules.RuleLoaderTest;
 import org.alfresco.rest.api.impl.rules.RuleSetsImplTest;
 import org.alfresco.rest.api.model.rules.ActionTest;
 import org.alfresco.rest.api.model.rules.CompositeConditionTest;
@@ -48,7 +52,11 @@ import org.junit.runners.Suite;
     RuleTest.class,
     ActionTest.class,
     SimpleConditionTest.class,
-    CompositeConditionTest.class
+    CompositeConditionTest.class,
+    RuleLoaderTest.class,
+    ActionParameterConverterTest.class,
+    ActionPermissionValidatorTest.class,
+    RestRuleSimpleConditionModelMapperTest.class
 })
 public class RulesUnitTests
 {

remote-api/src/test/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleSimpleConditionModelMapperTest.java

@@ -0,0 +1,372 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.impl.mapper.rules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.BDDMockito.given;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import junit.framework.TestCase;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.ActionConditionImpl;
+import org.alfresco.repo.action.evaluator.CompareMimeTypeEvaluator;
+import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
+import org.alfresco.repo.action.evaluator.HasAspectEvaluator;
+import org.alfresco.repo.action.evaluator.HasChildEvaluator;
+import org.alfresco.repo.action.evaluator.HasTagEvaluator;
+import org.alfresco.repo.action.evaluator.HasVersionHistoryEvaluator;
+import org.alfresco.repo.action.evaluator.InCategoryEvaluator;
+import org.alfresco.repo.action.evaluator.IsSubTypeEvaluator;
+import org.alfresco.repo.action.evaluator.NoConditionEvaluator;
+import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
+import org.alfresco.repo.action.evaluator.compare.ContentPropertyName;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.rules.SimpleCondition;
+import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@Experimental
+@RunWith(MockitoJUnitRunner.class)
+public class RestRuleSimpleConditionModelMapperTest extends TestCase
+{
+    private static final boolean NULL_RESULT = true;
+    private static final String PARAMETER_DEFAULT = "value";
+
+    @Mock
+    private NamespaceService namespaceServiceMock;
+    @Mock
+    private Nodes nodesMock;
+
+    @InjectMocks
+    private RestRuleSimpleConditionModelMapper objectUnderTest;
+
+    @Before
+    public void setUp() throws Exception
+    {
+        given(namespaceServiceMock.getPrefixes(NamespaceService.CONTENT_MODEL_1_0_URI)).willReturn(List.of(NamespaceService.CONTENT_MODEL_PREFIX));
+        given(namespaceServiceMock.getNamespaceURI(NamespaceService.CONTENT_MODEL_PREFIX)).willReturn(NamespaceService.CONTENT_MODEL_1_0_URI);
+        given(namespaceServiceMock.getPrefixes(NamespaceService.AUDIO_MODEL_1_0_URI)).willReturn(List.of(NamespaceService.AUDIO_MODEL_PREFIX));
+        given(namespaceServiceMock.getNamespaceURI(NamespaceService.AUDIO_MODEL_PREFIX)).willReturn(NamespaceService.AUDIO_MODEL_1_0_URI);
+    }
+
+    @Test
+    public void testToRestModel()
+    {
+        for (TestData testData : getTestData())
+        {
+            final ActionCondition actionCondition = createActionCondition(testData.conditionDefinitionName);
+
+            // when
+            final SimpleCondition actualSimpleCondition = objectUnderTest.toRestModel(actionCondition);
+
+            assertThat(Objects.isNull(actualSimpleCondition)).isEqualTo(testData.isNullResult);
+            if (!testData.isNullResult)
+            {
+                assertThat(actualSimpleCondition.getField()).isNotEmpty();
+                assertThat(actualSimpleCondition.getComparator()).isNotEmpty();
+                assertThat(actualSimpleCondition.getParameter()).isNotEmpty();
+            }
+        }
+    }
+
+    @Test
+    public void testToRestModelFromNullValue()
+    {
+        // when
+        final ActionCondition actionCondition = null;
+        final SimpleCondition actualSimpleCondition = objectUnderTest.toRestModel(actionCondition);
+
+        assertThat(actualSimpleCondition).isNull();
+    }
+
+    @Test
+    public void testToRestModelFromActionConditionWithoutDefinitionName()
+    {
+        final ActionCondition actionCondition = new ActionConditionImpl("fake-id", null, createParameterValues());
+
+        // when
+        final SimpleCondition actualSimpleCondition = objectUnderTest.toRestModel(actionCondition);
+
+        assertThat(actualSimpleCondition).isNull();
+    }
+
+    @Test
+    public void testToRestModelFromActionConditionWithoutParameterValues()
+    {
+        final ActionCondition actionCondition = new ActionConditionImpl("fake-id", "fake-def-name", null);
+
+        // when
+        final SimpleCondition actualSimpleCondition = objectUnderTest.toRestModel(actionCondition);
+
+        assertThat(actualSimpleCondition).isNull();
+    }
+
+    @Test
+    public void testToRestModelListOfEmptyActionConditions()
+    {
+        // when
+        final List<SimpleCondition> actualSimpleConditions =  objectUnderTest.toRestModels(Collections.emptyList());
+
+        assertThat(actualSimpleConditions).isEmpty();
+    }
+
+    @Test
+    public void testToRestModelListOfNullActionConditions()
+    {
+        // when
+        assertThatExceptionOfType(NullPointerException.class).isThrownBy(() -> objectUnderTest.toRestModels(null));
+    }
+
+    @Test
+    public void testToRestModelListOfActionConditionsContainingNull()
+    {
+        final List<ActionCondition> actionConditions = new ArrayList<>();
+        actionConditions.add(null);
+
+        // when
+        final List<SimpleCondition> actualSimpleConditions =  objectUnderTest.toRestModels(actionConditions);
+
+        assertThat(actualSimpleConditions).hasSize(1).containsOnlyNulls();
+    }
+
+    @Test
+    public void testToServiceModel_withSizeContentProperty()
+    {
+        final SimpleCondition simpleCondition = createSimpleCondition(ContentPropertyName.SIZE.toString().toLowerCase());
+
+        // when
+        final ActionCondition actualActionCondition = objectUnderTest.toServiceModel(simpleCondition);
+
+        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, ContentPropertyName.SIZE.toString());
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, ComparePropertyValueOperation.EQUALS.toString());
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, PARAMETER_DEFAULT);
+        ActionCondition expectedActionCondition = new ActionConditionImpl(null, ComparePropertyValueEvaluator.NAME, expectedParameterValues);
+        assertThat(actualActionCondition)
+                .isNotNull().usingRecursiveComparison().ignoringFields("id")
+                .isEqualTo(expectedActionCondition);
+    }
+
+    @Test
+    public void testToServiceModel_withoutContentProperty()
+    {
+        final String field = NamespaceService.CONTENT_MODEL_PREFIX + QName.NAMESPACE_PREFIX + ContentModel.PROP_DESCRIPTION.toPrefixString();
+        final SimpleCondition simpleCondition = createSimpleCondition(field);
+
+        // when
+        final ActionCondition actualActionCondition = objectUnderTest.toServiceModel(simpleCondition);
+
+        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.PROP_DESCRIPTION);
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, ComparePropertyValueOperation.EQUALS.toString());
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, PARAMETER_DEFAULT);
+        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, ComparePropertyValueEvaluator.NAME, expectedParameterValues);
+        assertThat(actualActionCondition)
+                .isNotNull().usingRecursiveComparison().ignoringFields("id", "parameterValues.property.prefix")
+                .isEqualTo(expectedActionCondition);
+    }
+
+    @Test
+    public void testToServiceModel_compareMimetype()
+    {
+        final SimpleCondition simpleCondition = createSimpleCondition(SimpleCondition.PARAM_MIMETYPE);
+
+        // when
+        final ActionCondition actualActionCondition = objectUnderTest.toServiceModel(simpleCondition);
+
+        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
+        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, PARAMETER_DEFAULT);
+        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, CompareMimeTypeEvaluator.NAME, expectedParameterValues);
+        assertThat(actualActionCondition)
+                .isNotNull().usingRecursiveComparison().ignoringFields("id")
+                .isEqualTo(expectedActionCondition);
+    }
+
+    @Test
+    public void testToServiceModel_hasAspect()
+    {
+        final QName audioAspect = QName.createQName(NamespaceService.AUDIO_MODEL_1_0_URI, NamespaceService.AUDIO_MODEL_PREFIX);
+        final String field = NamespaceService.AUDIO_MODEL_PREFIX + QName.NAMESPACE_PREFIX + NamespaceService.AUDIO_MODEL_PREFIX;
+        final SimpleCondition simpleCondition = createSimpleCondition(HasAspectEvaluator.PARAM_ASPECT, field);
+
+        // when
+        final ActionCondition actualActionCondition = objectUnderTest.toServiceModel(simpleCondition);
+
+        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
+        expectedParameterValues.put(HasAspectEvaluator.PARAM_ASPECT, audioAspect);
+        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, HasAspectEvaluator.NAME, expectedParameterValues);
+        assertThat(actualActionCondition)
+                .isNotNull().usingRecursiveComparison().ignoringFields("id", "parameterValues.aspect.prefix")
+                .isEqualTo(expectedActionCondition);
+    }
+
+    @Test
+    public void testToServiceModel_hasTag()
+    {
+        final String tag = "some tag";
+        final SimpleCondition simpleCondition = createSimpleCondition(HasTagEvaluator.PARAM_TAG, tag);
+
+        // when
+        final ActionCondition actualActionCondition = objectUnderTest.toServiceModel(simpleCondition);
+
+        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
+        expectedParameterValues.put(HasTagEvaluator.PARAM_TAG, tag);
+        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, HasTagEvaluator.NAME, expectedParameterValues);
+        assertThat(actualActionCondition)
+                .isNotNull().usingRecursiveComparison().ignoringFields("id")
+                .isEqualTo(expectedActionCondition);
+    }
+
+    @Test
+    public void testToServiceModel_inCategory()
+    {
+        final SimpleCondition simpleCondition = createSimpleCondition(SimpleCondition.PARAM_CATEGORY);
+        final NodeRef defaultNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARAMETER_DEFAULT);
+        given(nodesMock.validateOrLookupNode(PARAMETER_DEFAULT, null)).willReturn(defaultNodeRef);
+
+        // when
+        final ActionCondition actualActionCondition = objectUnderTest.toServiceModel(simpleCondition);
+
+        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
+        expectedParameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, ContentModel.ASPECT_GEN_CLASSIFIABLE);
+        expectedParameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, defaultNodeRef);
+        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, InCategoryEvaluator.NAME, expectedParameterValues);
+        assertThat(actualActionCondition)
+                .isNotNull().usingRecursiveComparison().ignoringFields("id")
+                .isEqualTo(expectedActionCondition);
+    }
+
+    @Test
+    public void testToServiceModel_isSubType()
+    {
+        final String field = NamespaceService.CONTENT_MODEL_PREFIX + QName.NAMESPACE_PREFIX + ContentModel.TYPE_FOLDER.toPrefixString();
+        final SimpleCondition simpleCondition = createSimpleCondition(IsSubTypeEvaluator.PARAM_TYPE, field);
+
+        // when
+        final ActionCondition actualActionCondition = objectUnderTest.toServiceModel(simpleCondition);
+
+        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
+        expectedParameterValues.put(IsSubTypeEvaluator.PARAM_TYPE, ContentModel.TYPE_FOLDER);
+        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, IsSubTypeEvaluator.NAME, expectedParameterValues);
+        assertThat(actualActionCondition)
+                .isNotNull().usingRecursiveComparison().ignoringFields("id", "parameterValues.type.prefix")
+                .isEqualTo(expectedActionCondition);
+    }
+
+    private static ActionCondition createActionCondition(final String actionDefinitionName)
+    {
+        return new ActionConditionImpl("fake-id", actionDefinitionName, createParameterValues());
+    }
+
+    private static Map<String, Serializable> createParameterValues() {
+        final QName audioAspect = QName.createQName(NamespaceService.AUDIO_MODEL_1_0_URI, NamespaceService.AUDIO_MODEL_PREFIX);
+        final NodeRef defaultNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARAMETER_DEFAULT);
+        final Map<String, Serializable> parameterValues = new HashMap<>();
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, "content-property");
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, "operation");
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, "value");
+        parameterValues.put(HasAspectEvaluator.PARAM_ASPECT, audioAspect);
+        parameterValues.put(HasTagEvaluator.PARAM_TAG, "tag");
+        parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, "category-aspect");
+        parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, defaultNodeRef);
+        parameterValues.put(IsSubTypeEvaluator.PARAM_TYPE, ContentModel.TYPE_FOLDER);
+
+        return parameterValues;
+    }
+
+    private static SimpleCondition createSimpleCondition(final String field)
+    {
+        return createSimpleCondition(field, PARAMETER_DEFAULT);
+    }
+
+    private static SimpleCondition createSimpleCondition(final String field, final String parameter)
+    {
+        return SimpleCondition.builder()
+                .field(field)
+                .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
+                .parameter(parameter)
+                .create();
+    }
+
+    private static List<TestData> getTestData() {
+        return List.of(
+                TestData.of(ComparePropertyValueEvaluator.NAME),
+                TestData.of(CompareMimeTypeEvaluator.NAME),
+                TestData.of(HasAspectEvaluator.NAME),
+                TestData.of(HasChildEvaluator.NAME, NULL_RESULT),
+                TestData.of(HasTagEvaluator.NAME),
+                TestData.of(HasVersionHistoryEvaluator.NAME, NULL_RESULT),
+                TestData.of(InCategoryEvaluator.NAME),
+                TestData.of(IsSubTypeEvaluator.NAME),
+                TestData.of(NoConditionEvaluator.NAME, NULL_RESULT),
+                TestData.of("fake-definition-name", NULL_RESULT),
+                TestData.of("", NULL_RESULT),
+                TestData.of(null, NULL_RESULT)
+        );
+    }
+
+    private static class TestData
+    {
+        String conditionDefinitionName;
+        boolean isNullResult;
+
+        public TestData(String conditionDefinitionName, boolean isNullResult)
+        {
+            this.conditionDefinitionName = conditionDefinitionName;
+            this.isNullResult = isNullResult;
+        }
+
+        public static TestData of(String conditionDefinitionName) {
+            return new TestData(conditionDefinitionName, false);
+        }
+
+        public static TestData of(String conditionDefinitionName, boolean isNullResult) {
+            return new TestData(conditionDefinitionName, isNullResult);
+        }
+    }
+}

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

@@ -26,11 +26,17 @@
 package org.alfresco.rest.api.impl.rules;
 
 import static org.alfresco.rest.api.impl.rules.RuleSetLoader.INCLUSION_TYPE;
+import static org.alfresco.rest.api.impl.rules.RuleSetLoader.INHERITED_BY;
+import static org.alfresco.rest.api.impl.rules.RuleSetLoader.IS_INHERITED;
+import static org.alfresco.rest.api.impl.rules.RuleSetLoader.IS_LINKED_TO;
+import static org.alfresco.rest.api.impl.rules.RuleSetLoader.LINKED_TO_BY;
 import static org.alfresco.rest.api.impl.rules.RuleSetLoader.OWNING_FOLDER;
 import static org.alfresco.rest.api.model.rules.InclusionType.INHERITED;
 import static org.alfresco.rest.api.model.rules.InclusionType.LINKED;
 import static org.alfresco.rest.api.model.rules.InclusionType.OWNED;
 import static org.alfresco.service.cmr.repository.StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
 
 import java.util.List;
@@ -41,6 +47,7 @@ import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.rule.RuleService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,6 +73,8 @@ public class RuleSetLoaderTest extends TestCase
     @Mock
     private NodeService nodeServiceMock;
     @Mock
+    private RuleService ruleServiceMock;
+    @Mock
     private ChildAssociationRef ruleSetAssociationMock;
     @Mock
     private ChildAssociationRef linkAssociationMock;
@@ -79,6 +88,8 @@ public class RuleSetLoaderTest extends TestCase
 
         given(linkAssociationMock.getParentRef()).willReturn(LINKING_FOLDER);
         given(nodeServiceMock.getParentAssocs(RULE_SET_NODE)).willReturn(List.of(ruleSetAssociationMock, linkAssociationMock));
+
+        given(ruleServiceMock.getFoldersInheritingRuleSet(eq(RULE_SET_NODE), anyInt())).willReturn(List.of(INHERITING_FOLDER));
     }
 
     @Test
@@ -130,4 +141,44 @@ public class RuleSetLoaderTest extends TestCase
         RuleSet expected = RuleSet.builder().id(RULE_SET_ID).inclusionType(INHERITED).create();
         assertEquals(expected, actual);
     }
+
+    @Test
+    public void testLoadRuleSet_inheritedBy()
+    {
+        // Call the method under test.
+        RuleSet actual = ruleSetLoader.loadRuleSet(RULE_SET_NODE, INHERITING_FOLDER, List.of(INHERITED_BY));
+
+        RuleSet expected = RuleSet.builder().id(RULE_SET_ID).inheritedBy(List.of(INHERITING_FOLDER)).create();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testLoadRuleSet_linkedToBy()
+    {
+        // Call the method under test.
+        RuleSet actual = ruleSetLoader.loadRuleSet(RULE_SET_NODE, FOLDER_NODE, List.of(LINKED_TO_BY));
+
+        RuleSet expected = RuleSet.builder().id(RULE_SET_ID).linkedToBy(List.of(LINKING_FOLDER)).create();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testLoadRuleSet_isInherited()
+    {
+        // Call the method under test.
+        RuleSet actual = ruleSetLoader.loadRuleSet(RULE_SET_NODE, FOLDER_NODE, List.of(IS_INHERITED));
+
+        RuleSet expected = RuleSet.builder().id(RULE_SET_ID).isInherited(true).create();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testLoadRuleSet_isLinkedTo()
+    {
+        // Call the method under test.
+        RuleSet actual = ruleSetLoader.loadRuleSet(RULE_SET_NODE, FOLDER_NODE, List.of(IS_LINKED_TO));
+
+        RuleSet expected = RuleSet.builder().id(RULE_SET_ID).isLinkedTo(true).create();
+        assertEquals(expected, actual);
+    }
 }

remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RulesImplTest.java

@@ -50,7 +50,9 @@ import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.repo.action.CompositeActionImpl;
 import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.rules.Action;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.rest.api.model.rules.Rule;
+import org.alfresco.rest.api.model.rules.SimpleCondition;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
@@ -58,11 +60,11 @@ import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundE
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
 import org.alfresco.service.cmr.action.CompositeAction;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.rule.RuleService;
-import org.alfresco.service.namespace.NamespaceService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -89,7 +91,7 @@ public class RulesImplTest extends TestCase
     @Mock
     private Nodes nodesMock;
     @Mock
-    private NamespaceService namespaceService;
+    private RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapperMock;
     @Mock
     private NodeValidator nodeValidatorMock;
     @Mock
@@ -295,7 +297,7 @@ public class RulesImplTest extends TestCase
     public void testCreateRules()
     {
         List<Rule> ruleList = List.of(ruleMock);
-        given(ruleMock.toServiceModel(nodesMock, namespaceService)).willReturn(serviceRuleMock);
+        given(ruleMock.toServiceModel(nodesMock, simpleConditionMapperMock)).willReturn(serviceRuleMock);
         given(ruleMock.getActions()).willReturn(List.of(actionMock));
         given(serviceRuleMock.getAction()).willReturn(compositeAction);
         given(ruleServiceMock.saveRule(FOLDER_NODE_REF, serviceRuleMock)).willAnswer(arg -> arg.getArguments()[1]);
@@ -312,7 +314,7 @@ public class RulesImplTest extends TestCase
         then(actionParameterConverterMock).shouldHaveNoMoreInteractions();
         then(actionPermissionValidatorMock).should().validateRulePermissions(serviceRuleMock);
         then(actionPermissionValidatorMock).shouldHaveNoMoreInteractions();
-        then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleMock.toServiceModel(nodesMock, namespaceService));
+        then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleMock.toServiceModel(nodesMock, simpleConditionMapperMock));
         then(ruleServiceMock).shouldHaveNoMoreInteractions();
         List<Rule> expected = List.of(ruleMock);
         assertThat(actual).isEqualTo(expected);
@@ -325,7 +327,7 @@ public class RulesImplTest extends TestCase
     public void testCreateRules_defaultRuleSet()
     {
         List<Rule> ruleList = List.of(ruleMock);
-        given(ruleMock.toServiceModel(nodesMock, namespaceService)).willReturn(serviceRuleMock);
+        given(ruleMock.toServiceModel(nodesMock, simpleConditionMapperMock)).willReturn(serviceRuleMock);
         given(ruleMock.getActions()).willReturn(List.of(actionMock));
         given(ruleServiceMock.saveRule(FOLDER_NODE_REF, serviceRuleMock)).willAnswer(arg -> arg.getArguments()[1]);
         given(ruleLoaderMock.loadRule(serviceRuleMock, INCLUDE)).willReturn(ruleMock);
@@ -341,7 +343,7 @@ public class RulesImplTest extends TestCase
         then(actionParameterConverterMock).shouldHaveNoMoreInteractions();
         then(actionPermissionValidatorMock).should().validateRulePermissions(serviceRuleMock);
         then(actionPermissionValidatorMock).shouldHaveNoMoreInteractions();
-        then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleMock.toServiceModel(nodesMock, namespaceService));
+        then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleMock.toServiceModel(nodesMock, simpleConditionMapperMock));
         then(ruleServiceMock).shouldHaveNoMoreInteractions();
         List<Rule> expected = List.of(ruleMock);
         assertThat(actual).isEqualTo(expected);
@@ -372,7 +374,7 @@ public class RulesImplTest extends TestCase
             given(ruleBodyMock.getActions()).willReturn(List.of(actionMock));
             ruleBodyList.add(ruleBodyMock);
             org.alfresco.service.cmr.rule.Rule serviceRuleMockInner = mock(org.alfresco.service.cmr.rule.Rule.class);
-            given(ruleBodyMock.toServiceModel(nodesMock, namespaceService)).willReturn(serviceRuleMockInner);
+            given(ruleBodyMock.toServiceModel(nodesMock, simpleConditionMapperMock)).willReturn(serviceRuleMockInner);
             final CompositeAction compositeActionInner = new CompositeActionImpl(RULE_NODE_REF, "compositeActionInnerId");
             compositeActionInner.addAction(new ActionImpl(FOLDER_NODE_REF, "actionInnerId", ACTION_DEFINITION_NAME, DUMMY_PARAMS));
             given(serviceRuleMockInner.getAction()).willReturn(compositeActionInner);
@@ -391,8 +393,8 @@ public class RulesImplTest extends TestCase
         then(nodeValidatorMock).shouldHaveNoMoreInteractions();
         for (Rule ruleBody : ruleBodyList)
         {
-            then(actionPermissionValidatorMock).should().validateRulePermissions(ruleBody.toServiceModel(nodesMock, namespaceService));
-            then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleBody.toServiceModel(nodesMock, namespaceService));
+            then(actionPermissionValidatorMock).should().validateRulePermissions(ruleBody.toServiceModel(nodesMock, simpleConditionMapperMock));
+            then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleBody.toServiceModel(nodesMock, simpleConditionMapperMock));
         }
         then(actionParameterConverterMock).should(times(3)).getConvertedParams(DUMMY_PARAMS, ACTION_DEFINITION_NAME);
         then(actionParameterConverterMock).shouldHaveNoMoreInteractions();
@@ -466,7 +468,7 @@ public class RulesImplTest extends TestCase
     @Test
     public void testUpdateRuleById()
     {
-        given(ruleMock.toServiceModel(nodesMock, namespaceService)).willReturn(serviceRuleMock);
+        given(ruleMock.toServiceModel(nodesMock, simpleConditionMapperMock)).willReturn(serviceRuleMock);
         given(ruleMock.getActions()).willReturn(List.of(actionMock));
         given(ruleServiceMock.saveRule(FOLDER_NODE_REF, serviceRuleMock)).willAnswer(a -> a.getArguments()[1]);
         given(serviceRuleMock.getAction()).willReturn(compositeAction);

remote-api/src/test/java/org/alfresco/rest/api/model/rules/CompositeConditionTest.java

@@ -38,11 +38,13 @@ import java.util.Map;
 
 import org.alfresco.repo.action.ActionConditionImpl;
 import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
+import org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.action.ActionCondition;
-import org.alfresco.service.namespace.NamespaceService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @Experimental
@@ -50,28 +52,32 @@ import org.mockito.junit.MockitoJUnitRunner;
 public class CompositeConditionTest
 {
 
-    private final NamespaceService namespaceService = mock(NamespaceService.class);
+    private final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper = mock(RestRuleSimpleConditionModelMapper.class);
 
     @Test
     public void testFrom()
     {
         final List<ActionCondition> actionConditions = List.of(
-            createActionCondition("value1"),
-            createActionCondition("value2", true),
-            createActionCondition("value3")
+                createActionCondition("value1"),
+                createActionCondition("value3"),
+                createActionCondition("value2", true)
         );
-        final CompositeCondition expectedCompositeCondition = createCompositeCondition(List.of(
-            createCompositeCondition(false, List.of(
+        final List<SimpleCondition> simpleConditions = List.of(
                 createSimpleCondition("value1"),
-                createSimpleCondition("value3")
-            )),
-            createCompositeCondition(true, List.of(
+                createSimpleCondition("value3"),
                 createSimpleCondition("value2")
-            ))
+        );
+
+        final CompositeCondition expectedCompositeCondition = createCompositeCondition(List.of(
+            createCompositeCondition(false, simpleConditions.subList(0,2)),
+            createCompositeCondition(true, simpleConditions.subList(2,3))
         ));
 
+        Mockito.when(simpleConditionMapper.toRestModels(actionConditions.subList(0,2))).thenReturn(simpleConditions.subList(0,2));
+        Mockito.when(simpleConditionMapper.toRestModels(actionConditions.subList(2,3))).thenReturn(simpleConditions.subList(2,3));
+
         // when
-        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions, namespaceService);
+        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions, simpleConditionMapper);
 
         assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCompositeCondition);
     }
@@ -83,7 +89,7 @@ public class CompositeConditionTest
         final CompositeCondition expectedCompositeCondition = CompositeCondition.builder().create();
 
         // when
-        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions, namespaceService);
+        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions, simpleConditionMapper);
 
         assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCompositeCondition);
     }
@@ -92,7 +98,7 @@ public class CompositeConditionTest
     public void testFromNullValue()
     {
         // when
-        final CompositeCondition actualCompositeCondition = CompositeCondition.from(null, namespaceService);
+        final CompositeCondition actualCompositeCondition = CompositeCondition.from(null, simpleConditionMapper);
 
         assertThat(actualCompositeCondition).isNull();
     }
@@ -105,7 +111,7 @@ public class CompositeConditionTest
         final CompositeCondition expectedCompositeCondition = CompositeCondition.builder().create();
 
         // when
-        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions, namespaceService);
+        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions, simpleConditionMapper);
 
         assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCompositeCondition);
     }
@@ -184,4 +190,4 @@ public class CompositeConditionTest
             .simpleConditions(simpleConditions)
             .create();
     }
-}
+}

remote-api/src/test/java/org/alfresco/rest/api/model/rules/RuleTest.java

@@ -37,6 +37,8 @@ import org.alfresco.repo.action.ActionConditionImpl;
 import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.repo.action.executer.ScriptActionExecuter;
 import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.action.ActionCondition;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -61,7 +63,7 @@ public class RuleTest
     private static final String ACTION_DEFINITION_NAME = "action-def-name";
     private static final String ERROR_SCRIPT = "error-script-ref";
 
-    private final NamespaceService namespaceService = mock(NamespaceService.class);
+    private final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper = mock(RestRuleSimpleConditionModelMapper.class);
 
     @Test
     public void testFrom()
@@ -70,7 +72,7 @@ public class RuleTest
         final Rule expectedRule = createRuleWithDefaultValues();
 
         // when
-        final Rule actualRule = Rule.from(ruleModel, namespaceService);
+        final Rule actualRule = Rule.from(ruleModel, simpleConditionMapper);
 
         assertThat(actualRule).isNotNull().usingRecursiveComparison().isEqualTo(expectedRule);
 
@@ -83,7 +85,7 @@ public class RuleTest
         final Rule expectedRule = Rule.builder().enabled(true).create();
 
         // when
-        final Rule actualRule = Rule.from(ruleModel, namespaceService);
+        final Rule actualRule = Rule.from(ruleModel, simpleConditionMapper);
 
         assertThat(actualRule).isNotNull().usingRecursiveComparison().isEqualTo(expectedRule);
 
@@ -99,7 +101,7 @@ public class RuleTest
         final org.alfresco.service.cmr.action.Action expectedCompensatingActionModel = createCompensatingActionModel();
 
         // when
-        final org.alfresco.service.cmr.rule.Rule actualRuleModel = rule.toServiceModel(nodesMock, namespaceService);
+        final org.alfresco.service.cmr.rule.Rule actualRuleModel = rule.toServiceModel(nodesMock, simpleConditionMapper);
 
         then(nodesMock).should().validateOrLookupNode(RULE_ID, null);
         then(nodesMock).shouldHaveNoMoreInteractions();
@@ -124,7 +126,7 @@ public class RuleTest
         expectedRuleModel.setRuleDisabled(true);
 
         // when
-        final org.alfresco.service.cmr.rule.Rule actualRuleModel = rule.toServiceModel(nodesMock, namespaceService);
+        final org.alfresco.service.cmr.rule.Rule actualRuleModel = rule.toServiceModel(nodesMock, simpleConditionMapper);
 
         then(nodesMock).shouldHaveNoInteractions();
         assertThat(actualRuleModel)
@@ -144,7 +146,7 @@ public class RuleTest
             .asynchronous(RULE_ASYNC)
             .triggers(List.of(RuleTrigger.INBOUND, RuleTrigger.UPDATE))
             .errorScript(ERROR_SCRIPT)
-            .conditions(CompositeCondition.from(Collections.emptyList(), namespaceService))
+            .conditions(CompositeCondition.from(Collections.emptyList(), simpleConditionMapper))
             .create();
     }
 
@@ -177,4 +179,4 @@ public class RuleTest
 
         return compensatingActionModel;
     }
-}
+}

remote-api/src/test/java/org/alfresco/rest/api/model/rules/SimpleConditionTest.java

@@ -28,37 +28,21 @@ package org.alfresco.rest.api.model.rules;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.mock;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
-import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.ActionConditionImpl;
-import org.alfresco.repo.action.evaluator.CompareMimeTypeEvaluator;
 import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
-import org.alfresco.repo.action.evaluator.HasAspectEvaluator;
-import org.alfresco.repo.action.evaluator.HasChildEvaluator;
-import org.alfresco.repo.action.evaluator.HasTagEvaluator;
-import org.alfresco.repo.action.evaluator.HasVersionHistoryEvaluator;
-import org.alfresco.repo.action.evaluator.InCategoryEvaluator;
-import org.alfresco.repo.action.evaluator.IsSubTypeEvaluator;
-import org.alfresco.repo.action.evaluator.NoConditionEvaluator;
 import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
-import org.alfresco.repo.action.evaluator.compare.ContentPropertyName;
-import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper;
+import org.alfresco.rest.api.model.mapper.RestModelMapper;
 import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.action.ActionCondition;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -67,123 +51,49 @@ import org.mockito.junit.MockitoJUnitRunner;
 @RunWith(MockitoJUnitRunner.class)
 public class SimpleConditionTest
 {
-    private static final boolean NULL_RESULT = true;
-    private static final boolean NOT_INVERTED = false;
-    private static final String PARAMETER_DEFAULT = "value";
+    private static final boolean INVERTED = true;
+    private static final String VALUE = "value";
+    private static final String KEY = "key";
 
-    private final Nodes nodes = mock(Nodes.class);
-    private final NamespaceService namespaceService = mock(NamespaceService.class);
-
-    @Before
-    public void setUp() throws Exception
-    {
-        given(namespaceService.getPrefixes(NamespaceService.CONTENT_MODEL_1_0_URI)).willReturn(List.of(NamespaceService.CONTENT_MODEL_PREFIX));
-        given(namespaceService.getNamespaceURI(NamespaceService.CONTENT_MODEL_PREFIX)).willReturn(NamespaceService.CONTENT_MODEL_1_0_URI);
-        given(namespaceService.getPrefixes(NamespaceService.AUDIO_MODEL_1_0_URI)).willReturn(List.of(NamespaceService.AUDIO_MODEL_PREFIX));
-        given(namespaceService.getNamespaceURI(NamespaceService.AUDIO_MODEL_PREFIX)).willReturn(NamespaceService.AUDIO_MODEL_1_0_URI);
-    }
-
-    private static List<TestData> getTestData() {
-        return List.of(
-            TestData.of(ComparePropertyValueEvaluator.NAME),
-            TestData.of(CompareMimeTypeEvaluator.NAME),
-            TestData.of(HasAspectEvaluator.NAME),
-            TestData.of(HasChildEvaluator.NAME, NULL_RESULT),
-            TestData.of(HasTagEvaluator.NAME),
-            TestData.of(HasVersionHistoryEvaluator.NAME, NULL_RESULT),
-            TestData.of(InCategoryEvaluator.NAME),
-            TestData.of(IsSubTypeEvaluator.NAME),
-            TestData.of(NoConditionEvaluator.NAME, NULL_RESULT),
-            TestData.of("fake-definition-name", NULL_RESULT),
-            TestData.of("", NULL_RESULT),
-            TestData.of(null, NULL_RESULT)
-        );
-    }
+    private final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapperMock = mock(RestRuleSimpleConditionModelMapper.class);
 
     @Test
     public void testFrom()
     {
-        for (TestData testData : getTestData())
-        {
-            final ActionCondition actionCondition = createActionCondition(testData.conditionDefinitionName);
+        final ActionCondition actionCondition = createActionCondition(ComparePropertyValueEvaluator.NAME);
+        final SimpleCondition simpleConditionMock = mock(SimpleCondition.class);
+        given(simpleConditionMapperMock.toRestModel(actionCondition)).willReturn(simpleConditionMock);
 
-            // when
-            final SimpleCondition actualSimpleCondition = SimpleCondition.from(actionCondition, namespaceService);
+        //when
+        final SimpleCondition actualSimpleCondition = SimpleCondition.from(actionCondition, simpleConditionMapperMock);
 
-            assertThat(Objects.isNull(actualSimpleCondition)).isEqualTo(testData.isNullResult);
-            if (!testData.isNullResult)
-            {
-                assertThat(actualSimpleCondition.getField()).isNotEmpty();
-                assertThat(actualSimpleCondition.getComparator()).isNotEmpty();
-                assertThat(actualSimpleCondition.getParameter()).isNotEmpty();
-            }
-        }
-    }
-
-    @Test
-    public void testFromNullValue()
-    {
-        // when
-        final SimpleCondition actualSimpleCondition = SimpleCondition.from(null, namespaceService);
-
-        assertThat(actualSimpleCondition).isNull();
-    }
-
-    @Test
-    public void testFromActionConditionWithoutDefinitionName()
-    {
-        final ActionCondition actionCondition = new ActionConditionImpl("fake-id", null, createParameterValues());
-
-        // when
-        final SimpleCondition actualSimpleCondition = SimpleCondition.from(actionCondition, namespaceService);
-
-        assertThat(actualSimpleCondition).isNull();
-    }
-
-    @Test
-    public void testFromActionConditionWithoutParameterValues()
-    {
-        final ActionCondition actionCondition = new ActionConditionImpl("fake-id", "fake-def-name", null);
-
-        // when
-        final SimpleCondition actualSimpleCondition = SimpleCondition.from(actionCondition, namespaceService);
-
-        assertThat(actualSimpleCondition).isNull();
+        then(simpleConditionMapperMock).should().toRestModel(actionCondition);
+        then(simpleConditionMapperMock).shouldHaveNoMoreInteractions();
+        assertThat(actualSimpleCondition).isEqualTo(simpleConditionMock);
     }
 
     @Test
     public void testListOf()
     {
-        final List<ActionCondition> actionConditions = List.of(
-            createActionCondition(ComparePropertyValueEvaluator.NAME),
-            createActionCondition(CompareMimeTypeEvaluator.NAME)
-        );
+        final List<ActionCondition> actionConditionsMock = mock(List.class);
+        final List<SimpleCondition> simpleConditionsMock = mock(List.class);
+        given(simpleConditionMapperMock.toRestModels(actionConditionsMock)).willReturn(simpleConditionsMock);
 
         // when
-        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(actionConditions, namespaceService);
+        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(actionConditionsMock, simpleConditionMapperMock);
 
-        final List<SimpleCondition> expectedSimpleConditions = List.of(
-            SimpleCondition.builder()
-                .field("content-property")
-                .comparator("operation")
-                .parameter("value")
-                .create(),
-            SimpleCondition.builder()
-                .field(SimpleCondition.PARAM_MIMETYPE)
-                .comparator(ComparePropertyValueOperation.EQUALS.toString().toLowerCase())
-                .parameter("value")
-                .create()
-        );
+        then(simpleConditionMapperMock).should().toRestModels(actionConditionsMock);
+        then(simpleConditionMapperMock).shouldHaveNoMoreInteractions();
         assertThat(actualSimpleConditions)
             .isNotNull()
-            .containsExactlyElementsOf(expectedSimpleConditions);
+            .containsExactlyElementsOf(simpleConditionsMock);
     }
 
     @Test
     public void testListOfEmptyActionConditions()
     {
         // when
-        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(Collections.emptyList(), namespaceService);
+        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(Collections.emptyList(), simpleConditionMapperMock);
 
         assertThat(actualSimpleConditions).isNull();
     }
@@ -192,8 +102,9 @@ public class SimpleConditionTest
     public void testListOfNullActionConditions()
     {
         // when
-        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(null, namespaceService);
+        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(null, simpleConditionMapperMock);
 
+        then(simpleConditionMapperMock).shouldHaveNoInteractions();
         assertThat(actualSimpleConditions).isNull();
     }
 
@@ -204,156 +115,47 @@ public class SimpleConditionTest
         actionConditions.add(null);
 
         // when
-        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(actionConditions, namespaceService);
+        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(actionConditions, simpleConditionMapperMock);
 
+        then(simpleConditionMapperMock).should().toRestModels(actionConditions);
+        then(simpleConditionMapperMock).shouldHaveNoMoreInteractions();
         assertThat(actualSimpleConditions).isNotNull().isEmpty();
     }
 
     @Test
-    public void testToServiceModel_withSizeContentProperty()
+    public void testToServiceModel_notInverted()
     {
-        final SimpleCondition simpleCondition = createSimpleCondition(ContentPropertyName.SIZE.toString().toLowerCase());
+        final SimpleCondition simpleCondition = createSimpleCondition("field");
+        final ActionCondition actionCondition = createActionCondition(ComparePropertyValueEvaluator.NAME);
+        given(simpleConditionMapperMock.toServiceModel(simpleCondition)).willReturn(actionCondition);
 
         // when
-        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(NOT_INVERTED, nodes, namespaceService);
+        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(!INVERTED, simpleConditionMapperMock);
 
-        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, ContentPropertyName.SIZE.toString());
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, ComparePropertyValueOperation.EQUALS.toString());
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, PARAMETER_DEFAULT);
-        ActionCondition expectedActionCondition = new ActionConditionImpl(null, ComparePropertyValueEvaluator.NAME, expectedParameterValues);
-        assertThat(actualActionCondition)
-            .isNotNull().usingRecursiveComparison().ignoringFields("id")
-            .isEqualTo(expectedActionCondition);
-    }
-
-    @Test
-    public void testToServiceModel_withoutContentProperty()
-    {
-        final SimpleCondition simpleCondition = createSimpleCondition(ContentModel.PROP_DESCRIPTION.toPrefixString(namespaceService));
-
-        // when
-        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(NOT_INVERTED, nodes, namespaceService);
-
-        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.PROP_DESCRIPTION);
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, ComparePropertyValueOperation.EQUALS.toString());
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, PARAMETER_DEFAULT);
-        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, ComparePropertyValueEvaluator.NAME, expectedParameterValues);
-        assertThat(actualActionCondition)
-            .isNotNull().usingRecursiveComparison().ignoringFields("id", "parameterValues.property.prefix")
-            .isEqualTo(expectedActionCondition);
-    }
-
-    @Test
-    public void testToServiceModel_compareMimetype()
-    {
-        final SimpleCondition simpleCondition = createSimpleCondition(SimpleCondition.PARAM_MIMETYPE);
-
-        // when
-        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(NOT_INVERTED, nodes, namespaceService);
-
-        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, PARAMETER_DEFAULT);
-        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, CompareMimeTypeEvaluator.NAME, expectedParameterValues);
-        assertThat(actualActionCondition)
-            .isNotNull().usingRecursiveComparison().ignoringFields("id")
-            .isEqualTo(expectedActionCondition);
-    }
-
-    @Test
-    public void testToServiceModel_hasAspect()
-    {
-        final QName audioAspect = QName.createQName(NamespaceService.AUDIO_MODEL_1_0_URI, NamespaceService.AUDIO_MODEL_PREFIX);
-        final SimpleCondition simpleCondition = createSimpleCondition(HasAspectEvaluator.PARAM_ASPECT, audioAspect.toPrefixString(namespaceService));
-
-        // when
-        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(NOT_INVERTED, nodes, namespaceService);
-
-        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
-        expectedParameterValues.put(HasAspectEvaluator.PARAM_ASPECT, audioAspect);
-        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, HasAspectEvaluator.NAME, expectedParameterValues);
-        assertThat(actualActionCondition)
-            .isNotNull().usingRecursiveComparison().ignoringFields("id", "parameterValues.aspect.prefix")
-            .isEqualTo(expectedActionCondition);
-    }
-
-    @Test
-    public void testToServiceModel_hasTag()
-    {
-        final String tag = "some tag";
-        final SimpleCondition simpleCondition = createSimpleCondition(HasTagEvaluator.PARAM_TAG, tag);
-
-        // when
-        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(NOT_INVERTED, nodes, namespaceService);
-
-        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
-        expectedParameterValues.put(HasTagEvaluator.PARAM_TAG, tag);
-        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, HasTagEvaluator.NAME, expectedParameterValues);
-        assertThat(actualActionCondition)
-            .isNotNull().usingRecursiveComparison().ignoringFields("id")
-            .isEqualTo(expectedActionCondition);
-    }
-
-    @Test
-    public void testToServiceModel_inCategory()
-    {
-        final SimpleCondition simpleCondition = createSimpleCondition(SimpleCondition.PARAM_CATEGORY);
-        final NodeRef defaultNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARAMETER_DEFAULT);
-        given(nodes.validateOrLookupNode(PARAMETER_DEFAULT, null)).willReturn(defaultNodeRef);
-
-        // when
-        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(NOT_INVERTED, nodes, namespaceService);
-
-        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
-        expectedParameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, ContentModel.ASPECT_GEN_CLASSIFIABLE);
-        expectedParameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, defaultNodeRef);
-        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, InCategoryEvaluator.NAME, expectedParameterValues);
-        assertThat(actualActionCondition)
-            .isNotNull().usingRecursiveComparison().ignoringFields("id")
-            .isEqualTo(expectedActionCondition);
-    }
-
-    @Test
-    public void testToServiceModel_isSubType()
-    {
-        final SimpleCondition simpleCondition = createSimpleCondition(IsSubTypeEvaluator.PARAM_TYPE, ContentModel.TYPE_FOLDER.toPrefixString(namespaceService));
-
-        // when
-        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(NOT_INVERTED, nodes, namespaceService);
-
-        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
-        expectedParameterValues.put(IsSubTypeEvaluator.PARAM_TYPE, ContentModel.TYPE_FOLDER);
-        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, IsSubTypeEvaluator.NAME, expectedParameterValues);
-        assertThat(actualActionCondition)
-            .isNotNull().usingRecursiveComparison().ignoringFields("id", "parameterValues.type.prefix")
-            .isEqualTo(expectedActionCondition);
+        assertThat(actualActionCondition).isEqualTo(actionCondition);
     }
 
     @Test
     public void testToServiceModel_inverted()
     {
-        final SimpleCondition simpleCondition = createSimpleCondition(ContentModel.PROP_DESCRIPTION.toPrefixString(namespaceService));
+        final SimpleCondition simpleCondition = createSimpleCondition("field");
+        final ActionCondition actionCondition = createActionCondition(ComparePropertyValueEvaluator.NAME);
+        given(simpleConditionMapperMock.toServiceModel(simpleCondition)).willReturn(actionCondition);
 
         // when
-        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(!NOT_INVERTED, nodes, namespaceService);
+        final ActionCondition actualActionCondition = simpleCondition.toServiceModel(INVERTED, simpleConditionMapperMock);
 
-        final Map<String, Serializable> expectedParameterValues = new HashMap<>();
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.PROP_DESCRIPTION);
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, ComparePropertyValueOperation.EQUALS.toString());
-        expectedParameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, PARAMETER_DEFAULT);
-        final ActionCondition expectedActionCondition = new ActionConditionImpl(null, ComparePropertyValueEvaluator.NAME, expectedParameterValues);
-        expectedActionCondition.setInvertCondition(!NOT_INVERTED);
-        assertThat(actualActionCondition)
-            .isNotNull().usingRecursiveComparison().ignoringFields("id", "parameterValues.property.prefix")
-            .isEqualTo(expectedActionCondition);
+        assertThat(actualActionCondition).isEqualTo(actionCondition);
+    }
+
+    private static ActionCondition createActionCondition(final String actionDefinitionName)
+    {
+        return new ActionConditionImpl("fake-id", actionDefinitionName, Map.of(KEY, VALUE));
     }
 
     private static SimpleCondition createSimpleCondition(final String field)
     {
-        return createSimpleCondition(field, PARAMETER_DEFAULT);
+        return createSimpleCondition(field, VALUE);
     }
 
     private static SimpleCondition createSimpleCondition(final String field, final String parameter)
@@ -364,46 +166,4 @@ public class SimpleConditionTest
             .parameter(parameter)
             .create();
     }
-
-    private static ActionCondition createActionCondition(final String actionDefinitionName)
-    {
-        return new ActionConditionImpl("fake-id", actionDefinitionName, createParameterValues());
-    }
-
-    private static Map<String, Serializable> createParameterValues() {
-        final QName audioAspect = QName.createQName(NamespaceService.AUDIO_MODEL_1_0_URI, NamespaceService.AUDIO_MODEL_PREFIX);
-        final NodeRef defaultNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARAMETER_DEFAULT);
-        final Map<String, Serializable> parameterValues = new HashMap<>();
-        parameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, "content-property");
-        parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, ContentModel.TYPE_CONTENT);
-        parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, "operation");
-        parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, "value");
-        parameterValues.put(HasAspectEvaluator.PARAM_ASPECT, audioAspect);
-        parameterValues.put(HasTagEvaluator.PARAM_TAG, "tag");
-        parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, "category-aspect");
-        parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, defaultNodeRef);
-        parameterValues.put(IsSubTypeEvaluator.PARAM_TYPE, ContentModel.TYPE_FOLDER);
-
-        return parameterValues;
-    }
-
-    private static class TestData
-    {
-        String conditionDefinitionName;
-        boolean isNullResult;
-
-        public TestData(String conditionDefinitionName, boolean isNullResult)
-        {
-            this.conditionDefinitionName = conditionDefinitionName;
-            this.isNullResult = isNullResult;
-        }
-
-        public static TestData of(String conditionDefinitionName) {
-            return new TestData(conditionDefinitionName, false);
-        }
-
-        public static TestData of(String conditionDefinitionName, boolean isNullResult) {
-            return new TestData(conditionDefinitionName, isNullResult);
-        }
-    }
-}
+}

remote-api/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -177,6 +177,7 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
         assertEquals(1000L, entitlements.getMaxDocs().longValue());
         assertTrue(entitlements.getIsClusterEnabled());
         assertFalse(entitlements.getIsCryptodocEnabled());
+        assertFalse(entitlements.getIsCustomEmbeddedWorkflowEnabled());
 
         // Check status
         StatusInfo statusInfo = repositoryInfo.getStatus();
@@ -297,11 +298,13 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
         assertEquals(1000L, entitlements.getMaxDocs().longValue());
         assertTrue(entitlements.getIsClusterEnabled());
         assertFalse(entitlements.getIsCryptodocEnabled());
+        assertFalse(entitlements.getIsCustomEmbeddedWorkflowEnabled());
 
         // Override entitlements
         when(licenseDescriptorMock.getMaxDocs()).thenReturn(null);
         when(licenseDescriptorMock.isClusterEnabled()).thenReturn(false);
         when(licenseDescriptorMock.isCryptodocEnabled()).thenReturn(true);
+        when(licenseDescriptorMock.isCustomEmbeddedWorkflowEnabled()).thenReturn(true);
 
         response = get("discovery", null, 200);
 
@@ -319,6 +322,7 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
         assertNull(entitlements.getMaxDocs());
         assertFalse(entitlements.getIsClusterEnabled());
         assertTrue(entitlements.getIsCryptodocEnabled());
+        assertTrue(entitlements.getIsCustomEmbeddedWorkflowEnabled());
     }
 
     @Test

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.115</version>
+        <version>17.128-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -374,7 +374,7 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.3.0</version>
+            <version>6.3.1</version>
         </dependency>
 
         <!-- GData -->

repository/src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -25,7 +25,6 @@
  */
 package org.alfresco.repo.descriptor;
 
-import java.security.Principal;
 import java.util.Date;
 import java.util.Properties;
 
@@ -125,6 +124,15 @@ public class DescriptorStartupLog extends AbstractLifecycleBean
             {
                  msg += ", NO CLUSTER";
             }
+
+            if(license.isCustomEmbeddedWorkflowEnabled())
+            {
+                msg += ", customEmbeddedWorkflow:enabled";
+            }
+            else
+            {
+                msg += ", NO CUSTOM EMBEDDED WORKFLOW";
+            }
             
             String holder = license.getHolderOrganisation();
             if (holder != null)

repository/src/main/java/org/alfresco/repo/rule/RuleServiceImpl.java

@@ -25,14 +25,19 @@
  */
 package org.alfresco.repo.rule;
 
+import static org.alfresco.model.ContentModel.ASSOC_CONTAINS;
 import static org.alfresco.repo.rule.RuleModel.ASPECT_IGNORE_INHERITED_RULES;
 import static org.alfresco.repo.rule.RuleModel.ASSOC_RULE_FOLDER;
+import static org.alfresco.service.cmr.security.AccessStatus.ALLOWED;
+import static org.alfresco.service.namespace.RegexQNamePattern.MATCH_ALL;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -70,7 +75,6 @@ import org.alfresco.service.cmr.rule.Rule;
 import org.alfresco.service.cmr.rule.RuleService;
 import org.alfresco.service.cmr.rule.RuleServiceException;
 import org.alfresco.service.cmr.rule.RuleType;
-import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNamePattern;
@@ -520,7 +524,7 @@ public class RuleServiceImpl
             // https://issues.alfresco.com/browse/ETWOTWO-438
             
         if (!runtimeNodeService.hasAspect(nodeRef, RuleModel.ASPECT_RULES) ||
-            permissionService.hasPermission(nodeRef, PermissionService.READ) != AccessStatus.ALLOWED)
+            permissionService.hasPermission(nodeRef, PermissionService.READ) != ALLOWED)
         {
             // Doesn't have the aspect or the user doesn't have access
             return Collections.emptyList();
@@ -538,7 +542,7 @@ public class RuleServiceImpl
         {
             // Get the rules for this node
             List<ChildAssociationRef> ruleChildAssocRefs = 
-                this.runtimeNodeService.getChildAssocs(ruleFolder, RegexQNamePattern.MATCH_ALL, ASSOC_NAME_RULES_REGEX);
+                this.runtimeNodeService.getChildAssocs(ruleFolder, MATCH_ALL, ASSOC_NAME_RULES_REGEX);
             for (ChildAssociationRef ruleChildAssocRef : ruleChildAssocRefs)
             {
                 // Create the rule and add to the list
@@ -567,7 +571,7 @@ public class RuleServiceImpl
                 {
                     // Get the rules for this node
                     List<ChildAssociationRef> ruleChildAssocRefs = 
-                        this.runtimeNodeService.getChildAssocs(ruleFolder, RegexQNamePattern.MATCH_ALL, ASSOC_NAME_RULES_REGEX);
+                        this.runtimeNodeService.getChildAssocs(ruleFolder, MATCH_ALL, ASSOC_NAME_RULES_REGEX);
                     
                     ruleCount = ruleChildAssocRefs.size();
                 }
@@ -647,6 +651,58 @@ public class RuleServiceImpl
         return returnList;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    @Experimental
+    public List<NodeRef> getFoldersInheritingRuleSet(NodeRef ruleSet, int maxFoldersToReturn)
+    {
+        // Seed stack with all folders owning or linking to the rule set.
+        Deque<NodeRef> stack = new LinkedList<>();
+        for (ChildAssociationRef parentAssociation : runtimeNodeService.getParentAssocs(ruleSet))
+        {
+            stack.add(parentAssociation.getParentRef());
+        }
+        // Process child folders to find all that inherit the rules.
+        List<NodeRef> inheritors = new ArrayList<>();
+        while (!stack.isEmpty() && inheritors.size() < maxFoldersToReturn)
+        {
+            NodeRef folder = stack.pop();
+            runtimeNodeService.getChildAssocs(folder, ASSOC_CONTAINS, MATCH_ALL).stream().map(ChildAssociationRef::getChildRef).forEach(childNode -> {
+                QName childType = runtimeNodeService.getType(childNode);
+                if (dictionaryService.isSubClass(childType, ContentModel.TYPE_FOLDER)
+                        && !runtimeNodeService.hasAspect(childNode, ASPECT_IGNORE_INHERITED_RULES))
+                {
+                    stack.add(childNode);
+                    // Only return nodes that the user has permission to view.
+                    if (permissionService.hasReadPermission(childNode) == ALLOWED)
+                    {
+                        inheritors.add(childNode);
+                        if (inheritors.size() == maxFoldersToReturn)
+                        {
+                            // Return once we've hit the limit.
+                            return;
+                        }
+                    }
+                }
+            });
+        }
+        return inheritors;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    @Experimental
+    public List<NodeRef> getFoldersLinkingToRuleSet(NodeRef ruleSet)
+    {
+        NodeRef parentRef = nodeService.getPrimaryParent(ruleSet).getParentRef();
+        return nodeService.getParentAssocs(ruleSet)
+                          .stream()
+                          .map(ChildAssociationRef::getParentRef)
+                          .filter(folder -> !folder.equals(parentRef))
+                          .filter(folder -> permissionService.hasReadPermission(folder) == ALLOWED)
+                          .collect(Collectors.toList());
+    }
+
     /**
      * Gets the inherited rules for a given node reference
      *
@@ -798,7 +854,7 @@ public class RuleServiceImpl
     {
         checkForLinkedRules(nodeRef);
         
-        if (this.permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) != AccessStatus.ALLOWED)
+        if (this.permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) != ALLOWED)
         {
             throw new RuleServiceException("Insufficient permissions to save a rule.");
         }
@@ -823,7 +879,7 @@ public class RuleServiceImpl
                 // Create the action node
                 ruleNodeRef = this.nodeService.createNode(
                         getSavedRuleFolderRef(nodeRef),
-                        ContentModel.ASSOC_CONTAINS,
+                        ASSOC_CONTAINS,
                         QName.createQName(RuleModel.RULE_MODEL_URI, ASSOC_NAME_RULES_PREFIX + GUID.generate()),
                         RuleModel.TYPE_RULE).getChildRef();
 
@@ -866,7 +922,7 @@ public class RuleServiceImpl
         NodeRef ruleFolder = getSavedRuleFolderRef(nodeRef);
         if (ruleFolder != null)
         {
-            List<ChildAssociationRef> assocs = this.runtimeNodeService.getChildAssocs(ruleFolder, RegexQNamePattern.MATCH_ALL, ASSOC_NAME_RULES_REGEX);
+            List<ChildAssociationRef> assocs = this.runtimeNodeService.getChildAssocs(ruleFolder, MATCH_ALL, ASSOC_NAME_RULES_REGEX);
             List<ChildAssociationRef> orderedAssocs = new ArrayList<ChildAssociationRef>(assocs.size());
             ChildAssociationRef movedAssoc = null;
             for (ChildAssociationRef assoc : assocs)
@@ -948,7 +1004,7 @@ public class RuleServiceImpl
     {
         checkForLinkedRules(nodeRef);
         
-        if (permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED)
+        if (permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == ALLOWED)
         {
             if (nodeService.exists(nodeRef) && nodeService.hasAspect(nodeRef, RuleModel.ASPECT_RULES))
             {
@@ -1011,7 +1067,7 @@ public class RuleServiceImpl
     {
         checkForLinkedRules(nodeRef);
         
-        if (this.permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED)
+        if (this.permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == ALLOWED)
         {
             if (this.nodeService.exists(nodeRef) == true && 
                 this.nodeService.hasAspect(nodeRef, RuleModel.ASPECT_RULES) == true)
@@ -1021,7 +1077,7 @@ public class RuleServiceImpl
                 {
                     List<ChildAssociationRef> ruleChildAssocs = this.nodeService.getChildAssocs(
                                                                                 folder, 
-                                                                                RegexQNamePattern.MATCH_ALL, ASSOC_NAME_RULES_REGEX);
+                                                                                MATCH_ALL, ASSOC_NAME_RULES_REGEX);
                     for (ChildAssociationRef ruleChildAssoc : ruleChildAssocs)
                     {
                         this.nodeService.removeChild(folder, ruleChildAssoc.getChildRef());
@@ -1371,7 +1427,7 @@ public class RuleServiceImpl
     {
         boolean result = true;
         if (this.nodeService.exists(actionedUponNodeRef)
-                && this.permissionService.hasPermission(actionedUponNodeRef, PermissionService.READ).equals(AccessStatus.ALLOWED))
+                && this.permissionService.hasPermission(actionedUponNodeRef, PermissionService.READ).equals(ALLOWED))
         {
             NodeRef copiedFrom = copyService.getOriginal(actionedUponNodeRef);
             if (logger.isDebugEnabled() == true)

repository/src/main/java/org/alfresco/service/cmr/rule/RuleService.java

@@ -227,6 +227,28 @@ public interface RuleService
     @Experimental
     List<NodeRef> getNodesSupplyingRuleSets(NodeRef nodeRef);
 
+    /**
+     * Get a list of folders inheriting the specified rule set.
+     *
+     * @param ruleSet The rule set node.
+     * @param maxFoldersToReturn A limit on the number of folders to return (since otherwise this could traverse a very large proportion of
+     * the repository).
+     * @return The list of the inheriting folders.
+     */
+    @Auditable (parameters = { "ruleSet", "maxFoldersToReturn" })
+    @Experimental
+    List<NodeRef> getFoldersInheritingRuleSet(NodeRef ruleSet, int maxFoldersToReturn);
+
+    /**
+     * Get a list of folders linking to the specified rule set.
+     *
+     * @param ruleSet The rule set node.
+     * @return The list linking folders.
+     */
+    @Auditable (parameters = { "ruleSet" })
+    @Experimental
+    List<NodeRef> getFoldersLinkingToRuleSet(NodeRef ruleSet);
+
     /**
      * Get the rule given its node reference
      * 

repository/src/main/java/org/alfresco/service/license/LicenseDescriptor.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -139,6 +139,12 @@ public interface LicenseDescriptor
      * @return <code>true</code> if the license allows cryptodoc
      */
     boolean isCryptodocEnabled();
+
+    /**
+     * Does this license allow custom embedded workflows?
+     * @return <code>true</code> if the license allows custom embedded workflows
+     */
+    boolean isCustomEmbeddedWorkflowEnabled();
     
     /**
      * ATS Transformation Server Expiry Date

repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplUnitTest.java

@@ -25,17 +25,21 @@
  */
 package org.alfresco.repo.rule;
 
+import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 
 import static org.alfresco.model.ContentModel.ASSOC_CONTAINS;
 import static org.alfresco.model.ContentModel.ASSOC_MEMBER;
+import static org.alfresco.model.ContentModel.TYPE_CONTENT;
+import static org.alfresco.model.ContentModel.TYPE_FOLDER;
 import static org.alfresco.repo.rule.RuleModel.ASPECT_IGNORE_INHERITED_RULES;
 import static org.alfresco.repo.rule.RuleModel.ASSOC_ACTION;
 import static org.alfresco.repo.rule.RuleModel.ASSOC_RULE_FOLDER;
 import static org.alfresco.repo.rule.RuleModel.TYPE_RULE;
 import static org.alfresco.service.cmr.security.AccessStatus.ALLOWED;
 import static org.alfresco.service.cmr.security.AccessStatus.DENIED;
+import static org.alfresco.service.namespace.RegexQNamePattern.MATCH_ALL;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.Assert.assertEquals;
@@ -52,18 +56,19 @@ import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.io.Serializable;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
-import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.RuntimeActionService;
 import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionServiceException;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -98,6 +103,8 @@ public class RuleServiceImplUnitTest
     @Mock
     private RuntimeActionService runtimeActionService;
     @Mock
+    private DictionaryService dictionaryService;
+    @Mock
     private Rule mockRule;
     @Mock
     private Action mockAction;
@@ -106,6 +113,10 @@ public class RuleServiceImplUnitTest
     public void setUp()
     {
         openMocks(this);
+
+        when(dictionaryService.isSubClass(TYPE_FOLDER, TYPE_FOLDER)).thenReturn(true);
+        when(dictionaryService.isSubClass(TYPE_CONTENT, TYPE_FOLDER)).thenReturn(false);
+        when(permissionService.hasReadPermission(any())).thenReturn(ALLOWED);
     }
 
     @Test
@@ -220,7 +231,7 @@ public class RuleServiceImplUnitTest
     @Test
     public void testGetRuleSetNode_emptyAssociation()
     {
-        given(runtimeNodeService.getChildAssocs(any(), any(), any())).willReturn(Collections.emptyList());
+        given(runtimeNodeService.getChildAssocs(any(), any(), any())).willReturn(emptyList());
 
         // when
         final NodeRef actualNode = ruleService.getRuleSetNode(FOLDER_NODE);
@@ -264,7 +275,7 @@ public class RuleServiceImplUnitTest
     @Test
     public void testIsRuleSetAssociatedWithFolder_emptyAssociation()
     {
-        given(runtimeNodeService.getParentAssocs(any(), any(), any())).willReturn(Collections.emptyList());
+        given(runtimeNodeService.getParentAssocs(any(), any(), any())).willReturn(emptyList());
 
         // when
         boolean associated = ruleService.isRuleSetAssociatedWithFolder(RULE_SET_NODE, FOLDER_NODE);
@@ -343,7 +354,7 @@ public class RuleServiceImplUnitTest
     @Test
     public void testIsRuleAssociatedWithRuleSet_emptyAssociation()
     {
-        given(runtimeNodeService.getParentAssocs(any())).willReturn(Collections.emptyList());
+        given(runtimeNodeService.getParentAssocs(any())).willReturn(emptyList());
 
         // when
         boolean associated = ruleService.isRuleAssociatedWithRuleSet(RULE_NODE, RULE_SET_NODE);
@@ -456,7 +467,7 @@ public class RuleServiceImplUnitTest
     {
         Map<String, NodeRef> nodes = createParentChildHierarchy("A,B", "B,C", "C,D", "D,E");
         // Replace the B,C association with a user group membership association.
-        ChildAssociationRef memberAssoc = new ChildAssociationRef(ASSOC_MEMBER, nodes.get("B"), ContentModel.TYPE_FOLDER, nodes.get("C"));
+        ChildAssociationRef memberAssoc = new ChildAssociationRef(ASSOC_MEMBER, nodes.get("B"), TYPE_FOLDER, nodes.get("C"));
         given(runtimeNodeService.getParentAssocs(nodes.get("C"))).willReturn(List.of(memberAssoc));
 
         List<NodeRef> actual = ruleService.getNodesSupplyingRuleSets(nodes.get("E"));
@@ -570,10 +581,179 @@ public class RuleServiceImplUnitTest
                                                          .filter(assoc -> assoc.endsWith(nodeName))
                                                          .map(assoc -> assoc.split(",")[0])
                                                          .map(nodeRefMap::get)
-                                                         .map(parentRef -> new ChildAssociationRef(ASSOC_CONTAINS, parentRef, ContentModel.TYPE_FOLDER, nodeRef))
+                                                         .map(parentRef -> new ChildAssociationRef(ASSOC_CONTAINS, parentRef, TYPE_FOLDER, nodeRef))
                                                          .collect(toList());
             given(runtimeNodeService.getParentAssocs(nodeRef)).willReturn(parentAssocs);
         });
         return nodeRefMap;
     }
+
+    /** Check that getFoldersInheritingRuleSet returns a child folder. */
+    @Test
+    public void testGetFoldersInheritingRuleSet()
+    {
+        NodeRef parent = new NodeRef("parent://node/");
+        NodeRef ruleSetNode = new NodeRef("rule://set/");
+        ChildAssociationRef ruleSetAssociation = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getParentAssocs(ruleSetNode)).willReturn(List.of(ruleSetAssociation));
+        given(ruleSetAssociation.getParentRef()).willReturn(parent);
+        NodeRef child = new NodeRef("child://node/");
+        ChildAssociationRef childAssocMock = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getChildAssocs(parent, ASSOC_CONTAINS, MATCH_ALL)).willReturn(List.of(childAssocMock));
+        given(childAssocMock.getChildRef()).willReturn(child);
+        given(runtimeNodeService.getType(child)).willReturn(TYPE_FOLDER);
+
+        List<NodeRef> actual = ruleService.getFoldersInheritingRuleSet(ruleSetNode, 100);
+
+        assertEquals("Unexpected list of inheriting folders.", List.of(child), actual);
+    }
+
+    /** Check that getFoldersInheritingRuleSet omits a child folder if IGNORE_INHERITED_RULES is applied. */
+    @Test
+    public void testGetFoldersInheritingRuleSet_ignoreInheritedRules()
+    {
+        NodeRef parent = new NodeRef("parent://node/");
+        NodeRef ruleSetNode = new NodeRef("rule://set/");
+        ChildAssociationRef ruleSetAssociation = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getParentAssocs(ruleSetNode)).willReturn(List.of(ruleSetAssociation));
+        given(ruleSetAssociation.getParentRef()).willReturn(parent);
+        NodeRef child = new NodeRef("child://node/");
+        ChildAssociationRef childAssocMock = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getChildAssocs(parent, ASSOC_CONTAINS, MATCH_ALL)).willReturn(List.of(childAssocMock));
+        given(childAssocMock.getChildRef()).willReturn(child);
+        given(runtimeNodeService.getType(child)).willReturn(TYPE_FOLDER);
+        given(runtimeNodeService.hasAspect(child, ASPECT_IGNORE_INHERITED_RULES)).willReturn(true);
+
+        List<NodeRef> actual = ruleService.getFoldersInheritingRuleSet(ruleSetNode, 100);
+
+        assertEquals("Unexpected list of inheriting folders.", emptyList(), actual);
+    }
+
+    /** Check that getFoldersInheritingRuleSet only returns at most the requested number of folders. */
+    @Test
+    public void testGetFoldersExceedsLimit()
+    {
+        NodeRef root = new NodeRef("root://node/");
+        NodeRef ruleSetNode = new NodeRef("rule://set/");
+        ChildAssociationRef ruleSetAssociation = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getParentAssocs(ruleSetNode)).willReturn(List.of(ruleSetAssociation));
+        given(ruleSetAssociation.getParentRef()).willReturn(root);
+        // Create a chain of ancestors starting from the root that is 10 folders deep.
+        List<NodeRef> nodeChain = new ArrayList<>();
+        nodeChain.add(root);
+        IntStream.range(0, 10).forEach(index -> {
+            NodeRef parent = nodeChain.get(nodeChain.size() - 1);
+            NodeRef child = new NodeRef("chain://node/" + index);
+            nodeChain.add(child);
+            ChildAssociationRef childAssocMock = mock(ChildAssociationRef.class);
+            given(runtimeNodeService.getChildAssocs(parent, ASSOC_CONTAINS, MATCH_ALL)).willReturn(List.of(childAssocMock));
+            given(childAssocMock.getChildRef()).willReturn(child);
+            given(runtimeNodeService.getType(child)).willReturn(TYPE_FOLDER);
+        });
+
+        // Request at most 9 folders inheriting the rule.
+        List<NodeRef> actual = ruleService.getFoldersInheritingRuleSet(ruleSetNode, 9);
+
+        // Check we don't get the root node or the final descendant folder.
+        assertEquals("Unexpected list of inheriting folders.", nodeChain.subList(1, 10), actual);
+    }
+
+    /** Check that getFoldersInheritingRuleSet doesn't include documents. */
+    @Test
+    public void testGetFoldersInheritingRuleSet_ignoreFiles()
+    {
+        NodeRef parent = new NodeRef("parent://node/");
+        NodeRef ruleSetNode = new NodeRef("rule://set/");
+        ChildAssociationRef ruleSetAssociation = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getParentAssocs(ruleSetNode)).willReturn(List.of(ruleSetAssociation));
+        given(ruleSetAssociation.getParentRef()).willReturn(parent);
+        NodeRef childDocument = new NodeRef("child://document/");
+        ChildAssociationRef childAssocMock = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getChildAssocs(parent, ASSOC_CONTAINS, MATCH_ALL)).willReturn(List.of(childAssocMock));
+        given(childAssocMock.getChildRef()).willReturn(childDocument);
+        given(runtimeNodeService.getType(childDocument)).willReturn(TYPE_CONTENT);
+
+        List<NodeRef> actual = ruleService.getFoldersInheritingRuleSet(ruleSetNode, 100);
+
+        assertEquals("Unexpected list of inheriting folders.", emptyList(), actual);
+    }
+
+    /**
+     * Check that getFoldersInheritingRuleSet does not include folders that the user doesn't have access to.
+     * <p>
+     * This test uses a chain of three folders:
+     * <pre>
+     *     grandparent - owns the rule set
+     *     parent - user does not have read access
+     *     child - user _does_ have read access
+     * </pre>
+     */
+    @Test
+    public void testGetFoldersInheritingRuleSet_omitFoldersWithoutReadPermission()
+    {
+        NodeRef grandparent = new NodeRef("grandparent://node/");
+        NodeRef ruleSetNode = new NodeRef("rule://set/");
+        ChildAssociationRef ruleSetAssociation = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getParentAssocs(ruleSetNode)).willReturn(List.of(ruleSetAssociation));
+        given(ruleSetAssociation.getParentRef()).willReturn(grandparent);
+        NodeRef parent = new NodeRef("parent://node/");
+        ChildAssociationRef parentAssocMock = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getChildAssocs(grandparent, ASSOC_CONTAINS, MATCH_ALL)).willReturn(List.of(parentAssocMock));
+        given(parentAssocMock.getChildRef()).willReturn(parent);
+        given(runtimeNodeService.getType(parent)).willReturn(TYPE_FOLDER);
+        NodeRef child = new NodeRef("child://node/");
+        ChildAssociationRef childAssocMock = mock(ChildAssociationRef.class);
+        given(runtimeNodeService.getChildAssocs(grandparent, ASSOC_CONTAINS, MATCH_ALL)).willReturn(List.of(childAssocMock));
+        given(childAssocMock.getChildRef()).willReturn(child);
+        given(runtimeNodeService.getType(child)).willReturn(TYPE_FOLDER);
+
+        // The current user doesn't have permission to view the parent node.
+        given(permissionService.hasReadPermission(parent)).willReturn(DENIED);
+
+        List<NodeRef> actual = ruleService.getFoldersInheritingRuleSet(ruleSetNode, 100);
+
+        assertEquals("Unexpected list of inheriting folders.", List.of(child), actual);
+    }
+
+    /** Check that a linked folder can be retrieved from a rule set node. */
+    @Test
+    public void testGetFoldersLinkingToRuleSet()
+    {
+        NodeRef ruleSetNode = new NodeRef("rule://set/");
+        NodeRef owningFolder = new NodeRef("owning://folder/");
+        ChildAssociationRef owningAssocMock = mock(ChildAssociationRef.class);
+        given(owningAssocMock.getParentRef()).willReturn(owningFolder);
+        given(nodeService.getPrimaryParent(ruleSetNode)).willReturn(owningAssocMock);
+        // Simulate a folder linking to the rule set.
+        NodeRef linkingFolder = new NodeRef("linking://folder/");
+        ChildAssociationRef linkingAssocMock = mock(ChildAssociationRef.class);
+        given(linkingAssocMock.getParentRef()).willReturn(linkingFolder);
+        given(nodeService.getParentAssocs(ruleSetNode)).willReturn(List.of(owningAssocMock, linkingAssocMock));
+
+        List<NodeRef> linkingFolders = ruleService.getFoldersLinkingToRuleSet(ruleSetNode);
+
+        assertEquals("Unexpected list of linking folders.", List.of(linkingFolder), linkingFolders);
+    }
+
+    /** Check that permissions affect which linked folders are returned to the user. */
+    @Test
+    public void testGetFoldersLinkingToRuleSet_respectsPermissions()
+    {
+        NodeRef ruleSetNode = new NodeRef("rule://set/");
+        NodeRef owningFolder = new NodeRef("owning://folder/");
+        ChildAssociationRef owningAssocMock = mock(ChildAssociationRef.class);
+        given(owningAssocMock.getParentRef()).willReturn(owningFolder);
+        given(nodeService.getPrimaryParent(ruleSetNode)).willReturn(owningAssocMock);
+        // Simulate a folder linking to the rule set.
+        NodeRef linkingFolder = new NodeRef("linking://folder/");
+        ChildAssociationRef linkingAssocMock = mock(ChildAssociationRef.class);
+        given(linkingAssocMock.getParentRef()).willReturn(linkingFolder);
+        given(nodeService.getParentAssocs(ruleSetNode)).willReturn(List.of(owningAssocMock, linkingAssocMock));
+        // The currect user does not have permission to view the folder.
+        given(permissionService.hasReadPermission(linkingFolder)).willReturn(DENIED);
+
+        List<NodeRef> linkingFolders = ruleService.getFoldersLinkingToRuleSet(ruleSetNode);
+
+        assertEquals("Unexpected list of linking folders.", emptyList(), linkingFolders);
+    }
 }