[maven-release-plugin] prepare release V3.3.0.2

[MNT-21935] Added cache to records management root, preventing the query from being executed multiple times

.gitignore

@@ -6,6 +6,7 @@
 .project
 .settings
 .history
+*.bak
 *.eml
 *.iml
 *.log*
@@ -16,6 +17,8 @@ build.local.properties
 dist
 explodedDeps
 local.properties
+rebel.xml
+rebel-remote.xml
 target
 test-output
 

.travis.settings.xml

@@ -0,0 +1,68 @@
+<settings>
+   <profiles>
+      <profile>
+         <id>alfresco-internal</id>
+         <activation>
+            <activeByDefault>true</activeByDefault>
+         </activation>
+         <repositories>
+            <repository>
+               <id>alfresco-internal</id>
+               <releases>
+                  <enabled>true</enabled>
+               </releases>
+               <snapshots>
+                  <enabled>true</enabled>
+               </snapshots>
+               <name>Alfresco Internal Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+            </repository>
+         </repositories>
+         <pluginRepositories>
+            <pluginRepository>
+               <id>alfresco-internal</id>
+               <name>Alfresco Internal Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+            </pluginRepository>
+            <pluginRepository>
+               <id>alfresco-public</id>
+               <name>Alfresco Public Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+            </pluginRepository>
+            <pluginRepository>
+               <id>alfresco-private</id>
+               <name>Alfresco Private Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+            </pluginRepository>
+         </pluginRepositories>
+      </profile>
+   </profiles>
+
+   <servers>
+      <server>
+         <id>docker.io</id>
+         <username>${env.DOCKERHUB_USERNAME}</username>
+         <password>${env.DOCKERHUB_PASSWORD}</password>
+      </server>
+      <server>
+         <id>quay.io</id>
+         <username>${env.QUAY_USERNAME}</username>
+         <password>${env.QUAY_PASSWORD}</password>
+      </server>
+      <server>
+         <id>alfresco-internal</id>
+         <username>${env.MAVEN_USERNAME}</username>
+         <password>${env.MAVEN_PASSWORD}</password>
+      </server>
+      <server>
+         <id>alfresco-private</id>
+         <username>${env.MAVEN_USERNAME}</username>
+         <password>${env.MAVEN_PASSWORD}</password>
+      </server>
+      <server>
+         <id>alfresco-internal-snapshots</id>
+         <username>${env.MAVEN_USERNAME}</username>
+         <password>${env.MAVEN_PASSWORD}</password>
+      </server>
+   </servers>
+</settings>

.travis.yml

@@ -1,6 +1,145 @@
+import:
+  - source: travis-env-vars.yml
+dist: xenial
+sudo: required
 language: java
 jdk:
-  - oraclejdk8
-sudo: false
-install: true
-script: travis_wait 30 mvn -B clean verify -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+  - openjdk11
+
+services:
+  - docker
+
+branches:
+  only:
+    - /release\/V3.\d+.*/
+    - /feature-3.\d+\/.*/
+    - /merge-3.\d+\/.*/
+    - /hotfix-3.\d+\/.*/
+
+cache:
+  directories:
+    - $HOME/.m2
+
+# the cache can grow constantly
+before_cache:
+  - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-governance-services*
+
+before_install:
+  - "cp .travis.settings.xml $HOME/.m2/settings.xml"
+install: skip
+
+stages:
+  - name: Build AGS
+  - name: Tests
+    if: commit_message !~ /\[skip tests\]/
+  - name: Security Scans
+  - name: Release
+  - name: Publish
+
+jobs:
+  include:
+    - name: "Build AGS Community"
+      stage: Build AGS
+      before_script: source scripts/setUpMavenPhase.sh
+      script:
+        - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Build AGS Enterprise"
+      stage: Build AGS
+      install:
+        - travis_retry travis_wait 30 mvn -B deploy -N
+        - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      before_script: source scripts/setUpMavenPhase.sh
+      script:
+        - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Build AGS Benchmark"
+      stage: Build AGS
+      install:
+        - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      before_script: source scripts/setUpMavenPhase.sh
+      script:
+        - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Community Integrations Tests on MySQL"
+      stage: Tests
+      script:
+        - echo "Community Integrations Tests on MySQL"
+    - name: "Enterprise Integrations Tests on MySQL"
+      stage: Tests
+      script:
+        - echo "Enterprise Integrations Tests on MySQL"
+    - name: "Community Rest API Tests"
+      stage: Tests
+      install:
+        - |
+          if [[ ${TRAVIS_BRANCH} == *community* ]]; then
+            travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am
+          else
+            travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am
+          fi
+        - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-community-rest-api -am
+      before_script:
+        - |
+          if [[ ${TRAVIS_BRANCH} == *community* ]]; then
+            bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH
+          else
+            bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH
+          fi
+        - bash scripts/waitForAlfrescoToStart.sh
+      script: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false
+      after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000
+    - name: "Enterprise Rest API Tests"
+      stage: Tests
+      install:
+        - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am
+        - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am
+      before_script:
+        - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH
+        - bash scripts/waitForAlfrescoToStart.sh
+        - bash scripts/dockerLimitMemory.sh
+        - sudo free -m -t
+      script:
+        - mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false
+      after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000
+    - name: "Community UI Tests ..."
+      stage: Tests
+      before_install:
+        - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am
+      install:
+        - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH
+        - bash scripts/waitForAlfrescoToStart.sh
+      script:
+        - echo "Community UI Tests ..."
+    - name: "Enterprise UI Tests ..."
+      stage: Tests
+      before_install:
+        - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am
+      install:
+        - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH
+        - bash scripts/waitForAlfrescoToStart.sh
+      script:
+        - echo "Enterprise UI Tests ..."
+
+    - name: "Source Clear Scan (SCA)"
+      stage: Security Scans
+      script:
+       - echo "Source Clear Scan (SCA)"
+    - name: "Static Analysis (SAST)"
+      stage: Security Scans
+      script:
+       - echo "Static Analysis (SAST)"
+
+    - name: "Community Release"
+      stage: Release
+      script:
+        - echo "Community Release"
+    - name: "Enterprise Release"
+      stage: Release
+      script:
+        - echo "Enterprise Release"
+
+    - name: "Copy to S3 Release Bucket"
+      stage: Publish
+      script:
+        - echo "Copy to S3 Release Bucket"

CONTRIBUTING.md

@@ -4,20 +4,19 @@ For the details on the Records Management project see [here](https://community.a
 ## Getting started
 What you need to get started:
 
-* A [Jira](https://issues.alfresco.com/jira/projects/ALF/issues/?filter=allopenissues) account;
-
 * A [GitHub](https://github.com/) account.
 
 Useful but not necessary:
 
 * An [Alfresco community](https://community.alfresco.com/) account - this is a good place to ask questions and find answers. 
 
+* A [Jira](https://issues.alfresco.com/jira/projects/RM/issues/?filter=allopenissues) account - Good place to look at what the team is working on;
+
 ## Making changes
 
-We use Jira to track issues. If you are committing a fix for a raised issue please include the ticket number in both the merge requests and the git commit messages.
-For example a fix for the ticket [ALF-21953](https://issues.alfresco.com/jira/browse/ALF-21953) might have the git commit message: "ALF-21953 Updated to use super pom v9".
+We use GitHub's issues to track community contributions and issues. If you are committing a fix for a raised issue please reference the issue number in the pull request.
 
-If you are adding in a new feature or bug fix please do so [here](https://issues.alfresco.com/jira/projects/ALF/issues/?filter=allopenissues). By raising a ticket in this project you will be agreeing to the Alfresco Contribution Agreement which can be found at the bottom of the 'Create Issue' form or alternatively attached to [this](https://community.alfresco.com/docs/DOC-7070-alfresco-contribution-agreement) page.
+If you are adding in a new feature or bug fix please raise an issue in the issues tab. By raising an issue in this project you will be agreeing to the Alfresco Contribution Agreement which can be found [here](https://community.alfresco.com/docs/DOC-7070-alfresco-contribution-agreement).
 
 When you are ready to make a change you just need to fork the [records-management](https://github.com/Alfresco/records-management) repository and then make your changes into your copy of the code.
 
@@ -55,8 +54,6 @@ Occasionally we may have to revert a change after it has been accepted. This wil
 
 [IDE settings for Eclipse and Intellij](https://github.com/Alfresco/records-management/tree/master/ide-config)
 
-[Jira project for raising issues/features](https://issues.alfresco.com/jira/projects/ALF/issues/?filter=allopenissues)
-
 [Jira project used by GS team](https://issues.alfresco.com/jira/projects/RM/issues)
 
 [Records Management project details](https://community.alfresco.com/docs/DOC-6387-project-overview-records-management)

README.md

@@ -138,3 +138,42 @@ Unzip it and change to the "solr" folder within it. Start the Solr server using
 solr start -a "-Dcreate.alfresco.defaults=alfresco,archive"
 ```
 Start your repository
+
+## Build Docker images for RM Repo and Share
+A first step is checking that you have installed a working version of Docker that can be downloaded from here:
+[https://docs.docker.com/install/]
+
+The second step, in case you already have Docker installed, the current running images must be checked in order to be sure that they are not occupying any of the ports that
+ACS and Share use.
+
+To kill and clean all the images and containers the following command can be used:
+
+```
+docker system prune --volumes
+```
+ > Note that this will also remove all the stopped containers, containers, networks, volumes and build cache.
+
+Depending on which version of AGS you want to start, Community or Enterprise, **you must first build the docker images**.
+From the root folder of the project you can create both the Repo and the Share images for Community and Enterprise.
+To build all the images use the following command:
+```
+mvn install -PbuildDockerImage
+```
+If only the Community or Enterprise images need to be built than the same command as above must be run either in the rm-community or rm-enterprise modules.
+
+## Start the Docker images
+
+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
+```
+> Be aware of the fact that the Share images can not be started independently from Repo
+
+e.g. In order to start an instance of rm-enterprise-repo and rm-enterprise-share, the above command must be run in rm-enterprise-share after the images have been built.
+
+## Start the Docker images with jRebel in remote server mode
+
+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
+```

rm-automation/pom.xml

@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-automation</artifactId>
-   <name>Alfresco Records Management Automation</name>
+   <artifactId>alfresco-governance-services-automation</artifactId>
+   <name>Alfresco Governance Services Automation</name>
    <packaging>pom</packaging>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm</artifactId>
-      <version>2.7.0.1</version>
+      <artifactId>alfresco-governance-services</artifactId>
+      <version>3.3.0.2</version>
    </parent>
 
    <licenses>
@@ -24,8 +24,6 @@
    </modules>
 
    <properties>
-      <maven.compiler.source>1.8</maven.compiler.source>
-      <maven.compiler.target>1.8</maven.compiler.target>
       <suiteXmlFile>testng.xml</suiteXmlFile>
       <skip.automationtests>true</skip.automationtests>
    </properties>
@@ -88,251 +86,4 @@
          </plugins>
       </pluginManagement>
    </build>
-
-   <profiles>
-      <profile>
-         <id>install-alfresco</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <artifactId>maven-antrun-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>fetch-installer</id>
-                        <phase>generate-test-resources</phase>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                        <configuration>
-                           <target>
-                              <echo>Recreating database...</echo>
-                              <sql driver="org.postgresql.Driver" url="jdbc:postgresql:template1" userid="alfresco" password="alfresco" autocommit="true">drop database if exists alfresco; create database alfresco</sql>
-                              <echo>Downloading Alfresco installer...</echo>
-                              <get src="${installer.url}" dest="target/alf-installer.bin" />
-                              <chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
-                              <echo>Installing Alfresco...</echo>
-                              <exec executable="${basedir}/target/alf-installer.bin" dir="target" failonerror="true">
-                                 <arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation" />
-                              </exec>
-                              <delete file="target/alf-installer.bin" verbose="true" />
-                           </target>
-                        </configuration>
-                     </execution>
-                  </executions>
-                  <dependencies>
-                     <dependency>
-                        <groupId>postgresql</groupId>
-                        <artifactId>postgresql</artifactId>
-                        <version>9.1-901-1.jdbc4</version>
-                     </dependency>
-                  </dependencies>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>apply-rm-community</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>fetch-amps</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                           <artifactItems>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-share</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-repo</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
-                           </artifactItems>
-                           <outputDirectory>${project.build.directory}/amps</outputDirectory>
-                           <useBaseVersion>true</useBaseVersion>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.alfresco.maven.plugin</groupId>
-                  <artifactId>alfresco-maven-plugin</artifactId>
-                  <extensions>true</extensions>
-                  <executions>
-                     <execution>
-                        <id>install-community-repo-amp</id>
-                        <goals>
-                           <goal>install</goal>
-                        </goals>
-                        <phase>process-test-resources</phase>
-                        <configuration>
-                           <backup>true</backup>
-                           <ampLocation>
-                              ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp
-                           </ampLocation>
-                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war
-                           </warLocation>
-                        </configuration>
-                     </execution>
-                     <execution>
-                        <id>install-community-share-amp</id>
-                        <goals>
-                           <goal>install</goal>
-                        </goals>
-                        <phase>process-test-resources</phase>
-                        <configuration>
-                           <backup>true</backup>
-                           <ampLocation>
-                              ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp
-                           </ampLocation>
-                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war
-                           </warLocation>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>apply-rm-enterprise</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>fetch-amps</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                           <artifactItems>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>${alfresco.rm.share}</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>${alfresco.rm.repo}</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
-                           </artifactItems>
-                           <outputDirectory>${project.build.directory}/amps</outputDirectory>
-                           <useBaseVersion>true</useBaseVersion>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.alfresco.maven.plugin</groupId>
-                  <artifactId>alfresco-maven-plugin</artifactId>
-                  <extensions>true</extensions>
-                  <executions>
-                     <execution>
-                        <id>install-enterprise-repo-amp</id>
-                        <goals>
-                           <goal>install</goal>
-                        </goals>
-                        <phase>process-test-resources</phase>
-                        <configuration>
-                           <backup>true</backup>
-                           <ampLocation>${project.build.directory}/amps/${alfresco.rm.repo}-${project.version}.amp</ampLocation>
-                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
-                        </configuration>
-                     </execution>
-                     <execution>
-                        <id>install-enterprise-share-amp</id>
-                        <goals>
-                           <goal>install</goal>
-                        </goals>
-                        <phase>process-test-resources</phase>
-                        <configuration>
-                           <backup>true</backup>
-                           <ampLocation>${project.build.directory}/amps/${alfresco.rm.share}-${project.version}.amp</ampLocation>
-                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>run-alfresco</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.jacoco</groupId>
-                  <artifactId>jacoco-maven-plugin</artifactId>
-                  <version>0.7.5.201505241946</version>
-                  <executions>
-                     <execution>
-                        <id>prepare-jacoco</id>
-                        <goals>
-                           <goal>prepare-agent</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-                  <configuration>
-                     <includes>
-                        <include>org.alfresco.*</include>
-                     </includes>
-                  </configuration>
-               </plugin>
-               <plugin>
-                  <artifactId>maven-antrun-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>start-alfresco</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                        <configuration>
-                           <target>
-                              <echo>Starting Alfresco...</echo>
-                              <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
-                                 <arg value="start" />
-                                 <env key="CATALINA_OPTS" value="${argLine}" />
-                              </exec>
-                              <sleep minutes="5" />
-                           </target>
-                        </configuration>
-                     </execution>
-                     <execution>
-                        <id>stop-alfresco</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                        <configuration>
-                           <target>
-                              <echo>Stopping Alfresco...</echo>
-                              <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
-                                 <arg value="stop" />
-                              </exec>
-                           </target>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
 </project>

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

@@ -2,21 +2,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-automation-community-rest-api</artifactId>
-   <name>Alfresco Records Management Automation Community REST API</name>
+   <artifactId>alfresco-governance-services-automation-community-rest-api</artifactId>
+   <name>Alfresco Governance Services Automation Community REST API</name>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm-automation</artifactId>
-      <version>2.7.0.1</version>
+      <artifactId>alfresco-governance-services-automation</artifactId>
+      <version>3.3.0.2</version>
    </parent>
 
    <properties>
-      <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
-      <alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
-      <alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
-      <tas.restapi.version>5.2.0-10</tas.restapi.version>
+      <maven.javadoc.skip>false</maven.javadoc.skip>
+      <ags.share>alfresco-governance-services-community-share</ags.share>
+      <ags.repo>alfresco-governance-services-community-repo</ags.repo>
+      <tas.restapi.version>6.0.1.2</tas.restapi.version>
       <fluent.json.version>2.0.0</fluent.json.version>
+      <jackson.databind.version>2.7.7</jackson.databind.version>
    </properties>
 
    <build>
@@ -45,21 +46,39 @@
    </build>
 
    <dependencies>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+         <version>1.7.26</version>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>
          <version>${tas.restapi.version}</version>
+         <exclusions>
+              <exclusion>
+                  <groupId>com.fasterxml.jackson.core</groupId>
+                  <artifactId>jackson-databind</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>
          <version>${tas.restapi.version}</version>
          <type>test-jar</type>
+         <exclusions>
+              <exclusion>
+                  <groupId>com.fasterxml.jackson.core</groupId>
+                  <artifactId>jackson-databind</artifactId>
+              </exclusion>
+          </exclusions>         
       </dependency>
       <dependency>
          <groupId>org.projectlombok</groupId>
          <artifactId>lombok</artifactId>
-         <version>1.16.10</version>
+         <version>1.18.6</version>
          <scope>provided</scope>
       </dependency>
       <!-- FIXME: Remove this dependency once RMUserAPI.java has been refactored -->
@@ -73,5 +92,20 @@
          <artifactId>alfresco-testng</artifactId>
          <version>1.1</version>
       </dependency>
+      <dependency>
+         <groupId>org.apache.commons</groupId>
+         <artifactId>commons-collections4</artifactId>
+         <version>4.1</version>
+      </dependency>
+      <dependency>
+         <groupId>com.github.docker-java</groupId>
+         <artifactId>docker-java</artifactId>
+         <version>3.0.14</version>
+      </dependency>
+       <dependency>
+           <groupId>com.fasterxml.jackson.core</groupId>
+           <artifactId>jackson-databind</artifactId>
+            <version>${jackson.databind.version}</version>
+       </dependency>
    </dependencies>
 </project>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -56,4 +56,7 @@ public class RMRestProperties extends RestProperties
 
     @Value ("${rest.rmPath}")
     private String restRmPath;
+
+    @Value ("${docker.host}")
+    private String dockerHost;
 }

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestWrapper.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,7 +26,7 @@
  */
 package org.alfresco.rest.core;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.RequestSpecBuilder;
 
 import org.alfresco.rest.exception.EmptyJsonResponseException;
 import org.alfresco.rest.model.RestErrorModel;

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -34,6 +34,7 @@ import org.alfresco.rest.requests.Node;
 import org.alfresco.rest.requests.coreAPI.RestCoreAPI;
 import org.alfresco.rest.requests.search.SearchAPI;
 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.RMSiteAPI;
@@ -92,14 +93,28 @@ public class RestAPIFactory
         return getRmRestWrapper().withSearchAPI();
     }   
 
-    public Node getNodeAPI(RepoTestModel model) throws Exception
+    public Node getNodeAPI(RepoTestModel model) throws RuntimeException
     {
-        return getCoreAPI(null).usingNode(model);
+        try
+        {
+            return getCoreAPI(null).usingNode(model);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to load nodeAPI.", e);
+        }
     }
 
-    public Node getNodeAPI(UserModel userModel, RepoTestModel model) throws Exception
+    public Node getNodeAPI(UserModel userModel, RepoTestModel model) throws RuntimeException
     {
-        return getCoreAPI(userModel).usingNode(model);
+        try
+        {
+            return getCoreAPI(userModel).usingNode(model);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to load nodeAPI.", e);
+        }
     }
 
     public RMSiteAPI getRMSiteAPI()
@@ -211,4 +226,14 @@ public class RestAPIFactory
     {
         return getGSCoreAPI(userModel).usingUnfiledRecordFolder();
     }
+
+    public ActionsExecutionAPI getActionsAPI(UserModel userModel)
+    {
+        return getGSCoreAPI(userModel).usingActionsExecutionsAPI();
+    }
+
+    public ActionsExecutionAPI getActionsAPI()
+    {
+        return getGSCoreAPI(null).usingActionsExecutionsAPI();
+    }
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,10 +26,18 @@
  */
 package org.alfresco.rest.core.v0;
 
+import javax.json.Json;
+import javax.json.JsonReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
+import org.apache.http.ParseException;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +52,10 @@ public class APIUtils
 {
     /** Logger for this class. */
     private static final Logger LOGGER = LoggerFactory.getLogger(APIUtils.class);
+    /** The ISO instant formatter that formats or parses an instant in UTC, such as '2011-12-03T10:15:305Z'
+     * similar with {@link DateTimeFormatter#ISO_INSTANT}, but with only 3 nanoseconds*/
+    public static final DateTimeFormatter ISO_INSTANT_FORMATTER =
+            new DateTimeFormatterBuilder().appendInstant(3).toFormatter();
 
     /** Private constructor for helper class. */
     private APIUtils()
@@ -70,4 +82,40 @@ public class APIUtils
         LOGGER.info("Response body:\n{}", source);
         return new JSONObject(source);
     }
+
+    /**
+     * Util method to extract the message string from the HTTP response
+     *
+     * @param httpResponse http response
+     * @return error message from the http response
+     */
+    public static String extractErrorMessageFromHttpResponse(HttpResponse httpResponse)
+    {
+        final HttpEntity entity = httpResponse.getEntity();
+        JsonReader reader = null;
+        try
+        {
+            final InputStream responseStream = entity.getContent();
+            reader = Json.createReader(responseStream);
+            return reader.readObject().getString("message");
+        }
+        catch (JSONException error)
+        {
+
+            LOGGER.error("Converting message body to JSON failed. Body: {}", httpResponse, error);
+        }
+        catch (ParseException | IOException error)
+        {
+
+            LOGGER.error("Parsing message body failed.", error);
+        }
+        finally
+        {
+            if (reader != null)
+            {
+                reader.close();
+            }
+        }
+        return null;
+    }
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -81,7 +81,7 @@ public abstract class BaseAPI
     protected static final String UPDATE_METADATA_API = "{0}node/{1}/formprocessor";
     protected static final String ACTIONS_API = "{0}actionQueue";
     protected static final String RM_ACTIONS_API = "{0}rma/actions/ExecutionQueue";
-    protected static final String RM_SITE_ID = "rm";
+    public static final String RM_SITE_ID = "rm";
     protected static final String SHARE_ACTION_API = "{0}internal/shared/share/workspace/SpacesStore/{1}";
     private static final String SLINGSHOT_PREFIX = "alfresco/s/slingshot/";
 
@@ -89,7 +89,7 @@ public abstract class BaseAPI
     private AlfrescoHttpClientFactory alfrescoHttpClientFactory;
 
     @Autowired
-    private ContentService contentService;
+    protected ContentService contentService;
 
     public static final String NODE_REF_WORKSPACE_SPACES_STORE = "workspace://SpacesStore/";
     private static final String FILE_PLAN_PATH = "/Sites/rm/documentLibrary";
@@ -103,7 +103,7 @@ public abstract class BaseAPI
      */
     protected List<String> getPropertyValues(JSONObject result, String propertyName)
     {
-        ArrayList<String> results = new ArrayList<String>();
+        ArrayList<String> results = new ArrayList<>();
         try
         {
             JSONArray items = result.getJSONArray("items");
@@ -541,7 +541,6 @@ public abstract class BaseAPI
         AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
         T request = requestType.newInstance();
 
-        HttpResponse response = null;
         JSONObject responseBody = null;
         JSONObject returnValues = null;
 
@@ -555,7 +554,7 @@ public abstract class BaseAPI
             }
             LOGGER.info("Sending {} request to {}", requestType.getSimpleName(), requestUrl);
             LOGGER.info("Request body: {}", requestParams);
-            response = client.execute(adminUser, adminPassword, request);
+            HttpResponse response = client.execute(adminUser, adminPassword, request);
             LOGGER.info("Response: {}", response.getStatusLine());
 
             try
@@ -587,13 +586,13 @@ public abstract class BaseAPI
                 case HttpStatus.SC_UNPROCESSABLE_ENTITY:
                     if (responseBody != null  && responseBody.has(EXCEPTION_KEY))
                     {
-                        LOGGER.error("Request failed: " + responseBody.getString(EXCEPTION_KEY));
+                        LOGGER.error("Request failed: {}", responseBody.getString(EXCEPTION_KEY));
                         returnValues = responseBody;
                     }
                     break;
 
                 default:
-                    LOGGER.error("Request returned unexpected HTTP status " + response.getStatusLine().getStatusCode());
+                    LOGGER.error("Request returned unexpected HTTP status {}", response.getStatusLine().getStatusCode());
                     break;
             }
         }
@@ -702,6 +701,7 @@ public abstract class BaseAPI
     public enum RM_ACTIONS
     {
         EDIT_DISPOSITION_DATE("editDispositionActionAsOfDate"),
+        END_RETENTION("retain"),
         CUT_OFF("cutoff"),
         UNDO_CUT_OFF("undoCutoff"),
         TRANSFER("transfer"),

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/RMEvents.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEntry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEvents.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -41,7 +41,11 @@ public enum AuditEvents
     DELETE_USER_GROUP("Delete User Group", "Delete User Group"),
     ADD_TO_USER_GROUP("Add To User Group", "Add To User Group"),
     REMOVE_FROM_USER_GROUP("Remove From User Group", "Remove From User Group"),
-    LOGIN_UNSUCCESSFUL("Login.Failure", "Login Unsuccessful");
+    LOGIN_UNSUCCESSFUL("Login.Failure", "Login Unsuccessful"),
+    CREATE_HOLD("Create Hold", "Create Hold"),
+    DELETE_HOLD("Delete Hold", "Delete Hold"),
+    ADD_TO_HOLD("Add To Hold", "Add To Hold"),
+    REMOVE_FROM_HOLD("Remove From Hold", "Remove From Hold");
 
     /** event audited */
     public final String event;
@@ -54,4 +58,4 @@ public enum AuditEvents
         this.event = event;
         this.eventDisplayName = displayName;
     }
-}
+}

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/IdNamePair.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,6 +26,8 @@
  */
 package org.alfresco.rest.rm.community.model.common;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.AllArgsConstructor;
@@ -50,4 +52,10 @@ public class IdNamePair
 
     @JsonProperty (required = true)
     private String name;
+
+    @JsonProperty (required = true)
+    private List<String> aspectNames;
+
+    @JsonProperty (required = true)
+    private String nodeType;
 }

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Owner.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Path.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/ReviewPeriod.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/custom/CustomDefinitions.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlan.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlanProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAlias.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -34,6 +34,23 @@ package org.alfresco.rest.rm.community.model.fileplancomponents;
  */
 public class FilePlanComponentAspects
 {
+    /** Private constructor to prevent instantiation. */
+    private FilePlanComponentAspects()
+    {
+    }
+
     // aspect present on completed records
     public static final String ASPECTS_COMPLETED_RECORD = "rma:declaredRecord";
+    
+	// aspect present on record folders/categories with vital records
+    public static final String ASPECTS_VITAL_RECORD_DEFINITION= "rma:vitalRecordDefinition";
+    
+	// aspect present on vital records
+    public static final String ASPECTS_VITAL_RECORD = "rma:vitalRecord";
+
+    // Frozen aspect
+    public static final String FROZEN_ASPECT = "rma:frozen";
+
+    // recordSearch aspect
+    public static final String RECORD_SEARCH_ASPECT = "rma:recordSearch";
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -82,6 +82,7 @@ public class FilePlanComponentFields
     public static final String PROPERTIES_CLASSIFICATION = "sc:classification";
     public static final String PROPERTIES_DATE_FILED = "rma:dateFiled";
     public static final String PROPERTIES_ORIGINAL_NAME = "rma:origionalName";
+    public static final String PROPERTIES_REVIEW_AS_OF = "rma:reviewAsOf";
 
     /** Electronic record properties */
     public static final String PROPERTIES_VERSION_TYPE = "cm:versionType";

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentType.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -0,0 +1,56 @@
+/*-
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * 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.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;
+}

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/Record.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -109,7 +109,7 @@ public class Record extends TestModel implements IRestModel<RestNodeModel>
     @Override
     public ModelAssertion<RestNodeModel> assertThat()
     {
-        return new ModelAssertion<RestNodeModel>(this);
+        return new ModelAssertion<>(this);
     }
 
     @Override

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordBodyFile.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordContent.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -52,8 +52,19 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_ORIGINATING_CREATION_DATE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_ORIGINATING_LOCATION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_ORIGINATING_USER_ID;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RESOLUTION_UNIT;
+
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_REVIEW_AS_OF;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_SHELF;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_SOFTWARE;
@@ -64,19 +75,19 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_X_RESOLUTION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_Y_RESOLUTION;
 
+import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.alfresco.rest.rm.community.model.common.Owner;
-import org.alfresco.utility.model.TestModel;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.alfresco.rest.rm.community.model.common.Owner;
+import org.alfresco.utility.model.TestModel;
 
 /**
  * POJO for record properties
@@ -208,4 +219,34 @@ public class RecordProperties extends TestModel
 
     @JsonProperty(PROPERTIES_AUTHOR)
     private String author;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION)
+    private String recordSearchDispositionPeriodExpression;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
+    private String recordSearchDispositionAuthority;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF)
+    private Date recordSearchDispositionActionAsOf;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD)
+    private String recordSearchDispositionPeriod;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME)
+    private String recordSearchDispositionActionName;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE)
+    private Boolean recordSearchDispositionEventsEligible;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
+    private String recordSearchDispositionInstructions;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD)
+    private String recordSearchVitalRecordReviewPeriod;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION)
+    private String recordSearchVitalRecordReviewPeriodExpression;
+
+    @JsonProperty(PROPERTIES_REVIEW_AS_OF)
+    private Date reviewAsOf;
 }

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategory.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -53,7 +53,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class RecordCategory extends TestModel
 {
-    public final static String DEFAULT_FILE_PLAN_ALIAS = "-filePlan-";
+    public static final String DEFAULT_FILE_PLAN_ALIAS = "-filePlan-";
 
     /*************************/
     /** Mandatory parameters */

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChild.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -53,7 +53,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class RecordCategoryChild extends TestModel
 {
-    public final static String RECORD_FOLDER_NODE_TYPE = "rma:recordFolder";
+    public static final String RECORD_FOLDER_NODE_TYPE = "rma:recordFolder";
 
     /*************************/
     /** Mandatory parameters */

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildCollection.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildEntry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryCollection.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryEntry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolder.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderCollection.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderEntry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -33,6 +33,10 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_IS_CLOSED;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_LOCATION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_OWNER;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields
+        .PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields
+        .PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION;
@@ -120,4 +124,11 @@ public class RecordFolderProperties extends TestModel
 
     @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION)
     private String recordSearchVitalRecordReviewPeriodExpression;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
+    private String recordSearchDispositionAuthority;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
+    private String recordSearchDispositionInstructions;
+
 }

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/ActionsOnRule.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/ConditionsOnRule.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/RuleDefinition.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -45,7 +45,7 @@ public class RuleDefinition
     private String contentTitle;
     private String contentDescription;
     private String rejectReason;
-    private List<ActionsOnRule> actions;
+    private List<String> actions;
 
     /**
      * Creates a new object of type Rule Definition
@@ -189,15 +189,15 @@ public class RuleDefinition
         return this;
     }
 
-
-    public List<ActionsOnRule> getActions()
+    public List<String> getActions()
     {
         return actions;
     }
 
-    public RuleDefinition actions(List<ActionsOnRule> actions)
+    public RuleDefinition actions(List<String> actions)
     {
         this.actions = actions;
         return this;
     }
 }
+

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSiteCompliance.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSiteFields.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/Transfer.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChild.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildCollection.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildEntry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferCollection.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferEntry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfercontainer/TransferContainer.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfercontainer/TransferContainerProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainer.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChild.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildCollection.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildEntry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerProperties.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -29,6 +29,7 @@ package org.alfresco.rest.rm.community.model.unfiledcontainer;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_IDENTIFIER;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.alfresco.utility.model.TestModel;
@@ -50,6 +51,7 @@ import lombok.NoArgsConstructor;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class UnfiledContainerProperties extends TestModel
 {
     /*************************/

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledRecordFolder.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserCapabilities.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserPermissions.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -32,9 +32,16 @@ package org.alfresco.rest.rm.community.model.user;
  * @author Kristijan Conkas
  * @since 2.6
  */
-public class UserPermissions
+public enum UserPermissions
 {
-    public static final String PERMISSION_FILING = "Filing";
-    public static final String PERMISSION_READ_RECORDS = "ReadRecords";
-    public static final String PERMISSION_FILE_RECORDS = "FileRecords";
+    PERMISSION_FILING("Filing"),
+    PERMISSION_READ_RECORDS("ReadRecords"),
+    PERMISSION_FILE_RECORDS("FileRecords");
+
+    public final String permissionId;
+
+    UserPermissions(String permissionId)
+    {
+        this.permissionId = permissionId;
+    }
 }

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserRoles.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/RMModelRequest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -41,14 +41,14 @@ import lombok.Setter;
  * @author Tuna Aksoy
  * @since 2.6
  */
-public abstract class RMModelRequest extends ModelRequest<RMModelRequest>
+public abstract class RMModelRequest<Request> extends ModelRequest<Request>
 {
     @Getter (value = PROTECTED)
     @Setter (value = PRIVATE)
     private RMRestWrapper rmRestWrapper;
 
     /**
-     * @param restWrapper
+     * @param rmRestWrapper
      */
     public RMModelRequest(RMRestWrapper rmRestWrapper)
     {

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -29,10 +29,11 @@ package org.alfresco.rest.rm.community.requests.gscore;
 import static java.lang.Integer.parseInt;
 import static java.lang.String.format;
 
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
 
 import org.alfresco.rest.core.RMRestProperties;
 import org.alfresco.rest.core.RMRestWrapper;
+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;
@@ -113,7 +114,7 @@ public class GSCoreAPI extends RMModelRequest
     /**
      * Provides DSL on all REST calls under <code>records/...</code> API path
      *
-     * @return {@link FilePlanComponentAPI}
+     * @return {@link RecordsAPI}
      */
     public RecordsAPI usingRecords()
     {
@@ -179,4 +180,14 @@ public class GSCoreAPI extends RMModelRequest
     {
         return new RMUserAPI(getRmRestWrapper());
     }
+
+    /**
+     * Provides DSL for ActionExecution API
+     *
+     * @return {@link ActionsExecutionAPI}
+     */
+    public ActionsExecutionAPI usingActionsExecutionsAPI()
+    {
+        return new ActionsExecutionAPI(getRmRestWrapper());
+    }
 }

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/ActionsExecutionAPI.java

@@ -0,0 +1,78 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * 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 com.google.common.collect.ImmutableMap;
+
+import org.alfresco.rest.core.RMRestWrapper;
+import org.alfresco.rest.rm.community.model.rules.ActionsOnRule;
+import org.alfresco.rest.rm.community.requests.RMModelRequest;
+import org.alfresco.utility.model.RepoTestModel;
+import org.json.JSONObject;
+
+/**
+ * Produces processed results from Core Actions API calls
+ *
+ * @author Claudia Agache
+ * @since 3.1
+ */
+public class ActionsExecutionAPI extends RMModelRequest
+{
+    /**
+     * @param rmRestWrapper RM REST Wrapper
+     */
+    public ActionsExecutionAPI(RMRestWrapper rmRestWrapper)
+    {
+        super(rmRestWrapper);
+    }
+
+    /**
+     * Declares and files a document as record to a record folder using v1 actions api
+     *
+     * @param targetNode      the node on which the action is executed
+     * @param destinationPath the path to the record folder
+     * @throws Exception
+     */
+    public JSONObject declareAndFile(RepoTestModel targetNode, String destinationPath) throws Exception
+    {
+        return getRmRestWrapper().withCoreAPI().usingActions()
+                                 .executeAction(ActionsOnRule.DECLARE_AS_RECORD.getActionValue(), targetNode,
+                                         ImmutableMap.of("path", destinationPath));
+    }
+
+    /**
+     * Declares a document as record using v1 actions api
+     *
+     * @param targetNode the node on which the action is executed
+     * @throws Exception
+     */
+    public JSONObject declareAsRecord(RepoTestModel targetNode) throws Exception
+    {
+        return getRmRestWrapper().withCoreAPI().usingActions()
+                                 .executeAction(ActionsOnRule.DECLARE_AS_RECORD.getActionValue(), targetNode);
+    }
+}

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -54,7 +54,7 @@ public class FilePlanAPI extends RMModelRequest
     /**
      * Constructor.
      *
-     * @param restWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public FilePlanAPI(RMRestWrapper rmRestWrapper)
     {
@@ -77,7 +77,7 @@ public class FilePlanAPI extends RMModelRequest
      * @param filePlanId The identifier of a file plan
      * @param parameters The URL parameters to add
      * @return The {@link FilePlan} for the given {@code filePlanId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code filePlanId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -113,7 +113,7 @@ public class FilePlanAPI extends RMModelRequest
      * @param filePlanId The identifier of a file plan
      * @param parameters The URL parameters to add
      * @return The {@link RecordCategoryCollection} for the given {@code filePlanId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code filePlanId}</li>
@@ -135,7 +135,7 @@ public class FilePlanAPI extends RMModelRequest
     /**
      * see {@link #createRootRecordCategory(RecordCategory, String, String)}
      */
-    public RecordCategory createRootRecordCategory(RecordCategory recordCategoryModel, String filePlanId) throws Exception
+    public RecordCategory createRootRecordCategory(RecordCategory recordCategoryModel, String filePlanId)
     {
         mandatoryObject("recordCategoryModel", recordCategoryModel);
         mandatoryString("filePlanId", filePlanId);
@@ -150,7 +150,7 @@ public class FilePlanAPI extends RMModelRequest
      * @param filePlanId The identifier of a file plan
      * @param parameters The URL parameters to add
      * @return The created {@link RecordCategory}
-     * @throws Exception for the following cases:
+     * @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>
@@ -160,7 +160,7 @@ public class FilePlanAPI extends RMModelRequest
      *  <li>model integrity exception, including node name with invalid characters</li>
      * </ul>
      */
-    public RecordCategory createRootRecordCategory(RecordCategory recordCategoryModel, String filePlanId, String parameters) throws Exception
+    public RecordCategory createRootRecordCategory(RecordCategory recordCategoryModel, String filePlanId, String parameters)
     {
         mandatoryObject("recordCategoryModel", recordCategoryModel);
         mandatoryString("filePlanId", filePlanId);
@@ -177,7 +177,7 @@ public class FilePlanAPI extends RMModelRequest
     /**
      * see {@link #updateFilePlan(FilePlan, String, String)
      */
-    public FilePlan updateFilePlan(FilePlan filePlanModel, String filePlanId) throws Exception
+    public FilePlan updateFilePlan(FilePlan filePlanModel, String filePlanId)
     {
         mandatoryObject("filePlanModel", filePlanModel);
         mandatoryString("filePlanId", filePlanId);
@@ -191,7 +191,7 @@ public class FilePlanAPI extends RMModelRequest
      * @param filePlanModel The file plan  model which holds the information
      * @param filePlanId    The identifier of the file plan
      * @param parameters          The URL parameters to add
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      *                   <ul>
      *                   <li>the update request is invalid or {@code filePlanId} is not a valid format or {@code filePlanModel} is invalid</li>
      *                   <li>authentication fails</li>
@@ -200,7 +200,7 @@ public class FilePlanAPI extends RMModelRequest
      *                   <li>model integrity exception, including file name with invalid characters</li>
      *                   </ul>
      */
-    public FilePlan updateFilePlan(FilePlan filePlanModel, String filePlanId, String parameters) throws Exception
+    public FilePlan updateFilePlan(FilePlan filePlanModel, String filePlanId, String parameters)
     {
         mandatoryObject("filePlanModel", filePlanModel);
         mandatoryString("filePlanId", filePlanId);

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/FilesAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -28,7 +28,6 @@ package org.alfresco.rest.rm.community.requests.gscore.api;
 
 import static org.alfresco.rest.core.RestRequest.simpleRequest;
 import static org.alfresco.rest.rm.community.util.ParameterCheck.mandatoryString;
-import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.springframework.http.HttpMethod.POST;
 
 import org.alfresco.rest.core.RMRestWrapper;
@@ -41,10 +40,12 @@ import org.alfresco.rest.rm.community.requests.RMModelRequest;
  * @author Kristijan Conkas
  * @since 2.6
  */
-public class FilesAPI extends RMModelRequest
+public class FilesAPI extends RMModelRequest<FilesAPI>
 {
+    public static final String PARENT_ID_PARAM = "parentId";
+
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public FilesAPI(RMRestWrapper rmRestWrapper)
     {
@@ -55,11 +56,10 @@ public class FilesAPI extends RMModelRequest
      * Declare file as record
      *
      * @param fileId The Id of a file to declare as record
-     * @param parameters Request parameters, refer to API documentation for more details
      * @return The {@link Record} for created record
-     * @throws Exception for malformed JSON responses
+     * @throws RuntimeException for malformed JSON responses
      */
-    public Record declareAsRecord(String fileId, String parameters) throws Exception
+    public Record declareAsRecord(String fileId)
     {
         mandatoryString("fileId", fileId);
 
@@ -67,22 +67,8 @@ public class FilesAPI extends RMModelRequest
             POST,
             "/files/{fileId}/declare?{parameters}",
             fileId,
-            parameters
+            getRmRestWrapper().getParameters()
         ));
     }
-
-    /**
-     * A no-parameter version of {@link FilesAPI#declareAsRecord}
-     *
-     * @param fileId The Id of a file to declare as record
-     * @return The {@link Record} for created record
-     * @throws Exception for malformed JSON responses
-     */
-    public Record declareAsRecord(String fileId) throws Exception
-    {
-        mandatoryString("fileId", fileId);
-
-        return declareAsRecord(fileId, EMPTY);
-    }
 }
 

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMSiteAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -62,7 +62,7 @@ public class RMSiteAPI extends RMModelRequest
      * Get the RM site
      *
      * @return The {@link RMSite} for the given file plan component id
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 Invalid parameter: GET request is supported only for the RM site</li>
      *  <li>Api Response code 401 If authentication failed</li>
@@ -70,7 +70,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error</li>
      * </ul>
      */
-    public RMSite getSite() throws Exception
+    public RMSite getSite()
     {
         return getRmRestWrapper().processModel(RMSite.class, simpleRequest(
                 GET,
@@ -83,7 +83,7 @@ public class RMSiteAPI extends RMModelRequest
      *
      * @param rmSite The properties of the rm site to be created
      * @return The {@link RMSite} with the given properties
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 Invalid parameter: title, or description exceed the maximum length; or siteBodyCreate invalid</li>
      *  <li>Api Response code 401 If authentication failed</
@@ -91,7 +91,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error</li>
      * </ul>
      */
-    public RMSite createRMSite(RMSite rmSiteModel) throws Exception
+    public RMSite createRMSite(RMSite rmSiteModel)
     {
         mandatoryObject("rmSiteModel", rmSiteModel);
 
@@ -104,7 +104,7 @@ public class RMSiteAPI extends RMModelRequest
 
     /**
      * Delete RM site
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 Invalid parameter: DELETE request is supported only for the RM site</li>
      *  <li>Api Response code 401 If authentication failed</
@@ -113,7 +113,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error</li>
      * </ul>
      */
-    public void deleteRMSite() throws Exception
+    public void deleteRMSite()
     {
         getRmRestWrapper().processEmptyModel(simpleRequest(
                 DELETE,
@@ -126,7 +126,7 @@ public class RMSiteAPI extends RMModelRequest
      *
      * @param rmSiteProperties The properties to be updated
      * @return The updated {@link RMSite}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 the update request is invalid {@code rmSiteModel} is invalid</li>
      *  <li>Api Response code 401 If authentication fails</li>
@@ -135,7 +135,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error,model integrity exception</li>
      * </ul>
      */
-    public RMSite updateRMSite(RMSite rmSiteModel) throws Exception
+    public RMSite updateRMSite(RMSite rmSiteModel)
     {
         mandatoryObject("rmSiteProperties", rmSiteModel);
 
@@ -150,7 +150,7 @@ public class RMSiteAPI extends RMModelRequest
      * Checks if the RM site exists or not
      *
      * @return <code>true</code> if the RM site exists, <code>false</code> otherwise
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 Invalid parameter: GET request is supported only for the RM site</li>
      *  <li>Api Response code 401 If authentication failed</li>
@@ -158,7 +158,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error</li>
      * </ul>
      */
-    public boolean existsRMSite() throws Exception
+    public boolean existsRMSite()
     {
         getSite();
         return getRmRestWrapper().getStatusCode().equals(OK.toString());

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,17 +26,17 @@
  */
 package org.alfresco.rest.rm.community.requests.gscore.api;
 
-import static com.jayway.restassured.RestAssured.basic;
-import static com.jayway.restassured.RestAssured.given;
-
 import static org.jglue.fluentjson.JsonBuilderFactory.buildObject;
 import static org.springframework.http.HttpStatus.OK;
 
 import com.google.gson.JsonObject;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.response.Response;
-import com.jayway.restassured.specification.RequestSpecification;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+import static io.restassured.RestAssured.basic;
+import static io.restassured.RestAssured.given;
 
 import org.alfresco.dataprep.AlfrescoHttpClient;
 import org.alfresco.dataprep.AlfrescoHttpClientFactory;
@@ -59,7 +59,7 @@ import org.alfresco.utility.model.UserModel;
 public class RMUserAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public RMUserAPI(RMRestWrapper rmRestWrapper)
     {
@@ -84,11 +84,12 @@ public class RMUserAPI extends RMModelRequest
 
     /**
      * Assign RM role to user
+     *
      * @param userName User's username
      * @param userRole User's RM role, one of {@link UserRoles} roles
-     * @throws Exception for failed requests
+     * @throws RuntimeException for failed requests
      */
-    public void assignRoleToUser(String userName, String userRole) throws Exception
+    public void assignRoleToUser(String userName, String userRole)
     {
         UserModel adminUser = getRmRestWrapper().getTestUser();
 
@@ -97,31 +98,31 @@ public class RMUserAPI extends RMModelRequest
 
         // override v1 baseURI and basePath
         RequestSpecification spec = new RequestSpecBuilder()
-            .setBaseUri(client.getApiUrl())
-            .setBasePath("/")
-            .build();
+                .setBaseUri(client.getApiUrl())
+                .setBasePath("/")
+                .build();
 
         Response response = given()
-            .spec(spec)
-            .log().all()
-            .pathParam("role", userRole)
-            .pathParam("authority", userName)
-            .param("alf_ticket", client.getAlfTicket(adminUser.getUsername(),
-                adminUser.getPassword()))
-        .when()
-            .post("/rm/roles/{role}/authorities/{authority}")
-            .prettyPeek()
-            .andReturn();
+                .spec(spec)
+                .log().all()
+                .pathParam("role", userRole)
+                .pathParam("authority", userName)
+                .param("alf_ticket", client.getAlfTicket(adminUser.getUsername(),
+                        adminUser.getPassword()))
+                .when()
+                .post("/rm/roles/{role}/authorities/{authority}")
+                .prettyPeek()
+                .andReturn();
         getRmRestWrapper().setStatusCode(Integer.toString(response.getStatusCode()));
     }
 
     /**
      * Helper method to add permission on a component to user
-     * @param component The id of the file plan component on which permission should be given
+     * @param filePlanComponentId The id of the file plan component on which permission should be given
      * @param user {@link UserModel} for a user to be granted permission
      * @param permission {@link UserPermissions} to be granted
      */
-    public void addUserPermission(String filePlanComponentId, UserModel user, String permission)
+    public void addUserPermission(String filePlanComponentId, UserModel user, UserPermissions permission)
     {
         UserModel adminUser = getRmRestWrapper().getTestUser();
 
@@ -129,34 +130,76 @@ public class RMUserAPI extends RMModelRequest
         AlfrescoHttpClient client = getAlfrescoHttpClient();
 
         JsonObject bodyJson = buildObject()
-            .addArray("permissions")
+                .addArray("permissions")
                 .addObject()
-                    .add("authority", user.getUsername())
-                    .add("role", permission)
-                    .end()
-                    .getJson();
+                .add("authority", user.getUsername())
+                .add("role", permission.permissionId)
+                .end()
+                .getJson();
 
         // override v1 baseURI and basePath
         RequestSpecification spec = new RequestSpecBuilder()
-            .setBaseUri(client.getApiUrl())
-            .setBasePath("/")
-            .build();
+                .setBaseUri(client.getApiUrl())
+                .setBasePath("/")
+                .build();
 
         // execute an "old-style" API call
         Response response = given()
-            .spec(spec)
-            .auth().basic(adminUser.getUsername(), adminUser.getPassword())
-            .contentType(ContentType.JSON)
-            .body(bodyJson.toString())
-            .pathParam("nodeId", filePlanComponentId)
-            .log().all()
-        .when()
-            .post("/node/workspace/SpacesStore/{nodeId}/rmpermissions")
-            .prettyPeek()
-            .andReturn();
+                .spec(spec)
+                .auth().basic(adminUser.getUsername(), adminUser.getPassword())
+                .contentType(ContentType.JSON)
+                .body(bodyJson.toString())
+                .pathParam("nodeId", filePlanComponentId)
+                .log().all()
+                .when()
+                .post("/node/workspace/SpacesStore/{nodeId}/rmpermissions")
+                .prettyPeek()
+                .andReturn();
         getRmRestWrapper().setStatusCode(Integer.toString(response.getStatusCode()));
     }
 
+    /**
+     * Helper method to set permission inheritance on a file plan component
+     *
+     * @param filePlanComponentId The id of the file plan component on which inherited permission should be set
+     * @param isInherited          true if the permission is inherited
+     *                             false if the permission inheritance is disabled
+     */
+    public void setUserPermissionInheritance(String filePlanComponentId, Boolean isInherited)
+    {
+        final UserModel adminUser = getRmRestWrapper().getTestUser();
+
+        // get an "old-style" REST API client
+        final AlfrescoHttpClient client = getAlfrescoHttpClient();
+
+        final JsonObject bodyJson = buildObject()
+                .addArray("permissions")
+                .end()
+                .add("isInherited", isInherited)
+                .getJson();
+
+        // override v1 baseURI and basePath
+        RequestSpecification spec = new RequestSpecBuilder()
+                .setBaseUri(client.getApiUrl())
+                .setBasePath("/")
+                .build();
+
+        // execute an "old-style" API call
+        final Response response = given()
+                .spec(spec)
+                .auth().basic(adminUser.getUsername(), adminUser.getPassword())
+                .contentType(ContentType.JSON)
+                .body(bodyJson.toString())
+                .pathParam("nodeId", filePlanComponentId)
+                .log().all()
+                .when()
+                .post("/node/workspace/SpacesStore/{nodeId}/rmpermissions")
+                .prettyPeek()
+                .andReturn();
+        getRmRestWrapper().setStatusCode(Integer.toString(response.getStatusCode()));
+    }
+
+
     /**
      * Creates a user with the given name using the old APIs
      *
@@ -168,7 +211,7 @@ public class RMUserAPI extends RMModelRequest
     public boolean createUser(String userName, String userPassword, String userEmail)
     {
         UserModel adminUser = getRmRestWrapper().getTestUser();
-        AlfrescoHttpClient client = getAlfrescoHttpClient();
+        final AlfrescoHttpClient client = getAlfrescoHttpClient();
 
         JsonObject body = buildObject()
             .add("userName", userName)
@@ -178,7 +221,7 @@ public class RMUserAPI extends RMModelRequest
             .add("email", userEmail)
             .getJson();
 
-        RequestSpecification spec = new RequestSpecBuilder()
+        final RequestSpecification spec = new RequestSpecBuilder()
             .setBaseUri(client.getApiUrl())
             .setBasePath("/")
             .setAuth(basic(adminUser.getUsername(), adminUser.getPassword()))

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordCategoryAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -54,7 +54,7 @@ public class RecordCategoryAPI extends RMModelRequest
     /**
      * Constructor.
      *
-     * @param restWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public RecordCategoryAPI(RMRestWrapper rmRestWrapper)
     {
@@ -65,7 +65,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * Deletes a record category.
      *
      * @param recordCategoryId The identifier of a record category
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordCategoryId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -101,7 +101,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * @param recordCategoryId The identifier of a record category
      * @param parameters The URL parameters to add
      * @return The {@link RecordCategory} for the given {@code recordCategoryId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordCategoryId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -124,7 +124,7 @@ public class RecordCategoryAPI extends RMModelRequest
     /**
      * see {@link #updateRecordCategory(RecordCategory, String, String)
      */
-    public RecordCategory updateRecordCategory(RecordCategory recordCategoryModel, String recordCategoryId) throws Exception
+    public RecordCategory updateRecordCategory(RecordCategory recordCategoryModel, String recordCategoryId)
     {
         mandatoryObject("recordCategoryModel", recordCategoryModel);
         mandatoryString("recordCategoryId", recordCategoryId);
@@ -139,7 +139,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * @param recordCategoryId The identifier of a record category
      * @param parameters The URL parameters to add
      * @param returns The updated {@link RecordCategory}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code recordCategoryId} is not a valid format or {@code recordCategoryModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -149,7 +149,7 @@ public class RecordCategoryAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public RecordCategory updateRecordCategory(RecordCategory recordCategoryModel, String recordCategoryId, String parameters) throws Exception
+    public RecordCategory updateRecordCategory(RecordCategory recordCategoryModel, String recordCategoryId, String parameters)
     {
         mandatoryObject("recordCategoryModel", recordCategoryModel);
         mandatoryString("recordCategoryId", recordCategoryId);
@@ -179,7 +179,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * @param recordCategoryId The identifier of a record category
      * @param parameters The URL parameters to add
      * @return The {@link RecordCategoryChildCollection} for the given {@code recordCategoryId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code recordCategoryId}</li>
@@ -201,7 +201,7 @@ public class RecordCategoryAPI extends RMModelRequest
     /**
      * see {@link #createRecordCategoryChild(RecordCategoryChild, String, String)}
      */
-    public RecordCategoryChild createRecordCategoryChild(RecordCategoryChild recordCategoryChildModel, String recordCategoryId) throws Exception
+    public RecordCategoryChild createRecordCategoryChild(RecordCategoryChild recordCategoryChildModel, String recordCategoryId)
     {
         mandatoryObject("recordCategoryChildModel", recordCategoryChildModel);
         mandatoryString("recordCategoryId", recordCategoryId);
@@ -216,7 +216,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * @param recordCategoryId The identifier of a record category
      * @param parameters The URL parameters to add
      * @return The created {@link RecordCategoryChild}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordCategoryId} is not a valid format or {@code recordCategoryChildModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -226,7 +226,7 @@ public class RecordCategoryAPI extends RMModelRequest
      *  <li>model integrity exception, including node name with invalid characters</li>
      * </ul>
      */
-    public RecordCategoryChild createRecordCategoryChild(RecordCategoryChild recordCategoryChildModel, String recordCategoryId, String parameters) throws Exception
+    public RecordCategoryChild createRecordCategoryChild(RecordCategoryChild recordCategoryChildModel, String recordCategoryId, String parameters)
     {
         mandatoryObject("filePlanComponentProperties", recordCategoryChildModel);
         mandatoryString("recordCategoryId", recordCategoryId);

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordFolderAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -40,12 +40,13 @@ import static org.springframework.http.HttpMethod.PUT;
 import static org.testng.Assert.fail;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.record.Record;
@@ -65,7 +66,7 @@ public class RecordFolderAPI extends RMModelRequest
     /**
      * Constructor.
      *
-     * @param restWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public RecordFolderAPI(RMRestWrapper rmRestWrapper)
     {
@@ -76,7 +77,7 @@ public class RecordFolderAPI extends RMModelRequest
      * Deletes a record folder.
      *
      * @param recordFolderId The identifier of a record folder
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordFolderId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -112,7 +113,7 @@ public class RecordFolderAPI extends RMModelRequest
      * @param recordFolderId The identifier of a record folder
      * @param parameters The URL parameters to add
      * @return The {@link RecordFolder} for the given {@code recordFolderId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordFolderId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -135,7 +136,7 @@ public class RecordFolderAPI extends RMModelRequest
     /**
      * see {@link #updateRecordFolder(RecordFolder, String, String)
      */
-    public RecordFolder updateRecordFolder(RecordFolder recordFolderModel, String recordFolderId) throws Exception
+    public RecordFolder updateRecordFolder(RecordFolder recordFolderModel, String recordFolderId)
     {
         mandatoryObject("recordFolderModel", recordFolderModel);
         mandatoryString("recordFolderId", recordFolderId);
@@ -150,7 +151,7 @@ public class RecordFolderAPI extends RMModelRequest
      * @param recordFolderId The identifier of a record folder
      * @param parameters The URL parameters to add
      * @param returns The updated {@link RecordFolder}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code recordFolderId} is not a valid format or {@code recordFolderModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -160,7 +161,7 @@ public class RecordFolderAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public RecordFolder updateRecordFolder(RecordFolder recordFolderModel, String recordFolderId, String parameters) throws Exception
+    public RecordFolder updateRecordFolder(RecordFolder recordFolderModel, String recordFolderId, String parameters)
     {
         mandatoryObject("recordFolderModel", recordFolderModel);
         mandatoryString("recordFolderId", recordFolderId);
@@ -190,7 +191,7 @@ public class RecordFolderAPI extends RMModelRequest
      * @param recordFolderId The identifier of a record folder
      * @param parameters The URL parameters to add
      * @return The {@link RecordFolderCollection} for the given {@code recordFolderId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code recordFolderId}</li>
@@ -212,7 +213,7 @@ public class RecordFolderAPI extends RMModelRequest
     /**
      * see {@link #createRecord(Record, String, String)}
      */
-    public Record createRecord(Record recordModel, String recordFolderId) throws Exception
+    public Record createRecord(Record recordModel, String recordFolderId)
     {
         mandatoryObject("recordModel", recordModel);
         mandatoryString("recordFolderId", recordFolderId);
@@ -227,9 +228,9 @@ public class RecordFolderAPI extends RMModelRequest
      * @param recordContent {@link File} pointing to the content of the electronic record to be created
      * @param recordFolderId The identifier of a record folder
      * @return newly created {@link Record}
-     * @throws Exception for invalid recordModel JSON strings
+     * @throws RuntimeException for invalid recordModel JSON strings
      */
-    public Record createRecord(Record recordModel, String recordFolderId, File recordContent) throws Exception
+    public Record createRecord(Record recordModel, String recordFolderId, File recordContent) throws RuntimeException
     {
         mandatoryString("recordFolderId", recordFolderId);
         mandatoryObject("recordContent", recordContent);
@@ -245,7 +246,15 @@ public class RecordFolderAPI extends RMModelRequest
          * to the request.
          */
         RequestSpecBuilder builder = getRmRestWrapper().configureRequestSpec();
-        JsonNode root = new ObjectMapper().readTree(toJson(recordModel, Record.class, FilePlanComponentMixIn.class));
+        JsonNode root;
+        try
+        {
+            root = new ObjectMapper().readTree(toJson(recordModel, Record.class, FilePlanComponentMixIn.class));
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("Failed to convert model to JSON.", e);
+        }
         // add request fields
         Iterator<String> fieldNames = root.fieldNames();
         while (fieldNames.hasNext())
@@ -266,7 +275,7 @@ public class RecordFolderAPI extends RMModelRequest
      * @param recordFolderId The identifier of a record folder
      * @param parameters The URL parameters to add
      * @return The created {@link Record}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordFolderId is not a valid format or {@code recordModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -275,7 +284,7 @@ public class RecordFolderAPI extends RMModelRequest
      *  <li>model integrity exception, including node name with invalid characters</li>
      * </ul>
      */
-    public Record createRecord(Record recordModel, String recordFolderId, String parameters) throws Exception
+    public Record createRecord(Record recordModel, String recordFolderId, String parameters)
     {
         mandatoryObject("recordModel", recordModel);
         mandatoryString("recordFolderId", recordFolderId);

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordsAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -37,13 +37,14 @@ import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
 import static org.springframework.http.HttpMethod.PUT;
 
-import com.jayway.restassured.response.ResponseBody;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.record.Record;
 import org.alfresco.rest.rm.community.model.record.RecordBodyFile;
 import org.alfresco.rest.rm.community.requests.RMModelRequest;
 
+import io.restassured.response.ResponseBody;
+
 /**
  * Records REST API Wrapper
  *
@@ -53,7 +54,7 @@ import org.alfresco.rest.rm.community.requests.RMModelRequest;
 public class RecordsAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public RecordsAPI(RMRestWrapper rmRestWrapper)
     {
@@ -65,7 +66,7 @@ public class RecordsAPI extends RMModelRequest
      *
      * @param recordId The id of the electronic record
      * @return {@link ResponseBody} representing content for the given record id
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      * <li>{@code recordId} has no content</li>
      * <li> {@code recordId} is not a valid format, or is not a record</li>
@@ -73,7 +74,7 @@ public class RecordsAPI extends RMModelRequest
      * <li>{@code recordId} does not exist</li>
      * </ul>
      */
-    public ResponseBody<?> getRecordContent(String recordId) throws Exception
+    public ResponseBody<?> getRecordContent(String recordId)
     {
         mandatoryString("recordId", recordId);
 
@@ -89,7 +90,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordBodyFile The properties where to file the record
      * @param recordId       The id of the record to file
      * @return The {@link Record} with the given properties
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Invalid parameter: {@code recordBodyFile} is not a valid format,{@code recordId} is not a record</li>
      *  <li>authentication fails</li>
@@ -100,7 +101,7 @@ public class RecordsAPI extends RMModelRequest
      * </ul>
      *
      */
-    public Record fileRecord(RecordBodyFile recordBodyFile, String recordId) throws Exception
+    public Record fileRecord(RecordBodyFile recordBodyFile, String recordId)
     {
         mandatoryObject("recordBodyFile", recordBodyFile);
         mandatoryString("recordId", recordId);
@@ -114,7 +115,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordBodyFile The properties where to file the record
      * @param recordId       The id of the record to file
      * @return The {@link Record} with the given properties
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Invalid parameter: {@code recordBodyFile} is not a valid format,{@code recordId} is not a record</li>
      *  <li>authentication fails</li>
@@ -125,7 +126,7 @@ public class RecordsAPI extends RMModelRequest
      * </ul>
      *
      */
-    public Record fileRecord(RecordBodyFile recordBodyFile, String recordId, String parameters) throws Exception
+    public Record fileRecord(RecordBodyFile recordBodyFile, String recordId, String parameters)
     {
         mandatoryObject("requestBodyFile", recordBodyFile);
         mandatoryString("recordId", recordId);
@@ -142,7 +143,7 @@ public class RecordsAPI extends RMModelRequest
     /**
      * see {@link #completeRecord(String, String)
      */
-    public Record completeRecord(String recordId) throws Exception
+    public Record completeRecord(String recordId)
     {
         mandatoryString("recordId", recordId);
 
@@ -154,7 +155,7 @@ public class RecordsAPI extends RMModelRequest
      *
      * @param recordId The id of the record to complete
      * @return The completed {@link Record} with the given properties
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      *                   <ul>
      *                   <li>Invalid parameter: {@code recordId} is not a record</li>
      *                   <li>authentication fails</li>
@@ -164,7 +165,7 @@ public class RecordsAPI extends RMModelRequest
      *                   <li>model integrity exception: the record has missing meta-data</li>
      *                   </ul>
      */
-    public Record completeRecord(String recordId, String parameters) throws Exception
+    public Record completeRecord(String recordId, String parameters)
     {
         mandatoryString("recordId", recordId);
 
@@ -179,7 +180,7 @@ public class RecordsAPI extends RMModelRequest
      * Deletes a record.
      *
      * @param recordId The identifier of a record
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -215,7 +216,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordId The identifier of a record
      * @param parameters The URL parameters to add
      * @return The {@link Record} for the given {@code recordId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -238,7 +239,7 @@ public class RecordsAPI extends RMModelRequest
     /**
      * see {@link #updateRecord(Record, String, String)
      */
-    public Record updateRecord(Record recordModel, String recordId) throws Exception
+    public Record updateRecord(Record recordModel, String recordId)
     {
         mandatoryObject("recordModel", recordModel);
         mandatoryString("recordId", recordId);
@@ -253,7 +254,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordId The identifier of a record
      * @param parameters The URL parameters to add
      * @return The updated {@link Record}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code recordId} is not a valid format or {@code recordModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -263,7 +264,7 @@ public class RecordsAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public Record updateRecord(Record recordModel, String recordId, String parameters) throws Exception
+    public Record updateRecord(Record recordModel, String recordId, String parameters)
     {
         mandatoryObject("recordModel", recordModel);
         mandatoryString("recordId", recordId);

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/TransferAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -46,7 +46,7 @@ import org.alfresco.rest.rm.community.requests.RMModelRequest;
 public class TransferAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public TransferAPI(RMRestWrapper rmRestWrapper)
     {
@@ -69,7 +69,7 @@ public class TransferAPI extends RMModelRequest
      * @param transferId The identifier of a transfer
      * @param parameters The URL parameters to add
      * @return The {@link Transfer} for the given {@code transferId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code transferId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -104,7 +104,7 @@ public class TransferAPI extends RMModelRequest
      * @param transferId The identifier of a transfer
      * @param parameters The URL parameters to add
      * @return The {@link TransferChildCollection} for the given {@code transferId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code transferId}</li>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/TransferContainerAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -50,7 +50,7 @@ import org.alfresco.rest.rm.community.requests.RMModelRequest;
 public class TransferContainerAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public TransferContainerAPI(RMRestWrapper rmRestWrapper)
     {
@@ -73,7 +73,7 @@ public class TransferContainerAPI extends RMModelRequest
      * @param transferContainerId The identifier of a transfer container
      * @param parameters The URL parameters to add
      * @return The {@link TransferContainer} for the given {@code transferContainerId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code transferContainerId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -96,7 +96,7 @@ public class TransferContainerAPI extends RMModelRequest
     /**
      * see {@link #updateTransferContainer(TransferContainer, String, String)
      */
-    public TransferContainer updateTransferContainer(TransferContainer transferContainerModel, String transferContainerId) throws Exception
+    public TransferContainer updateTransferContainer(TransferContainer transferContainerModel, String transferContainerId)
     {
         mandatoryObject("transferContainerModel", transferContainerModel);
         mandatoryString("transferContainerId", transferContainerId);
@@ -111,7 +111,7 @@ public class TransferContainerAPI extends RMModelRequest
      * @param transferContainerId The identifier of a transfer container
      * @param parameters The URL parameters to add
      * @param returns The updated {@link TransferContainer}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code transferContainerId} is not a valid format or {@code transferContainerModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -121,7 +121,7 @@ public class TransferContainerAPI extends RMModelRequest
      *  <li>model integrity exception, including transfer container name with invalid characters</li>
      * </ul>
      */
-    public TransferContainer updateTransferContainer(TransferContainer transferContainerModel, String transferContainerId, String parameters) throws Exception
+    public TransferContainer updateTransferContainer(TransferContainer transferContainerModel, String transferContainerId, String parameters)
     {
         mandatoryObject("transferContainerModel", transferContainerModel);
         mandatoryString("transferContainerId", transferContainerId);
@@ -151,7 +151,7 @@ public class TransferContainerAPI extends RMModelRequest
      * @param transferContainerId The identifier of a transfer container
      * @param parameters The URL parameters to add
      * @return The {@link TransferCollection} for the given {@code transferContainerId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code transferContainerId}</li>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/UnfiledContainerAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -39,12 +39,14 @@ import static org.springframework.http.HttpMethod.PUT;
 import static org.testng.Assert.fail;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainer;
@@ -63,7 +65,7 @@ import org.alfresco.rest.rm.community.util.UnfiledContainerChildMixin;
 public class UnfiledContainerAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public UnfiledContainerAPI(RMRestWrapper rmRestWrapper)
     {
@@ -86,7 +88,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerId The identifier of a unfiled record container
      * @param parameters The URL parameters to add
      * @return The {@link UnfiledContainer} for the given {@code unfiledContainerId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledContainerId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -122,7 +124,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerId The identifier of an unfiled records container
      * @param parameters The URL parameters to add
      * @return The {@link UnfiledContainerChildCollection} for the given {@code unfiledContainerId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code unfiledContainerId}</li>
@@ -144,7 +146,7 @@ public class UnfiledContainerAPI extends RMModelRequest
     /**
      * see {@link #createUnfiledContainerChild(UnfiledContainerChild, String, String)}
      */
-    public UnfiledContainerChild createUnfiledContainerChild(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId) throws Exception
+    public UnfiledContainerChild createUnfiledContainerChild(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId)
     {
         mandatoryObject("unfiledContainerChildModel", unfiledContainerChildModel);
         mandatoryString("unfiledContainerId", unfiledContainerId);
@@ -159,7 +161,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerId The identifier of an unfiled container
      * @param parameters The URL parameters to add
      * @return The created {@link UnfiledContainerChild}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledContainerId} is not a valid format or {@code unfiledContainerChildModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -169,7 +171,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      *  <li>model integrity exception, including node name with invalid characters</li>
      * </ul>
      */
-    public UnfiledContainerChild createUnfiledContainerChild(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId, String parameters) throws Exception
+    public UnfiledContainerChild createUnfiledContainerChild(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId, String parameters)
     {
         mandatoryObject("unfiledContainerChildModel", unfiledContainerChildModel);
         mandatoryString("unfiledContainerId", unfiledContainerId);
@@ -190,9 +192,9 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerChildContent {@link File} pointing to the content of the electronic record to be created
      * @param unfiledContainerId The identifier of a unfiled container
      * @return newly created {@link UnfiledContainerChild}
-     * @throws Exception for invalid recordModel JSON strings
+     * @throws RuntimeException for invalid recordModel JSON strings
      */
-    public UnfiledContainerChild uploadRecord(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId, File unfiledContainerChildContent) throws Exception
+    public UnfiledContainerChild uploadRecord(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId, File unfiledContainerChildContent)
     {
         mandatoryObject("unfiledContainerChildModel", unfiledContainerChildModel);
         mandatoryObject("unfiledContainerChildContent", unfiledContainerChildContent);
@@ -208,7 +210,15 @@ public class UnfiledContainerAPI extends RMModelRequest
          * to the request.
          */
         RequestSpecBuilder builder = getRmRestWrapper().configureRequestSpec();
-        JsonNode root = new ObjectMapper().readTree(toJson(unfiledContainerChildModel, UnfiledContainerChild.class, UnfiledContainerChildMixin.class));
+        JsonNode root;
+        try
+        {
+            root = new ObjectMapper().readTree(toJson(unfiledContainerChildModel, UnfiledContainerChild.class, UnfiledContainerChildMixin.class));
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("Failed to convert model to JSON.", e);
+        }
         // add request fields
         Iterator<String> fieldNames = root.fieldNames();
         while (fieldNames.hasNext())
@@ -225,7 +235,7 @@ public class UnfiledContainerAPI extends RMModelRequest
     /**
      * see {@link #updateUnfiledContainer(UnfiledContainer, String, String)
      */
-    public UnfiledContainer updateUnfiledContainer(UnfiledContainer unfiledContainerModel, String unfiledContainerId) throws Exception
+    public UnfiledContainer updateUnfiledContainer(UnfiledContainer unfiledContainerModel, String unfiledContainerId)
     {
         mandatoryObject("unfiledContainerModel", unfiledContainerModel);
         mandatoryString("unfiledContainerId", unfiledContainerId);
@@ -240,7 +250,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerId The identifier of an unfiled record container
      * @param parameters The URL parameters to add
      * @param returns The updated {@link UnfiledContainer}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code unfiledContainerId} is not a valid format or {@code unfiledContainerModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -250,7 +260,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public UnfiledContainer updateUnfiledContainer(UnfiledContainer unfiledContainerModel, String unfiledContainerId, String parameters) throws Exception
+    public UnfiledContainer updateUnfiledContainer(UnfiledContainer unfiledContainerModel, String unfiledContainerId, String parameters)
     {
         mandatoryObject("unfiledContainerModel", unfiledContainerModel);
         mandatoryString("unfiledContainerId", unfiledContainerId);

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/UnfiledRecordFolderAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -40,12 +40,13 @@ import static org.springframework.http.HttpMethod.PUT;
 import static org.testng.Assert.fail;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChild;
@@ -63,7 +64,7 @@ import org.alfresco.rest.rm.community.util.UnfiledContainerChildMixin;
 public class UnfiledRecordFolderAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public UnfiledRecordFolderAPI(RMRestWrapper rmRestWrapper)
     {
@@ -86,7 +87,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderId The identifier of a unfiled record folder
      * @param parameters The URL parameters to add
      * @return The {@link UnfiledRecordFolder} for the given {@code unfiledRecordFolderId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledRecordFolderId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -122,7 +123,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderId The identifier of an unfiled records folder
      * @param parameters The URL parameters to add
      * @return The {@link UnfiledRecordFolderChildCollection} for the given {@code unfiledRecordFolderId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code unfiledRecordFolderId}</li>
@@ -144,7 +145,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
     /**
      * see {@link #createUnfiledRecordFolderChild(UnfiledContainerChild, String, String)}
      */
-    public UnfiledContainerChild createUnfiledRecordFolderChild(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId) throws Exception
+    public UnfiledContainerChild createUnfiledRecordFolderChild(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId)
     {
         mandatoryObject("unfiledRecordFolderChildModel", unfiledRecordFolderChildModel);
         mandatoryString("unfiledRecordFolderId", unfiledRecordFolderId);
@@ -159,7 +160,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderId The identifier of an unfiled folder
      * @param parameters The URL parameters to add
      * @return The created {@link UnfiledRecordFolderChild}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledRecordFolderId} is not a valid format or {@code unfiledRecordFolderChildModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -169,7 +170,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      *  <li>model integrity exception, including node name with invalid characters</li>
      * </ul>
      */
-    public UnfiledContainerChild createUnfiledRecordFolderChild(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId, String parameters) throws Exception
+    public UnfiledContainerChild createUnfiledRecordFolderChild(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId, String parameters)
     {
         mandatoryObject("unfiledRecordFolderChildModel", unfiledRecordFolderChildModel);
         mandatoryString("unfiledRecordFolderId", unfiledRecordFolderId);
@@ -190,9 +191,9 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderChildContent {@link File} pointing to the content of the electronic record to be created
      * @param unfiledRecordFolderId The identifier of a unfiled record folder
      * @return newly created {@link UnfiledContainerChild}
-     * @throws Exception for invalid recordModel JSON strings
+     * @throws RuntimeException for invalid recordModel JSON strings
      */
-    public UnfiledContainerChild uploadRecord(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId, File unfiledRecordFolderChildContent) throws Exception
+    public UnfiledContainerChild uploadRecord(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId, File unfiledRecordFolderChildContent)
     {
         mandatoryObject("unfiledRecordFolderChildModel", unfiledRecordFolderChildModel);
         mandatoryObject("unfiledRecordFolderChildContent", unfiledRecordFolderChildContent);
@@ -208,7 +209,15 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
          * to the request.
          */
         RequestSpecBuilder builder = getRmRestWrapper().configureRequestSpec();
-        JsonNode root = new ObjectMapper().readTree(toJson(unfiledRecordFolderChildModel, UnfiledContainerChild.class, UnfiledContainerChildMixin.class));
+        JsonNode root;
+        try
+        {
+            root = new ObjectMapper().readTree(toJson(unfiledRecordFolderChildModel, UnfiledContainerChild.class, UnfiledContainerChildMixin.class));
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("Failed to convert model to JSON.", e);
+        }
         // add request fields
         Iterator<String> fieldNames = root.fieldNames();
         while (fieldNames.hasNext())
@@ -225,7 +234,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
     /**
      * see {@link #updateUnfiledRecordFolder(UnfiledRecordFolder, String, String)
      */
-    public UnfiledRecordFolder updateUnfiledRecordFolder(UnfiledRecordFolder unfiledRecordFolderModel, String unfiledRecordFolderId) throws Exception
+    public UnfiledRecordFolder updateUnfiledRecordFolder(UnfiledRecordFolder unfiledRecordFolderModel, String unfiledRecordFolderId)
     {
         mandatoryObject("unfiledRecordFolderModel", unfiledRecordFolderModel);
         mandatoryString("unfiledRecordFolderId", unfiledRecordFolderId);
@@ -240,7 +249,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderId The identifier of an unfiled record folder
      * @param parameters The URL parameters to add
      * @param returns The updated {@link UnfiledRecordFolder}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code unfiledRecordFolderId} is not a valid format or {@code unfiledRecordFolderModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -250,7 +259,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public UnfiledRecordFolder updateUnfiledRecordFolder(UnfiledRecordFolder unfiledRecordFolderModel, String unfiledRecordFolderId, String parameters) throws Exception
+    public UnfiledRecordFolder updateUnfiledRecordFolder(UnfiledRecordFolder unfiledRecordFolderModel, String unfiledRecordFolderId, String parameters)
     {
         mandatoryObject("unfiledRecordFolderModel", unfiledRecordFolderModel);
         mandatoryString("unfiledRecordFolderId", unfiledRecordFolderId);
@@ -268,7 +277,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * Deletes an unfiled record folder.
      *
      * @param unfiledRecordFolderId The identifier of a unfiled record folder
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledRecordFolderId} is not a valid format</li>
      *  <li>authentication fails</li>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/CommonTestUtils.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/DockerHelper.java

@@ -0,0 +1,142 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * 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.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.core.command.LogContainerResultCallback;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang.SystemUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+/**
+ * Helper class for interaction with docker containers
+ *
+ * @author Claudia Agache
+ * @since 3.1
+ */
+@Service
+public class DockerHelper
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerHelper.class);
+    private static final String REPO_IMAGE_NAME = "repository";
+    @Getter
+    @Setter
+    private DockerClient dockerClient;
+
+    @Autowired
+    public DockerHelper(@Value ("${docker.host}") String dockerHost)
+    {
+        if (SystemUtils.IS_OS_WINDOWS)
+        {
+            this.dockerClient = DockerClientBuilder.getInstance(dockerHost).build();
+        }
+        else
+        {
+            this.dockerClient = DockerClientBuilder.getInstance().build();
+        }
+    }
+
+    /**
+     * Method for returning logs of docker container
+     *
+     * @param containerId - ID of the container
+     * @return list of strings, where every string is log line
+     */
+    private List<String> getDockerLogs(String containerId)
+    {
+        final List<String> logs = new ArrayList<>();
+        // get the logs since current time - 10 seconds
+        final int timeStamp = (int) (System.currentTimeMillis() / 1000) - 10;
+
+        final LogContainerCmd logContainerCmd = getDockerClient().logContainerCmd(containerId);
+        logContainerCmd.withStdOut(true)
+                       .withStdErr(true)
+                       .withSince(timeStamp) // UNIX timestamp to filter logs. Output log-entries since that timestamp.
+                       .withTimestamps(true); //print timestamps for every log line
+
+        try
+        {
+            logContainerCmd.exec(new LogContainerResultCallback()
+            {
+                @Override
+                public void onNext(Frame item)
+                {
+                    logs.add(item.toString());
+                }
+            }).awaitCompletion();
+        }
+        catch (InterruptedException e)
+        {
+            Thread.currentThread().interrupt();  // set interrupt flag
+            LOGGER.error("Failed to retrieve logs of container " + containerId, e);
+        }
+
+        return logs;
+    }
+
+    /**
+     * Get the alfresco container logs
+     *
+     * @return list of strings, where every string is log line
+     */
+    public List<String> getAlfrescoLogs()
+    {
+        final Optional<Container> alfrescoContainer = findContainerByImageName(REPO_IMAGE_NAME);
+        return (alfrescoContainer.isPresent()) ? getDockerLogs(alfrescoContainer.get().getId()) : Collections.emptyList();
+    }
+
+    /**
+     * Method for finding a docker container after the image name
+     *
+     * @param imageName - the name of the image used by container
+     * @return the container
+     */
+    private Optional<Container> findContainerByImageName(String imageName)
+    {
+        final List<Container> containers = getDockerClient().listContainersCmd().withShowAll(true).exec();
+
+        return containers.stream()
+                         .filter(container -> container.getImage().contains(imageName))
+                         .findFirst();
+    }
+}

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/FilePlanComponentMixIn.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/ParameterCheck.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/PojoUtility.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -54,6 +54,10 @@ public class PojoUtility
      */
     private static final Logger LOGGER = LoggerFactory.getLogger(PojoUtility.class);
 
+    /** Private constructor to prevent instantiation. */
+    private PojoUtility()
+    {}
+
     /**
      * see {@link #toJson(Object, Class, Class)}
      */
@@ -122,7 +126,7 @@ public class PojoUtility
         }
         catch (IOException e)
         {
-            LOGGER.error("Unable to convert the json into a java object.", e.toString());
+            LOGGER.error("Unable to convert the json into a java object.", e);
         }
 
         return obj;
@@ -152,7 +156,7 @@ public class PojoUtility
         }
         catch (IOException e)
         {
-            LOGGER.error("Unable to convert the json array into a java collection.", e.toString());
+            LOGGER.error("Unable to convert the json array into a java collection.", e);
         }
 
 

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/ReviewPeriodSerializer.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/UnfiledContainerChildMixin.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/CopyToAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/CustomDefinitionsAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -105,7 +105,7 @@ public class CustomDefinitionsAPI extends BaseAPI
             }
             catch (JSONException error)
             {
-                LOGGER.error("Unable to get the refId for the custom reference definition " + customDefinition);
+                LOGGER.error("Unable to get the refId for the custom reference definition {}", customDefinition);
             }
         }
         return null;

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

@@ -0,0 +1,360 @@
+/*-
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.v0;
+
+import static org.alfresco.rest.core.v0.APIUtils.convertHTTPResponseToJSON;
+import static org.apache.http.HttpStatus.SC_OK;
+
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.List;
+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.HoldEntry;
+import org.alfresco.rest.rm.community.util.PojoUtility;
+import org.alfresco.utility.model.UserModel;
+import org.apache.http.HttpResponse;
+import org.apache.http.ParseException;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.stereotype.Component;
+
+/**
+ * Methods to make API requests using v0 API for generalized holds
+ *
+ * @author Rodica Sutu
+ * @since 3.2
+ */
+@Component
+public class HoldsAPI extends BaseAPI
+{
+    public static final String HOLDS_CONTAINER = "Holds";
+    /**
+     * The URI to create a hold
+     */
+    private static final String CREATE_HOLDS_API = "{0}type/rma:hold/formprocessor";
+
+    /**
+     * The URI to add items to hold or to remove items from hold
+     */
+    private static final String RM_HOLDS_API = "{0}rma/holds";
+
+    /**
+     * The URI to  get holds.
+     */
+    private static final String GET_RM_HOLDS = RM_HOLDS_API + "?{1}";
+
+    /**
+     * Util method to create a hold
+     *
+     * @param user        the user creating the hold
+     * @param password    the user's password
+     * @param holdName    the hold name
+     * @param reason      hold reason
+     * @param description hold description
+     * @return The HTTP response.
+     */
+    public HttpResponse createHold(String user, String password, String holdName, String reason, String description)
+    {
+        return createHold(user, password, holdName, reason, description, SC_OK);
+    }
+
+    /**
+     * Util method to create a hold
+     *
+     * @param user        the user creating the hold
+     * @param password    the user's password
+     * @param holdName    the hold name
+     * @param reason      hold reason
+     * @param description hold description
+     * @param expectedStatusCode The expected return status code.
+     * @return The HTTP response or throws AssertionError if the returned status code is not as expected.
+     */
+    public HttpResponse createHold(String user, String password, String holdName, String reason, String description,
+                                   int expectedStatusCode)
+    {
+        // retrieve the Holds container nodeRef
+        final String parentNodeRef = getItemNodeRef(user, password, "/" + HOLDS_CONTAINER);
+
+        final JSONObject requestParams = new JSONObject();
+        requestParams.put("alf_destination", getNodeRefSpacesStore() + parentNodeRef);
+        requestParams.put("prop_cm_name", holdName);
+        requestParams.put("prop_cm_description", description);
+        requestParams.put("prop_rma_holdReason", reason);
+
+        return doPostJsonRequest(user, password, expectedStatusCode, requestParams, CREATE_HOLDS_API);
+    }
+
+    /**
+     * Create a hold and get the node ref of the hold from the response body
+     *
+     * @param user        the user creating the hold
+     * @param password    the user's password
+     * @param holdName    the hold name to be created
+     * @param reason      reason of the hold to be created
+     * @param description hold description
+     * @return node ref of the hold created
+     */
+    public String createHoldAndGetNodeRef(String user, String password,
+                                     String holdName, String reason, String description)
+    {
+        final HttpResponse httpResponse = createHold(user, password, holdName, reason, description);
+
+        try
+        {
+           return convertHTTPResponseToJSON(httpResponse).getString("persistedObject")
+                                .replace(NODE_REF_WORKSPACE_SPACES_STORE, "");
+        }
+        catch(JSONException error)
+        {
+            LOGGER.error("Converting message body to JSON failed. Body: {}", httpResponse, error);
+        }
+        catch(ParseException error)
+        {
+            LOGGER.error("Parsing message body failed.", error);
+        }
+
+        return null;
+    }
+
+    /**
+     * Deletes hold using RM Actions API and expect action to be successful
+     *
+     * @param user the user who does the request
+     * @param holdNodeRef the hold node ref
+     * @return The HTTP Response or throws AssertionError if the request is not successful.
+     */
+    public HttpResponse deleteHold(UserModel user, String holdNodeRef)
+    {
+        return deleteHold(user.getUsername(), user.getPassword(), holdNodeRef, SC_OK);
+    }
+
+    /**
+     * Deletes hold using RM Actions API and expect a specific status code
+     *
+     * @param username user's username
+     * @param password its password
+     * @param holdNodeRef the hold node ref
+     * @return The HTTP Response or throws AssertionError if the returned status code is not as expected.
+     */
+    public HttpResponse deleteHold(String username, String password, String holdNodeRef, int expectedStatusCode)
+    {
+        JSONObject requestParams = new JSONObject();
+        requestParams.put("name", "deleteHold");
+        requestParams.put("nodeRef", getNodeRefSpacesStore() + holdNodeRef);
+
+        return doPostJsonRequest(username, password, expectedStatusCode, requestParams, RM_ACTIONS_API);
+    }
+
+    /**
+     * Deletes hold using cmis
+     *
+     * @param username user's username
+     * @param password its password
+     * @param holdName the hold name
+     * @throws AssertionError if the deletion was unsuccessful.
+     */
+    public void deleteHold( String username, String password, String holdName)
+    {
+        deleteItem(username, password, String.format("/%s/%s", HOLDS_CONTAINER, holdName));
+    }
+
+    /**
+     * Adds item(content/record/record folder) to the hold
+     *
+     * @param user        the user who adds the item to the hold
+     * @param password    the user's password
+     * @param itemNodeRef the nodeRef of the item to be added to hold
+     * @param holdName    the hold name
+     * @return The HTTP response
+     */
+    public HttpResponse addItemToHold(String user, String password, String itemNodeRef, String holdName)
+    {
+        return addItemsToHolds(user, password, Collections.singletonList(itemNodeRef), Collections.singletonList(holdName));
+    }
+
+    /**
+     * Adds a list of items (content/record/record folder) to a list of holds
+     *
+     * @param user         the user who adds the items to the holds
+     * @param password     the user's password
+     * @param itemNodeRefs the list of items nodeRefs to be added to holds
+     * @param holdNames    the list of holds
+     * @return The HTTP response
+     */
+    public HttpResponse addItemsToHolds(String user, String password, List<String> itemNodeRefs, List<String> holdNames)
+    {
+        final List<String> holdNodeRefs = holdNames.stream()
+                                                   .map(hold -> getItemNodeRef(user, password, String.format("/%s/%s", HOLDS_CONTAINER, hold)))
+                                                   .collect(Collectors.toList());
+        return addItemsToHolds(user, password, SC_OK, itemNodeRefs, holdNodeRefs);
+    }
+
+    /**
+     * Adds a list of items (content/record/record folder) to a list of holds
+     *
+     * @param user         the user who adds the items to the holds
+     * @param password     the user's password
+     * @param itemNodeRefs the list of items nodeRefs to be added to holds
+     * @param holdNodeRefs the list of holds
+     * @return The HTTP response
+     */
+    public HttpResponse addItemsToHolds(String user, String password, int expectedStatus, List<String> itemNodeRefs,
+                                        List<String> holdNodeRefs)
+    {
+        final JSONObject requestParams = addOrRemoveToFromHoldJsonObject(itemNodeRefs, holdNodeRefs);
+        return doPostJsonRequest(user, password, expectedStatus, requestParams, RM_HOLDS_API);
+    }
+
+    /**
+     * Util method to add item(content/record/record folder) to the hold and get the error message
+     *
+     * @param user        the user who adds the item to the hold
+     * @param password    the user's password
+     * @param itemNodeRef the nodeRef of the item to be added to hold
+     * @param holdNodeRef the hold node ref
+     * @return The error message
+     */
+    public String addToHoldAndGetMessage(String user, String password, int expectedStatus, String itemNodeRef, String
+            holdNodeRef)
+    {
+        final HttpResponse httpResponse = addItemsToHolds(user, password, expectedStatus, Collections.singletonList(itemNodeRef),
+                Collections.singletonList(holdNodeRef));
+        return APIUtils.extractErrorMessageFromHttpResponse(httpResponse);
+    }
+
+    /**
+     * Util method to create the request body used when adding items to holds or when removing items from holds
+     *
+     * @param items        list of items node refs to be added to holds
+     * @param holdNodeRefs list of hold node refs for add/remove items
+     * @return JSONObject fo
+     */
+    private JSONObject addOrRemoveToFromHoldJsonObject(List<String> items, List<String> holdNodeRefs)
+    {
+        final JSONArray nodeRefs = new JSONArray();
+        items.forEach(itemNodeRef -> nodeRefs.put(getNodeRefSpacesStore() + itemNodeRef));
+        final JSONArray holds = new JSONArray();
+        holdNodeRefs.forEach(holdNodeRef -> holds.put(getNodeRefSpacesStore() + holdNodeRef));
+        final JSONObject requestParams = new JSONObject();
+        requestParams.put("nodeRefs", nodeRefs);
+        requestParams.put("holds", holds);
+        return requestParams;
+    }
+
+    /**
+     * Remove item(content/record/record folder) from hold
+     *
+     * @param user        the user who removes the item from the hold
+     * @param password    the user's password
+     * @param itemNodeRef the nodeRef of the item to be removed from hold
+     * @param holdName    the hold name
+     * @return The HTTP response
+     */
+    public HttpResponse removeItemFromHold(String user, String password, String itemNodeRef, String holdName)
+    {
+        return removeItemsFromHolds(user, password, Collections.singletonList(itemNodeRef), Collections.singletonList(holdName));
+    }
+
+    /**
+     * Remove a list of items (content/record/record folder) from a list of holds
+     *
+     * @param user           the user who removes the item from the hold
+     * @param password       the user's password
+     * @param itemNodeRefs   the list of items nodeRefs to be removed from hold
+     * @param holdNames      the list of hold names
+     * @return The HTTP response
+     */
+    public HttpResponse removeItemsFromHolds(String user, String password, List<String> itemNodeRefs, List<String> holdNames)
+    {
+        final List<String> holdNodeRefs = holdNames.stream()
+                                                   .map(hold -> getItemNodeRef(user, password, String.format("/%s/%s", HOLDS_CONTAINER, hold)))
+                                                   .collect(Collectors.toList());
+        return removeItemsFromHolds(user, password, SC_OK, itemNodeRefs, holdNodeRefs);
+    }
+
+    /**
+     * Remove a list of items (content/record/record folder) from a list of holds
+     *
+     * @param user           the user who removes the item from the hold
+     * @param password       the user's password
+     * @param expectedStatus https status code expected
+     * @param itemNodeRefs   the list of items nodeRefs to be removed from hold
+     * @param holdNodeRefs   the list of hold node refs
+     * @return The HTTP response
+     */
+    public HttpResponse removeItemsFromHolds(String user, String password, int expectedStatus, List<String> itemNodeRefs,
+                                             List<String> holdNodeRefs)
+    {
+        final JSONObject requestParams = addOrRemoveToFromHoldJsonObject(itemNodeRefs, holdNodeRefs);
+        return doPutJsonRequest(user, password, expectedStatus, requestParams, RM_HOLDS_API);
+    }
+
+    /**
+     * Util method to remove item(content/record/record folder) from hold and get the error message
+     *
+     * @param user        the user who removes the item from hold
+     * @param password    the user's password
+     * @param itemNodeRef the nodeRef of the item to be removed from hold
+     * @param holdNodeRef the hold node ref
+     * @return The error message
+     */
+    public String removeFromHoldAndGetMessage(String user, String password, int expectedStatus, String itemNodeRef, String
+            holdNodeRef)
+    {
+        final HttpResponse httpResponse = removeItemsFromHolds(user, password, expectedStatus, Collections.singletonList(itemNodeRef),
+                Collections.singletonList(holdNodeRef));
+        return APIUtils.extractErrorMessageFromHttpResponse(httpResponse);
+    }
+
+    /**
+     *  Get the list of the available holds which have the item node reference if includedInHold parameter is true,
+     *   otherwise a list of hold node references will be retrieved which do not include the given node reference.
+     *
+     * @param user     The username of the user to use.
+     * @param password The password of the user.
+     * @param itemNodeRef The item node reference
+     * @param includedInHold True to retrieve the holds which have the item node reference
+     * @param fileOnly True if only files should be return
+     * @return return a list of hold entries
+     */
+    public List<HoldEntry> getHolds(String user, String password, final String itemNodeRef,
+                                    final Boolean includedInHold, final Boolean fileOnly)
+    {
+        final String parameters = (itemNodeRef != null ? "itemNodeRef=" + NODE_REF_WORKSPACE_SPACES_STORE + itemNodeRef  : "")
+                             + (includedInHold != null ? "&includedInHold=" + includedInHold : "")
+                             + (fileOnly != null ? "&fileOnly=" + fileOnly : "");
+
+        final JSONArray holdEntries = doGetRequest(user, password,
+                MessageFormat.format(GET_RM_HOLDS, "{0}", parameters)).getJSONObject("data").getJSONArray("holds");
+
+        return PojoUtility.jsonToObject(holdEntries, HoldEntry.class);
+    }
+}

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/NodeAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -76,7 +76,7 @@ public class RMAuditAPI extends BaseAPI
         }
         catch (UnsupportedEncodingException e)
         {
-            LOGGER.error("Unable to encode the event name" + e.getMessage());
+            LOGGER.error("Unable to encode the event name {}", e.getMessage());
         }
         JSONArray auditEntries =  doGetRequest(user, password,
                 MessageFormat.format(RM_AUDIT_LOG_API,"{0}", parameters)).getJSONObject("data").getJSONArray("entries");

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -27,9 +27,10 @@
 package org.alfresco.rest.v0;
 
 import static org.alfresco.dataprep.AlfrescoHttpClient.MIME_TYPE_JSON;
+import static org.alfresco.rest.core.v0.APIUtils.ISO_INSTANT_FORMATTER;
 import static org.apache.http.HttpStatus.SC_OK;
 import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 import static org.testng.AssertJUnit.fail;
 
@@ -37,14 +38,12 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.time.Instant;
 import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
 
 import org.alfresco.dataprep.AlfrescoHttpClient;
 import org.alfresco.dataprep.AlfrescoHttpClientFactory;
-import org.alfresco.dataprep.ContentService;
 import org.alfresco.dataprep.UserService;
 import org.alfresco.rest.core.v0.BaseAPI;
 import org.alfresco.rest.core.v0.RMEvents;
@@ -82,7 +81,6 @@ public class RMRolesAndActionsAPI extends BaseAPI
     // logger
     private static final Logger LOGGER = LoggerFactory.getLogger(RMRolesAndActionsAPI.class);
     private static final String MOVE_ACTIONS_API = "action/rm-move-to/site/rm/documentLibrary/{0}";
-    private static final String CREATE_HOLDS_API = "{0}type/rma:hold/formprocessor";
 
     /** http client factory */
     @Autowired
@@ -92,9 +90,6 @@ public class RMRolesAndActionsAPI extends BaseAPI
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private ContentService contentService;
-
     /**
      * Get all the configured RM roles.
      *
@@ -105,7 +100,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
     public Set<String> getConfiguredRoles(String adminUser, String adminPassword)
     {
         // Using "is=true" includes the in-place readers and writers.
-        JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject("data");
+        final JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject(
+                "data");
         return jsonObject.toMap().keySet();
     }
 
@@ -119,11 +115,31 @@ public class RMRolesAndActionsAPI extends BaseAPI
      */
     public Set<String> getCapabilitiesForRole(String adminUser, String adminPassword, String role)
     {
-        JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject("data");
+        final JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject(
+                "data");
         assertTrue("Could not find role '" + role + "' in " + jsonObject.keySet(), jsonObject.has(role));
         return jsonObject.getJSONObject(role).getJSONObject("capabilities").keySet();
     }
 
+    /**
+     * Creates the body for PUT/POST Roles API requests
+     *
+     * @param roleName         the role name
+     * @param roleDisplayLabel a human-readable label for the role
+     * @param capabilities     a list of capabilities for the role
+     * @return
+     */
+    private JSONObject roleRequestBody(String roleName, String roleDisplayLabel, Set<String> capabilities)
+    {
+        final JSONObject requestBody = new JSONObject();
+        requestBody.put("name", roleName);
+        requestBody.put("displayLabel", roleDisplayLabel);
+        final JSONArray capabilitiesArray = new JSONArray();
+        capabilities.forEach(capabilitiesArray::put);
+        requestBody.put("capabilities", capabilitiesArray);
+        return requestBody;
+    }
+
     /**
      * Create a new RM role.
      *
@@ -135,13 +151,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
      */
     public void createRole(String adminUser, String adminPassword, String roleName, String roleDisplayLabel, Set<String> capabilities)
     {
-        JSONObject requestBody = new JSONObject();
-        requestBody.put("name", roleName);
-        requestBody.put("displayLabel", roleDisplayLabel);
-        JSONArray capabilitiesArray = new JSONArray();
-        capabilities.forEach(capabilitiesArray::put);
-        requestBody.put("capabilities", capabilitiesArray);
-        doPostJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, requestBody, RM_ROLES);
+        doPostJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, roleRequestBody(roleName, roleDisplayLabel, capabilities),
+                RM_ROLES);
     }
 
     /**
@@ -155,13 +166,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
      */
     public void updateRole(String adminUser, String adminPassword, String roleName, String roleDisplayLabel, Set<String> capabilities)
     {
-        JSONObject requestBody = new JSONObject();
-        requestBody.put("name", roleName);
-        requestBody.put("displayLabel", roleDisplayLabel);
-        JSONArray capabilitiesArray = new JSONArray();
-        capabilities.forEach(capabilitiesArray::put);
-        requestBody.put("capabilities", capabilitiesArray);
-        doPutJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, requestBody, RM_ROLES_ROLE, roleName);
+        doPutJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, roleRequestBody(roleName, roleDisplayLabel, capabilities),
+                RM_ROLES_ROLE, roleName);
     }
 
     /**
@@ -174,8 +180,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
     public void deleteRole(String adminUser, String adminPassword, String roleName)
     {
         doDeleteRequest(adminUser, adminPassword, MessageFormat.format(RM_ROLES_ROLE, "{0}", roleName));
-        boolean success = !getConfiguredRoles(adminUser, adminPassword).contains(roleName);
-        assertTrue("Failed to delete role " + roleName + " with " + adminUser, success);
+        assertFalse("Failed to delete role " + roleName + " with " + adminUser,
+                getConfiguredRoles(adminUser, adminPassword).contains(roleName));
     }
 
     /**
@@ -205,8 +211,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
      */
     public void assignRoleToUser(String adminUser, String adminPassword, String userName, String role)
     {
-        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
-        String reqURL = MessageFormat.format(
+        final AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
+        final String reqURL = MessageFormat.format(
                 RM_ROLES_AUTHORITIES,
                 client.getApiUrl(),
                 role,
@@ -274,7 +280,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
         }
         catch (JSONException | IOException e)
         {
-            e.printStackTrace();
+            LOGGER.error(e.toString());
         }
         finally
         {
@@ -312,16 +318,40 @@ public class RMRolesAndActionsAPI extends BaseAPI
     }
 
     /**
-     * Perform an action on the record folder
+     * Perform an action on the given content
      *
      * @param user        the user executing the action
      * @param password    the user's password
      * @param contentName the content name
      * @return The HTTP response.
      */
-    public HttpResponse executeAction(String user, String password, String contentName, RM_ACTIONS rm_action)
+    public HttpResponse executeAction(String user, String password, String contentName, RM_ACTIONS action)
     {
-        return executeAction(user, password, contentName, rm_action, null);
+        return executeAction(user, password, contentName, action, null);
+    }
+
+    /**
+     * Creates the body for Actions API requests
+     *
+     * @param user          the user executing the action
+     * @param password      the user's password
+     * @param contentName   the content on which the action is executed
+     * @param action        the action executed
+     * @param actionsParams the request parameters
+     * @return the JSONObject created
+     */
+    private JSONObject actionsRequestBody(String user, String password, String contentName, RM_ACTIONS action,
+                                          JSONObject actionsParams)
+    {
+        final String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, contentName);
+        final JSONObject requestParams = new JSONObject();
+        requestParams.put("name", action.getAction());
+        requestParams.put("nodeRef", recNodeRef);
+        if (actionsParams != null)
+        {
+            requestParams.put("params", actionsParams);
+        }
+        return requestParams;
     }
 
     /**
@@ -335,19 +365,12 @@ public class RMRolesAndActionsAPI extends BaseAPI
      */
     public HttpResponse executeAction(String user, String password, String contentName, RM_ACTIONS action, ZonedDateTime date)
     {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, contentName);
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("name", action.getAction());
-        requestParams.put("nodeRef", recNodeRef);
+        final JSONObject actionParams = new JSONObject();
         if (date != null)
         {
-            String thisMoment = date.format(DateTimeFormatter.ISO_INSTANT);
-            requestParams.put("params", new JSONObject()
-                            .put("asOfDate", new JSONObject()
-                                    .put("iso8601", thisMoment)
-                                )
-                             );
+            actionParams.put("asOfDate", new JSONObject().put("iso8601", ISO_INSTANT_FORMATTER.format(date)));
         }
+        final JSONObject requestParams = actionsRequestBody(user, password, contentName, action, actionParams);
         return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
     }
 
@@ -363,20 +386,14 @@ public class RMRolesAndActionsAPI extends BaseAPI
      */
     public HttpResponse completeEvent(String user, String password, String nodeName, RMEvents event, Instant date)
     {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, nodeName);
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("name", RM_ACTIONS.COMPLETE_EVENT.getAction());
-        requestParams.put("nodeRef", recNodeRef);
         date = (date != null) ? date : Instant.now();
-        String formattedDate = DateTimeFormatter.ISO_INSTANT.format(date);
-        requestParams.put("params", new JSONObject()
-                        .put("eventName", event.getEventName())
-                        .put("eventCompletedBy", user)
-                        .put("eventCompletedAt", new JSONObject()
-                                .put("iso8601", formattedDate)
-                            )
-                         );
-
+        final JSONObject actionParams = new JSONObject().put("eventName", event.getEventName())
+                                                        .put("eventCompletedBy", user)
+                                                        .put("eventCompletedAt", new JSONObject()
+                                                                .put("iso8601", ISO_INSTANT_FORMATTER.format(date))
+                                                            );
+        final JSONObject requestParams = actionsRequestBody(user, password, nodeName, RM_ACTIONS.COMPLETE_EVENT,
+                actionParams);
         return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
     }
 
@@ -391,13 +408,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
      */
     public HttpResponse undoEvent(String user, String password, String contentName, RMEvents event)
     {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, contentName);
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("name", RM_ACTIONS.UNDO_EVENT.getAction());
-        requestParams.put("nodeRef", recNodeRef);
-        requestParams.put("params", new JSONObject()
-                        .put("eventName", event.getEventName()));
-
+        final JSONObject requestParams = actionsRequestBody(user, password, contentName, RM_ACTIONS.UNDO_EVENT,
+                new JSONObject().put("eventName", event.getEventName()));
         return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
     }
 
@@ -416,58 +428,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
         {
             item.delete();
         }
-        boolean success = !(contentService.getFolderObject(contentService.getCMISSession(username, password), siteId, containerName).getChildren().getHasMoreItems());
-        assertTrue("Not all items were deleted from " + containerName, success);
-    }
-
-    /**
-     * Deletes hold
-     *
-     * @param username user's username
-     * @param password its password
-     * @param holdName the hold name
-     * @throws AssertionError if the deletion was unsuccessful.
-     */
-    public void deleteHold(String username, String password, String holdName)
-    {
-        deleteItem(username, password, "/Holds/" + holdName);
-    }
-
-
-    /**
-     * Util method to create a hold
-     *
-     * @param user        the user creating the category
-     * @param password    the user's password
-     * @param holdName    the hold name
-     * @param reason      hold reason
-     * @param description hold description
-     * @return The HTTP response (or null if no POST call was needed).
-     */
-    public HttpResponse createHold(String user, String password, String holdName, String reason, String description)
-    {
-        // if the hold already exists don't try to create it again
-        String holdsContainerPath = getFilePlanPath() + "/Holds";
-        String fullHoldPath = holdsContainerPath + "/" + holdName;
-        CmisObject hold = getObjectByPath(user, password, fullHoldPath);
-        if (hold != null)
-        {
-            return null;
-        }
-        // retrieve the Holds container nodeRef
-        String parentNodeRef = getItemNodeRef(user, password, "/Holds");
-
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("alf_destination", getNodeRefSpacesStore() + parentNodeRef);
-        requestParams.put("prop_cm_name", holdName);
-        requestParams.put("prop_cm_description", description);
-        requestParams.put("prop_rma_holdReason", reason);
-
-        // Make the POST request and throw an assertion error if it fails.
-        HttpResponse httpResponse = doPostJsonRequest(user, password, SC_OK, requestParams, CREATE_HOLDS_API);
-        assertNotNull("Expected object to have been created at " + fullHoldPath,
-                    getObjectByPath(user, password, fullHoldPath));
-        return httpResponse;
+        assertFalse("Not all items were deleted from " + containerName,
+                contentService.getFolderObject(contentService.getCMISSession(username, password), siteId, containerName).getChildren().getHasMoreItems());
     }
 
     /**

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -28,14 +28,12 @@ package org.alfresco.rest.v0;
 
 import static org.apache.http.HttpStatus.SC_OK;
 
-import org.alfresco.dataprep.ContentService;
 import org.alfresco.rest.core.v0.BaseAPI;
 import org.apache.http.HttpResponse;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -49,9 +47,6 @@ public class RecordFoldersAPI extends BaseAPI
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(RecordFoldersAPI.class);
 
-    @Autowired
-    private ContentService contentService;
-
     /**
      * Close the record folder
      *

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -33,7 +33,6 @@ import java.text.MessageFormat;
 import java.util.Map;
 
 import org.alfresco.dataprep.CMISUtil.DocumentType;
-import org.alfresco.dataprep.ContentService;
 import org.alfresco.rest.core.v0.BaseAPI;
 import org.apache.chemistry.opencmis.client.api.CmisObject;
 import org.apache.commons.lang3.tuple.Pair;
@@ -42,7 +41,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -59,9 +57,6 @@ public class RecordsAPI extends BaseAPI
 
     private static final String CREATE_NON_ELECTRONIC_RECORD_API = "{0}type/rma:nonElectronicDocument/formprocessor";
 
-    @Autowired
-    private ContentService contentService;
-
     /**
      * Declare documents as records
      *