Increase sleep to 4 minutes

.github/workflows/hackathon.yml

@@ -0,0 +1,11 @@
+name: Hackathon
+
+on:
+  push:
+
+jobs:
+  sleep:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: sleep 240

.travis.yml

@@ -53,7 +53,7 @@ jobs:
 
     - name: "Source Clear Scan (SCA)"
       stage: test
-      if: (branch = master OR branch =~ /release\/.*/) AND type != pull_request
+      if: branch = master OR branch =~ /release\/.*/
       # Run Veracode
       install: skip
       script: travis_wait 30 bash scripts/travis/source_clear.sh
@@ -264,7 +264,6 @@ 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\]/
@@ -273,7 +272,6 @@ 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\]/
@@ -282,7 +280,6 @@ 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\]/
@@ -291,7 +288,6 @@ 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\]/
@@ -300,7 +296,6 @@ 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\]/
@@ -309,7 +304,6 @@ 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\]/
@@ -318,7 +312,6 @@ 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\]/
@@ -327,7 +320,6 @@ 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\]/
@@ -336,7 +328,6 @@ 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.128</version>
+      <version>17.102-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.128</version>
+      <version>17.102-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.128</version>
+      <version>17.102-SNAPSHOT</version>
    </parent>
 
    <build>

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/LinksAPI.java

@@ -1,73 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * 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.v0;
-
-import org.alfresco.rest.core.v0.BaseAPI;
-import org.apache.http.HttpResponse;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.springframework.stereotype.Component;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.text.MessageFormat;
-import java.util.List;
-
-/**
- * Methods to make API requests using v0 API for Linking Records
- *
- * @author Kavit Shah
- * @since 3.2
- */
-@Component
-public class LinksAPI extends BaseAPI {
-
-    private static final String LINK_API = "{0}doclib/action/rm-link/site/rm/documentLibrary/{1}";
-
-    /**
-     * Creates the Link
-     *
-     * @param user The username of the user to use.
-     * @param password The password of the user.
-     * @param expectedStatusCode The expected return status code.
-     * @param sourcePath The Source of link the record. This should be in the format
-     * "{site}/{container}/{path}", "{site}/{container}", "{store_type}/{store_id}/{id}/{path}",
-     * "{store_type}/{store_id}/{id}" or "{store_type}/{store_id}".
-     * @param nodeRefs The Node that needs to be linked.
-     * @return The HTTP Response.
-     * @throws AssertionError If the API didn't return the expected status code.
-     */
-    public HttpResponse linkRecord(String user, String password, int expectedStatusCode, String sourcePath, List<String> nodeRefs) throws UnsupportedEncodingException {
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("nodeRefs", new JSONArray(nodeRefs));
-
-        return doSlingshotPostJsonRequest(user, password, expectedStatusCode, requestParams,
-            MessageFormat.format(LINK_API, "{0}", sourcePath));
-    }
-
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java

@@ -52,7 +52,7 @@ public class RecordCategoriesAPI extends BaseAPI
     private static final String RM_ACTIONS_API = "{0}rma/actions/ExecutionQueue";
     private static final String DISPOSITION_ACTIONS_API = "{0}node/{1}/dispositionschedule/dispositionactiondefinitions";
     private static final String DISPOSITION_SCHEDULE_API = "{0}node/{1}/dispositionschedule";
-    private static final String NEXT_DISPOSITION_ACTIONS_API = "{0}node/{1}/nextdispositionaction";
+
 
     /**
      * Creates a retention schedule for the category given as parameter
@@ -191,19 +191,4 @@ public class RecordCategoriesAPI extends BaseAPI
         retentionProperties.put(RETENTION_SCHEDULE.RETENTION_INSTRUCTIONS, instructions);
         return retentionProperties;
     }
-
-    /**
-     * Get the Next Disposition Action
-     *
-     * @param user
-     * @param password
-     * @param recordId
-     * @return the next disposition schedule action
-     */
-    public JSONObject getNextDispositionAction(String user, String password, String recordId)
-    {
-        String nodeRef = NODE_PREFIX + recordId;
-        JSONObject nextDispositionAction = doGetRequest(user, password, MessageFormat.format(NEXT_DISPOSITION_ACTIONS_API, "{0}", nodeRef));
-        return nextDispositionAction;
-    }
 }

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

@@ -72,7 +72,6 @@ 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;
 
@@ -260,7 +259,6 @@ 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,7 +61,6 @@ 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;
 
@@ -210,7 +209,6 @@ 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/DeclareInPlaceRecordsTestLevel2.java

@@ -1,311 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * 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.rm.community.records;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.rules.ActionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.RuleDefinition;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainer;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChildCollection;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.rest.v0.service.DispositionScheduleService;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import static java.util.Arrays.asList;
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.core.v0.BaseAPI.RM_SITE_ID;
-import static org.alfresco.rest.rm.community.base.TestData.DEFAULT_PASSWORD;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.CREATED_DATE;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_READ_RECORDS;
-import static org.alfresco.rest.rm.community.requests.gscore.api.FilesAPI.PARENT_ID_PARAM;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.http.HttpStatus.CREATED;
-
-public class DeclareInPlaceRecordsTestLevel2 extends BaseRMRestTest {
-    private final String TEST_PREFIX = generateTestPrefix(DeclareInPlaceRecordsTestLevel2.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    private final String RECORDS_CATEGORY_ONE = TEST_PREFIX + "category";
-    public static final String RECORD_FOLDER_ONE = "record-folder-one";
-    public static final String RECORD_CATEGORY_TWO = "record-category-two" + System.currentTimeMillis();
-    public static final String RECORD_FOLDER_TWO = "record-folder-two";
-    private final String RULE_NAME = TEST_PREFIX + "rule unfiled";
-    private String unfiledRecordsNodeRef;
-    private RecordCategory RecordCategoryOne, RecordCategoryTwo;
-    private RecordCategoryChild recordFolder;
-    private UnfiledContainer unfiledContainer;
-    private FolderModel testFolder;
-    private SiteModel testSite;
-    private SiteModel privateSite;
-    private UserModel testUser;
-    @Autowired
-    private DispositionScheduleService dispositionScheduleService;
-    @Autowired
-    private RulesAPI rulesAPI;
-    /**
-     * data prep services
-     */
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RecordsAPI recordsAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void preConditions() {
-        STEP("Create RM Site");
-        createRMSiteIfNotExists();
-        privateSite = dataSite.usingAdmin().createPrivateRandomSite();
-    }
-
-    /**
-     * Given that a user is the owner of a document
-     * And that user has been deleted
-     * When admin tries to declare the document as a record
-     * Then the document becomes an inplace record
-     */
-    @Test
-    @AlfrescoTest(jira="RM-2584")
-    public void DeclareRecordOwnerDeleted() throws Exception {
-
-        createTestPrecondition();
-
-        // Upload document in a folder in a collaboration site
-        FileModel uploadedDoc = dataContent.usingSite(testSite)
-            .usingUser(testUser)
-            .usingResource(testFolder)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        // delete the test user
-        dataUser.deleteUser(testUser);
-
-        // declare uploadedDocument as record
-        getRestAPIFactory().getFilesAPI(getDataUser().getAdminUser()).declareAsRecord(uploadedDoc.getNodeRefWithoutVersion());
-        assertStatusCode(CREATED);
-
-        // assert that the document is now a record
-        assertTrue(hasRecordAspect(uploadedDoc));
-    }
-    /**
-     * Given that a user is the owner of a document
-     * And that user declare the document as a record
-     * When admin files the record to a category that has a disposition schedule applied on records and a cut off step
-     * And admin completes the record so the pending record action is now Cut off
-     * Then user is still able to see the in place record in original share site location
-     */
-    @Test
-    @AlfrescoTest(jira="MNT-18558")
-    public void inPlaceRecordVisibilityAfterFilingToCategoryWithCutOffStep() throws Exception {
-
-        // create test precondition
-        createTestPrecondition(RECORDS_CATEGORY_ONE);
-
-        //create a disposition schedule on Records level with a cut off step
-        dispositionScheduleService.createCategoryRetentionSchedule(RECORDS_CATEGORY_ONE, true);
-        dispositionScheduleService.addCutOffAfterPeriodStep(RECORDS_CATEGORY_ONE, "day|2", CREATED_DATE);
-
-        //create a folder in category
-        recordFolder = createFolder(getAdminUser(),RecordCategoryOne.getId(),RECORD_FOLDER_ONE);
-
-        // create a File to record folder rule applied on Unfiled Records container
-        fileToRuleAppliedOnUnfiledRecords();
-
-        //create a new test user
-        UserModel testUser = createSiteManager();
-
-        // upload a new document as the user and declare the document as record
-        FileModel uploadedDoc = dataContent.usingSite(privateSite)
-            .usingUser(testUser)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        Record uploadedRecord = getRestAPIFactory().getFilesAPI(getDataUser().getAdminUser()).declareAsRecord(uploadedDoc.getNodeRefWithoutVersion());
-        assertStatusCode(CREATED);
-
-        //Complete the record as admin to be sure that pending action is now Cut off
-        recordsAPI.completeRecord(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), uploadedRecord.getName());
-
-        // As test user navigate to collaboration site documents library and check that the record is still visible
-        dataContent.usingAdmin().usingSite(privateSite).assertContentExist();
-    }
-    /**
-     * Create a user called test
-     * Create a collaboration site
-     * Add the user to the collaboration site as consumer
-     * Create an RM site
-     * In RM, create a new categories under file plan with a cut off step set after an event happens
-     * Under the previously created category create a folder
-     * Set READ-ONLY permission for test user for the folder previously created (the user does not have Read
-     * permissions to the category containing the folder)
-     * In the collaboration site create two files
-     * File as record the first file
-     * Log in with test user and check if he can still see the two files in the collaboration site
-     */
-    @Test
-    @AlfrescoTest (jira = "MNT-22138")
-    public void filesVisibilityAfterFilingToCategoryWithCutOffAfterEventStep() throws Exception {
-
-        //create a category
-        RecordCategoryTwo = createRootCategory(RECORD_CATEGORY_TWO);
-
-        //create a disposition schedule on Records level with a cut off step
-        dispositionScheduleService.createCategoryRetentionSchedule(RECORD_CATEGORY_TWO, true);
-        dispositionScheduleService.addCutOffAfterPeriodStep(RECORD_CATEGORY_TWO, "day|2", CREATED_DATE);
-
-        //create a folder in category
-        recordFolder = createFolder(getAdminUser(),RecordCategoryTwo.getId(),RECORD_FOLDER_TWO);
-
-        //create a new test user
-        UserModel siteConsumer = getDataUser().createRandomTestUser();
-        getDataUser().addUserToSite(siteConsumer,privateSite,UserRole.SiteConsumer);
-
-        // give read permissions to test user
-        getRestAPIFactory().getRMUserAPI().addUserPermission(recordFolder.getId(), siteConsumer, PERMISSION_READ_RECORDS);
-
-        // create two documents
-        FileModel testFile = dataContent.usingSite(new SiteModel(privateSite.getTitle()))
-            .usingAdmin()
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        FileModel testFileNotFiled = dataContent.usingSite(new SiteModel(privateSite.getTitle()))
-            .usingAdmin()
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        // file one of the documents as record
-        getRestAPIFactory().getFilesAPI()
-            .usingParams(String.format("%s=%s", PARENT_ID_PARAM, recordFolder.getId()))
-            .declareAsRecord(testFile.getNodeRefWithoutVersion());
-        getRestAPIFactory().getRmRestWrapper().assertStatusCodeIs(CREATED);
-
-        // As test user navigate to collaboration site documents library and check that both of the documents are
-        // visible
-        STEP("Verify the document in collaboration site is now a record");
-        Assert.assertTrue(hasRecordAspect(testFile), "File should have record aspect");
-        Assert.assertFalse(hasRecordAspect(testFileNotFiled), "File should not have record aspect");
-    }
-
-    private void createTestPrecondition(String categoryName) {
-
-    // create "rm admin" user if it does not exist and assign it to RM Administrator role
-    rmRolesAndActionsAPI.createUserAndAssignToRole(
-        getDataUser().usingAdmin().getAdminUser().getUsername(),
-        getDataUser().usingAdmin().getAdminUser().getPassword(),
-        RM_ADMIN, DEFAULT_PASSWORD, "Administrator");
-
-    // create category
-    STEP("Create category");
-    RecordCategoryOne = createRootCategory(categoryName,"Title");
-
-    unfiledContainer = getRestAPIFactory().getUnfiledContainersAPI().getUnfiledContainer(UNFILED_RECORDS_CONTAINER_ALIAS);
-
-    unfiledRecordsNodeRef = NODE_PREFIX + unfiledContainer.getId();
-    }
-    private void createTestPrecondition() {
-        STEP("Create collab_user user");
-        testUser = getDataUser().createRandomTestUser();
-        testSite = dataSite.usingAdmin().createPublicRandomSite();
-
-        // invite collab_user to Collaboration site with Contributor role
-        getDataUser().addUserToSite(testUser, testSite, UserRole.SiteContributor);
-
-        testFolder = dataContent.usingSite(testSite).usingUser(testUser).createFolder();
-    }
-    private void fileToRuleAppliedOnUnfiledRecords() {
-        unfiledRecordsRuleTeardown();
-
-        // create a rule
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title(RULE_NAME)
-            .description(RULE_NAME)
-            .createRecordPath(false)
-            .path("/" + RECORDS_CATEGORY_ONE + "/" + RECORD_FOLDER_ONE)
-            .runInBackground(true)
-            .actions(asList(ActionsOnRule.FILE_TO.getActionValue()));
-
-        // create a rule on unfiledRecords
-        rulesAPI.createRule(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), unfiledRecordsNodeRef, ruleDefinition);
-    }
-    private void unfiledRecordsRuleTeardown() {
-        rulesAPI.deleteAllRulesOnContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), unfiledRecordsNodeRef);
-    }
-    public UserModel createSiteManager() {
-        UserModel siteManager = getDataUser().createRandomTestUser();
-        getDataUser().addUserToSite(siteManager, privateSite, UserRole.SiteManager);
-        return siteManager;
-    }
-    @AfterClass
-    public void cleanupCategory() {
-        unfiledRecordsRuleTeardown();
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, RECORD_FOLDER_ONE);
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, RecordCategoryOne.getName());
-        deleteRecordCategory(RecordCategoryOne.getId());
-
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, RECORD_FOLDER_TWO);
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, RecordCategoryTwo.getName());
-        deleteRecordCategory(RecordCategoryTwo.getId());
-
-        dataSite.usingAdmin().deleteSite(privateSite);
-        dataSite.usingAdmin().deleteSite(testSite);
-
-        UnfiledContainerChildCollection unfiledContainerChildCollection = getRestAPIFactory()
-            .getUnfiledContainersAPI().getUnfiledContainerChildren(unfiledContainer.getId());
-
-        unfiledContainerChildCollection.getEntries().forEach(unfiledChild ->
-        {
-            if (unfiledChild.getEntry().getIsRecord())
-            {
-                getRestAPIFactory().getRecordsAPI().deleteRecord(unfiledChild.getEntry().getId());
-            }
-            else
-            {
-                getRestAPIFactory().getUnfiledRecordFoldersAPI().deleteUnfiledRecordFolder(unfiledChild.getEntry().getId());
-            }
-        });
-    }
-}

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

@@ -75,7 +75,6 @@ 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;
 
 /**
@@ -103,7 +102,7 @@ public class DeleteRecordTests extends BaseRMRestTest
         testSite = dataSite.usingAdmin().createPublicRandomSite();
         recordFolder = createCategoryFolderInFilePlan();
         unfiledRecordFolder = createUnfiledContainerChild(UNFILED_RECORDS_CONTAINER_ALIAS, getRandomName("Unfiled Folder "),
-            UNFILED_RECORD_FOLDER_TYPE);
+                UNFILED_RECORD_FOLDER_TYPE);
     }
 
     /** Data provider with electronic and non-electronic records to be deleted */
@@ -134,10 +133,10 @@ public class DeleteRecordTests extends BaseRMRestTest
      * </pre>
      */
     @Test
-        (
-            dataProvider = "recordsToBeDeleted",
-            description = "Admin user can delete records"
-        )
+    (
+        dataProvider = "recordsToBeDeleted",
+        description = "Admin user can delete records"
+    )
     @AlfrescoTest(jira="RM-4363")
     public void adminCanDeleteRecords(String recordId)
     {
@@ -155,17 +154,17 @@ public class DeleteRecordTests extends BaseRMRestTest
      * </pre>
      */
     @Test
-        (
-            description = "User without write permissions can't delete a record"
-        )
+    (
+        description = "User without write permissions can't delete a record"
+    )
     @AlfrescoTest(jira="RM-4363")
     public void userWithoutWritePermissionsCantDeleteRecord()
     {
         // Create a non-electronic record in unfiled records
         UnfiledContainerChild nonElectronicRecord = UnfiledContainerChild.builder()
-            .name("Record " + RandomData.getRandomAlphanumeric())
-            .nodeType(NON_ELECTRONIC_RECORD_TYPE)
-            .build();
+                .name("Record " + RandomData.getRandomAlphanumeric())
+                .nodeType(NON_ELECTRONIC_RECORD_TYPE)
+                .build();
         UnfiledContainerChild newRecord = getRestAPIFactory().getUnfiledContainersAPI().createUnfiledContainerChild(nonElectronicRecord, UNFILED_RECORDS_CONTAINER_ALIAS);
 
         assertStatusCode(CREATED);
@@ -188,9 +187,9 @@ public class DeleteRecordTests extends BaseRMRestTest
      * </pre>
      */
     @Test
-        (
-            description = "User without delete records capability can't delete a record"
-        )
+    (
+        description = "User without delete records capability can't delete a record"
+    )
     @AlfrescoTest(jira="RM-4363")
     public void userWithoutDeleteRecordsCapabilityCantDeleteRecord()
     {
@@ -235,7 +234,7 @@ public class DeleteRecordTests extends BaseRMRestTest
 
         STEP("Create a record in first folder and copy it into second folder.");
         String recordId = getRestAPIFactory().getRecordFolderAPI()
-            .createRecord(createElectronicRecordModel(), recordFolder.getId(), getFile(IMAGE_FILE)).getId();
+                    .createRecord(createElectronicRecordModel(), recordFolder.getId(), getFile(IMAGE_FILE)).getId();
         String copyId = copyNode(recordId, recordFolderB.getId()).getId();
         assertStatusCode(CREATED);
 
@@ -292,7 +291,6 @@ 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()
     {
@@ -325,9 +323,9 @@ public class DeleteRecordTests extends BaseRMRestTest
 
         STEP("Execute the disposition schedule steps.");
         rmRolesAndActionsAPI.executeAction(getAdminUser().getUsername(), getAdminUser().getUsername(), recordFiled.getName(),
-            RM_ACTIONS.CUT_OFF);
+                RM_ACTIONS.CUT_OFF);
         rmRolesAndActionsAPI.executeAction(getAdminUser().getUsername(), getAdminUser().getUsername(), recordFiled.getName(),
-            RM_ACTIONS.DESTROY);
+                RM_ACTIONS.DESTROY);
 
         STEP("Check that it's possible to load the copy content.");
         getNodeContent(copy.getId());
@@ -350,14 +348,14 @@ public class DeleteRecordTests extends BaseRMRestTest
 
         STEP("Declare file version as record.");
         recordsAPI.declareDocumentVersionAsRecord(getAdminUser().getUsername(), getAdminUser().getPassword(), testSite.getId(),
-            testFile.getName());
+                testFile.getName());
         UnfiledContainerChild unfiledContainerChild = getRestAPIFactory().getUnfiledContainersAPI()
-            .getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS)
-            .getEntries().stream()
-            .filter(child -> child.getEntry().getName()
-                .startsWith(testFile.getName().substring(0, testFile.getName().indexOf("."))))
-            .findFirst()
-            .get().getEntry();
+                                                                       .getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS)
+                                                                       .getEntries().stream()
+                                                                       .filter(child -> child.getEntry().getName()
+                                                                                             .startsWith(testFile.getName().substring(0, testFile.getName().indexOf("."))))
+                                                                       .findFirst()
+                                                                       .get().getEntry();
 
         STEP("Delete the record.");
         deleteAndVerify(unfiledContainerChild.getId());

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

@@ -1,128 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * 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.rm.community.records;
-
-import org.alfresco.dataprep.ContentService;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.apache.commons.httpclient.HttpStatus;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-import static org.alfresco.rest.core.v0.BaseAPI.RM_SITE_ID;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertFalse;
-
-/**
- * Tests to cover share action for records
- * @author Kavit Shah
- */
-public class ShareRecordsTest extends BaseRMRestTest {
-
-    /** data prep services*/
-    @Autowired
-    private RecordsAPI service;
-    @Autowired
-    private ContentService contentService;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    /** Constants*/
-    private final String TEST_PREFIX = generateTestPrefix(ShareRecordsTest.class);
-    private final String CATEGORY = "CategoryWithSharedRecords" + TEST_PREFIX;
-    private final String FOLDER = "FolderWithSharedRecords" + TEST_PREFIX;
-    private final String ELECTRONIC_RECORD = "ELECTRONIC_RECORD" + TEST_PREFIX;
-    private final String NONELECTRONIC_REC = "NON_ELECTRONIC_RECORD" + TEST_PREFIX;
-    private RecordCategory category;
-    private RecordCategoryChild recordCategoryChild;
-    /**
-     * Given a record
-     * When admin tries to share it via API
-     * Then the record can't be shared
-     */
-    @Test
-    @AlfrescoTest(jira = "RM-5308")
-    public void shareRecordViaApi()
-    {
-        //create RM Site
-        createRMSiteIfNotExists();
-
-        //create a category
-        category = createRootCategory(CATEGORY);
-
-        //create folder
-        recordCategoryChild = createFolder(category.getId(),FOLDER);
-
-        createNonElectronicRecord(recordCategoryChild.getId(),NONELECTRONIC_REC);
-
-        // create record to be shared
-        createElectronicRecord(recordCategoryChild.getId(),ELECTRONIC_RECORD);
-
-        //get the node id for the ELECTRONIC_RECORD created
-        String nodeRefRec1= contentService.getNodeRefByPath(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            "/Sites/" + RM_SITE_ID + "/documentLibrary/" + CATEGORY + "/" + FOLDER + "/" + service.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), FOLDER, ELECTRONIC_RECORD));
-        //check record can't be shared
-        assertFalse("The record has been succesfully shared",
-            service.shareDocument(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(),nodeRefRec1 ).getKey());
-        //check the error code when trying to share a record
-        assertEquals("The API response code is not " + HttpStatus.SC_INTERNAL_SERVER_ERROR, service.shareDocument(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), nodeRefRec1).getValue(),
-            String.valueOf( HttpStatus.SC_INTERNAL_SERVER_ERROR));
-
-        //get the node id for NONELECTRONIC_REC created
-        String nodeRefRec2 = contentService.getNodeRefByPath(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            "/Sites/" + RM_SITE_ID + "/documentLibrary/" + CATEGORY + "/" + FOLDER + "/" + service.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), FOLDER, NONELECTRONIC_REC));
-        //check record can't be shared
-        assertFalse("The record has been succesfully shared",
-            service.shareDocument(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), nodeRefRec2).getKey());
-        //check the error code when trying to share a record
-        assertEquals("The API response code is not " + HttpStatus.SC_INTERNAL_SERVER_ERROR, service.shareDocument(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), nodeRefRec2).getValue(),
-            String.valueOf(HttpStatus.SC_INTERNAL_SERVER_ERROR));
-    }
-
-    @AfterClass
-    public void cleanupCategory() {
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, recordCategoryChild.getName());
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, category.getName());
-        deleteRecordCategory(category.getId());
-    }
-}

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

@@ -1,121 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * 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.rm.community.smoke;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordFoldersAPI;
-import org.alfresco.rest.v0.service.DispositionScheduleService;
-import org.alfresco.test.AlfrescoTest;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.CREATED_DATE;
-import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.CUT_OFF_DATE;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.createBodyForMoveCopy;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.toContentModel;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.OK;
-import static org.testng.AssertJUnit.assertNotNull;
-
-
-public class DestroyRecordFolderActionsTest extends BaseRMRestTest {
-
-    private RecordCategory Category1,CATEGORY_TO_MOVE;
-    @Autowired
-    private DispositionScheduleService dispositionScheduleService;
-    @Autowired
-    private RecordFoldersAPI recordFoldersAPI;
-    private final String TEST_PREFIX = generateTestPrefix(DestroyRecordFolderActionsTest.class);
-    private final String folderDisposition = TEST_PREFIX + "RM-2937 folder ghosting";
-
-
-    @BeforeClass(alwaysRun = true)
-    private void setUp(){
-
-        STEP("Create the RM site if doesn't exist");
-        createRMSiteIfNotExists();
-
-        STEP("Create two record category");
-        Category1 = createRootCategory(getRandomName("Category1"));
-        CATEGORY_TO_MOVE = createRootCategory(getRandomName("CATEGORY_TO_MOVE"));
-
-        //create retention schedule
-        dispositionScheduleService.createCategoryRetentionSchedule(Category1.getName(), false);
-
-        // add cut off step
-        dispositionScheduleService.addCutOffAfterPeriodStep(Category1.getName(), "day|2", CREATED_DATE);
-
-        // add destroy step with ghosting
-        dispositionScheduleService.addDestroyWithGhostingImmediatelyAfterCutOff(Category1.getName());
-
-    }
-
-    @Test
-    @AlfrescoTest (jira = "RM-1621")
-    public void moveOnCutOffDestroyFolders() throws Exception {
-
-        //create folders
-        RecordCategoryChild FOLDER_DESTROY = createFolder(getAdminUser(),Category1.getId(),folderDisposition);
-
-        // edit disposition date
-        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),FOLDER_DESTROY.getName());
-
-        // cut off the FOLDER_DESTROY
-        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),FOLDER_DESTROY.getName());
-
-
-        // Destroy the FOLDER_DESTROY
-        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","destroy"),FOLDER_DESTROY.getName());
-
-
-       //Move the FOLDER_DESTROY within the CATEGORY_TO_MOVE.");
-        getRestAPIFactory().getNodeAPI(toContentModel(FOLDER_DESTROY.getId())).move(createBodyForMoveCopy(CATEGORY_TO_MOVE.getId()));
-        assertStatusCode(OK);
-
-    }
-
-    @AfterMethod(alwaysRun = true)
-    private  void deletePreconditions() {
-
-            deleteRecordCategory(Category1.getId());
-            deleteRecordCategory(CATEGORY_TO_MOVE.getId());
-
-        }
-
-    }

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

@@ -1,430 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * 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.rm.community.smoke;
-
-import org.alfresco.rest.core.v0.RMEvents;
-import org.alfresco.rest.model.RestNodeBodyMoveCopyModel;
-import org.alfresco.rest.model.RestNodeModel;
-import org.alfresco.rest.requests.Node;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.fileplan.FilePlan;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.v0.LinksAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordFoldersAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.rest.v0.service.DispositionScheduleService;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.model.RepoTestModel;
-import org.alfresco.utility.model.UserModel;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.util.EntityUtils;
-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;
-import java.io.UnsupportedEncodingException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_REF_WORKSPACE_SPACES_STORE;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.CUT_OFF_ASPECT;
-import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.*;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.http.HttpStatus.NO_CONTENT;
-
-public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private DispositionScheduleService dispositionScheduleService;
-    @Autowired
-    private LinksAPI linksAPI;
-    @Autowired
-    private RecordsAPI recordsAPI;
-    @Autowired
-    private RecordFoldersAPI recordFoldersAPI;
-    private final static  String TEST_PREFIX = generateTestPrefix(DispositionScheduleLinkedRecordsTest.class);
-    private RecordCategory Category1,catsameLevel1,catsameLevel2;
-    private RecordCategoryChild CopyCatFolder,folder1,CatFolder,folder2;
-    private static final String categoryRM3077 = TEST_PREFIX + "RM-3077_manager_sees_me";
-    private static final String copyCategoryRM3077 = "Copy_of_" + categoryRM3077;
-    private static final String folderRM3077 = "RM-3077_folder_"+ categoryRM3077;
-    private static final String copyFolderRM3077 = "Copy_of_" + folderRM3077;
-    private final String electronicRecord = "RM-2937 electronic 2 record";
-    private final String folder = TEST_PREFIX + "RM-2937 folder ghosting";
-    private static final String categoryRecordsRM2526 = TEST_PREFIX + "RM-2526_category_records_immediately";
-    private static final String category2RecordsRM2526 = TEST_PREFIX + "RM-2526_category_2_records_1_day";
-    private static final String firstCategoryRM3060 = TEST_PREFIX + "RM-3060_category_record";
-    private static final String secondCategoryRM3060 = "Copy_of_" + firstCategoryRM3060;
-    private static final String firstFolderRM3060 = TEST_PREFIX + "RM-3060_folder";
-    private static final String secondFolderRM3060 = TEST_PREFIX + "RM-3060_disposition_on_Record_Level";
-    private static final String electronicRecordRM3060 = TEST_PREFIX + "RM-3060_electronic_1_record";
-    private static final String nonElectronicRecordRM3060 = TEST_PREFIX + "RM-3060_non-electronic_record";
-    private static final String TRANSFER_LOCATION = TEST_PREFIX + "RM-3060_transferred_records";
-    public static final String TRANSFER_TYPE = "rma:transferred";
-    private FilePlan filePlanModel;
-    private UserModel rmAdmin, rmManager;
-    @BeforeClass(alwaysRun = true)
-    public void setupDispositionScheduleLinkedRecordsTest() {
-        createRMSiteIfNotExists();
-        //get file plan
-        filePlanModel = getRestAPIFactory().getFilePlansAPI().getFilePlan(FILE_PLAN_ALIAS);
-
-        // create "rm admin" user if it does not exist and assign it to RM Administrator role
-        rmAdmin = getDataUser().createRandomTestUser();
-        rmRolesAndActionsAPI.assignRoleToUser(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),rmAdmin.getUsername(),
-            UserRoles.ROLE_RM_ADMIN.roleId);
-
-        // create "rm Manager" user if it does not exist and assign it to RM Administrator role
-        rmManager = getDataUser().createRandomTestUser();
-        rmRolesAndActionsAPI.assignRoleToUser(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),rmManager.getUsername(),
-            UserRoles.ROLE_RM_MANAGER.roleId);
-    }
-    /**
-     * Disposition Schedule on Record Folder with linked records test
-     * <p>
-     * Precondition:
-     * <p>
-     * Create rm_manager user that would have RM Managers role, rm_admin that would have RM Administrator role.
-     * Log in with admin user, create a category "manager sees me", give rm_manager read&file permission over it.
-     * Create a disposition schedule for it that would cut off folders after 1 day from created date. Copy the category.
-     * <p>
-     * <p/> TestRail Test C775<p/>
-     **/
-    @Test
-    @Ignore
-    @AlfrescoTest(jira = "RM-1622")
-    public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
-        STEP("Create record category");
-        Category1 = createRootCategory(categoryRM3077);
-
-        //create retention schedule
-        dispositionScheduleService.createCategoryRetentionSchedule(Category1.getName(), false);
-
-        // add cut off step
-        dispositionScheduleService.addCutOffAfterPeriodStep(Category1.getName(), "day|2", CREATED_DATE);
-
-        //create a copy of the category recordsCategory
-        String CopyCategoryId = copyCategory(getAdminUser(),Category1.getId(), copyCategoryRM3077);
-
-        // create folders in both categories
-        CatFolder = createRecordFolder(Category1.getId(), folderRM3077);
-        CopyCatFolder = createRecordFolder(CopyCategoryId, copyFolderRM3077);
-
-        // create record  files
-        String electronicRecord = "RM-2801 electronic record";
-        Record elRecord = createElectronicRecord(CatFolder.getId(), electronicRecord);
-        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), CatFolder.getName(), electronicRecord);
-
-        String nonElectronicRecord = "RM-2801 non-electronic record";
-        Record nonElRecord = createNonElectronicRecord(CatFolder.getId(), nonElectronicRecord);
-        String nonElRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), CatFolder.getName(), nonElectronicRecord);
-
-        // link the records to copy folder, then complete them
-        List<String> recordLists = new ArrayList<>();
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + elRecord.getId());
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + nonElRecord.getId());
-
-        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,copyCategoryRM3077 + "/" +
-                copyFolderRM3077, recordLists);
-        recordsAPI.completeRecord(rmAdmin.getUsername(), rmAdmin.getPassword(), elRecordFullName);
-        recordsAPI.completeRecord(rmAdmin.getUsername(), rmAdmin.getPassword(), nonElRecordFullName);
-
-        // edit disposition date
-        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),CatFolder.getName());
-
-        // cut off the Folder
-        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),CatFolder.getName());
-
-        // Verify the Content
-        Node electronicNode = getNode(elRecord.getId());
-        assertTrue("The content of " + electronicRecord + " is available",
-            StringUtils.isEmpty(electronicNode.getNodeContent().getResponse().getBody().asString()));
-
-        // verify the Properties
-        AssertJUnit.assertNull("The properties are present even after cutting off the record.", elRecord.getProperties().getTitle());
-
-        // delete precondition
-        deleteRecordCategory(Category1.getId());
-        deleteRecordCategory(CopyCategoryId);
-    }
-    /**
-     * Test covering RM-3060
-     * Check the disposition steps for a record can be executed
-     * When the record is linked to a folder with the same disposition schedule
-     * */
-    @Test
-    @Ignore
-    @AlfrescoTest (jira = "RM-3060")
-    public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
-
-        // create a category with retention applied on records level
-        RecordCategory recordCategory = getRestAPIFactory().getFilePlansAPI(rmAdmin)
-            .createRootRecordCategory(RecordCategory.builder().name(firstCategoryRM3060).build(),
-                RecordCategory.DEFAULT_FILE_PLAN_ALIAS);
-        dispositionScheduleService.createCategoryRetentionSchedule(firstCategoryRM3060, true);
-        dispositionScheduleService.addCutOffAfterPeriodStep(firstCategoryRM3060, "week|1", DATE_FILED);
-        dispositionScheduleService.addTransferAfterEventStep(firstCategoryRM3060, TRANSFER_LOCATION, RMEvents.CASE_CLOSED.getEventName());
-        dispositionScheduleService.addDestroyWithoutGhostingAfterPeriodStep(firstCategoryRM3060, "week|1", CUT_OFF_DATE);
-
-        // make a copy of the category created
-        String categorySecondId = copyCategory(getAdminUser(), recordCategory.getId(), secondCategoryRM3060);
-
-        // create a folder on the category firstCategoryRM3060 with a complete electronic record
-        RecordCategoryChild firstFolderRecordCategoryChild = createRecordFolder(recordCategory.getId(),firstFolderRM3060);
-        Record firstElectronicRecord = createElectronicRecord(firstFolderRecordCategoryChild.getId(),electronicRecordRM3060);
-
-        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(),firstFolderRM3060, electronicRecordRM3060);
-        String elRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + firstCategoryRM3060 + "/" + firstFolderRM3060);
-
-        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), elRecordFullName);
-
-        // create a folder on the category secondCategoryRM3060 with a non electronic record
-        RecordCategoryChild secondFolderRecordCategoryChild = createRecordFolder(categorySecondId,secondFolderRM3060);
-        Record secondNonElectronicRecord = createNonElectronicRecord(secondFolderRecordCategoryChild.getId(),nonElectronicRecordRM3060);
-
-        // link the nonElectronicRecordRM3060 to firstFolderRM3060
-        List<String> recordLists = new ArrayList<>();
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + secondNonElectronicRecord.getId());
-
-        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,secondCategoryRM3060 + "/" +
-                secondFolderRM3060, recordLists);
-        String nonElRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), secondFolderRM3060, secondNonElectronicRecord.getName());
-        String nonElRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + secondCategoryRM3060 + "/" + secondFolderRM3060);
-
-        // complete records and cut them off
-        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), nonElRecordFullName);
-
-        // edit the disposition date
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),nonElRecordNameNodeRef);
-
-        // cut off the record
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),nonElRecordNameNodeRef);
-
-        //check the record is cut off
-        AssertJUnit.assertTrue("The file " + nonElectronicRecordRM3060 + " has not been successfully cut off.", getRestAPIFactory().getRecordsAPI().getRecord(secondNonElectronicRecord.getId()).getAspectNames().contains(CUT_OFF_ASPECT));
-
-        // link the electronic record to secondFolderRM3060
-        recordLists.clear();
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + secondNonElectronicRecord.getId());
-        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,secondCategoryRM3060 + "/" +
-                secondFolderRM3060, recordLists);
-
-        // edit the disposition date and cut off the record
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),elRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),elRecordNameNodeRef);
-
-        AssertJUnit.assertTrue("The file " + electronicRecordRM3060 + " has not been successfully cut off.", getRestAPIFactory().getRecordsAPI().getRecord(firstElectronicRecord.getId()).getAspectNames().contains(CUT_OFF_ASPECT));
-
-        // open the record and complete the disposition schedule event
-        rmRolesAndActionsAPI.completeEvent(getAdminUser().getUsername(),
-            getAdminUser().getPassword(), elRecordFullName, RMEvents.CASE_CLOSED, Instant.now());
-        rmRolesAndActionsAPI.completeEvent(getAdminUser().getUsername(),
-            getAdminUser().getPassword(), nonElRecordFullName, RMEvents.CASE_CLOSED, Instant.now());
-
-        // transfer the files & complete transfers
-        HttpResponse nonElRecordNameHttpResponse = recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","transfer"),recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + secondCategoryRM3060 + "/" + secondFolderRM3060));
-
-        String nonElRecordNameTransferId = getTransferId(nonElRecordNameHttpResponse,nonElRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","transferComplete"),nonElRecordNameTransferId);
-
-        HttpResponse elRecordNameHttpResponse = recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","transfer"),recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + firstCategoryRM3060 + "/" + firstFolderRM3060));
-
-        String elRecordNameTransferId = getTransferId(elRecordNameHttpResponse,elRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","transferComplete"),elRecordNameTransferId);
-
-        AssertJUnit.assertTrue("The file " + electronicRecordRM3060 + " has not been successfully transferred", getRestAPIFactory().getRecordsAPI().getRecord(firstElectronicRecord.getId()).getAspectNames().contains(TRANSFER_TYPE));
-        AssertJUnit.assertTrue("The file " + nonElectronicRecordRM3060 + " has not been successfully transferred.", getRestAPIFactory().getRecordsAPI().getRecord(secondNonElectronicRecord.getId()).getAspectNames().contains(TRANSFER_TYPE));
-
-        // edit the disposition date for nonElectronicRecordRM3060 & electronicRecordRM3060
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),nonElRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),elRecordNameNodeRef);
-
-        // destroy nonElectronicRecordRM3060 & electronicRecordRM3060 records
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","destroy"),nonElRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","destroy"),elRecordNameNodeRef);
-
-        // check the file is not displayed
-       assertNull("The file " + nonElectronicRecordRM3060 + " has not been successfully destroyed.", secondNonElectronicRecord.getContent());
-       assertNull("The file " + electronicRecordRM3060 + " has not been successfully destroyed.", firstElectronicRecord.getContent());
-
-        // delete precondition
-        deleteRecordCategory(recordCategory.getId());
-        deleteRecordCategory(categorySecondId);
-    }
-    private String copyCategory(UserModel user, String categoryId, String copyName) {
-        RepoTestModel repoTestModel = new RepoTestModel() {};
-        repoTestModel.setNodeRef(categoryId);
-        RestNodeModel restNodeModel;
-
-        RestNodeBodyMoveCopyModel copyDestinationInfo = new RestNodeBodyMoveCopyModel();
-        copyDestinationInfo.setTargetParentId(filePlanModel.getId());
-        copyDestinationInfo.setName(copyName);
-
-        try
-        {
-            restNodeModel = getRestAPIFactory().getNodeAPI(user, repoTestModel).copy(copyDestinationInfo);
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("Problem copying category.", e);
-        }
-        return restNodeModel.getId();
-    }
-
-    private Node getNode(String recordId)
-    {
-        RepoTestModel repoTestModel = new RepoTestModel() {};
-        repoTestModel.setNodeRef(recordId);
-        return getRestAPIFactory().getNodeAPI(repoTestModel);
-    }
-
-    private String getTransferId(HttpResponse httpResponse,String nodeRef) {
-        HttpEntity entity = httpResponse.getEntity();
-        String responseString = null;
-        try {
-            responseString = EntityUtils.toString(entity, "UTF-8");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        JSONObject result = new JSONObject(responseString);
-        return result
-            .getJSONObject("results")
-            .get(nodeRef)
-            .toString();
-
-    }
-
-    @Test
-    @Ignore
-    @AlfrescoTest(jira = "RM-1622")
-    public void sameLevelDispositionScheduleStepsPeriodsCalculation() throws Exception {
-
-        // create a category with retention applied on records level
-        RecordCategory catsameLevel1  = getRestAPIFactory().getFilePlansAPI(rmAdmin)
-            .createRootRecordCategory(RecordCategory.builder().name(firstCategoryRM3060).build(),
-                RecordCategory.DEFAULT_FILE_PLAN_ALIAS);
-        RecordCategory catsameLevel2  = getRestAPIFactory().getFilePlansAPI(rmAdmin)
-            .createRootRecordCategory(RecordCategory.builder().name(secondCategoryRM3060).build(),
-                RecordCategory.DEFAULT_FILE_PLAN_ALIAS);
-
-        // create retention schedule applied on records for category 1
-        dispositionScheduleService.createCategoryRetentionSchedule(firstCategoryRM3060, true);
-
-        // with retain immediately after record creation date and cut 1 day after record creation date
-        dispositionScheduleService.addCutOffAfterPeriodStep(firstCategoryRM3060, "day|1", DATE_FILED);
-
-
-        // create a folder on the category firstCategoryRM3060 with a complete electronic record
-        RecordCategoryChild firstFolderRecordCategoryChild = createRecordFolder(catsameLevel1.getId(),firstFolderRM3060);
-        Record firstElectronicRecord = createElectronicRecord(firstFolderRecordCategoryChild.getId(),electronicRecordRM3060);
-
-        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(),firstFolderRM3060, electronicRecordRM3060);
-        String elRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + firstCategoryRM3060 + "/" + firstFolderRM3060);
-
-        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), elRecordFullName);
-
-        // create a folder on the category secondCategoryRM3060 with a non electronic record
-        RecordCategoryChild secondFolderRecordCategoryChild = createRecordFolder(catsameLevel2.getId(),secondFolderRM3060);
-        String elRecordNameNodeRefs = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + firstCategoryRM3060 + "/" + firstFolderRM3060);
-
-
-        // link it to the folder in second category through the details page
-        List<String> recordLists = new ArrayList<>();
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + firstElectronicRecord.getId());
-
-        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,secondCategoryRM3060 + "/" +
-                secondFolderRM3060, recordLists);
-
-        // edit disposition date
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),elRecordNameNodeRefs);
-
-
-    }
-
-    @Test (dependsOnMethods = {"sameLevelDispositionScheduleStepsPeriodsCalculation" })
-    @Ignore
-    public void deleteLongestPeriodTestPrecondition() {
-        // Delete the RM site
-        getRestAPIFactory().getRMSiteAPI().deleteRMSite();
-
-        // Verify the status code
-        assertStatusCode(NO_CONTENT);
-    }
-    }

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

@@ -1,138 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * 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.rm.community.smoke;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.recordfolder.RecordFolderCollection;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.rm.community.records.FileUnfiledRecordsTests;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordCategoriesAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.data.DataContent;
-import org.alfresco.utility.data.DataSite;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FileType;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_FILING;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
-
-public class FileVersionAsRecordTests extends BaseRMRestTest {
-
-    private UserModel nonRMuser,rmManager;
-    private SiteModel testSite;
-    private FileModel document, documentDeclared;
-    private RecordCategory category_manager, category_admin;
-    private RecordCategoryChild folder_admin, folder_manager ;
-    private static final String CATEGORY_MANAGER = "catManager" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String CATEGORY_ADMIN = "catAdmin" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String FOLDER_MANAGER = "recordFolder" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String FOLDER_ADMIN = "recordFolder" + generateTestPrefix(FileAsRecordTests.class);
-
-    @Autowired
-    private DataSite dataSite;
-    @Autowired
-    private DataContent dataContent;
-    @Autowired
-    private RoleService roleService;
-
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForFileVersionAsRecordTests()
-    {
-        STEP("Create the RM site if doesn't exist");
-        createRMSiteIfNotExists();
-
-        STEP("Create a user");
-        nonRMuser = dataUser.createRandomTestUser("testUser");
-
-        STEP("Create a collaboration site");
-        testSite = dataSite.usingUser(nonRMuser).createPublicRandomSite();
-
-        STEP("Create a document with the user without RM role");
-        document = dataContent.usingSite(testSite)
-            .usingUser(nonRMuser)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        STEP("Create two categories with two folders");
-        category_manager = createRootCategory(CATEGORY_MANAGER);
-        category_admin = createRootCategory(CATEGORY_ADMIN);
-        folder_admin = createFolder(category_admin.getId(),FOLDER_ADMIN);
-        folder_manager = createFolder(category_manager.getId(),FOLDER_MANAGER);
-
-        STEP("Create an rm user and give filling permission over CATEGORY_MANAGER record category");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId())
-            .build();
-        rmManager = roleService.createCollaboratorWithRMRoleAndPermission(testSite, recordCategory,
-            UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-
-    }
-
-    @Test
-    @AlfrescoTest (jira = "APPS-1625")
-    public void fileVersionAsRecordToUnfiledRecordContainer() throws Exception
-    {
-
-        AtomicReference<RecordFolderCollection> apiChildren = new AtomicReference<>();
-
-        STEP("Create a document with the user without RM role");
-        FileModel inplaceRecord = dataContent.usingSite(testSite).usingUser(rmManager)
-            .createContent(new FileModel("declareAndFileToIntoUnfiledRecordFolder",
-                FileType.TEXT_PLAIN));
-
-        STEP("Click on Declare and file without selecting a record folder");
-        getRestAPIFactory().getActionsAPI(rmManager).declareAndFile(inplaceRecord,"");
-
-        STEP("Check the file is declared in unfiled record folder");
-        Assert.assertTrue(isMatchingRecordInUnfiledRecords(inplaceRecord), "Record should be filed to Unfiled Records folder");
-
-
-    }
-
-
-}

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

@@ -1,156 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * 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.rm.community.smoke;
-
-import org.alfresco.rest.core.v0.BaseAPI;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordCategoriesAPI;
-import org.alfresco.rest.v0.RecordFoldersAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.rest.v0.service.DispositionScheduleService;
-import org.alfresco.test.AlfrescoTest;
-import org.apache.commons.lang3.time.DateUtils;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import static org.alfresco.rest.rm.community.base.TestData.DEFAULT_PASSWORD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.testng.Assert.assertTrue;
-
-public class RecordRetentionAsOfDateTest extends BaseRMRestTest {
-
-    /** data prep 6services */
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RecordsAPI recordsAPI;
-    @Autowired
-    private RecordFoldersAPI recordFoldersAPI;
-    @Autowired
-    private RecordCategoriesAPI recordCategoriesAPI;
-    @Autowired
-    private DispositionScheduleService dispositionScheduleService;
-    private RecordCategory Category1;
-    private final String TEST_PREFIX = generateTestPrefix(RecordRetentionAsOfDateTest.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    private final String recordsCategory = TEST_PREFIX + "RM-5733 category";
-    private final String folderDisposition = TEST_PREFIX + "RM-5733 folder";
-
-    private static final String YEAR_MONTH_DAY = "yyyy-MM-dd";
-
-    @Test
-    @AlfrescoTest (jira = "RM-5733,RM-5799")
-    public void checkRetentionAsOfDateForTransferStepWithRetentionAction() {
-
-        // create test precondition
-        createTestPrecondition(recordsCategory);
-
-        // create disposition schedule
-        dispositionScheduleService.createCategoryRetentionSchedule(Category1.getName(), true);
-
-        // add cut off step
-        dispositionScheduleService.addCutOffImmediatelyStep(Category1.getName());
-
-        // add transfer step
-        HashMap<BaseAPI.RETENTION_SCHEDULE, String> transferStep = new HashMap<>();
-        transferStep.put(BaseAPI.RETENTION_SCHEDULE.RETENTION_PERIOD, "day|1");
-        transferStep.put(BaseAPI.RETENTION_SCHEDULE.NAME, "transfer");
-        transferStep.put(BaseAPI.RETENTION_SCHEDULE.RETENTION_PERIOD_PROPERTY, "rma:cutOffDate");
-        transferStep.put(BaseAPI.RETENTION_SCHEDULE.COMBINE_DISPOSITION_STEP_CONDITIONS, "false");
-        transferStep.put(BaseAPI.RETENTION_SCHEDULE.RETENTION_ELIGIBLE_FIRST_EVENT, "true");
-        transferStep.put(BaseAPI.RETENTION_SCHEDULE.RETENTION_GHOST, "on");
-        transferStep.put(BaseAPI.RETENTION_SCHEDULE.DESCRIPTION, "Transfer after 1 day");
-        recordCategoriesAPI.addDispositionScheduleSteps(getAdminUser().getUsername(),
-            getAdminUser().getPassword(), Category1.getName(), transferStep);
-
-        // create a folder and an electronic and a non-electronic record in it
-        RecordCategoryChild FOLDER = createFolder(getAdminUser(),Category1.getId(),folderDisposition);
-
-        String nonElectronicRecord = TEST_PREFIX + "RM-5733 non-electronic record";
-        Record nonElRecord = createNonElectronicRecord(FOLDER.getId(), nonElectronicRecord);
-
-        // complete records and cut them off
-        String nonElRecordName = recordsAPI.getRecordFullName(getAdminUser().getUsername(),
-            getAdminUser().getPassword(), folderDisposition, nonElectronicRecord);
-
-        // complete records and cut them off
-        completeRecord(nonElRecord.getId());
-
-        String nonElRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordName, "/" + Category1.getName() + "/" + folderDisposition);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),nonElRecordNameNodeRef);
-
-        JSONObject nextDispositionActionJson = recordCategoriesAPI.getNextDispositionAction(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),nonElRecord.getId());
-
-        assertTrue(getAsOfDate(nextDispositionActionJson).startsWith(getTomorrow()),
-            "The retention as of date is not set to tomorrow.");
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanUp() {
-        // delete category
-        deleteRecordCategory(Category1.getId());
-    }
-
-    private void createTestPrecondition(String categoryName) {
-        createRMSiteIfNotExists();
-
-        // create "rm admin" user if it does not exist and assign it to RM Administrator role
-        rmRolesAndActionsAPI.createUserAndAssignToRole(
-            getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            RM_ADMIN, DEFAULT_PASSWORD, "Administrator");
-
-        // create category
-        STEP("Create category");
-        Category1 = createRootCategory(categoryName,"Title");
-    }
-
-    private String getAsOfDate(JSONObject nextDispositionActionJson) {
-        return nextDispositionActionJson.getJSONObject("data").get("asOf").toString();
-    }
-
-    private static String getTomorrow() {
-        Date today = new Date();
-        Date tomorrow = DateUtils.addDays(today, 1);
-        SimpleDateFormat dateFormat = new SimpleDateFormat(YEAR_MONTH_DAY);
-        return dateFormat.format(tomorrow);
-    }
-
-}

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>17.128</version>
+      <version>17.102-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.128</version>
+      <version>17.102-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.128</version>
+        <version>17.102-SNAPSHOT</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.128</version>
+        <version>17.102-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.128</version>
+        <version>17.102-SNAPSHOT</version>
     </parent>
 
     <properties>

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

@@ -11,7 +11,7 @@ function main()
    var params =
    {
       type: "people",
-      term: args.t + " [hint:useCQ]",
+      term: args.t,
       maxResults: (args.maxResults !== null) ? parseInt(args.maxResults, 10) : DEFAULT_MAX_RESULTS,
       startIndex: (args.startIndex !== null) ? parseInt(args.startIndex, 10) : 0
    };

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: encodeURIComponent(args.facetFields),
+      facetFields: 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.128</version>
+      <version>17.102-SNAPSHOT</version>
    </parent>
 
    <dependencies>

core/src/main/java/org/alfresco/error/ExceptionStackUtil.java

@@ -25,9 +25,6 @@ package org.alfresco.error;
  */
 public class ExceptionStackUtil
 {
-    private static final String JAVASCRIPT_EXCEPTION = "org.mozilla.javascript.JavaScriptException";
-    private static final String EXCEPTION_DELIMITER = ":";
-
     /**
      * Searches through the exception stack of the given throwable to find any instance
      * of the possible cause.  The top-level throwable will also be tested.
@@ -41,17 +38,10 @@ public class ExceptionStackUtil
     {
         while (throwable != null)
         {
-            Class<?> throwableClass = throwable.getClass();
-
-            boolean isJavaScriptException = throwableClass.getName().contains(JAVASCRIPT_EXCEPTION);
-            String throwableMsg = throwable.getMessage() != null ? throwable.getMessage() : "";
-
             for (Class<?> possibleCauseClass : possibleCauses)
             {
-                String possibleCauseClassName = possibleCauseClass.getName();
-
-                if (possibleCauseClass.isAssignableFrom(throwableClass)
-                        || (isJavaScriptException && throwableMsg.contains(possibleCauseClassName + EXCEPTION_DELIMITER)))
+                Class<?> throwableClass = throwable.getClass();
+                if (possibleCauseClass.isAssignableFrom(throwableClass))
                 {
                     // We have a match
                     return throwable;

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.128</version>
+        <version>17.102-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.3.1</version>
+            <version>6.3.0</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.128</version>
+        <version>17.102-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.128</version>
+        <version>17.102-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-202209131110
+FROM alfresco/alfresco-base-tomcat:tomcat9-jre17-rockylinux8-202205140719
 
 # 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.128</version>
+        <version>17.102-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.128</version>
+        <version>17.102-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.128</version>
+        <version>17.102-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/scripts/output_logs_for_failures.sh

@@ -1,12 +0,0 @@
-#!/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.128</version>
+        <version>17.102-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.128</version>
+        <version>17.102-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.128</version>
+        <version>17.102-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.128</version>
+        <version>17.102-SNAPSHOT</version>
     </parent>
 
     <developers>

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

@@ -49,7 +49,6 @@ import java.util.stream.IntStream;
 
 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.rest.model.RestRuleModelsCollection;
 import org.alfresco.utility.constants.UserRole;
@@ -67,6 +66,8 @@ 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;
@@ -93,10 +94,12 @@ public class CreateRulesTests extends RestTest
                                        .createSingleRule(ruleModel);
 
         RestRuleModel expectedRuleModel = createRuleModelWithModifiedValues();
+        expectedRuleModel.setActions(addActionContextParams(expectedRuleModel.getActions()));
+        expectedRuleModel.setConditions(createEmptyConditionModel());
         restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().isEqualTo(expectedRuleModel, ID, IS_SHARED)
-                .assertThat().field(ID).isNotNull()
-                .assertThat().field(IS_SHARED).isNull();
+        rule.assertThat().isEqualTo(expectedRuleModel, IGNORE_ID, IGNORE_IS_SHARED)
+                .assertThat().field("id").isNotNull()
+                .assertThat().field("isShared").isNull();
     }
 
     /** Check creating a rule in a non-existent folder returns an error. */
@@ -381,106 +384,12 @@ public class CreateRulesTests extends RestTest
                 .createSingleRule(ruleModel);
 
         final RestRuleModel expectedRuleModel = createRuleModelWithDefaultValues();
-        expectedRuleModel.setActions(Arrays.asList(copyAction, checkOutAction, scriptAction));
+        expectedRuleModel.setActions(addActionContextParams(Arrays.asList(copyAction, checkOutAction, scriptAction)));
+        expectedRuleModel.setConditions(createEmptyConditionModel());
         expectedRuleModel.setTriggers(List.of("inbound"));
 
         restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().isEqualTo(expectedRuleModel, ID, IS_SHARED)
-                .assertThat().field(IS_SHARED).isNull();
-    }
-
-    /**
-     * Check we get error when attempt to create a rule without any actions.
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void createRuleWithoutActionsShouldFail()
-    {
-        final RestRuleModel ruleModel = createRuleModelWithDefaultValues();
-        ruleModel.setActions(null);
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                .createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("A rule must have at least one action");
-    }
-
-    /**
-     * Check we get error when attempt to create a rule with invalid action.
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void createRuleWithInvalidActionsShouldFail()
-    {
-        final RestRuleModel ruleModel = createRuleModelWithDefaultValues();
-        final RestActionBodyExecTemplateModel invalidAction = new RestActionBodyExecTemplateModel();
-        final String actionDefinitionId = "invalid-definition-value";
-        invalidAction.setActionDefinitionId(actionDefinitionId);
-        invalidAction.setParams(Map.of("dummy-key", "dummy-value"));
-        ruleModel.setActions(List.of(invalidAction));
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                .createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(NOT_FOUND);
-        restClient.assertLastError().containsSummary(actionDefinitionId);
-    }
-
-    /**
-     * Check we can create a rule with multiple conditions
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void createRuleWithConditions()
-    {
-        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
-        ruleModel.setConditions(createVariousConditions());
-
-        RestRuleModel rule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-            .createSingleRule(ruleModel);
-
-        RestRuleModel expectedRuleModel = createRuleModelWithDefaultValues();
-        expectedRuleModel.setConditions(createVariousConditions());
-        expectedRuleModel.setTriggers(List.of("inbound"));
-        restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().isEqualTo(expectedRuleModel, ID, IS_SHARED);
-    }
-
-    /**
-     * Check we can create a rule with empty list as conditions
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void createRuleWithConditions_emptyConditionList()
-    {
-        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
-        ruleModel.setConditions(createCompositeCondition(null));
-
-        RestRuleModel rule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-            .createSingleRule(ruleModel);
-
-        RestRuleModel expectedRuleModel = createRuleModelWithDefaultValues();
-        expectedRuleModel.setTriggers(List.of("inbound"));
-        restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().isEqualTo(expectedRuleModel, ID, IS_SHARED);
-    }
-
-    /**
-     * Check we can NOT create a rule when category ID in condition is invalid, HTTP status code 400 is expected
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void createRuleWithConditions_invalidCategory()
-    {
-        STEP("Try to create a rule with non existing category in conditions.");
-        String fakeCategoryId = "bdba5f9f-fake-id22-803b-349bcfd06fd1";
-        RestCompositeConditionDefinitionModel conditions = createCompositeCondition(List.of(
-            createCompositeCondition(!INVERTED, List.of(
-                createSimpleCondition("category", "equals", fakeCategoryId)
-            ))
-        ));
-        RestRuleModel ruleModel = createRuleModelWithDefaultValues();
-        ruleModel.setConditions(conditions);
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("Category in condition is invalid");
+        rule.assertThat().isEqualTo(expectedRuleModel, IGNORE_ID, IGNORE_IS_SHARED)
+                .assertThat().field("isShared").isNull();
     }
 }

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

@@ -1,142 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 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.rules;
-
-import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModelWithModifiedValues;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.testng.Assert.assertEquals;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestRuleModel;
-import org.alfresco.rest.model.RestRuleModelsCollection;
-import org.alfresco.rest.model.RestRuleSetLinkModel;
-import org.alfresco.rest.model.RestRuleSetModel;
-import org.alfresco.rest.model.RestRuleSetModelsCollection;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.alfresco.utility.model.UserModel;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests for GET /nodes/{nodeId}/rule-sets/{ruleSetId}/rules with rule inheritance.
- */
-@Test(groups = {TestGroup.RULES})
-public class GetInheritedRulesTests extends RestTest
-{
-    private UserModel user;
-    private SiteModel site;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation()
-    {
-        STEP("Create a user and site");
-        user = dataUser.createRandomTestUser();
-        site = dataSite.usingUser(user).createPublicRandomSite();
-    }
-
-    /**
-     * Check we can get all the rules for the folder by providing the different rule set ids.
-     */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void getInheritedRules()
-    {
-        STEP("Create a parent and child folder, each with inheriting rules");
-        FolderModel parent = dataContent.usingUser(user).usingSite(site).createFolder();
-        FolderModel child = dataContent.usingUser(user).usingResource(parent).createFolder();
-        RestRuleModel parentRule = createRuleModelWithModifiedValues();
-        parentRule = restClient.authenticateUser(user).withCoreAPI().usingNode(parent).usingDefaultRuleSet().createSingleRule(parentRule);
-        RestRuleModel childRule = createRuleModelWithModifiedValues();
-        childRule = restClient.authenticateUser(user).withCoreAPI().usingNode(child).usingDefaultRuleSet().createSingleRule(childRule);
-
-        STEP("Get the rules in the default rule set for the child folder");
-        RestRuleModelsCollection rules = restClient.authenticateUser(user).withCoreAPI().usingNode(child).usingDefaultRuleSet().getListOfRules();
-        rules.assertThat().entriesListContains("id", childRule.getId())
-             .and().entriesListCountIs(1);
-
-        STEP("Get the rules in the inherited rule set for the child folder");
-        RestRuleSetModelsCollection ruleSets = restClient.authenticateUser(user).withCoreAPI().usingNode(child).include("inclusionType").getListOfRuleSets();
-        String inheritedRuleSetId = ruleSets.getEntries().stream()
-                                            .filter(ruleSet -> ruleSet.onModel().getInclusionType().equals("inherited"))
-                                            .findFirst().get().onModel().getId();
-        RestRuleModelsCollection inheritedRules = restClient.authenticateUser(user).withCoreAPI().usingNode(child).usingRuleSet(inheritedRuleSetId).getListOfRules();
-        inheritedRules.assertThat().entriesListContains("id", parentRule.getId())
-                      .and().entriesListCountIs(1);
-    }
-
-    /**
-     * Check that we only get each rule once with linking and inheritance, and the order is correct.
-     * <p>
-     * The folder structure for this test is as follows:
-     * <pre>
-     *      A --[links]-> DRuleSet
-     *      +-B --[owns]-> BRuleSet
-     *        +-C --[owns]-> CRuleSet
-     *          +-D --[owns]--> DRuleSet
-     * </pre>
-     */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void rulesReturnedAreUnique()
-    {
-        STEP("Create four folders with rules");
-        FolderModel folderA = dataContent.usingUser(user).usingSite(site).createFolder();
-        FolderModel folderB = dataContent.usingUser(user).usingResource(folderA).createFolder();
-        FolderModel folderC = dataContent.usingUser(user).usingResource(folderB).createFolder();
-        FolderModel folderD = dataContent.usingUser(user).usingResource(folderC).createFolder();
-        RestRuleModel ruleB = restClient.authenticateUser(user).withCoreAPI().usingNode(folderB).usingDefaultRuleSet().createSingleRule(createRuleModelWithModifiedValues());
-        RestRuleModel ruleC = restClient.authenticateUser(user).withCoreAPI().usingNode(folderC).usingDefaultRuleSet().createSingleRule(createRuleModelWithModifiedValues());
-        RestRuleModel ruleD = restClient.authenticateUser(user).withCoreAPI().usingNode(folderD).usingDefaultRuleSet().createSingleRule(createRuleModelWithModifiedValues());
-        STEP("Link folderA to ruleSetD");
-        RestRuleSetLinkModel linkModel = new RestRuleSetLinkModel();
-        linkModel.setId(folderD.getNodeRef());
-        restClient.authenticateUser(user).withCoreAPI().usingNode(folderA).createRuleLink(linkModel);
-
-        STEP("Get the rule sets for the folderD");
-        List<RestRuleSetModel> ruleSets = restClient.authenticateUser(user).withCoreAPI().usingNode(folderD).getListOfRuleSets().getEntries();
-
-        STEP("Check the rules for each rule set are as expected");
-        List<RestRuleModel> expectedRuleIds = List.of(ruleD, ruleB, ruleC);
-        IntStream.range(0, 2).forEach(index -> {
-            String ruleSetId = ruleSets.get(index).onModel().getId();
-            List<RestRuleModel> rules = restClient.authenticateUser(user)
-                                                  .withCoreAPI()
-                                                  .usingNode(folderD)
-                                                  .usingRuleSet(ruleSetId)
-                                                  .getListOfRules()
-                                                  .getEntries()
-                                                  .stream()
-                                                  .map(RestRuleModel::onModel)
-                                                  .collect(Collectors.toList());
-            assertEquals(rules, List.of(expectedRuleIds.get(index)), "Unexpected rules found for rule set " + ruleSetId);
-        });
-        assertEquals(ruleSets.size(), 3, "Expected three unique rule sets to be returned but got " + ruleSets);
-    }
-}

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

@@ -25,27 +25,16 @@
  */
 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;
@@ -62,8 +51,6 @@ public class GetRuleSetsTests extends RestTest
     private UserModel user;
     private SiteModel site;
     private FolderModel ruleFolder;
-    private FolderModel inheritingChildFolder;
-    private FolderModel notInheritingChildFolder;
     private RestRuleModel rule;
     private String ruleSetId;
 
@@ -75,14 +62,6 @@ public class GetRuleSetsTests extends RestTest
         site = dataSite.usingUser(user).createPublicRandomSite();
         ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
 
-        STEP("Create two children of the folder - one that inherits rules and one that doesn't");
-        inheritingChildFolder = dataContent.usingUser(user).usingResource(ruleFolder).createFolder();
-        notInheritingChildFolder = dataContent.usingUser(user).usingResource(ruleFolder).createFolder();
-        RestRuleSettingsModel doesntInherit = new RestRuleSettingsModel();
-        doesntInherit.setValue(false);
-        restClient.authenticateUser(user).withCoreAPI().usingNode(notInheritingChildFolder)
-                  .usingIsInheritanceEnabledRuleSetting().updateSetting(doesntInherit);
-
         STEP("Create a rule in the folder.");
         RestRuleModel ruleModel = createRuleModel("ruleName");
         rule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
@@ -154,7 +133,7 @@ public class GetRuleSetsTests extends RestTest
 
     /** Check we can get the reason that a rule set is included in the list. */
     @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getRuleSetsAndOwnedInclusionType()
+    public void getRuleSetsAndInclusionType()
     {
         STEP("Get the rule sets and inclusion type");
         RestRuleSetModelsCollection ruleSets = restClient.authenticateUser(user).withCoreAPI()
@@ -169,36 +148,6 @@ public class GetRuleSetsTests extends RestTest
         ruleSets.assertThat().entriesListCountIs(1);
     }
 
-    /** Check we can tell that a rule set has been inherited. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getRuleSetsAndInheritedInclusionType()
-    {
-        STEP("Get the rule sets and inclusion type");
-        RestRuleSetModelsCollection ruleSets = restClient.authenticateUser(user).withCoreAPI()
-                                                         .usingNode(inheritingChildFolder)
-                                                         .include("inclusionType")
-                                                         .getListOfRuleSets();
-
-        restClient.assertStatusCodeIs(OK);
-        ruleSets.getEntries().get(0).onModel()
-                .assertThat().field("inclusionType").is("inherited")
-                .assertThat().field("id").is(ruleSetId);
-        ruleSets.assertThat().entriesListCountIs(1);
-    }
-
-    /** Check that a rule set is not inherited if inheriting is disabled. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getRuleSetsWithoutInheriting()
-    {
-        STEP("Get the rule sets and inclusion type");
-        RestRuleSetModelsCollection ruleSets = restClient.authenticateUser(user).withCoreAPI()
-                                                         .usingNode(notInheritingChildFolder)
-                                                         .getListOfRuleSets();
-
-        restClient.assertStatusCodeIs(OK);
-        ruleSets.assertThat().entriesListCountIs(0);
-    }
-
     /** Check we can get a rule set by its id. */
     @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
     public void getRuleSetById()
@@ -208,13 +157,7 @@ public class GetRuleSetsTests extends RestTest
                                              .getRuleSet(ruleSetId);
 
         restClient.assertStatusCodeIs(OK);
-        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();
+        ruleSet.assertThat().field("id").is(ruleSetId);
     }
 
     /** Check we can get a rule set using the "-default-" synonym. */
@@ -264,252 +207,4 @@ 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/GetRulesTests.java

@@ -189,7 +189,9 @@ public class GetRulesTests extends RestTest
                 .createSingleRule(ruleModel);
 
         RestRuleModel expectedRuleModel = createRuleModelWithModifiedValues();
+        expectedRuleModel.setActions(addActionContextParams(expectedRuleModel.getActions()));
         expectedRuleModel.setTriggers(List.of("update"));
+        expectedRuleModel.setConditions(createEmptyConditionModel());
 
         restClient.assertStatusCodeIs(CREATED);
         rule.assertThat().isEqualTo(expectedRuleModel, IGNORE_ID, IGNORE_IS_SHARED)
@@ -210,7 +212,9 @@ public class GetRulesTests extends RestTest
                 .createSingleRule(ruleModel);
 
         RestRuleModel expectedRuleModel = createRuleModelWithDefaultValues();
+        expectedRuleModel.setActions(addActionContextParams(expectedRuleModel.getActions()));
         expectedRuleModel.setTriggers(List.of("inbound"));
+        expectedRuleModel.setConditions(createEmptyConditionModel());
 
         restClient.assertStatusCodeIs(CREATED);
 

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

@@ -234,7 +234,7 @@ public class RuleSetLinksTests extends RestTest
         STEP("Assert link result is 400");
         restClient.assertStatusCodeIs(BAD_REQUEST)
                 .assertLastError().containsSummary(
-                "Unable to link to a rule set because the folder has pre-existing rules or is already linked to a rule set.");
+                "Unable to link to a ruleset because the folder has pre-existing rules or is already linked to a ruleset.");
     }
 
     /**

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

@@ -26,13 +26,13 @@
 package org.alfresco.rest.rules;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
 import org.alfresco.rest.model.RestCompositeConditionDefinitionModel;
 import org.alfresco.rest.model.RestRuleModel;
-import org.alfresco.rest.model.RestSimpleConditionDefinitionModel;
 
 public class RulesTestsUtils
 {
@@ -43,14 +43,7 @@ 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 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";
+    static final List<String> ruleTriggersDefault = List.of("inbound", "update", "outbound");
 
     /**
      * Create a rule model filled with default values.
@@ -65,7 +58,7 @@ public class RulesTestsUtils
         ruleModel.setCascade(RULE_CASCADE_DEFAULT);
         ruleModel.setAsynchronous(RULE_ASYNC_DEFAULT);
         ruleModel.setIsShared(RULE_SHARED_DEFAULT);
-        ruleModel.setTriggers(RULE_TRIGGERS_DEFAULT);
+        ruleModel.setTriggers(ruleTriggersDefault);
         ruleModel.setErrorScript(RULE_ERROR_SCRIPT_DEFAULT);
 
         return ruleModel;
@@ -109,6 +102,16 @@ public class RulesTestsUtils
         return restActionModel;
     }
 
+    public static List<RestActionBodyExecTemplateModel> addActionContextParams(List<RestActionBodyExecTemplateModel> inputActions)
+    {
+        inputActions.forEach(inputAction -> {
+            final Map<String, Serializable> params = new HashMap<>((Map<String, Serializable>) inputAction.getParams());
+            params.put("actionContext", "rule");
+            inputAction.setParams(params);
+        });
+        return inputActions;
+    }
+
     public static RestActionBodyExecTemplateModel createCustomActionModel(String actionDefinitionId, Map<String, Serializable> params)
     {
         RestActionBodyExecTemplateModel restActionModel = new RestActionBodyExecTemplateModel();
@@ -120,59 +123,8 @@ public class RulesTestsUtils
     public static RestCompositeConditionDefinitionModel createEmptyConditionModel()
     {
         RestCompositeConditionDefinitionModel conditions = new RestCompositeConditionDefinitionModel();
-        conditions.setInverted(!INVERTED);
-        conditions.setBooleanMode(AND);
+        conditions.setInverted(false);
+        conditions.setBooleanMode("and");
         return conditions;
     }
-
-    public static RestCompositeConditionDefinitionModel createVariousConditions()
-    {
-        return createCompositeCondition(List.of(
-            createCompositeCondition(!INVERTED, List.of(
-                createSimpleCondition("cm:created", "less_than", "2022-09-01T12:59:00.000+02:00"),
-                createSimpleCondition("cm:creator", "ends", "ski"),
-                createSimpleCondition("size", "greater_than", "90000000"),
-                createSimpleCondition("mimetype", "equals", "video/3gpp"),
-                createSimpleCondition("encoding", "equals", "utf-8"),
-                createSimpleCondition("type", "equals", "cm:folder"),
-                createSimpleCondition("tag", "equals", "uat")
-            )),
-            createCompositeCondition(INVERTED, List.of(
-                createSimpleCondition("aspect", "equals", "audio:audio"),
-                createSimpleCondition("cm:modelVersion", "begins", "1.")
-            ))
-        ));
-    }
-
-    public static RestSimpleConditionDefinitionModel createSimpleCondition(String field, String comparator, String parameter)
-    {
-        RestSimpleConditionDefinitionModel simpleCondition = new RestSimpleConditionDefinitionModel();
-        simpleCondition.setField(field);
-        simpleCondition.setComparator(comparator);
-        simpleCondition.setParameter(parameter);
-        return simpleCondition;
-    }
-
-    public static RestCompositeConditionDefinitionModel createCompositeCondition(List<RestCompositeConditionDefinitionModel> compositeConditions)
-    {
-        return createCompositeCondition(AND, !INVERTED, compositeConditions, null);
-    }
-
-    public static RestCompositeConditionDefinitionModel createCompositeCondition(boolean inverted,
-        List<RestSimpleConditionDefinitionModel> simpleConditions)
-    {
-        return createCompositeCondition(AND, inverted, null, simpleConditions);
-    }
-
-    private static RestCompositeConditionDefinitionModel createCompositeCondition(String booleanMode, boolean inverted,
-        List<RestCompositeConditionDefinitionModel> compositeConditions, List<RestSimpleConditionDefinitionModel> simpleConditions)
-    {
-        RestCompositeConditionDefinitionModel compositeCondition = new RestCompositeConditionDefinitionModel();
-        compositeCondition.setBooleanMode(booleanMode);
-        compositeCondition.setInverted(inverted);
-        compositeCondition.setCompositeConditions(compositeConditions);
-        compositeCondition.setSimpleConditions(simpleConditions);
-
-        return compositeCondition;
-    }
 }

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

@@ -25,34 +25,19 @@
  */
 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.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;
 
 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;
@@ -95,9 +80,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(IS_SHARED).isNull();
+                   .assertThat().field("isShared").isNull();
     }
 
     /** Check we get a 404 if trying to update a rule in a folder that doesn't exist. */
@@ -195,7 +180,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. */
@@ -207,255 +192,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(IS_SHARED)
+                                              .include("isShared")
                                               .updateRule(rule.getId(), updatedRuleModel);
 
-        updatedRule.assertThat().field(IS_SHARED).isNotNull();
-    }
-
-    /**
-     * Check we get error when attempt to update a rule to one without any actions.
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void updateRuleWithoutActionsShouldFail()
-    {
-        RestRuleModel rule = createAndSaveRule("Rule name");
-
-        STEP("Try to update the rule - set no actions.");
-        rule.setActions(null);
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                .include(IS_SHARED)
-                .updateRule(rule.getId(), rule);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("A rule must have at least one action");
-    }
-
-    /**
-     * Check we get error when attempt to update a rule to one with invalid action.
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void updateRuleWithInvalidActionsShouldFail()
-    {
-        RestRuleModel rule = createAndSaveRule("Rule name");
-
-        STEP("Try to update the rule - set no actions.");
-        final RestActionBodyExecTemplateModel invalidAction = new RestActionBodyExecTemplateModel();
-        final String actionDefinitionId = "invalid-definition-value";
-        invalidAction.setActionDefinitionId(actionDefinitionId);
-        invalidAction.setParams(Map.of("dummy-key", "dummy-value"));
-        rule.setActions(List.of(invalidAction));
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                .include(IS_SHARED)
-                .updateRule(rule.getId(), rule);
-
-        restClient.assertStatusCodeIs(NOT_FOUND);
-        restClient.assertLastError().containsSummary(actionDefinitionId);
-    }
-
-    /** Check we can use the POST response to create the new rule. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void updateCopyRuleWithResponseFromPOST()
-    {
-        FolderModel destination = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        RestActionBodyExecTemplateModel copyAction = new RestActionBodyExecTemplateModel();
-        copyAction.setActionDefinitionId("copy");
-        copyAction.setParams(ImmutableMap.of("destination-folder", destination.getNodeRef()));
-        RestRuleModel rule = createAndSaveRule("Rule name", List.of(copyAction));
-
-        STEP("Try to update the rule.");
-        rule.setName("Updated rule name");
-        RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                                              .include(IS_SHARED)
-                                              .updateRule(rule.getId(), rule);
-
-        restClient.assertStatusCodeIs(OK);
-        updatedRule.assertThat().field("name").is("Updated rule name")
-                   .assertThat().field("actions.actionDefinitionId").is(List.of("copy"))
-                   .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(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);
-
-        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 400 error when using the POST response and update rule by adding condition without comparator when it is required. */
-    @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 (null comparator when required non-null).");
-        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);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("Comparator in condition must not be blank");
-    }
-
-    /** Check we get a 400 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 (null field).");
-        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);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("Field in condition must not be blank");
-    }
-
-    /** Check we get a 400 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 (null parameter).");
-        final RestCompositeConditionDefinitionModel conditions = createCompositeCondition(
-                List.of(createCompositeCondition(!INVERTED, List.of(createSimpleCondition("size", "greater_than", "")))));
-        rule.setConditions(conditions);
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                .include(IS_SHARED)
-                .updateRule(rule.getId(), rule);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("Parameter in condition must not be blank");
+        updatedRule.assertThat().field("isShared").isNotNull();
     }
 
     private RestRuleModel createAndSaveRule(String name)
@@ -477,17 +217,4 @@ 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.128</version>
+        <version>17.102-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.128</version>
+        <version>17.102-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.128</version>
+    <version>17.102-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -51,18 +51,18 @@
         <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-service.version>2.0.0-A2</dependency.alfresco-transform-service.version>
-        <dependency.alfresco-transform-core.version>3.0.0-A2</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>1.5.4-A3</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>2.7.0-A1</dependency.alfresco-transform-core.version>
         <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.23</dependency.spring.version>
-        <dependency.antlr.version>3.5.3</dependency.antlr.version>
+        <dependency.spring.version>5.3.22</dependency.spring.version>
+        <dependency.antlr.version>3.5.2</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.32</dependency.webscripts.version>
+        <dependency.webscripts.version>8.31</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,20 +74,17 @@
         <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>2.0.1</dependency.slf4j.version>
-        <dependency.gytheio.version>0.17</dependency.gytheio.version>
+        <dependency.slf4j.version>1.7.36</dependency.slf4j.version>
+        <dependency.gytheio.version>0.16</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.3</dependency.spring-security.version>
+        <dependency.spring-security.version>5.7.2</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>
         <dependency.keycloak.version>18.0.0</dependency.keycloak.version>
         <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
-        <dependency.camel.version>3.18.2</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
-        <dependency.netty.version>4.1.79.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
-        <dependency.netty.qpid.version>4.1.72.Final</dependency.netty.qpid.version> <!-- must be in sync with camels transitive dependencies: native-unix-common/native-epoll/native-kqueue -->
-        <dependency.netty-tcnative.version>2.0.53.Final</dependency.netty-tcnative.version> <!-- must be in sync with camels transitive dependencies -->
+        <dependency.camel.version>3.15.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
         <dependency.activemq.version>5.17.1</dependency.activemq.version>
         <dependency.apache-compress.version>1.21</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
@@ -110,20 +107,20 @@
         <dependency.jakarta-json-path.version>2.7.0</dependency.jakarta-json-path.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
-        <alfresco.googledrive.version>3.2.3-A2</alfresco.googledrive.version>
+        <alfresco.googledrive.version>3.2.2</alfresco.googledrive.version>
         <alfresco.aos-module.version>1.4.1</alfresco.aos-module.version> 
         <alfresco.api-explorer.version>7.2.1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <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.5.0</dependency.postgresql.version>
+        <dependency.postgresql.version>42.4.1</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.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-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-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 +148,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.128</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -408,7 +405,7 @@
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
-                <version>5.1.1</version>
+                <version>5.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -516,11 +513,6 @@
                 <artifactId>jackson-dataformat-yaml</artifactId>
                 <version>${dependency.jackson.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>1.32</version>
-            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
@@ -664,7 +656,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.15.3</version>
+                <version>1.15.2</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -743,7 +735,7 @@
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.11.1</version>
+                <version>2.10.14</version>
             </dependency>
 
             <!-- provided dependencies -->
@@ -859,18 +851,6 @@
                 <artifactId>camel-mock</artifactId>
                 <version>${dependency.camel.version}</version>
             </dependency>
-            <!-- Netty non-transitive dependencies declared for depending projects usage in conjunction with Camel's other transitive netty dependencies -->
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler-proxy</artifactId>
-                <version>${dependency.netty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-tcnative-classes</artifactId>
-                <version>${dependency.netty-tcnative.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.taglibs</groupId>
                 <artifactId>taglibs-standard-spec</artifactId>
@@ -952,7 +932,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.4.0</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.128</version>
+        <version>17.102-SNAPSHOT</version>
     </parent>
 
     <dependencies>

remote-api/src/main/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -36,7 +36,7 @@ import org.alfresco.repo.content.metadata.MetadataExtracter;
 import org.alfresco.repo.content.metadata.MetadataExtracterRegistry;
 import org.alfresco.repo.content.transform.LocalTransformServiceRegistry;
 import org.alfresco.service.cmr.repository.MimetypeService;
-import org.alfresco.transform.registry.TransformServiceRegistry;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;

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

@@ -1,151 +0,0 @@
-/*
- * #%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.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.alfresco.rest.api.model.mapper.RestModelMapper;
-import org.alfresco.rest.api.model.rules.CompositeCondition;
-import org.alfresco.rest.api.model.rules.ConditionOperator;
-import org.alfresco.rest.api.model.rules.SimpleCondition;
-import org.alfresco.service.Experimental;
-import org.alfresco.service.cmr.action.ActionCondition;
-import org.apache.commons.collections.CollectionUtils;
-
-@Experimental
-public class RestRuleCompositeConditionModelMapper implements RestModelMapper<CompositeCondition, ActionCondition>
-{
-    private final RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper;
-
-    public RestRuleCompositeConditionModelMapper(
-            RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapper)
-    {
-        this.simpleConditionMapper = simpleConditionMapper;
-    }
-
-    /**
-     * Converts Action conditions (service POJO) list to composite condition (REST model).
-     *
-     * @param actionConditions - list of {@link ActionCondition} service POJOs
-     * @return {@link CompositeCondition} REST model
-     */
-    @Override
-    public CompositeCondition toRestModel(final Collection<ActionCondition> actionConditions)
-    {
-        if (CollectionUtils.isEmpty(actionConditions))
-        {
-            return null;
-        }
-        final CompositeCondition conditions = new CompositeCondition();
-        conditions.setCompositeConditions(new ArrayList<>());
-        // 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(ofActionConditions(actionConditionsPart, inverted, ConditionOperator.AND))
-                        // if composite condition present add to final list
-                        .ifPresent(compositeCondition -> conditions.getCompositeConditions().add(compositeCondition)));
-
-        if (CollectionUtils.isEmpty(conditions.getCompositeConditions()))
-        {
-            conditions.setCompositeConditions(null);
-        }
-        return conditions;
-    }
-
-    @Override
-    public List<ActionCondition> toServiceModels(final CompositeCondition compositeCondition)
-    {
-        final List<ActionCondition> actionConditions = new ArrayList<>();
-        if (compositeCondition == null)
-        {
-            return actionConditions;
-        }
-        if (CollectionUtils.isNotEmpty(compositeCondition.getSimpleConditions()))
-        {
-            compositeCondition.getSimpleConditions()
-                    .forEach(simpleCondition -> actionConditions.add(mapSimpleCondition(simpleCondition, compositeCondition.isInverted())));
-        }
-        if (CollectionUtils.isNotEmpty(compositeCondition.getCompositeConditions()))
-        {
-            compositeCondition.getCompositeConditions().forEach(condition -> actionConditions.addAll(toServiceModels(condition)));
-        }
-
-        return actionConditions;
-    }
-
-    private ActionCondition mapSimpleCondition(final SimpleCondition simpleCondition, final boolean inverted)
-    {
-        final ActionCondition actionCondition = simpleConditionMapper.toServiceModel(simpleCondition);
-        actionCondition.setInvertCondition(inverted);
-        return actionCondition;
-    }
-
-    private CompositeCondition ofActionConditions(final List<ActionCondition> actionConditions, final boolean inverted,
-                                                  final ConditionOperator conditionOperator)
-    {
-        if (actionConditions == null)
-        {
-            return null;
-        }
-        return ofSimpleConditions(simpleConditionMapper.toRestModels(actionConditions), inverted, conditionOperator);
-    }
-
-    /**
-     * Creates a composite condition instance of simple conditions.
-     *
-     * @param simpleConditions  - list of {@link SimpleCondition}
-     * @param inverted          - determines if condition should be inverted
-     * @param conditionOperator - determines the operation, see {@link ConditionOperator}
-     * @return {@link CompositeCondition}
-     */
-    private CompositeCondition ofSimpleConditions(final List<SimpleCondition> simpleConditions, final boolean inverted,
-                                                  final ConditionOperator conditionOperator)
-    {
-        return of(simpleConditions, null, inverted, conditionOperator);
-    }
-
-    private CompositeCondition of(final List<SimpleCondition> simpleConditions, final List<CompositeCondition> compositeConditions,
-                                  final boolean inverted, final ConditionOperator conditionOperator)
-    {
-        if (CollectionUtils.isEmpty(simpleConditions) && CollectionUtils.isEmpty(compositeConditions))
-        {
-            return null;
-        }
-        return CompositeCondition.builder()
-                .inverted(inverted)
-                .booleanMode(conditionOperator)
-                .simpleConditions(simpleConditions)
-                .compositeConditions(compositeConditions)
-                .create();
-    }
-}

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

@@ -1,233 +0,0 @@
-/*
- * #%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 com.rometools.utils.Strings;
-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>
-{
-    static final String CATEGORY_INVALID_MSG = "Category in condition is invalid";
-    static final String PARAM_CATEGORY = "category";
-    static final String PARAM_MIMETYPE = "mimetype";
-    static final String FIELD_NOT_NULL = "Field in condition must not be blank";
-    static final String PARAMETER_NOT_NULL = "Parameter in condition must not be blank";
-    static final String COMPARATOR_NOT_NULL = "Comparator in condition must not be blank";
-    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();
-        checkStringNotBlank(field, FIELD_NOT_NULL);
-
-        final Map<String, Serializable> parameterValues = new HashMap<>();
-        String conditionDefinitionId;
-        final String parameter = restModel.getParameter();
-        checkStringNotBlank(parameter, PARAMETER_NOT_NULL);
-
-        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));
-                }
-                checkStringNotBlank(restModel.getComparator(), COMPARATOR_NOT_NULL);
-                parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, restModel.getComparator().toUpperCase());
-                parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, parameter);
-                break;
-        }
-        return new ActionConditionImpl(UUID.randomUUID().toString(), conditionDefinitionId, parameterValues);
-    }
-
-    private void checkStringNotBlank(final String string, final String message) {
-        if (Strings.isBlank(string))
-        {
-            throw new InvalidArgumentException(message);
-        }
-    }
-
-    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(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(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/ActionParameterConverter.java

@@ -48,7 +48,6 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 @Experimental
 public class ActionParameterConverter
@@ -68,15 +67,9 @@ public class ActionParameterConverter
     Map<String, Serializable> getConvertedParams(Map<String, Serializable> params, String name)
     {
         final Map<String, Serializable> parameters = new HashMap<>(params.size());
-        final ParameterizedItemDefinition definition;
-        try
+        final ParameterizedItemDefinition definition = actionService.getActionDefinition(name);
+        if (definition == null)
         {
-            definition = actionService.getActionDefinition(name);
-            if (definition == null)
-            {
-                throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID, new String[]{name});
-            }
-        } catch (NoSuchBeanDefinitionException e) {
             throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID, new String[]{name});
         }
 

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

@@ -180,12 +180,6 @@ public class NodeValidator
         }
     }
 
-    /**
-     * Verifies if rule set node or folder node's default rule set is shared
-     * @param ruleSetNodeRef
-     * @param folderNodeRef
-     * @return
-     */
     public boolean isRuleSetNotNullAndShared(final NodeRef ruleSetNodeRef, final NodeRef folderNodeRef)
     {
         if (ruleSetNodeRef == null && folderNodeRef != null)

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

@@ -27,12 +27,8 @@ 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.CompositeCondition;
 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;
 
@@ -43,11 +39,10 @@ public class RuleLoader
     public static final String IS_SHARED = "isShared";
     private RuleService ruleService;
     private NodeValidator nodeValidator;
-    private RestModelMapper<CompositeCondition, ActionCondition> compositeConditionMapper;
 
     public Rule loadRule(org.alfresco.service.cmr.rule.Rule ruleModel, List<String> includes)
     {
-        Rule rule = Rule.from(ruleModel, compositeConditionMapper);
+        Rule rule = Rule.from(ruleModel);
         if (includes != null && includes.contains(IS_SHARED))
         {
             NodeRef ruleSet = ruleService.getRuleSetNode(ruleModel.getNodeRef());
@@ -66,10 +61,4 @@ public class RuleLoader
     {
         this.nodeValidator = nodeValidator;
     }
-
-    public void setCompositeConditionMapper(
-            RestModelMapper<CompositeCondition, ActionCondition> compositeConditionMapper)
-    {
-        this.compositeConditionMapper = compositeConditionMapper;
-    }
 }

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

@@ -31,13 +31,11 @@ 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
@@ -45,13 +43,7 @@ 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.
@@ -87,65 +79,12 @@ 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/RuleSetsImpl.java

@@ -29,7 +29,7 @@ package org.alfresco.rest.api.impl.rules;
 import static java.util.stream.Collectors.toList;
 
 import java.util.List;
-import java.util.Objects;
+import java.util.Optional;
 
 import org.alfresco.repo.rule.RuleModel;
 import org.alfresco.repo.rule.RuntimeRuleService;
@@ -59,13 +59,10 @@ public class RuleSetsImpl implements RuleSets
     {
         NodeRef folderNode = validator.validateFolderNode(folderNodeId, false);
 
-        List<RuleSet> ruleSets = ruleService.getNodesSupplyingRuleSets(folderNode)
-                                            .stream()
-                                            .map(ruleService::getRuleSetNode)
-                                            .filter(Objects::nonNull)
-                                            .map(nodeRef -> ruleSetLoader.loadRuleSet(nodeRef, folderNode, includes))
-                                            .distinct()
-                                            .collect(toList());
+        NodeRef ruleSetNode = ruleService.getRuleSetNode(folderNode);
+        List<RuleSet> ruleSets = Optional.ofNullable(ruleSetNode)
+                                         .map(nodeRef -> ruleSetLoader.loadRuleSet(nodeRef, folderNode, includes))
+                                                                      .stream().collect(toList());
 
         return ListPage.of(ruleSets, paging);
     }
@@ -96,7 +93,7 @@ public class RuleSetsImpl implements RuleSets
 
         //The folder shouldn't have any pre-existing rules
         if (ruleService.hasRules(folderNodeRef)) {
-            throw new InvalidArgumentException("Unable to link to a rule set because the folder has pre-existing rules or is already linked to a rule set.");
+            throw new InvalidArgumentException("Unable to link to a ruleset because the folder has pre-existing rules or is already linked to a ruleset.");
         }
 
         // Create the destination folder as a secondary child of the first

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

@@ -32,23 +32,15 @@ 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.CompositeCondition;
 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;
-import org.alfresco.util.collections.CollectionUtils;
-import org.alfresco.service.namespace.NamespaceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,7 +48,6 @@ import org.slf4j.LoggerFactory;
 public class RulesImpl implements Rules
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(RulesImpl.class);
-    private static final String MUST_HAVE_AT_LEAST_ONE_ACTION = "A rule must have at least one action";
 
     private Nodes nodes;
     private RuleService ruleService;
@@ -64,7 +55,6 @@ public class RulesImpl implements Rules
     private RuleLoader ruleLoader;
     private ActionParameterConverter actionParameterConverter;
     private ActionPermissionValidator actionPermissionValidator;
-    private RestModelMapper<CompositeCondition, ActionCondition> compositeConditionMapper;
 
     @Override
     public CollectionWithPagingInfo<Rule> getRules(final String folderNodeId,
@@ -73,10 +63,9 @@ public class RulesImpl implements Rules
                                                    final Paging paging)
     {
         final NodeRef folderNodeRef = validator.validateFolderNode(folderNodeId, false);
-        NodeRef ruleSetNode = validator.validateRuleSetNode(ruleSetId, folderNodeRef);
-        NodeRef owningFolder = ruleService.getOwningNodeRef(ruleSetNode);
+        validator.validateRuleSetNode(ruleSetId, folderNodeRef);
 
-        final List<Rule> rules = ruleService.getRules(owningFolder, false).stream()
+        final List<Rule> rules = ruleService.getRules(folderNodeRef).stream()
                 .map(ruleModel -> loadRuleAndConvertActionParams(ruleModel, includes))
                 .collect(Collectors.toList());
 
@@ -134,11 +123,7 @@ public class RulesImpl implements Rules
 
     private org.alfresco.service.cmr.rule.Rule mapToServiceModelAndValidateActions(Rule rule)
     {
-        if (CollectionUtils.isEmpty(rule.getActions()))
-        {
-            throw new InvalidArgumentException(MUST_HAVE_AT_LEAST_ONE_ACTION);
-        }
-        final org.alfresco.service.cmr.rule.Rule serviceModelRule = rule.toServiceModel(nodes, compositeConditionMapper);
+        final org.alfresco.service.cmr.rule.Rule serviceModelRule = rule.toServiceModel(nodes);
         final CompositeAction compositeAction = (CompositeAction) serviceModelRule.getAction();
         compositeAction.getActions().forEach(action -> action.setParameterValues(
                 actionParameterConverter.getConvertedParams(action.getParameterValues(), action.getActionDefinitionName())));
@@ -148,6 +133,7 @@ public class RulesImpl implements Rules
 
     private Rule loadRuleAndConvertActionParams(org.alfresco.service.cmr.rule.Rule ruleModel, List<String> includes)
     {
+
         final Rule rule = ruleLoader.loadRule(ruleModel, includes);
         rule.getActions()
                 .forEach(a -> a.setParams(a.getParams().entrySet()
@@ -188,10 +174,4 @@ public class RulesImpl implements Rules
     {
         this.actionPermissionValidator = actionPermissionValidator;
     }
-
-    public void setCompositeConditionMapper(
-            RestModelMapper<CompositeCondition, ActionCondition> compositeConditionMapper)
-    {
-        this.compositeConditionMapper = compositeConditionMapper;
-    }
 }

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

@@ -1,63 +0,0 @@
-/*
- * #%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>
-{
-    default R toRestModel(S serviceModel) {
-        throw new NotImplementedException();
-    }
-    default S toServiceModel(R restModel) {
-        throw new NotImplementedException();
-    }
-    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());
-    }
-    default List<R> toRestModels(S serviceModel) {
-        throw new NotImplementedException();
-    }
-    default List<S> toServiceModels(R restModel) {
-        throw new NotImplementedException();
-    }
-}

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

@@ -26,8 +26,6 @@
 
 package org.alfresco.rest.api.model.rules;
 
-import static org.alfresco.repo.action.access.ActionAccessRestriction.ACTION_CONTEXT_PARAM_NAME;
-
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
@@ -62,9 +60,7 @@ public class Action
         final Action.Builder builder = builder().actionDefinitionId(actionModel.getActionDefinitionName());
         if (actionModel.getParameterValues() != null)
         {
-            Map<String, Serializable> params = new HashMap<>(actionModel.getParameterValues());
-            params.remove(ACTION_CONTEXT_PARAM_NAME);
-            builder.params(params);
+            builder.params(new HashMap<>(actionModel.getParameterValues()));
         }
 
         return builder.create();

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

@@ -26,10 +26,15 @@
 
 package org.alfresco.rest.api.model.rules;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.apache.commons.collections.CollectionUtils;
 
 @Experimental
 public class CompositeCondition
@@ -39,6 +44,74 @@ public class CompositeCondition
     private List<CompositeCondition> compositeConditions;
     private List<SimpleCondition> simpleConditions;
 
+    /**
+     * Converts Action conditions (service POJO) list to composite condition (REST model).
+     *
+     * @param actionConditions - list of {@link ActionCondition} service POJOs
+     * @return {@link CompositeCondition} REST model
+     */
+    public static CompositeCondition from(final List<ActionCondition> actionConditions)
+    {
+        if (actionConditions == null)
+        {
+            return null;
+        }
+
+        final CompositeCondition conditions = new CompositeCondition();
+        conditions.compositeConditions = new ArrayList<>();
+        // 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, inverted, ConditionOperator.AND))
+                // if composite condition present add to final list
+                .ifPresent(compositeCondition -> conditions.compositeConditions.add(compositeCondition)));
+
+        if (conditions.compositeConditions.isEmpty()) {
+            conditions.compositeConditions = null;
+        }
+
+        return conditions;
+    }
+
+    private static CompositeCondition ofActionConditions(final List<ActionCondition> actionConditions, final boolean inverted, final ConditionOperator conditionOperator)
+    {
+        if (actionConditions == null)
+        {
+            return null;
+        }
+
+        return ofSimpleConditions(SimpleCondition.listOf(actionConditions), inverted, conditionOperator);
+    }
+
+    /**
+     * Creates a composite condition instance of simple conditions.
+     *
+     * @param simpleConditions - list of {@link SimpleCondition}
+     * @param inverted - determines if condition should be inverted
+     * @param conditionOperator - determines the operation, see {@link ConditionOperator}
+     * @return {@link CompositeCondition}
+     */
+    public static CompositeCondition ofSimpleConditions(final List<SimpleCondition> simpleConditions, final boolean inverted, final ConditionOperator conditionOperator)
+    {
+        return of(simpleConditions, null, inverted, conditionOperator);
+    }
+
+    private static CompositeCondition of(final List<SimpleCondition> simpleConditions, final List<CompositeCondition> compositeConditions,
+        final boolean inverted, final ConditionOperator conditionOperator)
+    {
+        if (CollectionUtils.isEmpty(simpleConditions) && CollectionUtils.isEmpty(compositeConditions))
+        {
+            return null;
+        }
+
+        return builder()
+            .inverted(inverted)
+            .booleanMode(conditionOperator)
+            .simpleConditions(simpleConditions)
+            .compositeConditions(compositeConditions)
+            .create();
+    }
+
     public boolean isInverted()
     {
         return inverted;
@@ -58,14 +131,6 @@ public class CompositeCondition
         return booleanMode.name().toLowerCase();
     }
 
-    public void setBooleanMode(String booleanMode)
-    {
-        if (booleanMode != null)
-        {
-            this.booleanMode = ConditionOperator.valueOf(booleanMode.toUpperCase());
-        }
-    }
-
     public void setBooleanMode(ConditionOperator booleanMode)
     {
         this.booleanMode = booleanMode;

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

@@ -33,13 +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;
 import org.alfresco.util.GUID;
 
 @Experimental
@@ -63,7 +60,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 RestModelMapper<CompositeCondition, ActionCondition> compositeConditionMapper)
+    public static Rule from(final org.alfresco.service.cmr.rule.Rule ruleModel)
     {
         if (ruleModel == null)
         {
@@ -86,7 +83,7 @@ public class Rule
         }
         if (ruleModel.getAction() != null)
         {
-            builder.conditions(compositeConditionMapper.toRestModel(ruleModel.getAction().getActionConditions()));
+            builder.conditions(CompositeCondition.from(ruleModel.getAction().getActionConditions()));
             if (ruleModel.getAction().getCompensatingAction() != null && ruleModel.getAction().getCompensatingAction().getParameterValue(ScriptActionExecuter.PARAM_SCRIPTREF) != null)
             {
                 builder.errorScript(ruleModel.getAction().getCompensatingAction().getParameterValue(ScriptActionExecuter.PARAM_SCRIPTREF).toString());
@@ -106,7 +103,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 RestModelMapper<CompositeCondition, ActionCondition> compositeConditionMapper)
+    public org.alfresco.service.cmr.rule.Rule toServiceModel(Nodes nodes)
     {
         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,10 +124,6 @@ public class Rule
             compensatingAction.setParameterValue(ScriptActionExecuter.PARAM_SCRIPTREF, errorScript);
             ruleModel.getAction().setCompensatingAction(compensatingAction);
         }
-        if (conditions != null)
-        {
-            compositeConditionMapper.toServiceModels(conditions).forEach(condition -> ruleModel.getAction().addActionCondition(condition));
-        }
 
         return ruleModel;
     }

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

@@ -26,7 +26,6 @@
 
 package org.alfresco.rest.api.model.rules;
 
-import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
 
@@ -41,10 +40,6 @@ 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)
     {
@@ -91,66 +86,6 @@ 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()
     {
@@ -159,10 +94,6 @@ 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()
                 + '}';
     }
@@ -177,17 +108,13 @@ public class RuleSet
         RuleSet ruleSet = (RuleSet) o;
         return Objects.equals(id, ruleSet.id)
                 && Objects.equals(owningFolder, ruleSet.owningFolder)
-                && inclusionType == ruleSet.inclusionType
-                && Objects.equals(inheritedBy, ruleSet.inheritedBy)
-                && Objects.equals(linkedToBy, ruleSet.linkedToBy)
-                && Objects.equals(isInherited, ruleSet.isInherited)
-                && Objects.equals(isLinkedTo, ruleSet.isLinkedTo);
+                && inclusionType == ruleSet.inclusionType;
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(id, owningFolder, inclusionType, inheritedBy, linkedToBy, isInherited, isLinkedTo);
+        return Objects.hash(id, owningFolder, inclusionType);
     }
 
     public static Builder builder()
@@ -200,10 +127,6 @@ 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)
         {
@@ -223,40 +146,12 @@ 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 either the rule set or the folder that contains the rule set.
+     * This id is referring to the node id of the linked-to-folder which contains the ruleset(s)
      */
     private String id;
 

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

@@ -26,43 +26,88 @@
 
 package org.alfresco.rest.api.model.rules;
 
-import java.io.Serializable;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
-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.mapper.RestModelMapper;
-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.CollectionUtils;
 
 @Experimental
 public class SimpleCondition
 {
+    private static final String COMPARATOR_EQUALS = "equals";
+
     private String field;
     private String comparator;
     private String parameter;
 
+    /**
+     * Converts list of service POJO action conditions to list of REST model simple conditions.
+     *
+     * @param actionConditions - list of {@link ActionCondition} service POJOs
+     * @return list of {@link SimpleCondition} REST models
+     */
+    public static List<SimpleCondition> listOf(final List<ActionCondition> actionConditions)
+    {
+        if (CollectionUtils.isEmpty(actionConditions))
+        {
+            return null;
+        }
+
+        return actionConditions.stream()
+            .map(SimpleCondition::from)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * Creates simple condition REST model instance from service POJO action condition.
+     *
+     * @param actionCondition - {@link ActionCondition} service POJO
+     * @return {@link SimpleCondition} REST model
+     */
+    public static SimpleCondition from(final ActionCondition actionCondition)
+    {
+        if (actionCondition == null || actionCondition.getActionConditionDefinitionName() == null || actionCondition.getParameterValues() == null)
+        {
+            return null;
+        }
+
+        switch (actionCondition.getActionConditionDefinitionName())
+        {
+        case ComparePropertyValueEvaluator.NAME:
+            return createComparePropertyValueCondition(actionCondition);
+        case CompareMimeTypeEvaluator.NAME:
+            return createCompareMimeTypeCondition(actionCondition);
+        case HasAspectEvaluator.NAME:
+            return createHasAspectCondition(actionCondition);
+        case HasChildEvaluator.NAME:
+            return createHasChildCondition(actionCondition);
+        case HasTagEvaluator.NAME:
+            return createHasTagCondition(actionCondition);
+        case HasVersionHistoryEvaluator.NAME:
+            return createHasVersionHistoryCondition(actionCondition);
+        case InCategoryEvaluator.NAME:
+            return createInCategoryCondition(actionCondition);
+        case IsSubTypeEvaluator.NAME:
+            return createIsSubtypeCondition(actionCondition);
+        case NoConditionEvaluator.NAME:
+        default:
+            return null;
+        }
+    }
+
     public String getField()
     {
         return field;
@@ -116,6 +161,82 @@ public class SimpleCondition
         return Objects.hash(field, comparator, parameter);
     }
 
+    private static SimpleCondition createComparePropertyValueCondition(final ActionCondition actionCondition) {
+        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(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_PROPERTY).toString().toLowerCase());
+        }
+        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(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_PROPERTY).toString().toLowerCase())
+            .comparator(COMPARATOR_EQUALS)
+            .parameter(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_VALUE).toString())
+            .create();
+    }
+
+    private static SimpleCondition createHasAspectCondition(final ActionCondition actionCondition) {
+        return builder()
+            .field(HasAspectEvaluator.PARAM_ASPECT)
+            .comparator(COMPARATOR_EQUALS)
+            .parameter(actionCondition.getParameterValues().get(HasAspectEvaluator.PARAM_ASPECT).toString())
+            .create();
+    }
+
+    private static SimpleCondition createHasChildCondition(final ActionCondition actionCondition) {
+        final SimpleCondition.Builder builder = builder();
+        if (actionCondition.getParameterValues().get(HasChildEvaluator.PARAM_ASSOC_TYPE) != null)
+        {
+            builder.field(actionCondition.getParameterValues().get(HasChildEvaluator.PARAM_ASSOC_TYPE).toString().toLowerCase());
+        } else {
+            builder.field(actionCondition.getParameterValues().get(HasChildEvaluator.PARAM_ASSOC_NAME).toString().toLowerCase());
+        }
+        return builder
+            .comparator(COMPARATOR_EQUALS)
+            .parameter(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_VALUE).toString())
+            .create();
+    }
+
+    private static SimpleCondition createHasTagCondition(final ActionCondition actionCondition) {
+        return builder()
+            .field(HasTagEvaluator.PARAM_TAG)
+            .comparator(COMPARATOR_EQUALS)
+            .parameter(actionCondition.getParameterValues().get(HasTagEvaluator.PARAM_TAG).toString())
+            .create();
+    }
+
+    private static SimpleCondition createHasVersionHistoryCondition(final ActionCondition actionCondition) {
+        return builder()
+            .field(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_PROPERTY).toString().toLowerCase())
+            .comparator(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_OPERATION).toString().toLowerCase())
+            .parameter(actionCondition.getParameterValues().get(ComparePropertyValueEvaluator.PARAM_VALUE).toString())
+            .create();
+    }
+
+    private static SimpleCondition createInCategoryCondition(final ActionCondition actionCondition) {
+        return builder()
+            .field(actionCondition.getParameterValues().get(InCategoryEvaluator.PARAM_CATEGORY_ASPECT).toString().toLowerCase())
+            .comparator(COMPARATOR_EQUALS)
+            .parameter(actionCondition.getParameterValues().get(InCategoryEvaluator.PARAM_CATEGORY_VALUE).toString())
+            .create();
+    }
+
+    private static SimpleCondition createIsSubtypeCondition(final ActionCondition actionCondition) {
+        return builder()
+            .field(IsSubTypeEvaluator.PARAM_TYPE)
+            .comparator(COMPARATOR_EQUALS)
+            .parameter(actionCondition.getParameterValues().get(IsSubTypeEvaluator.PARAM_TYPE).toString())
+            .create();
+    }
+
     public static Builder builder()
     {
         return new Builder();

remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRulesRelation.java

@@ -65,7 +65,7 @@ public class NodeRulesRelation implements RelationshipResourceAction.Read<Rule>,
 
     /**
      * List folder rules for given folder node's and rule set's IDs as a page.
-     * <p>
+     *
      * - GET /nodes/{folderNodeId}/rule-sets/{ruleSetId}/rules
      *
      * @param folderNodeId - entity resource context for this relationship
@@ -87,7 +87,7 @@ public class NodeRulesRelation implements RelationshipResourceAction.Read<Rule>,
 
     /**
      * Get single folder rule for given node's, rule set's and rule's IDs.
-     * <p>
+     *
      * - GET /nodes/{folderNodeId}/rule-sets/{ruleSetId}/rules/{ruleId}
      *
      * @param folderNodeId - entity resource context for this relationship
@@ -158,7 +158,7 @@ public class NodeRulesRelation implements RelationshipResourceAction.Read<Rule>,
 
     /**
      * Delete single folder rule for given node's, rule set's and rule's IDs.
-     * <p>
+     *
      * - DELETE /nodes/{folderNodeId}/rule-sets/{ruleSetId}/rules/{ruleId}
      *
      * @param folderNodeId - entity resource context for this relationship

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

@@ -863,7 +863,6 @@
 
     <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">
@@ -887,7 +886,6 @@
     <bean id="ruleLoader" class="org.alfresco.rest.api.impl.rules.RuleLoader">
         <property name="ruleService" ref="RuleService" />
         <property name="nodeValidator" ref="nodeValidator" />
-        <property name="compositeConditionMapper" ref="compositeConditionMapper"/>
     </bean>
 
     <bean class="org.alfresco.rest.api.nodes.NodeRuleSetsRelation">
@@ -911,7 +909,6 @@
         <property name="ruleLoader" ref="ruleLoader"/>
         <property name="actionParameterConverter" ref="actionParameterConverter"/>
         <property name="actionPermissionValidator" ref="actionPermissionValidator"/>
-        <property name="compositeConditionMapper" ref="compositeConditionMapper"/>
     </bean>
 
     <bean id="Rules" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -947,14 +944,6 @@
         <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="compositeConditionMapper" class="org.alfresco.rest.api.impl.mapper.rules.RestRuleCompositeConditionModelMapper">
-        <constructor-arg name="simpleConditionMapper" ref="simpleConditionMapper"/>
-    </bean>
-
     <bean id="publicapi.mimeTypePropertyLookup" class="org.alfresco.rest.api.lookups.MimeTypePropertyLookup">
         <property name="serviceRegistry" ref="ServiceRegistry"/>
         <property name="supported">

remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.js

@@ -309,7 +309,7 @@ function sortByName(a, b)
 
 function findUsers(searchTerm, maxResults, results)
 {
-   var personRefs = people.getPeople(searchTerm+ " [hint:useCQ]", maxResults, "lastName", true);
+   var personRefs = people.getPeople(searchTerm, maxResults, "lastName", true);
    
    // create person object for each result
    for each(var personRef in personRefs)

remote-api/src/test/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java

@@ -55,14 +55,10 @@ public class PreferenceServiceTest extends BaseWebScriptTest
     private PersonService personService;
 
     private static final String USER_ONE = "PreferenceTestOne" + System.currentTimeMillis();
-    private static final String USER_TWO = "PreferenceTestTwo" + System.currentTimeMillis();
+
     private static final String USER_BAD = "PreferenceTestBad" + System.currentTimeMillis();
 
-    private static final String URL = "/api/people/" + USER_ONE + "/preferences";
-    private static final String URL2 = "/api/people/" + USER_TWO + "/preferences";
-
-    private static final int NUM_THREADS = 3;
-    private static Integer THREADS_FINISHED = 0;
+    private static final String URL = "/api/people/" + USER_ONE + "/preferences";;
 
     @Override
     protected void setUp() throws Exception
@@ -79,7 +75,6 @@ public class PreferenceServiceTest extends BaseWebScriptTest
 
         // Create users
         createUser(USER_ONE);
-        createUser(USER_TWO);
         createUser(USER_BAD);
 
         // Do tests as user one
@@ -108,6 +103,7 @@ public class PreferenceServiceTest extends BaseWebScriptTest
     {
         super.tearDown();
         this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+
     }
 
     public void testPreferences() throws Exception
@@ -197,64 +193,6 @@ public class PreferenceServiceTest extends BaseWebScriptTest
         sendRequest(new GetRequest("/api/people/noExistUser/preferences"), 404);
     }
 
-    public void testPreferencesMNT21901() throws Exception
-    {
-        String[] body = {
-                "{\"org\":{\"alfresco\":{\"share\":{\"forum\":{\"summary\":{\"dashlet\":{\"component-1-5\":{\"topics\":\"mine\"}}}}}}}}",
-                "{\"org\":{\"alfresco\":{\"share\":{\"forum\":{\"summary\":{\"dashlet\":{\"component-2-5\":{\"topics\":\"mine\"}}}}}}}}",
-                "{\"org\":{\"alfresco\":{\"share\":{\"forum\":{\"summary\":{\"dashlet\":{\"component-2-5\":{\"history\":\"1\"}}}}}}}}" 
-        };
-
-        Thread[] threads = new Thread[NUM_THREADS];
-
-        for (int i = 0; i < NUM_THREADS; i++)
-        {
-            UpdatePreferencesThread t = new UpdatePreferencesThread(i, body[i]);
-            threads[i] = t;
-            t.start();
-        }
-
-        for (int i = 0; i < threads.length; i++)
-        {
-            threads[i].join();
-        }
-
-        authenticationComponent.setCurrentUser(USER_ONE);
-
-        if (THREADS_FINISHED != NUM_THREADS)
-        {
-            fail("An error has occurred when updating preferences in concurrency context");
-        }
-    }
-
-    private class UpdatePreferencesThread extends Thread
-    {
-        private String body;
-
-        UpdatePreferencesThread(int threadNum, String body)
-        {
-            super(UpdatePreferencesThread.class.getSimpleName() + "-" + threadNum);
-            this.body = body;
-        }
-
-        @Override
-        public void run()
-        {
-            authenticationComponent.setCurrentUser(USER_TWO);
-
-            try
-            {
-                Response resp = sendRequest(new PostRequest(URL2, body, "application/json"), 200);
-                assertEquals(0, resp.getContentLength());
-                THREADS_FINISHED++;
-            }
-            catch (Exception e)
-            {
-                // Intentionally empty
-            }
-        }
-    }
-
     private JSONObject getPreferenceObj() throws JSONException
     {
         JSONObject jsonObject = new JSONObject();
@@ -270,4 +208,5 @@ public class PreferenceServiceTest extends BaseWebScriptTest
         assertEquals(10, jsonObject.get("numberValue"));
         assertEquals(BigDecimal.valueOf(3.142), jsonObject.get("numberValue2"));
     }
+
 }

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

@@ -26,16 +26,13 @@
 
 package org.alfresco.rest.api;
 
-import org.alfresco.rest.api.impl.mapper.rules.RestRuleCompositeConditionModelMapperTest;
-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;
 import org.alfresco.rest.api.impl.rules.RulesImplTest;
 import org.alfresco.rest.api.model.rules.RuleTest;
+import org.alfresco.rest.api.model.rules.SimpleConditionTest;
 import org.alfresco.rest.api.nodes.NodeRulesRelationTest;
 import org.alfresco.service.Experimental;
 import org.junit.runner.RunWith;
@@ -50,11 +47,8 @@ import org.junit.runners.Suite;
     NodeValidatorTest.class,
     RuleTest.class,
     ActionTest.class,
-    RuleLoaderTest.class,
-    ActionParameterConverterTest.class,
-    ActionPermissionValidatorTest.class,
-    RestRuleSimpleConditionModelMapperTest.class,
-    RestRuleCompositeConditionModelMapperTest.class
+    SimpleConditionTest.class,
+    CompositeConditionTest.class
 })
 public class RulesUnitTests
 {

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

@@ -1,238 +0,0 @@
-/*
- * #%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.mockito.Mockito.when;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-import org.alfresco.repo.action.ActionConditionImpl;
-import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
-import org.alfresco.rest.api.model.mapper.RestModelMapper;
-import org.alfresco.rest.api.model.rules.CompositeCondition;
-import org.alfresco.rest.api.model.rules.ConditionOperator;
-import org.alfresco.rest.api.model.rules.SimpleCondition;
-import org.alfresco.service.Experimental;
-import org.alfresco.service.cmr.action.ActionCondition;
-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 RestRuleCompositeConditionModelMapperTest
-{
-
-    @Mock
-    private RestModelMapper<SimpleCondition, ActionCondition> simpleConditionMapperMock;
-
-    @InjectMocks
-    RestRuleCompositeConditionModelMapper objectUnderTest;
-
-    @Test
-    public void testToRestModel()
-    {
-        final List<ActionCondition> actionConditions = List.of(
-                createActionCondition("value1"),
-                createActionCondition("value3"),
-                createActionCondition("value2", true)
-        );
-        final List<SimpleCondition> simpleConditions = List.of(
-                createSimpleCondition("value1"),
-                createSimpleCondition("value3"),
-                createSimpleCondition("value2")
-        );
-
-        final CompositeCondition expectedCompositeCondition = createCompositeCondition(List.of(
-            createCompositeCondition(false, simpleConditions.subList(0,2)),
-            createCompositeCondition(true, simpleConditions.subList(2,3))
-        ));
-
-        when(simpleConditionMapperMock.toRestModels(actionConditions.subList(0,2))).thenReturn(simpleConditions.subList(0,2));
-        when(simpleConditionMapperMock.toRestModels(actionConditions.subList(2,3))).thenReturn(simpleConditions.subList(2,3));
-
-        // when
-        final CompositeCondition actualCompositeCondition = objectUnderTest.toRestModel(actionConditions);
-
-        assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCompositeCondition);
-    }
-
-    @Test
-    public void testToRestModel_fromEmptyList()
-    {
-        final List<ActionCondition> actionConditions = Collections.emptyList();
-
-        // when
-        final CompositeCondition actualCompositeCondition = objectUnderTest.toRestModel(actionConditions);
-
-        assertThat(actualCompositeCondition).isNull();
-    }
-
-    @Test
-    public void testToRestModel_fromNullValue()
-    {
-        // when
-        final CompositeCondition actualCompositeCondition = objectUnderTest.toRestModel((Collection<ActionCondition>) null);
-
-        assertThat(actualCompositeCondition).isNull();
-    }
-
-    @Test
-    public void testToRestModel_fromListContainingNull()
-    {
-        final List<ActionCondition> actionConditions = new ArrayList<>();
-        actionConditions.add(null);
-        final CompositeCondition expectedCompositeCondition = CompositeCondition.builder().create();
-
-        // when
-        final CompositeCondition actualCompositeCondition = objectUnderTest.toRestModel(actionConditions);
-
-        assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCompositeCondition);
-    }
-
-    @Test
-    public void testToServiceModels() {
-        final List<SimpleCondition> simpleConditions = List.of(
-                createSimpleCondition("value1"),
-                createSimpleCondition("value3"),
-                createSimpleCondition("value2")
-        );
-        final CompositeCondition compositeCondition = createCompositeCondition(List.of(
-                createCompositeCondition(false, simpleConditions.subList(0,2)),
-                createCompositeCondition(true, simpleConditions.subList(2,3))
-        ));
-        final List<ActionCondition> actionConditions = List.of(
-                createActionCondition("value1"),
-                createActionCondition("value3"),
-                createActionCondition("value2", true)
-        );
-
-        IntStream.rangeClosed(0, 2)
-                .forEach(i -> when(simpleConditionMapperMock.toServiceModel(simpleConditions.get(i))).thenReturn(actionConditions.get(i)));
-
-        final List<ActionCondition> actualActionConditions = objectUnderTest.toServiceModels(compositeCondition);
-        assertThat(actualActionConditions).isEqualTo(actionConditions);
-    }
-
-    @Test
-    public void testToServiceModels_simpleNonInvertedConditionsOnly() {
-        final List<SimpleCondition> simpleConditions = List.of(
-                createSimpleCondition("value1"),
-                createSimpleCondition("value2"),
-                createSimpleCondition("value3")
-        );
-        final CompositeCondition compositeCondition = createCompositeCondition(false, simpleConditions);
-        final List<ActionCondition> actionConditions = List.of(
-                createActionCondition("value1"),
-                createActionCondition("value2"),
-                createActionCondition("value3")
-        );
-
-        IntStream.rangeClosed(0, 2)
-                .forEach(i -> when(simpleConditionMapperMock.toServiceModel(simpleConditions.get(i))).thenReturn(actionConditions.get(i)));
-
-        final List<ActionCondition> actualActionConditions = objectUnderTest.toServiceModels(compositeCondition);
-        assertThat(actualActionConditions).isEqualTo(actionConditions);
-    }
-
-    @Test
-    public void testToServiceModels_nullSimpleConditions() {
-        final CompositeCondition compositeCondition = createCompositeCondition(false, null);
-
-        final List<ActionCondition> actualActionConditions = objectUnderTest.toServiceModels(compositeCondition);
-        assertThat(actualActionConditions).isNotNull().isEmpty();
-    }
-
-    @Test
-    public void testToServiceModels_emptyCompositeCondition() {
-        final CompositeCondition compositeCondition = CompositeCondition.builder().create();
-
-        final List<ActionCondition> actualActionConditions = objectUnderTest.toServiceModels(compositeCondition);
-        assertThat(actualActionConditions).isNotNull().isEmpty();
-    }
-
-    @Test
-    public void testToServiceModels_nullCompositeCondition() {
-        final CompositeCondition compositeCondition = null;
-
-        final List<ActionCondition> actualActionConditions = objectUnderTest.toServiceModels(compositeCondition);
-        assertThat(actualActionConditions).isNotNull().isEmpty();
-    }
-
-    private static ActionCondition createActionCondition(final String value)
-    {
-        return createActionCondition(value, false);
-    }
-
-    private static ActionCondition createActionCondition(final String value, final boolean inverted)
-    {
-        final ActionCondition actionCondition = new ActionConditionImpl("fake-id", ComparePropertyValueEvaluator.NAME);
-        actionCondition.setInvertCondition(inverted);
-        final Map<String, Serializable> parameterValues = new HashMap<>();
-        parameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, "content-property");
-        parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, "operation");
-        parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, value);
-        actionCondition.setParameterValues(parameterValues);
-        return actionCondition;
-    }
-
-    private static SimpleCondition createSimpleCondition(final String value) {
-        return SimpleCondition.builder()
-                .field("content-property")
-                .comparator("operation")
-                .parameter(value)
-                .create();
-    }
-
-    private static CompositeCondition createCompositeCondition(final List<CompositeCondition> compositeConditions) {
-        return createCompositeCondition(false, ConditionOperator.AND, compositeConditions, null);
-    }
-
-    private static CompositeCondition createCompositeCondition(final boolean inverted, final List<SimpleCondition> simpleConditions) {
-        return createCompositeCondition(inverted, ConditionOperator.AND, null, simpleConditions);
-    }
-
-    private static CompositeCondition createCompositeCondition(final boolean inverted, final ConditionOperator conditionOperator,
-                                                               final List<CompositeCondition> compositeConditions, final List<SimpleCondition> simpleConditions) {
-        return CompositeCondition.builder()
-                .inverted(inverted)
-                .booleanMode(conditionOperator)
-                .compositeConditions(compositeConditions)
-                .simpleConditions(simpleConditions)
-                .create();
-    }
-}

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

@@ -1,441 +0,0 @@
-/*
- * #%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.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.COMPARATOR_NOT_NULL;
-import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.FIELD_NOT_NULL;
-import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.PARAMETER_NOT_NULL;
-import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.PARAM_CATEGORY;
-import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.PARAM_MIMETYPE;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.BDDMockito.given;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-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.model.rules.SimpleCondition;
-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.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
-{
-    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(
-                (Collection<ActionCondition>) 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(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(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);
-    }
-
-    @Test
-    public void testToServiceModel_nullOrBlankParameter()
-    {
-        final SimpleCondition simpleConditionNullParam = createSimpleCondition(IsSubTypeEvaluator.PARAM_TYPE, null);
-
-        // when
-        assertThatThrownBy(() -> objectUnderTest.toServiceModel(simpleConditionNullParam))
-                .isInstanceOf(InvalidArgumentException.class)
-                .hasMessageContaining(PARAMETER_NOT_NULL);
-
-        final SimpleCondition simpleConditionEmptyParam = createSimpleCondition(IsSubTypeEvaluator.PARAM_TYPE, " ");
-
-        assertThatThrownBy(() -> objectUnderTest.toServiceModel(simpleConditionEmptyParam))
-                .isInstanceOf(InvalidArgumentException.class)
-                .hasMessageContaining(PARAMETER_NOT_NULL);
-    }
-
-    @Test
-    public void testToServiceModel_nullOrEmptyField()
-    {
-        final SimpleCondition simpleConditionNullField = createSimpleCondition(null);
-
-        // when
-        assertThatThrownBy(() -> objectUnderTest.toServiceModel(simpleConditionNullField))
-                .isInstanceOf(InvalidArgumentException.class)
-                .hasMessageContaining(FIELD_NOT_NULL);
-
-        final SimpleCondition simpleConditionEmptyField = createSimpleCondition("");
-
-        // when
-        assertThatThrownBy(() -> objectUnderTest.toServiceModel(simpleConditionEmptyField))
-                .isInstanceOf(InvalidArgumentException.class)
-                .hasMessageContaining(FIELD_NOT_NULL);
-    }
-
-    @Test
-    public void testToServiceModel_nullOrEmptyComparatorWhenRequired()
-    {
-        final SimpleCondition simpleConditionNullComparator = SimpleCondition.builder()
-                .field("size")
-                .comparator(null)
-                .parameter("65000")
-                .create();
-
-        // when
-        assertThatThrownBy(() -> objectUnderTest.toServiceModel(simpleConditionNullComparator))
-                .isInstanceOf(InvalidArgumentException.class)
-                .hasMessageContaining(COMPARATOR_NOT_NULL);
-
-        final SimpleCondition simpleConditionEmptyComparator = SimpleCondition.builder()
-                .field("size")
-                .comparator(" ")
-                .parameter("65000")
-                .create();
-
-        // when
-        assertThatThrownBy(() -> objectUnderTest.toServiceModel(simpleConditionEmptyComparator))
-                .isInstanceOf(InvalidArgumentException.class)
-                .hasMessageContaining(COMPARATOR_NOT_NULL);
-    }
-
-    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/ActionParameterConverterTest.java

@@ -29,7 +29,6 @@ package org.alfresco.rest.api.impl.rules;
 import static org.alfresco.service.cmr.repository.StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
@@ -50,7 +49,6 @@ import org.alfresco.repo.action.executer.RemoveFeaturesActionExecuter;
 import org.alfresco.repo.action.executer.ScriptActionExecuter;
 import org.alfresco.repo.action.executer.SetPropertyValueActionExecuter;
 import org.alfresco.repo.action.executer.SimpleWorkflowActionExecuter;
-import org.alfresco.rest.framework.core.exceptions.NotFoundException;
 import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.action.ActionDefinition;
 import org.alfresco.service.cmr.action.ActionService;
@@ -555,19 +553,6 @@ public class ActionParameterConverterTest
         assertEquals(propType, convertedPropTypeParam);
     }
 
-    @Test
-    public void testInvalidActionDefinitionConversion() {
-        final String invalidName = "dummy-definition";
-        final Map<String, Serializable> params = Map.of("dummy-key", "dummy-value");
-        given(actionService.getActionDefinition(invalidName)).willReturn(null);
-        //when-then
-        assertThrows(NotFoundException.class, () ->objectUnderTest.getConvertedParams(params, invalidName));
-
-        given(actionService.getActionDefinition(invalidName)).willThrow(NotFoundException.class);
-        //when-then
-        assertThrows(NotFoundException.class, () ->objectUnderTest.getConvertedParams(params, invalidName));
-    }
-
     @Test
     public void testQnameServiceModelParamConversion() {
         given(namespaceService.getPrefixes(any())).willReturn(List.of("cm"));

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

@@ -26,17 +26,11 @@
 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;
@@ -47,7 +41,6 @@ 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;
@@ -73,8 +66,6 @@ public class RuleSetLoaderTest extends TestCase
     @Mock
     private NodeService nodeServiceMock;
     @Mock
-    private RuleService ruleServiceMock;
-    @Mock
     private ChildAssociationRef ruleSetAssociationMock;
     @Mock
     private ChildAssociationRef linkAssociationMock;
@@ -88,8 +79,6 @@ 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
@@ -141,44 +130,4 @@ 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/RuleSetsImplTest.java

@@ -33,7 +33,6 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
-import static org.mockito.Mockito.mock;
 
 import java.util.Collection;
 import java.util.List;
@@ -102,8 +101,6 @@ public class RuleSetsImplTest extends TestCase
         given(nodeValidatorMock.validateRuleSetNode(RULE_SET_ID, FOLDER_NODE)).willReturn(RULE_SET_NODE);
 
         given(ruleServiceMock.getRuleSetNode(FOLDER_NODE)).willReturn(RULE_SET_NODE);
-        given(ruleServiceMock.getNodesSupplyingRuleSets(FOLDER_NODE)).willReturn(List.of(FOLDER_NODE));
-
         given(ruleSetLoaderMock.loadRuleSet(RULE_SET_NODE, FOLDER_NODE, INCLUDES)).willReturn(ruleSetMock);
     }
 
@@ -116,7 +113,6 @@ public class RuleSetsImplTest extends TestCase
         then(nodeValidatorMock).should().validateFolderNode(FOLDER_ID, false);
         then(nodeValidatorMock).shouldHaveNoMoreInteractions();
 
-        then(ruleServiceMock).should().getNodesSupplyingRuleSets(FOLDER_NODE);
         then(ruleServiceMock).should().getRuleSetNode(FOLDER_NODE);
         then(ruleServiceMock).shouldHaveNoMoreInteractions();
 
@@ -137,7 +133,6 @@ public class RuleSetsImplTest extends TestCase
         then(nodeValidatorMock).should().validateFolderNode(FOLDER_ID, false);
         then(nodeValidatorMock).shouldHaveNoMoreInteractions();
 
-        then(ruleServiceMock).should().getNodesSupplyingRuleSets(FOLDER_NODE);
         then(ruleServiceMock).should().getRuleSetNode(FOLDER_NODE);
         then(ruleServiceMock).shouldHaveNoMoreInteractions();
 
@@ -145,62 +140,6 @@ public class RuleSetsImplTest extends TestCase
         assertEquals(PAGING, actual.getPaging());
     }
 
-    /** Check that a folder with a parent and grandparent can inherit rule sets from the grandparent, even if the parent has no rules. */
-    @Test
-    public void testGetInheritedRuleSets()
-    {
-        // Simulate a parent node without a rule set.
-        NodeRef parentNode = new NodeRef("parent://node/");
-        // Simulate a grandparent node providing a rule set.
-        NodeRef grandparentNode = new NodeRef("grandparent://node/");
-        RuleSet grandparentRuleSet = mock(RuleSet.class);
-        NodeRef grandparentRuleSetNode = new NodeRef("grandparent://rule-set/");
-        given(ruleServiceMock.getRuleSetNode(grandparentNode)).willReturn(grandparentRuleSetNode);
-        given(ruleSetLoaderMock.loadRuleSet(grandparentRuleSetNode, FOLDER_NODE, INCLUDES)).willReturn(grandparentRuleSet);
-        // These should be returned with the highest in hierarchy first.
-        given(ruleServiceMock.getNodesSupplyingRuleSets(FOLDER_NODE)).willReturn(List.of(grandparentNode, parentNode, FOLDER_NODE));
-
-        // Call the method under test.
-        CollectionWithPagingInfo<RuleSet> actual = ruleSets.getRuleSets(FOLDER_ID, INCLUDES, PAGING);
-
-        then(nodeValidatorMock).should().validateFolderNode(FOLDER_ID, false);
-        then(nodeValidatorMock).shouldHaveNoMoreInteractions();
-
-        then(ruleServiceMock).should().getNodesSupplyingRuleSets(FOLDER_NODE);
-        then(ruleServiceMock).should().getRuleSetNode(grandparentNode);
-        then(ruleServiceMock).should().getRuleSetNode(parentNode);
-        then(ruleServiceMock).should().getRuleSetNode(FOLDER_NODE);
-        then(ruleServiceMock).shouldHaveNoMoreInteractions();
-
-        Collection<RuleSet> expected = List.of(grandparentRuleSet, ruleSetMock);
-        assertEquals(expected, actual.getCollection());
-        assertEquals(PAGING, actual.getPaging());
-    }
-
-    /** When getting rule sets then only the first instance of each rule set should be included (ancestor first). */
-    @Test
-    public void testGetDuplicateRuleSets()
-    {
-        // Simulate a grandparent, parent and child with the grandparent linking to the child's rule set.
-        NodeRef grandparentNode = new NodeRef("grandparent://node/");
-        given(ruleServiceMock.getRuleSetNode(grandparentNode)).willReturn(RULE_SET_NODE);
-        NodeRef parentNode = new NodeRef("parent://node/");
-        RuleSet parentRuleSet = mock(RuleSet.class);
-        NodeRef parentRuleSetNode = new NodeRef("parent://rule-set/");
-        given(ruleServiceMock.getRuleSetNode(parentNode)).willReturn(parentRuleSetNode);
-        given(ruleSetLoaderMock.loadRuleSet(parentRuleSetNode, FOLDER_NODE, INCLUDES)).willReturn(parentRuleSet);
-        // These should be returned with the highest in hierarchy first.
-        given(ruleServiceMock.getNodesSupplyingRuleSets(FOLDER_NODE)).willReturn(List.of(grandparentNode, parentNode, FOLDER_NODE));
-
-        // Call the method under test.
-        CollectionWithPagingInfo<RuleSet> actual = ruleSets.getRuleSets(FOLDER_ID, INCLUDES, PAGING);
-
-        // The grandparent's linked rule set should be first and only appear once.
-        Collection<RuleSet> expected = List.of(ruleSetMock, parentRuleSet);
-        assertEquals(expected, actual.getCollection());
-        assertEquals(PAGING, actual.getPaging());
-    }
-
     @Test
     public void testGetRuleSetById()
     {

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

@@ -49,11 +49,7 @@ import junit.framework.TestCase;
 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.CompositeCondition;
 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;
@@ -61,7 +57,6 @@ 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;
@@ -92,8 +87,6 @@ public class RulesImplTest extends TestCase
     @Mock
     private Nodes nodesMock;
     @Mock
-    private RestModelMapper<CompositeCondition, ActionCondition> compositeConditionMapperMock;
-    @Mock
     private NodeValidator nodeValidatorMock;
     @Mock
     private RuleService ruleServiceMock;
@@ -107,9 +100,6 @@ public class RulesImplTest extends TestCase
     private org.alfresco.service.cmr.rule.Rule serviceRuleMock;
     @Mock
     private Rule ruleMock;
-    @Mock
-    private Action actionMock;
-
     private org.alfresco.service.cmr.rule.Rule ruleModel = createRule(RULE_ID);
     private CompositeAction compositeAction = new CompositeActionImpl(RULE_NODE_REF, "compositeActionId");
 
@@ -125,8 +115,7 @@ public class RulesImplTest extends TestCase
         given(nodeValidatorMock.validateRuleNode(any(), any())).willReturn(RULE_NODE_REF);
 
         given(ruleServiceMock.getRule(RULE_NODE_REF)).willReturn(ruleModel);
-        given(ruleServiceMock.getRules(FOLDER_NODE_REF, false)).willReturn(List.of(ruleModel));
-        given(ruleServiceMock.getOwningNodeRef(RULE_SET_NODE_REF)).willReturn(FOLDER_NODE_REF);
+        given(ruleServiceMock.getRules(FOLDER_NODE_REF)).willReturn(List.of(ruleModel));
 
         given(ruleLoaderMock.loadRule(ruleModel, INCLUDE)).willReturn(ruleMock);
 
@@ -137,15 +126,13 @@ public class RulesImplTest extends TestCase
     public void testGetRules()
     {
         given(ruleLoaderMock.loadRule(ruleModel, emptyList())).willReturn(ruleMock);
-
         // when
         final CollectionWithPagingInfo<Rule> rulesPage = rules.getRules(FOLDER_NODE_ID, RULE_SET_ID, INCLUDE, PAGING);
 
         then(nodeValidatorMock).should().validateFolderNode(FOLDER_NODE_ID, false);
         then(nodeValidatorMock).should().validateRuleSetNode(RULE_SET_ID, FOLDER_NODE_REF);
         then(nodeValidatorMock).shouldHaveNoMoreInteractions();
-        then(ruleServiceMock).should().getOwningNodeRef(RULE_SET_NODE_REF);
-        then(ruleServiceMock).should().getRules(FOLDER_NODE_REF, false);
+        then(ruleServiceMock).should().getRules(FOLDER_NODE_REF);
         then(ruleServiceMock).shouldHaveNoMoreInteractions();
         then(ruleLoaderMock).should().loadRule(ruleModel, emptyList());
         then(ruleLoaderMock).shouldHaveNoMoreInteractions();
@@ -161,13 +148,12 @@ public class RulesImplTest extends TestCase
     @Test
     public void testGetRules_emptyResult()
     {
-        given(ruleServiceMock.getRules(FOLDER_NODE_REF, false)).willReturn(emptyList());
+        given(ruleServiceMock.getRules(any())).willReturn(emptyList());
 
         // when
         final CollectionWithPagingInfo<Rule> rulesPage = rules.getRules(FOLDER_NODE_ID, RULE_SET_ID, INCLUDE, PAGING);
 
-        then(ruleServiceMock).should().getOwningNodeRef(RULE_SET_NODE_REF);
-        then(ruleServiceMock).should().getRules(FOLDER_NODE_REF, false);
+        then(ruleServiceMock).should().getRules(FOLDER_NODE_REF);
         then(ruleServiceMock).shouldHaveNoMoreInteractions();
         assertThat(rulesPage)
                 .isNotNull()
@@ -298,8 +284,7 @@ public class RulesImplTest extends TestCase
     public void testCreateRules()
     {
         List<Rule> ruleList = List.of(ruleMock);
-        given(ruleMock.toServiceModel(nodesMock, compositeConditionMapperMock)).willReturn(serviceRuleMock);
-        given(ruleMock.getActions()).willReturn(List.of(actionMock));
+        given(ruleMock.toServiceModel(nodesMock)).willReturn(serviceRuleMock);
         given(serviceRuleMock.getAction()).willReturn(compositeAction);
         given(ruleServiceMock.saveRule(FOLDER_NODE_REF, serviceRuleMock)).willAnswer(arg -> arg.getArguments()[1]);
         given(ruleLoaderMock.loadRule(serviceRuleMock, INCLUDE)).willReturn(ruleMock);
@@ -315,7 +300,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, compositeConditionMapperMock));
+        then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleMock.toServiceModel(nodesMock));
         then(ruleServiceMock).shouldHaveNoMoreInteractions();
         List<Rule> expected = List.of(ruleMock);
         assertThat(actual).isEqualTo(expected);
@@ -328,8 +313,7 @@ public class RulesImplTest extends TestCase
     public void testCreateRules_defaultRuleSet()
     {
         List<Rule> ruleList = List.of(ruleMock);
-        given(ruleMock.toServiceModel(nodesMock, compositeConditionMapperMock)).willReturn(serviceRuleMock);
-        given(ruleMock.getActions()).willReturn(List.of(actionMock));
+        given(ruleMock.toServiceModel(nodesMock)).willReturn(serviceRuleMock);
         given(ruleServiceMock.saveRule(FOLDER_NODE_REF, serviceRuleMock)).willAnswer(arg -> arg.getArguments()[1]);
         given(ruleLoaderMock.loadRule(serviceRuleMock, INCLUDE)).willReturn(ruleMock);
         given(serviceRuleMock.getAction()).willReturn(compositeAction);
@@ -344,7 +328,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, compositeConditionMapperMock));
+        then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleMock.toServiceModel(nodesMock));
         then(ruleServiceMock).shouldHaveNoMoreInteractions();
         List<Rule> expected = List.of(ruleMock);
         assertThat(actual).isEqualTo(expected);
@@ -372,10 +356,9 @@ public class RulesImplTest extends TestCase
         List<Rule> expected = new ArrayList<>();
         IntStream.range(0, 3).forEach(i -> {
             Rule ruleBodyMock = mock(Rule.class);
-            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, compositeConditionMapperMock)).willReturn(serviceRuleMockInner);
+            given(ruleBodyMock.toServiceModel(nodesMock)).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);
@@ -394,9 +377,8 @@ public class RulesImplTest extends TestCase
         then(nodeValidatorMock).shouldHaveNoMoreInteractions();
         for (Rule ruleBody : ruleBodyList)
         {
-            then(actionPermissionValidatorMock).should().validateRulePermissions(ruleBody.toServiceModel(nodesMock,
-                    compositeConditionMapperMock));
-            then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleBody.toServiceModel(nodesMock, compositeConditionMapperMock));
+            then(actionPermissionValidatorMock).should().validateRulePermissions(ruleBody.toServiceModel(nodesMock));
+            then(ruleServiceMock).should().saveRule(FOLDER_NODE_REF, ruleBody.toServiceModel(nodesMock));
         }
         then(actionParameterConverterMock).should(times(3)).getConvertedParams(DUMMY_PARAMS, ACTION_DEFINITION_NAME);
         then(actionParameterConverterMock).shouldHaveNoMoreInteractions();
@@ -443,35 +425,13 @@ public class RulesImplTest extends TestCase
         }
     }
 
-    /**
-     * Fail on create a rule without any actions.
-     */
-    @Test
-    public void testCreateRuleWithoutActionsShouldFail()
-    {
-        List<Rule> ruleList = List.of(ruleMock);
-        given(ruleMock.getActions()).willReturn(null);
-
-        // when
-        assertThatExceptionOfType(InvalidArgumentException.class)
-                .isThrownBy(() -> rules.createRules(FOLDER_NODE_REF.getId(), RULE_SET_NODE_REF.getId(), ruleList, INCLUDE));
-
-        then(nodeValidatorMock).should().validateFolderNode(FOLDER_NODE_ID, true);
-        then(nodeValidatorMock).should().validateRuleSetNode(RULE_SET_ID, FOLDER_NODE_REF);
-        then(nodeValidatorMock).shouldHaveNoMoreInteractions();
-        then(actionParameterConverterMock).shouldHaveNoInteractions();
-        then(actionPermissionValidatorMock).shouldHaveNoInteractions();
-        then(ruleServiceMock).shouldHaveNoInteractions();
-    }
-
     /**
      * Check that we can update a rule.
      */
     @Test
     public void testUpdateRuleById()
     {
-        given(ruleMock.toServiceModel(nodesMock, compositeConditionMapperMock)).willReturn(serviceRuleMock);
-        given(ruleMock.getActions()).willReturn(List.of(actionMock));
+        given(ruleMock.toServiceModel(nodesMock)).willReturn(serviceRuleMock);
         given(ruleServiceMock.saveRule(FOLDER_NODE_REF, serviceRuleMock)).willAnswer(a -> a.getArguments()[1]);
         given(serviceRuleMock.getAction()).willReturn(compositeAction);
         given(ruleLoaderMock.loadRule(serviceRuleMock, INCLUDE)).willReturn(ruleMock);
@@ -553,28 +513,6 @@ public class RulesImplTest extends TestCase
         }
     }
 
-    /**
-     * Fail on update a rule without any actions.
-     */
-    @Test
-    public void testUpdateRuleWithoutActionShouldFail()
-    {
-        given(ruleMock.getActions()).willReturn(emptyList());
-
-        // when
-        assertThatExceptionOfType(InvalidArgumentException.class)
-                .isThrownBy(() -> rules.updateRuleById(FOLDER_NODE_REF.getId(), RULE_SET_NODE_REF.getId(), RULE_ID, ruleMock, INCLUDE));
-
-        then(nodeValidatorMock).should().validateFolderNode(FOLDER_NODE_ID, true);
-        then(nodeValidatorMock).should().validateRuleSetNode(RULE_SET_ID, FOLDER_NODE_REF);
-        then(nodeValidatorMock).should().validateRuleNode(RULE_ID, RULE_SET_NODE_REF);
-        then(nodeValidatorMock).shouldHaveNoMoreInteractions();
-
-        then(ruleServiceMock).shouldHaveNoInteractions();
-        then(actionParameterConverterMock).shouldHaveNoInteractions();
-        then(actionPermissionValidatorMock).shouldHaveNoInteractions();
-    }
-
     @Test
     public void testDeleteRuleById()
     {

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

@@ -0,0 +1,180 @@
+/*
+ * #%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.rules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+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 org.alfresco.repo.action.ActionConditionImpl;
+import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
+import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.junit.Test;
+
+@Experimental
+public class CompositeConditionTest
+{
+
+    @Test
+    public void testFrom()
+    {
+        final List<ActionCondition> actionConditions = List.of(
+            createActionCondition("value1"),
+            createActionCondition("value2", true),
+            createActionCondition("value3")
+        );
+        final CompositeCondition expectedCompositeCondition = createCompositeCondition(List.of(
+            createCompositeCondition(false, List.of(
+                createSimpleCondition("value1"),
+                createSimpleCondition("value3")
+            )),
+            createCompositeCondition(true, List.of(
+                createSimpleCondition("value2")
+            ))
+        ));
+
+        // when
+        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions);
+
+        assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCompositeCondition);
+    }
+
+    @Test
+    public void testFromEmptyList()
+    {
+        final List<ActionCondition> actionConditions = Collections.emptyList();
+        final CompositeCondition expectedCompositeCondition = CompositeCondition.builder().create();
+
+        // when
+        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions);
+
+        assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCompositeCondition);
+    }
+
+    @Test
+    public void testFromNullValue()
+    {
+        // when
+        final CompositeCondition actualCompositeCondition = CompositeCondition.from(null);
+
+        assertThat(actualCompositeCondition).isNull();
+    }
+
+    @Test
+    public void testFromListContainingNull()
+    {
+        final List<ActionCondition> actionConditions = new ArrayList<>();
+        actionConditions.add(null);
+        final CompositeCondition expectedCompositeCondition = CompositeCondition.builder().create();
+
+        // when
+        final CompositeCondition actualCompositeCondition = CompositeCondition.from(actionConditions);
+
+        assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCompositeCondition);
+    }
+
+    @Test
+    public void testOfSimpleConditions()
+    {
+        final List<SimpleCondition> simpleConditions = List.of(SimpleCondition.builder().field("field").comparator("comparator").parameter("param").create());
+        final boolean inverted = true;
+        final ConditionOperator conditionOperator = ConditionOperator.OR;
+        final CompositeCondition expectedCondition = createCompositeCondition(inverted, conditionOperator, null, simpleConditions);
+
+        // when
+        final CompositeCondition actualCompositeCondition = CompositeCondition.ofSimpleConditions(simpleConditions, inverted, conditionOperator);
+
+        assertThat(actualCompositeCondition).isNotNull().usingRecursiveComparison().isEqualTo(expectedCondition);
+    }
+
+    @Test
+    public void testOfEmptySimpleConditions()
+    {
+        // when
+        final CompositeCondition actualCompositeCondition = CompositeCondition.ofSimpleConditions(Collections.emptyList(), false, ConditionOperator.AND);
+
+        assertThat(actualCompositeCondition).isNull();
+    }
+
+    @Test
+    public void testOfNullSimpleConditions()
+    {
+        // when
+        final CompositeCondition actualCompositeCondition = CompositeCondition.ofSimpleConditions(null, false, ConditionOperator.AND);
+
+        assertThat(actualCompositeCondition).isNull();
+    }
+
+    private static ActionCondition createActionCondition(final String value)
+    {
+        return createActionCondition(value, false);
+    }
+
+    private static ActionCondition createActionCondition(final String value, final boolean inverted)
+    {
+        final ActionCondition actionCondition = new ActionConditionImpl("fake-id", ComparePropertyValueEvaluator.NAME);
+        actionCondition.setInvertCondition(inverted);
+        final Map<String, Serializable> parameterValues = new HashMap<>();
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, "content-property");
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, "operation");
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, value);
+        actionCondition.setParameterValues(parameterValues);
+        return actionCondition;
+    }
+
+    private static SimpleCondition createSimpleCondition(final String value) {
+        return SimpleCondition.builder()
+            .field("content-property")
+            .comparator("operation")
+            .parameter(value)
+            .create();
+    }
+
+    private static CompositeCondition createCompositeCondition(final List<CompositeCondition> compositeConditions) {
+        return createCompositeCondition(false, ConditionOperator.AND, compositeConditions, null);
+    }
+
+    private static CompositeCondition createCompositeCondition(final boolean inverted, final List<SimpleCondition> simpleConditions) {
+        return createCompositeCondition(inverted, ConditionOperator.AND, null, simpleConditions);
+    }
+
+    private static CompositeCondition createCompositeCondition(final boolean inverted, final ConditionOperator conditionOperator,
+        final List<CompositeCondition> compositeConditions, final List<SimpleCondition> simpleConditions) {
+        return CompositeCondition.builder()
+            .inverted(inverted)
+            .booleanMode(conditionOperator)
+            .compositeConditions(compositeConditions)
+            .simpleConditions(simpleConditions)
+            .create();
+    }
+}

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

@@ -37,9 +37,6 @@ 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.RestRuleCompositeConditionModelMapper;
-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;
@@ -63,8 +60,6 @@ public class RuleTest
     private static final String ACTION_DEFINITION_NAME = "action-def-name";
     private static final String ERROR_SCRIPT = "error-script-ref";
 
-    private final RestModelMapper<CompositeCondition, ActionCondition> compositeConditionMapper = mock(RestRuleCompositeConditionModelMapper.class);
-
     @Test
     public void testFrom()
     {
@@ -72,7 +67,7 @@ public class RuleTest
         final Rule expectedRule = createRuleWithDefaultValues();
 
         // when
-        final Rule actualRule = Rule.from(ruleModel, compositeConditionMapper);
+        final Rule actualRule = Rule.from(ruleModel);
 
         assertThat(actualRule).isNotNull().usingRecursiveComparison().isEqualTo(expectedRule);
 
@@ -85,7 +80,7 @@ public class RuleTest
         final Rule expectedRule = Rule.builder().enabled(true).create();
 
         // when
-        final Rule actualRule = Rule.from(ruleModel, compositeConditionMapper);
+        final Rule actualRule = Rule.from(ruleModel);
 
         assertThat(actualRule).isNotNull().usingRecursiveComparison().isEqualTo(expectedRule);
 
@@ -101,7 +96,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, compositeConditionMapper);
+        final org.alfresco.service.cmr.rule.Rule actualRuleModel = rule.toServiceModel(nodesMock);
 
         then(nodesMock).should().validateOrLookupNode(RULE_ID, null);
         then(nodesMock).shouldHaveNoMoreInteractions();
@@ -126,7 +121,7 @@ public class RuleTest
         expectedRuleModel.setRuleDisabled(true);
 
         // when
-        final org.alfresco.service.cmr.rule.Rule actualRuleModel = rule.toServiceModel(nodesMock, compositeConditionMapper);
+        final org.alfresco.service.cmr.rule.Rule actualRuleModel = rule.toServiceModel(nodesMock);
 
         then(nodesMock).shouldHaveNoInteractions();
         assertThat(actualRuleModel)
@@ -136,20 +131,6 @@ public class RuleTest
             .isEqualTo(expectedRuleModel);
     }
 
-    private Rule createRuleWithDefaultValues() {
-        return Rule.builder()
-            .id(RULE_ID)
-            .name(RULE_NAME)
-            .description(RULE_DESCRIPTION)
-            .enabled(RULE_ENABLED)
-            .cascade(RULE_CASCADE)
-            .asynchronous(RULE_ASYNC)
-            .triggers(List.of(RuleTrigger.INBOUND, RuleTrigger.UPDATE))
-            .errorScript(ERROR_SCRIPT)
-            .conditions(compositeConditionMapper.toRestModel(Collections.emptyList()))
-            .create();
-    }
-
     private static org.alfresco.service.cmr.rule.Rule createRuleModel() {
         final NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, RULE_ID);
         final org.alfresco.service.cmr.rule.Rule ruleModel = new org.alfresco.service.cmr.rule.Rule(nodeRef);
@@ -179,4 +160,18 @@ public class RuleTest
 
         return compensatingActionModel;
     }
-}
+
+    private static Rule createRuleWithDefaultValues() {
+        return Rule.builder()
+            .id(RULE_ID)
+            .name(RULE_NAME)
+            .description(RULE_DESCRIPTION)
+            .enabled(RULE_ENABLED)
+            .cascade(RULE_CASCADE)
+            .asynchronous(RULE_ASYNC)
+            .triggers(List.of(RuleTrigger.INBOUND, RuleTrigger.UPDATE))
+            .errorScript(ERROR_SCRIPT)
+            .conditions(CompositeCondition.from(Collections.emptyList()))
+            .create();
+    }
+}

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

@@ -0,0 +1,213 @@
+/*
+ * #%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.rules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+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.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.service.Experimental;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.junit.Test;
+
+@Experimental
+public class SimpleConditionTest
+{
+
+    private static List<TestData> getTestData() {
+        return List.of(
+            TestData.of(ComparePropertyValueEvaluator.NAME),
+            TestData.of(CompareMimeTypeEvaluator.NAME),
+            TestData.of(HasAspectEvaluator.NAME),
+            TestData.of(HasChildEvaluator.NAME),
+            TestData.of(HasTagEvaluator.NAME),
+            TestData.of(HasVersionHistoryEvaluator.NAME),
+            TestData.of(InCategoryEvaluator.NAME),
+            TestData.of(IsSubTypeEvaluator.NAME),
+            TestData.of(NoConditionEvaluator.NAME, true),
+            TestData.of("fake-definition-name", true),
+            TestData.of("", true),
+            TestData.of(null, true)
+        );
+    }
+
+    @Test
+    public void testFrom()
+    {
+        for (TestData testData : getTestData())
+        {
+            final ActionCondition actionCondition = createActionCondition(testData.actionDefinitionName);
+
+            // when
+            final SimpleCondition actualSimpleCondition = SimpleCondition.from(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 testFromNullValue()
+    {
+        // when
+        final SimpleCondition actualSimpleCondition = SimpleCondition.from(null);
+
+        assertThat(actualSimpleCondition).isNull();
+    }
+
+    @Test
+    public void testFromActionConditionWithoutDefinitionName()
+    {
+        final ActionCondition actionCondition = new ActionConditionImpl("fake-id", null, createParameterValues());
+
+        // when
+        final SimpleCondition actualSimpleCondition = SimpleCondition.from(actionCondition);
+
+        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);
+
+        assertThat(actualSimpleCondition).isNull();
+    }
+
+    @Test
+    public void testListOf()
+    {
+        final List<ActionCondition> actionConditions = List.of(
+            createActionCondition(ComparePropertyValueEvaluator.NAME),
+            createActionCondition(CompareMimeTypeEvaluator.NAME)
+        );
+        final List<SimpleCondition> expectedSimpleConditions = List.of(
+            SimpleCondition.builder().field("content-property").comparator("operation").parameter("value").create(),
+            SimpleCondition.builder().field("property").comparator("equals").parameter("value").create()
+        );
+
+        // when
+        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(actionConditions);
+
+        assertThat(actualSimpleConditions)
+            .isNotNull()
+            .containsExactlyElementsOf(expectedSimpleConditions);
+    }
+
+    @Test
+    public void testListOfEmptyActionConditions()
+    {
+        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(Collections.emptyList());
+
+        assertThat(actualSimpleConditions).isNull();
+    }
+
+    @Test
+    public void testListOfNullActionConditions()
+    {
+        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(null);
+
+        assertThat(actualSimpleConditions).isNull();
+    }
+
+    @Test
+    public void testListOfActionConditionsContainingNull()
+    {
+        final List<ActionCondition> actionConditions = new ArrayList<>();
+        actionConditions.add(null);
+
+        final List<SimpleCondition> actualSimpleConditions = SimpleCondition.listOf(actionConditions);
+
+        assertThat(actualSimpleConditions).isNotNull().isEmpty();
+    }
+
+    private static ActionCondition createActionCondition(final String actionDefinitionName)
+    {
+        return new ActionConditionImpl("fake-id", actionDefinitionName, createParameterValues());
+    }
+
+    private static Map<String, Serializable> createParameterValues() {
+        final Map<String, Serializable> parameterValues = new HashMap<>();
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_CONTENT_PROPERTY, "content-property");
+        parameterValues.put(HasChildEvaluator.PARAM_ASSOC_TYPE, "assoc-type");
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, "property");
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, "operation");
+        parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, "value");
+        parameterValues.put(HasAspectEvaluator.PARAM_ASPECT, "aspect");
+        parameterValues.put(HasChildEvaluator.PARAM_ASSOC_NAME, "assoc-name");
+        parameterValues.put(HasTagEvaluator.PARAM_TAG, "tag");
+        parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, "category-aspect");
+        parameterValues.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, "category-value");
+        parameterValues.put(IsSubTypeEvaluator.PARAM_TYPE, "type");
+
+        return parameterValues;
+    }
+
+    private static class TestData
+    {
+        String actionDefinitionName;
+        boolean isNullResult;
+
+        public TestData(String actionDefinitionName, boolean isNullResult)
+        {
+            this.actionDefinitionName = actionDefinitionName;
+            this.isNullResult = isNullResult;
+        }
+
+        public static TestData of(String actionDefinitionName) {
+            return new TestData(actionDefinitionName, false);
+        }
+
+        public static TestData of(String actionDefinitionName, boolean isNullResult) {
+            return new TestData(actionDefinitionName, isNullResult);
+        }
+    }
+}

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

@@ -106,7 +106,6 @@ import org.apache.commons.collections.map.MultiValueMap;
 import org.json.simple.JSONObject;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -3612,7 +3611,6 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
      * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
      */
     @Test
-    @Ignore("ACS-3531 Frequent intermittent failure")
     public void testDownloadFileContent() throws Exception
     {
         setRequestContext(user1);

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.128</version>
+        <version>17.102-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -374,7 +374,7 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.3.1</version>
+            <version>6.3.0</version>
         </dependency>
 
         <!-- GData -->
@@ -691,16 +691,6 @@
             <artifactId>camel-mock</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Netty non-transitive dependencies declared for depending projects usage in conjunction with Camel's other transitive netty dependencies -->
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler-proxy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative-classes</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-client</artifactId>

repository/src/main/java/org/alfresco/repo/action/ParameterizedItemImpl.java

@@ -1,34 +1,33 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 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%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 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.repo.action;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 import org.alfresco.service.cmr.action.ParameterizedItem;
 
@@ -39,8 +38,8 @@ import org.alfresco.service.cmr.action.ParameterizedItem;
  */
 public abstract class ParameterizedItemImpl implements ParameterizedItem, Serializable
 {
-    private static final long serialVersionUID = 3578052215076397741L;
-
+    private static final long serialVersionUID = 3578052215076397741L;
+
     /**
      * The id
      */
@@ -51,23 +50,23 @@ public abstract class ParameterizedItemImpl implements ParameterizedItem, Serial
      */
     private Map<String, Serializable> parameterValues = new HashMap<String, Serializable>();
 
-    /**
-     * Constructor
-     * 
-     * @param id  the id
-     */
-    public ParameterizedItemImpl(String id)
-    {
+    /**
+     * Constructor
+     * 
+     * @param id  the id
+     */
+    public ParameterizedItemImpl(String id)
+    {
         this(id, null);
     }
     
-    /**
-     * Constructor
-     * 
-     * @param id          the rule item
-     * @param parameterValues   the parameter values
-     */
-    public ParameterizedItemImpl(String id, Map<String, Serializable> parameterValues)
+    /**
+     * Constructor
+     * 
+     * @param id          the rule item
+     * @param parameterValues   the parameter values
+     */
+    public ParameterizedItemImpl(String id, Map<String, Serializable> parameterValues)
     {     
         // Set the action id
         this.id = id;
@@ -136,7 +135,7 @@ public abstract class ParameterizedItemImpl implements ParameterizedItem, Serial
     @Override
     public int hashCode()
     {
-        return Objects.hashCode(this.id);
+        return this.id.hashCode(); 
     }
     
     /**

repository/src/main/java/org/alfresco/repo/content/metadata/AsynchronousExtractor.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2022 Alfresco Software Limited
+ * Copyright (C) 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -50,7 +50,7 @@ import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.transform.registry.TransformServiceRegistry;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;

repository/src/main/java/org/alfresco/repo/content/transform/AbstractLocalTransform.java

@@ -31,9 +31,9 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.transform.config.TransformOption;
-import org.alfresco.transform.config.TransformOptionGroup;
-import org.alfresco.transform.config.TransformOptionValue;
+import org.alfresco.transform.client.model.config.TransformOption;
+import org.alfresco.transform.client.model.config.TransformOptionGroup;
+import org.alfresco.transform.client.model.config.TransformOptionValue;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

repository/src/main/java/org/alfresco/repo/content/transform/AdminUiTransformerDebug.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -37,8 +37,8 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.transform.registry.SupportedTransform;
-import org.alfresco.transform.registry.TransformServiceRegistry;
+import org.alfresco.transform.client.registry.SupportedTransform;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
 import org.alfresco.util.PropertyCheck;
 import org.alfresco.util.TempFileProvider;
 import org.springframework.beans.BeansException;

repository/src/main/java/org/alfresco/repo/content/transform/DummyTransformServiceRegistry.java

@@ -25,8 +25,8 @@
  */
 package org.alfresco.repo.content.transform;
 
-import org.alfresco.transform.config.CoreFunction;
-import org.alfresco.transform.registry.TransformServiceRegistry;
+import org.alfresco.transform.client.model.config.CoreFunction;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
 
 import java.util.Map;
 

repository/src/main/java/org/alfresco/repo/content/transform/LocalFailoverTransform.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2019-2022 Alfresco Software Limited
+ * Copyright (C) 2019 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -31,7 +31,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.transform.config.TransformOption;
+import org.alfresco.transform.client.model.config.TransformOption;
 import org.alfresco.util.TempFileProvider;
 
 import java.io.File;

repository/src/main/java/org/alfresco/repo/content/transform/LocalPassThroughTransform.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -31,11 +31,11 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.transform.config.SupportedSourceAndTarget;
-import org.alfresco.transform.config.TransformOption;
-import org.alfresco.transform.config.Transformer;
-import org.alfresco.transform.registry.AbstractTransformRegistry;
-import org.alfresco.transform.registry.CombinedConfig;
+import org.alfresco.transform.client.model.config.SupportedSourceAndTarget;
+import org.alfresco.transform.client.model.config.TransformOption;
+import org.alfresco.transform.client.model.config.Transformer;
+import org.alfresco.transform.client.registry.AbstractTransformRegistry;
+import org.alfresco.transform.client.registry.CombinedConfig;
 
 import java.io.IOException;
 import java.io.InputStreamReader;

repository/src/main/java/org/alfresco/repo/content/transform/LocalPipelineTransform.java

@@ -30,7 +30,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.transform.config.TransformOption;
+import org.alfresco.transform.client.model.config.TransformOption;
 import org.alfresco.util.TempFileProvider;
 
 import java.io.File;
@@ -39,7 +39,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL;
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
 
 /**
  * Transformer that passes a document through a pipeline of transformations to arrive at an target mimetype.

repository/src/main/java/org/alfresco/repo/content/transform/LocalTransformImpl.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -31,7 +31,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.transform.config.TransformOption;
+import org.alfresco.transform.client.model.config.TransformOption;
 import org.alfresco.util.Pair;
 
 import java.util.HashMap;

repository/src/main/java/org/alfresco/repo/content/transform/LocalTransformServiceRegistry.java

@@ -36,14 +36,14 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import org.alfresco.service.cmr.repository.MimetypeService;
-import org.alfresco.transform.config.CoreFunction;
-import org.alfresco.transform.config.TransformOptionGroup;
-import org.alfresco.transform.registry.CombinedConfig;
-import org.alfresco.transform.config.TransformOption;
-import org.alfresco.transform.registry.TransformServiceRegistryImpl;
-import org.alfresco.transform.config.TransformStep;
-import org.alfresco.transform.config.Transformer;
-import org.alfresco.transform.registry.TransformServiceRegistry;
+import org.alfresco.transform.client.model.config.CoreFunction;
+import org.alfresco.transform.client.model.config.TransformOptionGroup;
+import org.alfresco.transform.client.registry.CombinedConfig;
+import org.alfresco.transform.client.model.config.TransformOption;
+import org.alfresco.transform.client.registry.TransformServiceRegistryImpl;
+import org.alfresco.transform.client.model.config.TransformStep;
+import org.alfresco.transform.client.model.config.Transformer;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
 import org.alfresco.util.PropertyCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java

@@ -220,7 +220,6 @@ public class DeleteNotExistsExecutor implements StatementExecutor
                 {
                     // Process batch
                     primaryId = processPrimaryTableResultSet(primaryPrepStmt, secondaryPrepStmts, deletePrepStmt, deleteIds, primaryTableName, primaryColumnName, tableColumn);
-                    connection.commit();
 
                     if (primaryId == null)
                     {
@@ -299,6 +298,7 @@ public class DeleteNotExistsExecutor implements StatementExecutor
                     if (deleteIds.size() == deleteBatchSize)
                     {
                         deleteFromPrimaryTable(deletePrepStmt, deleteIds, primaryTableName);
+                        connection.commit();
                     }
 
                     if (!resultSet.next())

repository/src/main/java/org/alfresco/repo/domain/schema/script/MySQLDeleteNotExistsExecutor.java

@@ -117,7 +117,6 @@ public class MySQLDeleteNotExistsExecutor extends DeleteNotExistsExecutor
                 {
                     // Process batch
                     primaryId = processPrimaryTableResultSet(primaryPrepStmt, secondaryPrepStmts, deletePrepStmt, deleteIds, primaryTableName, primaryColumnName, tableColumn);
-                    connection.commit();
 
                     if (primaryId == null)
                     {

repository/src/main/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClient.java

@@ -33,7 +33,7 @@ import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.DirectAccessUrl;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.transform.config.CoreFunction;
+import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.util.PropertyCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,7 +43,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.alfresco.model.ContentModel.PROP_CONTENT;
-import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL;
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
 
 /**
  * Request synchronous transforms.

repository/src/main/java/org/alfresco/repo/rendition2/LocalTransformClient.java

@@ -35,7 +35,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.DirectAccessUrl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.transform.config.CoreFunction;
+import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.util.PropertyCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -48,7 +48,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import static org.alfresco.model.ContentModel.PROP_CONTENT;
-import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL;
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
 
 /**
  * Requests rendition transforms take place using transforms available on the local machine (based on

repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2Impl.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -27,7 +27,7 @@ package org.alfresco.repo.rendition2;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.alfresco.transform.registry.TransformServiceRegistry;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
 import org.alfresco.util.ConfigFileFinder;
 import org.alfresco.util.ConfigScheduler;
 import org.alfresco.util.Pair;

repository/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformServiceRegistry.java

@@ -25,8 +25,8 @@
  */
 package org.alfresco.repo.rendition2;
 
-import org.alfresco.transform.config.CoreFunction;
-import org.alfresco.transform.registry.TransformServiceRegistry;
+import org.alfresco.transform.client.model.config.CoreFunction;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
 
 import java.util.Map;
 

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

@@ -25,25 +25,14 @@
  */
 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;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.Sets;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.ActionImpl;
@@ -75,6 +64,7 @@ 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;
@@ -265,7 +255,7 @@ public class RuleServiceImpl
         policyComponent.bindAssociationBehaviour(
                 NodeServicePolicies.OnCreateChildAssociationPolicy.QNAME,
                 RuleModel.ASPECT_RULES,
-                ASSOC_RULE_FOLDER,
+                RuleModel.ASSOC_RULE_FOLDER,
                 new JavaBehaviour(this, "onCreateChildAssociation"));
         policyComponent.bindClassBehaviour(
                 NodeServicePolicies.OnAddAspectPolicy.QNAME,
@@ -357,8 +347,8 @@ public class RuleServiceImpl
         
         List<ChildAssociationRef> assocs = this.runtimeNodeService.getChildAssocs(
                 nodeRef,
-                ASSOC_RULE_FOLDER,
-                ASSOC_RULE_FOLDER);
+                RuleModel.ASSOC_RULE_FOLDER,
+                RuleModel.ASSOC_RULE_FOLDER);
         if (assocs.size() > 1)
         {
             throw new ActionServiceException("There is more than one rule folder, which is invalid.");
@@ -489,7 +479,7 @@ public class RuleServiceImpl
                     // Node has gone or is not the correct type
                     return rules;
                 }
-                if (includeInherited && !runtimeNodeService.hasAspect(nodeRef, ASPECT_IGNORE_INHERITED_RULES))
+                if (includeInherited == true && runtimeNodeService.hasAspect(nodeRef, RuleModel.ASPECT_IGNORE_INHERITED_RULES) == false)
                 {
                     // Get any inherited rules
                     for (Rule rule : getInheritedRules(nodeRef, ruleTypeName, null))
@@ -524,7 +514,7 @@ public class RuleServiceImpl
             // https://issues.alfresco.com/browse/ETWOTWO-438
             
         if (!runtimeNodeService.hasAspect(nodeRef, RuleModel.ASPECT_RULES) ||
-            permissionService.hasPermission(nodeRef, PermissionService.READ) != ALLOWED)
+            permissionService.hasPermission(nodeRef, PermissionService.READ) != AccessStatus.ALLOWED)
         {
             // Doesn't have the aspect or the user doesn't have access
             return Collections.emptyList();
@@ -542,7 +532,7 @@ public class RuleServiceImpl
         {
             // Get the rules for this node
             List<ChildAssociationRef> ruleChildAssocRefs = 
-                this.runtimeNodeService.getChildAssocs(ruleFolder, MATCH_ALL, ASSOC_NAME_RULES_REGEX);
+                this.runtimeNodeService.getChildAssocs(ruleFolder, RegexQNamePattern.MATCH_ALL, ASSOC_NAME_RULES_REGEX);
             for (ChildAssociationRef ruleChildAssocRef : ruleChildAssocRefs)
             {
                 // Create the rule and add to the list
@@ -571,7 +561,7 @@ public class RuleServiceImpl
                 {
                     // Get the rules for this node
                     List<ChildAssociationRef> ruleChildAssocRefs = 
-                        this.runtimeNodeService.getChildAssocs(ruleFolder, MATCH_ALL, ASSOC_NAME_RULES_REGEX);
+                        this.runtimeNodeService.getChildAssocs(ruleFolder, RegexQNamePattern.MATCH_ALL, ASSOC_NAME_RULES_REGEX);
                     
                     ruleCount = ruleChildAssocRefs.size();
                 }
@@ -607,105 +597,10 @@ public class RuleServiceImpl
         
         return result;
     }
-
-    /** {@inheritDoc} */
-    @Override
-    @Experimental
-    public List<NodeRef> getNodesSupplyingRuleSets(NodeRef nodeRef)
-    {
-        return getNodesSupplyingRuleSets(nodeRef, new ArrayList<>());
-    }
-
-    /**
-     * Traverse the folder hierarchy find all the folder nodes that could supply rules by inheritance.
-     * <p>
-     * The order of nodes returned by this methods has to match the order used by {@link #getInheritedRules}.
-     *
-     * @param nodeRef The starting node ref.
-     * @param visitedNodeRefs All the visited node refs (will be modified).
-     * @return A list of node refs, starting with the first parent of the first parent of ... and ending with the object generated by the
-     * given node ref.
-     */
-    private List<NodeRef> getNodesSupplyingRuleSets(NodeRef nodeRef, List<NodeRef> visitedNodeRefs)
-    {
-        List<NodeRef> returnList = new ArrayList<>();
-        // This check prevents stack over flow when we have a cyclic node graph
-        if (!visitedNodeRefs.contains(nodeRef))
-        {
-            visitedNodeRefs.add(nodeRef);
-            if (!runtimeNodeService.hasAspect(nodeRef, ASPECT_IGNORE_INHERITED_RULES))
-            {
-                List<ChildAssociationRef> parents = runtimeNodeService.getParentAssocs(nodeRef);
-                for (ChildAssociationRef parent : parents)
-                {
-                    // We are not interested in following potentially massive person group membership trees!
-                    if (!IGNORE_PARENT_ASSOC_TYPES.contains(parent.getTypeQName()))
-                    {
-                        // Update visitedNodeRefs with all the ancestors.
-                        returnList.addAll(getNodesSupplyingRuleSets(parent.getParentRef(), visitedNodeRefs));
-                    }
-                }
-            }
-            returnList.add(nodeRef);
-        }
-        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
-     *
+     * 
      * @param nodeRef            the nodeRef
      * @param ruleTypeName        the rule type (null if all applicable)
      * @return                    a list of inherited rules (empty if none)
@@ -713,20 +608,20 @@ public class RuleServiceImpl
     private List<Rule> getInheritedRules(NodeRef nodeRef, String ruleTypeName, Set<NodeRef> visitedNodeRefs)
     {
         List<Rule> inheritedRules = new ArrayList<Rule>();
-
+        
         if (this.runtimeNodeService.hasAspect(nodeRef, RuleModel.ASPECT_IGNORE_INHERITED_RULES) == false)
-        {
+        {        
             // Create the visited nodes set if it has not already been created
             if (visitedNodeRefs == null)
             {
                 visitedNodeRefs = new HashSet<NodeRef>();
             }
-
+            
             // This check prevents stack over flow when we have a cyclic node graph
             if (visitedNodeRefs.contains(nodeRef) == false)
             {
                 visitedNodeRefs.add(nodeRef);
-
+                
                 List<Rule> allInheritedRules = new ArrayList<Rule>();
                 List<ChildAssociationRef> parents = this.runtimeNodeService.getParentAssocs(nodeRef);
                 for (ChildAssociationRef parent : parents)
@@ -746,7 +641,7 @@ public class RuleServiceImpl
                             allInheritedRules.add(rule);
                         }
                     }
-
+                    
                     List<Rule> rules = getRules(parent.getParentRef(), false);
                     for (Rule rule : rules)
                     {
@@ -757,7 +652,7 @@ public class RuleServiceImpl
                         }
                     }
                 }
-
+                
                 if (ruleTypeName == null)
                 {
                     inheritedRules = allInheritedRules;
@@ -775,7 +670,7 @@ public class RuleServiceImpl
                 }
             }
         }
-
+        
         return inheritedRules;
     }
 
@@ -854,7 +749,7 @@ public class RuleServiceImpl
     {
         checkForLinkedRules(nodeRef);
         
-        if (this.permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) != ALLOWED)
+        if (this.permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) != AccessStatus.ALLOWED)
         {
             throw new RuleServiceException("Insufficient permissions to save a rule.");
         }
@@ -879,7 +774,7 @@ public class RuleServiceImpl
                 // Create the action node
                 ruleNodeRef = this.nodeService.createNode(
                         getSavedRuleFolderRef(nodeRef),
-                        ASSOC_CONTAINS,
+                        ContentModel.ASSOC_CONTAINS,
                         QName.createQName(RuleModel.RULE_MODEL_URI, ASSOC_NAME_RULES_PREFIX + GUID.generate()),
                         RuleModel.TYPE_RULE).getChildRef();
 
@@ -922,7 +817,7 @@ public class RuleServiceImpl
         NodeRef ruleFolder = getSavedRuleFolderRef(nodeRef);
         if (ruleFolder != null)
         {
-            List<ChildAssociationRef> assocs = this.runtimeNodeService.getChildAssocs(ruleFolder, MATCH_ALL, ASSOC_NAME_RULES_REGEX);
+            List<ChildAssociationRef> assocs = this.runtimeNodeService.getChildAssocs(ruleFolder, RegexQNamePattern.MATCH_ALL, ASSOC_NAME_RULES_REGEX);
             List<ChildAssociationRef> orderedAssocs = new ArrayList<ChildAssociationRef>(assocs.size());
             ChildAssociationRef movedAssoc = null;
             for (ChildAssociationRef assoc : assocs)
@@ -1004,7 +899,7 @@ public class RuleServiceImpl
     {
         checkForLinkedRules(nodeRef);
         
-        if (permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == ALLOWED)
+        if (permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED)
         {
             if (nodeService.exists(nodeRef) && nodeService.hasAspect(nodeRef, RuleModel.ASPECT_RULES))
             {
@@ -1067,7 +962,7 @@ public class RuleServiceImpl
     {
         checkForLinkedRules(nodeRef);
         
-        if (this.permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == ALLOWED)
+        if (this.permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED)
         {
             if (this.nodeService.exists(nodeRef) == true && 
                 this.nodeService.hasAspect(nodeRef, RuleModel.ASPECT_RULES) == true)
@@ -1077,7 +972,7 @@ public class RuleServiceImpl
                 {
                     List<ChildAssociationRef> ruleChildAssocs = this.nodeService.getChildAssocs(
                                                                                 folder, 
-                                                                                MATCH_ALL, ASSOC_NAME_RULES_REGEX);
+                                                                                RegexQNamePattern.MATCH_ALL, ASSOC_NAME_RULES_REGEX);
                     for (ChildAssociationRef ruleChildAssoc : ruleChildAssocs)
                     {
                         this.nodeService.removeChild(folder, ruleChildAssoc.getChildRef());
@@ -1427,7 +1322,7 @@ public class RuleServiceImpl
     {
         boolean result = true;
         if (this.nodeService.exists(actionedUponNodeRef)
-                && this.permissionService.hasPermission(actionedUponNodeRef, PermissionService.READ).equals(ALLOWED))
+                && this.permissionService.hasPermission(actionedUponNodeRef, PermissionService.READ).equals(AccessStatus.ALLOWED))
         {
             NodeRef copiedFrom = copyService.getOriginal(actionedUponNodeRef);
             if (logger.isDebugEnabled() == true)
@@ -1628,12 +1523,6 @@ public class RuleServiceImpl
         return this.nodeService.getPrimaryParent(systemFolder).getParentRef();
     }
 
-    @Override
-    public NodeRef getOwningNodeRef(NodeRef ruleSet)
-    {
-        return nodeService.getPrimaryParent(ruleSet).getParentRef();
-    }
-
     @Override
     public NodeRef getOwningNodeRef(final Action action)
     {
@@ -1726,7 +1615,7 @@ public class RuleServiceImpl
     @Experimental
     public NodeRef getRuleSetNode(final NodeRef folderNodeRef)
     {
-        return runtimeNodeService.getChildAssocs(folderNodeRef, ASSOC_RULE_FOLDER, ASSOC_RULE_FOLDER).stream()
+        return runtimeNodeService.getChildAssocs(folderNodeRef, RuleModel.ASSOC_RULE_FOLDER, RuleModel.ASSOC_RULE_FOLDER).stream()
             .map(ChildAssociationRef::getChildRef)
             .findFirst()
             .orElse(null);
@@ -1736,10 +1625,7 @@ public class RuleServiceImpl
     @Experimental
     public boolean isRuleSetAssociatedWithFolder(final NodeRef ruleSetNodeRef, final NodeRef folderNodeRef)
     {
-        List<ChildAssociationRef> associations = runtimeNodeService.getParentAssocs(ruleSetNodeRef, ASSOC_RULE_FOLDER, ASSOC_RULE_FOLDER);
-        Set<NodeRef> associatedFolders = associations.stream().map(ChildAssociationRef::getParentRef).collect(Collectors.toSet());
-        Set<NodeRef> supplyingFolders = new HashSet<>(getNodesSupplyingRuleSets(folderNodeRef));
-        return !Sets.intersection(associatedFolders, supplyingFolders).isEmpty();
+        return isChildOf(ruleSetNodeRef, RuleModel.ASSOC_RULE_FOLDER, folderNodeRef);
     }
 
     @Override

repository/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactoryImpl.java

@@ -25,54 +25,54 @@
  */
 package org.alfresco.repo.security.authentication.ldap;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.naming.AuthenticationNotSupportedException;
-import javax.naming.CommunicationException;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.ldap.Control;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapContext;
-import javax.naming.ldap.PagedResultsControl;
-import javax.naming.ldap.PagedResultsResponseControl;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.cache.SimpleCache;
-import org.alfresco.repo.security.authentication.AlfrescoSSLSocketFactory;
-import org.alfresco.repo.security.authentication.AuthenticationDiagnostic;
-import org.alfresco.repo.security.authentication.AuthenticationException;
-import org.alfresco.util.ApplicationContextHelper;
-import org.alfresco.util.PropertyCheck;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import javax.naming.AuthenticationNotSupportedException;
+import javax.naming.CommunicationException;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+import javax.naming.ldap.PagedResultsControl;
+import javax.naming.ldap.PagedResultsResponseControl;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.security.authentication.AlfrescoSSLSocketFactory;
+import org.alfresco.repo.security.authentication.AuthenticationDiagnostic;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 
 public class LDAPInitialDirContextFactoryImpl implements LDAPInitialDirContextFactory, InitializingBean
 {
     private static final Log logger = LogFactory.getLog(LDAPInitialDirContextFactoryImpl.class);
 
-    private SimpleCache<String, Set<Map<String, String>>> ldapInitialDirContextCache;
+    private static Set<Map<String, String>> checkedEnvs = Collections.synchronizedSet(new HashSet<Map<String, String>>(
+            11));
 
     private Map<String, String> defaultEnvironment = Collections.<String, String> emptyMap();
     private Map<String, String> authenticatedEnvironment = Collections.<String, String> emptyMap();
@@ -80,13 +80,6 @@ public class LDAPInitialDirContextFactoryImpl implements LDAPInitialDirContextFa
     private String trustStorePath;
     private String trustStoreType;
     private String trustStorePassPhrase;
-
-    private boolean initialChecksEnabled = true;
-
-    private final String ANONYMOUS_CHECK = "anonymous_check";
-    private final String SIMPLE_DN_CHECK = "simple_dn_check";
-    private final String DN_CHECK = "dn_check";
-    private final String PRINCIPAL_CHECK = "principal_check";
 
     public String getTrustStorePath()
     {
@@ -482,202 +475,159 @@ public class LDAPInitialDirContextFactoryImpl implements LDAPInitialDirContextFa
 
     }
 
-    public void afterPropertiesSet() throws Exception
-    {
-        logger.debug("after Properties Set");
-
-        if (initialChecksEnabled)
-        {
-            checkAnonymousBind();
-            checkSimpleDnAndPassword();
-            checkDnAndPassword();
-            checkPrincipal();
-        }
-        else
-        {
-            logger.info("LDAP checks are disabled");
-        }
+    public void afterPropertiesSet() throws Exception
+    {
+        logger.debug("after Properties Set");
+        // Check Anonymous bind
+
+        Hashtable<String, String> env = new Hashtable<String, String>(authenticatedEnvironment.size());
+        env.putAll(authenticatedEnvironment);
+        env.remove(Context.SECURITY_PRINCIPAL);
+        env.remove(Context.SECURITY_CREDENTIALS);
+        if (isSSLSocketFactoryRequired())
+        {
+            KeyStore trustStore = initTrustStore();
+            AlfrescoSSLSocketFactory.initTrustedSSLSocketFactory(trustStore);
+            env.put("java.naming.ldap.factory.socket", AlfrescoSSLSocketFactory.class.getName());
+        }
+        try
+        {
+            new InitialDirContext(env);
+
+            logger.warn("LDAP server supports anonymous bind " + env.get(Context.PROVIDER_URL));
+        }
+        catch (javax.naming.AuthenticationException ax)
+        {
+
+        }
+        catch (AuthenticationNotSupportedException e)
+        {
+
+        }
+        catch (NamingException nx)
+        {
+            logger.error("Unable to connect to LDAP Server; check LDAP configuration", nx);
+            return;
+        }
+
+        // Simple DN and password
+
+        env = new Hashtable<String, String>(authenticatedEnvironment.size());
+        env.putAll(authenticatedEnvironment);
+        env.put(Context.SECURITY_PRINCIPAL, "daftAsABrush");
+        env.put(Context.SECURITY_CREDENTIALS, "daftAsABrush");
+        if (isSSLSocketFactoryRequired())
+        {
+            KeyStore trustStore = initTrustStore();
+            AlfrescoSSLSocketFactory.initTrustedSSLSocketFactory(trustStore);
+            env.put("java.naming.ldap.factory.socket", AlfrescoSSLSocketFactory.class.getName());
+        }
+        try
+        {
+
+            new InitialDirContext(env);
+
+            throw new AuthenticationException(
+                    "The ldap server at "
+                            + env.get(Context.PROVIDER_URL)
+                            + " falls back to use anonymous bind if invalid security credentials are presented. This is not supported.");
+        }
+        catch (javax.naming.AuthenticationException ax)
+        {
+            logger.info("LDAP server does not fall back to anonymous bind for a string uid and password at " + env.get(Context.PROVIDER_URL));
+        }
+        catch (AuthenticationNotSupportedException e)
+        {
+            logger.info("LDAP server does not fall back to anonymous bind for a string uid and password at " + env.get(Context.PROVIDER_URL)); 
+        }
+        catch (NamingException nx)
+        {
+            logger.info("LDAP server does not support simple string user ids and invalid credentials at "+ env.get(Context.PROVIDER_URL));
+        }
+
+        // DN and password
+
+        env = new Hashtable<String, String>(authenticatedEnvironment.size());
+        env.putAll(authenticatedEnvironment);
+        env.put(Context.SECURITY_PRINCIPAL, "cn=daftAsABrush,dc=woof");
+        env.put(Context.SECURITY_CREDENTIALS, "daftAsABrush");
+        if (isSSLSocketFactoryRequired())
+        {
+            KeyStore trustStore = initTrustStore();
+            AlfrescoSSLSocketFactory.initTrustedSSLSocketFactory(trustStore);
+            env.put("java.naming.ldap.factory.socket", AlfrescoSSLSocketFactory.class.getName());
+        }
+        try
+        {
+
+            new InitialDirContext(env);
+
+            throw new AuthenticationException(
+                    "The ldap server at "
+                            + env.get(Context.PROVIDER_URL)
+                            + " falls back to use anonymous bind if invalid security credentials are presented. This is not supported.");
+        }
+        catch (javax.naming.AuthenticationException ax)
+        {
+            logger.info("LDAP server does not fall back to anonymous bind for a simple dn and password at " + env.get(Context.PROVIDER_URL));
+        }
+        catch (AuthenticationNotSupportedException e)
+        {
+            logger.info("LDAP server does not fall back to anonymous bind for a simple dn and password at " + env.get(Context.PROVIDER_URL));
+        }
+        catch (NamingException nx)
+        {
+            logger.info("LDAP server does not support simple DN and invalid password at "+ env.get(Context.PROVIDER_URL));
+        }
+
+        // Check more if we have a real principal we expect to work
+
+        String principal = defaultEnvironment.get(Context.SECURITY_PRINCIPAL);
+        if (principal != null)
+        {
+            // Correct principal invalid password
+
+            env = new Hashtable<String, String>(authenticatedEnvironment.size());
+            env.putAll(authenticatedEnvironment);
+            env.put(Context.SECURITY_PRINCIPAL, principal);
+            env.put(Context.SECURITY_CREDENTIALS, "sdasdasdasdasd123123123");
+            if (isSSLSocketFactoryRequired())
+            {
+                KeyStore trustStore = initTrustStore();
+                AlfrescoSSLSocketFactory.initTrustedSSLSocketFactory(trustStore);
+                env.put("java.naming.ldap.factory.socket", AlfrescoSSLSocketFactory.class.getName());
+            }
+            if (!checkedEnvs.contains(env))
+            {
+
+                try
+                {
+    
+                    new InitialDirContext(env);
+    
+                    throw new AuthenticationException(
+                            "The ldap server at "
+                                    + env.get(Context.PROVIDER_URL)
+                                    + " falls back to use anonymous bind for a known principal if  invalid security credentials are presented. This is not supported.");
+                }
+                catch (javax.naming.AuthenticationException ax)
+                {
+                    logger.info("LDAP server does not fall back to anonymous bind for known principal and invalid credentials at " + env.get(Context.PROVIDER_URL));
+                }
+                catch (AuthenticationNotSupportedException e)
+                {
+                    logger.info("LDAP server does not support the required authentication mechanism");
+                }
+                catch (NamingException nx)
+                {
+                    // already done
+                }
+                // Record this environment as checked so that we don't check it again on further restarts / other subsystem
+                // instances
+                checkedEnvs.add(env);
+            }
+        }
     }
-
-    /**
-     * Check Anonymous bind
-     */
-    private void checkAnonymousBind()
-    {
-        Hashtable<String, String> env = new Hashtable<String, String>(authenticatedEnvironment.size());
-        env.putAll(authenticatedEnvironment);
-        env.remove(Context.SECURITY_PRINCIPAL);
-        env.remove(Context.SECURITY_CREDENTIALS);
-
-        if (isSSLSocketFactoryRequired())
-        {
-            KeyStore trustStore = initTrustStore();
-            AlfrescoSSLSocketFactory.initTrustedSSLSocketFactory(trustStore);
-            env.put("java.naming.ldap.factory.socket", AlfrescoSSLSocketFactory.class.getName());
-        }
-
-        if (!isCached(ANONYMOUS_CHECK, env))
-        {
-            logger.debug("Starting check: Anonymous bind");
-
-            try
-            {
-                new InitialDirContext(env);
-
-                logger.warn("LDAP server supports anonymous bind " + env.get(Context.PROVIDER_URL));
-            }
-            catch (javax.naming.AuthenticationException | AuthenticationNotSupportedException e)
-            {
-                // do nothing
-            }
-            catch (NamingException nx)
-            {
-                logger.error("Unable to connect to LDAP Server; check LDAP configuration", nx);
-            }
-
-            addToCache(ANONYMOUS_CHECK, env);
-        }
-    }
-
-    /**
-     * Check simple DN and password
-     */
-    private void checkSimpleDnAndPassword()
-    {
-        Hashtable<String, String> env = new Hashtable<String, String>(authenticatedEnvironment.size());
-        env.putAll(authenticatedEnvironment);
-        env.put(Context.SECURITY_PRINCIPAL, "daftAsABrush");
-        env.put(Context.SECURITY_CREDENTIALS, "daftAsABrush");
-
-        if (isSSLSocketFactoryRequired())
-        {
-            KeyStore trustStore = initTrustStore();
-            AlfrescoSSLSocketFactory.initTrustedSSLSocketFactory(trustStore);
-            env.put("java.naming.ldap.factory.socket", AlfrescoSSLSocketFactory.class.getName());
-        }
-
-        if (!isCached(SIMPLE_DN_CHECK, env))
-        {
-            logger.debug("Starting check: Simple DN and Password");
-
-            try
-            {
-                new InitialDirContext(env);
-
-                throw new AuthenticationException("The ldap server at " + env.get(Context.PROVIDER_URL)
-                        + " falls back to use anonymous bind if invalid security credentials are presented. This is not supported.");
-            }
-            catch (javax.naming.AuthenticationException | AuthenticationNotSupportedException e)
-            {
-                logger.info("LDAP server does not fall back to anonymous bind for a string uid and password at "
-                        + env.get(Context.PROVIDER_URL));
-            }
-            catch (NamingException nx)
-            {
-                logger.info("LDAP server does not support simple string user ids and invalid credentials at "
-                        + env.get(Context.PROVIDER_URL));
-            }
-
-            addToCache(SIMPLE_DN_CHECK, env);
-        }
-    }
-
-    /**
-     * Check DN and Password
-     */
-    private void checkDnAndPassword()
-    {
-        Hashtable<String, String> env = new Hashtable<String, String>(authenticatedEnvironment.size());
-        env.putAll(authenticatedEnvironment);
-        env.put(Context.SECURITY_PRINCIPAL, "cn=daftAsABrush,dc=woof");
-        env.put(Context.SECURITY_CREDENTIALS, "daftAsABrush");
-
-        if (isSSLSocketFactoryRequired())
-        {
-            KeyStore trustStore = initTrustStore();
-            AlfrescoSSLSocketFactory.initTrustedSSLSocketFactory(trustStore);
-            env.put("java.naming.ldap.factory.socket", AlfrescoSSLSocketFactory.class.getName());
-        }
-
-        if (!isCached(DN_CHECK, env))
-        {
-            logger.debug("Starting check: DN and Password");
-
-            try
-            {
-                new InitialDirContext(env);
-
-                throw new AuthenticationException("The ldap server at " + env.get(Context.PROVIDER_URL)
-                        + " falls back to use anonymous bind if invalid security credentials are presented. This is not supported.");
-            }
-            catch (javax.naming.AuthenticationException | AuthenticationNotSupportedException e)
-            {
-                logger.info("LDAP server does not fall back to anonymous bind for a simple dn and password at "
-                        + env.get(Context.PROVIDER_URL));
-            }
-            catch (NamingException nx)
-            {
-                logger.info("LDAP server does not support simple DN and invalid password at " + env.get(Context.PROVIDER_URL));
-            }
-
-            addToCache(DN_CHECK, env);
-        }
-    }
-
-    /**
-     * Check more if we have a real principal we expect to work
-     */
-    private void checkPrincipal()
-    {
-        String principal = defaultEnvironment.get(Context.SECURITY_PRINCIPAL);
-
-        if (principal != null)
-        {
-            // Correct principal invalid password
-
-            Hashtable<String, String> env = new Hashtable<String, String>(authenticatedEnvironment.size());
-            env.putAll(authenticatedEnvironment);
-            env.put(Context.SECURITY_PRINCIPAL, principal);
-            env.put(Context.SECURITY_CREDENTIALS, "sdasdasdasdasd123123123");
-
-            if (isSSLSocketFactoryRequired())
-            {
-                KeyStore trustStore = initTrustStore();
-                AlfrescoSSLSocketFactory.initTrustedSSLSocketFactory(trustStore);
-                env.put("java.naming.ldap.factory.socket", AlfrescoSSLSocketFactory.class.getName());
-            }
-
-            if (!isCached(PRINCIPAL_CHECK, env))
-            {
-                logger.debug("Starting check: Principal");
-
-                try
-                {
-                    new InitialDirContext(env);
-
-                    throw new AuthenticationException("The ldap server at " + env.get(Context.PROVIDER_URL)
-                            + " falls back to use anonymous bind for a known principal if  invalid security credentials are presented. This is not supported.");
-                }
-                catch (javax.naming.AuthenticationException ax)
-                {
-                    logger.info("LDAP server does not fall back to anonymous bind for known principal and invalid credentials at "
-                            + env.get(Context.PROVIDER_URL));
-                }
-                catch (AuthenticationNotSupportedException e)
-                {
-                    logger.info("LDAP server does not support the required authentication mechanism");
-                }
-                catch (NamingException nx)
-                {
-                    // already done
-                }
-
-                // Record this environment as checked so that we don't check it again on further restarts / other
-                // subsystem instances
-                addToCache(PRINCIPAL_CHECK, env);
-            }
-        }
-    }
 
     /**
      * Check if it required to use custom SSL socket factory with custom trustStore.
@@ -754,69 +704,5 @@ public class LDAPInitialDirContextFactoryImpl implements LDAPInitialDirContextFa
             throw new AlfrescoRuntimeException("The certificates cannot be loaded from truststore.", ce);
         }
         return ks;
-    }
-
-    private void addToCache(String key, Map<String, String> value)
-    {
-        Set<Map<String, String>> envs = ldapInitialDirContextCache.get(key);
-
-        if (envs == null)
-        {
-            envs = Collections.synchronizedSet(new HashSet<Map<String, String>>(11));
-        }
-        
-        if (!envs.contains(value))
-        {
-            envs.add(value);
-        }
-
-        if (!ldapInitialDirContextCache.contains(key))
-        {
-            ldapInitialDirContextCache.put(key, envs);
-        }
-    }
-
-    private void removeFromCache(String key, Map<String, String> value)
-    {
-        if (ldapInitialDirContextCache != null && ldapInitialDirContextCache.contains(key))
-        {
-            Set<Map<String, String>> envs = ldapInitialDirContextCache.get(key);
-            if (envs != null && envs.contains(value))
-            {
-                envs.remove(value);
-                if (envs.isEmpty())
-                {
-                    ldapInitialDirContextCache.remove(key);
-                }
-            }
-        }
-    }
-
-    private boolean isCached(String key, Map<String, String> value)
-    {
-        boolean isCached = false;
-
-        if (ldapInitialDirContextCache != null && ldapInitialDirContextCache.contains(key))
-        {
-            Set<Map<String, String>> envs = ldapInitialDirContextCache.get(key);
-            if (envs != null && envs.contains(value))
-            {
-                isCached = true;
-            }
-        }
-        
-        logger.debug("LDAP check: " + key + " / isCached: " + (isCached ? "yes" : "no"));
-
-        return isCached;
-    }
-
-    public void setLdapInitialDirContextCache(SimpleCache<String, Set<Map<String, String>>> cache)
-    {
-        this.ldapInitialDirContextCache = cache;
-    }
-
-    public void setInitialChecksEnabled(boolean initialChecksEnabled)
-    {
-        this.initialChecksEnabled = initialChecksEnabled;
-    }
+    }
 }

repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailRegistry.java

@@ -2,11 +2,11 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2019 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
+ * 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
@@ -44,7 +44,7 @@ import org.alfresco.service.cmr.thumbnail.ThumbnailException;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.transform.registry.TransformServiceRegistry;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;

repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java

@@ -51,7 +51,6 @@ import org.alfresco.service.license.LicenseIntegrityException;
 import org.alfresco.util.LockHelper.LockTryException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.ibatis.exceptions.PersistenceException;
 import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.framework.ProxyFactory;
@@ -106,8 +105,7 @@ public class RetryingTransactionHelper
                     DataIntegrityViolationException.class,
                     LicenseIntegrityException.class,
                     TooManyResultsException.class,              // Expected one result but found multiple (bad key alert)
-                    LockTryException.class,
-                    PersistenceException.class
+                    LockTryException.class
                     };
      
         List<Class<?>> retryExceptions = new ArrayList<Class<?>>();