[maven-release-plugin][skip ci] prepare release 19.23

updated googleDrive version

.github/dependabot.yml

@@ -14,6 +14,15 @@ updates:
     timezone: Africa/Abidjan
   open-pull-requests-limit: 99
   ignore:
+  - dependency-name: com.google.code.gson:gson
+    versions:
+    - "> 2.8.6"
+  - dependency-name: io.fabric8:fabric8-maven-plugin
+    versions:
+    - "> 4.4.0"
+  - dependency-name: javax.servlet:javax.servlet-api
+    versions:
+    - "> 3.0.1"
   - dependency-name: org.acegisecurity:acegi-security
     versions:
     - "> 0.8.2_patched"
@@ -43,7 +52,110 @@ updates:
     - "> 1.0.0"
   - dependency-name: org.freemarker:freemarker
     versions:
-    - "> 2.3.31-alfresco-patched"
+    - "> 2.3.20-alfresco-patched-20200421"
+  - dependency-name: org.keycloak:keycloak-adapter-core
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-adapter-spi
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-authz-client
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-common
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-core
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-servlet-adapter-spi
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.eclipse.jetty:jetty-server
+    versions:
+    - 9.4.38.v20210224
+  - dependency-name: org.alfresco.tas:cmis
+    versions:
+    - "1.28"
+  - dependency-name: org.springframework:spring-webmvc
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-web
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-tx
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-orm
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-test
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-jms
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-jdbc
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-expression
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-core
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-context-support
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-context
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-beans
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-aop
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.alfresco.tas:restapi
+    versions:
+    - "1.55"
+  - dependency-name: org.eclipse.jetty:jetty-security
+    versions:
+    - 11.0.1
+  - dependency-name: org.alfresco.aos-module:alfresco-vti-bin
+    versions:
+    - 1.4.0-M1
+  - dependency-name: org.alfresco.aos-module:alfresco-aos-module-distributionzip
+    versions:
+    - 1.4.0-M1
+  - dependency-name: org.alfresco.aos-module:alfresco-aos-module
+    versions:
+    - 1.4.0-M1
+  - dependency-name: org.alfresco.surf:spring-webscripts-api
+    versions:
+    - "8.16"
+  - dependency-name: org.alfresco.surf:spring-webscripts:tests
+    versions:
+    - "8.16"
+  - dependency-name: org.alfresco.surf:spring-webscripts
+    versions:
+    - "8.16"
+  - dependency-name: org.alfresco.surf:spring-surf-core-configservice
+    versions:
+    - "8.16"
   registries:
   - maven-repository-artifacts-alfresco-com-nexus-content-groups-int
 - package-ecosystem: "docker"
@@ -52,7 +164,3 @@ updates:
     interval: "daily"
     time: "22:00"
     timezone: Africa/Abidjan
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "monthly"

.github/workflows/master_release.yml

@@ -27,19 +27,16 @@ jobs:
     runs-on: ubuntu-latest
     needs: [run_ci]
     if: >
-      !(failure() || cancelled()) &&
+      !failure() &&
       !contains(github.event.head_commit.message, '[no release]') &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2      
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.30.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -56,19 +53,16 @@ jobs:
     runs-on: ubuntu-latest
     needs: [push_to_nexus]
     if: >
-      !(failure() || cancelled()) &&
+      !failure() &&
       !contains(github.event.head_commit.message, '[no downstream]') &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2      
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.30.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -78,4 +72,4 @@ jobs:
         env:
           COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
       - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
+        run: bash ./scripts/ci/cleanup_cache.sh

.gitignore

@@ -39,9 +39,6 @@ dependency-reduced-pom.xml
 
 hs_err_pid*
 
-# Development
-repository/scripts/hazelcast-init/alfresco-hazelcast-config.xml
-
 # Alfresco runtime
 alf_data
 

CONTRIBUTING.md

@@ -3,12 +3,14 @@ Thanks for your interest in contributing to this project!
 
 The following is a set of guidelines for contributing to this library. Most of them will make the life of the reviewer easier and therefore decrease the time required for the patch be included in the next version.
 
-Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](https://hub.alfresco.com/t5/alfresco-content-services-ecm/ct-p/ECM-software) where they can be referenced from multiple projects.
+Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](http://community.alfresco.com/community/ecm) where they can be referenced from multiple projects.
+
+Read an [overview on how this project is goverened](https://community.alfresco.com/docs/DOC-6385-project-overview-repository).
 
 You can report an issue in the ALF project of the [Alfresco issue tracker](http://issues.alfresco.com).
 
-Read [instructions for a good issue report](https://hub.alfresco.com/t5/alfresco-content-services-hub/reporting-an-issue/ba-p/289727).
+Read [instructions for a good issue report](https://community.alfresco.com/docs/DOC-6263-reporting-an-issue).
 
-Read [instructions for making a contribution](https://hub.alfresco.com/t5/alfresco-content-services-hub/alfresco-contribution-agreement/ba-p/293276).
+Read [instructions for making a contribution](https://community.alfresco.com/docs/DOC-6269-submitting-contributions).
 
-Please follow [the coding standards](https://hub.alfresco.com/t5/alfresco-content-services-hub/coding-standards-for-alfresco-content-services/ba-p/290457).
+Please follow [the coding standards](https://community.alfresco.com/docs/DOC-4658-coding-standards).

README.md

@@ -1,58 +1,39 @@
 # alfresco-community-repo
 
-[![Build Status](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml/badge.svg?branch=master)](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml)
+[![Build Status](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml/badge.svg?branch=7.3.1)](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml)
 
-## Table of Contents
-1. [Content](#content)
-2. [Artifacts](#artifacts)
-3. [Setup](#setting-up-and-building-your-development-environment)
-4. [Branches](#branches)
-5. [Contributing](#contributing-guide)
-6. [Helpful links](#helpful-links)
-
-
-## Content
-Alfresco Community Repository contains following libraries:
-
-### Alfresco Core
-Core is a library packaged as a jar file which contains the following:
+#### Alfresco Core
 
+Alfresco Core is a library packaged as a jar file which contains the following:
 * Various helpers and utils
 * Canned queries interface and supporting classes
 * Generic encryption supporting classes
 
-### Alfresco Data Model
-
-Data Model is a library packaged as a jar file which  contains the following:
-
+#### Alfresco Data Model
+Data model is a library packaged as a jar file which  contains the following:
 * Dictionary, Repository and Search Services interfaces
 * Models for data types and Dictionary implementation
 * Parsers
 
-### Alfresco Repository
+#### Alfresco Repository
 
 Repository is a library packaged as a jar file which contains the following:
-
 * DAOs and SQL scripts
 * Various Service implementations
 * Utility classes
 
-### Alfresco Remote API
+#### Alfresco Remote API
 
 Remote API is a library packaged as a jar file which contains the following:
-
 * REST API framework
-* WebScript implementations including [V1 REST APIs](https://hub.alfresco.com/t5/alfresco-content-services-blog/v1-rest-api-10-things-you-should-know/ba-p/287692)
+* WebScript implementations including [V1 REST APIs](https://community.alfresco.com/community/ecm/blog/2017/05/02/v1-rest-api-10-things-you-should-know)
 * [OpenCMIS](https://chemistry.apache.org/java/opencmis.html) implementations
 
-## Artifacts
-
+#### Artifacts
 The artifacts can be obtained by:
-* downloading from [Alfresco maven repository](https://artifacts.alfresco.com/nexus/#browse/browse:public)
+* downloading from [Alfresco maven repository](https://artifacts.alfresco.com/nexus/content/groups/public)
 * as Maven dependency by adding the dependency to your pom file:
-
-~~~xml
-
+~~~
 <dependency>
   <groupId>org.alfresco</groupId>
   <artifactId>alfresco-core</artifactId>
@@ -83,46 +64,34 @@ The artifacts can be obtained by:
     <version>version</version>
     <type>war</type>
 </dependency>
-
 ~~~
-
 and Alfresco maven repository:
-
-~~~xml
-
+~~~
 <repository>
   <id>alfresco-maven-repo</id>
   <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
 </repository>
-
 ~~~
-
 The SNAPSHOT versions of the artifact are not published.
 
 ## Setting up and building your development environment
-
-See the [**Development Tomcat Environment**](https://github.com/Alfresco/acs-community-packaging/tree/master/dev/README.md)
-page which will show you how to try out your repository changes in a local Tomcat instance or using Docker containers. 
+See the [Development Tomcat Environment](https://github.com/Alfresco/acs-community-packaging/tree/master/dev/README.md)
+page which will show you how to try out your repository changes in a local tomcat instance.
+If you wish to use Docker images, take a look at the aliases ending in `D` and the docker-compose files in this
+project's test modules.    
 
 ## Branches
-
-This project has a branch for each ACS release. For example the code in ACS 6.2.2 is a
-branch called **`release/6.2.2`**. In addition to the original 6.2.2 release it will also contain Hot Fixes
-added later. The latest unreleased code is on the **`master`** branch. There are also **`.N`** branches, such as 
-**`release/7.1.N`** on which we gather unreleased fixes for future service pack releases. They do not indicate
+This project has a branch for each ACS release. For example the code in ACS 6.2.1 is a
+branch called `releases/6.2.2`. In addition to the original 6.2.2 release it will also contain Hot Fixes
+added later. The latest unreleased code is on the `master` branch. There are also `.N` branches, such as 
+`releases/7.1.N` on which we gather unreleased fixes for future service pack releases. They do not indicate
 that one is planned.
 
 For historic reasons the version of artifacts created on each branch do not match the ACS version.
-For example artifact in ACS 7.2.0 will be **`14.<something>`**.
+For example artifact in ACS 7.2.0 will be `14.<something>`.
 
-The enterprise projects which extend the **`alfresco-community-repo`** use the same branch names and leading
+The enterprise projects which extend the `alfresco-community-repo` use the same branch names and leading
 artifact version number.
 
-## Contributing guide
-
-Please use [**this guide**](CONTRIBUTING.md) to make a contribution to the project.
-
-## Helpful links
-
-- [Alfresco Content Services Documentation](https://docs.alfresco.com/content-services/latest/)
-- [Alfresco Platform](https://www.hyland.com/en/products/alfresco-platform)
+### Contributing guide
+Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.

amps/ags/README.md

@@ -71,7 +71,7 @@ the _alfresco-internal_ repository:
    </snapshots>
 </repository>
 ```
-
+ 
 
 For additional instructions you can check the official Maven documentation:
 * [setting up repositories](https://maven.apache.org/guides/mini/guide-multiple-repositories.html)
@@ -227,7 +227,7 @@ If only the Community or Enterprise images need to be built than the same comman
 
 The Docker images of the Repo can be started independently from Share running the following command in the rm-repo-enterprise or rm-repo-community folder which contains the Docker-compose.yml file:
 ```
-docker compose up
+docker-compose up
 ```
 > Be aware of the fact that the Share images can not be started independently from Repo
 
@@ -237,5 +237,5 @@ e.g. In order to start an instance of rm-enterprise-repo and rm-enterprise-share
 
 If you have a license for jRebel then this can be used from the rm-community-share or rm-enterprise-share directories with:
 ```
-docker compose -f docker-compose.yml -f jrebel-docker-compose.yml --project-name agsdev up --build --force-recreate
+docker-compose -f docker-compose.yml -f jrebel-docker-compose.yml --project-name agsdev up --build --force-recreate
 ```

amps/ags/ci/scripts/getLogs.sh

@@ -4,9 +4,9 @@ set -x
 # Display running containers
 docker ps
 
-alfrescoContainerId=$(docker ps -a | grep '\-alfresco\-' | awk '{print $1}')
-shareContainerId=$(docker ps -a | grep '\-share\-' | awk '{print $1}')
-solrContainerId=$(docker ps -a | grep '\-search\-' | awk '{print $1}')
+alfrescoContainerId=$(docker ps -a | grep '_alfresco_' | awk '{print $1}')
+shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}')
+solrContainerId=$(docker ps -a | grep '_search_' | awk '{print $1}')
 
 docker logs $alfrescoContainerId > alfresco.log
 if [ -n "$shareContainerId" ]; then

amps/ags/pom.xml

@@ -7,29 +7,21 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.4.0.1</version>
+      <version>19.23</version>
    </parent>
 
    <modules>
       <module>rm-community</module>
+      <module>rm-automation</module>
    </modules>
 
-   <profiles>
-      <profile>
-         <id>all-tas-tests</id>
-         <modules>
-            <module>rm-automation</module>
-         </modules>
-      </profile>
-   </profiles>
-
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
       <license.update.dryrun>true</license.update.dryrun>
       <license.verbose>false</license.verbose>
-      <license.failOnNotUptodateHeader>true</license.failOnNotUptodateHeader>
+      <license.failOnNotUptodateHeader>false</license.failOnNotUptodateHeader>
    </properties>
 
    <build>

amps/ags/rm-automation/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.4.0.1</version>
+      <version>19.23</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>23.4.0.1</version>
+      <version>19.23</version>
    </parent>
 
    <build>
@@ -42,10 +42,15 @@
    </build>
 
    <dependencies>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-reload4j</artifactId>
+         <version>${dependency.slf4j.version}</version>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi</artifactId>
-         <version>${project.version}</version>
          <exclusions>
             <exclusion>
                <groupId>org.alfresco.tas</groupId>
@@ -74,22 +79,6 @@
          <artifactId>alfresco-testng</artifactId>
          <version>1.1</version>
       </dependency>
-      <dependency>
-         <groupId>com.epam.reportportal</groupId>
-         <artifactId>agent-java-testng</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>com.squareup.okhttp3</groupId>
-         <artifactId>okhttp</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.awaitility</groupId>
-         <artifactId>awaitility</artifactId>
-         <version>${dependency.awaitility.version}</version>
-         <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>commons-collections4</artifactId>
@@ -98,25 +87,7 @@
       <dependency>
          <groupId>com.github.docker-java</groupId>
          <artifactId>docker-java</artifactId>
-         <version>3.3.6</version>
-         <exclusions>
-            <exclusion>
-               <groupId>org.bouncycastle</groupId>
-               <artifactId>bcprov-jdk15on</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>org.bouncycastle</groupId>
-               <artifactId>bcpkix-jdk15on</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>org.bouncycastle</groupId>
-         <artifactId>bcprov-jdk18on</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.bouncycastle</groupId>
-         <artifactId>bcpkix-jdk18on</artifactId>
+         <version>3.2.13</version>
       </dependency>
    </dependencies>
 </project>

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java

@@ -28,7 +28,7 @@ package org.alfresco.rest.core;
 
 import static lombok.AccessLevel.PROTECTED;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -39,7 +39,6 @@ import org.alfresco.rest.rm.community.requests.gscore.GSCoreAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.ActionsExecutionAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilePlanAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilesAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.HoldsAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RMSiteAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RMUserAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RecordCategoryAPI;
@@ -49,7 +48,6 @@ import org.alfresco.rest.rm.community.requests.gscore.api.TransferAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.TransferContainerAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledRecordFolderAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.RetentionScheduleAPI;
 import org.alfresco.utility.data.DataUserAIS;
 import org.alfresco.utility.model.RepoTestModel;
 import org.alfresco.utility.model.UserModel;
@@ -245,24 +243,4 @@ public class RestAPIFactory
     {
         return getGSCoreAPI(null).usingActionsExecutionsAPI();
     }
-
-    public HoldsAPI getHoldsAPI()
-    {
-        return getGSCoreAPI(null).usingHoldsAPI();
-    }
-
-    public HoldsAPI getHoldsAPI(UserModel userModel)
-    {
-        return getGSCoreAPI(userModel).usingHoldsAPI();
-    }
-
-    public RetentionScheduleAPI getRetentionScheduleAPI()
-    {
-        return getGSCoreAPI(null).usingRetentionScheduleAPI();
-    }
-
-    public RetentionScheduleAPI getRetentionScheduleAPI(UserModel userModel)
-    {
-        return getGSCoreAPI(userModel).usingRetentionScheduleAPI();
-    }
 }

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

@@ -26,8 +26,8 @@
  */
 package org.alfresco.rest.core.v0;
 
-import jakarta.json.Json;
-import jakarta.json.JsonReader;
+import javax.json.Json;
+import javax.json.JsonReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.format.DateTimeFormatter;

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

@@ -512,12 +512,7 @@ public abstract class BaseAPI
         try
         {
             HttpResponse httpResponse = doRequestJson(HttpPost.class, requestUrl, adminUser, adminPassword, requestParams);
-            if (httpResponse.getStatusLine().getStatusCode() != expectedStatusCode)
-            {
-                // It's only possible to stream the response body once, so ensure we only do this if the test has failed.
-                JSONObject responseJson = responseBodyToJson(httpResponse);
-                assertEquals("POST request to " + requestUrl + " was not successful. Response: " + responseJson, expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
-            }
+            assertEquals("POST request to " + requestUrl + " was not successful.", expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
             return httpResponse;
         }
         catch (InstantiationException | IllegalAccessException error)
@@ -526,32 +521,6 @@ public abstract class BaseAPI
         }
     }
 
-    /**
-     * Try to convert the response body to a JSON object.
-     *
-     * @param response The response.
-     * @return The JSON object or null if it was not possible to convert the response.
-     */
-    private JSONObject responseBodyToJson(HttpResponse response)
-    {
-        try
-        {
-            try
-            {
-                return new JSONObject(EntityUtils.toString(response.getEntity()));
-            }
-            catch (JSONException error)
-            {
-                LOGGER.error("Converting message body to JSON failed. Body: {}", response.getEntity().getContent(), error);
-            }
-        }
-        catch (ParseException | IOException error)
-        {
-            LOGGER.error("Parsing message body failed.", error);
-        }
-        return null;
-    }
-
     /**
      * Helper method for handling generic HTTP requests
      * @param requestType request type (a subclass of {@link HttpRequestBase})
@@ -589,7 +558,18 @@ public abstract class BaseAPI
             HttpResponse response = client.execute(adminUser, adminPassword, request);
             LOGGER.info("Response: {}", response.getStatusLine());
 
-            responseBody = responseBodyToJson(response);
+            try
+            {
+                responseBody = new JSONObject(EntityUtils.toString(response.getEntity()));
+            }
+            catch (JSONException error)
+            {
+                LOGGER.error("Converting message body to JSON failed. Body: {}", responseBody, error);
+            }
+            catch (ParseException | IOException error)
+            {
+                LOGGER.error("Parsing message body failed.", error);
+            }
 
             switch (response.getStatusLine().getStatusCode())
             {

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java

@@ -61,6 +61,7 @@ public class FilePlanComponentFields
     public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS = "rma:recordSearchDispositionEvents";
     public static final String PROPERTIES_DECLASSIFICATION_REVIEW_COMPLETED_BY = "rma:declassificationReviewCompletedBy";
     public static final String PROPERTIES_DECLASSIFICATION_REVIEW_COMPLETED_AT = "rma:declassificationReviewCompletedAt";
+    
 
     /** File plan properties */
     public static final String PROPERTIES_COMPONENT_ID = "st:componentId";

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/BulkBodyCancel.java

@@ -1,41 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class BulkBodyCancel
-{
-    private String reason;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/Hold.java

@@ -1,83 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Hold extends TestModel
-{
-    @JsonProperty(required = true)
-    private String id;
-
-    @JsonProperty(required = true)
-    private String name;
-
-    @JsonProperty(required = true)
-    private String description;
-
-    @JsonProperty(required = true)
-    private String reason;
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass())
-        {
-            return false;
-        }
-        Hold hold = (Hold) o;
-        return Objects.equals(id, hold.id) && Objects.equals(name, hold.name)
-            && Objects.equals(description, hold.description) && Objects.equals(reason, hold.reason);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(id, name, description, reason);
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkOperation.java

@@ -1,59 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.alfresco.rest.search.RestRequestQueryModel;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold bulk request
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldBulkOperation extends TestModel
-{
-    public enum HoldBulkOperationType
-    {
-        ADD
-    }
-
-    @JsonProperty(required = true)
-    private RestRequestQueryModel query;
-    @JsonProperty(required = true)
-    private HoldBulkOperationType op;
-
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkOperationEntry.java

@@ -1,50 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * POJO for hold bulk request entry
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldBulkOperationEntry
-{
-    private String bulkStatusId;
-
-    private long totalItems;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatus.java

@@ -1,67 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold bulk request
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldBulkStatus extends TestModel
-{
-    private String bulkStatusId;
-
-    private String startTime;
-
-    private String endTime;
-
-    private long processedItems;
-
-    private long errorsCount;
-
-    private long totalItems;
-
-    private String lastError;
-
-    private String status;
-
-    private boolean isCancelled;
-
-    private String cancellationReason;
-
-    private HoldBulkOperation holdBulkOperation;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatusCollection.java

@@ -1,38 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import org.alfresco.rest.core.RestModels;
-
-/**
- * Handle collection of {@link HoldBulkStatusEntry}
- *
- * @author Damian Ujma
- */
-public class HoldBulkStatusCollection extends RestModels<HoldBulkStatusEntry, HoldBulkStatusCollection>
-{
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatusEntry.java

@@ -1,46 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.alfresco.rest.core.RestModels;
-
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldBulkStatusEntry extends RestModels<HoldBulkStatus, HoldBulkStatusEntry>
-{
-    private HoldBulkStatus entry;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChild.java

@@ -1,52 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold child
- *
- * @author Damian Ujma
- */
-@Builder
-@EqualsAndHashCode(callSuper = true)
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldChild extends TestModel
-{
-    @JsonProperty(required = true)
-    private String id;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChildCollection.java

@@ -1,38 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import org.alfresco.rest.core.RestModels;
-
-/**
- * Handle collection of {@link HoldChildEntry}
- *
- * @author Damian Ujma
- */
-public class HoldChildCollection extends RestModels<HoldChildEntry, HoldChildCollection>
-{
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChildEntry.java

@@ -1,52 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.alfresco.rest.core.RestModels;
-
-/**
- * POJO for hold child entry
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldChildEntry extends RestModels<Hold, HoldChildEntry>
-{
-    @JsonProperty
-    private HoldChild entry;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldCollection.java

@@ -1,38 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import org.alfresco.rest.core.RestModels;
-
-/**
- * Handle collection of {@link HoldEntry}
- *
- * @author Damian Ujma
- */
-public class HoldCollection extends RestModels<HoldEntry, HoldCollection>
-{
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldDeletionReason.java

@@ -1,52 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold deletion reason
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldDeletionReason extends TestModel
-{
-    @JsonProperty
-    private String reason;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldDeletionReasonEntry.java

@@ -1,52 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.alfresco.rest.core.RestModels;
-
-/**
- * POJO for hold child entry
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldDeletionReasonEntry extends RestModels<HoldDeletionReason, HoldDeletionReasonEntry>
-{
-    @JsonProperty
-    private HoldDeletionReason entry;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldEntry.java

@@ -26,27 +26,31 @@
  */
 package org.alfresco.rest.rm.community.model.hold;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.alfresco.rest.core.RestModels;
+import org.alfresco.utility.model.TestModel;
 
 /**
  * POJO for hold entry
  *
- * @author Damian Ujma
+ * @author Rodica Sutu
+ * @since 3.2
  */
 @Builder
 @Data
-@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
-public class HoldEntry extends RestModels<Hold, HoldEntry>
+@JsonIgnoreProperties (ignoreUnknown = true)
+public class HoldEntry extends TestModel
 {
-    @JsonProperty
-    private Hold entry;
+    @JsonProperty (required = true)
+    private String name;
+
+    @JsonProperty (required = true)
+    private String nodeRef;
 }

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

@@ -1,56 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.hold.v0;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold entry
- *
- * @author Rodica Sutu
- * @since 3.2
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties (ignoreUnknown = true)
-public class HoldEntry extends TestModel
-{
-    @JsonProperty (required = true)
-    private String name;
-
-    @JsonProperty (required = true)
-    private String nodeRef;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionSchedule.java

@@ -1,58 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.retentionschedule;
-
-import lombok.EqualsAndHashCode;
-import org.alfresco.utility.model.TestModel;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * retention schedule
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class RetentionSchedule extends TestModel
-{
-    private String id ;
-    private String parentId;
-    private String authority;
-    private String instructions;
-    private boolean isRecordLevel;
-    private boolean isUnpublishedUpdates;
-    private List<RetentionScheduleActionDefinition> actions;
-
-    public boolean getIsRecordLevel()
-    {
-        return isRecordLevel;
-    }
-
-    public void setIsRecordLevel(boolean recordLevel) {
-        isRecordLevel = recordLevel;
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleActionDefinition.java

@@ -1,50 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.retentionschedule;
-
-import java.util.List;
-import lombok.Data;
-
-/**
- * retention schedule action definition
- */
-@Data
-public class RetentionScheduleActionDefinition
-{
-    private String id;
-    private String name;
-    private int periodAmount;
-    private String period;
-    private String periodProperty;
-    private boolean combineRetentionStepConditions;
-    private List<String> events;
-    private boolean eligibleOnFirstCompleteEvent;
-    private String description;
-    private boolean retainRecordMetadataAfterDestruction;
-    private String location;
-    private int index;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleCollection.java

@@ -1,32 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.retentionschedule;
-
-import org.alfresco.rest.core.RestModels;
-public class RetentionScheduleCollection extends RestModels<RetentionScheduleEntry, RetentionScheduleCollection>
-{
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleEntry.java

@@ -1,37 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.retentionschedule;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import org.alfresco.rest.core.RestModels;
-@Data
-public class RetentionScheduleEntry extends RestModels<RetentionSchedule, RetentionScheduleEntry>
-{
-    @JsonProperty
-    private RetentionSchedule entry;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleStepCollection.java

@@ -1,33 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.retentionschedule;
-
-import org.alfresco.rest.core.RestModels;
-
-public class RetentionScheduleStepCollection extends RestModels<RetentionScheduleStepEntry, RetentionScheduleStepCollection>
-{
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleStepEntry.java

@@ -1,38 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.model.retentionschedule;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import org.alfresco.rest.core.RestModels;
-
-@Data
-public class RetentionScheduleStepEntry extends RestModels<RetentionScheduleActionDefinition, RetentionScheduleStepEntry>
-{
-    @JsonProperty
-    private RetentionScheduleActionDefinition entry;
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/GSCoreAPI.java

@@ -37,7 +37,6 @@ import org.alfresco.rest.rm.community.requests.gscore.api.ActionsExecutionAPI;
 import org.alfresco.rest.rm.community.requests.RMModelRequest;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilePlanAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilesAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.HoldsAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RMSiteAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RMUserAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RecordCategoryAPI;
@@ -47,7 +46,6 @@ import org.alfresco.rest.rm.community.requests.gscore.api.TransferAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.TransferContainerAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledRecordFolderAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.RetentionScheduleAPI;
 
 /**
  * Defines the entire GS Core API
@@ -192,11 +190,4 @@ public class GSCoreAPI extends RMModelRequest
     {
         return new ActionsExecutionAPI(getRmRestWrapper());
     }
-
-    public HoldsAPI usingHoldsAPI() { return new HoldsAPI(getRmRestWrapper()); }
-
-    public RetentionScheduleAPI usingRetentionScheduleAPI()
-    {
-        return new RetentionScheduleAPI(getRmRestWrapper());
-    }
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/FilePlanAPI.java

@@ -38,8 +38,6 @@ import static org.springframework.http.HttpMethod.PUT;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.fileplan.FilePlan;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldCollection;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryCollection;
 import org.alfresco.rest.rm.community.requests.RMModelRequest;
@@ -215,74 +213,4 @@ public class FilePlanAPI extends RMModelRequest
                 parameters));
     }
 
-    /**
-     * Creates a hold.
-     *
-     * @param holdModel The hold model
-     * @param filePlanId The identifier of a file plan
-     * @param parameters The URL parameters to add
-     * @return The created {@link Hold}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code filePlanId} is not a valid format or {@code filePlanId} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to add children to {@code filePlanId}</li>
-     *  <li>{@code filePlanIds} does not exist</li>
-     *  <li>new name clashes with an existing node in the current parent container</li>
-     * </ul>
-     */
-    public Hold createHold(Hold holdModel, String filePlanId, String parameters)
-    {
-        mandatoryString("filePlanId", filePlanId);
-        mandatoryObject("holdModel", holdModel);
-
-        return getRmRestWrapper().processModel(Hold.class, requestWithBody(
-            POST,
-            toJson(holdModel),
-            "file-plans/{filePlanId}/holds",
-            filePlanId,
-            parameters
-                                                                          ));
-    }
-
-    /**
-     * See {@link #createHold(Hold, String, String)}
-     */
-    public Hold createHold(Hold holdModel, String filePlanId)
-    {
-        return createHold(holdModel, filePlanId, EMPTY);
-    }
-
-    /**
-     * Gets the holds of a file plan.
-     *
-     * @param filePlanId The identifier of a file plan
-     * @param parameters The URL parameters to add
-     * @return The {@link HoldCollection} for the given {@code filePlanId}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to read {@code filePlanId}</li>
-     *  <li>{@code filePlanId} does not exist</li>
-     *</ul>
-     */
-    public HoldCollection getHolds(String filePlanId, String parameters)
-    {
-        mandatoryString("filePlanId", filePlanId);
-
-        return getRmRestWrapper().processModels(HoldCollection.class, simpleRequest(
-            GET,
-            "file-plans/{filePlanId}/holds?{parameters}",
-            filePlanId,
-            parameters
-                                                                                   ));
-    }
-
-    /**
-     * See {@link #getHolds(String, String)}
-     */
-    public HoldCollection getHolds(String filePlanId)
-    {
-        return getHolds(filePlanId, EMPTY);
-    }
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/HoldsAPI.java

@@ -1,446 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.requests.gscore.api;
-
-import static org.alfresco.rest.core.RestRequest.requestWithBody;
-import static org.alfresco.rest.core.RestRequest.simpleRequest;
-import static org.alfresco.rest.rm.community.util.ParameterCheck.mandatoryObject;
-import static org.alfresco.rest.rm.community.util.ParameterCheck.mandatoryString;
-import static org.alfresco.rest.rm.community.util.PojoUtility.toJson;
-import static org.apache.commons.lang3.StringUtils.EMPTY;
-import static org.springframework.http.HttpMethod.DELETE;
-import static org.springframework.http.HttpMethod.GET;
-import static org.springframework.http.HttpMethod.POST;
-import static org.springframework.http.HttpMethod.PUT;
-
-import org.alfresco.rest.core.RMRestWrapper;
-import org.alfresco.rest.rm.community.model.hold.BulkBodyCancel;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkOperation;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkOperationEntry;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkStatus;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkStatusCollection;
-import org.alfresco.rest.rm.community.model.hold.HoldChild;
-import org.alfresco.rest.rm.community.model.hold.HoldChildCollection;
-import org.alfresco.rest.rm.community.model.hold.HoldDeletionReason;
-import org.alfresco.rest.rm.community.requests.RMModelRequest;
-
-/**
- * Holds REST API Wrapper
- *
- * @author Damian Ujma
- */
-public class HoldsAPI extends RMModelRequest
-{
-
-    /**
-     * @param rmRestWrapper
-     */
-    public HoldsAPI(RMRestWrapper rmRestWrapper)
-    {
-        super(rmRestWrapper);
-    }
-
-    /**
-     * Gets a hold.
-     *
-     * @param holdId The identifier of a hold
-     * @param parameters The URL parameters to add
-     * @return The {@link Hold} for the given {@code holdId}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code holdId} is not a valid format</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to read {@code holdId}</li>
-     *  <li>{@code holdId} does not exist</li>
-     * </ul>
-     */
-    public Hold getHold(String holdId, String parameters)
-    {
-        mandatoryString("holdId", holdId);
-
-        return getRmRestWrapper().processModel(Hold.class, simpleRequest(
-            GET,
-            "holds/{holdId}?{parameters}",
-            holdId,
-            parameters
-                                                                        ));
-    }
-
-    /**
-     * See {@link #getHold(String, String)}
-     */
-    public Hold getHold(String holdId)
-    {
-        mandatoryString("holdId", holdId);
-
-        return getHold(holdId, EMPTY);
-    }
-
-    /**
-     * Updates a hold.
-     *
-     * @param holdModel     The hold model which holds the information
-     * @param holdId        The identifier of the hold
-     * @param parameters          The URL parameters to add
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>the update request is invalid or {@code holdId} is not a valid format or {@code holdModel} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to update {@code holdId}</li>
-     *  <li>{@code holdId} does not exist</li>
-     * </ul>
-     */
-    public Hold updateHold(Hold holdModel, String holdId, String parameters)
-    {
-        mandatoryObject("holdModel", holdModel);
-        mandatoryString("holdId", holdId);
-
-        return getRmRestWrapper().processModel(Hold.class, requestWithBody(
-            PUT,
-            toJson(holdModel),
-            "holds/{holdId}?{parameters}",
-            holdId,
-            parameters
-                                                                            ));
-    }
-
-    /**
-     * See {@link #updateHold(Hold, String, String)}
-     */
-    public Hold updateHold(Hold holdModel, String holdId)
-    {
-        mandatoryObject("holdModel", holdModel);
-        mandatoryString("holdId", holdId);
-
-        return updateHold(holdModel, holdId, EMPTY);
-    }
-
-    /**
-     * Deletes a hold.
-     *
-     * @param holdId The identifier of a hold
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code holdId} is not a valid format</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to delete {@code holdId}</li>
-     *  <li>{@code holdId} does not exist</li>
-     * </ul>
-     */
-    public void deleteHold(String holdId)
-    {
-        mandatoryString("holdId", holdId);
-
-        getRmRestWrapper().processEmptyModel(simpleRequest(
-            DELETE,
-            "holds/{holdId}",
-            holdId
-                                                          ));
-    }
-
-    /**
-     * Deletes a hold and stores a reason for deletion in the audit log.
-     *
-     * @param reason        The reason for hold deletion
-     * @param holdId        The identifier of a hold
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code holdId} is not a valid format or {@code reason} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to delete {@code holdId}</li>
-     *  <li>{@code holdId} does not exist</li>
-     * </ul>
-     */
-    public HoldDeletionReason deleteHoldWithReason(HoldDeletionReason reason, String holdId)
-    {
-        mandatoryObject("reason", reason);
-        mandatoryString("holdId", holdId);
-
-        return getRmRestWrapper().processModel(HoldDeletionReason.class, requestWithBody(
-            POST,
-            toJson(reason),
-            "holds/{holdId}/delete",
-            holdId
-                                                          ));
-    }
-
-    /**
-     * Adds the relationship between a child and a parent hold.
-     *
-     * @param holdChild The hold child model
-     * @param holdId The identifier of a hold
-     * @param parameters The URL parameters to add
-     * @return The created {@link Hold}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code holdId} is not a valid format or {@code holdId} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to add children to {@code holdId}</li>
-     *  <li>{@code holdId} does not exist</li>
-     * </ul>
-     */
-    public HoldChild addChildToHold(HoldChild holdChild, String holdId, String parameters)
-    {
-        mandatoryObject("holdId", holdId);
-
-        return getRmRestWrapper().processModel(HoldChild.class, requestWithBody(
-            POST,
-            toJson(holdChild),
-            "holds/{holdId}/children",
-            holdId,
-            parameters));
-    }
-
-    /**
-     * See {@link #addChildToHold(HoldChild, String, String)}
-     */
-    public HoldChild addChildToHold(HoldChild holdChild, String holdId)
-    {
-        return addChildToHold(holdChild, holdId, EMPTY);
-    }
-
-    /**
-     * Gets the children of a hold.
-     *
-     * @param holdId The identifier of a hold
-     * @param parameters The URL parameters to add
-     * @return The {@link HoldChildCollection} for the given {@code holdId}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to read {@code holdId}</li>
-     *  <li>{@code holdId} does not exist</li>
-     *</ul>
-     */
-    public HoldChildCollection getChildren(String holdId, String parameters)
-    {
-        mandatoryString("holdId", holdId);
-
-        return getRmRestWrapper().processModels(HoldChildCollection.class, simpleRequest(
-            GET,
-            "holds/{holdId}/children",
-            holdId,
-            parameters
-                                                                                   ));
-    }
-
-    /**
-     * See {@link #getChildren(String, String)}
-     */
-    public HoldChildCollection getChildren(String holdId)
-    {
-        return getChildren(holdId, EMPTY);
-    }
-
-    /**
-     * Deletes the relationship between a child and a parent hold.
-     *
-     * @param holdChildId The identifier of hold child
-     * @param holdId The identifier of a hold
-     * @param parameters The URL parameters to add
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code holdId} or {@code holdChildId} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to delete children from {@code holdId}</li>
-     *  <li>{@code holdId} does not exist</li>
-     * </ul>
-     */
-    public void deleteHoldChild(String holdId, String holdChildId, String parameters)
-    {
-        mandatoryString("holdId", holdId);
-        mandatoryString("holdChildId", holdChildId);
-
-        getRmRestWrapper().processEmptyModel(simpleRequest(
-            DELETE,
-            "holds/{holdId}/children/{holdChildId}",
-            holdId,
-            holdChildId,
-            parameters
-                                                          ));
-    }
-
-    /**
-     * See {@link #deleteHoldChild(String, String, String)}
-     */
-    public void deleteHoldChild(String holdId, String holdChildId)
-    {
-        deleteHoldChild(holdId, holdChildId, EMPTY);
-    }
-
-    /**
-     * Starts a bulk process for a hold.
-     *
-     * @param holdBulkOperation The bulk operation details
-     * @param hold The identifier of a hold
-     * @param parameters The URL parameters to add
-     * @return The {@link HoldBulkOperationEntry} for the started bulk process
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code hold} or {@code holdBulkOperation} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to start a bulk process for {@code hold}</li>
-     *  <li>{@code hold} does not exist</li>
-     * </ul>
-     */
-    public HoldBulkOperationEntry startBulkProcess(HoldBulkOperation holdBulkOperation, String hold, String parameters)
-    {
-        mandatoryObject("holdBulkOperation", holdBulkOperation);
-        mandatoryString("hold", hold);
-
-        return getRmRestWrapper().processModel(HoldBulkOperationEntry.class, requestWithBody(
-            POST,
-            toJson(holdBulkOperation),
-            "holds/{hold}/bulk",
-            hold,
-            parameters
-                                                                                          ));
-    }
-
-    /**
-     * See {@link #startBulkProcess(HoldBulkOperation, String, String)}
-     */
-    public HoldBulkOperationEntry startBulkProcess(HoldBulkOperation holdBulkOperation, String hold)
-    {
-        return startBulkProcess(holdBulkOperation, hold, EMPTY);
-    }
-
-    /**
-     * Gets the status of a bulk process for a hold.
-     *
-     * @param holdId The identifier of a hold
-     * @param holdBulkStatusId The identifier of a bulk status operation
-     * @param parameters The URL parameters to add
-     * @return The {@link HoldBulkStatus} for the given {@code holdId} and {@code holdBulkStatusId}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code holdId} or {@code holdBulkStatusId} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to get the bulk status for {@code holdId}</li>
-     *  <li>{@code holdId} or {@code holdBulkStatusId} does not exist</li>
-     * </ul>
-     */
-    public HoldBulkStatus getBulkStatus(String holdId, String holdBulkStatusId, String parameters)
-    {
-        mandatoryString("holdId", holdId);
-        mandatoryString("holdBulkStatusId", holdBulkStatusId);
-
-        return getRmRestWrapper().processModel(HoldBulkStatus.class, simpleRequest(
-            GET,
-            "holds/{holdId}/bulk-statuses/{holdBulkStatusId}",
-            holdId,
-            holdBulkStatusId,
-            parameters
-                                                                                   ));
-    }
-
-    /**
-     * See {@link #getBulkStatus(String, String, String)}
-     */
-    public HoldBulkStatus getBulkStatus(String holdId, String holdBulkStatusId)
-    {
-        return getBulkStatus(holdId, holdBulkStatusId, EMPTY);
-    }
-
-    /**
-     * Gets the statuses of all bulk processes for a hold.
-     *
-     * @param holdId The identifier of a hold
-     * @param parameters The URL parameters to add
-     * @return The {@link HoldBulkStatusCollection} for the given {@code holdId}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *     <li>{@code holdId} is invalid</li>
-     *     <li>authentication fails</li>
-     *     <li>current user does not have permission to get the bulk statuses for {@code holdId}</li>
-     *     <li>{@code holdId} does not exist</li>
-     * </ul>
-     */
-    public HoldBulkStatusCollection getBulkStatuses(String holdId, String parameters)
-    {
-        mandatoryString("holdId", holdId);
-
-        return getRmRestWrapper().processModels(HoldBulkStatusCollection.class, simpleRequest(
-            GET,
-            "holds/{holdId}/bulk-statuses",
-            holdId,
-            parameters
-                                                                                             ));
-    }
-
-    /**
-     * See {@link #getBulkStatuses(String, String)}
-     */
-    public HoldBulkStatusCollection getBulkStatuses(String holdId)
-    {
-        return getBulkStatuses(holdId, EMPTY);
-    }
-
-    /**
-     * Cancels a bulk operation for a hold.
-     *
-     * @param holdId The identifier of a hold
-     * @param bulkStatusId The identifier of a bulk status operation
-     * @param bulkBodyCancel The bulk body cancel model
-     * @param parameters The URL parameters to add
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *     <li>{@code holdId}, {@code bulkStatusId} or {@code bulkBodyCancel} is invalid</li>
-     *     <li>authentication fails</li>
-     *     <li>current user does not have permission to cancel the bulk operation for {@code bulkStatusId}</li>
-     *     <li>{@code holdId} or {@code bulkStatusId} does not exist</li>
-     * </ul>
-     */
-    public void cancelBulkOperation(String holdId, String bulkStatusId, BulkBodyCancel bulkBodyCancel, String parameters)
-    {
-        mandatoryString("holdId", holdId);
-        mandatoryString("bulkStatusId", bulkStatusId);
-        mandatoryObject("bulkBodyCancel", bulkBodyCancel);
-
-        getRmRestWrapper().processEmptyModel(requestWithBody(
-            POST,
-            toJson(bulkBodyCancel),
-            "holds/{holdId}/bulk-statuses/{bulkStatusId}/cancel",
-            holdId,
-            bulkStatusId,
-            parameters
-                                                          ));
-    }
-
-    /**
-     * See {@link #cancelBulkOperation(String, String, BulkBodyCancel, String)}
-     */
-    public void cancelBulkOperation(String holdId, String bulkStatusId, BulkBodyCancel bulkBodyCancel)
-    {
-        mandatoryString("holdId", holdId);
-        mandatoryString("bulkStatusId", bulkStatusId);
-        mandatoryObject("bulkBodyCancel", bulkBodyCancel);
-
-        cancelBulkOperation(holdId, bulkStatusId, bulkBodyCancel, EMPTY);
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RetentionScheduleAPI.java

@@ -1,198 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.requests.gscore.api;
-
-import org.alfresco.rest.core.RMRestWrapper;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionSchedule;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionScheduleActionDefinition;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionScheduleCollection;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionScheduleStepCollection;
-import org.alfresco.rest.rm.community.requests.RMModelRequest;
-
-import static org.alfresco.rest.core.RestRequest.requestWithBody;
-import static org.alfresco.rest.core.RestRequest.simpleRequest;
-import static org.alfresco.rest.rm.community.util.ParameterCheck.mandatoryObject;
-import static org.alfresco.rest.rm.community.util.ParameterCheck.mandatoryString;
-import static org.alfresco.rest.rm.community.util.PojoUtility.toJson;
-import static org.apache.commons.lang3.StringUtils.EMPTY;
-import static org.springframework.http.HttpMethod.GET;
-import static org.springframework.http.HttpMethod.POST;
-
-public class RetentionScheduleAPI extends RMModelRequest
-{
-
-    /**
-     * @param rmRestWrapper
-     */
-    public RetentionScheduleAPI(RMRestWrapper rmRestWrapper)
-    {
-        super(rmRestWrapper);
-    }
-
-
-    /**
-     * Creates a retention schedule.
-     *
-     * @param retentionScheduleModel The retentionSchedule model
-     * @param recordCategoryId The identifier of a record category
-     * @param parameters The URL parameters to add
-     * @return The created {@link RetentionSchedule}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code recordCategoryId} is not a valid format or {@code recordCategoryId} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to add children to {@code recordCategoryId}</li>
-     *  <li>{@code recordCategoryId} does not exist</li>
-     *  <li>new name clashes with an existing node in the current parent container</li>
-     * </ul>
-     */
-    public RetentionSchedule createRetentionSchedule(RetentionSchedule retentionScheduleModel, String recordCategoryId, String parameters)
-    {
-        mandatoryString("recordCategoryId", recordCategoryId);
-        mandatoryObject("retentionScheduleModel", retentionScheduleModel);
-
-        return getRmRestWrapper().processModel(RetentionSchedule.class, requestWithBody(
-            POST,
-            toJson(retentionScheduleModel),
-            "record-categories/{recordCategoryId}/retention-schedules",
-            recordCategoryId,
-            parameters
-        ));
-    }
-
-    /**
-     * See {@link #createRetentionSchedule(RetentionSchedule, String, String)}
-     */
-    public RetentionSchedule createRetentionSchedule(RetentionSchedule retentionScheduleModel, String recordCategoryId)
-    {
-        return createRetentionSchedule(retentionScheduleModel, recordCategoryId, EMPTY);
-    }
-
-    /**
-     * Gets the retentionSchedule of a record category.
-     *
-     * @param recordCategoryId The identifier of a record category
-     * @param parameters The URL parameters to add
-     * @return The {@link RetentionSchedule} for the given {@code recordCategoryId}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to read {@code recordCategoryId}</li>
-     *  <li>{@code recordCategoryId} does not exist</li>
-     *</ul>
-     */
-    public RetentionScheduleCollection getRetentionSchedule(String recordCategoryId, String parameters)
-    {
-        mandatoryString("recordCategoryId", recordCategoryId);
-
-        return getRmRestWrapper().processModels(RetentionScheduleCollection.class, simpleRequest(
-            GET,
-            "record-categories/{recordCategoryId}/retention-schedules?{parameters}",
-            recordCategoryId,
-            parameters
-        ));
-    }
-
-    /**
-     * See {@link #getRetentionSchedule(String, String)}
-     */
-    public RetentionScheduleCollection getRetentionSchedule(String recordCategoryId)
-    {
-        return getRetentionSchedule(recordCategoryId, EMPTY);
-    }
-
-    /**
-     * Creates a step in the retention schedule.
-     *
-     * @param retentionScheduleActionDefinition The retentionScheduleActionDefinition model
-     * @param retentionScheduleId The identifier of a retention schedule id
-     * @param parameters The URL parameters to add
-     * @return The created {@link RetentionScheduleActionDefinition}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>{@code retentionScheduleId} is not a valid format or {@code retentionScheduleId} is invalid</li>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to add children to {@code retentionScheduleId}</li>
-     *  <li>{@code retentionScheduleId} does not exist</li>
-     *  <li>new name clashes with an existing node in the current parent container</li>
-     * </ul>
-     */
-    public RetentionScheduleActionDefinition createRetentionScheduleStep(RetentionScheduleActionDefinition retentionScheduleActionDefinition, String retentionScheduleId, String parameters)
-    {
-        mandatoryString("retentionScheduleId", retentionScheduleId);
-        mandatoryObject("retentionScheduleActionDefinition", retentionScheduleActionDefinition);
-
-        return getRmRestWrapper().processModel(RetentionScheduleActionDefinition.class, requestWithBody(
-            POST,
-            toJson(retentionScheduleActionDefinition),
-            "retention-schedules/{retentionScheduleId}/retention-steps",
-            retentionScheduleId,
-            parameters
-        ));
-    }
-
-    /**
-     * See {@link #createRetentionScheduleStep(RetentionScheduleActionDefinition, String)} (RetentionSchedule, String, String)}
-     */
-    public RetentionScheduleActionDefinition createRetentionScheduleStep(RetentionScheduleActionDefinition retentionScheduleActionDefinition, String retentionScheduleId)
-    {
-        return createRetentionScheduleStep(retentionScheduleActionDefinition, retentionScheduleId, EMPTY);
-    }
-
-    /**
-     * Gets the retentionSchedule of a record category.
-     *
-     * @param retentionScheduleId The identifier of a record category
-     * @param parameters The URL parameters to add
-     * @return The {@link RetentionScheduleActionDefinition} for the given {@code recordCategoryId}
-     * @throws RuntimeException for the following cases:
-     * <ul>
-     *  <li>authentication fails</li>
-     *  <li>current user does not have permission to read {@code recordCategoryId}</li>
-     *  <li>{@code recordCategoryId} does not exist</li>
-     *</ul>
-     */
-    public RetentionScheduleStepCollection getRetentionScheduleStep(String retentionScheduleId, String parameters)
-    {
-        mandatoryString("retentionScheduleId", retentionScheduleId);
-
-        return getRmRestWrapper().processModels(RetentionScheduleStepCollection.class, simpleRequest(
-            GET,
-            "retention-schedules/{retentionScheduleId}/retention-steps?{parameters}",
-            retentionScheduleId,
-            parameters
-        ));
-    }
-
-    /**
-     * See {@link #getRetentionScheduleStep(String, String)}
-     */
-    public RetentionScheduleStepCollection getRetentionScheduleStep(String recordCategoryId)
-    {
-        return getRetentionScheduleStep(recordCategoryId, EMPTY);
-    }
-}

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

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 
 import org.alfresco.rest.core.v0.APIUtils;
 import org.alfresco.rest.core.v0.BaseAPI;
-import org.alfresco.rest.rm.community.model.hold.v0.HoldEntry;
+import org.alfresco.rest.rm.community.model.hold.HoldEntry;
 import org.alfresco.rest.rm.community.util.PojoUtility;
 import org.alfresco.utility.model.UserModel;
 import org.apache.http.HttpResponse;

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

@@ -26,7 +26,6 @@
  */
 package org.alfresco.rest.v0;
 
-import static org.apache.http.HttpStatus.SC_OK;
 import static org.testng.Assert.assertTrue;
 
 import java.io.UnsupportedEncodingException;
@@ -37,7 +36,6 @@ import java.util.List;
 import org.alfresco.rest.core.v0.BaseAPI;
 import org.alfresco.rest.rm.community.model.audit.AuditEntry;
 import org.alfresco.rest.rm.community.util.PojoUtility;
-import org.apache.http.HttpResponse;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -60,8 +58,6 @@ public class RMAuditAPI extends BaseAPI
     private static final String RM_AUDIT_API = "{0}rma/admin/rmauditlog";
     private static final String RM_AUDIT_LOG_API = RM_AUDIT_API + "?{1}";
 
-    private static final String RM_AUDIT_LOG_AS_RECORD = "{0}node/{1}/rmauditlog";
-
     /**
      * Returns a list of rm audit entries .
      *
@@ -88,21 +84,6 @@ public class RMAuditAPI extends BaseAPI
         return PojoUtility.jsonToObject(auditEntries, AuditEntry.class);
     }
 
-    /**
-     * Returns a list of rm audit entries .
-     *
-     * @param user     The username of the user to use.
-     * @param password The password of the user.
-     * @param size     Maximum number of log entries to return
-     * @return return All return log entries
-     */
-    public List<AuditEntry> getRMAuditLogAll(String user, String password, final int size) {
-        String parameters = "size=" + size;
-        JSONArray auditEntries =  doGetRequest(user, password,
-            MessageFormat.format(RM_AUDIT_LOG_API,"{0}", parameters)).getJSONObject("data").getJSONArray("entries");
-        return PojoUtility.jsonToObject(auditEntries, AuditEntry.class);
-    }
-
     /**
      * Clear the list of audit entries.
      *
@@ -119,19 +100,5 @@ public class RMAuditAPI extends BaseAPI
                 && getRMAuditLog(username, password, 100, null).size() == 2);
     }
 
-    /**
-     * Logs the Audit Log as Record.
-     *
-     * @param username The username of the user to use.
-     * @param password The password of the user.
-     * @param recNodeRef The Record Node reference for which Audit log should be created as record
-     * @param destinationNodeRef The Folder id Node reference where the html file should be placed
-     * @throws AssertionError If the API call didn't create the Audit Log as Record.
-     */
-    public HttpResponse logsAuditLogAsRecord(String username, String password, String recNodeRef, String destinationNodeRef) {
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("destination", destinationNodeRef);
-        return doPostJsonRequest(username, password, SC_OK, requestParams, RM_AUDIT_LOG_AS_RECORD,recNodeRef);
-    }
 
 }

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

@@ -97,16 +97,4 @@ public class RecordFoldersAPI extends BaseAPI
         return null;
     }
 
-
-    public HttpResponse reOpenRecordFolder(String user, String password, String recordFolder)
-    {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, recordFolder);
-
-            JSONObject requestParams = new JSONObject();
-            requestParams.put("name", "openRecordFolder");
-            requestParams.put("nodeRef", recNodeRef);
-
-            return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
-        }
-
 }

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

@@ -360,25 +360,4 @@ public class RecordsAPI extends BaseAPI
     {
         return getNodeRefSpacesStore() + getItemNodeRef(username, password, recordPath + "/" + recordName);
     }
-
-    /**
-     * Reopens the record given as parameter
-     *
-     * @param user       the user declaring the document as record
-     * @param password   the user's password
-     * @param recordName the record name
-     * @return The HTTP Response.
-     */
-
-    public HttpResponse reOpenRecord(String user, String password, String recordName)
-    {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, recordName);
-
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("name", "undeclareRecord");
-        requestParams.put("nodeRef", recNodeRef);
-
-        return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
-    }
-
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditAddToHoldTests.java

@@ -31,18 +31,18 @@ import static java.util.Arrays.asList;
 import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
 import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
 import static org.alfresco.rest.rm.community.model.audit.AuditEvents.ADD_TO_HOLD;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
 import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
 import static org.alfresco.rest.rm.community.utils.RMSiteUtil.FILE_PLAN_PATH;
 import static org.alfresco.utility.Utility.buildPath;
 import static org.alfresco.utility.Utility.removeLastSlash;
 import static org.alfresco.utility.data.RandomData.getRandomName;
 import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
+import static org.apache.commons.httpclient.HttpStatus.SC_INTERNAL_SERVER_ERROR;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import com.google.common.collect.ImmutableMap;
@@ -50,13 +50,12 @@ import com.google.common.collect.ImmutableMap;
 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
 import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldChild;
 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.UserPermissions;
 import org.alfresco.rest.rm.community.model.user.UserRoles;
+import org.alfresco.rest.v0.HoldsAPI;
 import org.alfresco.rest.v0.service.RMAuditService;
 import org.alfresco.rest.v0.service.RoleService;
 import org.alfresco.test.AlfrescoTest;
@@ -86,6 +85,8 @@ public class AuditAddToHoldTests extends BaseRMRestTest
     @Autowired
     private RMAuditService rmAuditService;
     @Autowired
+    private HoldsAPI holdsAPI;
+    @Autowired
     private RoleService roleService;
 
     private UserModel rmAdmin, rmManagerNoReadOnHold, rmManagerNoReadOnNode;
@@ -93,22 +94,17 @@ public class AuditAddToHoldTests extends BaseRMRestTest
     private RecordCategory recordCategory;
     private RecordCategoryChild recordFolder;
     private List<AuditEntry> auditEntries;
+    private final List<String> holdsList = asList(HOLD1, HOLD2);
     private List<String> holdsListRef = new ArrayList<>();
     private String hold1NodeRef;
-    private String hold2NodeRef;
 
     @BeforeClass (alwaysRun = true)
     public void preconditionForAuditAddToHoldTests()
     {
         STEP("Create 2 holds.");
-        hold1NodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD1).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
-        hold2NodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD2).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
+        hold1NodeRef = holdsAPI.createHoldAndGetNodeRef(getAdminUser().getUsername(),
+                getAdminUser().getPassword(), HOLD1, HOLD_REASON, HOLD_DESCRIPTION);
+        String hold2NodeRef = holdsAPI.createHoldAndGetNodeRef(getAdminUser().getUsername(), getAdminUser().getPassword(), HOLD2, HOLD_REASON, HOLD_DESCRIPTION);
         holdsListRef = asList(hold1NodeRef, hold2NodeRef);
 
         STEP("Create a new record category with a record folder.");
@@ -173,8 +169,7 @@ public class AuditAddToHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Add node to hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(nodeId).build(), hold1NodeRef);
-
+        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), nodeId, HOLD1);
 
         STEP("Check the audit log contains the entry for the add to hold event.");
         rmAuditService.checkAuditLogForEvent(getAdminUser(), ADD_TO_HOLD, rmAdmin, nodeName, nodePath,
@@ -196,8 +191,9 @@ public class AuditAddToHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Try to add the record to a hold by an user with no rights.");
-        getRestAPIFactory().getHoldsAPI(rmManagerNoReadOnHold).addChildToHold(HoldChild.builder().id(recordToBeAdded.getId()).build(), hold1NodeRef);
-        assertStatusCode(FORBIDDEN);
+        holdsAPI.addItemsToHolds(rmManagerNoReadOnHold.getUsername(), rmManagerNoReadOnHold.getPassword(),
+                SC_INTERNAL_SERVER_ERROR, Collections.singletonList(recordToBeAdded.getId()),
+                Collections.singletonList(hold1NodeRef));
 
         STEP("Check the audit log doesn't contain the entry for the unsuccessful add to hold.");
         assertTrue("The list of events should not contain Add to Hold entry ",
@@ -219,7 +215,7 @@ public class AuditAddToHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Add record folder to hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(notEmptyRecFolder.getId()).build(), hold1NodeRef);
+        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), notEmptyRecFolder.getId(), HOLD1);
 
         auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), ADD_TO_HOLD);
 
@@ -243,9 +239,8 @@ public class AuditAddToHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Add record to multiple holds.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(recordToBeAdded.getId()).build(), hold1NodeRef);
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(recordToBeAdded.getId()).build(), hold2NodeRef);
-
+        holdsAPI.addItemsToHolds(rmAdmin.getUsername(), rmAdmin.getPassword(),
+                Collections.singletonList(recordToBeAdded.getId()), holdsList);
 
         auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), ADD_TO_HOLD);
 
@@ -273,7 +268,7 @@ public class AuditAddToHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Add file to hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(contentToBeAdded.getNodeRefWithoutVersion()).build(), hold1NodeRef);
+        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), contentToBeAdded.getNodeRefWithoutVersion(), HOLD1);
 
         STEP("Check that an user with no Read permissions can't see the entry for the add to hold event.");
         assertTrue("The list of events should not contain Add to Hold entry ",
@@ -294,7 +289,7 @@ public class AuditAddToHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Add file to hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(contentToBeAdded.getNodeRefWithoutVersion()).build(), hold1NodeRef);
+        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), contentToBeAdded.getNodeRefWithoutVersion(), HOLD1);
 
         auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(rmManagerNoReadOnHold, ADD_TO_HOLD);
 
@@ -309,8 +304,7 @@ public class AuditAddToHoldTests extends BaseRMRestTest
     @AfterClass (alwaysRun = true)
     public void cleanUpAuditAddToHoldTests()
     {
-        holdsListRef.forEach(holdRef -> getRestAPIFactory().getHoldsAPI(getAdminUser()).deleteHold(holdRef));
-
+        holdsListRef.forEach(holdRef -> holdsAPI.deleteHold(getAdminUser(), holdRef));
         dataSite.usingAdmin().deleteSite(privateSite);
         asList(rmAdmin, rmManagerNoReadOnHold, rmManagerNoReadOnNode).forEach(user -> getDataUser().usingAdmin().deleteUser(user));
         deleteRecordCategory(recordCategory.getId());

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditCreateHoldTests.java

@@ -31,10 +31,9 @@ import static java.util.Arrays.asList;
 import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
 import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
 import static org.alfresco.rest.rm.community.model.audit.AuditEvents.CREATE_HOLD;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
 import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
 import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.CONFLICT;
+import static org.apache.commons.httpclient.HttpStatus.SC_INTERNAL_SERVER_ERROR;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
@@ -45,8 +44,8 @@ import com.google.common.collect.ImmutableMap;
 
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
 import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.hold.Hold;
 import org.alfresco.rest.rm.community.model.user.UserRoles;
+import org.alfresco.rest.v0.HoldsAPI;
 import org.alfresco.rest.v0.service.RMAuditService;
 import org.alfresco.rest.v0.service.RoleService;
 import org.alfresco.test.AlfrescoTest;
@@ -74,6 +73,8 @@ public class AuditCreateHoldTests extends BaseRMRestTest
     @Autowired
     private RMAuditService rmAuditService;
     @Autowired
+    private HoldsAPI holdsAPI;
+    @Autowired
     private RoleService roleService;
 
     private UserModel rmAdmin, rmManager;
@@ -101,10 +102,8 @@ public class AuditCreateHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Create a new hold.");
-        String hold1NodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD1).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
+        String hold1NodeRef = holdsAPI.createHoldAndGetNodeRef(rmAdmin.getUsername(), rmAdmin.getPassword(), HOLD1,
+                HOLD_REASON, HOLD_DESCRIPTION);
         holdsListRef.add(hold1NodeRef);
         STEP("Check the audit log contains the entry for the created hold with the hold details.");
         rmAuditService.checkAuditLogForEvent(getAdminUser(), CREATE_HOLD, rmAdmin, HOLD1,
@@ -121,18 +120,13 @@ public class AuditCreateHoldTests extends BaseRMRestTest
     public void createHoldEventIsNotAuditedForExistingHold()
     {
         STEP("Create a new hold.");
-        String hold2NodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD2).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
+        String hold2NodeRef = holdsAPI.createHoldAndGetNodeRef(rmAdmin.getUsername(), rmAdmin.getPassword(), HOLD2, HOLD_REASON, HOLD_DESCRIPTION);
         holdsListRef.add(hold2NodeRef);
         rmAuditService.clearAuditLog();
 
         STEP("Try to create again the same hold and expect action to fail.");
-        getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD2).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS);
-        assertStatusCode(CONFLICT);
+        holdsAPI.createHold(rmAdmin.getUsername(), rmAdmin.getPassword(), HOLD2, HOLD_REASON, HOLD_DESCRIPTION,
+                SC_INTERNAL_SERVER_ERROR);
 
         STEP("Check the audit log doesn't contain the entry for the second create hold event.");
         assertTrue("The list of events should not contain Create Hold entry ",
@@ -151,17 +145,13 @@ public class AuditCreateHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Create a new hold.");
-        String nodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(holdName).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS).getId();
+        holdsAPI.createHold(rmAdmin.getUsername(), rmAdmin.getPassword(), holdName, HOLD_REASON, HOLD_DESCRIPTION);
 
         STEP("Get the list of audit entries for the create hold event.");
         List<AuditEntry> auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), CREATE_HOLD);
 
         STEP("Delete the created hold.");
-        getRestAPIFactory()
-            .getHoldsAPI(rmAdmin)
-            .deleteHold(nodeRef);
+        holdsAPI.deleteHold(rmAdmin.getUsername(), rmAdmin.getPassword(), holdName);
 
         STEP("Get again the list of audit entries for the create hold event.");
         List<AuditEntry> auditEntriesAfterDelete = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), CREATE_HOLD);
@@ -181,10 +171,8 @@ public class AuditCreateHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Create a new hold.");
-        String hold3NodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD3).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS).getId();
-
+        String hold3NodeRef = holdsAPI.createHoldAndGetNodeRef(rmAdmin.getUsername(), rmAdmin.getPassword(), HOLD3,
+                HOLD_REASON, HOLD_DESCRIPTION);
         holdsListRef.add(hold3NodeRef);
 
         STEP("Check that an user with no Read permissions over the hold can't see the entry for the create hold event");
@@ -195,7 +183,7 @@ public class AuditCreateHoldTests extends BaseRMRestTest
     @AfterClass (alwaysRun = true)
     public void cleanUpAuditCreateHoldTests()
     {
-        holdsListRef.forEach(holdRef -> getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHold(holdRef));
+        holdsListRef.forEach(holdRef -> holdsAPI.deleteHold(getAdminUser(), holdRef));
         asList(rmAdmin, rmManager).forEach(user -> getDataUser().usingAdmin().deleteUser(user));
     }
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditDeleteHoldTests.java

@@ -31,20 +31,18 @@ import static java.util.Arrays.asList;
 import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
 import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
 import static org.alfresco.rest.rm.community.model.audit.AuditEvents.DELETE_HOLD;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
 import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
 import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
+import static org.apache.commons.httpclient.HttpStatus.SC_INTERNAL_SERVER_ERROR;
 import static org.testng.AssertJUnit.assertTrue;
 
-import java.util.List;
+import java.util.Collections;
 
 import com.google.common.collect.ImmutableMap;
 
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldDeletionReason;
 import org.alfresco.rest.rm.community.model.user.UserRoles;
+import org.alfresco.rest.v0.HoldsAPI;
 import org.alfresco.rest.v0.service.RMAuditService;
 import org.alfresco.rest.v0.service.RoleService;
 import org.alfresco.test.AlfrescoTest;
@@ -64,13 +62,14 @@ import org.testng.annotations.Test;
 public class AuditDeleteHoldTests extends BaseRMRestTest
 {
     private final String PREFIX = generateTestPrefix(AuditDeleteHoldTests.class);
-    private final String hold = PREFIX + "holdToBeDeleted";
-    private final String hold2 = PREFIX + "deleteHold";
-    private final String hold3 = PREFIX + "deleteHoldWithReason";
+    private final String HOLD = PREFIX + "holdToBeDeleted";
+    private final String HOLD2 = PREFIX + "deleteHold";
 
     @Autowired
     private RMAuditService rmAuditService;
     @Autowired
+    private HoldsAPI holdsAPI;
+    @Autowired
     private RoleService roleService;
 
     private UserModel rmAdmin, rmManager;
@@ -80,10 +79,8 @@ public class AuditDeleteHoldTests extends BaseRMRestTest
     public void preconditionForAuditDeleteHoldTests()
     {
         STEP("Create a new hold.");
-        holdNodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(hold).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
+        holdNodeRef = holdsAPI.createHoldAndGetNodeRef(getAdminUser().getUsername(), getAdminUser().getPassword(), HOLD,
+                HOLD_REASON, HOLD_DESCRIPTION);
 
         STEP("Create 2 users with different permissions for the created hold.");
         rmAdmin = roleService.createUserWithRMRole(UserRoles.ROLE_RM_ADMIN.roleId);
@@ -102,51 +99,17 @@ public class AuditDeleteHoldTests extends BaseRMRestTest
     public void deleteHoldEventIsAudited()
     {
         STEP("Create a new hold.");
-        String holdRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(hold2).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
+        String holdRef = holdsAPI.createHoldAndGetNodeRef(rmAdmin.getUsername(), rmAdmin.getPassword(), HOLD2,
+                HOLD_REASON, HOLD_DESCRIPTION);
 
         rmAuditService.clearAuditLog();
 
         STEP("Delete the created hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHold(holdRef);
+        holdsAPI.deleteHold(rmAdmin, holdRef);
 
         STEP("Check the audit log contains the entry for the deleted hold with the hold details.");
-        rmAuditService.checkAuditLogForEvent(getAdminUser(), DELETE_HOLD, rmAdmin, hold2,
-                List.of(ImmutableMap.of("new", "", "previous", hold2, "name", "Hold Name"),
-                    ImmutableMap.of("new", "", "previous", "", "name", "Hold deletion reason")));
-    }
-
-    /**
-     * Given a hold is deleted with a reason
-     * When I view the audit log
-     * Then an entry has been created in the audit log which contains the following:
-     *      name of the hold
-     *      hold deletion reason
-     *      user who deleted the hold
-     *      date the delete occurred
-     */
-    @Test
-    public void deleteHoldWithReasonEventIsAudited()
-    {
-        STEP("Create a new hold.");
-        String holdRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(hold3).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
-
-        String deletionReason = "Test reason";
-
-        rmAuditService.clearAuditLog();
-
-        STEP("Delete the created hold with a reason.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHoldWithReason(HoldDeletionReason.builder().reason(deletionReason).build(), holdRef);
-
-        STEP("Check the audit log contains the entry for the deleted hold with the hold details.");
-        rmAuditService.checkAuditLogForEvent(getAdminUser(), DELETE_HOLD, rmAdmin, hold3,
-            List.of(ImmutableMap.of("new", "", "previous", hold3, "name", "Hold Name"),
-                ImmutableMap.of("new", "", "previous", deletionReason, "name", "Hold deletion reason")));
+        rmAuditService.checkAuditLogForEvent(getAdminUser(), DELETE_HOLD, rmAdmin, HOLD2,
+                Collections.singletonList(ImmutableMap.of("new", "", "previous", HOLD2, "name", "Hold Name")));
     }
 
     /**
@@ -160,8 +123,7 @@ public class AuditDeleteHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Try to delete a hold by an user with no Read permissions over the hold.");
-        getRestAPIFactory().getHoldsAPI(rmManager).deleteHold(holdNodeRef);
-        assertStatusCode(FORBIDDEN);
+        holdsAPI.deleteHold(rmManager.getUsername(), rmManager.getPassword(), holdNodeRef, SC_INTERNAL_SERVER_ERROR);
 
         STEP("Check the audit log doesn't contain the entry for the unsuccessful delete hold.");
         assertTrue("The list of events should not contain Delete Hold entry ",
@@ -171,7 +133,7 @@ public class AuditDeleteHoldTests extends BaseRMRestTest
     @AfterClass (alwaysRun = true)
     public void cleanUpAuditDeleteHoldTests()
     {
-        getRestAPIFactory().getHoldsAPI(rmManager).deleteHold(holdNodeRef);
+        holdsAPI.deleteHold(getAdminUser(), holdNodeRef);
         asList(rmAdmin, rmManager).forEach(user -> getDataUser().usingAdmin().deleteUser(user));
     }
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditHoldsTest.java

@@ -1,155 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.audit;
-
-import static java.util.Arrays.asList;
-
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
-import static org.alfresco.rest.rm.community.model.audit.AuditEvents.ADD_TO_HOLD;
-import static org.alfresco.rest.rm.community.model.audit.AuditEvents.REMOVE_FROM_HOLD;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-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.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.core.IsNot.not;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertTrue;
-
-import java.util.List;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.audit.AuditEvents;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldChild;
-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.recordfolder.RecordFolder;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.v0.service.RMAuditService;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-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.Test;
-public class AuditHoldsTest extends BaseRMRestTest {
-    private final String PREFIX = generateTestPrefix(AuditAddToHoldTests.class);
-    private final String HOLD1 = PREFIX + "hold1";
-    private SiteModel publicSite;
-    private FileModel testFile;
-    @Autowired
-    private RMAuditService rmAuditService;
-    @Autowired
-    private RoleService roleService;
-    private UserModel rmAdmin;
-    private RecordCategory recordCategory;
-    private RecordCategoryChild recordFolder1,recordFolder2;
-    private List<AuditEntry> auditEntries;
-    private String hold1NodeRef;
-    public static final String RECORD_FOLDER_THREE = "record-folder-three";
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForAuditAddToHoldTests()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = roleService.createUserWithRMRole(UserRoles.ROLE_RM_ADMIN.roleId);
-
-        STEP("Create a hold");
-
-        hold1NodeRef = getRestAPIFactory()
-                .getFilePlansAPI(rmAdmin)
-                .createHold(Hold.builder().name(HOLD1).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-                .getId();
-
-        STEP("Create a collaboration site with a test file.");
-        publicSite = dataSite.usingAdmin().createPublicRandomSite();
-        testFile = dataContent.usingAdmin().usingSite(publicSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        STEP("Create a record category with 2 folders and 1 record");
-        recordCategory = createRootCategory(getRandomName("recordCategory"));
-        recordFolder1 = createRecordFolder(recordCategory.getId(), PREFIX + "recFolder1");
-        recordFolder2 = createRecordFolder(recordCategory.getId(), PREFIX + "recFolder2");
-        Record recordToBeAdded = createElectronicRecord(recordFolder1.getId(), PREFIX + "record");
-        assertStatusCode(CREATED);
-
-        STEP("Add some items to the hold, then remove them from the hold");
-        final List<String> itemsList = asList(testFile.getNodeRefWithoutVersion(), recordToBeAdded.getId(), recordFolder2.getId());
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(recordToBeAdded.getId()).build(), hold1NodeRef);
-        for(String childId : itemsList)
-        {
-            getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHoldChild(hold1NodeRef, childId);
-        }
-
-        STEP("Delete the record folder that was held");
-        getRestAPIFactory().getRecordFolderAPI().deleteRecordFolder(recordFolder2.getId());
-
-        STEP("Rename the parent of the record that was held");
-        RecordFolder recordFolder = RecordFolder.builder().name(RECORD_FOLDER_THREE).build();
-        getRestAPIFactory().getRecordFolderAPI().updateRecordFolder(recordFolder, recordFolder1.getId());
-    }
-    /**
-     * Data provider with hold events that have links to held items
-     *
-     * @return the hold events
-     */
-    @DataProvider (name = "holdsEvents")
-    public Object[][] getHoldEvents()
-    {
-        return new AuditEvents[][]
-            {
-                { ADD_TO_HOLD },
-                { REMOVE_FROM_HOLD }
-            };
-    }
-    @Test (dataProvider = "holdsEvents")
-    public void checkItemPathLink(AuditEvents event) {
-        auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), event);
-        assertFalse("Audit results should not be empty",auditEntries.size()==0);
-        final String auditedEvent = event + " - " + testFile.getName();
-        assertTrue("Audit results should contain one " + auditedEvent + " event",auditEntries.stream().anyMatch(e -> e.getEvent().startsWith(event.eventDisplayName)));
-        STEP("Check the audit log contains only an entry for add to hold.");
-        assertThat(auditEntries, is(not(empty())));
-    }
-    @AfterClass(alwaysRun = true)
-    private void cleanup() {
-        dataSite.usingAdmin().deleteSite(publicSite);
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordFolder(recordFolder2.getId());
-        deleteRecordCategory(recordCategory.getId());
-        rmAuditService.clearAuditLog();
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditRemoveFromHoldTests.java

@@ -31,18 +31,18 @@ import static java.util.Arrays.asList;
 import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
 import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
 import static org.alfresco.rest.rm.community.model.audit.AuditEvents.REMOVE_FROM_HOLD;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
 import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
 import static org.alfresco.rest.rm.community.utils.RMSiteUtil.FILE_PLAN_PATH;
 import static org.alfresco.utility.Utility.buildPath;
 import static org.alfresco.utility.Utility.removeLastSlash;
 import static org.alfresco.utility.data.RandomData.getRandomName;
 import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
+import static org.apache.commons.httpclient.HttpStatus.SC_INTERNAL_SERVER_ERROR;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import com.google.common.collect.ImmutableMap;
@@ -50,13 +50,12 @@ import com.google.common.collect.ImmutableMap;
 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
 import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldChild;
 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.UserPermissions;
 import org.alfresco.rest.rm.community.model.user.UserRoles;
+import org.alfresco.rest.v0.HoldsAPI;
 import org.alfresco.rest.v0.service.RMAuditService;
 import org.alfresco.rest.v0.service.RoleService;
 import org.alfresco.test.AlfrescoTest;
@@ -87,6 +86,8 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
     @Autowired
     private RMAuditService rmAuditService;
     @Autowired
+    private HoldsAPI holdsAPI;
+    @Autowired
     private RoleService roleService;
 
     private UserModel rmAdmin, rmManagerNoReadOnHold, rmManagerNoReadOnNode;
@@ -95,11 +96,10 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
     private RecordCategoryChild recordFolder, heldRecordFolder;
     private Record heldRecord;
     private List<AuditEntry> auditEntries;
+    private final List<String> holdsList = asList(HOLD1, HOLD2, HOLD3);
     private List<String> holdsListRef = new ArrayList<>();
     private FileModel heldContent;
     private String hold1NodeRef;
-    private String hold2NodeRef;
-    private String hold3NodeRef;
 
     @BeforeClass (alwaysRun = true)
     public void preconditionForAuditRemoveFromHoldTests()
@@ -111,18 +111,10 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
         privateSite = dataSite.usingUser(rmAdmin).createPrivateRandomSite();
 
         STEP("Create new holds.");
-        hold1NodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD1).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
-        hold2NodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD2).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
-        hold3NodeRef = getRestAPIFactory()
-            .getFilePlansAPI(rmAdmin)
-            .createHold(Hold.builder().name(HOLD3).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), FILE_PLAN_ALIAS)
-            .getId();
+        hold1NodeRef = holdsAPI.createHoldAndGetNodeRef(getAdminUser().getUsername(), getAdminUser().getPassword(),
+                HOLD1, HOLD_REASON, HOLD_DESCRIPTION);
+        String hold2NodeRef = holdsAPI.createHoldAndGetNodeRef(getAdminUser().getUsername(), getAdminUser().getPassword(), HOLD2, HOLD_REASON, HOLD_DESCRIPTION);
+        String hold3NodeRef = holdsAPI.createHoldAndGetNodeRef(getAdminUser().getUsername(), getAdminUser().getPassword(), HOLD3, HOLD_REASON, HOLD_DESCRIPTION);
         holdsListRef = asList(hold1NodeRef, hold2NodeRef, hold3NodeRef);
 
         STEP("Create a new record category with a record folder.");
@@ -135,12 +127,9 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
         heldRecordFolder = createRecordFolder(recordCategory.getId(), PREFIX + "heldRecFolder");
         heldRecord = createElectronicRecord(recordFolder.getId(), PREFIX + "record");
 
-        holdsListRef.forEach(holdRef ->
-        {
-            getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(heldContent.getNodeRefWithoutVersion()).build(), holdRef);
-            getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(heldRecordFolder.getId()).build(), holdRef);
-            getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(heldRecord.getId()).build(), holdRef);
-        });
+        holdsAPI.addItemsToHolds(getAdminUser().getUsername(), getAdminUser().getPassword(),
+                asList(heldContent.getNodeRefWithoutVersion(), heldRecordFolder.getId(), heldRecord.getId()),
+                holdsList);
 
         STEP("Create users without rights to remove content from a hold.");
         rmManagerNoReadOnHold = roleService.createUserWithSiteRoleRMRoleAndPermission(privateSite,
@@ -190,7 +179,7 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Remove node from hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHoldChild(hold3NodeRef, nodeId);
+        holdsAPI.removeItemFromHold(rmAdmin.getUsername(), rmAdmin.getPassword(), nodeId, HOLD3);
 
         STEP("Check the audit log contains the entry for the remove from hold event.");
         rmAuditService.checkAuditLogForEvent(getAdminUser(), REMOVE_FROM_HOLD, rmAdmin, nodeName, nodePath,
@@ -209,8 +198,9 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Try to remove the record from a hold by an user with no rights.");
-        getRestAPIFactory().getHoldsAPI(rmManagerNoReadOnHold).deleteHoldChild(hold1NodeRef, heldRecord.getId());
-        assertStatusCode(FORBIDDEN);
+        holdsAPI.removeItemsFromHolds(rmManagerNoReadOnHold.getUsername(), rmManagerNoReadOnHold.getPassword(),
+                SC_INTERNAL_SERVER_ERROR, Collections.singletonList(heldRecord.getId()),
+                Collections.singletonList(hold1NodeRef));
 
         STEP("Check the audit log doesn't contain the entry for the unsuccessful remove from hold.");
         assertTrue("The list of events should not contain remove from hold entry ",
@@ -230,12 +220,12 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
         Record record = createElectronicRecord(notEmptyRecFolder.getId(), PREFIX + "record");
 
         STEP("Add the record folder to a hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(notEmptyRecFolder.getId()).build(), hold1NodeRef);
+        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), notEmptyRecFolder.getId(), HOLD1);
 
         rmAuditService.clearAuditLog();
 
         STEP("Remove record folder from hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHoldChild(hold1NodeRef, notEmptyRecFolder.getId());
+        holdsAPI.removeItemFromHold(rmAdmin.getUsername(), rmAdmin.getPassword(), notEmptyRecFolder.getId(), HOLD1);
 
         STEP("Get the list of audit entries for the remove from hold event.");
         auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), REMOVE_FROM_HOLD);
@@ -257,8 +247,8 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
         rmAuditService.clearAuditLog();
 
         STEP("Remove record folder from multiple holds.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHoldChild(hold1NodeRef, heldRecordFolder.getId());
-        getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHoldChild(hold2NodeRef, heldRecordFolder.getId());
+        holdsAPI.removeItemsFromHolds(rmAdmin.getUsername(), rmAdmin.getPassword(),
+                Collections.singletonList(heldRecordFolder.getId()), asList(HOLD1, HOLD2));
 
         STEP("Get the list of audit entries for the remove from hold event.");
         auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), REMOVE_FROM_HOLD);
@@ -285,12 +275,12 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
         STEP("Add content to a hold.");
         FileModel heldFile = dataContent.usingAdmin().usingSite(privateSite)
                                            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(heldFile.getNodeRefWithoutVersion()).build(), hold1NodeRef);
+        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), heldFile.getNodeRefWithoutVersion(), HOLD1);
 
         rmAuditService.clearAuditLog();
 
         STEP("Remove held content from the hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHoldChild(hold1NodeRef, heldFile.getNodeRefWithoutVersion());
+        holdsAPI.removeItemFromHold(rmAdmin.getUsername(), rmAdmin.getPassword(), heldFile.getNodeRefWithoutVersion(), HOLD1);
 
         STEP("Check that an user with no Read permissions can't see the entry for the remove from hold event.");
         assertTrue("The list of events should not contain Remove from Hold entry ",
@@ -308,12 +298,12 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
         STEP("Add content to a hold.");
         FileModel heldFile = dataContent.usingAdmin().usingSite(privateSite)
                                         .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        getRestAPIFactory().getHoldsAPI(rmAdmin).addChildToHold(HoldChild.builder().id(heldFile.getNodeRefWithoutVersion()).build(), hold1NodeRef);
+        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), heldFile.getNodeRefWithoutVersion(), HOLD1);
 
         rmAuditService.clearAuditLog();
 
         STEP("Remove held content from the hold.");
-        getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHoldChild(hold1NodeRef, heldFile.getNodeRefWithoutVersion());
+        holdsAPI.removeItemFromHold(rmAdmin.getUsername(), rmAdmin.getPassword(), heldFile.getNodeRefWithoutVersion(), HOLD1);
 
         auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(rmManagerNoReadOnHold, REMOVE_FROM_HOLD);
 
@@ -328,7 +318,7 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest
     @AfterClass (alwaysRun = true)
     public void cleanUpAuditRemoveFromHoldTests()
     {
-        holdsListRef.forEach(holdRef -> getRestAPIFactory().getHoldsAPI(rmAdmin).deleteHold(holdRef));
+        holdsListRef.forEach(holdRef -> holdsAPI.deleteHold(getAdminUser(), holdRef));
         dataSite.usingAdmin().deleteSite(privateSite);
         asList(rmAdmin, rmManagerNoReadOnHold, rmManagerNoReadOnNode).forEach(user -> getDataUser().usingAdmin().deleteUser(user));
         deleteRecordCategory(recordCategory.getId());

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/ElectronicRecordAuditLogTest.java

@@ -1,244 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-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.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-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.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-public class ElectronicRecordAuditLogTest extends BaseRMRestTest {
-
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-    @Autowired
-    private RecordsAPI recordApi;
-    /* electronic record details */
-    private static final String AUDIT_ELECTRONIC_RECORD = generateTestPrefix(ElectronicRecordAuditLogTest.class) + "electronic record";
-    private static final String AUDIT_COMPLETE_REOPEN_ELECTRONIC_RECORD = "Complete Reopen Electronic Record";
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    private Record electronicRecord, electronicRecord2;
-
-    @BeforeClass(alwaysRun = true)
-    public void electronicRecordsAuditLogSetup()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-            getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            rmAdmin.get().getUsername(),
-            "Administrator");
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(),TITLE);
-
-        electronicRecord = createElectronicRecord(recordFolder1.getId(),AUDIT_ELECTRONIC_RECORD,rmAdmin.get());
-    }
-
-    @Test(description = "Audit log for newly filed electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void newElectronicRecordAudit() {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-
-        // newly created record contains 2 events: "file to" and metadata update
-        // the order in which object creation and metadata update are listed isn't always identical due to
-        // both happening in the same transaction
-        assertTrue("File To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("File to")));
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "newElectronicRecordAudit",
-            description = "Viewing electronic record audit log is itself an auditable event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void electronicRecordAuditIsEvent()
-    {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Audit View Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "electronicRecordAuditIsEvent",
-            description = "Rename electronic record is an edit metadata event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameElectronicRecord() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        Record renameElectronicRecord = createRecordModel("edited " + electronicRecord.getName(), "", "");
-
-        // rename record
-        getRestAPIFactory().getRecordsAPI().updateRecord(renameElectronicRecord, electronicRecord.getId());
-        assertStatusCode(OK);
-
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test (
-        dependsOnMethods = "newElectronicRecordAudit",
-        description = "Complete and reopen electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void completeAndReopenElectronicRecord() {
-        electronicRecord2 = createElectronicRecord(recordFolder1.getId(),AUDIT_COMPLETE_REOPEN_ELECTRONIC_RECORD);
-
-        // complete record
-        recordApi.completeRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-            electronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(electronicRecord2.getId()).getAspectNames();
-                // a record must be completed
-                assertTrue("Record is not completed.",aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Complete Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Complete Record")));
-
-        // Reopen record
-        recordApi.reOpenRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-            electronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(electronicRecord2.getId()).getAspectNames();
-                // a record mustn't be completed
-                assertFalse(aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Reopen Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Reopen Record")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "completeAndReopenElectronicRecord",
-            description = "File electronic record's audit log as record"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void fileElectronicRecordAuditLogAsRecord()
-    {
-        // audit log is stored in the same folder, refresh it so that it appears in the list
-        HttpResponse auditRecordHttpResponse = auditLog.logsAuditLogAsRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-        getRecordNodeRef(electronicRecord2.getId()),getFolderNodeRef(recordFolder1.getId()));
-        JSONObject auditRecordProperties = getAuditPropertyValues(auditRecordHttpResponse);
-        Record auditRecord = getRestAPIFactory().getRecordsAPI().getRecord(auditRecordProperties.get("record").toString()
-            .replace("workspace://SpacesStore/",""));
-        // check audit log
-        AssertJUnit.assertTrue(auditRecordProperties.get("recordName").toString().endsWith(".html"));
-        AssertJUnit.assertTrue(auditRecord.getAspectNames().stream().noneMatch(x -> x.startsWith(ASPECTS_COMPLETED_RECORD)));
-    }
-
-    private String getFolderNodeRef(String folderId) {
-        return "workspace://SpacesStore/" + folderId;
-    }
-
-    private String getRecordNodeRef(String recordId) {
-        return "workspace/SpacesStore/" + recordId;
-    }
-
-    private JSONObject getAuditPropertyValues(HttpResponse httpResponse) {
-        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;
-    }
-
-    @AfterMethod
-    private void closeAuditLog() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass(alwaysRun = true)
-    private void electronicRecordAuditLogCleanup() {
-        deleteRecord(electronicRecord.getId());
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/NonElectronicRecordAuditLogTest.java

@@ -1,246 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-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.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-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.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-
-public class NonElectronicRecordAuditLogTest extends BaseRMRestTest {
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-    @Autowired
-    private RecordsAPI recordApi;
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    private Record nonElectronicRecord , nonElectronicRecord2;
-    private static final String AUDIT_NON_ELECTRONIC_RECORD = generateTestPrefix(NonElectronicRecordAuditLogTest.class) + "non electronic record";
-    private static final String AUDIT_COMPLETE_REOPEN_NON_ELECTRONIC_RECORD = "Complete Reopen Non-Electronic Record";
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-
-    @BeforeClass(alwaysRun = true)
-    public void nonElectronicRecordAuditLogSetup()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-                getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(),
-                rmAdmin.get().getUsername(),
-                "Administrator");
-
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(),TITLE);
-        nonElectronicRecord = createNonElectronicRecord(recordFolder1.getId(),AUDIT_NON_ELECTRONIC_RECORD,rmAdmin.get());
-
-    }
-
-    @Test(description = "Audit log for newly filed non-electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void newNonElectronicRecordAudit()
-    {
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-
-        // newly created record contains 3 events: "created object", "file to" and metadata update
-        assertTrue("File To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("File to")));
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-        assertTrue("Created Object Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "newNonElectronicRecordAudit",
-                    description = "Viewing Non electronic record audit log is itself an auditable event"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void nonElectronicRecordAuditIsEvent()
-    {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Audit View Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "nonElectronicRecordAuditIsEvent",
-                    description = "Rename electronic record is an edit metadata event"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameNonElectronicRecord()
-    {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        Record renameNonElectronicRecord = createRecordModel("edited " + nonElectronicRecord.getName(), "", "");
-
-        // rename record
-        getRestAPIFactory().getRecordsAPI().updateRecord(renameNonElectronicRecord, nonElectronicRecord.getId());
-        assertStatusCode(OK);
-
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test (dependsOnMethods = "newNonElectronicRecordAudit",description = "Complete and reopen electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void completeAndReopenNonElectronicRecord()
-    {
-        nonElectronicRecord2 = createNonElectronicRecord(recordFolder1.getId(),AUDIT_COMPLETE_REOPEN_NON_ELECTRONIC_RECORD);
-
-        // complete record
-        recordApi.completeRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                nonElectronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(nonElectronicRecord2.getId()).getAspectNames();
-                // a record must be completed
-                assertTrue("Record is not completed.",aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Complete Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Complete Record")));
-
-        // Reopen record
-        recordApi.reOpenRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                nonElectronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(nonElectronicRecord2.getId()).getAspectNames();
-                // a record mustn't be completed
-                assertFalse(aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Reopen Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Reopen Record")));
-
-    }
-    @Test
-            (
-                    dependsOnMethods = "completeAndReopenNonElectronicRecord",
-                    description = "File electronic record's audit log as record"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void fileNonElectronicRecordAuditLogAsRecord()
-    {
-        // audit log is stored in the same folder, refresh it so that it appears in the list
-        HttpResponse auditRecordHttpResponse = auditLog.logsAuditLogAsRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                getRecordNodeRef(nonElectronicRecord2.getId()),getFolderNodeRef(recordFolder1.getId()));
-        JSONObject auditRecordProperties = getAuditPropertyValues(auditRecordHttpResponse);
-        Record auditRecord = getRestAPIFactory().getRecordsAPI().getRecord(auditRecordProperties.get("record").toString()
-                .replace("workspace://SpacesStore/",""));
-        // check audit log
-        AssertJUnit.assertTrue(auditRecordProperties.get("recordName").toString().endsWith(".html"));
-        AssertJUnit.assertTrue(auditRecord.getAspectNames().stream().noneMatch(x -> x.startsWith(ASPECTS_COMPLETED_RECORD)));
-
-    }
-
-    private String getFolderNodeRef(String folderId) {
-        return "workspace://SpacesStore/" + folderId;
-    }
-
-    private String getRecordNodeRef(String recordId) {
-        return "workspace/SpacesStore/" + recordId;
-    }
-
-    private JSONObject getAuditPropertyValues(HttpResponse httpResponse) {
-        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;
-    }
-    @AfterMethod
-    private void closeAuditLog() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass(alwaysRun = true)
-    private void nonElectronicRecordAuditLogCleanup() {
-        deleteRecord(nonElectronicRecord.getId());
-        deleteRecord(nonElectronicRecord2.getId());
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/RecordCategoryAuditLogTest.java

@@ -1,120 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-
-public class RecordCategoryAuditLogTest extends BaseRMRestTest {
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-
-    private final String TEST_PREFIX = generateTestPrefix(RecordCategoryAuditLogTest.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    private static final String AUDIT_CATEGORY = generateTestPrefix(RecordCategoryAuditLogTest.class) + "category";
-    private RecordCategory recordCategoryAudit;
-
-    @BeforeClass(alwaysRun = true)
-    public void recordCategoryAuditLogSetup() {
-        STEP("Create RM Site");
-        createRMSiteIfNotExists();
-
-        STEP("Create RM Admin user");
-        rmRolesAndActionsAPI.createUserAndAssignToRole(getAdminUser().getUsername(), getAdminUser().getPassword(), RM_ADMIN,
-            getAdminUser().getPassword(),
-            "Administrator");
-    }
-
-    @Test
-    @AlfrescoTest(jira = "RM-2768")
-    public void recordCategoryAudit() throws Exception {
-        STEP("Create root level category");
-        recordCategoryAudit = createRootCategory(AUDIT_CATEGORY);
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        // newly created record category contains 3 events: object creation, inherited permissions set to false and metadata update
-        // the order in which object creation and metadata update are listed isn't always identical due to
-        // both happening in the same transaction
-        assertTrue("Created Object Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "recordCategoryAudit",
-            description = "Viewing audit log is itself an auditable event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void recordCategoryAuditIsEvent() {
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Audit View Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "recordCategoryAuditIsEvent",
-            description = "Record category rename is an edit metadata event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameRecordCategory() {
-        String categoryName = "Category name " + getRandomAlphanumeric();
-        RecordCategory rootRecordCategory = createRootCategory(categoryName);
-        String newCategoryName = "Rename " + categoryName;
-        RecordCategory recordCategoryUpdated = RecordCategory.builder().name(newCategoryName).build();
-        RecordCategory renamedRecordCategory = getRestAPIFactory().getRecordCategoryAPI().updateRecordCategory(recordCategoryUpdated, rootRecordCategory.getId());
-
-        assertStatusCode(OK);
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-    @AfterClass(alwaysRun = true)
-    private void electronicRecordAuditLogCleanup() {
-        deleteRecordCategory(recordCategoryAudit.getId());
-        dataUser.deleteUser(new UserModel(RM_ADMIN,
-            getAdminUser().getPassword()));
-        auditLog.clearAuditLog(getAdminUser().getUsername(), getAdminUser().getPassword());
-    }
-}
-

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/RecordFolderAuditLogTest.java

@@ -1,175 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-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.RecordFolder;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordFoldersAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import java.util.List;
-import java.util.Optional;
-
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordFolderModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-public class RecordFolderAuditLogTest extends BaseRMRestTest {
-
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-
-    @Autowired
-    private RecordFoldersAPI recordFoldersAPI;
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-
-    @BeforeClass(alwaysRun = true)
-    public void recordFolderAuditLogSetup() {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-                getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(),
-                rmAdmin.get().getUsername(),
-                "Administrator");
-    }
-
-    @Test(description = "Audit log for empty record folder")
-    @AlfrescoTest(jira = "RM-4303")
-    public void recordFolderAudit() {
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(), TITLE);
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Created Object Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "recordFolderAudit",
-                    description = "Viewing record folder audit log is itself an auditable event"
-            )
-    @AlfrescoTest(jira = "RM-4303")
-    public void recordFolderAuditIsEvent() {
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Audit View Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "recordFolderAuditIsEvent",
-                    description = "Record folder rename is an edit metadata event"
-            )
-    @AlfrescoTest(jira = "RM-4303")
-    public void renameRecordFolder() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(), rmAdmin.get().getPassword());
-        RecordFolder renameRecordFolder = createRecordFolderModel(category1.getId(), "edited");
-        getRestAPIFactory().getRecordFolderAPI().updateRecordFolder(renameRecordFolder, recordFolder1.getId());
-        assertStatusCode(OK);
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-//        assertTrue("Move To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Move to")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test(dependsOnMethods = "recordFolderAudit",
-        description = "Close and reopen folder")
-    @AlfrescoTest(jira = "RM-4303")
-    public void closeReopenFolder() {
-        //close folder
-        recordFoldersAPI.closeRecordFolder(rmAdmin.get().getUsername(), rmAdmin.get().getPassword(),
-                recordFolder1.getName());
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-                assertTrue("Folder Close Record Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Close Record Folder")));
-
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        //reopen folder
-        recordFoldersAPI.reOpenRecordFolder(rmAdmin.get().getUsername(), rmAdmin.get().getPassword(),
-                recordFolder1.getName());
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-
-                List<AuditEntry> auditEntries  = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-                assertTrue("Reopen Record Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Open Record Folder")));
-
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-    }
-    @AfterMethod
-    private void closeAuditLog()
-    {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass (alwaysRun = true)
-    public void recordFolderAuditLogCleanup()
-    {
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplans/FilePlanTests.java

@@ -60,15 +60,12 @@ import static org.testng.Assert.fail;
 import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.NoSuchElementException;
 
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
 import org.alfresco.rest.rm.community.base.DataProviderClass;
 import org.alfresco.rest.rm.community.model.fileplan.FilePlan;
 import org.alfresco.rest.rm.community.model.fileplan.FilePlanProperties;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldCollection;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryCollection;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryProperties;
@@ -517,97 +514,5 @@ public class FilePlanTests extends BaseRMRestTest
         );
     }
 
-    /**
-     * <pre>
-     * Given that a file plan exists
-     * When I ask the API to create a hold
-     * Then it is created
-     * </pre>
-     */
-    @Test
-    public void createHolds()
-    {
-        String holdName = "Hold" + getRandomAlphanumeric();
-        String holdDescription = "Description" + getRandomAlphanumeric();
-        String holdReason = "Reason" + getRandomAlphanumeric();
 
-        // Create the hold
-        Hold hold = Hold.builder()
-            .name(holdName)
-            .description(holdDescription)
-            .reason(holdReason)
-            .build();
-        Hold createdHold = getRestAPIFactory().getFilePlansAPI()
-            .createHold(hold, FILE_PLAN_ALIAS);
-
-        // Verify the status code
-        assertStatusCode(CREATED);
-
-        assertEquals(createdHold.getName(), holdName);
-        assertEquals(createdHold.getDescription(), holdDescription);
-        assertEquals(createdHold.getReason(), holdReason);
-        assertNotNull(createdHold.getId());
-    }
-
-
-    @Test
-    public void listHolds()
-    {
-        // Delete all holds
-        getRestAPIFactory().getFilePlansAPI().getHolds(FILE_PLAN_ALIAS).getEntries().forEach(holdEntry ->
-            getRestAPIFactory().getHoldsAPI().deleteHold(holdEntry.getEntry().getId()));
-
-        // Add holds
-        List<Hold> filePlanHolds = new ArrayList<>();
-        for (int i = 0; i < NUMBER_OF_CHILDREN; i++)
-        {
-            String holdName = "Hold name " + getRandomAlphanumeric();
-            String holdDescription = "Hold Description " + getRandomAlphanumeric();
-            String holdReason = "Reason " + getRandomAlphanumeric();
-            // Create a hold
-            Hold hold = Hold.builder()
-                .name(holdName)
-                .description(holdDescription)
-                .reason(holdReason)
-                .build();
-            Hold createdHold = getRestAPIFactory().getFilePlansAPI()
-                .createHold(hold, FILE_PLAN_ALIAS);
-            assertNotNull(createdHold.getId());
-            filePlanHolds.add(createdHold);
-        }
-
-        // Get holds of a file plan
-        HoldCollection holdCollection = getRestAPIFactory().getFilePlansAPI()
-            .getHolds(FILE_PLAN_ALIAS);
-
-        // Check status code
-        assertStatusCode(OK);
-
-        // Check holds against created list
-        holdCollection.getEntries().forEach(c ->
-            {
-                Hold hold = c.getEntry();
-                String holdId = hold.getId();
-                assertNotNull(holdId);
-                logger.info("Checking hold " + holdId);
-
-                try
-                {
-                    // Find this hold in created holds list
-                    Hold createdHold = filePlanHolds.stream()
-                        .filter(child -> child.getId().equals(holdId))
-                        .findFirst()
-                        .orElseThrow();
-
-                    assertEquals(createdHold.getName(), hold.getName());
-                    assertEquals(createdHold.getDescription(), hold.getDescription());
-                    assertEquals(createdHold.getReason(), hold.getReason());
-                }
-                catch (NoSuchElementException e)
-                {
-                    fail("No child element for " + hold);
-                }
-            }
-                                                   );
-    }
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/AddToHoldsBulkV1Tests.java

@@ -1,614 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.hold;
-
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_FILING;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_READ_RECORDS;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.http.HttpStatus.ACCEPTED;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.http.HttpStatus.UNAUTHORIZED;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.dataprep.ContentActions;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.hold.BulkBodyCancel;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkOperation;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkOperation.HoldBulkOperationType;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkOperationEntry;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkStatus;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkStatusCollection;
-import org.alfresco.rest.rm.community.model.hold.HoldBulkStatusEntry;
-import org.alfresco.rest.rm.community.model.hold.HoldChild;
-import org.alfresco.rest.rm.community.model.hold.HoldChildEntry;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.search.RestRequestQueryModel;
-import org.alfresco.rest.search.SearchRequest;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * API tests for adding items to holds via the bulk process
- */
-public class AddToHoldsBulkV1Tests extends BaseRMRestTest
-{
-    private static final String ACCESS_DENIED_ERROR_MESSAGE = "Access Denied.  You do not have the appropriate " +
-        "permissions to perform this operation.";
-    private static final int NUMBER_OF_FILES = 5;
-    private final List<FileModel> addedFiles = new ArrayList<>();
-    private final List<UserModel> users = new ArrayList<>();
-    private final List<Hold> holds = new ArrayList<>();
-    private Hold hold;
-    private Hold hold2;
-    private Hold hold3;
-    private FolderModel rootFolder;
-    private HoldBulkOperation holdBulkOperation;
-    @Autowired
-    private RoleService roleService;
-    @Autowired
-    private ContentActions contentActions;
-
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForAddContentToHold()
-    {
-        STEP("Create a hold.");
-        hold = getRestAPIFactory().getFilePlansAPI(getAdminUser()).createHold(
-            Hold.builder().name("HOLD" + generateTestPrefix(AddToHoldsV1Tests.class)).description(HOLD_DESCRIPTION)
-                .reason(HOLD_REASON).build(), FILE_PLAN_ALIAS);
-        holds.add(hold);
-
-        STEP("Create test files.");
-        testSite = dataSite.usingAdmin().createPublicRandomSite();
-
-        rootFolder = dataContent.usingAdmin().usingSite(testSite).createFolder();
-        FolderModel folder1 = dataContent.usingAdmin().usingResource(rootFolder).createFolder();
-        FolderModel folder2 = dataContent.usingAdmin().usingResource(folder1).createFolder();
-
-        // Add files to subfolders in the site
-        for (int i = 0; i < NUMBER_OF_FILES; i++)
-        {
-            FileModel documentHeld = dataContent.usingAdmin()
-                .usingResource(i % 2 == 0 ? folder1 : folder2)
-                .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-            addedFiles.add(documentHeld);
-        }
-
-        RestRequestQueryModel queryReq = getContentFromSiteQuery(testSite.getId());
-        SearchRequest searchRequest = new SearchRequest();
-        searchRequest.setQuery(queryReq);
-
-        STEP("Wait until all files are searchable.");
-        await().atMost(30, TimeUnit.SECONDS)
-            .until(() -> getRestAPIFactory().getSearchAPI(null).search(searchRequest).getPagination()
-                .getTotalItems() == NUMBER_OF_FILES);
-
-        holdBulkOperation = HoldBulkOperation.builder()
-            .query(queryReq)
-            .op(HoldBulkOperationType.ADD).build();
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a site to a hold using the bulk API
-     * Then the content is added to the hold and the status of the bulk operation is DONE
-     */
-    @Test
-    public void addContentFromTestSiteToHoldUsingBulkAPI()
-    {
-        UserModel userAddHoldPermission = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole.SiteCollaborator, hold.getId(), UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-        users.add(userAddHoldPermission);
-
-        STEP("Add content from the site to the hold using the bulk API.");
-        HoldBulkOperationEntry bulkOperationEntry = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .startBulkProcess(holdBulkOperation, hold.getId());
-
-        // Verify the status code
-        assertStatusCode(ACCEPTED);
-        assertEquals(NUMBER_OF_FILES, bulkOperationEntry.getTotalItems());
-
-        STEP("Wait until all files are added to the hold.");
-        await().atMost(20, TimeUnit.SECONDS).until(
-            () -> getRestAPIFactory().getHoldsAPI(getAdminUser()).getChildren(hold.getId()).getEntries().size()
-                == NUMBER_OF_FILES);
-        List<String> holdChildrenNodeRefs = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getChildren(hold.getId()).getEntries().stream().map(HoldChildEntry::getEntry).map(
-                HoldChild::getId).toList();
-        assertEquals(addedFiles.stream().map(FileModel::getNodeRefWithoutVersion).sorted().toList(),
-            holdChildrenNodeRefs.stream().sorted().toList());
-
-        STEP("Check the bulk status.");
-        HoldBulkStatus holdBulkStatus = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getBulkStatus(hold.getId(), bulkOperationEntry.getBulkStatusId());
-        assertBulkProcessStatus(holdBulkStatus, NUMBER_OF_FILES, 0, null, holdBulkOperation);
-
-        STEP("Check the bulk statuses.");
-        HoldBulkStatusCollection holdBulkStatusCollection = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getBulkStatuses(hold.getId());
-        assertEquals(Arrays.asList(holdBulkStatus),
-            holdBulkStatusCollection.getEntries().stream().map(HoldBulkStatusEntry::getEntry).toList());
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a folder and all subfolders to a hold using the bulk API
-     * Then the content is added to the hold and the status of the bulk operation is DONE
-     */
-    @Test
-    public void addContentFromFolderAndAllSubfoldersToHoldUsingBulkAPI()
-    {
-        hold3 = getRestAPIFactory().getFilePlansAPI(getAdminUser()).createHold(
-            Hold.builder().name("HOLD" + generateTestPrefix(AddToHoldsV1Tests.class)).description(HOLD_DESCRIPTION)
-                .reason(HOLD_REASON).build(), FILE_PLAN_ALIAS);
-        holds.add(hold3);
-
-        UserModel userAddHoldPermission = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole.SiteCollaborator, hold3.getId(), UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-        users.add(userAddHoldPermission);
-
-        STEP("Add content from the site to the hold using the bulk API.");
-        // Get content from folder and all subfolders of the root folder
-        HoldBulkOperation bulkOperation = HoldBulkOperation.builder()
-            .query(getContentFromFolderAndAllSubfoldersQuery(rootFolder.getNodeRefWithoutVersion()))
-            .op(HoldBulkOperationType.ADD).build();
-        HoldBulkOperationEntry bulkOperationEntry = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .startBulkProcess(bulkOperation, hold3.getId());
-
-        // Verify the status code
-        assertStatusCode(ACCEPTED);
-        assertEquals(NUMBER_OF_FILES, bulkOperationEntry.getTotalItems());
-
-        STEP("Wait until all files are added to the hold.");
-        await().atMost(20, TimeUnit.SECONDS).until(
-            () -> getRestAPIFactory().getHoldsAPI(getAdminUser()).getChildren(hold3.getId()).getEntries().size()
-                == NUMBER_OF_FILES);
-        List<String> holdChildrenNodeRefs = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getChildren(hold3.getId()).getEntries().stream().map(HoldChildEntry::getEntry).map(
-                HoldChild::getId).toList();
-        assertEquals(addedFiles.stream().map(FileModel::getNodeRefWithoutVersion).sorted().toList(),
-            holdChildrenNodeRefs.stream().sorted().toList());
-
-        STEP("Check the bulk status.");
-        HoldBulkStatus holdBulkStatus = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getBulkStatus(hold3.getId(), bulkOperationEntry.getBulkStatusId());
-        assertBulkProcessStatus(holdBulkStatus, NUMBER_OF_FILES, 0, null, bulkOperation);
-
-        STEP("Check the bulk statuses.");
-        HoldBulkStatusCollection holdBulkStatusCollection = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getBulkStatuses(hold3.getId());
-        assertEquals(List.of(holdBulkStatus),
-            holdBulkStatusCollection.getEntries().stream().map(HoldBulkStatusEntry::getEntry).toList());
-    }
-
-    /**
-     * Given a user without the add to hold capability
-     * When the user adds content from a site to a hold using the bulk API
-     * Then the user receives access denied error
-     */
-    @Test
-    public void testBulkProcessWithUserWithoutAddToHoldCapability()
-    {
-        UserModel userWithoutAddToHoldCapability = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole
-                .SiteCollaborator,
-            hold.getId(), UserRoles.ROLE_RM_POWER_USER, PERMISSION_FILING);
-        users.add(userWithoutAddToHoldCapability);
-
-        STEP("Add content from the site to the hold using the bulk API.");
-        getRestAPIFactory().getHoldsAPI(userWithoutAddToHoldCapability)
-            .startBulkProcess(holdBulkOperation, hold.getId());
-
-        STEP("Verify the response status code and the error message.");
-        assertStatusCode(FORBIDDEN);
-        getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary(ACCESS_DENIED_ERROR_MESSAGE);
-    }
-
-    /**
-     * Given a user without the filing permission on a hold
-     * When the user adds content from a site to a hold using the bulk API
-     * Then the user receives access denied error
-     */
-    @Test
-    public void testBulkProcessWithUserWithoutFilingPermissionOnAHold()
-    {
-        // User without filing permission on a hold
-        UserModel userWithoutPermission = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole.SiteCollaborator, hold.getId(), UserRoles.ROLE_RM_MANAGER, PERMISSION_READ_RECORDS);
-        users.add(userWithoutPermission);
-
-        STEP("Add content from the site to the hold using the bulk API.");
-        getRestAPIFactory().getHoldsAPI(userWithoutPermission)
-            .startBulkProcess(holdBulkOperation, hold.getId());
-
-        STEP("Verify the response status code and the error message.");
-        assertStatusCode(FORBIDDEN);
-        getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary(ACCESS_DENIED_ERROR_MESSAGE);
-
-    }
-
-    /**
-     * Given a user without the write permission on all the content
-     * When the user adds content from a site to a hold using the bulk API
-     * Then all processed items are marked as errors and the last error message contains access denied error
-     */
-    @Test
-    public void testBulkProcessWithUserWithoutWritePermissionOnTheContent()
-    {
-        // User without write permission on the content
-        UserModel userWithoutPermission = roleService.createUserWithSiteRoleRMRoleAndPermission(
-            testSite, UserRole.SiteConsumer,
-            hold.getId(), UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-        users.add(userWithoutPermission);
-
-        // Wait until permissions are reverted
-        SearchRequest searchRequest = new SearchRequest();
-        searchRequest.setQuery(holdBulkOperation.getQuery());
-        await().atMost(30, TimeUnit.SECONDS)
-            .until(() -> getRestAPIFactory().getSearchAPI(userWithoutPermission).search(searchRequest).getPagination()
-                .getTotalItems() == NUMBER_OF_FILES);
-
-        STEP("Add content from the site to the hold using the bulk API.");
-        HoldBulkOperationEntry bulkOperationEntry = getRestAPIFactory().getHoldsAPI(
-            userWithoutPermission).startBulkProcess(holdBulkOperation, hold.getId());
-
-        STEP("Verify the response.");
-        assertStatusCode(ACCEPTED);
-
-        await().atMost(20, TimeUnit.SECONDS).until(() ->
-            Objects.equals(getRestAPIFactory().getHoldsAPI(userWithoutPermission)
-                .getBulkStatus(hold.getId(), bulkOperationEntry.getBulkStatusId()).getStatus(), "DONE"));
-
-        HoldBulkStatus holdBulkStatus = getRestAPIFactory().getHoldsAPI(userWithoutPermission)
-            .getBulkStatus(hold.getId(), bulkOperationEntry.getBulkStatusId());
-        assertBulkProcessStatus(holdBulkStatus, NUMBER_OF_FILES, NUMBER_OF_FILES, ACCESS_DENIED_ERROR_MESSAGE,
-            holdBulkOperation);
-    }
-
-    /**
-     * Given a user without the write permission on one file
-     * When the user adds content from a site to a hold using the bulk API
-     * Then all processed items are added to the hold except the one that the user does not have write permission
-     * And the status of the bulk operation is DONE, contains the error message and the number of errors is 1
-     */
-    @Test
-    public void testBulkProcessWithUserWithoutWritePermissionOnOneFile()
-    {
-        hold2 = getRestAPIFactory().getFilePlansAPI(getAdminUser()).createHold(
-            Hold.builder().name("HOLD" + generateTestPrefix(AddToHoldsV1Tests.class)).description(HOLD_DESCRIPTION)
-                .reason(HOLD_REASON).build(), FILE_PLAN_ALIAS);
-        holds.add(hold2);
-
-        UserModel userAddHoldPermission = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole.SiteCollaborator, hold2.getId(), UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-        users.add(userAddHoldPermission);
-
-        contentActions.setPermissionForUser(getAdminUser().getUsername(), getAdminUser().getPassword(),
-            testSite.getId(), addedFiles.get(0).getName(), userAddHoldPermission.getUsername(),
-            UserRole.SiteConsumer.getRoleId(), false);
-
-        STEP("Add content from the site to the hold using the bulk API.");
-        HoldBulkOperationEntry bulkOperationEntry = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .startBulkProcess(holdBulkOperation, hold2.getId());
-
-        // Verify the status code
-        assertStatusCode(ACCEPTED);
-        assertEquals(NUMBER_OF_FILES, bulkOperationEntry.getTotalItems());
-
-        STEP("Wait until all files are added to the hold.");
-        await().atMost(30, TimeUnit.SECONDS).until(
-            () -> getRestAPIFactory().getHoldsAPI(getAdminUser()).getChildren(hold2.getId()).getEntries().size()
-                == NUMBER_OF_FILES - 1);
-        await().atMost(30, TimeUnit.SECONDS).until(
-            () -> getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-                .getBulkStatus(hold2.getId(), bulkOperationEntry.getBulkStatusId()).getProcessedItems()
-                == NUMBER_OF_FILES);
-        List<String> holdChildrenNodeRefs = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getChildren(hold2.getId()).getEntries().stream().map(HoldChildEntry::getEntry).map(
-                HoldChild::getId).toList();
-        assertEquals(addedFiles.stream().skip(1).map(FileModel::getNodeRefWithoutVersion).sorted().toList(),
-            holdChildrenNodeRefs.stream().sorted().toList());
-
-        STEP("Check the bulk status.");
-        HoldBulkStatus holdBulkStatus = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getBulkStatus(hold2.getId(), bulkOperationEntry.getBulkStatusId());
-        assertBulkProcessStatus(holdBulkStatus, NUMBER_OF_FILES, 1, ACCESS_DENIED_ERROR_MESSAGE, holdBulkOperation);
-
-        STEP("Check the bulk statuses.");
-        HoldBulkStatusCollection holdBulkStatusCollection = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .getBulkStatuses(hold2.getId());
-        assertEquals(List.of(holdBulkStatus),
-            holdBulkStatusCollection.getEntries().stream().map(HoldBulkStatusEntry::getEntry).toList());
-
-        // Revert the permissions
-        contentActions.setPermissionForUser(getAdminUser().getUsername(), getAdminUser().getPassword(),
-            testSite.getId(), addedFiles.get(0).getName(), userAddHoldPermission.getUsername(),
-            UserRole.SiteCollaborator.getRoleId(), true);
-    }
-
-    /**
-     * Given an unauthenticated user
-     * When the user adds content from a site to a hold using the bulk API
-     * Then the user receives unauthorized error
-     */
-    @Test
-    public void testBulkProcessAsUnauthenticatedUser()
-    {
-        STEP("Start bulk process as unauthenticated user");
-        getRestAPIFactory().getHoldsAPI(new UserModel(getAdminUser().getUsername(), "wrongPassword"))
-            .startBulkProcess(holdBulkOperation, hold.getId());
-
-        STEP("Verify the response status code.");
-        assertStatusCode(UNAUTHORIZED);
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a site to a hold using the bulk API
-     * And the hold does not exist
-     * Then the user receives not found error
-     */
-    @Test
-    public void testBulkProcessForNonExistentHold()
-    {
-        STEP("Start bulk process for non existent hold");
-        getRestAPIFactory().getHoldsAPI(getAdminUser()).startBulkProcess(holdBulkOperation, "nonExistentHoldId");
-
-        STEP("Verify the response status code.");
-        assertStatusCode(NOT_FOUND);
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a site to a hold using the bulk API
-     * and the bulk operation is invalid
-     * Then the user receives bad request error
-     */
-    @Test
-    public void testGetBulkStatusesForInvalidOperation()
-    {
-        STEP("Start bulk process for non existent hold");
-
-        HoldBulkOperation invalidHoldBulkOperation = HoldBulkOperation.builder().op(null)
-            .query(holdBulkOperation.getQuery()).build();
-        getRestAPIFactory().getHoldsAPI(getAdminUser()).startBulkProcess(invalidHoldBulkOperation, hold.getId());
-
-        STEP("Verify the response status code.");
-        assertStatusCode(BAD_REQUEST);
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a site to a hold using the bulk API
-     * And the hold does not exist
-     * Then the user receives not found error
-     */
-    @Test
-    public void testGetBulkStatusForNonExistentHold()
-    {
-        STEP("Start bulk process for non existent hold");
-        getRestAPIFactory().getHoldsAPI(getAdminUser()).getBulkStatus("nonExistentHoldId", "nonExistenBulkStatusId");
-
-        STEP("Verify the response status code.");
-        assertStatusCode(NOT_FOUND);
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a site to a hold using the bulk API
-     * And the bulk status does not exist
-     * Then the user receives not found error
-     */
-    @Test
-    public void testGetBulkStatusForNonExistentBulkStatus()
-    {
-        STEP("Start bulk process for non bulk status");
-        getRestAPIFactory().getHoldsAPI(getAdminUser()).getBulkStatus(hold.getId(), "nonExistenBulkStatusId");
-
-        STEP("Verify the response status code.");
-        assertStatusCode(NOT_FOUND);
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a site to a hold using the bulk API
-     * And the hold does not exist
-     * Then the user receives not found error
-     */
-    @Test
-    public void testGetBulkStatusesForNonExistentHold()
-    {
-        STEP("Start bulk process for non existent hold");
-        getRestAPIFactory().getHoldsAPI(getAdminUser()).getBulkStatuses("nonExistentHoldId");
-
-        STEP("Verify the response status code.");
-        assertStatusCode(NOT_FOUND);
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from all sites to a hold using the bulk API to exceed the limit (30 items)
-     * Then the user receives bad request error
-     */
-    @Test
-    public void testExceedingBulkOperationLimit()
-    {
-        RestRequestQueryModel queryReq = new RestRequestQueryModel();
-        queryReq.setQuery("TYPE:content");
-        queryReq.setLanguage("afts");
-
-        HoldBulkOperation exceedLimitOp = HoldBulkOperation.builder()
-            .query(queryReq)
-            .op(HoldBulkOperationType.ADD).build();
-
-        STEP("Start bulk process to exceed the limit");
-        getRestAPIFactory().getHoldsAPI(getAdminUser()).startBulkProcess(exceedLimitOp, hold.getId());
-
-        STEP("Verify the response status code.");
-        assertStatusCode(BAD_REQUEST);
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a site to a hold using the bulk API
-     * And then the user cancels the bulk operation
-     * Then the user receives OK status code
-     */
-    @Test
-    public void testBulkProcessCancellationWithAllowedUser()
-    {
-        Hold hold4 = getRestAPIFactory().getFilePlansAPI(getAdminUser()).createHold(
-            Hold.builder().name("HOLD" + generateTestPrefix(AddToHoldsV1Tests.class)).description(HOLD_DESCRIPTION)
-                .reason(HOLD_REASON).build(), FILE_PLAN_ALIAS);
-        holds.add(hold4);
-
-        UserModel userAddHoldPermission = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole.SiteCollaborator, hold4.getId(), UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-        users.add(userAddHoldPermission);
-
-        STEP("Add content from the site to the hold using the bulk API.");
-        HoldBulkOperationEntry bulkOperationEntry = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .startBulkProcess(holdBulkOperation, hold4.getId());
-
-        // Verify the status code
-        assertStatusCode(ACCEPTED);
-        assertEquals(NUMBER_OF_FILES, bulkOperationEntry.getTotalItems());
-
-        STEP("Cancel the bulk operation.");
-        getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .cancelBulkOperation(hold4.getId(), bulkOperationEntry.getBulkStatusId(), new BulkBodyCancel());
-
-        // Verify the status code
-        assertStatusCode(OK);
-    }
-
-    /**
-     * Given a user with the add to hold capability and hold filing permission
-     * When the user adds content from a site to a hold using the bulk API
-     * And a 2nd user without the add to hold capability cancels the bulk operation
-     * Then the 2nd user receives access denied error
-     */
-    @Test
-    public void testBulkProcessCancellationWithUserWithoutAddToHoldCapability()
-    {
-        Hold hold5 = getRestAPIFactory().getFilePlansAPI(getAdminUser()).createHold(
-            Hold.builder().name("HOLD" + generateTestPrefix(AddToHoldsV1Tests.class)).description(HOLD_DESCRIPTION)
-                .reason(HOLD_REASON).build(), FILE_PLAN_ALIAS);
-        holds.add(hold5);
-
-        UserModel userAddHoldPermission = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole.SiteCollaborator, hold5.getId(), UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-        users.add(userAddHoldPermission);
-
-        STEP("Add content from the site to the hold using the bulk API.");
-        HoldBulkOperationEntry bulkOperationEntry = getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .startBulkProcess(holdBulkOperation, hold5.getId());
-
-        // Verify the status code
-        assertStatusCode(ACCEPTED);
-        assertEquals(NUMBER_OF_FILES, bulkOperationEntry.getTotalItems());
-
-        UserModel userWithoutAddToHoldCapability = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole
-                .SiteCollaborator,
-            hold5.getId(), UserRoles.ROLE_RM_POWER_USER, PERMISSION_FILING);
-        users.add(userWithoutAddToHoldCapability);
-
-        STEP("Cancel the bulk operation.");
-        getRestAPIFactory().getHoldsAPI(userWithoutAddToHoldCapability)
-            .cancelBulkOperation(hold5.getId(), bulkOperationEntry.getBulkStatusId(), new BulkBodyCancel());
-
-        STEP("Verify the response status code and the error message.");
-        assertStatusCode(FORBIDDEN);
-        getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary(ACCESS_DENIED_ERROR_MESSAGE);
-    }
-
-    private void assertBulkProcessStatus(HoldBulkStatus holdBulkStatus, long expectedProcessedItems,
-        int expectedErrorsCount, String expectedErrorMessage, HoldBulkOperation holdBulkOperation)
-    {
-        assertEquals("DONE", holdBulkStatus.getStatus());
-        assertEquals(expectedProcessedItems, holdBulkStatus.getTotalItems());
-        assertEquals(expectedProcessedItems, holdBulkStatus.getProcessedItems());
-        assertEquals(expectedErrorsCount, holdBulkStatus.getErrorsCount());
-        assertEquals(holdBulkStatus.getHoldBulkOperation(), holdBulkOperation);
-        assertNotNull(holdBulkStatus.getStartTime());
-        assertNotNull(holdBulkStatus.getEndTime());
-
-        if (expectedErrorMessage != null)
-        {
-            assertTrue(holdBulkStatus.getLastError().contains(expectedErrorMessage));
-        }
-    }
-
-    private RestRequestQueryModel getContentFromSiteQuery(String siteId)
-    {
-        RestRequestQueryModel queryReq = new RestRequestQueryModel();
-        queryReq.setQuery("SITE:\"" + siteId + "\" and TYPE:content");
-        queryReq.setLanguage("afts");
-        return queryReq;
-    }
-
-    private RestRequestQueryModel getContentFromFolderAndAllSubfoldersQuery(String folderId)
-    {
-        RestRequestQueryModel queryReq = new RestRequestQueryModel();
-        queryReq.setQuery("ANCESTOR:\"workspace://SpacesStore/" + folderId + "\" and TYPE:content");
-        queryReq.setLanguage("afts");
-        return queryReq;
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanupAddToHoldsBulkV1Tests()
-    {
-        dataSite.usingAdmin().deleteSite(testSite);
-        users.forEach(user -> getDataUser().usingAdmin().deleteUser(user));
-        holds.forEach(hold -> getRestAPIFactory().getHoldsAPI(getAdminUser()).deleteHold(hold.getId()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/AddToHoldsTests.java

@@ -60,7 +60,7 @@ import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.dataprep.ContentActions;
 import org.alfresco.rest.model.RestNodeModel;
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.hold.v0.HoldEntry;
+import org.alfresco.rest.rm.community.model.hold.HoldEntry;
 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;

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/AddToHoldsV1Tests.java

@@ -1,386 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.hold;
-
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.TRANSFERS_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.FROZEN_ASPECT;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentType.UNFILED_RECORD_FOLDER_TYPE;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_FILING;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_READ_RECORDS;
-import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_MANAGER;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.toContentModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.IMAGE_FILE;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createElectronicRecordModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createNonElectronicRecordModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.getFile;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.apache.commons.httpclient.HttpStatus.SC_BAD_REQUEST;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.assertFalse;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.dataprep.ContentActions;
-import org.alfresco.rest.model.RestNodeAssociationModelCollection;
-import org.alfresco.rest.model.RestNodeModel;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldChild;
-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.rm.community.requests.gscore.api.FilePlanAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-/**
- * V1 API tests for adding content/record folder/records to holds
- *
- * @author Damian Ujma
- */
-public class AddToHoldsV1Tests extends BaseRMRestTest
-{
-    private static final String ACCESS_DENIED_ERROR_MESSAGE = "Access Denied.  You do not have the appropriate " +
-        "permissions to perform this operation.";
-    private static final String INVALID_TYPE_ERROR_MESSAGE = "Only records, record folders or content can be added to a hold.";
-    private static final String LOCKED_FILE_ERROR_MESSAGE = "Locked content can't be added to a hold.";
-
-    private static final String HOLD = "HOLD" + generateTestPrefix(AddToHoldsV1Tests.class);
-    private String holdNodeRef;
-    private SiteModel testSite;
-    private FileModel documentHeld;
-    private FileModel contentToAddToHold;
-    private FileModel contentAddToHoldNoPermission;
-    private Hold hold;
-
-    private UserModel userAddHoldPermission;
-    private final List<UserModel> users = new ArrayList<>();
-    private final List<String> nodesToBeClean = new ArrayList<>();
-
-    @Autowired
-    private RoleService roleService;
-    @Autowired
-    private ContentActions contentActions;
-
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForAddContentToHold()
-    {
-        STEP("Create a hold.");
-        hold = createHold(FILE_PLAN_ALIAS,
-            Hold.builder().name(HOLD).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), getAdminUser());
-        holdNodeRef = hold.getId();
-        STEP("Create test files.");
-        testSite = dataSite.usingAdmin().createPublicRandomSite();
-        documentHeld = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        contentToAddToHold = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        contentAddToHoldNoPermission = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        STEP("Add the content to the hold.");
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser())
-            .addChildToHold(HoldChild.builder().id(documentHeld.getNodeRefWithoutVersion()).build(), hold.getId());
-
-        STEP("Create users");
-        userAddHoldPermission = roleService.createUserWithSiteRoleRMRoleAndPermission(testSite,
-            UserRole.SiteCollaborator, holdNodeRef, UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-        users.add(userAddHoldPermission);
-    }
-
-    /**
-     * Given a hold that contains at least one active content
-     * When I use the existing REST API to retrieve the contents of the hold
-     * Then I should see all the active content on hold
-     */
-    @Test
-    public void retrieveTheContentOfTheHoldUsingV1API()
-    {
-        STEP("Retrieve the list of children from the hold and collect the entries that have the name of the active " +
-            "content held");
-        List<String> documentNames = restClient.authenticateUser(getAdminUser()).withCoreAPI()
-            .usingNode(toContentModel(holdNodeRef))
-            .listChildren().getEntries().stream()
-            .map(RestNodeModel::onModel)
-            .map(RestNodeModel::getName)
-            .filter(documentName -> documentName.equals(documentHeld.getName()))
-            .toList();
-
-        STEP("Check the list of active content");
-        assertEquals(documentNames, Set.of(documentHeld.getName()));
-    }
-
-    /**
-     * Given a hold that contains at least one active content
-     * When I use the existing REST API to retrieve the holds the content is added
-     * Then the hold where the content held is returned
-     */
-    @Test
-    public void retrieveTheHoldWhereTheContentIsAdded()
-    {
-        RestNodeAssociationModelCollection holdsEntries = getRestAPIFactory()
-            .getNodeAPI(documentHeld).usingParams("where=(assocType='rma:frozenContent')").getParents();
-        Hold retrievedHold = getRestAPIFactory().getHoldsAPI(getAdminUser())
-            .getHold(holdsEntries.getEntries().get(0).getModel().getId());
-        assertEquals(retrievedHold, hold, "Holds are not equal");
-    }
-
-    /**
-     * Valid nodes to be added to hold
-     */
-    @DataProvider(name = "validNodesForAddToHold")
-    public Object[][] getValidNodesForAddToHold()
-    {
-        //create electronic and nonElectronic record in record folder
-        RecordCategoryChild recordFolder = createCategoryFolderInFilePlan();
-        RecordFolderAPI recordFolderAPI = getRestAPIFactory().getRecordFolderAPI();
-        nodesToBeClean.add(recordFolder.getParentId());
-        Record electronicRecord = recordFolderAPI.createRecord(createElectronicRecordModel(), recordFolder.getId(),
-            getFile
-                (IMAGE_FILE));
-        assertStatusCode(CREATED);
-
-        Record nonElectronicRecord = recordFolderAPI.createRecord(createNonElectronicRecordModel(),
-            recordFolder.getId());
-        assertStatusCode(CREATED);
-        getRestAPIFactory().getRMUserAPI().addUserPermission(recordFolder.getId(), userAddHoldPermission,
-            PERMISSION_FILING);
-
-        RecordCategoryChild folderToHold = createCategoryFolderInFilePlan();
-        getRestAPIFactory().getRMUserAPI().addUserPermission(folderToHold.getId(), userAddHoldPermission,
-            PERMISSION_FILING);
-        nodesToBeClean.add(folderToHold.getParentId());
-
-        return new String[][]
-            {       // record folder
-                { folderToHold.getId() },
-                //electronic record
-                { electronicRecord.getId() },
-                // non electronic record
-                { nonElectronicRecord.getId() },
-                // document from collaboration site
-                { contentToAddToHold.getNodeRefWithoutVersion() },
-            };
-    }
-
-    /**
-     * Given record folder/record/document not on hold
-     * And a hold
-     * And file permission on the hold
-     * And the appropriate capability to add to hold
-     * When I use the existing REST API to add the node to the hold
-     * Then the record folder/record/document is added to the hold
-     * And the item is frozen
-     *
-     * @throws Exception
-     */
-    @Test(dataProvider = "validNodesForAddToHold")
-    public void addValidNodesToHoldWithAllowedUser(String nodeId) throws Exception
-    {
-        STEP("Add node to hold with user with permission.");
-        getRestAPIFactory().getHoldsAPI(userAddHoldPermission)
-            .addChildToHold(HoldChild.builder().id(nodeId).build(), hold.getId());
-
-        STEP("Check the node is frozen.");
-        assertTrue(hasAspect(nodeId, FROZEN_ASPECT));
-    }
-
-    /**
-     * Data provider with user without correct permission to add to hold and the node ref to be added to hold
-     *
-     * @return object with user model and the node ref to be added to hold
-     */
-    @DataProvider(name = "userWithoutPermissionForAddToHold")
-    public Object[][] getUserWithoutPermissionForAddToHold()
-    {
-        //create record folder
-        RecordCategoryChild recordFolder = createCategoryFolderInFilePlan();
-        //create a rm manager and grant read permission over the record folder created
-        UserModel user = roleService.createUserWithRMRoleAndRMNodePermission(ROLE_RM_MANAGER.roleId,
-            recordFolder.getId(),
-            PERMISSION_READ_RECORDS);
-        getRestAPIFactory().getRMUserAPI().addUserPermission(holdNodeRef, user, PERMISSION_FILING);
-        nodesToBeClean.add(recordFolder.getParentId());
-        return new Object[][]
-            {       // user without write permission on the content
-                {
-                    roleService.createUserWithSiteRoleRMRoleAndPermission(testSite, UserRole.SiteConsumer,
-                        holdNodeRef, UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING),
-                    contentAddToHoldNoPermission.getNodeRefWithoutVersion()
-                },
-                // user with write permission on the content and without filling permission on a hold
-                {
-                    roleService.createUserWithSiteRoleRMRoleAndPermission(testSite, UserRole
-                            .SiteCollaborator,
-                        holdNodeRef, UserRoles.ROLE_RM_MANAGER, PERMISSION_READ_RECORDS),
-                    contentAddToHoldNoPermission.getNodeRefWithoutVersion()
-                },
-                // user with write permission on the content, filling permission on a hold without add to
-                // hold capability
-                {
-                    roleService.createUserWithSiteRoleRMRoleAndPermission(testSite, UserRole
-                            .SiteCollaborator,
-                        holdNodeRef, UserRoles.ROLE_RM_POWER_USER, PERMISSION_READ_RECORDS),
-                    contentAddToHoldNoPermission.getNodeRefWithoutVersion()
-                },
-                //user without write permission on RM  record folder
-                {
-                    user, recordFolder.getId()
-                },
-
-            };
-    }
-
-    /**
-     * Given a node not on hold
-     * And a hold
-     * And user without right permission to add to hold
-     * When I use the existing REST API to add the node to the hold
-     * Then the node is not added to the hold
-     * And the node is not frozen
-     *
-     * @throws Exception
-     */
-    @Test(dataProvider = "userWithoutPermissionForAddToHold")
-    public void addContentToHoldWithUserWithoutHoldPermission(UserModel userModel, String nodeToBeAddedToHold)
-        throws Exception
-    {
-        users.add(userModel);
-        STEP("Add the node to the hold with user without permission.");
-
-        getRestAPIFactory()
-            .getHoldsAPI(userModel)
-            .addChildToHold(HoldChild.builder().id(nodeToBeAddedToHold).build(), holdNodeRef);
-
-        assertStatusCode(FORBIDDEN);
-        getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary(ACCESS_DENIED_ERROR_MESSAGE);
-
-        STEP("Check the node is not frozen.");
-        assertFalse(hasAspect(nodeToBeAddedToHold, FROZEN_ASPECT));
-    }
-
-    /**
-     * Data provider with invalid node types that can be added to a hold
-     */
-    @DataProvider(name = "invalidNodesForAddToHold")
-    public Object[][] getInvalidNodesForAddToHold()
-    {
-        //create locked file
-        FileModel contentLocked = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        contentActions.checkOut(getAdminUser().getUsername(), getAdminUser().getPassword(),
-            testSite.getId(), contentLocked.getName());
-        RecordCategory category = createRootCategory(getRandomAlphanumeric());
-        nodesToBeClean.add(category.getId());
-        return new Object[][]
-            {       // file plan node id
-                { getFilePlan(FILE_PLAN_ALIAS).getId(), SC_BAD_REQUEST, INVALID_TYPE_ERROR_MESSAGE },
-                //transfer container
-                { getTransferContainer(TRANSFERS_ALIAS).getId(), SC_BAD_REQUEST, INVALID_TYPE_ERROR_MESSAGE },
-                // a record category
-                { category.getId(), SC_BAD_REQUEST, INVALID_TYPE_ERROR_MESSAGE },
-                // unfiled records root
-                { getUnfiledContainer(UNFILED_RECORDS_CONTAINER_ALIAS).getId(), SC_BAD_REQUEST,
-                    INVALID_TYPE_ERROR_MESSAGE },
-                // an arbitrary unfiled records folder
-                { createUnfiledContainerChild(UNFILED_RECORDS_CONTAINER_ALIAS, "Unfiled Folder " +
-                    getRandomAlphanumeric(), UNFILED_RECORD_FOLDER_TYPE).getId(), SC_BAD_REQUEST,
-                    INVALID_TYPE_ERROR_MESSAGE },
-                //folder,
-                { dataContent.usingAdmin().usingSite(testSite).createFolder().getNodeRef(), SC_BAD_REQUEST,
-                    INVALID_TYPE_ERROR_MESSAGE },
-                //document locked
-                { contentLocked.getNodeRefWithoutVersion(), SC_BAD_REQUEST, LOCKED_FILE_ERROR_MESSAGE }
-            };
-    }
-
-    /**
-     * Given a node that is not a document/record/ record folder ( a valid node type to be added to hold)
-     * And a hold
-     * And user without right permission to add to hold
-     * When I use the existing REST API to add the node to the hold
-     * Then the node is not added to the hold
-     * And the node is not frozen
-     *
-     * @throws Exception
-     */
-    @Test(dataProvider = "invalidNodesForAddToHold")
-    public void addInvalidNodesToHold(String itemNodeRef, int responseCode, String errorMessage) throws Exception
-    {
-        STEP("Add the node to the hold ");
-
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser())
-            .addChildToHold(HoldChild.builder().id(itemNodeRef).build(), holdNodeRef);
-
-        assertStatusCode(HttpStatus.valueOf(responseCode));
-        getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary(errorMessage);
-
-        STEP("Check node is not frozen.");
-        assertFalse(hasAspect(itemNodeRef, FROZEN_ASPECT));
-    }
-
-    private Hold createHold(String parentId, Hold hold, UserModel user)
-    {
-        FilePlanAPI filePlanAPI = getRestAPIFactory().getFilePlansAPI(user);
-        return filePlanAPI.createHold(hold, parentId);
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanUpAddContentToHold()
-    {
-        getRestAPIFactory().getHoldsAPI(getAdminUser()).deleteHold(holdNodeRef);
-        dataSite.usingAdmin().deleteSite(testSite);
-        users.forEach(user -> getDataUser().usingAdmin().deleteUser(user));
-        nodesToBeClean.forEach(this::deleteRecordCategory);
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/HoldsTests.java

@@ -1,186 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.hold;
-
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.NO_CONTENT;
-import static org.springframework.http.HttpStatus.OK;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldDeletionReason;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-/**
- * This class contains the tests for the Holds CRUD V1 API
- *
- * @author Damian Ujma
- */
-public class HoldsTests extends BaseRMRestTest
-{
-
-    private final List<String> nodeRefs = new ArrayList<>();
-
-    @Test
-    public void testGetHold()
-    {
-        String holdName = "Hold" + getRandomAlphanumeric();
-        String holdDescription = "Description" + getRandomAlphanumeric();
-        String holdReason = "Reason" + getRandomAlphanumeric();
-
-        // Create the hold
-        Hold hold = Hold.builder()
-            .name(holdName)
-            .description(holdDescription)
-            .reason(holdReason)
-            .build();
-        Hold createdHold = getRestAPIFactory().getFilePlansAPI()
-            .createHold(hold, FILE_PLAN_ALIAS);
-
-        // Get the hold
-        Hold receivedHold = getRestAPIFactory().getHoldsAPI().getHold(createdHold.getId());
-        nodeRefs.add(receivedHold.getId());
-
-        // Verify the status code
-        assertStatusCode(OK);
-
-        assertEquals(receivedHold.getName(), holdName);
-        assertEquals(receivedHold.getDescription(), holdDescription);
-        assertEquals(receivedHold.getReason(), holdReason);
-        assertNotNull(receivedHold.getId());
-    }
-
-    @Test
-    public void testUpdateHold()
-    {
-        String holdName = "Hold" + getRandomAlphanumeric();
-        String holdDescription = "Description" + getRandomAlphanumeric();
-        String holdReason = "Reason" + getRandomAlphanumeric();
-
-        // Create the hold
-        Hold hold = Hold.builder()
-            .name(holdName)
-            .description(holdDescription)
-            .reason(holdReason)
-            .build();
-        Hold createdHold = getRestAPIFactory().getFilePlansAPI()
-            .createHold(hold, FILE_PLAN_ALIAS);
-        nodeRefs.add(createdHold.getId());
-
-        Hold holdModel = Hold.builder()
-            .name("Updated" + holdName)
-            .description("Updated" + holdDescription)
-            .reason("Updated" + holdReason)
-            .build();
-
-        // Update the hold
-        Hold updatedHold = getRestAPIFactory().getHoldsAPI().updateHold(holdModel, createdHold.getId());
-
-        // Verify the status code
-        assertStatusCode(OK);
-
-        assertEquals(updatedHold.getName(), "Updated" + holdName);
-        assertEquals(updatedHold.getDescription(), "Updated" + holdDescription);
-        assertEquals(updatedHold.getReason(), "Updated" + holdReason);
-        assertNotNull(updatedHold.getId());
-    }
-
-    @Test
-    public void testDeleteHold()
-    {
-        String holdName = "Hold" + getRandomAlphanumeric();
-        String holdDescription = "Description" + getRandomAlphanumeric();
-        String holdReason = "Reason" + getRandomAlphanumeric();
-
-        // Create the hold
-        Hold hold = Hold.builder()
-            .name(holdName)
-            .description(holdDescription)
-            .reason(holdReason)
-            .build();
-        Hold createdHold = getRestAPIFactory().getFilePlansAPI()
-            .createHold(hold, FILE_PLAN_ALIAS);
-        nodeRefs.add(createdHold.getId());
-
-        // Delete the hold
-        getRestAPIFactory().getHoldsAPI().deleteHold(createdHold.getId());
-
-        // Verify the status code
-        assertStatusCode(NO_CONTENT);
-
-        // Try to get the hold
-        getRestAPIFactory().getHoldsAPI().getHold(createdHold.getId());
-
-        // Verify the status code
-        assertStatusCode(NOT_FOUND);
-    }
-
-    @Test
-    public void testDeleteHoldWithReason()
-    {
-        String holdName = "Hold" + getRandomAlphanumeric();
-        String holdDescription = "Description" + getRandomAlphanumeric();
-        String holdReason = "Reason" + getRandomAlphanumeric();
-
-        // Create the hold
-        Hold hold = Hold.builder()
-            .name(holdName)
-            .description(holdDescription)
-            .reason(holdReason)
-            .build();
-        Hold createdHold = getRestAPIFactory().getFilePlansAPI()
-            .createHold(hold, FILE_PLAN_ALIAS);
-        nodeRefs.add(createdHold.getId());
-
-        // Delete the hold with the reason
-        getRestAPIFactory().getHoldsAPI()
-            .deleteHoldWithReason(HoldDeletionReason.builder().reason("Example reason").build(), createdHold.getId());
-
-        // Verify the status code
-        assertStatusCode(OK);
-
-        // Try to get the hold
-        getRestAPIFactory().getHoldsAPI().getHold(createdHold.getId());
-
-        // Verify the status code
-        assertStatusCode(NOT_FOUND);
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanUpHoldsTests()
-    {
-        nodeRefs.forEach(nodeRef -> getRestAPIFactory().getHoldsAPI(getAdminUser()).deleteHold(nodeRef));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java

@@ -42,8 +42,8 @@ import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertFalse;
 
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
+import javax.json.Json;
+import javax.json.JsonObject;
 import java.io.File;
 
 import org.alfresco.dataprep.CMISUtil;

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentV1Tests.java

@@ -1,337 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.hold;
-
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_VITAL_RECORD;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_VITAL_RECORD_DEFINITION;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.createBodyForMoveCopy;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.apache.commons.httpclient.HttpStatus.SC_INTERNAL_SERVER_ERROR;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
-import static org.springframework.http.HttpStatus.OK;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.assertFalse;
-
-import java.io.File;
-
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.core.JsonBodyGenerator;
-import org.alfresco.rest.core.v0.BaseAPI.RM_ACTIONS;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.common.ReviewPeriod;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldChild;
-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.recordfolder.RecordFolder;
-import org.alfresco.rest.rm.community.model.recordfolder.RecordFolderProperties;
-import org.alfresco.rest.rm.community.requests.gscore.api.FilePlanAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.service.DispositionScheduleService;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * V1 API tests to check actions on frozen content
- *
- * @author Damian Ujma
- */
-public class PreventActionsOnFrozenContentV1Tests extends BaseRMRestTest
-{
-    private static String holdNodeRef;
-    private static FileModel contentHeld;
-    private static File updatedFile;
-    private static FolderModel folderModel;
-    private static RecordCategoryChild recordFolder;
-    private static Record recordFrozen;
-    private static Record recordNotHeld;
-    private static RecordCategory categoryWithRS;
-
-    private Hold hold;
-
-    @Autowired
-    private DispositionScheduleService dispositionScheduleService;
-
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForPreventActionsOnFrozenContent()
-    {
-        String holdOne = "HOLD" + generateTestPrefix(PreventActionsOnFrozenContentV1Tests.class);
-
-        STEP("Create a hold.");
-        hold = createHold(FILE_PLAN_ALIAS,
-            Hold.builder().name(holdOne).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(), getAdminUser());
-        holdNodeRef = hold.getId();
-
-        STEP("Create a test file.");
-        testSite = dataSite.usingAdmin().createPublicRandomSite();
-        contentHeld = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        STEP("Add the file to the hold.");
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser())
-            .addChildToHold(HoldChild.builder().id(contentHeld.getNodeRefWithoutVersion()).build(), hold.getId());
-
-        STEP("Get a file resource.");
-        updatedFile = Utility.getResourceTestDataFile("SampleTextFile_10kb.txt");
-
-        STEP("Create a folder withing the test site .");
-        folderModel = dataContent.usingAdmin().usingSite(testSite)
-            .createFolder();
-
-        STEP("Create a record folder with some records");
-        recordFolder = createCategoryFolderInFilePlan();
-        recordFrozen = createElectronicRecord(recordFolder.getId(), getRandomName("elRecordFrozen"));
-        recordNotHeld = createElectronicRecord(recordFolder.getId(), getRandomName("elRecordNotHeld"));
-        assertStatusCode(CREATED);
-
-        STEP("Add the record to the hold.");
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser())
-            .addChildToHold(HoldChild.builder().id(recordFrozen.getId()).build(), hold.getId());
-    }
-
-    /**
-     * Given active content on hold
-     * When I try to edit the properties
-     * Or perform an action that edits the properties
-     * Then I am not successful
-     */
-    @Test
-    public void editPropertiesForContentHeld() throws Exception
-    {
-        STEP("Update name property of the held content");
-        JsonObject nameUpdated = Json.createObjectBuilder().add("name", "HeldNameUpdated").build();
-        restClient.authenticateUser(getAdminUser()).withCoreAPI().usingNode(contentHeld)
-            .updateNode(nameUpdated.toString());
-
-        STEP("Check the request failed.");
-        restClient.assertStatusCodeIs(FORBIDDEN);
-        restClient.assertLastError().containsSummary("Frozen content can't be updated.");
-    }
-
-    /*
-     * Given active content on hold
-     * When I try to update the content
-     * Then I am not successful
-     */
-    @Test
-    public void updateContentForFrozenFile() throws Exception
-    {
-        STEP("Update content of the held file");
-        restClient.authenticateUser(getAdminUser()).withCoreAPI().usingNode(contentHeld).updateNodeContent(updatedFile);
-
-        STEP("Check the request failed.");
-        restClient.assertStatusCodeIs(INTERNAL_SERVER_ERROR);
-        restClient.assertLastError().containsSummary("Frozen content can't be updated.");
-    }
-
-    /*
-     * Given active content on hold
-     * When I try to delete the content
-     * Then I am not successful
-     */
-    @Test
-    public void deleteFrozenFile() throws Exception
-    {
-        STEP("Delete frozen file");
-        restClient.authenticateUser(getAdminUser()).withCoreAPI().usingNode(contentHeld)
-            .deleteNode(contentHeld.getNodeRefWithoutVersion());
-
-        STEP("Check the request failed.");
-        restClient.assertStatusCodeIs(FORBIDDEN);
-        restClient.assertLastError().containsSummary("Frozen content can't be deleted.");
-    }
-
-    /**
-     * Given active content on hold
-     * When I try to copy the content
-     * Then I am not successful
-     */
-    @Test
-    public void copyFrozenFile()
-    {
-        STEP("Copy frozen file");
-        String postBody = JsonBodyGenerator.keyValueJson("targetParentId", folderModel.getNodeRef());
-        getRestAPIFactory().getNodeAPI(contentHeld).copyNode(postBody);
-
-        STEP("Check the request failed.");
-        assertStatusCode(FORBIDDEN);
-        getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary("Permission was denied");
-    }
-
-    /**
-     * Given active content on hold
-     * When I try to move the content
-     * Then I am not successful
-     */
-    @Test
-    public void moveFrozenFile() throws Exception
-    {
-        STEP("Move frozen file");
-        getRestAPIFactory().getNodeAPI(contentHeld).move(createBodyForMoveCopy(folderModel.getNodeRef()));
-
-        STEP("Check the request failed.");
-        assertStatusCode(FORBIDDEN);
-        getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary("Frozen content can't be moved.");
-    }
-
-    /**
-     * Given a record folder with a frozen record and another record not held
-     * When I update the record folder and make the records as vital
-     * Then I am successful and the records not held are marked as vital
-     * And the frozen nodes have the vital record search properties updated
-     */
-    @Test
-    public void updateRecordFolderVitalProperties()
-    {
-        STEP("Update the vital record properties for the record folder");
-        // Create the record folder properties to update
-        RecordFolder recordFolderToUpdate = RecordFolder.builder()
-            .properties(RecordFolderProperties.builder()
-                .vitalRecordIndicator(true)
-                .reviewPeriod(new ReviewPeriod("month", "1"))
-                .build())
-            .build();
-
-        // Update the record folder
-        RecordFolder updatedRecordFolder = getRestAPIFactory().getRecordFolderAPI().updateRecordFolder
-            (recordFolderToUpdate,
-                recordFolder.getId());
-        assertStatusCode(OK);
-        assertTrue(updatedRecordFolder.getAspectNames().contains(ASPECTS_VITAL_RECORD_DEFINITION));
-
-        STEP("Check the frozen record was not marked as vital");
-        recordFrozen = getRestAPIFactory().getRecordsAPI().getRecord(recordFrozen.getId());
-        assertFalse(recordFrozen.getAspectNames().contains(ASPECTS_VITAL_RECORD));
-        assertTrue(recordFrozen.getProperties().getRecordSearchVitalRecordReviewPeriod().contains("month"));
-        assertTrue(recordFrozen.getProperties().getRecordSearchVitalRecordReviewPeriodExpression().contains("1"));
-
-        STEP("Check the record not held was marked as vital");
-        recordNotHeld = getRestAPIFactory().getRecordsAPI().getRecord(recordNotHeld.getId());
-        assertTrue(recordNotHeld.getAspectNames().contains(ASPECTS_VITAL_RECORD));
-        assertNotNull(recordNotHeld.getProperties().getReviewAsOf());
-        assertTrue(recordNotHeld.getProperties().getRecordSearchVitalRecordReviewPeriod().contains("month"));
-        assertTrue(recordNotHeld.getProperties().getRecordSearchVitalRecordReviewPeriodExpression().contains("1"));
-    }
-
-    /**
-     * Given a record folder with a frozen record and another record not held
-     * When I add a disposition schedule
-     * Then I am successful
-     * And the record search disposition schedule properties are updated
-     */
-    @Test
-    public void createDispositionScheduleOnCategoryWithHeldChildren()
-    {
-        STEP("Create a retention schedule on the category with frozen children");
-        RecordCategory categoryWithRS = getRestAPIFactory().getRecordCategoryAPI()
-            .getRecordCategory(recordFolder.getParentId());
-        dispositionScheduleService.createCategoryRetentionSchedule(categoryWithRS.getName(), false);
-        dispositionScheduleService.addCutOffImmediatelyStep(categoryWithRS.getName());
-        dispositionScheduleService.addDestroyWithGhostingImmediatelyAfterCutOff(categoryWithRS.getName());
-
-        STEP("Check the record folder has a disposition schedule");
-        RecordFolder folderWithRS = getRestAPIFactory().getRecordFolderAPI().getRecordFolder(recordFolder.getId());
-        assertNotNull(folderWithRS.getProperties().getRecordSearchDispositionAuthority());
-        assertNotNull(folderWithRS.getProperties().getRecordSearchDispositionInstructions());
-
-    }
-
-    /**
-     * Given a record category with a disposition schedule applied to records
-     * And the disposition schedule has a retain step  immediately and destroy step immediately
-     * And a complete record added to one hold
-     * When I execute the retain action
-     * Then the action is executed
-     * And the record search disposition schedule properties are updated
-     */
-    @Test
-    public void retainActionOnFrozenHeldRecords()
-    {
-        STEP("Add a category with a disposition schedule.");
-        categoryWithRS = createRootCategory(getRandomName("CategoryWithRS"));
-        dispositionScheduleService.createCategoryRetentionSchedule(categoryWithRS.getName(), true);
-        dispositionScheduleService.addRetainAfterPeriodStep(categoryWithRS.getName(), "immediately");
-        dispositionScheduleService.addDestroyWithGhostingImmediatelyAfterCutOff(categoryWithRS.getName());
-
-        STEP("Create record folder with a record.");
-        RecordCategoryChild folder = createFolder(categoryWithRS.getId(), getRandomName("RecFolder"));
-        Record record = createElectronicRecord(folder.getId(), getRandomName("elRecord"));
-        completeRecord(record.getId());
-
-        STEP("Add the record to the hold");
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser())
-            .addChildToHold(HoldChild.builder().id(record.getId()).build(), hold.getId());
-
-        STEP("Execute the retain action");
-        rmRolesAndActionsAPI.executeAction(getAdminUser().getUsername(), getAdminUser().getPassword(), record.getName(),
-            RM_ACTIONS.END_RETENTION, null, SC_INTERNAL_SERVER_ERROR);
-
-        STEP("Check the record search disposition properties");
-        Record recordUpdated = getRestAPIFactory().getRecordsAPI().getRecord(record.getId());
-        assertTrue(recordUpdated.getProperties().getRecordSearchDispositionActionName()
-            .contains(RM_ACTIONS.END_RETENTION.getAction()));
-        assertTrue(recordUpdated.getProperties().getRecordSearchDispositionPeriod().contains("immediately"));
-    }
-
-    private Hold createHold(String parentId, Hold hold, UserModel user)
-    {
-        FilePlanAPI filePlanAPI = getRestAPIFactory().getFilePlansAPI(user);
-        return filePlanAPI.createHold(hold, parentId);
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanUpPreventActionsOnFrozenContent()
-    {
-        getRestAPIFactory().getHoldsAPI(getAdminUser()).deleteHold(holdNodeRef);
-        dataSite.usingAdmin().deleteSite(testSite);
-        deleteRecordCategory(recordFolder.getParentId());
-        deleteRecordCategory(categoryWithRS.getId());
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/RemoveFromHoldsTests.java

@@ -52,7 +52,7 @@ import java.util.Set;
 
 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.hold.v0.HoldEntry;
+import org.alfresco.rest.rm.community.model.hold.HoldEntry;
 import org.alfresco.rest.rm.community.model.record.Record;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
 import org.alfresco.rest.rm.community.model.user.UserRoles;

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/RemoveFromHoldsV1Tests.java

@@ -1,374 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.hold;
-
-import static java.util.Arrays.asList;
-
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.FROZEN_ASPECT;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_FILING;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_READ_RECORDS;
-import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_MANAGER;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.IMAGE_FILE;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createElectronicRecordModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createNonElectronicRecordModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.getFile;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.model.RestNodeAssociationModelCollection;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.hold.Hold;
-import org.alfresco.rest.rm.community.model.hold.HoldChild;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.rm.community.requests.gscore.api.FilePlanAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
-import org.alfresco.rest.rm.community.utils.CoreUtil;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-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.Test;
-
-/**
- * V1 API tests for removing content/record folder/record from holds
- *
- * @author Damian Ujma
- */
-public class RemoveFromHoldsV1Tests extends BaseRMRestTest
-{
-    private static final String HOLD_ONE = "HOLD_ONE" + generateTestPrefix(RemoveFromHoldsV1Tests.class);
-    private static final String HOLD_TWO = "HOLD_TWO" + generateTestPrefix(RemoveFromHoldsV1Tests.class);
-    private static final String ACCESS_DENIED_ERROR_MESSAGE = "Access Denied.  You do not have the appropriate " +
-        "permissions to perform this operation.";
-
-    private SiteModel testSite;
-    private SiteModel privateSite;
-    private String holdNodeRefOne;
-    private FileModel contentHeld;
-    private FileModel contentAddToManyHolds;
-    private List<String> holdsListRef = new ArrayList<>();
-    private final Set<UserModel> usersToBeClean = new HashSet<>();
-    private final Set<String> nodesToBeClean = new HashSet<>();
-
-    @Autowired
-    private RoleService roleService;
-
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForRemoveContentFromHold()
-    {
-        STEP("Create two holds.");
-
-        holdNodeRefOne = createHold(FILE_PLAN_ALIAS,
-            Hold.builder().name(HOLD_ONE).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(),
-            getAdminUser()).getId();
-        String holdNodeRefTwo = createHold(FILE_PLAN_ALIAS,
-            Hold.builder().name(HOLD_TWO).description(HOLD_DESCRIPTION).reason(HOLD_REASON).build(),
-            getAdminUser()).getId();
-        holdsListRef = asList(holdNodeRefOne, holdNodeRefTwo);
-
-        STEP("Create test files.");
-        testSite = dataSite.usingAdmin().createPublicRandomSite();
-        privateSite = dataSite.usingAdmin().createPrivateRandomSite();
-        contentHeld = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        contentAddToManyHolds = dataContent.usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        STEP("Add content to the holds.");
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser())
-            .addChildToHold(HoldChild.builder().id(contentHeld.getNodeRefWithoutVersion()).build(), holdNodeRefOne);
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser())
-            .addChildToHold(HoldChild.builder().id(contentAddToManyHolds.getNodeRefWithoutVersion()).build(),
-                holdNodeRefOne);
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser())
-            .addChildToHold(HoldChild.builder().id(contentAddToManyHolds.getNodeRefWithoutVersion()).build(),
-                holdNodeRefTwo);
-    }
-
-    /**
-     * Valid nodes to be removed from hold
-     */
-    @DataProvider(name = "validNodesToRemoveFromHold")
-    public Object[][] getValidNodesToRemoveFromHold()
-    {
-        //create electronic and nonElectronic record in record folder
-        RecordCategoryChild recordFolder = createCategoryFolderInFilePlan();
-        RecordFolderAPI recordFolderAPI = getRestAPIFactory().getRecordFolderAPI();
-        nodesToBeClean.add(recordFolder.getParentId());
-        Record electronicRecord = recordFolderAPI.createRecord(createElectronicRecordModel(), recordFolder.getId(),
-            getFile
-                (IMAGE_FILE));
-        assertStatusCode(CREATED);
-        Record nonElectronicRecord = recordFolderAPI.createRecord(createNonElectronicRecordModel(),
-            recordFolder.getId());
-        assertStatusCode(CREATED);
-
-        RecordCategoryChild folderToHeld = createCategoryFolderInFilePlan();
-        nodesToBeClean.add(folderToHeld.getParentId());
-        Stream.of(electronicRecord.getId(), nonElectronicRecord.getId(), folderToHeld.getId())
-            .forEach(id -> getRestAPIFactory()
-                .getHoldsAPI(getAdminUser())
-                .addChildToHold(HoldChild.builder().id(id).build(), holdNodeRefOne));
-
-        return new String[][]
-            {       // record folder
-                { folderToHeld.getId() },
-                //electronic record
-                { electronicRecord.getId() },
-                // non electronic record
-                { nonElectronicRecord.getId() },
-                // document from collaboration site
-                { contentHeld.getNodeRefWithoutVersion() },
-            };
-    }
-
-    /**
-     * Given content/record folder/record that is held
-     * And the corresponding hold
-     * When I use the existing REST API to remove the node from the hold
-     * Then the node is removed from the hold
-     * And is no longer frozen
-     */
-    @Test(dataProvider = "validNodesToRemoveFromHold")
-    public void removeContentFromHold(String nodeId) throws Exception
-    {
-        STEP("Remove node from hold");
-        getRestAPIFactory()
-            .getHoldsAPI(getAdminUser()).deleteHoldChild(holdNodeRefOne, nodeId);
-
-        STEP("Check the node is not held");
-        assertFalse(hasAspect(nodeId, FROZEN_ASPECT));
-
-        STEP("Check node is not in any hold");
-        RestNodeAssociationModelCollection holdsEntries = getRestAPIFactory()
-            .getNodeAPI(CoreUtil.toContentModel(nodeId)).usingParams("where=(assocType='rma:frozenContent')")
-            .getParents();
-        assertTrue(holdsEntries.getEntries().isEmpty(), "Content held is still added to a hold.");
-    }
-
-    /**
-     * Given active content that is held on many holds
-     * When I use the existing REST API to remove the active content from one hold
-     * Then the active content is removed from the specific hold
-     * And is frozen
-     * And in the other holds
-     */
-    @Test
-    public void removeContentAddedToManyHolds() throws Exception
-    {
-        STEP("Remove content from hold. ");
-
-        getRestAPIFactory().getHoldsAPI(getAdminUser())
-            .deleteHoldChild(holdNodeRefOne, contentAddToManyHolds.getNodeRefWithoutVersion());
-
-        STEP("Check the content is held. ");
-        assertTrue(hasAspect(contentAddToManyHolds.getNodeRefWithoutVersion(), FROZEN_ASPECT));
-
-        STEP("Check node is in hold HOLD_TWO. ");
-
-        RestNodeAssociationModelCollection holdsEntries = getRestAPIFactory()
-            .getNodeAPI(CoreUtil.toContentModel(contentAddToManyHolds.getNodeRefWithoutVersion()))
-            .usingParams("where=(assocType='rma:frozenContent')").getParents();
-        assertFalse(holdsEntries.getEntries().isEmpty(), "Content held is not held after removing from one hold.");
-        assertTrue(holdsEntries.getEntries().stream()
-                .anyMatch(restNodeModel -> restNodeModel.getModel().getName().equals(HOLD_TWO)),
-            "Content held is not held after removing from one hold.");
-    }
-
-    /**
-     * Data provider with user without right permission or capability to remove from hold a specific node
-     *
-     * @return user model and the node ref to be removed from hold
-     */
-    @DataProvider(name = "userWithoutPermissionForRemoveFromHold")
-    public Object[][] getUserWithoutPermissionForAddToHold()
-    {
-        //create record folder
-        RecordCategoryChild recordFolder = createCategoryFolderInFilePlan();
-        nodesToBeClean.add(recordFolder.getParentId());
-        UserModel user = roleService.createUserWithRMRole(ROLE_RM_MANAGER.roleId);
-        getRestAPIFactory().getRMUserAPI().addUserPermission(holdNodeRefOne, user, PERMISSION_FILING);
-        //create files that will be removed from hold
-        FileModel contentNoHoldPerm = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        FileModel contentNoHoldCap = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        FileModel privateFile = dataContent.usingAdmin().usingSite(privateSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        //add files to hold
-        asList(recordFolder.getId(), contentNoHoldCap.getNodeRefWithoutVersion(),
-            contentNoHoldPerm.getNodeRefWithoutVersion(), privateFile.getNodeRefWithoutVersion())
-            .forEach(id -> getRestAPIFactory()
-                .getHoldsAPI(getAdminUser())
-                .addChildToHold(HoldChild.builder().id(id).build(), holdNodeRefOne));
-
-        return new Object[][]
-            {
-                // user with read permission on the content, with remove from hold capability and without
-                // filling permission on a hold
-                {
-                    roleService.createUserWithSiteRoleRMRoleAndPermission(testSite, UserRole.SiteCollaborator,
-                        holdNodeRefOne, UserRoles.ROLE_RM_MANAGER, PERMISSION_READ_RECORDS),
-                    contentNoHoldPerm.getNodeRefWithoutVersion()
-                },
-                // user with write permission on the content, filling permission on a hold without remove from
-                // hold capability
-                {
-                    roleService.createUserWithSiteRoleRMRoleAndPermission(testSite, UserRole
-                            .SiteCollaborator,
-                        holdNodeRefOne, UserRoles.ROLE_RM_POWER_USER, PERMISSION_FILING),
-                    contentNoHoldCap.getNodeRefWithoutVersion()
-                },
-                //user without read permission on RM  record folder
-                {
-                    user, recordFolder.getId()
-                },
-                //user without read permission over the content from the private site
-                {
-                    user, privateFile.getNodeRefWithoutVersion()
-                }
-            };
-    }
-
-    /**
-     * Given node on hold in a single hold location
-     * And the user does not have sufficient permissions or capabilities to remove the node from the hold
-     * When the user tries to remove the node from the hold
-     * Then it's unsuccessful
-     *
-     * @throws Exception
-     */
-    @Test(dataProvider = "userWithoutPermissionForRemoveFromHold")
-    public void removeFromHoldWithUserWithoutPermission(UserModel userModel, String nodeIdToBeRemoved) throws Exception
-    {
-        STEP("Update the list of users to be deleted after running the tests");
-        usersToBeClean.add(userModel);
-
-        STEP("Remove node from hold with user without right permission or capability");
-        getRestAPIFactory().getHoldsAPI(userModel).deleteHoldChild(holdNodeRefOne, nodeIdToBeRemoved);
-
-        assertStatusCode(FORBIDDEN);
-        getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary(ACCESS_DENIED_ERROR_MESSAGE);
-
-        STEP("Check node is frozen.");
-        assertTrue(hasAspect(nodeIdToBeRemoved, FROZEN_ASPECT));
-    }
-
-    /**
-     * Data provider with user with right permission or capability to remove from hold a specific node
-     *
-     * @return user model and the node ref to be removed from hold
-     */
-    @DataProvider(name = "userWithPermissionForRemoveFromHold")
-    public Object[][] getUserWithPermissionForAddToHold()
-    {
-        //create record folder
-        RecordCategoryChild recordFolder = createCategoryFolderInFilePlan();
-        nodesToBeClean.add(recordFolder.getParentId());
-        UserModel user = roleService.createUserWithRMRoleAndRMNodePermission(ROLE_RM_MANAGER.roleId,
-            recordFolder.getId(),
-            PERMISSION_READ_RECORDS);
-        getRestAPIFactory().getRMUserAPI().addUserPermission(holdNodeRefOne, user, PERMISSION_FILING);
-        //create file that will be removed from hold
-        FileModel contentPermission = dataContent.usingAdmin().usingSite(testSite)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        //add files to hold
-        asList(recordFolder.getId(), contentPermission.getNodeRefWithoutVersion())
-            .forEach(id -> getRestAPIFactory()
-                .getHoldsAPI(getAdminUser())
-                .addChildToHold(HoldChild.builder().id(id).build(), holdNodeRefOne));
-
-        return new Object[][]
-            {
-                // user with write permission on the content
-                {
-                    roleService.createUserWithSiteRoleRMRoleAndPermission(testSite, UserRole.SiteConsumer,
-                        holdNodeRefOne, UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING),
-                    contentPermission.getNodeRefWithoutVersion()
-                },
-                //user with read permission on RM  record folder
-                {
-                    user, recordFolder.getId()
-                },
-
-            };
-    }
-
-    @Test(dataProvider = "userWithPermissionForRemoveFromHold")
-    public void removeFromHoldWithUserWithPermission(UserModel userModel, String nodeIdToBeRemoved) throws Exception
-    {
-        STEP("Update the list of users to be deleted after running the tests");
-        usersToBeClean.add(userModel);
-
-        STEP("Remove node from hold with user with right permission and capability");
-        getRestAPIFactory().getHoldsAPI(userModel).deleteHoldChild(holdNodeRefOne, nodeIdToBeRemoved);
-
-        STEP("Check node is not frozen.");
-        assertFalse(hasAspect(nodeIdToBeRemoved, FROZEN_ASPECT));
-    }
-
-    private Hold createHold(String parentId, Hold hold, UserModel user)
-    {
-        FilePlanAPI filePlanAPI = getRestAPIFactory().getFilePlansAPI(user);
-        return filePlanAPI.createHold(hold, parentId);
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanUpRemoveContentFromHold()
-    {
-        holdsListRef.forEach(holdRef -> getRestAPIFactory().getHoldsAPI(getAdminUser()).deleteHold(holdRef));
-        dataSite.usingAdmin().deleteSite(testSite);
-        dataSite.usingAdmin().deleteSite(privateSite);
-        usersToBeClean.forEach(user -> getDataUser().usingAdmin().deleteUser(user));
-        nodesToBeClean.forEach(this::deleteRecordCategory);
-    }
-}

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

@@ -33,9 +33,7 @@ import org.alfresco.rest.rm.community.model.record.Record;
 import org.alfresco.rest.v0.RecordsAPI;
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.data.RandomData;
 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;
@@ -99,10 +97,9 @@ public class InplaceRecordSearchTests extends BaseRMRestTest {
     @Test
     public void searchForInplaceRecord() {
         // And a document that isn't a record
-        final String fileName = "File" + RandomData.getRandomAlphanumeric();
         uploadedDocbyCollabUser = dataContent.usingSite(privateSite)
             .usingUser(siteCollaborator)
-            .createContent(new FileModel(fileName, FileType.fromName(fileName + "." + CMISUtil.DocumentType.TEXT_PLAIN.extention)));
+            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
 
         assertNotNull(uploadedDocbyCollabUser.getNodeRef());
 

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

@@ -62,7 +62,6 @@ import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledRecordFolderAPI;
-import org.alfresco.rest.rm.community.utils.AlfrescoRetryAnalyzer;
 import org.alfresco.rest.v0.service.RoleService;
 import org.alfresco.test.AlfrescoTest;
 import org.alfresco.utility.model.UserModel;
@@ -290,11 +289,10 @@ public class UpdateRecordsTests extends BaseRMRestTest
      * </pre>
      */
     @Test
-        (
-            dataProvider = "completeRecords",
-            description = "Complete records can't be updated",
-            retryAnalyzer = AlfrescoRetryAnalyzer.class
-        )
+    (
+        dataProvider = "completeRecords",
+        description = "Complete records can't be updated"
+    )
     @AlfrescoTest(jira="RM-4362")
     @Bug (id = "APPS-132")
     public void completeRecordsCantBeUpdated(String electronicRecordId, String nonElectronicRecordId)

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/retentionschedule/RetentionScheduleStepTests.java

@@ -1,377 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.retentionschedule;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionSchedule;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionScheduleActionDefinition;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionScheduleStepCollection;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.alfresco.rest.core.v0.BaseAPI.RM_SITE_ID;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.CONFLICT;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.http.HttpStatus.UNAUTHORIZED;
-import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.AssertJUnit.assertEquals;
-
-/**
- * Retention schedule step test case
- */
-public class RetentionScheduleStepTests extends BaseRMRestTest
-{
-    private RecordCategory recordCategory;
-    private RetentionSchedule createdRetentionSchedule;
-    private final RetentionScheduleActionDefinition retentionScheduleActionDefinition = new RetentionScheduleActionDefinition();
-    private RetentionScheduleActionDefinition createdRetentionActionDefinition;
-    private UserModel nonRMuser;
-    private final List<String> recordCategories = new ArrayList<>();
-    private static final String TEST_USER = "testUser";
-    private static final String RECORD_CATEGORY = "recordCategory";
-    private static final String PERIOD_PROPERTY = "cm:created";
-    private static final String AUTHORITY = "authority";
-    private static final String INSTRUCTIONS = "instructions";
-    private static final int PERIOD_AMOUNT = 5;
-    private static final String PERIOD = "month";
-    private static final List<String> EVENTS = Arrays.asList("case_closed","abolished");
-    private static final String TRANSFER_STEP = "transfer";
-    private static final String RETAIN_STEP = "retain";
-    private static final String INVALID_PERIOD = "random";
-    private static final String CUTOFF_STEP = "cutoff";
-    private static final String DESTROY_STEP = "destroyContent";
-    private static final String INVALID_PASSWORD = "wrongPassword";
-
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForRetentionScheduleStepTests()
-    {
-        createRMSiteIfNotExists();
-        // create a non rm user
-        nonRMuser = dataUser.createRandomTestUser(TEST_USER);
-        //Create record category
-        recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY));
-        recordCategories.add(recordCategory.getId());
-        RetentionSchedule retentionSchedule = new RetentionSchedule();
-        retentionSchedule.setAuthority(AUTHORITY + getRandomAlphanumeric());
-        retentionSchedule.setInstructions(INSTRUCTIONS + getRandomAlphanumeric());
-        retentionSchedule.setIsRecordLevel(false);
-        //Create retention schedule with a valid user
-        createdRetentionSchedule = getRestAPIFactory().getRetentionScheduleAPI()
-            .createRetentionSchedule(retentionSchedule, recordCategory.getId());
-
-        retentionScheduleActionDefinition.setName(RETAIN_STEP);
-        retentionScheduleActionDefinition.setDescription(INSTRUCTIONS);
-        retentionScheduleActionDefinition.setPeriodAmount(PERIOD_AMOUNT);
-        retentionScheduleActionDefinition.setPeriodProperty(PERIOD_PROPERTY);
-        retentionScheduleActionDefinition.setPeriod(PERIOD);
-        retentionScheduleActionDefinition.setCombineRetentionStepConditions(false);
-        retentionScheduleActionDefinition.setEligibleOnFirstCompleteEvent(true);
-        retentionScheduleActionDefinition.setEvents(EVENTS);
-    }
-
-    @Test(priority = 1)
-    public void createRetentionScheduleStepFor422()
-    {
-        RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition();
-        //Creating the first action "transfer" should give 422
-        actionDefinition.setName(TRANSFER_STEP);
-        actionDefinition.setLocation("location");
-        //Create retention schedule action definition
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,createdRetentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(UNPROCESSABLE_ENTITY);
-    }
-
-    @Test(priority = 2)
-    public void createRetentionScheduleStepWithInvalidPeriodValue()
-    {
-        RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition();
-        actionDefinition.setName(RETAIN_STEP);
-        //Invalid period value
-        actionDefinition.setPeriod(INVALID_PERIOD);
-        //Create retention schedule action definition
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,createdRetentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(BAD_REQUEST);
-    }
-
-    @Test(priority = 3)
-    public void createRetentionScheduleWithInvalidStep()
-    {
-        RecordCategory recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY));
-        recordCategories.add(recordCategory.getId());
-        RetentionSchedule retentionSchedule = createRetentionSchedule(recordCategory);
-        RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition();
-        actionDefinition.setName(RETAIN_STEP);
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,retentionSchedule.getId());
-
-        assertStatusCode(CREATED);
-
-        RetentionScheduleActionDefinition actionDefinition1 = getRetentionScheduleActionDefinition();
-        actionDefinition1.setName(TRANSFER_STEP);
-        actionDefinition1.setLocation("location");
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition1,retentionSchedule.getId());
-
-        assertStatusCode(CREATED);
-
-        RetentionScheduleActionDefinition actionDefinition2 = getRetentionScheduleActionDefinition();
-        actionDefinition2.setName(CUTOFF_STEP);
-        //Create retention schedule action definition
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition2,retentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(CONFLICT);
-    }
-
-    @Test(priority = 4)
-    public void createRetentionScheduleWithInvalidStepAfterDestroy()
-    {
-        RecordCategory recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY));
-        recordCategories.add(recordCategory.getId());
-        RetentionSchedule retentionSchedule = createRetentionSchedule(recordCategory);
-        RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition();
-        actionDefinition.setName(RETAIN_STEP);
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,retentionSchedule.getId());
-
-        assertStatusCode(CREATED);
-
-        RetentionScheduleActionDefinition actionDefinition1 = getRetentionScheduleActionDefinition();
-        actionDefinition1.setName(DESTROY_STEP);
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition1,retentionSchedule.getId());
-
-        assertStatusCode(CREATED);
-
-        RetentionScheduleActionDefinition actionDefinition2 = getRetentionScheduleActionDefinition();
-        actionDefinition2.setName(CUTOFF_STEP);
-        //Create retention schedule action definition
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition2,retentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(CONFLICT);
-    }
-
-    @Test(priority = 5)
-    public void combineRetentionStepConditionsNotValidForNonAccessionStep()
-    {
-        RecordCategory recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY));
-        recordCategories.add(recordCategory.getId());
-        RetentionSchedule retentionSchedule = createRetentionSchedule(recordCategory);
-        RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition();
-        actionDefinition.setName(RETAIN_STEP);
-        actionDefinition.setCombineRetentionStepConditions(true);
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,retentionSchedule.getId());
-
-        assertStatusCode(BAD_REQUEST);
-    }
-
-    @Test(priority = 6)
-    public void createRetentionScheduleWithSameStep()
-    {
-        RecordCategory recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY));
-        recordCategories.add(recordCategory.getId());
-        RetentionSchedule retentionSchedule = createRetentionSchedule(recordCategory);
-        RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition();
-        actionDefinition.setName(RETAIN_STEP);
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,retentionSchedule.getId());
-
-        assertStatusCode(CREATED);
-
-        RetentionScheduleActionDefinition actionDefinition1 = getRetentionScheduleActionDefinition();
-        actionDefinition1.setName(RETAIN_STEP);
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition1,retentionSchedule.getId());
-
-        // Verify the status code
-        assertStatusCode(CONFLICT);
-    }
-
-    @Test(priority = 7)
-    public void createRetentionScheduleWithMultipleTransferStep()
-    {
-        RecordCategory recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY));
-        recordCategories.add(recordCategory.getId());
-        RetentionSchedule retentionSchedule = createRetentionSchedule(recordCategory);
-        RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition();
-        actionDefinition.setName(RETAIN_STEP);
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,retentionSchedule.getId());
-
-        assertStatusCode(CREATED);
-
-        RetentionScheduleActionDefinition actionDefinition1 = getRetentionScheduleActionDefinition();
-        actionDefinition1.setName(TRANSFER_STEP);
-        actionDefinition1.setLocation("location");
-
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition1, retentionSchedule.getId());
-
-        RetentionScheduleActionDefinition actionDefinition2 = getRetentionScheduleActionDefinition();
-        actionDefinition2.setName(TRANSFER_STEP);
-        actionDefinition2.setLocation("location");
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition2, retentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(CREATED);
-    }
-
-    @Test(priority = 8)
-    public void createRetentionScheduleStepFor201()
-    {
-        //Create retention schedule action definition
-        createdRetentionActionDefinition = getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(retentionScheduleActionDefinition,createdRetentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(CREATED);
-        // Find this retention schedule is created one or not
-        assertEquals(createdRetentionActionDefinition.getName(), retentionScheduleActionDefinition.getName());
-        assertEquals(createdRetentionActionDefinition.getDescription(), retentionScheduleActionDefinition.getDescription());
-        assertEquals(createdRetentionActionDefinition.getPeriodAmount(), retentionScheduleActionDefinition.getPeriodAmount());
-        assertEquals(createdRetentionActionDefinition.isCombineRetentionStepConditions(), retentionScheduleActionDefinition.isCombineRetentionStepConditions());
-        assertEquals(createdRetentionActionDefinition.isEligibleOnFirstCompleteEvent(), retentionScheduleActionDefinition.isEligibleOnFirstCompleteEvent());
-    }
-
-    @Test(priority = 9)
-    public void createRetentionScheduleStepFor401()
-    {
-        //Create retention schedule action definition
-        getRestAPIFactory().getRetentionScheduleAPI(new UserModel(getAdminUser().getUsername(), INVALID_PASSWORD)).createRetentionScheduleStep(retentionScheduleActionDefinition,createdRetentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(UNAUTHORIZED);
-    }
-
-    @Test(priority = 10)
-    public void createRetentionScheduleStepFor403()
-    {
-        //Create retention schedule action definition
-        getRestAPIFactory().getRetentionScheduleAPI(nonRMuser).createRetentionScheduleStep(retentionScheduleActionDefinition,createdRetentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(FORBIDDEN);
-    }
-
-    @Test(priority = 11)
-    public void retentionScheduleStepFor400()
-    {
-        getRestAPIFactory().getRetentionScheduleAPI().getRetentionScheduleStep(recordCategory.getId());
-        // Verify the status code
-        assertStatusCode(BAD_REQUEST);
-    }
-
-    @Test(priority = 12)
-    public void createRetentionScheduleStepFor404()
-    {
-        //Create retention schedule action definition
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(retentionScheduleActionDefinition,getRandomAlphanumeric());
-        // Verify the status code
-        assertStatusCode(NOT_FOUND);
-    }
-
-    @Test(priority = 13)
-    public void retentionScheduleStepFor403()
-    {
-        // Get retention schedule steps with user having no rights
-        getRestAPIFactory().getRetentionScheduleAPI(nonRMuser).getRetentionScheduleStep(createdRetentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(FORBIDDEN);
-    }
-
-    @Test(priority = 14)
-    public void retentionScheduleStepFor401()
-    {
-        getRestAPIFactory().getRetentionScheduleAPI(new UserModel(getAdminUser().getUsername(), INVALID_PASSWORD)).getRetentionScheduleStep(createdRetentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(UNAUTHORIZED);
-    }
-
-    @Test(priority = 15)
-    public void retentionScheduleStepWith200()
-    {
-        RetentionScheduleStepCollection receiveRetentionStepCollection = getRestAPIFactory().getRetentionScheduleAPI().getRetentionScheduleStep(createdRetentionSchedule.getId());
-        // Verify the status code
-        assertStatusCode(OK);
-        receiveRetentionStepCollection.getEntries().forEach(c ->
-        {
-            RetentionScheduleActionDefinition retentionActionDef = c.getEntry();
-            assertNotNull(retentionActionDef.getId());
-            // Find this retention schedule is created one or not
-            assertEquals(createdRetentionActionDefinition.getId(), retentionActionDef.getId());
-            assertEquals(createdRetentionActionDefinition.getName(), retentionActionDef.getName());
-            assertEquals(createdRetentionActionDefinition.getDescription(), retentionActionDef.getDescription());
-            assertEquals(createdRetentionActionDefinition.getPeriod(), retentionActionDef.getPeriod());
-            assertEquals(createdRetentionActionDefinition.getPeriodAmount(), retentionActionDef.getPeriodAmount());
-            assertEquals(createdRetentionActionDefinition.isCombineRetentionStepConditions(), retentionActionDef.isCombineRetentionStepConditions());
-            assertEquals(createdRetentionActionDefinition.isEligibleOnFirstCompleteEvent(), retentionActionDef.isEligibleOnFirstCompleteEvent());
-        });
-    }
-
-    private RetentionSchedule createRetentionSchedule(RecordCategory recordCategory)
-    {
-        RetentionSchedule retentionSchedule = new RetentionSchedule();
-        retentionSchedule.setAuthority(AUTHORITY + getRandomAlphanumeric());
-        retentionSchedule.setInstructions(INSTRUCTIONS + getRandomAlphanumeric());
-        retentionSchedule.setIsRecordLevel(false);
-        //Create retention schedule with a valid user
-        retentionSchedule = getRestAPIFactory().getRetentionScheduleAPI()
-            .createRetentionSchedule(retentionSchedule, recordCategory.getId());
-        // Verify the status code
-        assertStatusCode(CREATED);
-        return retentionSchedule;
-    }
-
-    private static RetentionScheduleActionDefinition getRetentionScheduleActionDefinition()
-    {
-        RetentionScheduleActionDefinition actionDefinition = new RetentionScheduleActionDefinition();
-        actionDefinition.setDescription(INSTRUCTIONS);
-        actionDefinition.setPeriodAmount(PERIOD_AMOUNT);
-        actionDefinition.setPeriodProperty(PERIOD_PROPERTY);
-        actionDefinition.setPeriod(PERIOD);
-        actionDefinition.setCombineRetentionStepConditions(false);
-        actionDefinition.setEligibleOnFirstCompleteEvent(true);
-        actionDefinition.setEvents(EVENTS);
-        return actionDefinition;
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanUpRetentionScheduleStepTests()
-    {
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, recordCategory.getName());
-        recordCategories.forEach(this::deleteRecordCategory);
-        dataUser.deleteUser(nonRMuser);
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/retentionschedule/RetentionScheduleTests.java

@@ -1,270 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.retentionschedule;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionSchedule;
-import org.alfresco.rest.rm.community.model.retentionschedule.RetentionScheduleCollection;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import static org.alfresco.rest.core.v0.BaseAPI.RM_SITE_ID;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.springframework.http.HttpStatus.CONFLICT;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.http.HttpStatus.UNAUTHORIZED;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.AssertJUnit.assertEquals;
-
-/**
- * This class contains the tests for the Retention Schedule CRUD V1 API
- */
-public class RetentionScheduleTests extends BaseRMRestTest
-{
-    private RecordCategory recordCategory;
-    private RetentionSchedule createdRetentionSchedule;
-    private UserModel nonRMuser;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForRetentionScheduleTests()
-    {
-        createRMSiteIfNotExists();
-        // create a non rm user
-        nonRMuser = dataUser.createRandomTestUser("testUser");
-        //Create record category
-        recordCategory = createRootCategory(getRandomName("recordCategory"));
-
-
-    }
-    /**
-     * <pre>
-     * Given that a record category exists
-     * When I ask the API to create a retention schedule with a user having no rights
-     * Then it will give 403 as status code
-     * </pre>
-     */
-    @Test(priority = 1)
-    public void createRetentionScheduleFor403()
-    {
-        RetentionSchedule retentionSchedule = new RetentionSchedule();
-
-        // Create retention schedule with user having no rights
-        getRestAPIFactory().getRetentionScheduleAPI(nonRMuser).createRetentionSchedule(retentionSchedule, recordCategory.getId());
-
-        // Verify the status code
-        assertStatusCode(FORBIDDEN);
-    }
-
-    /**
-     * <pre>
-     * Given that a record category does not exists
-     * When I ask the API to create a retention schedule on a category Id
-     * Then it will give 404 as a status code
-     * </pre>
-     */
-    @Test(priority = 2)
-    public void createRetentionScheduleFor404()
-    {
-        RetentionSchedule retentionSchedule = new RetentionSchedule();
-
-        //Create retention schedule with category id not exist
-        getRestAPIFactory().getRetentionScheduleAPI().createRetentionSchedule(retentionSchedule, getRandomAlphanumeric());
-
-        // Verify the status code
-        assertStatusCode(NOT_FOUND);
-    }
-
-    /**
-     * <pre>
-     * Given that a record category exists
-     * When I ask the API to create a retention schedule on a category id with a user having unauthorized access
-     * Then it will give 401 as a status code
-     * </pre>
-     */
-    @Test(priority = 3)
-    public void createRetentionScheduleFor401()
-    {
-        RetentionSchedule retentionSchedule = new RetentionSchedule();
-
-        //Create retention schedule with a user with unauthorized access
-        createdRetentionSchedule = getRestAPIFactory().getRetentionScheduleAPI(new UserModel(getAdminUser().getUsername(), "wrongPassword")).createRetentionSchedule(retentionSchedule, recordCategory.getId());
-
-        // Verify the status code
-        assertStatusCode(UNAUTHORIZED);
-    }
-
-    /**
-     * <pre>
-     * Given that a record category exists
-     * When I ask the API to create a retention schedule with a user having access
-     * Then it is created with a 201 status code
-     * </pre>
-     */
-    @Test(priority = 4)
-    public void createRetentionScheduleFor201()
-    {
-        RetentionSchedule retentionSchedule = new RetentionSchedule();
-        String authority = "authority" + getRandomAlphanumeric();
-        String instructions = "instructions" + getRandomAlphanumeric();
-        boolean isRecordLevel = false;
-        retentionSchedule.setAuthority(authority);
-        retentionSchedule.setInstructions(instructions);
-        retentionSchedule.setIsRecordLevel(isRecordLevel);
-
-        //Create retention schedule with a valid user
-        createdRetentionSchedule = getRestAPIFactory().getRetentionScheduleAPI()
-            .createRetentionSchedule(retentionSchedule, recordCategory.getId());
-
-        // Verify the status code
-        assertStatusCode(CREATED);
-        assertEquals(createdRetentionSchedule.getAuthority(), authority);
-        assertEquals(createdRetentionSchedule.getInstructions(), instructions);
-        assertFalse(createdRetentionSchedule.getIsRecordLevel());
-        assertNotNull(createdRetentionSchedule.getId());
-    }
-
-    /**
-     * <pre>
-     * Given that a record category exists
-     * When I ask the API to create a retention schedule on a category id having retention schedule already
-     * Then it will give 409 as a status code
-     * </pre>
-     */
-    @Test(priority = 5)
-    public void createRetentionScheduleFor409()
-    {
-        RetentionSchedule retentionSchedule = new RetentionSchedule();
-        //Create retention schedule on a category with already having retention schedule
-        getRestAPIFactory().getRetentionScheduleAPI()
-            .createRetentionSchedule(retentionSchedule, recordCategory.getId());
-
-        assertStatusCode(CONFLICT);
-    }
-
-    /**
-     * <pre>
-     * Given that a record category exists
-     * When I ask the API to get a retention schedule on a given categoryId with a user having no rights
-     * Then it will give 403
-     * </pre>
-     */
-    @Test(priority = 6)
-    public void retentionScheduleWith403()
-    {
-        //Get retention schedule with user having no rights
-        getRestAPIFactory().getRetentionScheduleAPI(nonRMuser).getRetentionSchedule(recordCategory.getId());
-
-        // Verify the status code
-        assertStatusCode(FORBIDDEN);
-    }
-
-    /**
-     * <pre>
-     * Given that a record category does not exists
-     * When I ask the API to get a retention schedule on a category Id
-     * Then it will give 404 as a status code
-     * </pre>
-     */
-    @Test(priority = 7)
-    public void retentionScheduleWith404()
-    {
-
-        //Get retention schedule with category id that does not exist
-        getRestAPIFactory().getRetentionScheduleAPI().getRetentionSchedule(getRandomAlphanumeric());
-
-        // Verify the status code
-        assertStatusCode(NOT_FOUND);
-    }
-
-    /**
-     * <pre>
-     * Given that a record category exists
-     * When I ask the API to get a retention schedule on a categoryId with a user having unauthorized access
-     * Then it will give 401 as a status code
-     * </pre>
-     */
-    @Test(priority = 8)
-    public void retentionScheduleWith401()
-    {
-        //Create retention schedule with a user with unauthorized access
-        getRestAPIFactory().getRetentionScheduleAPI(new UserModel(getAdminUser().getUsername(), "wrongPassword")).getRetentionSchedule(recordCategory.getId());
-
-        // Verify the status code
-        assertStatusCode(UNAUTHORIZED);
-    }
-
-    /**
-     * <pre>
-     * Given that a record category exists
-     * When I ask the API to get a retention schedule on a categoryId with a user having access
-     * Then it will give retentionSchedule with 200 as a status code
-     * </pre>
-     */
-    @Test(priority = 9)
-    public void retentionScheduleWith200()
-    {
-        RetentionScheduleCollection retentionScheduleCollection = getRestAPIFactory().getRetentionScheduleAPI().getRetentionSchedule(recordCategory.getId());
-        // Verify the status code
-        assertStatusCode(OK);
-        retentionScheduleCollection.getEntries().forEach(c ->
-        {
-            RetentionSchedule retentionSchedule = c.getEntry();
-            String retentionScheduleId = retentionSchedule.getId();
-            assertNotNull(retentionScheduleId);
-            logger.info("Checking retention schedule " + retentionScheduleId);
-
-            // Find this retention schedule is created one or not
-            assertEquals(createdRetentionSchedule.getId(), retentionScheduleId);
-            assertEquals(createdRetentionSchedule.getParentId(),retentionSchedule.getParentId());
-            assertEquals(createdRetentionSchedule.getAuthority(), retentionSchedule.getAuthority());
-            assertEquals(createdRetentionSchedule.getInstructions(), retentionSchedule.getInstructions());
-            assertEquals(createdRetentionSchedule.getIsRecordLevel(), retentionSchedule.getIsRecordLevel());
-            assertEquals(createdRetentionSchedule.isUnpublishedUpdates(), retentionSchedule.isUnpublishedUpdates());
-        });
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanUpRetentionScheduleTests()
-    {
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, recordCategory.getName());
-        deleteRecordCategory(recordCategory.getId());
-        dataUser.deleteUser(nonRMuser);
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/rules/CopyToRuleOnFoldersTest.java

@@ -1,118 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.rules;
-
-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.requests.gscore.api.RecordCategoryAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI;
-import org.alfresco.rest.rm.community.smoke.CreateCategoriesTests;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.Test;
-
-import java.util.Collections;
-
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.rm.community.base.TestData.ELECTRONIC_RECORD_NAME;
-import static org.alfresco.rest.rm.community.base.TestData.NONELECTRONIC_RECORD_NAME;
-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.rest.rm.community.utils.FilePlanComponentsUtil.*;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.*;
-
-public class CopyToRuleOnFoldersTest extends BaseRMRestTest {
-
-    private RecordCategory category;
-    private RecordCategoryChild folder1,folder2;
-    private final static String title = "Run in background";
-    private final String TEST_PREFIX = generateTestPrefix(CopyToRuleOnFoldersTest.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    private final String electronicRecord = TEST_PREFIX + "record_electronic_for_copyTo";
-    private final String nonElectronicRecord = TEST_PREFIX + "record_non_electronic_for_copyTo";
-
-    @Autowired
-    private RulesAPI rulesAPI;
-
-    @Test
-    @AlfrescoTest(jira = "RM-2994")
-    public void copyToRuleOnFoldersTest()
-    {
-
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description1")
-            .runInBackground(true).title(title)
-            .actions(Collections.singletonList(ActionsOnRule.COPY_TO.getActionValue()));
-
-
-        STEP("Create the RM site if doesn't exist");
-        createRMSiteIfNotExists();
-
-        STEP("Create record categories and record folders");
-        category= createRootCategory(getRandomName("recordCategory"));
-        String folder1 = createCategoryFolderInFilePlan().getId();
-        String folder2 = createCategoryFolderInFilePlan().getId();
-
-        // create a rule on folder
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folder1, ruleDefinition);
-
-        // create electronic record in record folder
-        String electronicRecordId = createElectronicRecord(folder1, ELECTRONIC_RECORD_NAME).getId();
-        assertStatusCode(CREATED);
-
-        // create non-electronic record in record folder
-        String nonElectronicRecord = createElectronicRecord(folder1, NONELECTRONIC_RECORD_NAME).getId();
-        assertStatusCode(CREATED);
-
-        // Move the electronic and non-electronic records from "Category with records"> "Folder with rule"
-        // to "Copy Category with records" > "Folder with rule"
-       getRestAPIFactory().getNodeAPI(toContentModel(folder1)).copy(createBodyForMoveCopy(category.getId()));
-        getRestAPIFactory().getNodeAPI(toContentModel( electronicRecord)).move(createBodyForMoveCopy(folder2));
-        getRestAPIFactory().getNodeAPI(toContentModel( nonElectronicRecord)).move(createBodyForMoveCopy(folder2));
-
-        RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-        // Delete the record category
-        RecordCategoryAPI recordCategoryAPI = getRestAPIFactory().getRecordCategoryAPI();
-        String recordCategoryId = category.getId();
-        recordCategoryAPI.deleteRecordCategory(recordCategoryId);
-        recordsAPI.deleteRecord(electronicRecord);
-        recordsAPI.deleteRecord(nonElectronicRecord);
-        assertStatusCode(NO_CONTENT);
-
-
-    }
-
-
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/rules/FileAsRecordRuleTests.java

@@ -1,229 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.rules;
-
-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.rules.ActionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.RuleDefinition;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChildEntry;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-
-import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
-import org.alfresco.rest.rm.community.smoke.FileAsRecordTests;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-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.http.HttpStatus.CREATED;
-
-@AlfrescoTest (jira = "APPS-36")
-public class FileAsRecordRuleTests extends BaseRMRestTest
-{
-    private UserModel nonRMUser, rmManager;
-    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);
-    private FolderModel testFolder;
-    private FileModel document,inPlaceRecord;
-
-
-    @Autowired
-    private RoleService roleService;
-    @Autowired
-    private RulesAPI rulesAPI;
-
-    /**
-     * Create preconditions:
-     * 1. RM site is created
-     * 2. Two users: user without RM role and a user with RM manager role
-     * 3. Two Record categories with one folder each
-     * 4. User with RM MANAGER role has Filling permission over one category
-     * 5. A collaboration folder with rule set to declare and file as record to a record folder
-     **/
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForDeclareFileAsRecordRuleTests()
-    {
-        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 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);
-
-        STEP("Create a collaboration folder with a rule set to declare and file as record to a record folder");
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folderWithRule.getId(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-    }
-    /**
-     * Given I am a user that can create a rule on a folder in a collaboration site
-     * When I am creating the rule
-     * Then I have the option of adding a "Declare and File as Record" action to the rule
-     * <p>
-     * Given I am creating a rule
-     * When I add the "Declare and File as Record" action to the rule
-     * Then I am able to select the record folder I want the declared record to be filed to
-     * <p>
-     * Given I am configuring a "Declare and File as Record" action within a rule
-     * And I have at least one records management role (eg RM User)
-     * When I am selecting the record folder location to file the declared record to
-     * Then I see the record folders in the file plan that I have file access to as the creator of the record
-     **/
-    @Test
-    public void declareAsRecordRuleAsRMUserWithFilingPermissions() {
-        STEP("Create a collaboration folder");
-        testFolder = dataContent.usingSite(testSite)
-            .usingUser(rmManager)
-            .createFolder();
-
-        STEP("Create a rule with Declare as Record action and check that user can select a record folder.");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folderWithRule.getId(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-    }
-    /**
-     * Given I am configuring a "Declare and File as Record" action within a rule
-     * And I don't have a records management role
-     * When I am selecting the record folder location to file the declared record to
-     * Then I can see only the file plan
-     */
-    @Test
-    public void declareAsRecordRuleAsNonRMUser()
-    {
-        STEP("Create a collaboration folder");
-        testFolder = dataContent.usingSite(testSite)
-            .usingUser(nonRMUser)
-            .createFolder();
-
-        STEP("Create a rule with Declare as Record action and check that user can select a record folder.");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(nonRMUser.getUsername(), nonRMUser.getPassword(), NODE_PREFIX + testFolder.getNodeRef(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-    }
-
-    /**
-     * Given I have not selected a record folder location
-     * When the rule is triggered
-     * Then the file is declared as record to the UnFiled Records folder
-     */
-    @Test
-    public void triggerDeclareToUnfiledRuleAsNonRMUser()
-    {
-        STEP("Create a collaboration folder with a rule set to declare and file as record without a record folder location");
-
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folderWithRule.getId(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-
-        STEP("Create as nonRMUser a new file into the previous folder in order to trigger the rule");
-        inPlaceRecord = dataContent.usingUser(nonRMUser).usingResource(testFolder).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-//      Verify that declared record is in Unfilled Records Folder
-        UnfiledContainerAPI unfiledContainersAPI = getRestAPIFactory().getUnfiledContainersAPI();
-        List<UnfiledContainerChildEntry> matchingRecords = unfiledContainersAPI.getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS)
-            .getEntries()
-            .stream()
-            .filter(e -> e.getEntry().getId().equals(inPlaceRecord.getNodeRefWithoutVersion()))
-            .collect(Collectors.toList());
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanupDeclareAsRecordRuleTests()
-    {
-        STEP("Delete the collaboration site");
-        dataSite.usingUser(nonRMUser).deleteSite(testSite);
-
-        STEP("Delete Users");
-        dataUser.deleteUser(nonRMUser);
-        dataUser.deleteUser(rmManager);
-
-        STEP("Delete categories");
-        getRestAPIFactory().getFilePlansAPI().getRootRecordCategories(FILE_PLAN_ALIAS).getEntries().forEach(recordCategoryEntry ->
-            deleteRecordCategory(recordCategoryEntry.getEntry().getId()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/rules/FileVersionAsRecordRuleTest.java

@@ -1,221 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.rules;
-
-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.rules.ActionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.RuleDefinition;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChildEntry;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
-import org.alfresco.rest.rm.community.smoke.FileAsRecordTests;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FileType;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-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.http.HttpStatus.CREATED;
-
-public class FileVersionAsRecordRuleTest  extends BaseRMRestTest {
-
-    private UserModel nonRMuser, rmManager;
-    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);
-    private FolderModel testFolder;
-    private FileModel document,inPlaceRecord;
-
-
-    @Autowired
-    private RoleService roleService;
-    @Autowired
-    private RulesAPI rulesAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void createTestPrecondition()
-    {
-
-
-        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);
-
-
-
-        STEP("Create a collaboration folder with a rule set to declare and file version as record to a record folder");
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folderWithRule.getId(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-    }
-
-    @Test
-    public void declareVersionAsRecordRuleAsRMUserWithFilingPermissions()
-    {
-
-        STEP("Create a collaboration folder");
-        testFolder = dataContent.usingSite(testSite)
-            .usingUser(rmManager)
-            .createFolder();
-
-        STEP("Create a rule with Declare as Record action and check that user can select a record folder.");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(rmManager.getUsername(), rmManager.getPassword(), NODE_PREFIX + testFolder.getNodeRef(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-
-    }
-
-    @Test
-    public void declareVersionAsRecordRuleAsNonRMUser()
-    {
-
-        STEP("Create a collaboration folder");
-        testFolder = dataContent.usingSite(testSite)
-            .usingUser(nonRMuser)
-            .createFolder();
-
-        STEP("Create a rule with Declare as Record action and check that user can select a record folder.");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(nonRMuser.getUsername(), nonRMuser.getPassword(), NODE_PREFIX + testFolder.getNodeRef(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-
-    }
-
-    @Test
-    public void triggerDeclareToUnfiledRuleAsNonRMUser() throws Exception {
-
-        STEP("Create a collaboration folder with a rule set to declare and file as record without a record folder location");
-
-
-        FileModel inplaceRecord = dataContent.usingSite(testSite).usingUser(nonRMuser)
-            .createContent(new FileModel("declareAndFileToIntoUnfiledRecordFolder",
-                FileType.TEXT_PLAIN));
-
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(nonRMuser.getUsername(), nonRMuser.getPassword(), NODE_PREFIX + inplaceRecord.getNodeRef(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-
-       STEP("Create as nonRMuser a new file into the previous folder in order to trigger the rule");
-        inPlaceRecord = dataContent.usingUser(nonRMuser).usingResource(testFolder).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        // verify the declared record is in Unfilled Records folder
-        UnfiledContainerAPI unfiledContainersAPI = getRestAPIFactory().getUnfiledContainersAPI();
-        List<UnfiledContainerChildEntry> matchingRecords = unfiledContainersAPI.getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS)
-            .getEntries()
-            .stream()
-            .filter(e -> e.getEntry().getId().equals(inplaceRecord.getNodeRefWithoutVersion()))
-            .collect(Collectors.toList());
-
-
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanupDeclareVersionAsRecordRuleTests()
-    {
-
-        STEP("Delete the collaboration site");
-        dataSite.usingUser(nonRMuser).deleteSite(testSite);
-
-        STEP("Delete Users");
-        dataUser.deleteUser(nonRMuser);
-        dataUser.deleteUser(rmManager);
-
-
-        STEP("Delete categories");
-        getRestAPIFactory().getFilePlansAPI().getRootRecordCategories(FILE_PLAN_ALIAS).getEntries().forEach(recordCategoryEntry ->
-            deleteRecordCategory(recordCategoryEntry.getEntry().getId()));
-    }
-
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/rules/MoveToRuleOnFoldersTest.java

@@ -1,237 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.rules;
-
-import org.alfresco.rest.model.RestNodeModel;
-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.rules.ActionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.ConditionsOnRule;
-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.UnfiledContainerChildEntry;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
-import org.alfresco.rest.search.RestRequestQueryModel;
-import org.alfresco.rest.v0.HoldsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-import static java.lang.Integer.MAX_VALUE;
-import static java.util.Arrays.asList;
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-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.rest.rm.community.utils.FilePlanComponentsUtil.*;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.*;
-import static org.testng.Assert.assertNotNull;
-
-
-public class MoveToRuleOnFoldersTest extends BaseRMRestTest{
-
-
-    private RecordCategoryChild recordFolder2;
-    private RecordCategoryChild recordFolder1;
-    private String nonElectronicId;
-
-    public Record electronicRecord;
-
-    private String ruleType = ConditionsOnRule.UPDATE.getWhenConditionValue();
-    private UserModel rmAdmin;
-    public RecordCategory RecordCategoryOne;
-    private RecordCategoryChild recordFolder;
-    public static final String RECORD_FOLDER_ONE = "record-folder-one";
-    private final String TEST_PREFIX = generateTestPrefix(MoveToRuleOnFoldersTest.class);
-
-    private final String RECORD_CATEGORY_ONE = TEST_PREFIX + "category";
-
-    private final String recordName = "Test record";
-    private final String recordTitle = recordName + " title";
-    private final String recordDescription = recordName + " description";
-    private Record nonElectrinicRecordModel;
-    private RecordFolderAPI recordFolderAPI;
-    public String title,description,box,file,shelf,storageLocation,name;
-    @Autowired
-    private RulesAPI rulesAPI;
-    @Autowired
-    private HoldsAPI holdsAPI;
-
-    @Autowired
-    private RoleService roleService;
-
-    @Autowired
-    public RecordsAPI recordsAPI;
-
-
-    @BeforeClass(alwaysRun = true)
-    public void precondition()
-    {
-        //create RM site
-        createRMSiteIfNotExists();
-        rmAdmin = roleService.createUserWithRMRole(UserRoles.ROLE_RM_ADMIN.roleId);
-        //create root category, create folders , add electronic and non electronic records
-        RecordCategoryOne = createRootCategory(RECORD_CATEGORY_ONE);
-        recordFolder1=createRecordFolder(RecordCategoryOne.getId(), getRandomName("recFolder"));
-       // recordFolder1_id = createRecordFolder(RecordCategoryOne.getId(), getRandomName("recFolder")).getId();
-        recordFolder2 = createFolder(getAdminUser(),RecordCategoryOne.getId(),getRandomName("recFolder"));
-
-
-        STEP("CREATE ELECTRONIC RECORD");
-        recordFolderAPI = getRestAPIFactory().getRecordFolderAPI();
-        electronicRecord = recordFolderAPI.createRecord(createElectronicRecordModel(), recordFolder1.getId(), getFile(IMAGE_FILE));
-        STEP("Check the electronic record has been created");
-        assertStatusCode(CREATED);
-
-
-        STEP("Create a non-electronic record by completing some of the fields");
-        // Use these properties for non-electronic record to be created
-        title = "Title " + getRandomAlphanumeric();
-        description = "Description " + getRandomAlphanumeric();
-        box = "Box "+ getRandomAlphanumeric();
-        file = "File " + getRandomAlphanumeric();
-        shelf = "Shelf " + getRandomAlphanumeric();
-        storageLocation = "Storage Location " + getRandomAlphanumeric();
-        name = "Record " + getRandomAlphanumeric();
-        Random random = new Random();
-        Integer numberOfCopies = random.nextInt(MAX_VALUE);
-        Integer physicalSize = random.nextInt(MAX_VALUE);
-
-        // Set values of all available properties for the non electronic records
-        nonElectrinicRecordModel = createFullNonElectronicRecordModel(name, title, description, box, file, shelf, storageLocation, numberOfCopies, physicalSize);
-        // Create non-electronic record
-        nonElectronicId = recordFolderAPI.createRecord(nonElectrinicRecordModel, recordFolder1.getId()).getId();
-        STEP("Check the non-electronic record has been created");
-        assertStatusCode(CREATED);
-
-
-
-
-    }
-
-    @Test
-    public void MoveToRuleFoldersTest()
-    {
-
-        String CatName=RecordCategoryOne.getName();
-        String folder2name=recordFolder2.getName();
-        String recfolder2_path="/"+CatName+"/"+folder2name;
-
-        STEP("create a rule MOVE_TO for folder 1");
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description1")
-            .runInBackground(true).title(title)
-            .actions(Collections.singletonList(ActionsOnRule.MOVE_TO.getActionValue())).ruleType(ruleType).path(recfolder2_path);
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX +recordFolder1.getId() , ruleDefinition);
-
-
-
-        STEP("Update metadata for Non-Electronic Record");
-        updateRecordMetadata();
-
-        STEP("Delete ELECTRONIC AND NON-ELECTRONIC RECORDS IN FOLDER 2");
-        org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-        recordsAPI.deleteRecord(electronicRecord.getId());
-        assertStatusCode(NO_CONTENT);
-        recordsAPI.deleteRecord(nonElectronicId);
-        assertStatusCode(NO_CONTENT);
-
-        STEP("RULE CREATION FOR FOLDER 1 WITHOUT RUNNING IN BACKGROUND");
-
-        RuleDefinition ruleDefinition_notinbackground = RuleDefinition.createNewRule().title("name").description("description1")
-            .runInBackground(false).title(title)
-            .actions(Collections.singletonList(ActionsOnRule.MOVE_TO.getActionValue())).ruleType(ruleType).path(recfolder2_path);
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX +recordFolder1.getId() , ruleDefinition);
-
-        STEP("CREATE ELECTRONIC AND NON-ELECTRONIC RECORDS");
-        electronicRecord = recordFolderAPI.createRecord(createElectronicRecordModel(), recordFolder1.getId(), getFile(IMAGE_FILE));
-        STEP("Check the electronic record has been created");
-        assertStatusCode(CREATED);
-        nonElectronicId = recordFolderAPI.createRecord(nonElectrinicRecordModel, recordFolder1.getId()).getId();
-        STEP("Check the non-electronic record has been created");
-        assertStatusCode(CREATED);
-
-        STEP("UPDATE METADATA");
-        updateRecordMetadata();
-
-        STEP("CHECK IF ELECTRONIC AND NON-ELECTRONIC RECORDS MOVED  TO FOLDER2");
-        updateRecordMetadata();
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanMoveToRuleOnFoldersTest()
-    {
-        deleteRecordCategory(RecordCategoryOne.getId());
-
-        getDataUser().deleteUser(rmAdmin);
-    }
-
-    private String getModifiedPropertyValue(String originalValue) {
-        /* to be used to append to modifications */
-        String MODIFIED_PREFIX = "modified_";
-        return MODIFIED_PREFIX + originalValue;
-    }
-    private void updateRecordMetadata(){
-        STEP("Update metadata for Non-Electronic Record");
-        org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-        Record nonelecrecord = recordsAPI.getRecord(nonElectronicId);
-        String nonelecnewName = getModifiedPropertyValue(nonElectrinicRecordModel.getName());
-        String nonelecnewTitle = getModifiedPropertyValue(nonElectrinicRecordModel.getProperties().getTitle());
-        String nonelecnewDescription = getModifiedPropertyValue(nonElectrinicRecordModel.getProperties().getDescription());
-        recordsAPI.updateRecord(createRecordModel(nonelecnewName, nonelecnewDescription, nonelecnewTitle),nonelecrecord.getId());
-        assertStatusCode(OK);
-
-        STEP("Update metadata for Electronic Record");
-        Record elecrecord = recordsAPI.getRecord(electronicRecord.getId());
-        String elecnewName = getModifiedPropertyValue(electronicRecord.getName());
-        String elecnewTitle = getModifiedPropertyValue(electronicRecord.getProperties().getTitle());
-        String elecnewDescription = getModifiedPropertyValue(electronicRecord.getProperties().getDescription());
-        recordsAPI.updateRecord(createRecordModel(elecnewName, elecnewDescription, elecnewTitle),elecrecord.getId());
-        assertStatusCode(OK);
-    }
-}
-

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/SearchDocumentsV1Test.java

@@ -72,7 +72,7 @@ public class SearchDocumentsV1Test extends BaseRMRestTest
         cmisQueryModel.setLanguage("cmis");
 
         RestRequestQueryModel aftsQueryModel = new RestRequestQueryModel();
-        aftsQueryModel.setQuery("cm:name:*" + SEARCH_TERM + ".txt");
+        aftsQueryModel.setQuery("cm:name:*" + SEARCH_TERM);
         aftsQueryModel.setLanguage("afts");
 
         return new RestRequestQueryModel[][] {
@@ -107,7 +107,7 @@ public class SearchDocumentsV1Test extends BaseRMRestTest
     private void waitIndexing() throws Exception
     {
         RestRequestQueryModel queryType = new RestRequestQueryModel();
-        queryType.setQuery("cm:name:*" + SEARCH_TERM + ".txt");
+        queryType.setQuery("cm:name:*" + SEARCH_TERM);
         queryType.setLanguage("afts");
         Utility.sleep(1000, 80000, () ->
         {

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

@@ -53,6 +53,7 @@ import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -68,6 +69,7 @@ import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPerio
 import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.DATE_FILED;
 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.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;
@@ -120,7 +122,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
         // create "rm Manager" user if it does not exist and assign it to RM Administrator role
         UserModel rmManager = getDataUser().createRandomTestUser();
         rmRolesAndActionsAPI.assignRoleToUser(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), rmManager.getUsername(),
+            getDataUser().usingAdmin().getAdminUser().getPassword(),rmManager.getUsername(),
             UserRoles.ROLE_RM_MANAGER.roleId);
     }
 
@@ -137,6 +139,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
      **/
     @Test(enabled = false) // temporary disabled, see ACS-6073
     @AlfrescoTest(jira = "RM-1622")
+    @Ignore
     public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
         STEP("Create record category");
         RecordCategory category1 = createRootCategory(CATEGORY_RM_3077);
@@ -204,6 +207,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
      * */
     @Test(enabled = false) // temporary disabled, see ACS-6073
     @AlfrescoTest (jira = "RM-3060")
+    @Ignore
     public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
 
         // create a category with retention applied on records level

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/AlphabeticalPriorityInterceptor.java

@@ -26,19 +26,27 @@
  */
 package org.alfresco.rest.rm.community.utils;
 
-import org.testng.ITestResult;
-import org.testng.util.RetryAnalyzerCount;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
-public class AlfrescoRetryAnalyzer extends RetryAnalyzerCount
+import org.testng.IMethodInstance;
+import org.testng.IMethodInterceptor;
+import org.testng.ITestContext;
+
+/**
+ * A method interceptor that sorts test classes alphabetically.
+ *
+ * @author Damian Ujma
+ */
+public class AlphabeticalPriorityInterceptor implements IMethodInterceptor
 {
-    public AlfrescoRetryAnalyzer() {
-        super();
-        setCount(3);
-    }
-
     @Override
-    public boolean retryMethod(ITestResult result)
+    public List<IMethodInstance> intercept(List<IMethodInstance> methods,
+        ITestContext context)
     {
-        return true;
+        return methods.stream()
+            .sorted(Comparator.comparing(methodInstance -> methodInstance.getMethod().getTestClass().getName()))
+            .collect(Collectors.toList());
     }
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/META-INF/services/org.testng.ITestNGListener

@@ -1 +0,0 @@
-com.epam.reportportal.testng.ReportPortalTestNGListener

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties

@@ -45,9 +45,9 @@ serverHealth.showTenants=false
 # testManagement.username=<username>
 # testManagement.apiKey=<api-key>
 # testManagement.project=<id-of-your-project
-# testManagement.testRun=<test-run-name>
+# testManagement.testRun=<test-run-name> 
 # testManagement.includeOnlyTestCasesExecuted=true #if you want to include in your run ONLY the test cases that you run, then set this value to false
-# testManagement.rateLimitInSeconds=1 #is the default rate limit after what minimum time, should we upload the next request. http://docs.gurock.com/testrail-api2/introduction #Rate Limit
+# testManagement.rateLimitInSeconds=1 #is the default rate limit after what minimum time, should we upload the next request. http://docs.gurock.com/testrail-api2/introduction #Rate Limit 
 # testManagement.suiteId=23 (the id of the Master suite)
 # ------------------------------------------------------
 testManagement.enabled=false
@@ -72,7 +72,7 @@ reports.path=./target/reports
 #
 # MySQL:
 # db.url = jdbc:mysql://${alfresco.server}:3306/alfresco
-#
+# 
 # PostgreSQL:
 # db.url = jdbc:postgresql://<your-DB-IP>:3306/alfresco
 #

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties

@@ -0,0 +1,11 @@
+# Root logger option
+log4j.rootLogger=INFO, file
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/rm-automation-community-rest-api.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.logger.com.example=debug

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j2.properties

@@ -1,20 +0,0 @@
-###### Root Logger #######
-rootLogger.level=info
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=target/reports/rm-automation-community-rest-api.log
-appender.rolling.filePattern=target/reports/rm-automation-community-rest-api.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type=Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Loggers definitions #######
-logger.com-example.name=com.example
-logger.com-example.level=debug

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml

@@ -2,7 +2,7 @@
 
 <suite name="TestNG AllTestSuite" configfailurepolicy="continue" verbose="1" time-out="300000">
    <listeners>
-      <listener class-name="org.alfresco.utility.testng.AlphabeticalPriorityInterceptor" />
+      <listener class-name="org.alfresco.rest.rm.community.utils.AlphabeticalPriorityInterceptor" />
    </listeners>
    <test name="restapi" preserve-order="false">
       <packages>

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.4.0.1</version>
+      <version>19.23</version>
    </parent>
 
    <modules>

amps/ags/rm-community/rm-community-repo/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.11
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+SOLR6_TAG=2.0.11-A6
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.6-jre17-rockylinux8

amps/ags/rm-community/rm-community-repo/Dockerfile

@@ -1,4 +1,3 @@
-ARG BASE_IMAGE
 # BUILD STAGE AGS
 FROM debian:11-slim AS AGSBUILDER
 
@@ -13,7 +12,7 @@ RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
     chmod -R g-w,o= /build
 
 # ACTUAL IMAGE
-FROM ${BASE_IMAGE}
+FROM alfresco/alfresco-community-repo-base:${image.tag}
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
 # The access will be fixed after all operations are done.

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties

@@ -39,7 +39,7 @@ cache.jsonConversionComponentCache.timeToLiveSeconds=0
 cache.jsonConversionComponentCache.maxIdleSeconds=0
 cache.jsonConversionComponentCache.backup-count=1
 cache.jsonConversionComponentCache.eviction-policy=NONE
-cache.jsonConversionComponentCache.merge-policy=com.hazelcast.spi.merge.PutIfAbsentMergePolicy
+cache.jsonConversionComponentCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy
 cache.jsonConversionComponentCache.nearCache.maxSize=50
 cache.jsonConversionComponentCache.nearCache.maxIdleSeconds=0
 cache.jsonConversionComponentCache.nearCache.timeToLiveSeconds=0
@@ -116,8 +116,8 @@ rm.patch.v35.holdNewChildAssocPatch.batchSize=1000
 # Permission mapping
 # these take a comma separated string of permissions from org.alfresco.service.cmr.security.PermissionService
 # read maps to ReadRecords and write to FileRecords
-rm.haspermissionmap.read=Read
-rm.haspermissionmap.write=WriteProperties,AddChildren,ReadContent
+rm.haspermissionmap.read=ReadProperties,ReadChildren
+rm.haspermissionmap.write=WriteProperties,AddChildren
 
 #
 # Extended auto-version behaviour.  If true and other auto-version properties are satisfied, then
@@ -139,26 +139,3 @@ content.metadata.async.extract.6.enabled=false
 
 # Max number of entries returned in Record search view
 rm.recordSearch.maxItems=500
-
-#
-# Hold bulk
-#
-# The number of worker threads.
-rm.hold.bulk.threadCount=2
-# The maximum number of total items to process in a single bulk operation.
-rm.hold.bulk.maxItems=1000
-# The number of entries to be fetched from the Search Service as a next set of work object to process.
-rm.hold.bulk.batchSize=100
-# The number of entries to process before reporting progress.
-rm.hold.bulk.logging.interval=100
-# The number of entries we process at a time in a transaction.
-rm.hold.bulk.itemsPerTransaction=1
-# The maximum number of bulk requests we can process in parallel.
-rm.hold.bulk.maxParallelRequests=10
-
-cache.bulkHoldStatusCache.cluster.type=fully-distributed
-cache.bulkHoldStatusCache.timeToLiveSeconds=2592000
-cache.bulkHoldRegistryCache.cluster.type=fully-distributed
-cache.bulkHoldRegistryCache.timeToLiveSeconds=2592000
-cache.bulkCancellationsCache.cluster.type=fully-distributed
-cache.bulkCancellationsCache.timeToLiveSeconds=2592000

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml

@@ -31,11 +31,6 @@
          <cm:description>Configuration information for the Records Management application.</cm:description>
       </view:properties>
 
-      <view:aspects>
-         <sys:undeletable/>
-         <sys:unmovable/>
-      </view:aspects>
-
       <view:associations>
          <cm:contains>
 

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml

@@ -125,7 +125,7 @@
          parent="declarativeCapability">
       <property name="name" value="DeleteRecordFolder"/>
       <property name="private" value="true"/>
-      <property name="permission" value="DeleteRecords"/>
+      <property name="permission" value="CreateModifyDestroyFolders"/>
       <property name="kinds">
          <list>
             <value>RECORD_FOLDER</value>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/log4j.properties

@@ -0,0 +1,60 @@
+#
+# Warnings
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.caveat=warn
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityPostProcessor=warn
+
+#
+# Module patches
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.patch=info
+
+#
+# Set to 'debug' to see details of capability failures when AccessDenied is thrown.  May be
+# removed to enhance performance.
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor=info
+
+#
+# RM permission debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.capability.RMEntryVoter=debug
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.capability.RMAfterInvocationProvider=debug
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.capability.declarative=debug
+
+#
+# RM Audit service debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService=debug
+
+#
+# Job debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug
+
+#
+# Script logging level
+#
+log4j.logger.org.alfresco.repo.jscript.ScriptLogger=error
+
+#
+# Behaviour debug
+#
+log4j.logger.org.alfresco.repo.policy.annotation.AnnotatedBehaviourPostProcessor=info
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.behaviour.BaseBehaviourBean=info
+
+#
+# Patch debug
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.patch=info
+#
+# RM Audit service debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService=debug
+
+#
+# Job debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug
+log4j.logger.org.alfresco.repo.web.scripts.roles.DynamicAuthoritiesGet=info
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAOImpl=info

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/log4j2.properties

@@ -1,50 +0,0 @@
-# Warnings
-logger.alfresco-module-org_alfresco_module_rm-caveat.name=org.alfresco.module.org_alfresco_module_rm.caveat
-logger.alfresco-module-org_alfresco_module_rm-caveat.level=warn
-
-logger.alfresco-module-org_alfresco_module_rm-security-RMMethodSecurityPostProcessor.name=org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityPostProcessor
-logger.alfresco-module-org_alfresco_module_rm-security-RMMethodSecurityPostProcessor.level=warn
-
-# Module patches
-logger.alfresco-module-org_alfresco_module_rm-patch.name=org.alfresco.module.org_alfresco_module_rm.patch
-logger.alfresco-module-org_alfresco_module_rm-patch.level=info
-
-# Set to 'debug' to see details of capability failures when AccessDenied is thrown.  May be
-# removed to enhance performance.
-logger.alfresco-module-org_alfresco_module_rm-security-RMMethodSecurityInterceptor.name=org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor
-logger.alfresco-module-org_alfresco_module_rm-security-RMMethodSecurityInterceptor.level=info
-
-# RM permission debug
-#logger.alfresco-module-org_alfresco_module_rm-capability-RMEntryVoter.name=org.alfresco.module.org_alfresco_module_rm.capability.RMEntryVoter
-#logger.alfresco-module-org_alfresco_module_rm-capability-RMEntryVoter.level=debug
-
-#logger.alfresco-module-org_alfresco_module_rm-capability-RMAfterInvocationProvider.name=org.alfresco.module.org_alfresco_module_rm.capability.RMAfterInvocationProvider
-#logger.alfresco-module-org_alfresco_module_rm-capability-RMAfterInvocationProvider.level=debug
-
-#logger.alfresco-module-org_alfresco_module_rm-capability-declarative.name=org.alfresco.module.org_alfresco_module_rm.capability.declarative
-#logger.alfresco-module-org_alfresco_module_rm-capability-declarative.level=debug
-
-# RM Audit service debug
-#logger.alfresco-module-org_alfresco_module_rm-audit-RecordsManagementAuditService.name=org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService
-#logger.alfresco-module-org_alfresco_module_rm-audit-RecordsManagementAuditService.level=debug
-
-# Job debug
-#logger.alfresco-module-org_alfresco_module_rm-job.name=org.alfresco.module.org_alfresco_module_rm.job
-#logger.alfresco-module-org_alfresco_module_rm-job.level=debug
-
-# Script logging level
-logger.alfresco-repo-jscript-ScriptLogger.name=org.alfresco.repo.jscript.ScriptLogger
-logger.alfresco-repo-jscript-ScriptLogger.level=error
-
-# Behaviour debug
-logger.alfresco-repo-policy-annotation-AnnotatedBehaviourPostProcessor.name=org.alfresco.repo.policy.annotation.AnnotatedBehaviourPostProcessor
-logger.alfresco-repo-policy-annotation-AnnotatedBehaviourPostProcessor.level=info
-
-logger.alfresco-module-org_alfresco_module_rm-behaviour-BaseBehaviourBean.name=org.alfresco.module.org_alfresco_module_rm.behaviour.BaseBehaviourBean
-logger.alfresco-module-org_alfresco_module_rm-behaviour-BaseBehaviourBean.level=info
-
-logger.alfresco-repo-web-scripts-roles-DynamicAuthoritiesGet.name=org.alfresco.repo.web.scripts.roles.DynamicAuthoritiesGet
-logger.alfresco-repo-web-scripts-roles-DynamicAuthoritiesGet.level=info
-
-logger.alfresco-module-org_alfresco_module_rm-query-RecordsManagementQueryDAOImpl.name=org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAOImpl
-logger.alfresco-module-org_alfresco_module_rm-query-RecordsManagementQueryDAOImpl.level=info

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml

@@ -538,11 +538,6 @@
                <type>d:text</type>
                <mandatory>true</mandatory>
             </property>
-            <property name="rma:holdDeletionReason">
-               <title>Hold Deletion Reason</title>
-               <type>d:text</type>
-               <mandatory>false</mandatory>
-            </property>
          </properties>
 
          <associations>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml

@@ -89,9 +89,6 @@
    <!-- Import RM Audit -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-audit-context.xml"/>
 
-   <!-- Import RM Bulk -->
-   <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-bulk-context.xml"/>
-
    <!--  Import RM query context -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml" />
 

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-bulk-context.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-                        http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context
-                        http://www.springframework.org/schema/context/spring-context.xsd">
-
-   <bean id="holdBulkService"
-         class="org.alfresco.module.org_alfresco_module_rm.bulk.hold.HoldBulkServiceImpl">
-      <property name="serviceRegistry" ref="ServiceRegistry" />
-      <property name="transactionService" ref="transactionService" />
-      <property name="searchMapper" ref="searchapiSearchMapper" />
-      <property name="bulkMonitor" ref="holdBulkMonitor" />
-      <property name="holdService" ref="HoldService" />
-      <property name="capabilityService" ref="CapabilityService" />
-      <property name="permissionService" ref="PermissionService" />
-      <property name="nodeService" ref="NodeService" />
-      <property name="threadCount">
-         <value>${rm.hold.bulk.threadCount}</value>
-      </property>
-      <property name="batchSize">
-         <value>${rm.hold.bulk.batchSize}</value>
-      </property>
-      <property name="maxItems">
-         <value>${rm.hold.bulk.maxItems}</value>
-      </property>
-      <property name="loggingInterval">
-         <value>${rm.hold.bulk.logging.interval}</value>
-      </property>
-      <property name="itemsPerTransaction">
-         <value>${rm.hold.bulk.itemsPerTransaction}</value>
-      </property>
-      <property name="maxParallelRequests">
-         <value>${rm.hold.bulk.maxParallelRequests}</value>
-      </property>
-   </bean>
-
-   <bean id="holdBulkMonitor" class="org.alfresco.module.org_alfresco_module_rm.bulk.hold.DefaultHoldBulkMonitor">
-      <property name="holdProgressCache" ref="holdProgressCache" />
-      <property name="holdProcessRegistry" ref="holdProcessRegistry" />
-      <property name="bulkCancellationsCache" ref="bulkCancellationsCache" />
-   </bean>
-
-
-   <bean name="holdProgressCache" factory-bean="cacheFactory" factory-method="createCache">
-      <constructor-arg value="cache.bulkHoldStatusCache" />
-   </bean>
-
-   <bean name="holdProcessRegistry" factory-bean="cacheFactory" factory-method="createCache">
-      <constructor-arg value="cache.bulkHoldRegistryCache" />
-   </bean>
-
-   <bean name="bulkCancellationsCache" factory-bean="cacheFactory" factory-method="createCache">
-      <constructor-arg value="cache.bulkCancellationsCache" />
-   </bean>
-
-</beans>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-rest-context.xml

@@ -31,7 +31,6 @@
         <property name="personService" ref="PersonService"/>
         <property name="dispositionService" ref="DispositionService"/>
         <property name="serviceRegistry" ref="ServiceRegistry"/>
-        <property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/>
     </bean>
 
     <bean id="searchTypesFactory" class="org.alfresco.rm.rest.api.impl.SearchTypesFactory">
@@ -70,40 +69,7 @@
        <property name="transactionService" ref="transactionService" />
     </bean>
 
-   <bean class="org.alfresco.rm.rest.api.fileplans.FilePlanHoldsRelation">
-      <property name="apiUtils" ref="apiUtils" />
-      <property name="nodesModelFactory" ref="nodesModelFactory" />
-      <property name="holdService" ref="HoldService" />
-      <property name="fileFolderService" ref="FileFolderService" />
-      <property name="transactionService" ref="transactionService" />
-   </bean>
-
-   <bean class="org.alfresco.rm.rest.api.holds.HoldsEntityResource" >
-      <property name="holdService" ref="HoldService" />
-      <property name="apiUtils" ref="apiUtils" />
-      <property name="nodesModelFactory" ref="nodesModelFactory" />
-      <property name="fileFolderService" ref="FileFolderService" />
-      <property name="transactionService" ref="transactionService" />
-      <property name="holdBulkService" ref="holdBulkService" />
-   </bean>
-
-   <bean class="org.alfresco.rm.rest.api.holds.HoldsBulkStatusesRelation" >
-      <property name="holdBulkMonitor" ref="holdBulkMonitor" />
-      <property name="holdBulkService" ref="holdBulkService" />
-      <property name="apiUtils" ref="apiUtils" />
-      <property name="permissionService" ref="PermissionService" />
-   </bean>
-
-   <bean class="org.alfresco.rm.rest.api.holds.HoldsChildrenRelation">
-      <property name="holdService" ref="HoldService" />
-      <property name="apiUtils" ref="apiUtils" />
-      <property name="nodesModelFactory" ref="nodesModelFactory" />
-      <property name="fileFolderService" ref="FileFolderService" />
-      <property name="transactionService" ref="transactionService" />
-      <property name="permissionService" ref="PermissionService" />
-   </bean>
-
-   <bean class="org.alfresco.rm.rest.api.unfiledcontainers.UnfiledContainerEntityResource">
+    <bean class="org.alfresco.rm.rest.api.unfiledcontainers.UnfiledContainerEntityResource">
        <property name="apiUtils" ref="apiUtils" />
        <property name="fileFolderService" ref="FileFolderService" />
        <property name="nodesModelFactory" ref="nodesModelFactory" />
@@ -148,20 +114,6 @@
        <property name="transactionService" ref="transactionService" />
     </bean>
 
-    <bean class="org.alfresco.rm.rest.api.retentionschedule.RetentionScheduleRelation">
-        <property name="apiUtils" ref="apiUtils" />
-        <property name="nodesModelFactory" ref="nodesModelFactory" />
-        <property name="dispositionService" ref="DispositionService"/>
-        <property name="nodeService" ref="NodeService"/>
-    </bean>
-
-    <bean class="org.alfresco.rm.rest.api.retentionschedule.RetentionScheduleActionRelation">
-        <property name="apiUtils" ref="apiUtils" />
-        <property name="nodesModelFactory" ref="nodesModelFactory" />
-        <property name="nodeService" ref="NodeService"/>
-        <property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/>
-    </bean>
-
     <bean class="org.alfresco.rm.rest.api.recordfolders.RecordFolderEntityResource">
        <property name="apiUtils" ref="apiUtils" />
        <property name="fileFolderService" ref="FileFolderService" />

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml

@@ -1614,8 +1614,6 @@
             org.alfresco.module.org_alfresco_module_rm.hold.HoldService.createHold=RM_CAP.0.rma:filePlanComponent.CreateHold
             org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHoldReason=RM.Read.0
             org.alfresco.module.org_alfresco_module_rm.hold.HoldService.setHoldReason=RM_CAP.0.rma:filePlanComponent.EditHold
-            org.alfresco.module.org_alfresco_module_rm.hold.HoldService.setHoldDeletionReason=RM_CAP.0.rma:filePlanComponent.EditHold
-            org.alfresco.module.org_alfresco_module_rm.hold.HoldService.updateHold=RM_CAP.0.rma:filePlanComponent.EditHold
             org.alfresco.module.org_alfresco_module_rm.hold.HoldService.deleteHold=RM_CAP.0.rma:filePlanComponent.DeleteHold
             org.alfresco.module.org_alfresco_module_rm.hold.HoldService.addToHold=RM_CAP.0.rma:filePlanComponent.AddToHold
             org.alfresco.module.org_alfresco_module_rm.hold.HoldService.addToHolds=RM_ALLOW

amps/ags/rm-community/rm-community-repo/docker-compose.yml

@@ -41,8 +41,6 @@ services:
                 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
                 -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\"
                 -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-                -Drm.hold.bulk.maxItems=5
-                -Drm.hold.bulk.batchSize=2
                 "
         ports:
             - 8080:8080

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

@@ -8,15 +8,13 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.4.0.1</version>
+      <version>19.23</version>
    </parent>
 
    <properties>
       <app.amp.client.war.folder>${project.build.directory}/${project.build.finalName}-war</app.amp.client.war.folder>
 
       <image.name>alfresco/alfresco-governance-repository-community-base</image.name>
-      <base.image>alfresco/alfresco-community-repo-base</base.image>
-      <scripts.directory>${project.parent.parent.parent.parent.basedir}/scripts</scripts.directory>
    </properties>
 
    <dependencies>
@@ -60,12 +58,9 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>jakarta.servlet</groupId>
-         <artifactId>jakarta.servlet-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>jakarta.mail</groupId>
-         <artifactId>jakarta.mail-api</artifactId>
+         <groupId>javax.servlet</groupId>
+         <artifactId>javax.servlet-api</artifactId>
+         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.alfresco.surf</groupId>
@@ -84,11 +79,6 @@
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>com.epam.reportportal</groupId>
-         <artifactId>agent-java-testng</artifactId>
-         <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
@@ -110,8 +100,9 @@
          <artifactId>swagger-parser</artifactId>
          <scope>test</scope>
       </dependency>
+      <!-- https://mvnrepository.com/artifact/com.github.fge/json-schema-validator -->
       <dependency>
-         <groupId>com.networknt</groupId>
+         <groupId>com.github.fge</groupId>
          <artifactId>json-schema-validator</artifactId>
          <scope>test</scope>
       </dependency>
@@ -155,12 +146,6 @@
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
-      <dependency>
-         <groupId>org.awaitility</groupId>
-         <artifactId>awaitility</artifactId>
-         <version>${dependency.awaitility.version}</version>
-         <scope>test</scope>
-      </dependency>
    </dependencies>
 
    <build>
@@ -427,7 +412,9 @@
                   <configuration>
                      <images>
                         <image>
-                           <name>postgres:15.4</name>
+                           <!-- TODO upgrade this old postgres version -->
+                           <name>postgres:9.4.12</name>
+                           <!--<name>postgres:13.3</name>-->
                            <run>
                               <ports>
                                  <port>${postgresql.tests.port}:${postgresql.port}</port>
@@ -550,43 +537,9 @@
          </build>
       </profile>
 
-      <profile>
-         <id>build-docker-images</id>
-         <!-- builds "image:latest" locally -->
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>io.fabric8</groupId>
-                  <artifactId>docker-maven-plugin</artifactId>
-                  <configuration>
-                     <images>
-                        <image>
-                           <name>${image.name}:${image.tag}</name>
-                           <build>
-                              <args>
-                                 <BASE_IMAGE>${base.image}:${image.tag}</BASE_IMAGE>
-                              </args>
-                              <contextDir>${project.basedir}</contextDir>
-                           </build>
-                        </image>
-                     </images>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>build</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-
        <profile>
-          <id>build-multiarch-docker-images</id>
+          <id>build-docker-images</id>
+          <!-- builds "image:latest" locally -->
           <build>
              <plugins>
                 <plugin>
@@ -595,56 +548,20 @@
                    <configuration>
                       <images>
                          <image>
-                            <name>${local.registry}/${image.name}:${image.tag}</name>
-                            <build>
-                               <buildx>
-                                  <platforms>
-                                     <platform>linux/amd64</platform>
-                                     <platform>linux/arm64</platform>
-                                  </platforms>
-                                  <builderName>${builder.name}</builderName>
-                               </buildx>
-                               <contextDir>${project.basedir}</contextDir>
-                               <args>
-                                  <BASE_IMAGE>${local.registry}/${base.image}:${image.tag}</BASE_IMAGE>
-                               </args>
-                            </build>
+                            <name>${image.name}:${image.tag}</name>
                          </image>
                       </images>
                    </configuration>
                    <executions>
                       <execution>
-                         <id>build-push-image</id>
+                         <id>build-image</id>
                          <phase>package</phase>
                          <goals>
                             <goal>build</goal>
-                            <goal>push</goal>
                          </goals>
                       </execution>
                    </executions>
                 </plugin>
-                <plugin>
-                   <artifactId>exec-maven-plugin</artifactId>
-                   <groupId>org.codehaus.mojo</groupId>
-                   <executions>
-                      <execution>
-                         <id>prepare-buildx</id>
-                         <phase>generate-sources</phase>
-                         <goals>
-                            <goal>exec</goal>
-                         </goals>
-                         <configuration>
-                            <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                            <arguments>
-                               <argument>${builder.name}</argument>
-                               <argument>${image.registry}</argument>
-                               <argument>${image.name}</argument>
-                               <argument>${image.tag}</argument>
-                            </arguments>
-                         </configuration>
-                      </execution>
-                   </executions>
-                </plugin>
              </plugins>
           </build>
        </profile>
@@ -661,37 +578,12 @@
                       <images>
                          <image>
                             <!-- Quay image -->
-                            <name>${image.registry}/${image.name}:${image.tag}</name>
-                            <build>
-                               <buildx>
-                                  <platforms>
-                                     <platform>linux/amd64</platform>
-                                     <platform>linux/arm64</platform>
-                                  </platforms>
-                                  <builderName>${builder.name}</builderName>
-                               </buildx>
-                               <args>
-                                  <BASE_IMAGE>${local.registry}/${base.image}:${image.tag}</BASE_IMAGE>
-                               </args>
-                               <contextDir>${project.basedir}</contextDir>
-                            </build>
+                            <name>${image.name}:${image.tag}</name>
+                            <registry>${image.registry}</registry>
                          </image>
                          <image>
                             <!-- DockerHub image -->
                             <name>${image.name}:${image.tag}</name>
-                            <build>
-                               <buildx>
-                                  <platforms>
-                                     <platform>linux/amd64</platform>
-                                     <platform>linux/arm64</platform>
-                                  </platforms>
-                                  <builderName>${builder.name}</builderName>
-                               </buildx>
-                               <args>
-                                  <BASE_IMAGE>${local.registry}/${base.image}:${image.tag}</BASE_IMAGE>
-                               </args>
-                               <contextDir>${project.basedir}</contextDir>
-                            </build>
                          </image>
                       </images>
                    </configuration>
@@ -706,28 +598,6 @@
                       </execution>
                    </executions>
                 </plugin>
-                 <plugin>
-                     <artifactId>exec-maven-plugin</artifactId>
-                     <groupId>org.codehaus.mojo</groupId>
-                     <executions>
-                        <execution>
-                            <id>prepare-buildx</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                               <goal>exec</goal>
-                            </goals>
-                            <configuration>
-                               <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                               <arguments>
-                                  <argument>${builder.name}</argument>
-                                  <argument>${image.registry}</argument>
-                                  <argument>${image.name}</argument>
-                                  <argument>${image.tag}</argument>
-                               </arguments>
-                            </configuration>
-                        </execution>
-                     </executions>
-                 </plugin>
              </plugins>
           </build>
        </profile>

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java

@@ -39,12 +39,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.mail.MessagingException;
-import jakarta.mail.Multipart;
-import jakarta.mail.Part;
-import jakarta.mail.internet.ContentType;
-import jakarta.mail.internet.MimeMessage;
-import jakarta.mail.internet.MimeUtility;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.Part;
+import javax.mail.internet.ContentType;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeUtility;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java

@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import jakarta.transaction.SystemException;
+import javax.transaction.SystemException;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/DeleteHoldAuditEvent.java

@@ -27,7 +27,6 @@
 
 package org.alfresco.module.org_alfresco_module_rm.audit.event;
 
-import static org.alfresco.module.org_alfresco_module_rm.audit.event.HoldUtils.HOLD_DELETION_REASON;
 import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.EVERY_EVENT;
 
 import java.io.Serializable;
@@ -78,8 +77,6 @@ public class DeleteHoldAuditEvent extends AuditEvent implements NodeServicePolic
     public void beforeDeleteNode(NodeRef holdNodeRef)
     {
         Map<QName, Serializable> auditProperties = HoldUtils.makePropertiesMap(holdNodeRef, nodeService);
-        auditProperties.put(HOLD_DELETION_REASON, nodeService.getProperty(holdNodeRef, PROP_HOLD_DELETION_REASON));
-
         recordsManagementAuditService.auditEvent(holdNodeRef, getName(), auditProperties, null, true, false);
     }
 }

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/HoldUtils.java

@@ -47,7 +47,6 @@ class HoldUtils
 {
     /** A QName to display for the hold name. */
     public static final QName HOLD_NAME = QName.createQName(RecordsManagementModel.RM_URI, "Hold Name");
-    public static final QName HOLD_DELETION_REASON = QName.createQName(RecordsManagementModel.RM_URI, "Hold deletion reason");
     /** A QName to display for the hold node ref. */
     public static final QName HOLD_NODEREF = QName.createQName(RecordsManagementModel.RM_URI, "Hold NodeRef");
 

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bulk/BulkBaseService.java

@@ -1,265 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.module.org_alfresco_module_rm.bulk;
-
-import static java.util.concurrent.Executors.newFixedThreadPool;
-
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.alfresco.repo.batch.BatchProcessWorkProvider;
-import org.alfresco.repo.batch.BatchProcessor;
-import org.alfresco.repo.batch.BatchProcessor.BatchProcessWorker;
-import org.alfresco.rest.api.search.impl.SearchMapper;
-import org.alfresco.rest.api.search.model.Query;
-import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
-import org.alfresco.service.ServiceRegistry;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.search.ResultSet;
-import org.alfresco.service.cmr.search.SearchParameters;
-import org.alfresco.service.cmr.search.SearchService;
-import org.alfresco.service.transaction.TransactionService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * A base class for executing bulk operations on nodes based on search query results
- */
-public abstract class BulkBaseService<T> implements InitializingBean
-{
-    private static final Log LOG = LogFactory.getLog(BulkBaseService.class);
-    protected ExecutorService executorService;
-    protected ServiceRegistry serviceRegistry;
-    protected SearchService searchService;
-    protected TransactionService transactionService;
-    protected SearchMapper searchMapper;
-    protected BulkMonitor<T> bulkMonitor;
-
-    protected int threadCount;
-    protected int batchSize;
-    protected int itemsPerTransaction;
-    protected int maxItems;
-    protected int loggingInterval;
-    protected int maxParallelRequests;
-
-    @Override
-    public void afterPropertiesSet() throws Exception
-    {
-        this.searchService = serviceRegistry.getSearchService();
-        this.executorService = newFixedThreadPool(maxParallelRequests);
-    }
-
-    /**
-     * Execute bulk operation on node based on the search query results
-     *
-     * @param nodeRef       node reference
-     * @param bulkOperation bulk operation
-     * @return bulk status
-     */
-    public T execute(NodeRef nodeRef, BulkOperation bulkOperation)
-    {
-        checkPermissions(nodeRef, bulkOperation);
-
-        ResultSet resultSet = getTotalItems(bulkOperation.searchQuery(), maxItems);
-        if (maxItems < resultSet.getNumberFound() || resultSet.hasMore())
-        {
-            throw new InvalidArgumentException("Too many items to process. Please refine your query.");
-        }
-        long totalItems = resultSet.getNumberFound();
-        // Generate a random process id
-        String processId = UUID.randomUUID().toString();
-
-        T initBulkStatus = getInitBulkStatus(processId, totalItems);
-        bulkMonitor.updateBulkStatus(initBulkStatus);
-        bulkMonitor.registerProcess(nodeRef, processId, bulkOperation);
-
-        BulkProgress bulkProgress = new BulkProgress(totalItems, processId, new AtomicBoolean(false),
-            new AtomicInteger(0));
-        BatchProcessWorker<NodeRef> batchProcessWorker = getWorkerProvider(nodeRef, bulkOperation, bulkProgress);
-        BulkStatusUpdater bulkStatusUpdater = getBulkStatusUpdater();
-
-        BatchProcessor<NodeRef> batchProcessor = new BatchProcessor<>(
-            processId,
-            transactionService.getRetryingTransactionHelper(),
-            getWorkProvider(bulkOperation, bulkStatusUpdater, bulkProgress),
-            threadCount,
-            itemsPerTransaction,
-            bulkStatusUpdater,
-            LOG,
-            loggingInterval);
-
-        runAsyncBatchProcessor(batchProcessor, batchProcessWorker, bulkStatusUpdater);
-        return initBulkStatus;
-    }
-
-    /**
-     * Run batch processor
-     */
-    protected void runAsyncBatchProcessor(BatchProcessor<NodeRef> batchProcessor,
-        BatchProcessWorker<NodeRef> batchProcessWorker, BulkStatusUpdater bulkStatusUpdater)
-    {
-        Runnable backgroundLogic = () -> {
-            try
-            {
-                if (LOG.isDebugEnabled())
-                {
-                    LOG.debug("Started processing batch with name: " + batchProcessor.getProcessName());
-                }
-                batchProcessor.processLong(batchProcessWorker, true);
-                if (LOG.isDebugEnabled())
-                {
-                    LOG.debug("Processing batch with name: " + batchProcessor.getProcessName() + " completed");
-                }
-            }
-            catch (Exception exception)
-            {
-                LOG.error("Error processing batch with name: " + batchProcessor.getProcessName(), exception);
-            }
-            finally
-            {
-                bulkStatusUpdater.update();
-            }
-        };
-
-        executorService.submit(backgroundLogic);
-    }
-
-    /**
-     * Get initial bulk status
-     *
-     * @param processId  process id
-     * @param totalItems total items
-     * @return bulk status
-     */
-    protected abstract T getInitBulkStatus(String processId, long totalItems);
-
-    /**
-     * Get bulk status updater
-     *
-     * @return bulk status updater
-     */
-    protected abstract BulkStatusUpdater getBulkStatusUpdater();
-
-    /**
-     * Get work provider
-     *
-     * @param bulkOperation     bulk operation
-     * @param bulkStatusUpdater bulk status updater
-     * @param bulkProgress      bulk progress
-     * @return work provider
-     */
-    protected abstract BatchProcessWorkProvider<NodeRef> getWorkProvider(BulkOperation bulkOperation,
-        BulkStatusUpdater bulkStatusUpdater, BulkProgress bulkProgress);
-
-    /**
-     * Get worker provider
-     *
-     * @param nodeRef       node reference
-     * @param bulkOperation bulk operation
-     * @param bulkProgress  bulk progress
-     * @return worker provider
-     */
-    protected abstract BatchProcessWorker<NodeRef> getWorkerProvider(NodeRef nodeRef, BulkOperation bulkOperation,
-        BulkProgress bulkProgress);
-
-    /**
-     * Check permissions
-     *
-     * @param nodeRef       node reference
-     * @param bulkOperation bulk operation
-     */
-    protected abstract void checkPermissions(NodeRef nodeRef, BulkOperation bulkOperation);
-
-    protected ResultSet getTotalItems(Query searchQuery, int skipCount)
-    {
-        SearchParameters searchParams = new SearchParameters();
-        searchMapper.setDefaults(searchParams);
-        searchMapper.fromQuery(searchParams, searchQuery);
-        searchParams.setSkipCount(skipCount);
-        searchParams.setMaxItems(1);
-        searchParams.setLimit(1);
-        return searchService.query(searchParams);
-    }
-
-    public void setServiceRegistry(ServiceRegistry serviceRegistry)
-    {
-        this.serviceRegistry = serviceRegistry;
-    }
-
-    public void setSearchService(SearchService searchService)
-    {
-        this.searchService = searchService;
-    }
-
-    public void setTransactionService(TransactionService transactionService)
-    {
-        this.transactionService = transactionService;
-    }
-
-    public void setSearchMapper(SearchMapper searchMapper)
-    {
-        this.searchMapper = searchMapper;
-    }
-
-    public void setBulkMonitor(BulkMonitor<T> bulkMonitor)
-    {
-        this.bulkMonitor = bulkMonitor;
-    }
-
-    public void setThreadCount(int threadCount)
-    {
-        this.threadCount = threadCount;
-    }
-
-    public void setBatchSize(int batchSize)
-    {
-        this.batchSize = batchSize;
-    }
-
-    public void setMaxItems(int maxItems)
-    {
-        this.maxItems = maxItems;
-    }
-
-    public void setLoggingInterval(int loggingInterval)
-    {
-        this.loggingInterval = loggingInterval;
-    }
-
-    public void setItemsPerTransaction(int itemsPerTransaction)
-    {
-        this.itemsPerTransaction = itemsPerTransaction;
-    }
-
-    public void setMaxParallelRequests(int maxParallelRequests)
-    {
-        this.maxParallelRequests = maxParallelRequests;
-    }
-}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bulk/BulkCancellationRequest.java

@@ -1,34 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 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.module.org_alfresco_module_rm.bulk;
-
-/**
- * An immutable POJO to represent a bulk cancellation request
- */
-public record BulkCancellationRequest(String reason)
-{
-}