REPO-5712 Fix exception logging in EventGeneratorQueue

Include the exception stacktrace so that any event framework
wrong configuration can be easily detected.

.github/dependabot.yml

@@ -158,9 +158,3 @@ updates:
     - "8.16"
   registries:
   - maven-repository-artifacts-alfresco-com-nexus-content-groups-int
-- package-ecosystem: "docker"
-  directory: "packaging/docker-alfresco/"
-  schedule:
-    interval: "daily"
-    time: "22:00"
-    timezone: Africa/Abidjan

.travis.yml

@@ -1,7 +1,7 @@
 ---
 dist: focal
 language: java
-jdk: openjdk17
+jdk: openjdk11
 
 services:
   - docker
@@ -69,8 +69,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext01TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -78,16 +78,16 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext02TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext03TestSuite"
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext03TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -95,8 +95,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext04TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -104,8 +104,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - mkdir -p "${HOME}/tmp"
         - cp repository/src/test/resources/realms/alfresco-realm.json "${HOME}/tmp"
         - export HOST_IP=$(hostname  -I | cut -f1 -d' ')
@@ -116,8 +116,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext06TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -125,8 +125,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContextExtraTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -134,8 +134,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=MiscContextTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -143,8 +143,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=SearchTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dindex.subsystem.name=solr6
 
     - name: "Repository - MariaDB 10.2.18 tests"
@@ -152,7 +152,7 @@ jobs:
       install: skip
       before_script:
         - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.2.18 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - MariaDB 10.4 tests"
@@ -160,7 +160,7 @@ jobs:
       install: skip
       before_script:
         - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.4 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - MariaDB 10.5 tests"
@@ -168,7 +168,7 @@ jobs:
       install: skip
       before_script:
         - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.5 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - MariaDB 10.6 tests"
@@ -177,56 +177,105 @@ jobs:
       install: skip
       before_script:
         - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.6 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
+    - name: "Repository - MySQL 5.7.23 tests"
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
+      before_script:
+        - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco  mysql:5.7.23 --transaction-isolation='READ-COMMITTED' --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+
     - name: "Repository - MySQL 8 tests"
       # We run tests on the latest version of MySQL on pull requests plus the normal master and release branches - ignored on feature branches
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/                         ) OR commit_message =~ /\[db\]/ OR commit_message =~ /\[latest db\]/
       install: skip
       before_script:
         - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco  mysql:8 --transaction-isolation='READ-COMMITTED'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
-    - name: "Repository - PostgreSQL 13.7 tests"
+    - name: "Repository - PostgreSQL 10.9 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.7 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.9 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
-    - name: "Repository - PostgreSQL 14.4 tests"
-      # We only run DB tests on the latest version of PostgreSQL on feature branches
-      if: commit_message !~ /\[skip db\]/ OR commit_message =~ /\[db\]/ OR commit_message =~ /\[latest db\]/
+    - name: "Repository - PostgreSQL 11.7 tests"
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+
+    - name: "Repository - PostgreSQL 11.12 tests"
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
+      before_script:
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.12 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+
+    - name: "Repository - PostgreSQL 12.4 tests"
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
+      before_script:
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:12.4 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+
+    - name: "Repository - PostgreSQL 12.7 tests"
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
+      before_script:
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:12.7 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+
+    - name: "Repository - PostgreSQL 13.1 tests"
+      # We only run DB tests on the latest version of PostgreSQL on feature branches
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
+      before_script:
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.1 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+
+    - name: "Repository - PostgreSQL 13.3 tests"
+      # We only run DB tests on the latest version of PostgreSQL on feature branches
+      if: commit_message !~ /\[skip db\]/ OR commit_message =~ /\[latest db\]/
+      install: skip
+      before_script:
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - Messaging tests"
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false
 
     - name: "Remote-api - AppContext01TestSuite"
       if: commit_message !~ /\[skip repo\]/
       install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Remote-api - AppContext02TestSuite"
       if: commit_message !~ /\[skip repo\]/
       install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -234,8 +283,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -243,8 +292,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
         - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
@@ -252,8 +301,8 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
-        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
+        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "REST API TAS tests part1"
@@ -333,7 +382,7 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       install: skip
       before_script:
-        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:14.4 postgres -c 'max_connections=300'
+        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
       script: travis_wait 20 mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "AGS Unit & Integration Tests 01 (PostgreSQL)"

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>17.77</version>
+      <version>23.1.0.23-SNAPSHOT</version>
    </parent>
 
    <modules>
@@ -30,20 +30,16 @@
             <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
-                  <!-- Keeping illegal-access=permit for Java 11 compatibility, even though it has no effect on JDK 17 -->
                   <argLine>
                      --illegal-access=permit
-                     --add-opens=java.base/java.lang=ALL-UNNAMED
                   </argLine>
                </configuration>
             </plugin>
             <plugin>
                <artifactId>maven-failsafe-plugin</artifactId>
-               <!-- Keeping illegal-access=permit for Java 11 compatibility, even though it has no effect on JDK 17 -->
                <configuration>
                   <argLine>
                      --illegal-access=permit
-                     --add-opens=java.base/java.lang=ALL-UNNAMED
                   </argLine>
                </configuration>
             </plugin>

amps/ags/rm-automation/pom.xml

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

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

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>17.77</version>
+      <version>23.1.0.23-SNAPSHOT</version>
    </parent>
 
    <build>
@@ -87,7 +87,7 @@
       <dependency>
          <groupId>com.github.docker-java</groupId>
          <artifactId>docker-java</artifactId>
-         <version>3.2.13</version>
+         <version>3.2.12</version>
       </dependency>
    </dependencies>
 </project>

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

@@ -26,6 +26,8 @@
  */
 package org.alfresco.rest.v0;
 
+import static org.testng.AssertJUnit.assertTrue;
+
 import java.text.MessageFormat;
 
 import org.alfresco.rest.core.v0.BaseAPI;
@@ -36,9 +38,7 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
+
 /**
  * Methods to make API requests using v0 API on Records Management Custom Model Reference Definitions
  *
@@ -57,8 +57,6 @@ public class CustomDefinitionsAPI extends BaseAPI
      * create reference endpoint
      */
     private static final String CREATE_RELATIONSHIP_API_ENDPOINT = "{0}node/{1}/customreferences";
-    private static final String GET_RELATIONSHIP_API_ENDPOINT = "{0}node/{1}/relationships";
-    private static final String DELETE_RELATIONSHIP_API_ENDPOINT = "{0}node/{1}/targetnode/{2}/uniqueName/{3}";
 
     /**
      * logger
@@ -143,48 +141,4 @@ public class CustomDefinitionsAPI extends BaseAPI
         assertTrue("Creating relationship from " + recordNodeIdFrom + " to " + recordNodeIdTo + " failed.", success);
     }
 
-    public void createRelationship(
-        String adminUser,
-        String adminPassword,
-        int expectedStatus,
-        String recordNodeIdFrom,
-        String recordNodeIdTo,
-        CustomDefinitions relationshipType) {
-        //create the request body
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("toNode", NODE_REF_WORKSPACE_SPACES_STORE + recordNodeIdTo);
-        requestParams.put("refId", getCustomReferenceId(adminUser, adminPassword, relationshipType
-            .getDefinition()));
-        //send the API request to create the relationship
-        JSONObject setRelationshipStatus = doPostRequest(adminUser, adminPassword, requestParams,
-            MessageFormat.format(CREATE_RELATIONSHIP_API_ENDPOINT, "{0}", NODE_PREFIX + recordNodeIdFrom));
-        //check the response
-        assertEquals("POST request for createRelationship was not successful.", expectedStatus, setRelationshipStatus.getJSONObject("status").get("code"));
-    }
-
-    public JSONObject getRelationshipDetails(
-        String adminUser,
-        String adminPassword,
-        String nodeRef) {
-        //send the API request to create the relationship
-        JSONObject relationshipDetails = doGetRequest(adminUser, adminPassword,
-            MessageFormat.format(GET_RELATIONSHIP_API_ENDPOINT, "{0}", NODE_PREFIX + nodeRef));
-        //check the response
-        assertNotNull("The Relationship detail is not found for the Noderef " + nodeRef, relationshipDetails);
-        return relationshipDetails;
-    }
-
-    public void deleteRelationship(
-        String adminUser,
-        String adminPassword,
-        String recordNodeIdFrom,
-        String recordNodeIdTo,
-        String relationshipUniqueName) {
-        //send the API request to create the relationship
-        JSONObject setRelationshipStatus = doDeleteRequest(adminUser, adminPassword,
-            MessageFormat.format(DELETE_RELATIONSHIP_API_ENDPOINT, "{0}", NODE_PREFIX + recordNodeIdFrom,NODE_PREFIX + recordNodeIdTo,relationshipUniqueName));
-        //check the response
-        boolean success = (setRelationshipStatus != null) && setRelationshipStatus.getBoolean("success");
-        assertTrue("Deleting relationship from " + recordNodeIdFrom + " to " + recordNodeIdTo + " failed.", success);
-    }
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java

@@ -161,7 +161,7 @@ public class BaseRMRestTest extends RestTest
      */
     @Override
     @BeforeClass (alwaysRun = true)
-    public void checkServerHealth()
+    public void checkServerHealth() throws Exception
     {
         // Create RM Site if not exist
         createRMSiteIfNotExists();

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

@@ -73,7 +73,6 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import org.alfresco.utility.model.TestGroup;
 
 /**
  * API tests for declaring document as record and filing it immediately to a record folder location within the file plan
@@ -258,7 +257,7 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest
      * Then I receive an error indicating that I have attempted to declare and file a document into an invalid record folder
      * And the document is not declared as a record
      */
-    @Test (dataProvider = "invalidDestinationPaths",groups = { TestGroup.NOT_SUPPORTED_ON_SINGLE_PIPELINE })
+    @Test (dataProvider = "invalidDestinationPaths")
     public void declareAndFileToInvalidLocationUsingActionsAPI(String containerPath, String expectedException) throws Exception
     {
         STEP("Declare document as record with an invalid location parameter value");

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

@@ -62,7 +62,6 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import org.alfresco.utility.model.TestGroup;
 
 /**
  * API tests for declaring a document version as record and filing to a record folder location within the file plan
@@ -208,7 +207,7 @@ public class FileVersionAsRecordTests extends BaseRMRestTest
      * record folder
      * And the document is not declared as a version record
      */
-    @Test (dataProvider = "invalidDestinationPaths", groups = { TestGroup.NOT_SUPPORTED_ON_SINGLE_PIPELINE })
+    @Test (dataProvider = "invalidDestinationPaths")
     public void declareVersionAndFileToInvalidLocationUsingActionsAPI(String containerPath, String expectedException) throws Exception
     {
         STEP("Declare document as record version with an invalid location parameter value");

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

@@ -1,202 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package org.alfresco.rest.rm.community.records;
-import static org.alfresco.rest.core.v0.BaseAPI.RM_SITE_ID;
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_DESCRIPTION;
-import static org.alfresco.rest.rm.community.base.TestData.HOLD_REASON;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import java.util.Collections;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.custom.CustomDefinitions;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.v0.CustomDefinitionsAPI;
-import org.alfresco.rest.v0.HoldsAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.rest.v0.RecordCategoriesAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.apache.commons.lang.StringUtils;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.Test;
-import static org.apache.commons.httpclient.HttpStatus.SC_INTERNAL_SERVER_ERROR;
-import static org.apache.commons.httpclient.HttpStatus.SC_OK;
-/**
- * Add Relationship tests
- * @author Kavit Shah
- */
-public class AddRelationshipTests extends BaseRMRestTest
-{
-    private final String TEST_PREFIX = generateTestPrefix(AddRelationshipTests.class);
-    private final String CATEGORY = TEST_PREFIX + "category";
-    private final String HOLD1 = TEST_PREFIX + "hold1";
-    private final String FOLDER = TEST_PREFIX + "RM_2709_1814_FOLDER";
-    private final String RECORD1 = TEST_PREFIX + "RM_2709_1814_RECORD_ONE";
-    private final String RECORD2 = TEST_PREFIX + "RM_1814_RECORD_TWO";
-    private String hold1NodeRef;
-    @Autowired
-    private HoldsAPI holdsAPI;
-    @Autowired
-    private RecordsAPI recordsAPI;
-    @Autowired
-    private CustomDefinitionsAPI customDefinitionsAPI;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RecordCategoriesAPI recordCategoriesAPI;
-
-    @Test (priority = 1)
-    @AlfrescoTest (jira = "RM-1814")
-    public void addRelationshipToHoldRecord()
-    {
-        String CATEGORY_RELATIONSHIP = CATEGORY + "To Hold";
-        //create RM site
-        createRMSiteIfNotExists();
-        //create record category, record folder and records
-        RecordCategory recordCategory = createCategoryIfDoesNotExist(CATEGORY_RELATIONSHIP);
-        RecordCategoryChild recordCategoryChild = createRecordFolderInCategory(FOLDER, recordCategory);
-
-        createRecordItems(recordCategoryChild, RECORD1);
-        Record record2 = createRecordItems(recordCategoryChild, RECORD2);
-
-        //create Hold
-        hold1NodeRef = holdsAPI.createHoldAndGetNodeRef(getAdminUser().getUsername(),
-            getAdminUser().getPassword(), HOLD1, HOLD_REASON, HOLD_DESCRIPTION);
-        //add RECORD2 to holds
-        holdsAPI.addItemsToHolds(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            SC_OK, Collections.singletonList(record2.getId()),
-            Collections.singletonList(hold1NodeRef));
-
-        // get records nodeRefs
-        String elRecordFullName1 = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), FOLDER, RECORD1);
-        String elRecordNodeRef1 = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName1, "/" + CATEGORY_RELATIONSHIP + "/" + FOLDER);
-
-        String elRecordFullName2 = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), FOLDER, RECORD2);
-        String elRecordNodeRef2 = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName2, "/" + CATEGORY_RELATIONSHIP + "/" + FOLDER);
-
-        // create Relationship
-        customDefinitionsAPI.createRelationship(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            SC_INTERNAL_SERVER_ERROR,
-            formatNodeRef(elRecordNodeRef1),
-            formatNodeRef(elRecordNodeRef2),
-            CustomDefinitions.ATTACHMENT);
-
-        //delete preconditions
-        deletePrecondition();
-    }
-
-    @Test (priority = 2)
-    @AlfrescoTest (jira = "RM-1874")
-    public void deleteRelationship()
-    {
-        String CATEGORY_RELATIONSHIP = CATEGORY + "deleteRelationship";
-        // create RM site
-        createRMSiteIfNotExists();
-        // create record category, record folder and records
-        RecordCategory recordCategory = createCategoryIfDoesNotExist(CATEGORY_RELATIONSHIP);
-        RecordCategoryChild recordCategoryChild = createRecordFolderInCategory(FOLDER, recordCategory);
-
-        createRecordItems(recordCategoryChild, RECORD1);
-        createRecordItems(recordCategoryChild, RECORD2);
-
-        // Add Relationship
-        String elRecordFullName1 = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), FOLDER, RECORD1);
-        String elRecordNodeRef1 = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName1, "/" + CATEGORY_RELATIONSHIP + "/" + FOLDER);
-
-        String elRecordFullName2 = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), FOLDER, RECORD2);
-        String elRecordNodeRef2 = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName2, "/" + CATEGORY_RELATIONSHIP + "/" + FOLDER);
-
-        customDefinitionsAPI.createRelationship(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            formatNodeRef(elRecordNodeRef1),
-            formatNodeRef(elRecordNodeRef2),
-            CustomDefinitions.ATTACHMENT);
-
-        // Get RelationshipDetails
-        JSONObject relationshipDetails = customDefinitionsAPI.getRelationshipDetails(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            formatNodeRef(elRecordNodeRef1));
-
-        // Delete RelationshipDetails
-        customDefinitionsAPI.deleteRelationship(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            formatNodeRef(elRecordNodeRef1),
-            formatNodeRef(elRecordNodeRef2),
-            relationshipUniqueName(relationshipDetails));
-
-        // delete category
-        tearDown(CATEGORY_RELATIONSHIP);
-    }
-
-    private void deletePrecondition()
-    {
-        holdsAPI.deleteHold(getAdminUser(), hold1NodeRef);
-    }
-
-    private Record createRecordItems(RecordCategoryChild recordCategoryChild, String record) {
-        return createElectronicRecord(recordCategoryChild.getId(), record);
-    }
-
-    private RecordCategory createCategoryIfDoesNotExist(String CATEGORY_ALL) {
-        return createRootCategory(getDataUser().usingAdmin().getAdminUser(), CATEGORY_ALL);
-    }
-
-    private RecordCategoryChild createRecordFolderInCategory(String FOLDER_SEARCH, RecordCategory recordCategory) {
-        return createFolder(getDataUser().usingAdmin().getAdminUser(), recordCategory.getId(), FOLDER_SEARCH);
-    }
-
-    private String formatNodeRef(String nodeRef) {
-        return StringUtils.remove(nodeRef,"workspace://SpacesStore/");
-    }
-
-    private void tearDown(String category) {
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, FOLDER);
-        rmRolesAndActionsAPI.deleteAllItemsInContainer(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), RM_SITE_ID, category);
-        recordCategoriesAPI.deleteCategory(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), category);
-    }
-
-    private String relationshipUniqueName(JSONObject relationshipDetails) {
-        return relationshipDetails.getJSONObject("data").getJSONArray("items").getJSONObject(0).getJSONObject("node")
-            .get("relationshipUniqueName").toString();
-    }
-}

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

@@ -1,148 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.records;
-
-import static java.util.Arrays.asList;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.createBodyForMoveCopy;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.toContentModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createElectronicRecordModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.getFile;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.IMAGE_FILE;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordModel;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.OK;
-import org.alfresco.rest.model.RestNodeModel;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-/**
- * This class contains the tests for
- * CreateElectronicRecordsTests Action REST API
- *
- * @author Shishuraj Bisht
- */
-public class CreateElectronicRecordsTests extends BaseRMRestTest {
-
-    private RecordCategory rootCategory;
-    private UserModel updateUser;
-    /**
-     * data prep services
-     */
-
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-
-    private final String TEST_PREFIX = generateTestPrefix(CreateElectronicRecordsTests.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-
-    @BeforeClass (alwaysRun = true)
-    public void preConditions()
-    {
-        STEP("Create RM Site");
-        createRMSiteIfNotExists();
-
-        STEP("Create RM Admin user");
-        rmRolesAndActionsAPI.createUserAndAssignToRole(getAdminUser().getUsername(), getAdminUser().getPassword(), RM_ADMIN,
-            getAdminUser().getPassword(),
-            "Administrator");
-
-        STEP("Create root level category");
-        rootCategory = createRootCategory(getRandomName("Category"));
-
-        STEP("Create the record folder1 inside the rootCategory");
-        String recordFolder1 = createCategoryFolderInFilePlan().getId();
-    }
-
-    /**
-     * Test v0 methods to create and get electronic records.
-     */
-    @Test
-    @AlfrescoTest (jira = "RM-2768")
-    public void createElectronicRecordTest() throws Exception {
-
-        //create electronic record in record folder
-        String recordFolder1 = createRecordFolder(rootCategory.getId(), getRandomName("recFolder")).getId();
-        RecordFolderAPI recordFolderAPI = getRestAPIFactory().getRecordFolderAPI();
-
-        Record electronicRecord = recordFolderAPI.createRecord(createElectronicRecordModel(), recordFolder1, getFile(IMAGE_FILE));
-        assertStatusCode(CREATED);
-        STEP("Check the electronic record has been created");
-        assertStatusCode(CREATED);
-
-        // Get recordsAPI instance initialised to updateUser
-        org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI(updateUser);
-
-        for (Record record: asList(electronicRecord)) {
-            recordsAPI.getRecord(record.getId());
-            assertStatusCode(OK);
-
-            // Generate update metadata
-            String newName = getModifiedPropertyValue(record.getName());
-            String newTitle = getModifiedPropertyValue(record.getProperties().getTitle());
-            String newDescription = getModifiedPropertyValue(record.getProperties().getDescription());
-
-            // Update record
-            recordsAPI.updateRecord(createRecordModel(newName, newDescription, newTitle), record.getId());
-            assertStatusCode(OK);
-        }
-        // move the record from one folder1 to folder2
-        STEP("Create the record folder2 inside the rootCategory");
-        String recordFolder2 = createCategoryFolderInFilePlan().getId();
-
-        STEP("Move record from folder1 to folder2");
-        RestNodeModel electronicDocRestNodeModel = getRestAPIFactory()
-            .getNodeAPI(toContentModel(electronicRecord.getId()))
-            .move(createBodyForMoveCopy(recordFolder2));
-        assertStatusCode(OK);
-    }
-
-    private String getModifiedPropertyValue(String originalValue) {
-        /* to be used to append to modifications */
-        String MODIFIED_PREFIX = "modified_";
-        return MODIFIED_PREFIX + originalValue;
-    }
-
-    @AfterClass (alwaysRun = true)
-    public void deletePreConditions() {
-        STEP("Delete the created rootCategory along with corresponding record folders/records present in it");
-        getRestAPIFactory().getRecordCategoryAPI().deleteRecordCategory(rootCategory.getId());
-    }
-
-    }
-
-

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

@@ -1,145 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.records;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.testng.Assert.assertTrue;
-/**
- * This class contains the tests for
- * Create the Document, marking them as Record, Hiding them using Site Collaborator
- * The Rm_Admin user then verofy if he is able to access the documents using Rest Api
- *
- * @author Kavit Shah
- */
-public class DeclareInPlaceRecordTests extends BaseRMRestTest {
-
-    private final String TEST_PREFIX = generateTestPrefix(DeclareInPlaceRecordTests.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    private UserModel testUser;
-    private UserModel RmAdminUser;
-    private SiteModel testSite;
-    private FolderModel testFolder;
-    /**
-     * data prep services
-     */
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RecordsAPI recordsAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void preConditions() {
-        STEP("Create RM Site");
-        createRMSiteIfNotExists();
-
-        STEP("Create RM Admin user");
-        rmRolesAndActionsAPI.createUserAndAssignToRole(getAdminUser().getUsername(), getAdminUser().getPassword(), RM_ADMIN,
-            getAdminUser().getPassword(),
-            "Administrator");
-
-        RmAdminUser = new UserModel(RM_ADMIN,getAdminUser().getPassword());
-
-        STEP("Create collab_user user");
-        testUser = getDataUser().createRandomTestUser();
-        testSite = dataSite.usingAdmin().createPublicRandomSite();
-
-        // invite collab_user to Collaboration site with Contributor role
-        getDataUser().addUserToSite(testUser, testSite, UserRole.SiteContributor);
-
-        testFolder = dataContent.usingSite(testSite).usingUser(testUser).createFolder();
-    }
-
-    @Test
-    @AlfrescoTest(jira = "RM-2366")
-    public void declareInplaceRecord() {
-
-        // Upload document in a folder in a collaboration site
-        FileModel uploadedDocHidden = dataContent.usingSite(testSite)
-            .usingUser(testUser)
-            .usingResource(testFolder)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        // declare uploadedDocument as record
-        Record uploadedRecordHidden = getRestAPIFactory().getFilesAPI(testUser).declareAsRecord(uploadedDocHidden.getNodeRefWithoutVersion());
-        assertStatusCode(CREATED);
-
-        recordsAPI.hideRecord(testUser.getUsername(),testUser.getPassword(),uploadedRecordHidden.getId());
-
-        // Upload document in a folder in a collaboration site
-        FileModel uploadedDocWithoutHidden = dataContent.usingSite(testSite)
-            .usingUser(testUser)
-            .usingResource(testFolder)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        Record uploadedRecordWithoutHidden = getRestAPIFactory().getFilesAPI(testUser).declareAsRecord(uploadedDocWithoutHidden.getNodeRefWithoutVersion());
-        assertStatusCode(CREATED);
-
-        assertTrue(isRecordChildOfUnfiledContainer(uploadedRecordHidden.getId()), uploadedRecordHidden.getId() + " doesn't exist in Unfiled Records");
-        assertTrue(isRecordChildOfUnfiledContainer(uploadedRecordWithoutHidden.getId()), uploadedRecordWithoutHidden.getId() + " doesn't exist in Unfiled Records");
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void deletePreConditions() {
-        STEP("Delete the records created in the test");
-        getRestAPIFactory()
-            .getUnfiledContainersAPI(RmAdminUser)
-            .getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS)
-            .getEntries()
-            .stream()
-                .forEach(x -> getRestAPIFactory()
-                    .getRecordsAPI()
-                    .deleteRecord(x.getEntry().getId()));
-
-    }
-
-    private boolean isRecordChildOfUnfiledContainer(String recordId) {
-        return getRestAPIFactory()
-            .getUnfiledContainersAPI(RmAdminUser)
-            .getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS)
-            .getEntries()
-            .stream()
-            .anyMatch(c -> c.getEntry().getId().equals(recordId));
-    }
-}

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

@@ -1,226 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package org.alfresco.rest.rm.community.records;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.core.v0.BaseAPI;
-import org.alfresco.rest.model.RestNodeModel;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledRecordFolderAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.apache.chemistry.opencmis.client.api.CmisObject;
-import org.apache.http.HttpResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.alfresco.rest.core.v0.APIUtils.convertHTTPResponseToJSON;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentType.UNFILED_RECORD_FOLDER_TYPE;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.createBodyForMoveCopy;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.toContentModel;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.CREATED;
-
-public class FileUnfiledRecordsTests extends BaseRMRestTest {
-
-    private final String TEST_PREFIX = generateTestPrefix(FileUnfiledRecordsTests.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    public static final String NODE_REF_WORKSPACE_SPACES_STORE = "workspace://SpacesStore/";
-    private UserModel testUser;
-    private SiteModel testSite;
-    private String unfiledRecordFolderId;
-    private UserModel RmAdminUser;
-    private RecordCategory rootCategory;
-    private RecordCategoryChild recordFolder;
-    private final String recordName = "RM-2790 record";
-    private final String recordTitle = recordName + " title";
-    private final String recordDescription = recordName + " description";
-    /**
-     * data prep services
-     */
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RecordsAPI recordsAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void preConditions() {
-
-        STEP("Create RM Site");
-        createRMSiteIfNotExists();
-
-        STEP("Create RM Admin user");
-        rmRolesAndActionsAPI.createUserAndAssignToRole(getAdminUser().getUsername(), getAdminUser().getPassword(), RM_ADMIN,
-            getAdminUser().getPassword(),
-            "Administrator");
-
-        RmAdminUser = new UserModel(RM_ADMIN, getAdminUser().getPassword());
-
-        STEP("Create collab_user user");
-        testUser = getDataUser().createRandomTestUser();
-        testSite = dataSite.usingAdmin().createPublicRandomSite();
-
-        // invite collab_user to Collaboration site with Contributor role
-        getDataUser().addUserToSite(testUser, testSite, UserRole.SiteContributor);
-    }
-
-    @Test
-    @AlfrescoTest(jira = "RM-2790")
-    public void fileUnfiledRecords() throws Exception {
-
-        STEP("Upload the document to test site and then make it reacord");
-        // Upload document in a folder in a collaboration site
-        FileModel uploadedDocbyCollabUser = dataContent.usingSite(testSite)
-            .usingUser(testUser)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        // declare uploadedDocument as record
-        Record uploadedDocRecordbyCollabUser = getRestAPIFactory().getFilesAPI(testUser)
-            .declareAsRecord(uploadedDocbyCollabUser.getNodeRefWithoutVersion());
-        assertStatusCode(CREATED);
-
-        STEP("Create root level category");
-        rootCategory = createRootCategory(RmAdminUser, getRandomName("Category"));
-
-        STEP("Create the record folder inside the rootCategory");
-        recordFolder = createFolder(RmAdminUser, rootCategory.getId(), getRandomName("Folder"));
-
-        STEP("Create a non-electronic record by completing some of the fields");
-        Map<Enum<?>, String> non_electronic_records_properties = new HashMap<>();
-        non_electronic_records_properties.put(BaseAPI.RMProperty.TITLE, recordTitle);
-        non_electronic_records_properties.put(BaseAPI.RMProperty.DESCRIPTION, recordDescription);
-        non_electronic_records_properties.put(BaseAPI.RMProperty.NAME, recordName);
-        non_electronic_records_properties.put(BaseAPI.RMProperty.PHYSICAL_SIZE, "");
-        non_electronic_records_properties.put(BaseAPI.RMProperty.NUMBER_OF_COPIES, "");
-        non_electronic_records_properties.put(BaseAPI.RMProperty.SHELF, "");
-        non_electronic_records_properties.put(BaseAPI.RMProperty.STORAGE_LOCATION, "");
-        non_electronic_records_properties.put(BaseAPI.RMProperty.BOX, "");
-        non_electronic_records_properties.put(BaseAPI.RMProperty.FILE, "");
-
-        HttpResponse nonElectronicRecordHttpResponse = recordsAPI.createNonElectronicRecord(getAdminUser().getUsername(),
-            getAdminUser().getPassword(), non_electronic_records_properties, rootCategory.getName(), recordFolder.getName());
-
-        String nonElectronicRecordId = getNodeRef(nonElectronicRecordHttpResponse);
-
-        STEP("Check the non-electronic record has been created");
-        assertStatusCode(CREATED);
-
-        STEP("Create a electronic record by completing some of the fields");
-        Map<BaseAPI.RMProperty, String> electronic_records_properties = new HashMap<>();
-        electronic_records_properties.put(BaseAPI.RMProperty.DESCRIPTION, recordDescription);
-        electronic_records_properties.put(BaseAPI.RMProperty.NAME, recordName);
-
-        recordsAPI.uploadElectronicRecord(RmAdminUser.getUsername(),
-            RmAdminUser.getPassword(), electronic_records_properties, recordFolder.getName(), CMISUtil.DocumentType.TEXT_PLAIN);
-
-        CmisObject electronicRecord = recordsAPI.getRecord(RmAdminUser.getUsername(),
-            RmAdminUser.getPassword(),recordFolder.getName(), electronic_records_properties.get(BaseAPI.RMProperty.NAME));
-
-        STEP("Check the electronic record has been created");
-        assertStatusCode(CREATED);
-
-        STEP("Create a root folder under FilePlan - Unfiled");
-        String unFiledFolder = createUnFileFolder();
-
-        STEP("Move all the Unfiled Records to unFiledFolder");
-        RestNodeModel uploadDocRestNodeModel = getRestAPIFactory()
-            .getNodeAPI(toContentModel(uploadedDocRecordbyCollabUser.getId()))
-            .move(createBodyForMoveCopy(unFiledFolder));
-
-        RestNodeModel nonElectronicDocRestNodeModel = getRestAPIFactory()
-            .getNodeAPI(toContentModel(nonElectronicRecordId))
-            .move(createBodyForMoveCopy(unFiledFolder));
-
-        RestNodeModel electronicDocRestNodeModel = getRestAPIFactory()
-            .getNodeAPI(toContentModel(electronicRecord.getId()))
-            .move(createBodyForMoveCopy(unFiledFolder));
-
-        STEP("Move all the Record present in the unFiledFolder to Folder inside Root Category");
-
-        getRestAPIFactory()
-            .getNodeAPI(toContentModel(uploadDocRestNodeModel.getId()))
-            .move(createBodyForMoveCopy(recordFolder.getId()));
-
-        getRestAPIFactory()
-            .getNodeAPI(toContentModel(nonElectronicDocRestNodeModel.getId()))
-            .move(createBodyForMoveCopy(recordFolder.getId()));
-
-        getRestAPIFactory()
-            .getNodeAPI(toContentModel(electronicDocRestNodeModel.getId()))
-            .move(createBodyForMoveCopy(recordFolder.getId()));
-
-        getRestAPIFactory().getRecordsAPI().deleteRecord(uploadDocRestNodeModel.getId());
-        getRestAPIFactory().getRecordsAPI().deleteRecord(nonElectronicDocRestNodeModel.getId());
-        getRestAPIFactory().getRecordsAPI().deleteRecord(electronicDocRestNodeModel.getId());
-
-        UnfiledRecordFolderAPI unfiledRecordFoldersAPI = getRestAPIFactory().getUnfiledRecordFoldersAPI();
-        unfiledRecordFoldersAPI.deleteUnfiledRecordFolder(unFiledFolder);
-
-        RecordFolderAPI recordFolderAPI = getRestAPIFactory().getRecordFolderAPI();
-        String recordFolderId = recordFolder.getId();
-        recordFolderAPI.deleteRecordFolder(recordFolderId);
-    }
-
-    @AfterClass (alwaysRun = true)
-    public void deletePreConditions()
-    {
-        STEP("Delete the created rootCategory along with corresponding record folders/records present in it");
-        getRestAPIFactory().getRecordCategoryAPI().deleteRecordCategory(rootCategory.getId());
-    }
-
-    private String createUnFileFolder() {
-        String categoryName = "RM-2790 record Category name " + getRandomAlphanumeric();
-
-        unfiledRecordFolderId = createUnfiledContainerChild(UNFILED_RECORDS_CONTAINER_ALIAS,
-            categoryName + getRandomAlphanumeric(), UNFILED_RECORD_FOLDER_TYPE).getId();
-        return unfiledRecordFolderId;
-    }
-
-    private String getNodeRef(HttpResponse httpResponse) {
-            return convertHTTPResponseToJSON(httpResponse).getString("persistedObject")
-                .replace(NODE_REF_WORKSPACE_SPACES_STORE, "");
-    }
-}

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

@@ -1,179 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package org.alfresco.rest.rm.community.records;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.junit.Assert.assertNotNull;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.fail;
-
-public class InplaceRecordSearchTests extends BaseRMRestTest {
-
-    private UserModel siteCollaborator, siteConsumer, nonSiteMember;
-    private SiteModel privateSite;
-    private Record uploadedDocRecordbyCollabUser;
-    private FileModel uploadedDocbyCollabUser;
-    @Autowired
-    private RecordsAPI recordsAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void preConditions() {
-
-        STEP("Create RM Site");
-        createRMSiteIfNotExists();
-
-        // And a private collaboration site
-        privateSite = dataSite.usingAdmin().createPrivateRandomSite();
-
-        // And a site collaborator
-        siteCollaborator = getDataUser().createRandomTestUser();
-        getDataUser().addUserToSite(siteCollaborator, privateSite, UserRole.SiteCollaborator);
-
-        // And a site consumer
-        siteConsumer = getDataUser().createRandomTestUser();
-        getDataUser().addUserToSite(siteConsumer, privateSite, UserRole.SiteConsumer);
-
-        nonSiteMember = getDataUser().createRandomTestUser();
-    }
-
-    /**
-     * Given a RM site
-     * And a private collaboration site
-     * And a site collaborator
-     * And a site consumer
-     * And a user who is not a member of the site
-     * And a document that isn't a record
-     * When the collaborator declares it as a record
-     * Then the collaborator can browse to the record in the document library
-     * And can find the record using live search
-     * And can find the record using advanced search
-     * And the consumer can browse to the record in the document library
-     * And can find the record using live search
-     * And can find the record using advanced search
-     * And the user who is not a member of the site can't find the record using live search
-     * And can't find the record using advanced search
-     */
-    @Test
-    public void searchForInplaceRecord() {
-        // And a document that isn't a record
-        uploadedDocbyCollabUser = dataContent.usingSite(privateSite)
-            .usingUser(siteCollaborator)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        assertNotNull(uploadedDocbyCollabUser.getNodeRef());
-
-        // declare uploadedDocument as record
-        uploadedDocRecordbyCollabUser = getRestAPIFactory().getFilesAPI(siteCollaborator)
-            .declareAsRecord(uploadedDocbyCollabUser.getNodeRefWithoutVersion());
-        assertStatusCode(CREATED);
-
-        assertNotNull(uploadedDocRecordbyCollabUser.getId());
-
-        STEP("Allow the Document to be index for it to be available");
-
-        try
-        {
-            Utility.sleep(1000, 40000, () ->
-            {
-                JSONObject siteConsumerSearchJson = getSearchApi().liveSearchForDocuments(siteConsumer.getUsername(),
-                    siteConsumer.getPassword(),
-                    uploadedDocbyCollabUser.getName());
-                assertTrue("Site Consumer not able to find the document.",siteConsumerSearchJson.getJSONArray("items").length() != 0);
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try
-        {
-            Utility.sleep(1000, 40000, () ->
-                {
-                    JSONObject siteCollaboratorSearchJson = getSearchApi().liveSearchForDocuments(siteCollaborator.getUsername(),
-                    siteCollaborator.getPassword(),
-                    uploadedDocbyCollabUser.getName());
-                    assertTrue("Site Collaborator not able to find the document.",siteCollaboratorSearchJson.getJSONArray("items").length() != 0);
-                });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        JSONObject nonSiteMemberSearchJson = getSearchApi().liveSearchForDocuments(nonSiteMember.getUsername(),
-            nonSiteMember.getPassword(),
-            uploadedDocbyCollabUser.getName());
-
-        assertTrue("Non Site Member is able to access restricted document.",nonSiteMemberSearchJson.getJSONArray("items").isEmpty());
-    }
-
-    /**
-     * Given @see {@link #searchForInplaceRecord()}
-     * When the collaboration user hides the record in the collaboration site
-     * Then the collaborator can not browse to the record in the document library
-     * And can't find the record using live search
-     * And can't find the record using advanced search
-     */
-    @Test(dependsOnMethods = {"searchForInplaceRecord"})
-    public void usersCantFindRecordAfterHide() {
-        recordsAPI.hideRecord(siteCollaborator.getUsername(),siteCollaborator.getPassword(),uploadedDocRecordbyCollabUser.getId());
-
-        JSONObject siteCollaboratorSearchJson = getSearchApi().liveSearchForDocuments(siteCollaborator.getUsername(),
-            siteCollaborator.getPassword(),
-            uploadedDocbyCollabUser.getName());
-        assertTrue("Site Collaborator able to find the document after it is hidden.",siteCollaboratorSearchJson.getJSONArray("items").isEmpty());
-    }
-
-    @AfterClass
-    public void tearDown() {
-        // clean-up collab site
-        dataSite.usingAdmin().deleteSite(privateSite);
-
-        // clean-up users siteCollaborator, siteConsumer, nonSiteMember
-        dataUser.deleteUser(siteCollaborator);
-        dataUser.deleteUser(siteConsumer);
-        dataUser.deleteUser(nonSiteMember);
-    }
-}

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

@@ -1,539 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package org.alfresco.rest.rm.community.records;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.core.v0.BaseAPI;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.record.RecordContent;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChild;
-import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.rest.v0.SearchAPI;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.apache.http.HttpResponse;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.json.JSONArray;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.HashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import static org.alfresco.rest.rm.community.base.TestData.ELECTRONIC_RECORD_NAME;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentType.CONTENT_TYPE;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.*;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createTempFile;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-import static org.testng.Assert.assertTrue;
-/**
- * Tests the search of records in Records Search page
- * @author Kavit Shah
- */
-public class SearchRecordsTests extends BaseRMRestTest {
-
-    private Optional<UserModel> nonRmSiteUser, rm_user_search, rm_manager, rm_admin_search;
-
-    /** The default password used when creating test users. */
-    public static final String ROLE_RM_MANAGER = "RecordsManager";
-    private final String TEST_PREFIX = generateTestPrefix(SearchRecordsTests.class);
-    private final String CATEGORY_ALL = TEST_PREFIX + "everybody's category";
-    private final String FOLDER_SEARCH = TEST_PREFIX + "basic search folder";
-    private final String FOLDER_ADMIN_ONLY = TEST_PREFIX + "rm admin category";
-    private final String CATEGORY_ADMIN_ONLY = TEST_PREFIX + "rm admin category";
-    public static final String ROLE_RM_USER = "User";
-    public static final String ADMIN = "Administrator";
-    private final String ELECTRONIC_RECORD = TEST_PREFIX + " Electronic";
-    private final String UNFILED_ELECTRONIC_RECORD = TEST_PREFIX + " Unfiled Electronic";
-    private final String NON_ELECTRONIC_RECORD = TEST_PREFIX + " Non-Electronic";
-    private final String ADMIN_ELECTRONIC_RECORD = TEST_PREFIX + " admin Electronic";
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-    public static final String TEST_CONTENT = "This is some test content";
-    private RecordCategory categoryAll, category_Admin_Only;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private SearchAPI searchAPI;
-    @Autowired
-    private RecordsAPI recordsAPI;
-
-    @BeforeClass (alwaysRun = true)
-    public void createRecordsForSearch()
-    {
-        createRMSiteIfNotExists();
-        nonRmSiteUser = Optional.ofNullable(getDataUser().createRandomTestUser());
-        // create RM manager and RM user
-        createRMManager();
-        createRMUser();
-        createRMAdmin();
-        categoryAll = createCategoryIfDoesNotExist(CATEGORY_ALL);
-        createRecordFolderInCategory(FOLDER_SEARCH, categoryAll);
-
-        category_Admin_Only = createCategoryIfDoesNotExist(CATEGORY_ADMIN_ONLY);
-        createRecordFolderInCategory(FOLDER_ADMIN_ONLY,category_Admin_Only);
-
-        // upload records in folder in category and in Unfiled Records
-        uploadElectronicRecordInContainer(ELECTRONIC_RECORD, FOLDER_SEARCH);
-        createNonElectronicRecordInContainer(NON_ELECTRONIC_RECORD, CATEGORY_ALL, FOLDER_SEARCH);
-        uploadElectronicRecordInContainer(ADMIN_ELECTRONIC_RECORD, FOLDER_ADMIN_ONLY);
-
-        UnfiledContainerChild electronicRecord = UnfiledContainerChild.builder()
-            .name(UNFILED_ELECTRONIC_RECORD)
-            .nodeType(CONTENT_TYPE)
-            .content(RecordContent.builder().mimeType("text/plain").build())
-            .build();
-        getRecordsFromUnfiledRecordsContainer(electronicRecord);
-    }
-
-    /**
-     * Given I have created record category X which contains record folder Y which contains record Z
-     * And I have selected to display record category id in the search results
-     * When I issue a record search whose results will contain record X
-     * Then record X is displayed in the results
-     * And the record category X's ID is also displayed in search result meta-data for record X
-     */
-    @Test(priority = 1)
-    public void searchResultsWithRecordCategoryIdentifier() {
-        AtomicBoolean electronicRecordFound = new AtomicBoolean(false);
-        AtomicReference<JSONArray> items = new AtomicReference<>();
-        AtomicBoolean recordCategoryIdentifier = new AtomicBoolean(false);
-
-        STEP("Open the record search page and search by the items created");
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                JSONObject searchResult = (searchAPI
-                    .rmSearch(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                        getDataUser().usingAdmin().getAdminUser().getPassword(),
-                        "rm",
-                        "keywords:" + TEST_PREFIX + "*",
-                        "records/true,undeclared/true,vital/false,folders/false,categories/false,frozen/false,cutoff/false",
-                        "rma:identifier/asc"));
-                items.set((JSONArray) searchResult.get("items"));
-                assertFalse("Site Consumer not able to find the document.", ((JSONArray)searchResult.get("items")).isEmpty());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        STEP("Check that the records from file plan have the record category identifier displayed");
-        List searchList = IntStream.range(0, items.get().length()).mapToObj(i-> items.get().get(i)).collect(Collectors.toList());
-
-        searchList.stream().forEach(x -> {
-            Map<String, String> reconstructedUtilMap = Arrays.stream(x.toString().split(","))
-                .map(s -> s.split(":"))
-                .collect(Collectors.toMap(s -> s[0], s -> s[1]));
-            if(reconstructedUtilMap.get("\"name\"").contains(TEST_PREFIX + " Electronic")) {
-                electronicRecordFound.set(true);
-            }
-        });
-        assertFalse("The File Name with the Prefix " + TEST_PREFIX + " as Electronic Record was not found.", !electronicRecordFound.get());
-
-        STEP("Change the search filter to return only record folders and record categories");
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                JSONObject searchResult = (searchAPI
-                    .rmSearch(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                        getDataUser().usingAdmin().getAdminUser().getPassword(),
-                        "rm",
-                        "keywords:" + TEST_PREFIX + "*",
-                        "records/false,undeclared/true,vital/false,folders/true,categories/true,frozen/false,cutoff/false",
-                        "rma:identifier/asc"));
-                items.set((JSONArray) searchResult.get("items"));
-                assertFalse("Site Consumer not able to find the document.", ((JSONArray)searchResult.get("items")).isEmpty());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-        STEP("Check that the records folders and categories don't have a record category identifier displayed");
-        List recordFolderSearchList = IntStream.range(0, items.get().length()).mapToObj(i-> items.get().get(i)).collect(Collectors.toList());
-
-        recordFolderSearchList.stream().forEach(x -> {
-            Map<String, String> reconstructedUtilMap = Arrays.stream(x.toString().split(","))
-                .map(s -> s.split(":"))
-                .collect(Collectors.toMap(s -> s[0], s -> s[1]));
-            if(null != reconstructedUtilMap.get("\"rma_recordCategoryIdentifier\"")) {
-                recordCategoryIdentifier.set(true);
-            }
-        });
-        assertFalse("Record Category Identifier displayed for " + TEST_PREFIX + ".", recordCategoryIdentifier.get());
-    }
-
-    /**
-     * User with RM User role can see the records he has permission over and all in Unfiled Records
-     * <p>
-     * Given that I am a RM User
-     * I can see only the records in File Plan I have permission over and all in Unfiled Records
-     */
-    @Test (priority = 2)
-    public void nonRMUserSearchResults() {
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(nonRmSiteUser.get().getUsername(),
-                        nonRmSiteUser.get().getPassword(),
-                        ELECTRONIC_RECORD));
-                assertFalse("The file with search term " + ELECTRONIC_RECORD + " was found using RM Not Site User "+ nonRmSiteUser.get().getUsername(),getResult(ELECTRONIC_RECORD,stringList));
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(nonRmSiteUser.get().getUsername(),
-                        nonRmSiteUser.get().getPassword(),
-                        UNFILED_ELECTRONIC_RECORD));
-                assertFalse("The file with search term " + UNFILED_ELECTRONIC_RECORD + " was not found using RM Not Site User "+ nonRmSiteUser.get().getUsername(),getResult(UNFILED_ELECTRONIC_RECORD,stringList));
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(nonRmSiteUser.get().getUsername(),
-                        nonRmSiteUser.get().getPassword(),
-                        NON_ELECTRONIC_RECORD));
-                assertFalse("The file with search term " + NON_ELECTRONIC_RECORD + " was not found using RM Not Site User "+ nonRmSiteUser.get().getUsername(),getResult(NON_ELECTRONIC_RECORD,stringList));
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = searchAPI
-                    .searchForDocumentsAsUser(nonRmSiteUser.get().getUsername(),
-                        nonRmSiteUser.get().getPassword(),
-                        ADMIN_ELECTRONIC_RECORD);
-                assertFalse("The file with search term " + ADMIN_ELECTRONIC_RECORD + " was not found using RM Not Site User "+ nonRmSiteUser.get().getUsername(),getResult(ADMIN_ELECTRONIC_RECORD,stringList));
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-    }
-
-    /**
-     * User with RM User role can see the records he has permission over and all in Unfiled Records
-     * <p>
-     * Given that I am a RM User
-     * I can see only the records in File Plan I have permission over and all in Unfiled Records
-     */
-    @Test (priority = 3)
-    public void rmUserSearchResults() {
-        getRestAPIFactory().getRMUserAPI().addUserPermission(categoryAll.getId(), rm_user_search.get(), PERMISSION_READ_RECORDS);
-        getRestAPIFactory().getRMUserAPI().addUserPermission(categoryAll.getId(), rm_user_search.get(), PERMISSION_FILE_RECORDS);
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_user_search.get().getUsername(),
-                        rm_user_search.get().getPassword(),
-                        ELECTRONIC_RECORD));
-                assertTrue(getResult(ELECTRONIC_RECORD,stringList),"The file with search term" + ELECTRONIC_RECORD + " was not found using RM User "+ rm_user_search.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_user_search.get().getUsername(),
-                        rm_user_search.get().getPassword(),
-                        UNFILED_ELECTRONIC_RECORD));
-                assertTrue(getResult(UNFILED_ELECTRONIC_RECORD,stringList),"The file with search term" + UNFILED_ELECTRONIC_RECORD + " was not found using RM User "+ rm_user_search.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_user_search.get().getUsername(),
-                        rm_user_search.get().getPassword(),
-                        NON_ELECTRONIC_RECORD));
-                assertTrue(getResult(NON_ELECTRONIC_RECORD,stringList),"The file with search term" + NON_ELECTRONIC_RECORD + " was not found using RM User "+ rm_user_search.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = searchAPI
-                    .searchForDocumentsAsUser(rm_user_search.get().getUsername(),
-                        rm_user_search.get().getPassword(),
-                        ADMIN_ELECTRONIC_RECORD);
-                assertFalse("The file with search term" + ADMIN_ELECTRONIC_RECORD + " was not found using RM User "+ rm_user_search.get().getUsername(),getResult(ADMIN_ELECTRONIC_RECORD,stringList));
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-    }
-
-    /**
-     * User with RM Manager role can see the records he has permission over and all in Unfiled Records
-     * <p>
-     * Given that I am a RM Manager
-     * I can see only the records in File Plan I have permission over and all in Unfiled Records
-     */
-    @Test (priority = 4)
-    public void rmManagerSearchResults() {
-        getRestAPIFactory().getRMUserAPI().addUserPermission(categoryAll.getId(), rm_manager.get(), PERMISSION_READ_RECORDS);
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_manager.get().getUsername(),
-                        rm_manager.get().getPassword(),
-                        ELECTRONIC_RECORD));
-                assertTrue(getResult(ELECTRONIC_RECORD,stringList),"The file with search term " + ELECTRONIC_RECORD + " was not found using RM manager User "+ rm_manager.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_manager.get().getUsername(),
-                        rm_manager.get().getPassword(),
-                        UNFILED_ELECTRONIC_RECORD));
-                assertTrue(getResult(UNFILED_ELECTRONIC_RECORD,stringList),"The file with search term " + UNFILED_ELECTRONIC_RECORD + " was not found using RM manager User "+ rm_manager.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_manager.get().getUsername(),
-                        rm_manager.get().getPassword(),
-                        NON_ELECTRONIC_RECORD));
-                assertTrue(getResult(NON_ELECTRONIC_RECORD,stringList),"The file with search term " + NON_ELECTRONIC_RECORD + " was not found using RM manager User "+ rm_manager.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = searchAPI
-                    .searchForDocumentsAsUser(rm_manager.get().getUsername(),
-                        rm_manager.get().getPassword(),
-                        ADMIN_ELECTRONIC_RECORD);
-                assertFalse("The file with search term" + ADMIN_ELECTRONIC_RECORD + " was found using RM manager User "+ rm_manager.get().getUsername(),getResult(ADMIN_ELECTRONIC_RECORD,stringList));
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-    }
-
-    /**
-     * User with RM Administrator role can see all the records
-     *
-     * Given that I am a RM Administrator
-     * I can see all the records in File Plan and Unfiled Records through RM Search and Advanced Search
-     */
-    @Test(priority = 5)
-    public void rmAdminSearchResults() {
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_admin_search.get().getUsername(),
-                        rm_admin_search.get().getPassword(),
-                        ELECTRONIC_RECORD));
-                assertTrue(getResult(ELECTRONIC_RECORD,stringList),"The file with search term " + ELECTRONIC_RECORD + " was not found using RM Admin User "+ rm_admin_search.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_admin_search.get().getUsername(),
-                        rm_admin_search.get().getPassword(),
-                        UNFILED_ELECTRONIC_RECORD));
-                assertTrue(getResult(UNFILED_ELECTRONIC_RECORD,stringList),"The file with search term " + UNFILED_ELECTRONIC_RECORD + " was not found using RM Admin User "+ rm_admin_search.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        try {
-            Utility.sleep(1000, 40000, () -> {
-                List<String> stringList = (searchAPI
-                    .searchForDocumentsAsUser(rm_admin_search.get().getUsername(),
-                        rm_admin_search.get().getPassword(),
-                        NON_ELECTRONIC_RECORD));
-                assertTrue(getResult(NON_ELECTRONIC_RECORD,stringList),"The file with search term " + NON_ELECTRONIC_RECORD + " was not found using RM Admin User "+ rm_admin_search.get().getUsername());
-            });
-        }
-        catch (InterruptedException e) {
-            fail("InterruptedException received while waiting for results.");
-        }
-    }
-
-    private void createRMManager() {
-        // create RM manager
-        rm_manager = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-            getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            rm_manager.get().getUsername(),
-            ROLE_RM_MANAGER
-        );
-    }
-
-    private void createRMUser() {
-        // create RM manager
-        rm_user_search = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-            getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            rm_user_search.get().getUsername(),
-            ROLE_RM_USER
-        );
-    }
-
-    private void createRMAdmin() {
-        // create RM Admin
-        rm_admin_search = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-            getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            rm_admin_search.get().getUsername(),
-            ADMIN
-        );
-    }
-
-    private RecordCategory createCategoryIfDoesNotExist(String CATEGORY_ALL) {
-        return createRootCategory(getDataUser().usingAdmin().getAdminUser(), CATEGORY_ALL);
-    }
-
-    private RecordCategoryChild createRecordFolderInCategory(String FOLDER_SEARCH, RecordCategory recordCategory) {
-        return createFolder(getDataUser().usingAdmin().getAdminUser(), recordCategory.getId(), FOLDER_SEARCH);
-    }
-
-    private void uploadElectronicRecordInContainer(String electronic_record, String folder_search) {
-        recordsAPI.uploadElectronicRecord(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            getDefaultElectronicRecordProperties(electronic_record), folder_search, CMISUtil.DocumentType.TEXT_PLAIN);
-    }
-
-
-    protected HttpResponse createNonElectronicRecordInContainer(String name, String categoryName, String folderName) {
-        Map<BaseAPI.RMProperty, String> defaultProperties = new HashMap<>();
-        defaultProperties.put(BaseAPI.RMProperty.NAME, name);
-        defaultProperties.put(BaseAPI.RMProperty.TITLE, TITLE);
-        defaultProperties.put(BaseAPI.RMProperty.DESCRIPTION, DESCRIPTION);
-
-        return recordsAPI.createNonElectronicRecord(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), defaultProperties, categoryName, folderName);
-    }
-
-    public Map<BaseAPI.RMProperty, String> getDefaultElectronicRecordProperties(String recordName) {
-        Map<BaseAPI.RMProperty, String> defaultProperties = new HashMap<>();
-        defaultProperties.put(BaseAPI.RMProperty.NAME, recordName);
-        defaultProperties.put(BaseAPI.RMProperty.TITLE, TITLE);
-        defaultProperties.put(BaseAPI.RMProperty.DESCRIPTION, DESCRIPTION);
-        defaultProperties.put(BaseAPI.RMProperty.CONTENT, TEST_CONTENT);
-        return defaultProperties;
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void standardSearchTeardown() {
-        // delete categories
-        deleteRecordCategory(categoryAll.getId());
-        deleteRecordCategory(category_Admin_Only.getId());
-
-        // delete users
-        Optional.of(nonRmSiteUser).ifPresent(x -> getDataUser().deleteUser(x.get()));
-        Optional.of(rm_user_search).ifPresent(x -> getDataUser().deleteUser(x.get()));
-        Optional.of(rm_manager).ifPresent(x -> getDataUser().deleteUser(x.get()));
-        Optional.of(rm_admin_search).ifPresent(x -> getDataUser().deleteUser(x.get()));
-    }
-
-    private boolean getResult(String partialRecordName, List<String> searchResults) {
-        if(null != searchResults) {
-            for (String searchResult : searchResults) {
-                if (searchResult.startsWith(partialRecordName)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private Object[][] getRecordsFromUnfiledRecordsContainer(UnfiledContainerChild electronicRecord)
-    {
-        UnfiledContainerAPI unfiledContainersAPI = getRestAPIFactory().getUnfiledContainersAPI();
-        return new String[][] {
-            { unfiledContainersAPI.uploadRecord(electronicRecord, UNFILED_RECORDS_CONTAINER_ALIAS,
-                createTempFile(ELECTRONIC_RECORD_NAME, ELECTRONIC_RECORD_NAME)).getId()}
-        };
-    }
-}

amps/ags/rm-community/pom.xml

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

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

@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.3
-POSTGRES_TAG=14.4
-ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
+POSTGRES_TAG=13.3
+ACTIVEMQ_TAG=5.16.1

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

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>17.77</version>
+      <version>23.1.0.23-SNAPSHOT</version>
    </parent>
 
    <properties>
@@ -434,7 +434,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre11-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>
@@ -505,7 +505,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre11-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java

@@ -156,24 +156,25 @@ public class ExtendedRuleServiceImpl extends RuleServiceImpl
      * @see org.alfresco.repo.rule.RuleServiceImpl#saveRule(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.rule.Rule)
      */
     @Override
-    public Rule saveRule(final NodeRef nodeRef, final Rule rule)
+    public void saveRule(final NodeRef nodeRef, final Rule rule)
     {
         validateWormLockRuleAction(rule);
         if (filePlanService.isFilePlanComponent(nodeRef))
         {
-            return AuthenticationUtil.runAsSystem(new RunAsWork<Rule>()
+            AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
             {
                 @Override
-                public Rule doWork()
+                public Void doWork()
                 {
-                    return ExtendedRuleServiceImpl.super.saveRule(nodeRef, rule);
+                    ExtendedRuleServiceImpl.super.saveRule(nodeRef, rule);
+                    return null;
                 }
 
             });
         }
         else
         {
-            return super.saveRule(nodeRef, rule);
+            super.saveRule(nodeRef, rule);
         }
     }
 

amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/rule/FilePlanRuleInheritanceTest.java

@@ -82,7 +82,13 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
             public void given()
             {
                 filePlan = createFilePlan();
-                rule = createRuleThatAppliesToChildren();
+                
+                // create a rule that applies to childre
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
+                rule.setRuleType("inbound");
+                rule.setAction(completeRecordAction);
+                rule.applyToChildren(true);
             }
 
             public void when()
@@ -121,7 +127,13 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
             public void given()
             {
                 filePlan = createFilePlan();
-                rule = createRuleThatAppliesToChildren();
+                
+                // create a rule that applies to childre
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
+                rule.setRuleType("inbound");
+                rule.setAction(completeRecordAction);
+                rule.applyToChildren(true);
             }
 
             public void when()
@@ -159,7 +171,13 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
             public void given()
             {
                 filePlan = createFilePlan();
-                rule = createRuleThatAppliesToChildren();
+                
+                // create a rule that applies to childre
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
+                rule.setRuleType("inbound");
+                rule.setAction(completeRecordAction);
+                rule.applyToChildren(true);
             }
 
             public void when()
@@ -197,7 +215,13 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
             public void given()
             {
                 filePlan = createFilePlan();
-                rule = createRuleThatAppliesToChildren();
+                
+                // create a rule that applies to childre
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
+                rule.setRuleType("inbound");
+                rule.setAction(completeRecordAction);
+                rule.applyToChildren(true);
             }
 
             public void when()
@@ -237,7 +261,13 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
             {
                 filePlan = createFilePlan();
                 recordCategory = filePlanService.createRecordCategory(filePlan, GUID.generate());
-                rule = createRuleThatAppliesToChildren();
+                
+                // create a rule that applies to childre
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
+                rule.setRuleType("inbound");
+                rule.setAction(completeRecordAction);
+                rule.applyToChildren(true);
             }
 
             public void when()
@@ -256,15 +286,4 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
             }
         }); 
     }
-
-    private Rule createRuleThatAppliesToChildren()
-    {
-        Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
-        Rule rule = new Rule();
-        rule.setRuleType("inbound");
-        rule.setTitle("Rule name");
-        rule.setAction(completeRecordAction);
-        rule.applyToChildren(true);
-        return rule;
-    }
 }

amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties

@@ -3,8 +3,8 @@
 #
 
 # Version label
-version.major=7
-version.minor=3
+version.major=23
+version.minor=1
 version.revision=0
 version.label=
 
@@ -15,4 +15,4 @@ version.edition=Community
 version.scmrevision=@scm-path@-r@scm-revision@
 
 # Build number
-version.build=r@scm-revision@-b@build-number@
+version.build=r@scm-revision@-b@build-number@

amps/ags/rm-community/rm-community-repo/test/resources/test-context.xml

@@ -168,7 +168,6 @@
       <property name="nodeService" ref="NodeService"/>
       <property name="ruleService" ref="RuleService"/>
       <property name="actionService" ref="ActionService"/>
-      <property name="runtimeActionService" ref="actionService"/>
       <property name="dictionaryService" ref="DictionaryService"/>
       <property name="fileFolderService" ref="FileFolderService"/>
       <property name="namespaceService" ref="NamespaceService" />

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileReportActionUnitTest.java

@@ -27,7 +27,7 @@
 
 package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.action.BaseActionUnitTest;
@@ -86,7 +86,7 @@ public class FileReportActionUnitTest extends BaseActionUnitTest
         fileReportAction.executeImpl(getMockedAction(), actionedUponNodeRef);
 
         // == then ==
-        verifyNoInteractions(mockedReportService, mockedNodeService);
+        verifyZeroInteractions(mockedReportService, mockedNodeService);
     }
 
     /**
@@ -110,6 +110,6 @@ public class FileReportActionUnitTest extends BaseActionUnitTest
         fileReportAction.executeImpl(getMockedAction(), actionedUponNodeRef);
 
         // == then ==
-        verifyNoInteractions(mockedReportService, mockedNodeService);
+        verifyZeroInteractions(mockedReportService, mockedNodeService);
     }
 }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnlinkFromActionUnitTest.java

@@ -28,7 +28,7 @@
 package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import static org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock.generateText;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImplUnitTest.java

@@ -38,8 +38,8 @@ import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagement
 import static org.alfresco.module.org_alfresco_module_rm.model.rma.type.RmSiteType.DEFAULT_SITE_NAME;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponentUnitTest.java

@@ -27,7 +27,7 @@
 
 package org.alfresco.module.org_alfresco_module_rm.bootstrap;
 
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoterUnitTest.java

@@ -28,8 +28,8 @@
 package org.alfresco.module.org_alfresco_module_rm.capability;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityConditionUnitTest.java

@@ -29,9 +29,9 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java

@@ -29,7 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.content;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import java.io.File;
@@ -125,6 +125,6 @@ public class EagerContentStoreCleanerUnitTest extends BaseUnitTest
         
         eagerContentStoreCleaner.deleteFromStore(AlfMock.generateText(), mock(ContentStore.class));
         
-        verifyNoInteractions(mockedContentCleanser);
+        verifyZeroInteractions(mockedContentCleanser);
     }
 }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java

@@ -35,9 +35,9 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/compatibility/DictionaryBootstrapPostProcessorUnitTest.java

@@ -31,7 +31,7 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
 import org.junit.Test;
@@ -73,7 +73,7 @@ public class DictionaryBootstrapPostProcessorUnitTest extends BaseUnitTest
         // === then ===
         verify(mockedBeanFactory, times(1)).containsBean(BEAN_SITESERVICE_BOOTSTRAP);
         verifyNoMoreInteractions(mockedBeanFactory);
-        verifyNoInteractions(mockedBeanDefinition);
+        verifyZeroInteractions(mockedBeanDefinition);
     }
 
     /**

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspectUnitTest.java

@@ -27,7 +27,7 @@
 
 package org.alfresco.module.org_alfresco_module_rm.model.rma.aspect;
 
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerTypeUnitTest.java

@@ -26,8 +26,8 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.model.rma.type;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatchUnitTest.java

@@ -27,8 +27,8 @@
 
 package org.alfresco.module.org_alfresco_module_rm.patch.v22;
 
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22RemoveInPlaceRolesFromAllPatchUnitTest.java

@@ -32,7 +32,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -72,7 +72,7 @@ public class RMv22RemoveInPlaceRolesFromAllPatchUnitTest extends BaseUnitTest
         patch.applyInternal();
         
         // then
-        verifyNoInteractions(mockedAuthorityService);
+        verifyZeroInteractions(mockedAuthorityService);
     }
 
     /**

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatchUnitTest.java

@@ -30,8 +30,8 @@ package org.alfresco.module.org_alfresco_module_rm.patch.v23;
 import static java.util.Arrays.asList;
 import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_SAVED_SEARCH;
 import static org.alfresco.module.org_alfresco_module_rm.model.rma.type.RmSiteType.DEFAULT_SITE_NAME;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyMap;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v24/RMv24FilePlanContainerRuleInheritancePatchUnitTest.java

@@ -29,7 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.patch.v24;
 
 import static org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock.generateNodeRef;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.Collections;
@@ -81,7 +81,7 @@ public class RMv24FilePlanContainerRuleInheritancePatchUnitTest
         patch.applyInternal();
         
         // then
-        verifyNoInteractions(mockedNodeService);
+        verifyZeroInteractions(mockedNodeService);
     }
     
     /**

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v32/RMv32HoldReportUpdatePatchUnitTest.java

@@ -27,8 +27,8 @@
 
 package org.alfresco.module.org_alfresco_module_rm.patch.v32;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Matchers.anyMap;
+import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -92,8 +92,8 @@ public class RMv32HoldReportUpdatePatchUnitTest
 
         patch.applyInternal();
         verify(mockedNodeService, times(1)).addAspect(hold_report, ContentModel.ASPECT_VERSIONABLE, null);
-        verify(mockedVersionService, times(1)).createVersion((NodeRef) any(), anyMap());
-        verify(mockedContentWriter, times(1)).putContent((InputStream) any());
+        verify(mockedVersionService, times(1)).createVersion((NodeRef) anyObject(), anyMap());
+        verify(mockedContentWriter, times(1)).putContent((InputStream) anyObject());
     }
 }
 

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java

@@ -28,7 +28,7 @@
 package org.alfresco.module.org_alfresco_module_rm.patch.v33;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v35/RMv35HoldNewChildAssocPatchUnitTest.java

@@ -33,13 +33,13 @@ import static java.util.Collections.emptyList;
 import static org.alfresco.model.ContentModel.ASSOC_CONTAINS;
 import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASSOC_FROZEN_CONTENT;
 import static org.alfresco.module.org_alfresco_module_rm.patch.v35.RMv35HoldNewChildAssocPatch.PATCH_ASSOC_NAME;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyMap;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java

@@ -32,7 +32,7 @@ import static org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock.gener
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptWithContentUnitTest.java

@@ -28,7 +28,7 @@
 package org.alfresco.module.org_alfresco_module_rm.script.hold;
 
 import static org.alfresco.module.org_alfresco_module_rm.test.util.WebScriptExceptionMatcher.badRequest;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
 
 import java.util.Collections;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java

@@ -30,8 +30,8 @@ package org.alfresco.module.org_alfresco_module_rm.test.util;
 import static java.util.Collections.emptyMap;
 
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.lenient;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/NodeTypeUtilityUnitTest.java

@@ -28,7 +28,7 @@ package org.alfresco.module.org_alfresco_module_rm.util;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java

@@ -27,8 +27,8 @@
 
 package org.alfresco.module.org_alfresco_module_rm.version;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java

@@ -30,7 +30,7 @@ package org.alfresco.rm.rest.api.sites;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

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

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

amps/pom.xml

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

amps/share-services/pom.xml

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

amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java

@@ -176,6 +176,7 @@ public class NodeBrowserScript extends NodeBrowserPost implements Serializable
 			{
 				status.setCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 				status.setMessage(e.getMessage());
+				status.setException(e);
 				status.setRedirect(true);
 			}
     		return tmplMap;

amps/share-services/src/test/java/org/alfresco/slingshot/web/scripts/SlingshotContentGetTest.java

@@ -40,7 +40,6 @@ import org.json.JSONObject;
 import org.junit.Assert;
 import org.springframework.extensions.webscripts.TestWebScriptServer;
 import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
-import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -195,13 +194,13 @@ public class SlingshotContentGetTest extends BaseWebScriptTest
 
         NodeRef rootFolder = createNode(companyHome, "rootFolder", ContentModel.TYPE_FOLDER);
 
-        NodeRef doc1 = createNodeWithTextContent(rootFolder, "doc1", ContentModel.TYPE_CONTENT, "doc1 file content", MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        NodeRef doc1 = createNodeWithTextContent(rootFolder, "doc1", ContentModel.TYPE_CONTENT, "doc1 file content");
 
         NodeRef folderX = createNode(rootFolder, "X", ContentModel.TYPE_FOLDER);
         NodeRef folderY = createNode(folderX, "Y", ContentModel.TYPE_FOLDER);
         NodeRef folderZ = createNode(folderY, "Z", ContentModel.TYPE_FOLDER);
 
-        NodeRef doc2 = createNodeWithTextContent(folderZ, "doc2", ContentModel.TYPE_CONTENT, "doc2 file content", MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        NodeRef doc2 = createNodeWithTextContent(folderZ, "doc2", ContentModel.TYPE_CONTENT, "doc2 file content");
 
         // uri with relative path at the end
         String uri = URL_CONTENT_DOWNLOAD + doc1.getId() + "/X/Y/Z/doc2";
@@ -213,50 +212,7 @@ public class SlingshotContentGetTest extends BaseWebScriptTest
         nodeService.deleteNode(rootFolder);
     }
 
-    public void testForcedAttachment() throws Exception
-    {
-        Repository repositoryHelper = (Repository) getServer().getApplicationContext().getBean("repositoryHelper");
-        NodeRef companyHome = repositoryHelper.getCompanyHome();
-
-        NodeRef rootFolder = createNode(companyHome, "rootFolder", ContentModel.TYPE_FOLDER);
-        NodeRef testhtml = createNodeWithTextContent(rootFolder, "testhtml", ContentModel.TYPE_CONTENT, "testhtml content", MimetypeMap.MIMETYPE_HTML);
-        NodeRef testpdf = createNodeWithTextContent(rootFolder, "testpdf", ContentModel.TYPE_CONTENT, "testpdf content", MimetypeMap.MIMETYPE_PDF);
-
-        String uri = URL_CONTENT_DOWNLOAD + testhtml.getId() + "?a=false";
-        GetRequest req = new GetRequest(uri);
-        Response res = sendRequest(req, 200);
-        assertEquals("attachment", res.getHeader("Content-Disposition"));
-        assertEquals(MimetypeMap.MIMETYPE_HTML + ";charset=UTF-8", res.getContentType());
-
-        uri = URL_CONTENT_DOWNLOAD + testhtml.getId();
-        res = sendRequest(new GetRequest(uri), 200);
-        assertEquals("attachment", res.getHeader("Content-Disposition"));
-        assertEquals(MimetypeMap.MIMETYPE_HTML + ";charset=UTF-8", res.getContentType());
-
-        uri = URL_CONTENT_DOWNLOAD + testhtml.getId() + "?a=true";
-        res = sendRequest(new GetRequest(uri), 200);
-        assertEquals("attachment", res.getHeader("Content-Disposition"));
-        assertEquals(MimetypeMap.MIMETYPE_HTML + ";charset=UTF-8", res.getContentType());
-
-        uri = URL_CONTENT_DOWNLOAD + testpdf.getId() + "?a=false";
-        res = sendRequest(new GetRequest(uri), 200);
-        assertNull(res.getHeader("Content-Disposition"));
-        assertEquals(MimetypeMap.MIMETYPE_PDF + ";charset=UTF-8", res.getContentType());
-
-        uri = URL_CONTENT_DOWNLOAD + testpdf.getId();
-        res = sendRequest(new GetRequest(uri), 200);
-        assertNull(res.getHeader("Content-Disposition"));
-        assertEquals(MimetypeMap.MIMETYPE_PDF + ";charset=UTF-8", res.getContentType());
-
-        uri = URL_CONTENT_DOWNLOAD + testpdf.getId() + "?a=true";
-        res = sendRequest(new GetRequest(uri), 200);
-        assertEquals("attachment", res.getHeader("Content-Disposition"));
-        assertEquals(MimetypeMap.MIMETYPE_PDF + ";charset=UTF-8", res.getContentType());
-
-        nodeService.deleteNode(rootFolder);
-    }
-
-    public NodeRef createNodeWithTextContent(NodeRef parentNode, String nodeCmName, QName nodeType, String content, String mimetype)
+    public NodeRef createNodeWithTextContent(NodeRef parentNode, String nodeCmName, QName nodeType, String content)
     {
         NodeRef nodeRef = createNode(parentNode, nodeCmName, nodeType);
 
@@ -264,7 +220,7 @@ public class SlingshotContentGetTest extends BaseWebScriptTest
         if (content != null)
         {
             ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
-            writer.setMimetype(mimetype);
+            writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
             writer.setEncoding("UTF-8");
             writer.putContent(content);
         }

core/pom.xml

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

core/src/main/java/org/alfresco/query/ListBackedPagingResults.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2022 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.alfresco.query;
 
 import java.util.Collections;
@@ -56,7 +55,7 @@ public class ListBackedPagingResults<R> implements PagingResults<R>
         }
         
         this.results = Collections.unmodifiableList(
-                list.subList(Math.min(start, end), end));
+                list.subList(start, end));
         this.size = list.size();
         this.hasMore = ! (list.size() == end);
     }

data-model/pom.xml

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

data-model/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java

@@ -78,10 +78,6 @@ public class ObjectTypeIdLuceneBuilder extends BaseLuceneBuilder
         String field = getLuceneFieldName();
         String stringValue = getValueAsString(value);
         TypeDefinitionWrapper type = cmisDictionaryService.findType(stringValue);
-        if (type == null)
-        {
-            throw new CmisInvalidArgumentException("Unknown type: " + stringValue);
-        }
         return lqpa
                 .getFieldQuery(field, type.getAlfrescoClass().toString(), AnalysisMode.IDENTIFIER, luceneFunction);
     }

data-model/src/main/java/org/alfresco/service/namespace/NamespaceService.java

@@ -146,7 +146,7 @@ public interface NamespaceService extends NamespacePrefixResolver
 
     /** Email Server Application Model Prefix */
     static final String EMAILSERVER_MODEL_PREFIX = "emailserver";
-
+    
     /**
      * Register a prefix for namespace uri. 
      * 

data-model/src/test/java/org/alfresco/repo/dictionary/DictionaryComponentTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -25,7 +25,7 @@
  */
 package org.alfresco.repo.dictionary;
 
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

mmt/pom.xml

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

packaging/distribution/pom.xml

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

packaging/docker-alfresco/Dockerfile

@@ -1,6 +1,6 @@
-# Fetch image based on Tomcat 9.0, Java 17 and Rocky Linux 8
+# Fetch image based on Tomcat 9.0, Java 11 and Centos 7
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
-FROM alfresco/alfresco-base-tomcat:tomcat9-jre17-rockylinux8-202205140719
+FROM alfresco/alfresco-base-tomcat:tomcat9-jre11-centos7-202203091924
 
 # Set default docker_context.
 ARG resource_path=target
@@ -65,12 +65,12 @@ RUN sed -i -e "s_log4j.appender.File.File\=alfresco.log_log4j.appender.File.File
 
 # fontconfig is required by Activiti worflow diagram generator
 # installing pinned dependencies as well
-RUN yum install -y fontconfig-2.13.1-4.el8 \
-                   dejavu-fonts-common-2.35-7.el8 \
-                   fontpackages-filesystem-1.44-22.el8 \
-                   freetype-2.9.1-4.el8_3.1 \
-                   libpng-1.6.34-5.el8 \
-                   dejavu-sans-fonts-2.35-7.el8 && \
+RUN yum install -y fontconfig-2.13.0-4.3.el7 \
+                   dejavu-fonts-common-2.33-6.el7 \
+                   fontpackages-filesystem-1.44-8.el7 \
+                   freetype-2.8-14.el7_9.1 \
+                   libpng-1.5.13-8.el7 \
+                   dejavu-sans-fonts-2.33-6.el7 && \
     yum clean all
 
 # The standard configuration is to have all Tomcat files owned by root with group GROUPNAME and whilst owner has read/write privileges, 

packaging/docker-alfresco/pom.xml

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

packaging/pom.xml

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

packaging/tests/environment/.env

@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.3
-POSTGRES_TAG=14.4
-ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
+POSTGRES_TAG=13.3
+ACTIVEMQ_TAG=5.16.1

packaging/tests/pom.xml

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

packaging/tests/scripts/start-compose.sh

@@ -27,11 +27,11 @@ fi
 
 echo "Starting ACS stack in ${DOCKER_COMPOSE_PATH}"
 
-export TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
-export TRANSFORM_ROUTER_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout)
+TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
+TRANSFORM_ROUTER_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout)
 
 # .env files are picked up from project directory correctly on docker-compose 1.23.0+
-docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
+TRANSFORMERS_TAG=${TRANSFORMERS_TAG} TRANSFORM_ROUTER_TAG=${TRANSFORM_ROUTER_TAG} docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
 
 if [ $? -eq 0 ]
 then

packaging/tests/tas-cmis/pom.xml

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

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/AbstractCmisE2ETest.java

@@ -1,76 +0,0 @@
-package org.alfresco.cmis.search;
-
-import java.lang.reflect.Method;
-
-import org.alfresco.cmis.CmisProperties;
-import org.alfresco.utility.Utility;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-import org.springframework.test.context.ContextConfiguration;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-
-@ContextConfiguration("classpath:alfresco-cmis-context.xml")
-@Component
-@Scope(value = "prototype")
-public abstract class AbstractCmisE2ETest extends AbstractE2EFunctionalTest
-{
-    private static Logger LOGGER = LoggerFactory.getLogger(AbstractCmisE2ETest.class);
-
-    @Autowired
-    protected CmisProperties cmisProperties;
-
-    public String documentContent = "CMIS document content";
-
-    @BeforeMethod(alwaysRun = true)
-    public void showStartTestInfo(Method method)
-    {
-        LOGGER.info(String.format("*** STARTING Test: [%s] ***", method.getName()));
-    }
-
-    @AfterMethod(alwaysRun = true)
-    public void showEndTestInfo(Method method)
-    {
-        LOGGER.info(String.format("*** ENDING Test: [%s] ***", method.getName()));
-    }
-
-    public Integer getElasticWaitTimeInSeconds()
-    {
-        return cmisProperties.envProperty().getSolrWaitTimeInSeconds();
-    }
-
-    /**
-     * Repeat Elastic Query till results count returns expectedCountResults
-     * @param query CMIS Query to be executed
-     * @param expectedCountResults Number of results expected
-     * @return true when results count is equals to expectedCountResults
-     */
-    protected boolean waitForIndexing(String query, long expectedCountResults)
-    {
-
-        for (int searchCount = 1; searchCount <= SEARCH_MAX_ATTEMPTS; searchCount++)
-        {
-
-            try
-            {
-                cmisApi.withQuery(query).assertResultsCount().equals(expectedCountResults);
-                return true;
-            }
-            catch (AssertionError ae)
-            {
-                LOGGER.info(String.format("WaitForIndexing in Progress: %s", ae));
-            }
-
-
-            Utility.waitToLoopTime(getElasticWaitTimeInSeconds(), "Wait For Indexing");
-
-        }
-
-        return false;
-    }
-
-
-}

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/AbstractE2EFunctionalTest.java

@@ -1,58 +0,0 @@
-package org.alfresco.cmis.search;
-
-import org.alfresco.cmis.CmisWrapper;
-import org.alfresco.dataprep.SiteService.Visibility;
-import org.alfresco.utility.data.DataContent;
-import org.alfresco.utility.data.DataSite;
-import org.alfresco.utility.data.DataUser;
-import org.alfresco.utility.data.RandomData;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.alfresco.utility.network.ServerHealth;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.testng.annotations.BeforeClass;
-
-@ContextConfiguration ("classpath:alfresco-cmis-context.xml")
-public abstract class AbstractE2EFunctionalTest extends AbstractTestNGSpringContextTests
-{
-    /** The number of retries that a query will be tried before giving up. */
-    protected static final int SEARCH_MAX_ATTEMPTS = 20;
-
-    @Autowired
-    protected ServerHealth serverHealth;
-
-    @Autowired
-    protected DataSite dataSite;
-
-    @Autowired
-    protected DataContent dataContent;
-
-    @Autowired
-    protected CmisWrapper cmisApi;
-
-    @Autowired
-    protected DataUser dataUser;
-
-    protected UserModel testUser, adminUserModel;
-    protected SiteModel testSite;
-
-    protected static String unique_searchString;
-
-    @BeforeClass (alwaysRun = true)
-    public void setup()
-    {
-        serverHealth.assertServerIsOnline();
-
-        adminUserModel = dataUser.getAdminUser();
-        testUser = dataUser.createRandomTestUser("UserSearch");
-
-        testSite = new SiteModel(RandomData.getRandomName("SiteSearch"));
-        testSite.setVisibility(Visibility.PRIVATE);
-
-        testSite = dataSite.usingUser(testUser).createSite(testSite);
-
-        unique_searchString = testSite.getTitle().replace("SiteSearch", "Unique");
-    }
-}

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/SearchInFolderTests.java

@@ -1,62 +0,0 @@
-package org.alfresco.cmis.search;
-
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.data.provider.XMLDataConfig;
-import org.alfresco.utility.data.provider.XMLTestDataProvider;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FileType;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.QueryModel;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-public class SearchInFolderTests extends AbstractCmisE2ETest
-{
-    private FolderModel parentFolder, subFolder1, subFolder2, subFolder3;
-    private FileModel subFile1, subFile2, subFile3, subFile4, subFile5;
-
-    @BeforeClass(alwaysRun = true)
-    public void createTestData() throws Exception
-    {
-        // create input data
-        parentFolder = FolderModel.getRandomFolderModel();
-        subFolder1 = FolderModel.getRandomFolderModel();
-        subFolder2 = FolderModel.getRandomFolderModel();
-        subFolder3 = new FolderModel("subFolder");
-        subFile5 = new FileModel("fifthFile.txt",FileType.TEXT_PLAIN, "fifthFile content");
-        subFile1 = new FileModel("firstFile", FileType.MSEXCEL);
-        subFile2 = FileModel.getRandomFileModel(FileType.MSPOWERPOINT2007);
-        subFile3 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN);
-        subFile4 = new FileModel("fourthFile", "fourthFileTitle", "fourthFileDescription", FileType.MSWORD2007);
-
-        cmisApi.authenticateUser(testUser).usingSite(testSite).createFolder(parentFolder)
-                .then().usingResource(parentFolder)
-                .createFile(subFile5).assertThat().contentIs("fifthFile content")
-                .createFolder(subFolder1)
-                .createFolder(subFolder2)
-                .createFolder(subFolder3)
-                .createFile(subFile1)
-                .createFile(subFile2)
-                .createFile(subFile3)
-                .createFile(subFile4);
-        // wait for index
-        Utility.waitToLoopTime(getElasticWaitTimeInSeconds());
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanupEnvironment()
-    {
-        dataContent.deleteSite(testSite);
-    }
-
-    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
-    @XMLDataConfig(file = "src/test/resources/search-in-folder.xml")
-    public void executeCMISQuery(QueryModel query)
-    {
-        String currentQuery = String.format(query.getValue(), parentFolder.getNodeRef());
-        cmisApi.authenticateUser(testUser);
-        Assert.assertTrue(waitForIndexing(currentQuery, query.getResults()), String.format("Result count not as expected for query: %s", currentQuery));
-    }
-}

packaging/tests/tas-cmis/src/test/resources/default.properties

@@ -7,7 +7,7 @@ alfresco.port=8082
 admin.user=admin
 admin.password=admin
 
-solrWaitTimeInSeconds=60
+solrWaitTimeInSeconds=30
 
 # in containers we cannot access directly JMX, so we will use http://jolokia.org agent
 # disabling this we will use direct JMX calls to server

packaging/tests/tas-cmis/src/test/resources/search-in-folder.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--CMIS Queries: passing the search query as first param and results expected -->
-<testData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<queries>
-		<query value="SELECT cmis:name, cmis:parentId, cmis:path, cmis:allowedChildObjectTypeIds FROM cmis:folder where IN_FOLDER('%s') AND cmis:name = 'subFolder'" expectedResults="1" />
-		<query value="SELECT cmis:name, cmis:objectId, cmis:lastModifiedBy, cmis:creationDate, cmis:contentStreamFileName FROM cmis:document where IN_FOLDER('%s') AND cmis:name = 'fourthFile'" expectedResults="1" />
-		<query value="SELECT cmis:parentId FROM cmis:folder where IN_FOLDER('%s')" expectedResults="3" />
-		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s')" expectedResults="5" />
-		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:name ASC" expectedResults="5" />
-		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:name DESC" expectedResults="5" />
-		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') ORDER BY cmis:lastModificationDate ASC"  expectedResults="3" />
-		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') ORDER BY cmis:lastModificationDate DESC"  expectedResults="3" />
-		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:createdBy DESC" expectedResults="5" />
-		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name IS NOT NULL" expectedResults="5" />
-		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND cmis:name IS NOT NULL" expectedResults="3" />
-		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name LIKE 'fourthFile'" expectedResults="1" />
-		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND NOT(cmis:name NOT IN ('subFolder'))" expectedResults="1" />
-		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name IN ('fourthFile', 'fifthFile.txt')" expectedResults="2" />
-		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name NOT IN ('fourthFile', 'fifthFile.txt')" expectedResults="3" />
-		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND cmis:name &lt;&gt; 'subFolder'" expectedResults="2" />
-		<query value="SELECT cmis:secondaryObjectTypeIds FROM cmis:folder where IN_FOLDER('%s') AND cmis:name = 'subFolder'" expectedResults="1" />
-	</queries>
-</testData> 

packaging/tests/tas-email/pom.xml

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

packaging/tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.77</version>
+        <version>23.1.0.23-SNAPSHOT</version>
     </parent>
 
     <developers>
@@ -106,10 +106,8 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
                     </suiteXmlFiles>
-                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
                     <argLine>
                         --illegal-access=warn
-                        --add-opens=java.base/java.lang=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>

packaging/tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.77</version>
+        <version>23.1.0.23-SNAPSHOT</version>
     </parent>
 
     <developers>
@@ -78,10 +78,8 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
                     </suiteXmlFiles>
-                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
                     <argLine>
                         --illegal-access=warn
-                        --add-opens=java.base/java.lang=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/AccessRestrictionUtil.java

@@ -1,102 +0,0 @@
-package org.alfresco.rest.actions.access;
-
-import com.google.gson.Gson;
-import org.alfresco.rest.actions.access.pojo.Action;
-import org.alfresco.rest.actions.access.pojo.ActionCondition;
-import org.alfresco.rest.actions.access.pojo.Rule;
-import org.alfresco.utility.model.UserModel;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class AccessRestrictionUtil {
-
-    public static final String MAIL_ACTION = "mail";
-
-    public static final String ERROR_MESSAGE_FIELD = "message";
-    public static final String ERROR_MESSAGE_ACCESS_RESTRICTED =
-            "Only admin or system user is allowed to define uses of or directly execute this action";
-    private static final String ERROR_MESSAGE_FAILED_TO_SEND_EMAIL = "Failed to send email to:";
-
-    public static Map<String, String> createMailParameters(UserModel sender, UserModel recipient) {
-        Map<String, String> parameterValues = new HashMap<>();
-        parameterValues.put("from", sender.getEmailAddress());
-        parameterValues.put("to", recipient.getEmailAddress());
-        parameterValues.put("subject", "Test");
-        parameterValues.put("text", "<html>content</html>");
-
-        return parameterValues;
-    }
-
-    public static Rule createRuleWithAction(String actionName, Map<String, String> parameterValues) {
-        Rule rule = new Rule();
-        rule.setId("");
-        rule.setTitle("Test rule title");
-        rule.setDescription("Test rule description");
-        rule.setRuleType(List.of("inbound"));
-        rule.setDisabled(false);
-        rule.setApplyToChildren(false);
-        rule.setExecuteAsynchronously(false);
-
-        Action compositeAction = new Action();
-        compositeAction.setActionDefinitionName("composite-action");
-
-        ActionCondition actionCondition = new ActionCondition();
-        actionCondition.setConditionDefinitionName("no-condition");
-        actionCondition.setParameterValues(new HashMap<>());
-
-        compositeAction.setConditions(List.of(actionCondition));
-
-        Action action = createAction(actionName, parameterValues);
-
-        compositeAction.setActions(List.of(action));
-
-        rule.setAction(compositeAction);
-
-        return rule;
-    }
-
-    public static Action createActionWithParameters(String actionName, Map<String, String> parameterValues) {
-        Action compositeAction = new Action();
-        compositeAction.setActionDefinitionName("composite-action");
-
-        ActionCondition actionCondition = new ActionCondition();
-        actionCondition.setConditionDefinitionName("no-condition");
-        actionCondition.setParameterValues(new HashMap<>());
-
-        compositeAction.setConditions(List.of(actionCondition));
-
-        Action action = createAction(actionName, parameterValues);
-        action.setExecuteAsynchronously(false);
-
-        compositeAction.setActions(List.of(action));
-
-        return action;
-    }
-
-
-    public static Action createAction(String actionName, Map<String, String> parameterValues) {
-        Action action = new Action();
-        action.setActionDefinitionName(actionName);
-        action.setParameterValues(parameterValues);
-
-        return action;
-    }
-
-    public static String mapObjectToJSON(Object object) {
-        Gson gson = new Gson();
-        return gson.toJson(object);
-    }
-
-    /**
-     * Return error message that in fact means that the action has passed access restriction correctly,
-     * but due to non-configured smtp couldn't send email.
-     *
-     * @param userModel
-     * @return
-     */
-    public static String getExpectedEmailSendFailureMessage(UserModel userModel) {
-        return ERROR_MESSAGE_FAILED_TO_SEND_EMAIL + userModel.getEmailAddress();
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/FormProcAdminAccessRestrictionTest.java

@@ -1,84 +0,0 @@
-package org.alfresco.rest.actions.access;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.core.RestRequest;
-import org.alfresco.rest.core.RestResponse;
-import org.alfresco.rest.core.RestWrapper;
-import org.alfresco.utility.model.UserModel;
-import org.json.simple.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_ACCESS_RESTRICTED;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_FIELD;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.MAIL_ACTION;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.createMailParameters;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.getExpectedEmailSendFailureMessage;
-import static org.hamcrest.Matchers.containsString;
-
-public class FormProcAdminAccessRestrictionTest extends RestTest {
-
-    private static final String ACTION_FORM_PROCESSOR_ENDPOINT = "alfresco/service/api/action/%s/formprocessor";
-
-    private static final String PROPERTY_PREFIX = "prop_";
-
-    private UserModel adminUser;
-    private UserModel testUser;
-
-    @Autowired
-    protected RestWrapper restClient;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation() throws Exception {
-        adminUser = dataUser.getAdminUser();
-        testUser = dataUser.createRandomTestUser();
-    }
-
-    @BeforeMethod(alwaysRun=true)
-    public void setup() {
-        restClient.configureRequestSpec()
-                .setBasePath("")
-                .addHeader("Content-Type", "application/json");
-    }
-
-    @Test
-    public void userShouldNotCreateAMailForm() {
-        restClient.authenticateUser(testUser);
-
-        String body = generateBody(createMailParameters(adminUser, testUser));
-        String endpoint = String.format(ACTION_FORM_PROCESSOR_ENDPOINT, MAIL_ACTION);
-
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, body, endpoint);
-        RestResponse response = restClient.process(request);
-
-        response.assertThat().statusCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
-                .assertThat().body(ERROR_MESSAGE_FIELD, containsString(ERROR_MESSAGE_ACCESS_RESTRICTED));
-    }
-
-    @Test
-    public void adminShouldCreateAMailForm() {
-        restClient.authenticateUser(adminUser);
-
-        String body = generateBody(createMailParameters(adminUser, testUser));
-        String endpoint = String.format(ACTION_FORM_PROCESSOR_ENDPOINT, MAIL_ACTION);
-
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, body, endpoint);
-        RestResponse response = restClient.process(request);
-
-        response.assertThat().statusCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
-                .assertThat().body(ERROR_MESSAGE_FIELD, containsString(getExpectedEmailSendFailureMessage(testUser)));
-    }
-
-    private String generateBody(Map<String, String> mailParameters) {
-        JSONObject json = new JSONObject();
-        mailParameters.forEach((key, value) -> json.put(PROPERTY_PREFIX + key, value));
-
-        return json.toJSONString();
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/RuleAdminAccessRestrictionTest.java

@@ -1,102 +0,0 @@
-package org.alfresco.rest.actions.access;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.actions.access.pojo.Rule;
-import org.alfresco.rest.core.RestRequest;
-import org.alfresco.rest.core.RestResponse;
-import org.alfresco.rest.core.RestWrapper;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FileType;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_ACCESS_RESTRICTED;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_FIELD;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.MAIL_ACTION;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.createMailParameters;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.createRuleWithAction;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.mapObjectToJSON;
-import static org.hamcrest.Matchers.containsString;
-
-public class RuleAdminAccessRestrictionTest extends RestTest {
-
-    private static final String CREATE_RULE_ENDPOINT = "alfresco/service/api/node/workspace/SpacesStore/%s/ruleset/rules";
-
-    private UserModel adminUser;
-    private UserModel testUser;
-    private FolderModel testFolder;
-
-    @Autowired
-    protected RestWrapper restClient;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation() throws Exception {
-        adminUser = dataUser.getAdminUser();
-
-        testUser = dataUser.createRandomTestUser();
-        testSite = dataSite.usingUser(testUser)
-                .createPublicRandomSite();
-        testFolder = dataContent.usingUser(testUser)
-                .usingSite(testSite)
-                .createFolder();
-    }
-
-    @BeforeMethod(alwaysRun=true)
-    public void setup() {
-        restClient.configureRequestSpec().setBasePath("");
-    }
-
-    @Test
-    public void userShouldNotBeAbleToCreateANewRule() {
-        restClient.authenticateUser(testUser);
-
-        Rule rule = createRuleWithAction(MAIL_ACTION, createMailParameters(adminUser, testUser));
-        String ruleRequestBody = mapObjectToJSON(rule);
-        String ruleEndpoint = String.format(CREATE_RULE_ENDPOINT, testFolder.getNodeRef());
-
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, ruleRequestBody, ruleEndpoint);
-        RestResponse response = restClient.process(request);
-
-        response.assertThat().statusCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
-                .assertThat().body(ERROR_MESSAGE_FIELD, containsString(ERROR_MESSAGE_ACCESS_RESTRICTED));
-    }
-
-    @Test
-    public void adminShouldBeAbleToCreateANewRule() {
-        restClient.authenticateUser(adminUser);
-
-        Rule rule = createRuleWithAction(MAIL_ACTION, createMailParameters(adminUser, testUser));
-        String ruleRequestBody = mapObjectToJSON(rule);
-        String ruleEndpoint = String.format(CREATE_RULE_ENDPOINT, testFolder.getNodeRef());
-
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, ruleRequestBody, ruleEndpoint);
-        RestResponse response = restClient.process(request);
-
-        response.assertThat().statusCode(HttpStatus.OK.value());
-    }
-
-    @Test
-    public void userShouldAddAFileToFolderWithMailRule() {
-        restClient.authenticateUser(adminUser);
-
-        Rule rule = createRuleWithAction(MAIL_ACTION, createMailParameters(adminUser, testUser));
-        String ruleRequestBody = mapObjectToJSON(rule);
-        String ruleEndpoint = String.format(CREATE_RULE_ENDPOINT, testFolder.getNodeRef());
-
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, ruleRequestBody, ruleEndpoint);
-        RestResponse response = restClient.process(request);
-
-        response.assertThat().statusCode(HttpStatus.OK.value());
-
-        dataContent.usingUser(testUser)
-                .usingSite(testSite)
-                .usingResource(testFolder)
-                .createContent(FileModel.getRandomFileModel(FileType.TEXT_PLAIN));
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/V0AdminAccessRestrictionTest.java

@@ -1,76 +0,0 @@
-package org.alfresco.rest.actions.access;
-
-import org.alfresco.rest.actions.access.pojo.Action;
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.core.RestRequest;
-import org.alfresco.rest.core.RestResponse;
-import org.alfresco.rest.core.RestWrapper;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_ACCESS_RESTRICTED;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_FIELD;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.MAIL_ACTION;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.createActionWithParameters;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.createMailParameters;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.getExpectedEmailSendFailureMessage;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.mapObjectToJSON;
-import static org.hamcrest.Matchers.containsString;
-
-public class V0AdminAccessRestrictionTest extends RestTest {
-
-    private static final String ACTION_QUEUE_ENDPOINT = "alfresco/service/api/actionQueue?async=false";
-
-    private UserModel adminUser;
-    private UserModel testUser;
-
-    @Autowired
-    protected RestWrapper restClient;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation() throws Exception {
-        adminUser = dataUser.getAdminUser();
-
-        testUser = dataUser.createRandomTestUser();
-        testSite = dataSite.usingUser(testUser)
-                .createPublicRandomSite();
-    }
-
-    @BeforeMethod(alwaysRun=true)
-    public void setup() {
-        restClient.configureRequestSpec().setBasePath("");
-    }
-
-    @Test
-    public void userShouldNotExecuteMailActionQueue() {
-        restClient.authenticateUser(testUser);
-
-        Action action = createActionWithParameters(MAIL_ACTION, createMailParameters(adminUser, testUser));
-        String actionRequestBody = mapObjectToJSON(action);
-
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, actionRequestBody, ACTION_QUEUE_ENDPOINT);
-        RestResponse response = restClient.process(request);
-
-        response.assertThat().statusCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
-                .assertThat().body(ERROR_MESSAGE_FIELD, containsString(ERROR_MESSAGE_ACCESS_RESTRICTED));
-    }
-
-    @Test
-    public void adminShouldExecuteMailActionQueue() {
-        restClient.authenticateUser(adminUser);
-
-        Action action = createActionWithParameters(MAIL_ACTION, createMailParameters(adminUser, testUser));
-        String actionRequestBody = mapObjectToJSON(action);
-
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, actionRequestBody, ACTION_QUEUE_ENDPOINT);
-        RestResponse response = restClient.process(request);
-
-        response.assertThat().statusCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
-                .assertThat().body(ERROR_MESSAGE_FIELD, containsString(getExpectedEmailSendFailureMessage(testUser)));
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/V1AdminAccessRestrictionTest.java

@@ -1,64 +0,0 @@
-package org.alfresco.rest.actions.access;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import org.alfresco.rest.core.RestWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_ACCESS_RESTRICTED;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.MAIL_ACTION;
-import static org.alfresco.rest.actions.access.AccessRestrictionUtil.createMailParameters;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-
-public class V1AdminAccessRestrictionTest extends RestTest {
-
-    private UserModel adminUser;
-    private UserModel testUser;
-    private FolderModel testFolder;
-
-    @Autowired
-    protected RestWrapper restClient;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation() throws Exception {
-        adminUser = dataUser.getAdminUser();
-
-        testUser = dataUser.createRandomTestUser();
-        testSite = dataSite.usingUser(testUser)
-                           .createPublicRandomSite();
-        testFolder = dataContent.usingUser(testUser)
-                                .usingSite(testSite)
-                                .createFolder();
-    }
-
-    @Test
-    public void userShouldNotExecuteMailAction() throws Exception {
-        restClient.authenticateUser(testUser)
-                          .withCoreAPI()
-                          .usingActions()
-                          .executeAction(MAIL_ACTION, testFolder, createMailParameters(adminUser, testUser));
-
-        restClient.onResponse()
-                .assertThat().statusCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
-                .assertThat().body("entry.id", nullValue());
-        restClient.assertLastError().containsSummary(ERROR_MESSAGE_ACCESS_RESTRICTED);
-    }
-
-    @Test
-    public void adminShouldExecuteMailAction() throws Exception {
-        restClient.authenticateUser(adminUser)
-                          .withCoreAPI()
-                          .usingActions()
-                          .executeAction(MAIL_ACTION, testFolder, createMailParameters(adminUser, testUser));
-
-        restClient.onResponse()
-                .assertThat().statusCode(HttpStatus.ACCEPTED.value())
-                .assertThat().body("entry.id", notNullValue());
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/pojo/Action.java

@@ -1,57 +0,0 @@
-package org.alfresco.rest.actions.access.pojo;
-
-import java.util.List;
-import java.util.Map;
-
-public class Action {
-    private String actionDefinitionName;
-    private String actionedUponNode;
-    private List<ActionCondition> conditions;
-    private List<Action> actions;
-    private Map<String, String> parameterValues;
-
-    private boolean executeAsynchronously;
-
-    public void setExecuteAsynchronously(boolean executeAsynchronously) {
-        this.executeAsynchronously = executeAsynchronously;
-    }
-    public String getActionDefinitionName() {
-        return actionDefinitionName;
-    }
-
-    public void setActionDefinitionName(String actionDefinitionName) {
-        this.actionDefinitionName = actionDefinitionName;
-    }
-
-    public String getActionedUponNode() {
-        return actionedUponNode;
-    }
-
-    public void setActionedUponNode(String actionedUponNode) {
-        this.actionedUponNode = actionedUponNode;
-    }
-
-    public List<ActionCondition> getConditions() {
-        return conditions;
-    }
-
-    public void setConditions(List<ActionCondition> conditions) {
-        this.conditions = conditions;
-    }
-
-    public List<Action> getActions() {
-        return actions;
-    }
-
-    public void setActions(List<Action> actions) {
-        this.actions = actions;
-    }
-
-    public Map<String, String> getParameterValues() {
-        return parameterValues;
-    }
-
-    public void setParameterValues(Map<String, String> parameterValues) {
-        this.parameterValues = parameterValues;
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/pojo/ActionCondition.java

@@ -1,24 +0,0 @@
-package org.alfresco.rest.actions.access.pojo;
-
-import java.util.Map;
-
-public class ActionCondition {
-    private String conditionDefinitionName;
-    private Map<String, String> parameterValues;
-
-    public String getConditionDefinitionName() {
-        return conditionDefinitionName;
-    }
-
-    public void setConditionDefinitionName(String conditionDefinitionName) {
-        this.conditionDefinitionName = conditionDefinitionName;
-    }
-
-    public Map<String, String> getParameterValues() {
-        return parameterValues;
-    }
-
-    public void setParameterValues(Map<String, String> parameterValues) {
-        this.parameterValues = parameterValues;
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/pojo/Rule.java

@@ -1,78 +0,0 @@
-package org.alfresco.rest.actions.access.pojo;
-
-import java.util.List;
-
-public class Rule {
-    private String id;
-    private String title;
-    private String description;
-    private List<String> ruleType;
-    private boolean executeAsynchronously;
-    private boolean disabled;
-    private boolean applyToChildren;
-    private Action action;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<String> getRuleType() {
-        return ruleType;
-    }
-
-    public void setRuleType(List<String> ruleType) {
-        this.ruleType = ruleType;
-    }
-
-    public boolean isExecuteAsynchronously() {
-        return executeAsynchronously;
-    }
-
-    public void setExecuteAsynchronously(boolean executeAsynchronously) {
-        this.executeAsynchronously = executeAsynchronously;
-    }
-
-    public boolean isDisabled() {
-        return disabled;
-    }
-
-    public void setDisabled(boolean disabled) {
-        this.disabled = disabled;
-    }
-
-    public boolean isApplyToChildren() {
-        return applyToChildren;
-    }
-
-    public void setApplyToChildren(boolean applyToChildren) {
-        this.applyToChildren = applyToChildren;
-    }
-
-    public Action getAction() {
-        return action;
-    }
-
-    public void setAction(Action action) {
-        this.action = action;
-    }
-}

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

@@ -1,268 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rules;
-
-import static java.util.stream.Collectors.toList;
-
-import static org.alfresco.rest.rules.RulesTestsUtils.createActionModel;
-import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModel;
-import static org.alfresco.utility.constants.UserRole.*;
-import static org.alfresco.utility.model.FileModel.getRandomFileModel;
-import static org.alfresco.utility.model.FileType.TEXT_PLAIN;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.junit.Assert.assertEquals;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-
-import java.util.List;
-import java.util.stream.IntStream;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestRuleModel;
-import org.alfresco.rest.model.RestRuleModelsCollection;
-import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.alfresco.utility.model.UserModel;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests for POST /nodes/{nodeId}/rule-sets/{ruleSetId}/rules.
- */
-@Test(groups = {TestGroup.RULES})
-public class CreateRulesTests extends RestTest
-{
-    private UserModel user;
-    private SiteModel site;
-    private FolderModel ruleFolder;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation()
-    {
-        user = dataUser.createRandomTestUser();
-        site = dataSite.usingUser(user).createPublicRandomSite();
-        ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-    }
-
-    /** Check we can create a rule. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void createRule()
-    {
-        RestRuleModel ruleModel = createRuleModel("ruleName");
-
-        RestRuleModel rule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                                       .createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(CREATED);
-        rule.assertThat().field("id").isNotNull()
-            .assertThat().field("name").is("ruleName");
-    }
-
-    /** Check creating a rule in a non-existent folder returns an error. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void createRuleInNonExistentFolder()
-    {
-        STEP("Try to create a rule in non-existent folder.");
-        FolderModel nonExistentFolder = FolderModel.getRandomFolderModel();
-        nonExistentFolder.setNodeRef("fake-id");
-
-        RestRuleModel ruleModel = new RestRuleModel();
-        ruleModel.setName("ruleName");
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(nonExistentFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(NOT_FOUND);
-        restClient.assertLastError().containsSummary("fake-id was not found");
-    }
-
-    /** Check creating a rule in a non-existent rule set returns an error. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void createRuleInNonExistentRuleSet()
-    {
-        STEP("Try to create a rule in non-existent rule set.");
-        RestRuleModel ruleModel = new RestRuleModel();
-        ruleModel.setName("ruleName");
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingRuleSet("fake-id").createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(NOT_FOUND);
-        restClient.assertLastError().containsSummary("fake-id was not found");
-    }
-
-    /** Try to create a rule without a name and check the error. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void createRuleWithEmptyName()
-    {
-        RestRuleModel ruleModel = new RestRuleModel();
-        ruleModel.setName("");
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("Rule name is a mandatory parameter");
-    }
-
-    /** Check we can create two rules with the same name. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void duplicateRuleNameIsAcceptable()
-    {
-        RestRuleModel ruleModel = createRuleModel("duplicateRuleName");
-
-        STEP("Create two identical rules");
-        RestRuleModel ruleA = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-        RestRuleModel ruleB = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        // Check that the names are the same but the ids are different.
-        ruleA.assertThat().field("name").is(ruleB.getName());
-        ruleA.assertThat().field("id").isNot(ruleB.getId());
-    }
-
-    /** Check that a user without permission to view the folder cannot create a rule in it. */
-    public void requireReadPermissionToCreateRule()
-    {
-        STEP("Create a user and use them to create a private site containing a folder");
-        UserModel privateUser = dataUser.createRandomTestUser();
-        SiteModel privateSite = dataSite.usingUser(privateUser).createPrivateRandomSite();
-        FolderModel privateFolder = dataContent.usingUser(privateUser).usingSite(privateSite).createFolder();
-
-        STEP("Try to use a different user to create a rule in the private folder");
-        RestRuleModel ruleModel = new RestRuleModel();
-        ruleModel.setName("ruleName");
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(FORBIDDEN);
-        restClient.assertLastError().containsSummary("Insufficient permissions to manage rules");
-    }
-
-    /** Check that a Collaborator cannot create a rule in a private folder. */
-    public void siteCollaboratorCannotCreateRule()
-    {
-        testRolePermissionsWith(SiteCollaborator);
-
-        restClient.assertStatusCodeIs(FORBIDDEN);
-        restClient.assertLastError().containsSummary("Insufficient permissions to manage rules");
-    }
-
-    /** Check that a Contributor cannot create a rule in a private folder. */
-    public void siteContributorCannotCreateRule()
-    {
-        testRolePermissionsWith(SiteContributor);
-
-        restClient.assertStatusCodeIs(FORBIDDEN);
-        restClient.assertLastError().containsSummary("Insufficient permissions to manage rules");
-    }
-
-    /** Check that a Consumer cannot create a rule in a private folder. */
-    public void siteConsumerCannotCreateRule()
-    {
-        testRolePermissionsWith(SiteConsumer);
-
-        restClient.assertStatusCodeIs(FORBIDDEN);
-        restClient.assertLastError().containsSummary("Insufficient permissions to manage rules");
-    }
-
-    /** Check that a siteManager can create a rule in a private folder. */
-    public void siteManagerCanCreateRule()
-    {
-        testRolePermissionsWith(SiteManager)
-                .assertThat().field("id").isNotNull()
-                .assertThat().field("name").is("testRule");
-        restClient.assertStatusCodeIs(CREATED);
-    }
-
-    /** Check we can't create a rule under a document node. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void tryToCreateRuleUnderDocument()
-    {
-        STEP("Create a document.");
-        FileModel fileModel = dataContent.usingUser(user).usingSite(site).createContent(getRandomFileModel(TEXT_PLAIN));
-
-        RestRuleModel ruleModel = new RestRuleModel();
-        ruleModel.setName("ruleName");
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(fileModel).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("folder is expected");
-    }
-
-    /** Check we can create several rules. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void createRules()
-    {
-        STEP("Create a list of rules in one POST request");
-        List<String> ruleNames = List.of("ruleA", "ruleB", "ruleC");
-        List<RestRuleModel> ruleModels = ruleNames.stream().map(RulesTestsUtils::createRuleModel).collect(toList());
-
-        RestRuleModelsCollection rules = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                                                   .createListOfRules(ruleModels);
-
-        restClient.assertStatusCodeIs(CREATED);
-
-        assertEquals("Unexpected number of rules received in response.", ruleNames.size(), rules.getEntries().size());
-        IntStream.range(0, ruleModels.size()).forEach(i ->
-                rules.getEntries().get(i).onModel()
-                    .assertThat().field("id").isNotNull()
-                    .assertThat().field("name").is(ruleNames.get(i)));
-    }
-
-    /** Try to create several rules with an error in one of them. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void createRulesWithOneError()
-    {
-        STEP("Try to create a three rules but the middle one has an error.");
-        RestRuleModel ruleA = createRuleModel("ruleA");
-        RestRuleModel ruleB = new RestRuleModel();
-        // Don't set a name for Rule B.
-        RestRuleModel ruleC = createRuleModel("ruleC");
-        List<RestRuleModel> ruleModels = List.of(ruleA, ruleB, ruleC);
-
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().createListOfRules(ruleModels);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("Rule name is a mandatory parameter");
-    }
-
-    public RestRuleModel testRolePermissionsWith(UserRole userRole)
-    {
-        STEP("Create a user and use them to create a private site containing a folder");
-        SiteModel privateSite = dataSite.usingUser(user).createPrivateRandomSite();
-        FolderModel privateFolder = dataContent.usingUser(user).usingSite(privateSite).createFolder();
-
-        STEP(String.format("Add a user with '%s' role in the private site's folder", userRole.toString()));
-        UserModel userWithRole = dataUser.createRandomTestUser();
-        dataUser.addUserToSite(userWithRole, privateSite, userRole);
-        RestRuleModel ruleModel = createRuleModel("testRule", List.of(createActionModel()));
-
-        return restClient.authenticateUser(userWithRole).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-    }
-}

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

@@ -1,254 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rules;
-
-import static java.util.stream.Collectors.toList;
-
-import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModel;
-import static org.alfresco.utility.constants.UserRole.SiteCollaborator;
-import static org.alfresco.utility.constants.UserRole.SiteContributor;
-import static org.alfresco.utility.constants.UserRole.SiteManager;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.NO_CONTENT;
-import static org.springframework.http.HttpStatus.OK;
-
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestRuleModel;
-import org.alfresco.rest.model.RestRuleModelsCollection;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.alfresco.utility.model.UserModel;
-import org.junit.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests for DELETE /nodes/{nodeId}/rule-sets/{ruleSetId}/rules/{ruleId}.
- */
-@Test(groups = {TestGroup.RULES})
-public class DeleteRulesTests extends RestTest
-{
-    private static final String FAKE_NODE_REF = "fake-node-id";
-
-    private UserModel user;
-    private SiteModel site;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation()
-    {
-        STEP("Create a Contributor user and a public site");
-        user = dataUser.createRandomTestUser();
-        user.setUserRole(SiteContributor);
-        site = dataSite.usingUser(user).createPublicRandomSite();
-    }
-
-    /**
-     * Delete previously created rule by its id (as Contributor).
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY})
-    public void deleteSingleRuleAndGet204()
-    {
-        STEP("Create a few rules in the folder");
-        final FolderModel ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-        final List<RestRuleModel> createdRules = Stream.of("ruleA", "ruleB", "ruleC")
-                .map(ruleName -> {
-                    RestRuleModel ruleModel = createRuleModel(ruleName);
-                    return restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                            .createSingleRule(ruleModel);
-                })
-                .collect(toList());
-
-        STEP("Attempt delete one rule");
-        final RestRuleModel ruleA = createdRules.get(0);
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().deleteRule(ruleA.getId());
-        restClient.assertStatusCodeIs(NO_CONTENT);
-
-        STEP("Get and check the rules from the folder after deleting one of them");
-        final RestRuleModelsCollection rulesAfterDeletion =
-                restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().getListOfRules();
-        restClient.assertStatusCodeIs(OK);
-        rulesAfterDeletion.assertThat().entriesListCountIs(createdRules.size() - 1);
-        Assert.assertTrue(rulesAfterDeletion.getEntries()
-                .stream()
-                .noneMatch(r -> r.onModel().getId().equals(ruleA.getId()))
-        );
-        final Set<String> ruleIdsThatShouldBeLeft = createdRules.stream()
-                .filter(r -> !r.getName().equals("ruleA"))
-                .map(RestRuleModel::getId)
-                .collect(Collectors.toSet());
-        final Set<String> ruleIdsAfterDeletion = rulesAfterDeletion.getEntries().stream()
-                .map(r -> r.onModel().getId())
-                .collect(Collectors.toSet());
-        Assert.assertEquals(ruleIdsThatShouldBeLeft, ruleIdsAfterDeletion);
-    }
-
-    /**
-     * Try to delete a rule in a non-existing folder and get 404.
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void deleteRuleInNonExistingFolderAndGet404()
-    {
-        final FolderModel ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-        final RestRuleModel testRule = createRule(ruleFolder);
-
-        STEP("Create a non-existing folder model");
-        final FolderModel nonExistingFolder = new FolderModel();
-        nonExistingFolder.setNodeRef(FAKE_NODE_REF);
-
-        STEP("Attempt delete the rule in non-existing folder");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(nonExistingFolder).usingDefaultRuleSet().deleteRule(testRule.getId());
-
-        restClient.assertLastError().statusCodeIs(NOT_FOUND);
-    }
-
-    /**
-     * Try to delete a rule in a non-existing rule set and get 404.
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void deleteRuleInNonExistingRuleSetAndGet404()
-    {
-        final FolderModel ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-        final RestRuleModel testRule = createRule(ruleFolder);
-
-        STEP("Attempt delete the rule in non-existing rule set");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingRuleSet(FAKE_NODE_REF).deleteRule(testRule.getId());
-
-        restClient.assertLastError().statusCodeIs(NOT_FOUND);
-    }
-
-    /**
-     * Try to delete a non-existing rule and get 404.
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY})
-    public void deleteNonExistingRuleAndGet404()
-    {
-        final FolderModel ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-        STEP("Attempt delete non-existing rule");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().deleteRule(FAKE_NODE_REF);
-
-        restClient.assertLastError().statusCodeIs(NOT_FOUND);
-    }
-
-    /**
-     * Try to delete an existing rule passing a wrong but existing folder and get 404.
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY})
-    public void deleteExistingRuleFromWrongFolderAndGet404()
-    {
-        final FolderModel ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-        final RestRuleModel testRule = createRule(ruleFolder);
-
-        STEP("Create a second folder in the site");
-        final FolderModel anotherFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        STEP("Attempt delete an existing rule from a wrong but existing (second) folder");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(anotherFolder).usingDefaultRuleSet().deleteRule(testRule.getId());
-
-        restClient.assertLastError().statusCodeIs(NOT_FOUND);
-    }
-
-    /**
-     * Check that a user without write permission on folder cannot delete a rule inside it.
-     */
-    public void deleteSinglePrivateRuleWithoutPermissionAndGet403()
-    {
-        STEP("Create a user and use them to create a private site containing a folder with a rule");
-        final UserModel privateUser = dataUser.createRandomTestUser();
-        final SiteModel privateSite = dataSite.usingUser(privateUser).createPrivateRandomSite();
-        final FolderModel privateFolder = dataContent.usingUser(privateUser).usingSite(privateSite).createFolder();
-        final RestRuleModel ruleModel = createRuleModel("Private site rule");
-        final RestRuleModel createdRule =
-                restClient.authenticateUser(privateUser).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet()
-                        .createSingleRule(ruleModel);
-
-        STEP("Try to delete the rule with another user");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet().deleteRule(createdRule.getId());
-
-        restClient.assertLastError().statusCodeIs(FORBIDDEN);
-    }
-
-    /**
-     * Check that a user with SiteCollaborator permissions on folder can delete a rule inside it.
-     */
-    public void deleteSinglePublicRuleAsCollaboratorAndGet403()
-    {
-        STEP("Create a user and use them to create a private site containing a folder with a rule");
-        final FolderModel ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-        final RestRuleModel testRule = createRule(ruleFolder);
-
-        STEP("Create a manager in the private site");
-        final UserModel siteCollaborator = dataUser.createRandomTestUser();
-        siteCollaborator.setUserRole(SiteCollaborator);
-        restClient.authenticateUser(user).withCoreAPI().usingSite(site).addPerson(siteCollaborator);
-
-        STEP("Check the manager can delete the rule");
-        restClient.authenticateUser(siteCollaborator).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                .deleteRule(testRule.getId());
-
-        restClient.assertLastError().statusCodeIs(FORBIDDEN);
-    }
-
-    /**
-     * Check that a user with SiteManager permissions on folder can delete a rule inside it.
-     */
-    public void deleteSinglePrivateRuleAsSiteManagerAndGet204()
-    {
-        STEP("Create a user and use them to create a private site containing a folder with a rule");
-        final UserModel privateUser = dataUser.createRandomTestUser();
-        final SiteModel privateSite = dataSite.usingUser(privateUser).createPrivateRandomSite();
-        final FolderModel privateFolder = dataContent.usingUser(privateUser).usingSite(privateSite).createFolder();
-        final RestRuleModel ruleModel = createRuleModel("Private site rule");
-        final RestRuleModel createdRule =
-                restClient.authenticateUser(privateUser).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet()
-                        .createSingleRule(ruleModel);
-
-        STEP("Create a manager in the private site");
-        final UserModel siteManager = dataUser.createRandomTestUser();
-        siteManager.setUserRole(SiteManager);
-        restClient.authenticateUser(privateUser).withCoreAPI().usingSite(privateSite).addPerson(siteManager);
-
-        STEP("Check the manager can delete the rule");
-        restClient.authenticateUser(siteManager).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet()
-                .deleteRule(createdRule.getId());
-
-        restClient.assertStatusCodeIs(NO_CONTENT);
-    }
-
-    private RestRuleModel createRule(FolderModel ruleFolder)
-    {
-        STEP("Create a rule in the folder");
-        final RestRuleModel ruleModel = createRuleModel("Test rule");
-        return restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-    }
-}

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

@@ -1,161 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rules;
-
-import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModel;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.OK;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestRuleModel;
-import org.alfresco.rest.model.RestRuleModelsCollection;
-import org.alfresco.rest.model.RestRuleSetModel;
-import org.alfresco.rest.model.RestRuleSetModelsCollection;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.alfresco.utility.model.UserModel;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests for GET /nodes/{nodeId}/rule-sets and /nodes/{nodeId}/rule-sets/{ruleSetId}.
- */
-@Test (groups = { TestGroup.RULES })
-public class GetRuleSetsTests extends RestTest
-{
-    private UserModel user;
-    private SiteModel site;
-    private FolderModel ruleFolder;
-    private RestRuleModel rule;
-
-    @BeforeClass (alwaysRun = true)
-    public void dataPreparation()
-    {
-        STEP("Create a user, site and folder.");
-        user = dataUser.createRandomTestUser();
-        site = dataSite.usingUser(user).createPublicRandomSite();
-        ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        STEP("Create a rule in the folder.");
-        RestRuleModel ruleModel = createRuleModel("ruleName");
-        rule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                                       .createSingleRule(ruleModel);
-    }
-
-    /** Check we can get an empty list of rule sets. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getEmptyRuleSetsList()
-    {
-        STEP("Create a folder in existing site");
-        FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        STEP("Get the rule sets for the folder");
-        RestRuleSetModelsCollection ruleSets = restClient.authenticateUser(user).withCoreAPI()
-                                                         .usingNode(folder).getListOfRuleSets();
-
-        restClient.assertStatusCodeIs(OK);
-        assertTrue("Expected no rule sets to be present.", ruleSets.isEmpty());
-    }
-
-    /** Check we can get a list of rule sets. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void getRuleSetsList()
-    {
-        STEP("Get the rule sets for the folder");
-        RestRuleSetModelsCollection ruleSets = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder)
-                                                         .getListOfRuleSets();
-
-        restClient.assertStatusCodeIs(OK);
-        ruleSets.assertThat().entriesListCountIs(1);
-        ruleSets.getEntries().get(0).onModel()
-                .assertThat().field("id").isNotNull();
-    }
-
-    /** Check we get a 404 if trying to load rule sets for a folder that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getRuleSetsForNonExistentFolder()
-    {
-        STEP("Try to load rule sets for a non-existent folder.");
-        FolderModel nonExistentFolder = FolderModel.getRandomFolderModel();
-        nonExistentFolder.setNodeRef("fake-id");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(nonExistentFolder).getListOfRuleSets();
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /** Check we can get a rule set by its id. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void getRuleSetById()
-    {
-        STEP("Get the rule sets for the folder and find the rule set id");
-        RestRuleSetModelsCollection ruleSets = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder)
-                                                         .getListOfRuleSets();
-        ruleSets.assertThat().entriesListCountIs(1);
-        String ruleSetId = ruleSets.getEntries().get(0).onModel().getId();
-
-        STEP("Get the rule set using its rule set id");
-        RestRuleSetModel ruleSet = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder)
-                                             .getRuleSet(ruleSetId);
-
-        restClient.assertStatusCodeIs(OK);
-        ruleSet.assertThat().field("id").is(ruleSetId);
-    }
-
-    /** Check we can get a rule set using the "-default-" synonym. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getDefaultRuleSetById()
-    {
-        STEP("Get the default rule set for the folder");
-        RestRuleSetModel ruleSet = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder)
-                                                         .getDefaultRuleSet();
-
-        restClient.assertStatusCodeIs(OK);
-        ruleSet.assertThat().field("id").isNotNull();
-    }
-
-    /** Check we get a 404 if trying to load the default rule set for a folder that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getDefaultRuleSetForNonExistentFolder()
-    {
-        STEP("Try to load a rule set for a non-existent folder.");
-        FolderModel nonExistentFolder = FolderModel.getRandomFolderModel();
-        nonExistentFolder.setNodeRef("fake-id");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(nonExistentFolder).getDefaultRuleSet();
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /** Check we get 404 for a non-existing rule set id. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void getRuleSetByNonExistingId()
-    {
-        STEP("Get the rule set using fake rule set id");
-        String ruleSetId = "fake-rule-set-id";
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).getRuleSet(ruleSetId);
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-}

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

@@ -1,217 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rules;
-
-import static java.util.stream.Collectors.toList;
-
-import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModel;
-import static org.alfresco.utility.constants.UserRole.SiteCollaborator;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.OK;
-
-import java.util.List;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestRuleModel;
-import org.alfresco.rest.model.RestRuleModelsCollection;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.alfresco.utility.model.UserModel;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests for GET /nodes/{nodeId}/rule-sets/{ruleSetId}/rules and GET /nodes/{nodeId}/rule-sets/{ruleSetId}/rules/{ruleId}.
- */
-@Test(groups = {TestGroup.RULES})
-public class GetRulesTests extends RestTest
-{
-    private UserModel user;
-    private SiteModel site;
-    private FolderModel ruleFolder;
-    private List<RestRuleModel> createdRules;
-    private RestRuleModel createdRuleA;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation()
-    {
-        STEP("Create a user, site and folder");
-        user = dataUser.createRandomTestUser();
-        site = dataSite.usingUser(user).createPublicRandomSite();
-        ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        STEP("Create rules in the folder");
-        createdRules = Stream.of("ruleA", "ruleB").map(ruleName -> {
-            RestRuleModel ruleModel = createRuleModel(ruleName);
-            return restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-        }).collect(toList());
-        createdRuleA = createdRules.get(0);
-    }
-
-    /** Check we can get an empty list of rules. */
-    @Test(groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getEmptyRulesList()
-    {
-        STEP("Create a folder in existing site");
-        FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        STEP("Get the rules that apply to the folder");
-        RestRuleModelsCollection rules = restClient.authenticateUser(user).withCoreAPI().usingNode(folder).usingDefaultRuleSet().getListOfRules();
-
-        restClient.assertStatusCodeIs(NOT_FOUND);
-        assertTrue("Expected no rules to be present.", rules.isEmpty());
-    }
-
-    /** Check we can get all the rules for a folder. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void getRulesList()
-    {
-        STEP("Get the rules that apply to the folder");
-        RestRuleModelsCollection rules = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().getListOfRules();
-
-        restClient.assertStatusCodeIs(OK);
-        rules.assertThat().entriesListCountIs(createdRules.size());
-        IntStream.range(0, createdRules.size()).forEach(i ->
-                rules.getEntries().get(i).onModel()
-                         .assertThat().field("id").is(createdRules.get(i).getId())
-                         .assertThat().field("name").is(createdRules.get(i).getName()));
-    }
-
-    /** Check we get a 404 if trying to load rules for a folder that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getRulesForNonExistentFolder()
-    {
-        STEP("Try to load rules for a non-existent folder.");
-        FolderModel nonExistentFolder = FolderModel.getRandomFolderModel();
-        nonExistentFolder.setNodeRef("fake-id");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(nonExistentFolder).usingDefaultRuleSet().getListOfRules();
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /** Check we get a 404 if trying to load rules with a rule set id that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getRulesFromNonExistentRuleSet()
-    {
-        STEP("Create a folder in existing site");
-        FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-        STEP("Try to load rules for a non-existent rule set.");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(folder).usingRuleSet("fake-id").getListOfRules();
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /** Check we can get a rule by its id. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void getSingleRule()
-    {
-        STEP("Load a particular rule");
-        RestRuleModel rule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().getSingleRule(createdRuleA.getId());
-
-        restClient.assertStatusCodeIs(OK);
-
-        rule.assertThat().field("id").is(createdRuleA.getId())
-            .assertThat().field("name").is(createdRuleA.getName());
-    }
-
-    /** Check we get a 404 if trying to load a rule from a folder that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getSingleRuleFromNonExistentFolder()
-    {
-        STEP("Try to load a rule from a non-existent folder.");
-        FolderModel nonExistentFolder = FolderModel.getRandomFolderModel();
-        nonExistentFolder.setNodeRef("fake-id");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(nonExistentFolder).usingDefaultRuleSet().getSingleRule("fake-rule-id");
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /** Check we get a 404 if trying to load a rule with a rule set id that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getSingleRuleFromNonExistentRuleSet()
-    {
-        STEP("Create a folder in existing site");
-        FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-        STEP("Try to load rules for a non-existent rule set.");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(folder).usingRuleSet("fake-id").getSingleRule("fake-rule-id");
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /** Check we get a 404 if trying to load an existing rule providing a wrong but existing folder */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void getSingleRuleFromWrongFolder()
-    {
-        STEP("Create a folder in existing site");
-        FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-        STEP("Try to load a rule for a wrong but existing folder.");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(folder).usingDefaultRuleSet().getSingleRule(createdRuleA.getId());
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /** Check that a user without read permission cannot view the folder rules. */
-    public void requireReadPermissionToGetRule()
-    {
-        STEP("Create a user and use them to create a private site containing a folder with a rule");
-        UserModel privateUser = dataUser.createRandomTestUser();
-        SiteModel privateSite = dataSite.usingUser(privateUser).createPrivateRandomSite();
-        FolderModel privateFolder = dataContent.usingUser(privateUser).usingSite(privateSite).createFolder();
-        RestRuleModel ruleModel = new RestRuleModel();
-        ruleModel.setName("Private site rule");
-        restClient.authenticateUser(privateUser).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        STEP("Try to get the rule with another user");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet().getListOfRules();
-
-        restClient.assertLastError()
-                  .statusCodeIs(FORBIDDEN)
-                  .containsSummary("Cannot read from this node");
-    }
-
-    /** Check that a user with only read permission can view the folder rules. */
-    public void dontRequireWritePermissionToGetRule()
-    {
-        STEP("Create a user and use them to create a private site containing a folder with a rule");
-        UserModel privateUser = dataUser.createRandomTestUser();
-        SiteModel privateSite = dataSite.usingUser(privateUser).createPrivateRandomSite();
-        FolderModel privateFolder = dataContent.usingUser(privateUser).usingSite(privateSite).createFolder();
-        RestRuleModel ruleModel = createRuleModel("Private site rule");
-        restClient.authenticateUser(privateUser).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        STEP("Create a collaborator in the private site");
-        UserModel collaborator = dataUser.createRandomTestUser();
-        collaborator.setUserRole(SiteCollaborator);
-        restClient.authenticateUser(privateUser).withCoreAPI().usingSite(privateSite).addPerson(collaborator);
-
-        STEP("Check the collaborator can view the rule");
-        RestRuleModelsCollection rules = restClient.authenticateUser(collaborator).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet().getListOfRules();
-
-        restClient.assertStatusCodeIs(OK);
-        rules.assertThat().entriesListContains("name", "Private site rule");
-    }
-}

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

@@ -1,68 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rules;
-
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
-import org.alfresco.rest.model.RestRuleModel;
-
-public class RulesTestsUtils
-{
-
-    public static RestRuleModel createRuleModel(String name) {
-        return createRuleModel(name, List.of(createActionModel()));
-    }
-
-    /**
-     * Create a rule model.
-     *
-     * @param name The name for the rule.
-     * @param restActionModels Rule's actions.
-     * @return The created rule model.
-     */
-    public static RestRuleModel createRuleModel(String name, List<RestActionBodyExecTemplateModel> restActionModels)
-    {
-        RestRuleModel ruleModel = new RestRuleModel();
-        ruleModel.setName(name);
-        ruleModel.setActions(restActionModels);
-        return ruleModel;
-    }
-
-    /**
-     * Create a rule's action model.
-     *
-     * @return The created action model.
-     */
-    public static RestActionBodyExecTemplateModel createActionModel()
-    {
-        RestActionBodyExecTemplateModel restActionModel = new RestActionBodyExecTemplateModel();
-        restActionModel.setActionDefinitionId("add-features");
-        restActionModel.setParams(Map.of("aspect-name", "{http://www.alfresco.org/model/audio/1.0}audio", "actionContext", "rule"));
-        return restActionModel;
-    }
-}

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

@@ -1,201 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rules;
-
-import static org.alfresco.rest.rules.RulesTestsUtils.createActionModel;
-import static org.alfresco.rest.rules.RulesTestsUtils.createRuleModel;
-import static org.alfresco.utility.constants.UserRole.SiteCollaborator;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.OK;
-
-import java.util.List;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
-import org.alfresco.rest.model.RestRuleModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.alfresco.utility.model.UserModel;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests for PUT /nodes/{nodeId}/rule-sets/{ruleSetId}/rules.
- */
-@Test (groups = { TestGroup.RULES })
-public class UpdateRulesTests extends RestTest
-{
-    private UserModel user;
-    private SiteModel site;
-    private FolderModel ruleFolder;
-
-    @BeforeClass (alwaysRun = true)
-    public void dataPreparation()
-    {
-        user = dataUser.createRandomTestUser();
-        site = dataSite.usingUser(user).createPublicRandomSite();
-        ruleFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-    }
-
-    /** Check we can update a rule. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.SANITY })
-    public void updateRule()
-    {
-        RestRuleModel rule = createAndSaveRule("Rule name");
-
-        STEP("Try to update the rule.");
-        RestRuleModel updatedRuleModel = createRuleModel("Updated rule name");
-        RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                                       .updateRule(rule.getId(), updatedRuleModel);
-
-        restClient.assertStatusCodeIs(OK);
-        updatedRule.assertThat().field("id").is(rule.getId())
-                   .assertThat().field("name").is("Updated rule name");
-    }
-
-    /** Check we get a 404 if trying to update a rule in a folder that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void updateRuleForNonExistentFolder()
-    {
-        RestRuleModel rule = createAndSaveRule("Rule name");
-
-        STEP("Try to update a rule in a non-existent folder.");
-        FolderModel nonExistentFolder = FolderModel.getRandomFolderModel();
-        nonExistentFolder.setNodeRef("fake-id");
-
-        RestRuleModel updatedRuleModel = new RestRuleModel();
-        updatedRuleModel.setName("Updated rule name");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(nonExistentFolder).usingDefaultRuleSet()
-                  .updateRule(rule.getId(), updatedRuleModel);
-
-        restClient.assertLastError().statusCodeIs(NOT_FOUND)
-                                    .containsSummary("fake-id was not found");
-    }
-
-    /** Check we get a 404 if trying to update a rule in a rule set that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void updateRuleForNonExistentRuleSet()
-    {
-        RestRuleModel rule = createAndSaveRule("Rule name");
-
-        STEP("Try to update a rule in a non-existent rule set.");
-        RestRuleModel updatedRuleModel = new RestRuleModel();
-        updatedRuleModel.setName("Updated rule name");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingRuleSet("fake-id")
-                  .updateRule(rule.getId(), updatedRuleModel);
-
-        restClient.assertLastError().statusCodeIs(NOT_FOUND)
-                  .containsSummary("fake-id was not found");
-    }
-
-    /** Check we get a 404 if trying to update a rule that doesn't exist. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void updateRuleForNonExistentRuleId()
-    {
-        STEP("Try to update a rule that doesn't exist.");
-        RestRuleModel updatedRuleModel = new RestRuleModel();
-        updatedRuleModel.setName("Updated rule name");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                  .updateRule("fake-id", updatedRuleModel);
-
-        restClient.assertLastError().statusCodeIs(NOT_FOUND)
-                  .containsSummary("fake-id was not found");
-    }
-
-    /** Check that a user without permission cannot update a rule. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void requirePermissionToUpdateRule()
-    {
-        STEP("Create a user and use them to create a private site containing a folder");
-        UserModel privateUser = dataUser.createRandomTestUser();
-        SiteModel privateSite = dataSite.usingUser(privateUser).createPrivateRandomSite();
-        FolderModel privateFolder = dataContent.usingUser(privateUser).usingSite(privateSite).createFolder();
-
-        STEP("Create a collaborator and check they don't have permission to create a rule");
-        UserModel collaborator = dataUser.createRandomTestUser();
-        dataUser.addUserToSite(collaborator, privateSite, SiteCollaborator);
-        RestRuleModel ruleModel = new RestRuleModel();
-        ruleModel.setName("ruleName");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(privateFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(FORBIDDEN);
-        restClient.assertLastError().containsSummary("Insufficient permissions to manage rules");
-    }
-
-    /** Check we get an error trying to update a rule to have no name. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void updateRuleToHaveEmptyName()
-    {
-        RestRuleModel rule = createAndSaveRule("Rule name");
-
-        STEP("Try to update the rule to have no name.");
-        RestRuleModel updatedRuleModel = new RestRuleModel();
-        updatedRuleModel.setName("");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet().updateRule(rule.getId(), updatedRuleModel);
-
-        restClient.assertLastError().statusCodeIs(BAD_REQUEST)
-                                    .containsSummary("Rule name is a mandatory parameter");
-    }
-
-    /** Check that updates to the rule's id are ignored. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void tryToUpdateRuleId()
-    {
-        RestRuleModel rule = createAndSaveRule("Rule name");
-
-        STEP("Try to update the rule id and check it isn't changed.");
-        RestRuleModel updatedRuleModel = createRuleModel("Rule name");
-        updatedRuleModel.setId("new-rule-id");
-        RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-                                              .updateRule(rule.getId(), updatedRuleModel);
-
-        updatedRule.assertThat().field("id").is(rule.getId());
-    }
-
-    private RestRuleModel createAndSaveRule(String name)
-    {
-        return createAndSaveRule(name, List.of(createActionModel()));
-    }
-
-    /**
-     * Create a rule for folder and store it.
-     *
-     * @param name The name for the rule.
-     * @param restActionModels Rule's actions.
-     * @return The created rule.
-     */
-    private RestRuleModel createAndSaveRule(String name, List<RestActionBodyExecTemplateModel> restActionModels)
-    {
-        STEP("Create a rule called " + name + ", containing actions: " + restActionModels);
-        RestRuleModel ruleModel = createRuleModel(name, restActionModels);
-        return restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()
-            .createSingleRule(ruleModel);
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessSanityTests.java

@@ -16,7 +16,7 @@ import org.testng.annotations.Test;
  */
 public class GetProcessSanityTests extends RestTest
 {
-    private UserModel userWhoStartsProcess, assignee, user;
+    private UserModel userWhoStartsProcess, assignee;
     private RestProcessModel addedProcess, process;
 
     @BeforeClass(alwaysRun = true)
@@ -24,7 +24,6 @@ public class GetProcessSanityTests extends RestTest
     {
         userWhoStartsProcess = dataUser.createRandomTestUser();
         assignee = dataUser.createRandomTestUser();
-        user = dataUser.createRandomTestUser();
         addedProcess = restClient.authenticateUser(userWhoStartsProcess).withWorkflowAPI().addProcess("activitiAdhoc", assignee, false, CMISUtil.Priority.High);
     }
 
@@ -60,13 +59,4 @@ public class GetProcessSanityTests extends RestTest
         process.assertThat().field("id").is(addedProcess.getId())
                 .and().field("startUserId").is(addedProcess.getStartUserId());
     }
-
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESSES }, executionType = ExecutionType.SANITY,
-            description = "Verify User that is not involved in a process cannot get that process using REST API and status code is FORBIDDEN (403)")
-    @Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.SANITY })
-    public void shouldNotGetProcessesByNotInvolvedUser() throws Exception
-    {
-        process = restClient.authenticateUser(user).withWorkflowAPI().usingProcess(addedProcess).getProcess();
-        restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN);
-    }
 }

packaging/tests/tas-restapi/src/test/resources/test-suites/part1-suite.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="REST API tests part1" preserve-order="true">
-    <listeners>
+	<listeners>
         <listener class-name="org.alfresco.utility.report.HtmlReportListener"/>
         <listener class-name="org.alfresco.utility.testrail.TestRailExecutorListener"/>
         <listener class-name="org.alfresco.utility.testng.OSTestMethodSelector"/>
-    </listeners>
+	</listeners>
 
     <test name="Part1">
         <packages>
@@ -14,7 +14,6 @@
             <package name="org.alfresco.rest.comments.*"/>
             <package name="org.alfresco.rest.downloads.*"/>
             <package name="org.alfresco.rest.favorites.*"/>
-            <package name="org.alfresco.rest.rules.*" />
             <package name="org.alfresco.rest.servlet.*"/>
         </packages>
     </test>

packaging/tests/tas-webdav/pom.xml

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

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.77</version>
+        <version>23.1.0.23-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -144,7 +144,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>1.4</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>17.77</version>
+    <version>23.1.0.23-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -23,11 +23,11 @@
     </modules>
 
     <properties>
-        <acs.version.major>7</acs.version.major>
-        <acs.version.minor>3</acs.version.minor>
+        <acs.version.major>23</acs.version.major>
+        <acs.version.minor>1</acs.version.minor>
         <acs.version.revision>0</acs.version.revision>
         <acs.version.label />
-        <amp.min.version>${acs.version.major}.0.0</amp.min.version>
+        <amp.min.version>${acs.version.major}.1.0</amp.min.version>
 
         <version.edition>Community</version.edition>
         <licenseName>community</licenseName>
@@ -47,59 +47,58 @@
         <dependency.alfresco-trashcan-cleaner.version>2.4.1</dependency.alfresco-trashcan-cleaner.version>
         <dependency.alfresco-jlan.version>7.1</dependency.alfresco-jlan.version>
         <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
-        <dependency.alfresco-messaging-repo.version>1.2.20</dependency.alfresco-messaging-repo.version>
+        <dependency.alfresco-messaging-repo.version>1.2.19</dependency.alfresco-messaging-repo.version>
         <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
         <dependency.alfresco-transform-service.version>1.5.3</dependency.alfresco-transform-service.version>
         <dependency.alfresco-transform-core.version>2.6.0</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-greenmail.version>6.4</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.16</dependency.acs-event-model.version>
+        <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
+        <dependency.acs-event-model.version>0.0.13</dependency.acs-event-model.version>
 
-        <dependency.spring.version>5.3.22</dependency.spring.version>
+        <dependency.spring.version>5.3.18</dependency.spring.version>
         <dependency.antlr.version>3.5.2</dependency.antlr.version>
-        <dependency.jackson.version>2.13.3</dependency.jackson.version>
-        <dependency.jackson-databind.version>2.13.3</dependency.jackson-databind.version>
-        <dependency.cxf.version>3.5.3</dependency.cxf.version>
+        <dependency.jackson.version>2.13.1</dependency.jackson.version>
+        <dependency.jackson-databind.version>2.13.1</dependency.jackson-databind.version>
+        <dependency.cxf.version>3.5.0</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.31</dependency.webscripts.version>
+        <dependency.webscripts.version>8.29</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
-        <dependency.mockito-core.version>4.6.1</dependency.mockito-core.version>
-        <dependency.assertj.version>3.23.1</dependency.assertj.version>
-        <dependency.org-json.version>20220320</dependency.org-json.version>
+        <dependency.mockito-core.version>3.11.2</dependency.mockito-core.version>
+        <dependency.org-json.version>20211205</dependency.org-json.version>
         <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
         <dependency.commons-io.version>2.11.0</dependency.commons-io.version>
-        <dependency.gson.version>2.8.9</dependency.gson.version>
+        <dependency.gson.version>2.8.5</dependency.gson.version>
         <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
         <dependency.httpcore.version>4.4.15</dependency.httpcore.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
         <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
         <dependency.slf4j.version>1.7.35</dependency.slf4j.version>
         <dependency.gytheio.version>0.16</dependency.gytheio.version>
-        <dependency.groovy.version>3.0.12</dependency.groovy.version>
-        <dependency.tika.version>2.4.1</dependency.tika.version>
-        <dependency.spring-security.version>5.7.2</dependency.spring-security.version>
+        <dependency.groovy.version>3.0.9</dependency.groovy.version>
+        <dependency.tika.version>2.2.1</dependency.tika.version>
+        <dependency.spring-security.version>5.6.1</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
-        <dependency.poi.version>5.2.2</dependency.poi.version>
+        <dependency.poi.version>4.1.2</dependency.poi.version>
         <dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>
         <dependency.keycloak.version>15.0.2</dependency.keycloak.version>
-        <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
+        <dependency.jboss.logging.version>3.4.3.Final</dependency.jboss.logging.version>
         <dependency.camel.version>3.15.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
-        <dependency.activemq.version>5.17.1</dependency.activemq.version>
+        <dependency.activemq.version>5.16.1</dependency.activemq.version>
         <dependency.apache-compress.version>1.21</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
-        <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
+        <dependency.awaitility.version>4.1.1</dependency.awaitility.version>
         <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
-        <dependency.swagger-parser.version>1.0.61</dependency.swagger-parser.version>
+        <dependency.swagger-parser.version>1.0.56</dependency.swagger-parser.version>
         <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
-        <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
+        <dependency.maven-artifact.version>3.8.4</dependency.maven-artifact.version>
         <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
 
         <dependency.jakarta-jaxb-api.version>2.3.3</dependency.jakarta-jaxb-api.version>
         <dependency.jakarta-ws-api.version>2.3.3</dependency.jakarta-ws-api.version>
         <dependency.jakarta-soap-api.version>1.4.2</dependency.jakarta-soap-api.version>
         <dependency.jakarta-activation-api.version>1.2.2</dependency.jakarta-activation-api.version>
-        <dependency.jakarta-annotation-api.version>2.1.1</dependency.jakarta-annotation-api.version>
+        <dependency.jakarta-annotation-api.version>1.3.5</dependency.jakarta-annotation-api.version>
         <dependency.jakarta-transaction-api.version>1.3.3</dependency.jakarta-transaction-api.version>
         <dependency.jakarta-jws-api.version>2.1.0</dependency.jakarta-jws-api.version>
         <dependency.jakarta-mail-api.version>1.6.5</dependency.jakarta-mail-api.version>
@@ -107,20 +106,20 @@
         <dependency.jakarta-json-path.version>2.7.0</dependency.jakarta-json-path.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
-        <alfresco.googledrive.version>3.2.2</alfresco.googledrive.version>
+        <alfresco.googledrive.version>3.2.1.3</alfresco.googledrive.version>
         <alfresco.aos-module.version>1.4.1</alfresco.aos-module.version> 
-        <alfresco.api-explorer.version>7.2.1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.api-explorer.version>7.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
         <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
 
-        <dependency.postgresql.version>42.4.1</dependency.postgresql.version>
-        <dependency.mysql.version>8.0.30</dependency.mysql.version>
+        <dependency.postgresql.version>42.3.2</dependency.postgresql.version>
+        <dependency.mysql.version>8.0.27</dependency.mysql.version>
         <dependency.mysql-image.version>8</dependency.mysql-image.version>
         <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
-        <dependency.tas-utility.version>3.0.49</dependency.tas-utility.version>
+        <dependency.tas-utility.version>3.0.47</dependency.tas-utility.version>
         <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
-        <dependency.tas-restapi.version>1.101</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.80</dependency.tas-restapi.version>
         <dependency.tas-cmis.version>1.31</dependency.tas-cmis.version>
         <dependency.tas-email.version>1.8</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>
@@ -148,7 +147,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>17.77</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -405,7 +404,7 @@
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
-                <version>5.1.0</version>
+                <version>3.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -633,13 +632,13 @@
             <dependency>
                 <groupId>com.drewnoakes</groupId>
                 <artifactId>metadata-extractor</artifactId>
-                <version>2.18.0</version>
+                <version>2.16.0</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
                 <groupId>com.github.junrar</groupId>
                 <artifactId>junrar</artifactId>
-                <version>7.5.2</version>
+                <version>7.4.1</version>
             </dependency>
             <dependency>
                 <groupId>com.github.fge</groupId>
@@ -650,7 +649,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.15.2</version>
+                <version>1.14.3</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -729,7 +728,7 @@
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.10.14</version>
+                <version>2.10.13</version>
             </dependency>
 
             <!-- provided dependencies -->
@@ -756,11 +755,6 @@
                 <artifactId>mockito-core</artifactId>
                 <version>${dependency.mockito-core.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>${dependency.assertj.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>
@@ -874,20 +868,9 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.24</version>
+                <version>1.18.22</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.activiti</groupId>
-                <artifactId>activiti-spring</artifactId>
-                <version>${dependency.activiti.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-dbcp</groupId>
-                        <artifactId>commons-dbcp</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -905,7 +888,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.40.2</version>
+                    <version>0.39.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -926,21 +909,21 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.4.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.alfresco.maven.plugin</groupId>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.77</version>
+        <version>23.1.0.23-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
-            <version>3.0.0</version>
+            <version>2.3.0</version>
         </dependency>
         <!-- newer version, see REPO-3133 -->
         <dependency>
@@ -87,11 +87,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -130,7 +125,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>10.0.11</version>
+            <version>8.2.0.v20160908</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -142,19 +137,19 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
-            <version>10.0.11</version>
+            <version>8.2.0.v20160908</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
-            <version>10.0.11</version>
+            <version>8.2.0.v20160908</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco.cmis.client</groupId>
             <artifactId>alfresco-opencmis-extension</artifactId>
-            <version>2.1</version>
+            <version>2.0</version>
             <scope>test</scope>
             <exclusions>
               <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->

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

@@ -1,64 +0,0 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.repo.web.scripts;
-
-import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.MimetypeService;
-import org.springframework.extensions.webscripts.WebScriptRequest;
-
-public class MimeTypeUtil
-{
-
-    /**
-     * Get the file mimetype from the file ContentReader, and if its null then set the mimetype to binary by default
-     * and try to get the correct one from file extension
-     *
-     *
-     * @param reader            reader of the file in the request
-     * @param req               request relating to the file
-     * @param mimetypeService   MimetypeService
-     *
-     * @return  mimetype of the file as a string
-     */
-    public static String determineMimetype(ContentReader reader, WebScriptRequest req, MimetypeService mimetypeService)
-    {
-        String mimetype = reader.getMimetype();
-        if (mimetype == null || mimetype.length() == 0)
-        {
-            String extensionPath = req.getExtensionPath();
-            mimetype = MimetypeMap.MIMETYPE_BINARY;
-            int extIndex = extensionPath.lastIndexOf('.');
-            if (extIndex != -1)
-            {
-                String ext = extensionPath.substring(extIndex + 1);
-                mimetype = mimetypeService.getMimetype(ext);
-            }
-        }
-        return mimetype;
-    }
-
-}

remote-api/src/main/java/org/alfresco/repo/web/scripts/action/AbstractExecuteActionWebscript.java

@@ -1,33 +1,32 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.web.scripts.action;
 
 import java.util.Map;
 
-import org.alfresco.repo.action.access.ActionAccessRestriction;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ExecutionSummary;
 import org.springframework.extensions.webscripts.Cache;
@@ -59,7 +58,6 @@ public abstract class AbstractExecuteActionWebscript extends AbstractActionWebsc
            
            // Ask for it to be run in the background
            // It will be available to execute once the webscript finishes
-           ActionAccessRestriction.setActionContext(action, ActionAccessRestriction.V0_ACTION_CONTEXT);
            actionService.executeAction(
                  action, null, 
                  false, true

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -26,18 +26,14 @@
 package org.alfresco.repo.web.scripts.content;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.web.scripts.MimeTypeUtil;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
-import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@@ -69,19 +65,6 @@ public class ContentGet extends StreamContent implements ServletContextAware
     private NamespaceService namespaceService;
     private ContentService contentService;
 
-    private List<String> nonAttachContentTypes = Collections.emptyList();
-
-    /**
-     * @param nonAttachContentTypes List<String>
-     */
-    public void setNonAttachContentTypes(List<String> nonAttachContentTypes)
-    {
-        if (nonAttachContentTypes != null && !nonAttachContentTypes.isEmpty())
-        {
-            this.nonAttachContentTypes = nonAttachContentTypes;
-        }
-    }
-
     /**
      * @param servletContext ServletContext
      */
@@ -138,7 +121,9 @@ public class ContentGet extends StreamContent implements ServletContextAware
         {
             throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find " + reference.toString());
         }
-
+        
+        // determine attachment
+        boolean attach = Boolean.valueOf(req.getParameter("a"));
         
         // render content
         QName propertyQName = ContentModel.PROP_CONTENT;
@@ -155,19 +140,6 @@ public class ContentGet extends StreamContent implements ServletContextAware
                 propertyQName = QName.createQName(propertyName, namespaceService);
             }
         }
-        // determine attachment and force download for specific mimetypes - see PRODSEC-5862
-        boolean attach = Boolean.valueOf(req.getParameter("a"));
-        ContentReader reader = contentService.getReader(nodeRef, propertyQName);
-        String mimetype = MimeTypeUtil.determineMimetype(reader, req, mimetypeService);
-
-        if (!attach)
-        {
-            if (nonAttachContentTypes == null || !nonAttachContentTypes.contains(mimetype))
-            {
-                attach = true;
-                logger.warn("Ignored a=false for " + nodeRef.getId() + " since " + mimetype + " is not in the whitelist for non-attach content types");
-            }
-        }
 
         // Stream the content
         streamContentLocal(req, res, nodeRef, attach, propertyQName, null);

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

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.web.scripts.content;
 
 import java.io.IOException;
@@ -33,7 +33,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.web.scripts.MimeTypeUtil;
+import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
@@ -79,7 +79,18 @@ public class ContentInfo extends StreamContent
         delegate.setAttachment(req, res, attach, attachFileName);
 
         // establish mimetype
-        String mimetype = MimeTypeUtil.determineMimetype(reader, req, mimetypeService);
+        String mimetype = reader.getMimetype();
+        String extensionPath = req.getExtensionPath();
+        if (mimetype == null || mimetype.length() == 0)
+        {
+            mimetype = MimetypeMap.MIMETYPE_BINARY;
+            int extIndex = extensionPath.lastIndexOf('.');
+            if (extIndex != -1)
+            {
+                String ext = extensionPath.substring(extIndex + 1);
+                mimetype = mimetypeService.getMimetype(ext);
+            }
+        }
 
         // set mimetype for the content and the character encoding + length for the stream
         res.setContentType(mimetype);

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -43,7 +43,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentReader;
-import org.alfresco.repo.web.scripts.MimeTypeUtil;
 import org.alfresco.sync.repo.events.EventPublisher;
 import org.alfresco.repo.web.util.HttpRangeProcessor;
 import org.alfresco.rest.framework.resource.content.CacheDirective;
@@ -362,7 +361,18 @@ public class ContentStreamer implements ResourceLoaderAware
         setAttachment(req, res, attach, attachFileName);
     
         // establish mimetype
-        String mimetype = MimeTypeUtil.determineMimetype(reader, req, mimetypeService);
+        String mimetype = reader.getMimetype();
+        String extensionPath = req.getExtensionPath();
+        if (mimetype == null || mimetype.length() == 0)
+        {
+            mimetype = MimetypeMap.MIMETYPE_BINARY;
+            int extIndex = extensionPath.lastIndexOf('.');
+            if (extIndex != -1)
+            {
+                String ext = extensionPath.substring(extIndex + 1);
+                mimetype = mimetypeService.getMimetype(ext);
+            }
+        }
         
         res.setHeader(HEADER_ACCEPT_RANGES, "bytes");
         try

remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/AbstractRuleWebScript.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.web.scripts.rule;
 
 import java.io.Serializable;
@@ -38,8 +38,6 @@ import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.action.ActionConditionImpl;
 import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.repo.action.CompositeActionImpl;
-import org.alfresco.repo.action.RuntimeActionService;
-import org.alfresco.repo.action.access.ActionAccessRestriction;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionCondition;
 import org.alfresco.service.cmr.action.ActionService;
@@ -87,8 +85,6 @@ public abstract class AbstractRuleWebScript extends DeclarativeWebScript
     protected FileFolderService fileFolderService;
     protected NamespaceService namespaceService;
 
-    private RuntimeActionService runtimeActionService;
-
     /**
      * Sets the node service instance
      * 
@@ -149,10 +145,6 @@ public abstract class AbstractRuleWebScript extends DeclarativeWebScript
         this.namespaceService = namespaceService;
     }
 
-    public void setRuntimeActionService(RuntimeActionService runtimeActionService) {
-        this.runtimeActionService = runtimeActionService;
-    }
-
     /**
      * Parses the request and providing it's valid returns the NodeRef.
      * 
@@ -440,22 +432,10 @@ public abstract class AbstractRuleWebScript extends DeclarativeWebScript
 
     protected void checkRule(Rule rule)
     {
-        List<Action> actions = ((CompositeActionImpl) rule.getAction()).getActions();
-
-        checkRestrictedAccessActions(actions);
-        checkRuleOutboundHasNoCheckOutAction(rule, actions);
-    }
-
-    private void checkRestrictedAccessActions(List<Action> actions) {
-        for (Action action : actions) {
-            ActionAccessRestriction.setActionContext(action, ActionAccessRestriction.RULE_ACTION_CONTEXT);
-            runtimeActionService.verifyActionAccessRestrictions(action);
-        }
-    }
-
-    private void checkRuleOutboundHasNoCheckOutAction(Rule rule, List<Action> actions) {
-        if (rule.getRuleTypes().contains(RULE_OUTBOUND))
+        List<String> ruleTypes = rule.getRuleTypes();
+        if (ruleTypes.contains(RULE_OUTBOUND))
         {
+            List<Action> actions = ((CompositeActionImpl) rule.getAction()).getActions();
             for (Action action : actions)
             {
                 if (action.getActionDefinitionName().equalsIgnoreCase(ACTION_CHECK_OUT))