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

Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -44,14 +44,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - id: changed-files
-        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v6.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v7.1.0
         with:
           write-list-to-env: true
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v6.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Prepare maven cache and check compilation"
@@ -69,12 +69,12 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.1.0
         continue-on-error: true
         with:
           srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
@@ -92,10 +92,10 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.1.0
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
           repository: "Alfresco/veracode-baseline-archive"
@@ -142,10 +142,10 @@ jobs:
       !contains(github.event.head_commit.message, '[skip tests]') &&
       !contains(github.event.head_commit.message, '[force]')
     steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - uses: Alfresco/ya-pmd-scan@v4.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/ya-pmd-scan@v4.1.0
         with:
           classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""
 
@@ -175,14 +175,14 @@ jobs:
             testAttributes: "-Dtest=AllMmtUnitTestSuite"
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testModule }}
@@ -213,7 +213,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -255,9 +255,9 @@ jobs:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -266,10 +266,11 @@ jobs:
       - name: "Set transformers tag"
         run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV
       - name: "Set up the environment"
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }}
@@ -300,7 +301,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -333,9 +334,9 @@ jobs:
         version: ['10.2.18', '10.4', '10.5']
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: Run MariaDB ${{ matrix.version }} database
@@ -344,7 +345,7 @@ jobs:
           MARIADB_VERSION: ${{ matrix.version }}
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.version }}
@@ -375,7 +376,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -404,9 +405,9 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run MariaDB 10.6 database"
@@ -415,7 +416,7 @@ jobs:
           MARIADB_VERSION: 10.6
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -446,7 +447,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -475,9 +476,9 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run MySQL 8 database"
@@ -486,7 +487,7 @@ jobs:
           MYSQL_VERSION: 8
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -517,7 +518,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -545,9 +546,9 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 13.12 database"
@@ -556,7 +557,7 @@ jobs:
           POSTGRES_VERSION: 13.12
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -587,7 +588,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -615,9 +616,9 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 14.9 database"
@@ -626,7 +627,7 @@ jobs:
           POSTGRES_VERSION: 14.9
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -657,7 +658,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -685,9 +686,9 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 15.4 database"
@@ -696,7 +697,7 @@ jobs:
           POSTGRES_VERSION: 15.4
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -727,7 +728,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -753,16 +754,16 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run ActiveMQ"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -793,7 +794,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -853,9 +854,9 @@ jobs:
             mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore'
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Set transformers tag"
@@ -874,10 +875,11 @@ jobs:
             echo "HOSTNAME_VERIFICATION_DISABLED=false" >> "$GITHUB_ENV"
           fi
       - name: "Set up the environment"
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} ${{ matrix.idp }}
@@ -908,7 +910,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -966,15 +968,16 @@ jobs:
       REQUIRES_LOCAL_IMAGES: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
           bash ./scripts/ci/init.sh
           bash ./scripts/ci/build.sh
       - name: "Set up the environment"
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
           ${{ env.TAS_SCRIPTS }}/start-compose.sh ${{ env.TAS_ENVIRONMENT }}/docker-compose-minimal+transforms.yml
           ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
@@ -983,7 +986,7 @@ jobs:
         run: mvn install -pl :alfresco-community-repo-integration-test -am -DskipTests -Pall-tas-tests
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.test-name }}
@@ -1021,7 +1024,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.tests.outcome }}
@@ -1047,16 +1050,16 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run Postgres 15.4 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -1087,7 +1090,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -1121,9 +1124,9 @@ jobs:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1131,7 +1134,7 @@ jobs:
           bash ./scripts/ci/build.sh
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (PostgreSQL) ${{ matrix.test-name }}
@@ -1167,9 +1170,9 @@ jobs:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1177,7 +1180,7 @@ jobs:
           bash ./scripts/ci/build.sh
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (MySQL) ${{ matrix.test-name }}
@@ -1209,9 +1212,9 @@ jobs:
       REQUIRES_LOCAL_IMAGES: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1225,7 +1228,7 @@ jobs:
           mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -1257,7 +1260,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -1299,9 +1302,9 @@ jobs:
       !contains(github.event.head_commit.message, '[force]')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |

.github/workflows/master_release.yml

@@ -34,12 +34,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -63,12 +63,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}

.secrets.baseline

@@ -133,21 +133,21 @@
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572",
         "is_verified": false,
-        "line_number": 292
+        "line_number": 293
       },
       {
         "type": "Secret Keyword",
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966",
         "is_verified": false,
-        "line_number": 367
+        "line_number": 368
       },
       {
         "type": "Secret Keyword",
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39",
         "is_verified": false,
-        "line_number": 900
+        "line_number": 902
       }
     ],
     ".github/workflows/master_release.yml": [
@@ -1888,5 +1888,5 @@
       }
     ]
   },
-  "generated_at": "2024-09-25T10:33:16Z"
+  "generated_at": "2024-10-02T10:18:47Z"
 }

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.4.0.26</version>
+      <version>23.4.0.42</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/pom.xml

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

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

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

amps/ags/rm-community/pom.xml

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

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

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.11
+SOLR6_TAG=2.0.12
 POSTGRES_TAG=15.4
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

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>23.4.0.26</version>
+      <version>23.4.0.42</version>
    </parent>
 
    <properties>

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

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

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

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

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.4.0.26</version>
+      <version>23.4.0.42</version>
    </parent>
 
    <dependencies>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <properties>

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <dependencies>

packaging/distribution/pom.xml

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

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <modules>

packaging/tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.11
+SOLR6_TAG=2.0.12
 POSTGRES_TAG=15.4
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

packaging/tests/pom.xml

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

packaging/tests/tas-cmis/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <organization>

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</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>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <properties>

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPersonFavoritesModel.java

@@ -36,22 +36,22 @@ public class RestPersonFavoritesModel extends TestModel implements IRestModel<Re
 {
     @JsonProperty(value = "entry")
     RestPersonFavoritesModel model;
-    
+
     @Override
-    public RestPersonFavoritesModel onModel() 
-    {     
-      return model;
+    public RestPersonFavoritesModel onModel()
+    {
+        return model;
     }
 
     private String targetGuid;
     private String createdAt;
+    private List<String> aspectNames;
     private List<String> allowableOperations;
-    
+
     private RestTargetModel target;
 
     public RestPersonFavoritesModel()
-    {
-    }
+    {}
 
     public RestPersonFavoritesModel(String targetGuid, String createdAt)
     {
@@ -69,7 +69,7 @@ public class RestPersonFavoritesModel extends TestModel implements IRestModel<Re
     {
         this.targetGuid = targetGuid;
     }
-    
+
     public RestTargetModel getTarget()
     {
         return target;
@@ -90,11 +90,23 @@ public class RestPersonFavoritesModel extends TestModel implements IRestModel<Re
         this.createdAt = createdAt;
     }
 
-    public List<String> getAllowableOperations() {
+    public List<String> getAspectNames()
+    {
+        return aspectNames;
+    }
+
+    public void setAspectNames(List<String> aspectNames)
+    {
+        this.aspectNames = aspectNames;
+    }
+
+    public List<String> getAllowableOperations()
+    {
         return allowableOperations;
     }
 
-    public void setAllowableOperations(List<String> allowableOperations) {
+    public void setAllowableOperations(List<String> allowableOperations)
+    {
         this.allowableOperations = allowableOperations;
     }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Categories.java

@@ -0,0 +1,97 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.rest.repo.resource.cache.MultiKeyResourceMap;
+import org.alfresco.rest.repo.resource.category.RepoCategoryCreator;
+import org.alfresco.rest.repo.resource.category.RepoCategoryModifier;
+import org.alfresco.rest.repo.resource.general.Modifier;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.model.UserModel;
+
+/**
+ * Helper class simplifying things related with repository categories management.
+ */
+@Component
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class Categories implements ResourceManager<RestCategoryModel, Specifier.CategoriesSpecifier, Modifier.CategoryModifier>
+{
+    public static final String CATEGORY_NAME_PREFIX = "category";
+    private static final String ROOT_CATEGORY_ID = "-root-";
+    public static final RestCategoryModel ROOT_CATEGORY = RestCategoryModel.builder().id(ROOT_CATEGORY_ID).create();
+
+    private final RestWrapper restClient;
+    private final UserModel user;
+
+    private final Map<String, RestCategoryModel> categoriesCache = new MultiKeyResourceMap<>(RestCategoryModel::getId, RestCategoryModel::getName);
+
+    public Categories(RestWrapper restClient, UserModel user)
+    {
+        this.restClient = restClient;
+        this.user = user;
+    }
+
+    @Autowired
+    public Categories(RestWrapper restClient, DataUser dataUser)
+    {
+        this(restClient, dataUser.getAdminUser());
+    }
+
+    @Override
+    public Specifier.CategoriesSpecifier add()
+    {
+        return (Specifier.CategoriesSpecifier) new RepoCategoryCreator(restClient, categoriesCache)
+                .underCategory(ROOT_CATEGORY).asUser(user);
+    }
+
+    @Override
+    public RestCategoryModel get(String key)
+    {
+        return categoriesCache.get(key);
+    }
+
+    @Override
+    public Modifier.CategoryModifier modify(RestCategoryModel category)
+    {
+        return new RepoCategoryModifier(restClient, category, categoriesCache).asUser(user);
+    }
+
+    @Override
+    public void delete(RestCategoryModel category)
+    {
+        new RepoCategoryModifier(restClient, category, categoriesCache).asUser(user).delete();
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Files.java

@@ -0,0 +1,105 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.repo.resource.cache.MultiKeyResourceMap;
+import org.alfresco.rest.repo.resource.content.PlainFileCreator;
+import org.alfresco.rest.repo.resource.content.PlainFileModifier;
+import org.alfresco.rest.repo.resource.general.Modifier;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.data.DataSite;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.UserModel;
+
+/**
+ * Helper class simplifying things related with repository files management.
+ */
+@Component
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class Files implements ResourceManager<FileModel, Specifier.FileSpecifier, Modifier.FileModifier>
+{
+    public static final String FILE_NAME_PREFIX = "file";
+
+    private final DataContent dataContent;
+    private final RestWrapper restClient;
+    private final SiteModel site;
+    private final UserModel user;
+    private final Map<String, FileModel> filesCache = new MultiKeyResourceMap<>(FileModel::getNodeRef, FileModel::getName);
+
+    public Files(DataContent dataContent, RestWrapper restClient, UserModel user, SiteModel site)
+    {
+        this.dataContent = dataContent;
+        this.restClient = restClient;
+        this.user = user;
+        this.site = site;
+    }
+
+    public Files(DataContent dataContent, RestWrapper restClient, DataUser dataUser)
+    {
+        this(dataContent, restClient, dataUser.getAdminUser(), null);
+    }
+
+    @Autowired
+    public Files(DataContent dataContent, RestWrapper restClient, DataUser dataUser, DataSite dataSite)
+    {
+        this(dataContent, restClient, dataUser.getAdminUser(), dataSite.usingUser(dataUser.getAdminUser()).createPrivateRandomSite());
+    }
+
+    @Override
+    public Specifier.FileSpecifier add()
+    {
+        return (Specifier.FileSpecifier) new PlainFileCreator(dataContent, filesCache).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public FileModel get(String id)
+    {
+        return filesCache.get(id);
+    }
+
+    @Override
+    public Modifier.FileModifier modify(FileModel file)
+    {
+        return new PlainFileModifier(dataContent, restClient, file, filesCache).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public void delete(FileModel file)
+    {
+        new PlainFileModifier(dataContent, restClient, file, filesCache).withinSite(site).asUser(user).delete();
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Folders.java

@@ -0,0 +1,113 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.repo.resource.cache.MultiKeyResourceMap;
+import org.alfresco.rest.repo.resource.content.RepoFolderCreator;
+import org.alfresco.rest.repo.resource.content.RepoFolderModifier;
+import org.alfresco.rest.repo.resource.general.Modifier;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.data.DataSite;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.UserModel;
+
+/**
+ * Helper class simplifying things related with repository folders management.
+ */
+@Component
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class Folders implements ResourceManager<FolderModel, Specifier.FolderSpecifier, Modifier.FolderModifier>
+{
+    public static final String FOLDER_NAME_PREFIX = "folder";
+
+    private final DataContent dataContent;
+    private final RestWrapper restClient;
+    private final SiteModel site;
+    private final UserModel user;
+    private final Files files;
+
+    private final Map<String, FolderModel> foldersCache = new MultiKeyResourceMap<>(FolderModel::getNodeRef, FolderModel::getName);
+
+    public Folders(DataContent dataContent, RestWrapper restClient, UserModel user, SiteModel site, Files files)
+    {
+        this.dataContent = dataContent;
+        this.restClient = restClient;
+        this.site = site;
+        this.user = user;
+        this.files = files;
+    }
+
+    public Folders(DataContent dataContent, RestWrapper restClient, UserModel user, SiteModel site)
+    {
+        this(dataContent, restClient, user, site, new Files(dataContent, restClient, user, site));
+    }
+
+    public Folders(DataContent dataContent, RestWrapper restClient, DataUser dataUser)
+    {
+        this(dataContent, restClient, dataUser.getAdminUser(), null);
+    }
+
+    @Autowired
+    public Folders(DataContent dataContent, RestWrapper restClient, DataUser dataUser, DataSite dataSite)
+    {
+        this(dataContent, restClient, dataUser.getAdminUser(), dataSite.usingUser(dataUser.getAdminUser()).createPrivateRandomSite());
+    }
+
+    @Override
+    public Specifier.FolderSpecifier add()
+    {
+        return (Specifier.FolderSpecifier) new RepoFolderCreator(dataContent, foldersCache).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public FolderModel get(String key)
+    {
+        return foldersCache.get(key);
+    }
+
+    @Override
+    public Modifier.FolderModifier modify(FolderModel folder)
+    {
+        return new RepoFolderModifier(dataContent, restClient, folder, files, foldersCache).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public void delete(FolderModel folder)
+    {
+        new RepoFolderModifier(dataContent, restClient, folder, files, foldersCache).withinSite(site).asUser(user).delete();
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/ResourceManager.java

@@ -0,0 +1,61 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource;
+
+import org.alfresco.rest.repo.resource.general.Modifier;
+import org.alfresco.rest.repo.resource.general.ResourceIntroducer;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.model.TestModel;
+
+/**
+ * Declares operations introducing new, or allowing to manage repository resources like: folders, files, categories, associations, etc.
+ *
+ * @param <RESOURCE>>
+ *            repository resource, e.g. folder, file, category, etc.
+ * @param <SPECIFIER>
+ *            repository resource specifier, see {@link Specifier}
+ * @param <MODIFIER>>
+ *            repository resource modifier, see {@link Modifier}
+ */
+public interface ResourceManager<RESOURCE extends TestModel, SPECIFIER extends Specifier, MODIFIER extends Modifier<RESOURCE, ?>>
+        extends ResourceIntroducer<SPECIFIER>
+{
+    RESOURCE get(String id);
+
+    MODIFIER modify(RESOURCE resource);
+
+    default MODIFIER modify(String id)
+    {
+        return modify(get(id));
+    }
+
+    void delete(RESOURCE resource);
+
+    default void delete(String id)
+    {
+        delete(get(id));
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/cache/MultiKeyResourceMap.java

@@ -0,0 +1,129 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.cache;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+
+import org.alfresco.utility.model.TestModel;
+
+/**
+ * Allows to store data in map and find it using three keys - id, name and alias.
+ * 
+ * @param <RESOURCE>
+ *            repository resource, e.g. folder, category, etc.
+ */
+public class MultiKeyResourceMap<RESOURCE extends TestModel> extends HashMap<String, RESOURCE>
+{
+    private static final String UUID_PATTERN = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$";
+
+    private final Map<String, String> keys = new HashMap<>();
+    private final Function<RESOURCE, String> idSupplier;
+    private final Function<RESOURCE, String> nameSupplier;
+
+    public MultiKeyResourceMap(Function<RESOURCE, String> idSupplier, Function<RESOURCE, String> nameSupplier)
+    {
+        super();
+        this.idSupplier = idSupplier;
+        this.nameSupplier = nameSupplier;
+    }
+
+    @Override
+    public RESOURCE put(String alias, RESOURCE resource)
+    {
+        String id = idSupplier.apply(resource);
+        String name = nameSupplier.apply(resource);
+        if (StringUtils.isEmpty(id))
+        {
+            throw new IllegalArgumentException("ID of entity with name: " + name + " and alias: " + alias + " cannot be empty!");
+        }
+        if (StringUtils.isEmpty(name))
+        {
+            throw new IllegalArgumentException("Name of entity with ID: " + id + " and alias: " + alias + " cannot be empty!");
+        }
+
+        if (StringUtils.isNotEmpty(alias))
+        {
+            if (keys.containsKey(alias))
+            {
+                throw new IllegalStateException("Entity with alias: " + alias + " already exists in cache!");
+            }
+            keys.put(alias, id);
+        }
+
+        if (StringUtils.isNotEmpty(name))
+        {
+            keys.put(name, id);
+        }
+        return super.put(id, resource);
+    }
+
+    @Override
+    public RESOURCE get(Object key)
+    {
+        return super.get(findKey(key));
+    }
+
+    @Override
+    public RESOURCE remove(Object key)
+    {
+        RESOURCE resource = this.get(key);
+        if (resource == null)
+        {
+            return null;
+        }
+
+        String id = idSupplier.apply(resource);
+        findKeysFor(id).forEach(keys::remove);
+
+        return super.remove(id);
+    }
+
+    private Object findKey(Object key)
+    {
+        Object realKey = key;
+        if (key instanceof String k && (!Pattern.compile(UUID_PATTERN).matcher(k).matches() || !super.containsKey(k)))
+        {
+            realKey = keys.getOrDefault(k, k);
+        }
+        return realKey;
+    }
+
+    public Set<String> findKeysFor(Object id)
+    {
+        return keys.entrySet()
+                .stream()
+                .filter(entry -> id.equals(entry.getValue()))
+                .map(Entry::getKey)
+                .collect(Collectors.toSet());
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/NestedCategoriesCreator.java

@@ -0,0 +1,64 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.category;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestCategoryModel;
+
+public class NestedCategoriesCreator extends SerialCategoriesCreator
+{
+
+    public NestedCategoriesCreator(RestWrapper restClient, Map<String, RestCategoryModel> categories)
+    {
+        super(restClient, categories);
+    }
+
+    @Override
+    public List<RestCategoryModel> create()
+    {
+        return createNestedCategories(parent, names, 0);
+    }
+
+    private List<RestCategoryModel> createNestedCategories(RestCategoryModel parent, List<String> categoryNames, int index)
+    {
+        List<RestCategoryModel> createdCategories = new ArrayList<>();
+        categoryNames.stream().findFirst().ifPresent(categoryName -> {
+            RestCategoryModel createdCategory = createCategory(categoryName, getOrNull(aliases, index), parent);
+            createdCategories.add(createdCategory);
+            List<String> remainingNames = categoryNames.stream().skip(1).toList();
+            if (!remainingNames.isEmpty())
+            {
+                createdCategories.addAll(createNestedCategories(createdCategory, remainingNames, index + 1));
+            }
+        });
+
+        return createdCategories;
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryCreator.java

@@ -0,0 +1,154 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.category;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import static org.alfresco.rest.repo.resource.Categories.CATEGORY_NAME_PREFIX;
+import static org.alfresco.rest.repo.resource.Categories.ROOT_CATEGORY;
+
+import java.util.Map;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.rest.repo.resource.general.Creator;
+import org.alfresco.rest.repo.resource.general.MultiCreator;
+import org.alfresco.rest.repo.resource.general.ResourceCreator;
+import org.alfresco.rest.repo.resource.general.Specifier;
+
+public class RepoCategoryCreator
+        extends ResourceCreator<RestCategoryModel, Creator.CategoryCreator>
+        implements Creator.CategoryCreator, Specifier.CategoriesSpecifier
+{
+
+    private final RestWrapper restClient;
+    private RestCategoryModel parent = ROOT_CATEGORY;
+    private final Map<String, RestCategoryModel> categoriesCache;
+
+    public RepoCategoryCreator(RestWrapper restClient, Map<String, RestCategoryModel> categoriesCache)
+    {
+        super();
+        this.restClient = restClient;
+        this.categoriesCache = categoriesCache;
+    }
+
+    @Override
+    protected CategoryCreator self()
+    {
+        return this;
+    }
+
+    @Override
+    public CategoryCreator category(String name)
+    {
+        return this.withName(name);
+    }
+
+    @Override
+    public CategoryCreator randomCategory()
+    {
+        return this.withRandomName();
+    }
+
+    @Override
+    public CategoryCreator randomCategory(String prefix)
+    {
+        return this.withRandomName(prefix);
+    }
+
+    @Override
+    public MultiCreator.CategoriesCreator categories(String... names)
+    {
+        return new SerialCategoriesCreator(restClient, categoriesCache).withNames(names).underCategory(parent).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.CategoriesCreator randomCategories(String... prefixes)
+    {
+        return new SerialCategoriesCreator(restClient, categoriesCache).withRandomNames(prefixes).underCategory(parent).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.CategoriesCreator randomCategories(int quantity)
+    {
+        return new SerialCategoriesCreator(restClient, categoriesCache).withRandomNames(quantity).underCategory(parent).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.CategoriesCreator nestedCategories(String... names)
+    {
+        return new NestedCategoriesCreator(restClient, categoriesCache).withNames(names).underCategory(parent).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.CategoriesCreator nestedRandomCategories(String... prefixes)
+    {
+        return new NestedCategoriesCreator(restClient, categoriesCache).withRandomNames(prefixes).underCategory(parent).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.CategoriesCreator nestedRandomCategories(int depth)
+    {
+        return new NestedCategoriesCreator(restClient, categoriesCache).withRandomNames(depth).underCategory(parent).asUser(user);
+    }
+
+    @Override
+    public CategoryCreator withRandomName(String prefix)
+    {
+        withAlias(prefix);
+        return super.withRandomName(prefix);
+    }
+
+    @Override
+    public CategoryCreator underCategory(RestCategoryModel parent)
+    {
+        this.parent = parent;
+        return this;
+    }
+
+    @Override
+    public RestCategoryModel create()
+    {
+        RestCategoryModel category = restClient.authenticateUser(user).withCoreAPI().usingCategory(parent)
+                .createSingleCategory(RestCategoryModel.builder().name(name).create());
+
+        categoriesCache.put(alias, category);
+
+        return category;
+    }
+
+    @Override
+    protected String generateRandomName()
+    {
+        return this.generateRandomNameWith(EMPTY);
+    }
+
+    @Override
+    protected String generateRandomNameWith(String prefix)
+    {
+        return super.generateRandomNameWith(CATEGORY_NAME_PREFIX + prefix + "_");
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryModifier.java

@@ -0,0 +1,85 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.category;
+
+import java.util.Map;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.rest.repo.resource.general.Modifier;
+import org.alfresco.rest.repo.resource.general.ResourceModifier;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.model.UserModel;
+
+public class RepoCategoryModifier
+        extends ResourceModifier<RestCategoryModel, Modifier.CategoryModifier>
+        implements Modifier.CategoryModifier
+{
+
+    private final RestWrapper restClient;
+    private final RestCategoryModel category;
+    private final Map<String, RestCategoryModel> categoriesCache;
+
+    public RepoCategoryModifier(RestWrapper restClient, RestCategoryModel category, Map<String, RestCategoryModel> categoriesCache)
+    {
+        super();
+        this.restClient = restClient;
+        this.category = category;
+        this.categoriesCache = categoriesCache;
+    }
+
+    @Override
+    protected CategoryModifier self()
+    {
+        return this;
+    }
+
+    @Override
+    public Specifier.CategoriesSpecifier add()
+    {
+        return (Specifier.CategoriesSpecifier) new RepoCategoryCreator(restClient, categoriesCache)
+                .underCategory(category).asUser(user);
+    }
+
+    @Override
+    public RestCategoryModel get(String id)
+    {
+        return buildCategoryRestRequest(restClient, user, RestCategoryModel.builder().id(id).create())
+                .getCategory();
+    }
+
+    @Override
+    public void delete()
+    {
+        categoriesCache.remove(category.getId());
+        buildCategoryRestRequest(restClient, user, category).deleteCategory();
+    }
+
+    private static org.alfresco.rest.requests.Categories buildCategoryRestRequest(RestWrapper restClient, UserModel user, RestCategoryModel category)
+    {
+        return restClient.authenticateUser(user).withCoreAPI().usingCategory(category);
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/SerialCategoriesCreator.java

@@ -0,0 +1,111 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.category;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import static org.alfresco.rest.repo.resource.Categories.CATEGORY_NAME_PREFIX;
+import static org.alfresco.rest.repo.resource.Categories.ROOT_CATEGORY;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.rest.repo.resource.general.MultiCreator;
+import org.alfresco.rest.repo.resource.general.MultipleResourcesCreator;
+
+public class SerialCategoriesCreator
+        extends MultipleResourcesCreator<RestCategoryModel, MultiCreator.CategoriesCreator>
+        implements MultiCreator.CategoriesCreator
+{
+
+    private final RestWrapper restClient;
+    protected RestCategoryModel parent = ROOT_CATEGORY;
+    private final Map<String, RestCategoryModel> categoriesCache;
+
+    public SerialCategoriesCreator(RestWrapper restClient, Map<String, RestCategoryModel> categoriesCache)
+    {
+        super();
+        this.restClient = restClient;
+        this.categoriesCache = categoriesCache;
+    }
+
+    @Override
+    protected CategoriesCreator self()
+    {
+        return this;
+    }
+
+    @Override
+    public CategoriesCreator underCategory(RestCategoryModel parent)
+    {
+        this.parent = parent;
+        return this;
+    }
+
+    @Override
+    public List<RestCategoryModel> create()
+    {
+        return createRawCategories(parent, names);
+    }
+
+    @Override
+    protected String generateRandomName()
+    {
+        return this.generateRandomNameWith(EMPTY);
+    }
+
+    @Override
+    protected String generateRandomNameWith(String prefix)
+    {
+        return super.generateRandomNameWith(CATEGORY_NAME_PREFIX + prefix + "_");
+    }
+
+    private List<RestCategoryModel> createRawCategories(RestCategoryModel parent, List<String> categoryNames)
+    {
+        List<RestCategoryModel> createdCategories = new ArrayList<>();
+        AtomicInteger i = new AtomicInteger();
+        categoryNames.forEach(categoryName -> {
+            RestCategoryModel createdCategory = createCategory(categoryName, getOrNull(aliases, i.getAndIncrement()), parent);
+            createdCategories.add(createdCategory);
+        });
+
+        return createdCategories;
+    }
+
+    protected RestCategoryModel createCategory(String name, String alias, RestCategoryModel parent)
+    {
+        return new RepoCategoryCreator(restClient, this.categoriesCache)
+                .withAlias(alias)
+                .withName(name)
+                .underCategory(parent)
+                .asUser(user)
+                .create();
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/MultiContentCreator.java

@@ -0,0 +1,111 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.content;
+
+import java.util.Map;
+import java.util.stream.Stream;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestTagModel;
+import org.alfresco.rest.repo.resource.Files;
+import org.alfresco.rest.repo.resource.general.MultiCreator;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FolderModel;
+
+public class MultiContentCreator extends RepoFolderCreator implements Specifier.MultiContentSpecifier
+{
+    private final RestWrapper restClient;
+    private final Files files;
+
+    protected MultiContentCreator(DataContent dataContent, RestWrapper restClient, Files files, Map<String, FolderModel> folders)
+    {
+        super(dataContent, folders);
+        this.files = files;
+        this.restClient = restClient;
+    }
+
+    @Override
+    public FileCreator file(String name)
+    {
+        return files.add().file(name).underFolder(parent).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public FileCreator randomFile()
+    {
+        return files.add().randomFile().underFolder(parent).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public FileCreator randomFile(String prefix)
+    {
+        return files.add().randomFile(prefix).underFolder(parent).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FilesCreator files(String... names)
+    {
+        return files.add().files(names).underFolder(parent).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FilesCreator randomFiles(String... prefixes)
+    {
+        return files.add().randomFiles(prefixes).underFolder(parent).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FilesCreator randomFiles(int quantity)
+    {
+        return files.add().randomFiles(quantity).underFolder(parent).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public void secondaryContent(ContentModel content)
+    {
+        buildNodeRestRequest(restClient, parent).addSecondaryChild(content);
+    }
+
+    @Override
+    public void secondaryContent(ContentModel... contents)
+    {
+        buildNodeRestRequest(restClient, parent).addSecondaryChildren(contents);
+    }
+
+    @Override
+    public void tag(RestTagModel tag)
+    {
+        buildNodeRestRequest(restClient, parent).addTag(tag.getTag());
+    }
+
+    @Override
+    public void tags(RestTagModel... tags)
+    {
+        buildNodeRestRequest(restClient, parent).addTags(Stream.of(tags).map(RestTagModel::getTag).toArray(String[]::new));
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/NestedFoldersCreator.java

@@ -0,0 +1,65 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.content;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.FolderModel;
+
+public class NestedFoldersCreator extends SerialFoldersCreator
+{
+
+    public NestedFoldersCreator(DataContent dataContent, Map<String, FolderModel> folders)
+    {
+        super(dataContent, folders);
+    }
+
+    @Override
+    public List<FolderModel> create()
+    {
+        verifyDataConsistency();
+        return createNestedFoldersUnder(parent, names, 0);
+    }
+
+    private List<FolderModel> createNestedFoldersUnder(FolderModel parent, List<String> folderNames, int index)
+    {
+        List<FolderModel> createdFolders = new ArrayList<>();
+        folderNames.stream().findFirst().ifPresent(folderName -> {
+            FolderModel createdFolder = createFolder(folderName, getOrNull(titles, index), getOrNull(descriptions, index), parent, getOrNull(aliases, index));
+            createdFolders.add(createdFolder);
+            List<String> remainingNames = folderNames.stream().skip(1).toList();
+            if (!remainingNames.isEmpty())
+            {
+                createdFolders.addAll(createNestedFoldersUnder(createdFolder, remainingNames, index + 1));
+            }
+        });
+
+        return createdFolders;
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileCreator.java

@@ -0,0 +1,142 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.content;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import static org.alfresco.rest.repo.resource.Files.FILE_NAME_PREFIX;
+
+import java.util.Map;
+
+import org.alfresco.rest.repo.resource.general.ContentCreator;
+import org.alfresco.rest.repo.resource.general.Creator;
+import org.alfresco.rest.repo.resource.general.MultiCreator;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FileType;
+
+public class PlainFileCreator
+        extends ContentCreator<FileModel, Creator.FileCreator>
+        implements Creator.FileCreator, Specifier.FileSpecifier
+{
+
+    private final DataContent dataContent;
+    private final Map<String, FileModel> filesCache;
+
+    public PlainFileCreator(DataContent dataContent, Map<String, FileModel> filesCache)
+    {
+        super(new FileModel());
+        this.dataContent = dataContent;
+        this.filesCache = filesCache;
+        this.contentModel.setFileType(FileType.TEXT_PLAIN);
+    }
+
+    @Override
+    protected FileCreator self()
+    {
+        return this;
+    }
+
+    @Override
+    public FileCreator withRandomName(String prefix)
+    {
+        withAlias(prefix);
+        return super.withRandomName(prefix);
+    }
+
+    @Override
+    public FileCreator file(String name)
+    {
+        return this.withName(name);
+    }
+
+    @Override
+    public FileCreator randomFile()
+    {
+        return this.withRandomName();
+    }
+
+    @Override
+    public FileCreator randomFile(String prefix)
+    {
+        return this.withRandomName(prefix);
+    }
+
+    @Override
+    public MultiCreator.FilesCreator files(String... names)
+    {
+        return new SerialFilesCreator(dataContent, filesCache).withNames(names).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FilesCreator randomFiles(String... prefixes)
+    {
+        return new SerialFilesCreator(dataContent, filesCache).withRandomNames(prefixes).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FilesCreator randomFiles(int quantity)
+    {
+        return new SerialFilesCreator(dataContent, filesCache).withRandomNames(quantity).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public FileCreator ofType(FileType fileType)
+    {
+        contentModel.setFileType(fileType);
+        return this;
+    }
+
+    @Override
+    public FileCreator withContent(String fileContent)
+    {
+        contentModel.setContent(fileContent);
+        return this;
+    }
+
+    @Override
+    public FileModel create()
+    {
+        contentModel.setName(contentModel.getName() + "." + contentModel.getFileType().extension);
+        FileModel createdFile = create(dataContent, dataContent::createContent);
+        filesCache.put(alias, createdFile);
+
+        return createdFile;
+    }
+
+    @Override
+    protected String generateRandomName()
+    {
+        return this.generateRandomNameWith(EMPTY);
+    }
+
+    @Override
+    protected String generateRandomNameWith(String prefix, String suffix)
+    {
+        return super.generateRandomNameWith(FILE_NAME_PREFIX + prefix + "_", suffix);
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileModifier.java

@@ -0,0 +1,73 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.content;
+
+import java.util.Map;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.repo.resource.general.ContentModifier;
+import org.alfresco.rest.repo.resource.general.Modifier;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FolderModel;
+
+public class PlainFileModifier
+        extends ContentModifier<FileModel, Modifier.FileModifier>
+        implements Modifier.FileModifier
+{
+    private final Map<String, FileModel> filesCache;
+
+    public PlainFileModifier(DataContent dataContent, RestWrapper restClient, FileModel file, Map<String, FileModel> filesCache)
+    {
+        super(dataContent, restClient, file);
+        this.filesCache = filesCache;
+    }
+
+    @Override
+    protected FileModifier self()
+    {
+        return this;
+    }
+
+    @Override
+    public FileModel get(String id)
+    {
+        return super.get(id, FileModel::new);
+    }
+
+    @Override
+    public FileModel copyTo(FolderModel target)
+    {
+        return super.copyTo(target, FileModel::new);
+    }
+
+    @Override
+    public void delete()
+    {
+        filesCache.remove(contentModel.getNodeRef());
+        super.delete();
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderCreator.java

@@ -0,0 +1,143 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.content;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import static org.alfresco.rest.repo.resource.Folders.FOLDER_NAME_PREFIX;
+
+import java.util.Map;
+
+import org.alfresco.rest.repo.resource.general.ContentCreator;
+import org.alfresco.rest.repo.resource.general.Creator;
+import org.alfresco.rest.repo.resource.general.MultiCreator;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.FolderModel;
+
+public class RepoFolderCreator
+        extends ContentCreator<FolderModel, Creator.FolderCreator>
+        implements Creator.FolderCreator, Specifier.FolderSpecifier
+{
+
+    private final DataContent dataContent;
+    private final Map<String, FolderModel> foldersCache;
+
+    public RepoFolderCreator(DataContent dataContent, Map<String, FolderModel> foldersCache)
+    {
+        super(new FolderModel());
+        this.dataContent = dataContent;
+        this.foldersCache = foldersCache;
+    }
+
+    @Override
+    protected RepoFolderCreator self()
+    {
+        return this;
+    }
+
+    @Override
+    public FolderCreator folder(String name)
+    {
+        return this.withName(name);
+    }
+
+    @Override
+    public FolderCreator randomFolder()
+    {
+        return this.withRandomName();
+    }
+
+    @Override
+    public FolderCreator randomFolder(String prefix)
+    {
+        return this.withRandomName(prefix);
+    }
+
+    @Override
+    public MultiCreator.FoldersCreator folders(String... names)
+    {
+        return new SerialFoldersCreator(dataContent, foldersCache).withNames(names).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FoldersCreator randomFolders(String... prefixes)
+    {
+        return new SerialFoldersCreator(dataContent, foldersCache).withRandomNames(prefixes).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FoldersCreator randomFolders(int quantity)
+    {
+        return new SerialFoldersCreator(dataContent, foldersCache).withRandomNames(quantity).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FoldersCreator nestedFolders(String... names)
+    {
+        return new NestedFoldersCreator(dataContent, foldersCache).withNames(names).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FoldersCreator nestedRandomFolders(String... prefixes)
+    {
+        return new NestedFoldersCreator(dataContent, foldersCache).withRandomNames(prefixes).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public MultiCreator.FoldersCreator nestedRandomFolders(int depth)
+    {
+        return new NestedFoldersCreator(dataContent, foldersCache).withRandomNames(depth).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public FolderCreator withRandomName(String prefix)
+    {
+        withAlias(prefix);
+        return super.withRandomName(prefix);
+    }
+
+    @Override
+    public FolderModel create()
+    {
+        FolderModel createdFolder = create(dataContent, dataContent::createFolder);
+        foldersCache.put(alias, createdFolder);
+
+        return createdFolder;
+    }
+
+    @Override
+    protected String generateRandomName()
+    {
+        return this.generateRandomNameWith(EMPTY);
+    }
+
+    @Override
+    protected String generateRandomNameWith(String prefix)
+    {
+        return super.generateRandomNameWith(FOLDER_NAME_PREFIX + prefix + "_");
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderModifier.java

@@ -0,0 +1,108 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.content;
+
+import java.util.Map;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestTagModel;
+import org.alfresco.rest.repo.resource.Files;
+import org.alfresco.rest.repo.resource.general.ContentModifier;
+import org.alfresco.rest.repo.resource.general.Modifier;
+import org.alfresco.rest.repo.resource.general.Specifier;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FolderModel;
+
+public class RepoFolderModifier
+        extends ContentModifier<FolderModel, Modifier.FolderModifier>
+        implements Modifier.FolderModifier
+{
+
+    private final RestWrapper restClient;
+    private final DataContent dataContent;
+    private final Files files;
+    private final Map<String, FolderModel> foldersCache;
+
+    public RepoFolderModifier(DataContent dataContent, RestWrapper restClient, FolderModel folder, Files files, Map<String, FolderModel> foldersCache)
+    {
+        super(dataContent, restClient, folder);
+        this.dataContent = dataContent;
+        this.restClient = restClient;
+        this.files = files;
+        this.foldersCache = foldersCache;
+    }
+
+    @Override
+    protected FolderModifier self()
+    {
+        return this;
+    }
+
+    @Override
+    public Specifier.MultiContentSpecifier add()
+    {
+        return (Specifier.MultiContentSpecifier) new MultiContentCreator(dataContent, restClient, files, foldersCache)
+                .underFolder(contentModel).withinSite(site).asUser(user);
+    }
+
+    @Override
+    public Specifier.AssociationSpecifier remove()
+    {
+        return new Specifier.AssociationSpecifier() {
+            @Override
+            public void secondaryContent(ContentModel content)
+            {
+                buildNodeRestRequest(restClient, contentModel).removeSecondaryChild(content);
+            }
+
+            @Override
+            public void tag(RestTagModel tag)
+            {
+                buildNodeRestRequest(restClient, contentModel).deleteTag(tag);
+            }
+        };
+    }
+
+    @Override
+    public FolderModel get(String id)
+    {
+        return super.get(id, FolderModel::new);
+    }
+
+    @Override
+    public FolderModel copyTo(FolderModel target)
+    {
+        return super.copyTo(target, FolderModel::new);
+    }
+
+    @Override
+    public void delete()
+    {
+        foldersCache.remove(contentModel.getName());
+        super.delete();
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFilesCreator.java

@@ -0,0 +1,156 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.content;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import static org.alfresco.rest.repo.resource.Files.FILE_NAME_PREFIX;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import org.alfresco.rest.repo.resource.general.MultiCreator;
+import org.alfresco.rest.repo.resource.general.MultipleContentsCreator;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FileType;
+import org.alfresco.utility.model.FolderModel;
+
+public class SerialFilesCreator
+        extends MultipleContentsCreator<FileModel, MultiCreator.FilesCreator>
+        implements MultiCreator.FilesCreator
+{
+    private final DataContent dataContent;
+    private List<FileType> fileTypes;
+    private List<String> filesContents;
+    private final Map<String, FileModel> filesCache;
+
+    public SerialFilesCreator(DataContent dataContent, Map<String, FileModel> filesCache)
+    {
+        super();
+        this.dataContent = dataContent;
+        this.filesCache = filesCache;
+    }
+
+    @Override
+    protected FilesCreator self()
+    {
+        return this;
+    }
+
+    @Override
+    public FilesCreator ofTypes(FileType... fileTypes)
+    {
+        this.fileTypes = List.of(fileTypes);
+        return this;
+    }
+
+    @Override
+    public FilesCreator withContents(List<String> filesContents)
+    {
+        this.filesContents = filesContents;
+        return this;
+    }
+
+    @Override
+    public FilesCreator withRandomContents(int wordsCount, int wordsMaxLength)
+    {
+        return withContents(
+                IntStream.of(0, names.size())
+                        .mapToObj(i -> IntStream.range(0, wordsCount)
+                                .mapToObj(j -> RandomStringUtils.randomAlphanumeric(1, wordsMaxLength))
+                                .collect(Collectors.joining(" ")))
+                        .collect(Collectors.toList()));
+    }
+
+    @Override
+    public List<FileModel> create()
+    {
+        verifyDataConsistency();
+        return createRawFilesUnder(parent, names);
+    }
+
+    @Override
+    protected void verifyDataConsistency()
+    {
+        super.verifyDataConsistency();
+        if (CollectionUtils.isEmpty(fileTypes) || fileTypes.size() < names.size())
+        {
+            throw new IllegalArgumentException("Provided file types size is different from created files amount");
+        }
+        if (CollectionUtils.isEmpty(filesContents) || filesContents.size() < names.size())
+        {
+            throw new IllegalArgumentException("Provided file contents size is different from created files amount");
+        }
+    }
+
+    @Override
+    protected String generateRandomName()
+    {
+        return this.generateRandomNameWith(EMPTY);
+    }
+
+    @Override
+    protected String generateRandomNameWith(String prefix)
+    {
+        return super.generateRandomNameWith(FILE_NAME_PREFIX + prefix + "_");
+    }
+
+    protected FileModel createFile(String fileName, FileType fileType, String title, String description, String fileContent, FolderModel parent, String alias)
+    {
+        return new PlainFileCreator(dataContent, filesCache)
+                .withAlias(alias)
+                .withName(fileName)
+                .ofType(fileType)
+                .withTitle(title)
+                .withDescription(description)
+                .withContent(fileContent)
+                .underFolder(parent)
+                .withinSite(site)
+                .asUser(user)
+                .create();
+    }
+
+    private List<FileModel> createRawFilesUnder(FolderModel parent, List<String> fileNames)
+    {
+        List<FileModel> createdFiles = new ArrayList<>();
+        AtomicInteger i = new AtomicInteger(0);
+        fileNames.forEach(fileName -> {
+            createdFiles.add(createFile(fileName, getOrNull(fileTypes, i.get()), getOrNull(titles, i.get()), getOrNull(descriptions, i.get()),
+                    getOrNull(filesContents, i.get()), parent, getOrNull(aliases, i.get())));
+            i.getAndIncrement();
+        });
+
+        return createdFiles;
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFoldersCreator.java

@@ -0,0 +1,107 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.content;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import static org.alfresco.rest.repo.resource.Folders.FOLDER_NAME_PREFIX;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.alfresco.rest.repo.resource.general.MultiCreator;
+import org.alfresco.rest.repo.resource.general.MultipleContentsCreator;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.FolderModel;
+
+public class SerialFoldersCreator
+        extends MultipleContentsCreator<FolderModel, MultiCreator.FoldersCreator>
+        implements MultiCreator.FoldersCreator
+{
+
+    private final DataContent dataContent;
+    private final Map<String, FolderModel> foldersCache;
+
+    public SerialFoldersCreator(DataContent dataContent, Map<String, FolderModel> foldersCache)
+    {
+        super();
+        this.dataContent = dataContent;
+        this.foldersCache = foldersCache;
+    }
+
+    @Override
+    protected SerialFoldersCreator self()
+    {
+        return this;
+    }
+
+    @Override
+    public List<FolderModel> create()
+    {
+        verifyDataConsistency();
+        return createRawFoldersUnder(parent, names);
+    }
+
+    @Override
+    protected String generateRandomName()
+    {
+        return this.generateRandomNameWith(EMPTY);
+    }
+
+    @Override
+    protected String generateRandomNameWith(String prefix)
+    {
+        return super.generateRandomNameWith(FOLDER_NAME_PREFIX + prefix + "_");
+    }
+
+    protected FolderModel createFolder(String folderName, String title, String description, FolderModel parent, String alias)
+    {
+        return new RepoFolderCreator(dataContent, foldersCache)
+                .withAlias(alias)
+                .withName(folderName)
+                .withTitle(title)
+                .withDescription(description)
+                .underFolder(parent)
+                .withinSite(site)
+                .asUser(user)
+                .create();
+    }
+
+    private List<FolderModel> createRawFoldersUnder(FolderModel parent, List<String> folderNames)
+    {
+        List<FolderModel> createdFolders = new ArrayList<>();
+        AtomicInteger i = new AtomicInteger();
+        folderNames.forEach(folderName -> {
+            FolderModel createdFolder = createFolder(folderName, getOrNull(titles, i.get()), getOrNull(descriptions, i.get()), parent, getOrNull(aliases, i.get()));
+            createdFolders.add(createdFolder);
+            i.getAndIncrement();
+        });
+
+        return createdFolders;
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentCreator.java

@@ -0,0 +1,105 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import java.util.function.Function;
+
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+
+public abstract class ContentCreator<CONTENT extends ContentModel, SELF extends Creator.ContentCreator<CONTENT, ?>>
+        extends ResourceCreator<CONTENT, SELF>
+        implements Creator.ContentCreator<CONTENT, SELF>
+{
+    private static final FolderModel DOCUMENT_LIBRARY = null;
+
+    protected SiteModel site;
+    protected final CONTENT contentModel;
+    protected FolderModel parent = DOCUMENT_LIBRARY;
+
+    public ContentCreator(CONTENT contentModel)
+    {
+        super();
+        this.contentModel = contentModel;
+    }
+
+    protected abstract SELF self();
+
+    @Override
+    public SELF withName(String name)
+    {
+        contentModel.setName(name);
+        return self();
+    }
+
+    @Override
+    public SELF withTitle(String title)
+    {
+        contentModel.setTitle(title);
+        return self();
+    }
+
+    @Override
+    public SELF withDescription(String description)
+    {
+        contentModel.setDescription(description);
+        return self();
+    }
+
+    @Override
+    public <FOLDER extends FolderModel> SELF underFolder(FOLDER parent)
+    {
+        this.parent = parent;
+        return self();
+    }
+
+    @Override
+    public <SITE extends SiteModel> SELF withinSite(SITE site)
+    {
+        this.site = site;
+        return self();
+    }
+
+    protected CONTENT create(DataContent dataContent, Function<CONTENT, CONTENT> creator)
+    {
+        if (site != null)
+        {
+            dataContent.usingSite(site);
+        }
+        if (parent != null)
+        {
+            dataContent.usingResource(parent);
+        }
+        if (user != null)
+        {
+            dataContent.usingUser(user);
+        }
+
+        return creator.apply(contentModel);
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentModifier.java

@@ -0,0 +1,177 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestCategoryLinkBodyModel;
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.rest.model.RestNodeBodyMoveCopyModel;
+import org.alfresco.rest.model.RestNodeModel;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+
+public abstract class ContentModifier<CONTENT extends ContentModel, SELF extends Modifier.ContentModifier<CONTENT, ?>>
+        extends ResourceModifier<CONTENT, SELF>
+        implements Modifier.ContentModifier<CONTENT, SELF>
+{
+    protected SiteModel site;
+    private final DataContent dataContent;
+    private final RestWrapper restClient;
+    protected final CONTENT contentModel;
+
+    protected ContentModifier(DataContent dataContent, RestWrapper restClient, CONTENT contentModel)
+    {
+        super();
+        this.dataContent = dataContent;
+        this.restClient = restClient;
+        this.contentModel = contentModel;
+    }
+
+    public <SITE extends SiteModel> SELF withinSite(SITE site)
+    {
+        this.site = site;
+        return self();
+    }
+
+    protected CONTENT get(String id, Supplier<CONTENT> contentSupplier)
+    {
+        ContentModel getNodeModel = new ContentModel();
+        getNodeModel.setNodeRef(id);
+        RestNodeModel node = buildNodeRestRequest(restClient, getNodeModel).getNode();
+
+        CONTENT content = contentSupplier.get();
+        content.setName(node.getName());
+        content.setNodeRef(node.getId());
+        content.setCmisLocation(getCmisLocation(node.getPath(), node.getName()));
+        return content;
+    }
+
+    @Override
+    public <FOLDER extends FolderModel> void moveTo(FOLDER target)
+    {
+        RestNodeBodyMoveCopyModel moveModel = new RestNodeBodyMoveCopyModel();
+        moveModel.setTargetParentId(target.getNodeRef());
+        moveModel.setName(contentModel.getName());
+
+        RestNodeModel movedNode = buildNodeRestRequest(restClient, contentModel).includePath().move(moveModel);
+        contentModel.setCmisLocation(getCmisLocation(movedNode.getPath(), movedNode.getName()));
+    }
+
+    protected CONTENT copyTo(FolderModel target, Function<CONTENT, CONTENT> contentSupplier)
+    {
+        RestNodeBodyMoveCopyModel copyModel = new RestNodeBodyMoveCopyModel();
+        copyModel.setTargetParentId(target.getNodeRef());
+        copyModel.setName(contentModel.getName());
+
+        RestNodeModel nodeCopy = buildNodeRestRequest(restClient, contentModel).includePath().copy(copyModel);
+        CONTENT contentCopy = contentSupplier.apply(contentModel);
+        contentCopy.setName(nodeCopy.getName());
+        contentCopy.setNodeRef(nodeCopy.getId());
+        contentCopy.setCmisLocation(getCmisLocation(nodeCopy.getPath(), nodeCopy.getName()));
+        return contentCopy;
+    }
+
+    @Override
+    public void delete()
+    {
+        dataContent.usingUser(user).usingResource(contentModel).deleteContent();
+    }
+
+    @Override
+    public <FOLDER extends FolderModel> void linkTo(FOLDER secondaryParent)
+    {
+        buildNodeRestRequest(restClient, secondaryParent).addSecondaryChild(contentModel);
+    }
+
+    @Override
+    @SafeVarargs
+    public final <FOLDER extends FolderModel> void linkTo(FOLDER... secondaryParents)
+    {
+        Stream.of(secondaryParents).forEach(secondaryParent -> buildNodeRestRequest(restClient, secondaryParent).addSecondaryChildren(contentModel));
+    }
+
+    @Override
+    public <FOLDER extends FolderModel> void unlinkFrom(FOLDER secondaryParent)
+    {
+        buildNodeRestRequest(restClient, secondaryParent).removeSecondaryChild(contentModel);
+    }
+
+    @Override
+    public <CATEGORY extends RestCategoryModel> void linkTo(CATEGORY category)
+    {
+        buildNodeRestRequest(restClient, contentModel).linkToCategory(
+                RestCategoryLinkBodyModel.builder().categoryId(category.getId()).create());
+    }
+
+    @Override
+    @SafeVarargs
+    public final <CATEGORY extends RestCategoryModel> void linkTo(CATEGORY... categories)
+    {
+        buildNodeRestRequest(restClient, contentModel).linkToCategories(
+                Stream.of(categories)
+                        .map(category -> RestCategoryLinkBodyModel.builder().categoryId(category.getId()).create())
+                        .collect(Collectors.toList()));
+    }
+
+    @Override
+    public <CATEGORY extends RestCategoryModel> void unlinkFrom(CATEGORY category)
+    {
+        buildNodeRestRequest(restClient, contentModel).unlinkFromCategory(category.getId());
+    }
+
+    private static String getCmisLocation(Object pathMap, String name)
+    {
+        return Stream.concat(
+                Stream.of(pathMap)
+                        .filter(Objects::nonNull)
+                        .filter(path -> path instanceof Map)
+                        .map(Map.class::cast)
+                        .map(path -> path.get("elements"))
+                        .filter(Objects::nonNull)
+                        .filter(elements -> elements instanceof List)
+                        .map(List.class::cast)
+                        .flatMap(elements -> (Stream<?>) elements.stream())
+                        .skip(1)
+                        .filter(element -> element instanceof Map)
+                        .map(Map.class::cast)
+                        .map(element -> element.get("name"))
+                        .filter(Objects::nonNull)
+                        .filter(elementName -> elementName instanceof String)
+                        .map(String.class::cast),
+                Stream.of(name))
+                .collect(Collectors.joining("/", "/", "/"));
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Creator.java

@@ -0,0 +1,107 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import java.util.random.RandomGenerator;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FileType;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TestModel;
+import org.alfresco.utility.model.UserModel;
+
+/**
+ * Declares operations, which can be performed to create repository resource.
+ *
+ * @param <RESOURCE>
+ *            repository resource, e.g. folder, category, etc.
+ * @param <SELF>
+ *            return type - this interface extension or implementation
+ */
+public interface Creator<RESOURCE extends TestModel, SELF extends Creator<RESOURCE, ?>>
+{
+    SELF withName(String name);
+
+    <USER extends UserModel> SELF asUser(USER user);
+
+    RESOURCE create();
+
+    interface ContentCreator<CONTENT extends ContentModel, SELF extends ContentCreator<CONTENT, ?>>
+            extends Creator<CONTENT, SELF>
+    {
+        SELF withTitle(String title);
+
+        default SELF withRandomTitle()
+        {
+            return withTitle(RandomStringUtils.randomAlphanumeric(10));
+        }
+
+        SELF withDescription(String description);
+
+        default SELF withRandomDescription()
+        {
+            return withDescription(RandomStringUtils.randomAlphanumeric(20));
+        }
+
+        <FOLDER extends FolderModel> SELF underFolder(FOLDER parent);
+
+        <SITE extends SiteModel> SELF withinSite(SITE site);
+    }
+
+    interface FolderCreator extends ContentCreator<FolderModel, FolderCreator>
+    {}
+
+    interface FileCreator extends ContentCreator<FileModel, FileCreator>
+    {
+        FileCreator ofType(FileType fileType);
+
+        FileCreator withContent(String fileContent);
+
+        default FileCreator withRandomContent()
+        {
+            return withRandomContent(RandomGenerator.getDefault().nextInt(30, 70), 10);
+        }
+
+        default FileCreator withRandomContent(int wordsNumber, int wordsMaxLength)
+        {
+            return withContent(IntStream.range(0, wordsNumber)
+                    .mapToObj(i -> RandomStringUtils.randomAlphanumeric(1, wordsMaxLength))
+                    .collect(Collectors.joining(" ")));
+        }
+    }
+
+    interface CategoryCreator extends Creator<RestCategoryModel, CategoryCreator>
+    {
+        <CATEGORY extends RestCategoryModel> CategoryCreator underCategory(CATEGORY parent);
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Modifier.java

@@ -0,0 +1,84 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TestModel;
+import org.alfresco.utility.model.UserModel;
+
+/**
+ * Declares operations, which can be performed on repository resource.
+ *
+ * @param <RESOURCE>
+ *            repository resource, e.g. folder, category, etc.
+ * @param <SELF>
+ *            return type - this interface extension or implementation
+ */
+public interface Modifier<RESOURCE extends TestModel, SELF extends Modifier<RESOURCE, ?>>
+{
+    RESOURCE get(String id);
+
+    <USER extends UserModel> SELF asUser(USER user);
+
+    void delete();
+
+    interface ContentModifier<CONTENT extends ContentModel, SELF extends Modifier<CONTENT, ?>>
+            extends Modifier<CONTENT, SELF>
+    {
+        <FOLDER extends FolderModel> void moveTo(FOLDER target);
+
+        <FOLDER extends FolderModel> CONTENT copyTo(FOLDER target);
+
+        <FOLDER extends FolderModel> void linkTo(FOLDER secondaryParent);
+
+        <FOLDER extends FolderModel> void linkTo(FOLDER... secondaryParents);
+
+        <FOLDER extends FolderModel> void unlinkFrom(FOLDER secondaryParent);
+
+        <CATEGORY extends RestCategoryModel> void linkTo(CATEGORY category);
+
+        <CATEGORY extends RestCategoryModel> void linkTo(CATEGORY... categories);
+
+        <CATEGORY extends RestCategoryModel> void unlinkFrom(CATEGORY category);
+
+        <SITE extends SiteModel> SELF withinSite(SITE site);
+    }
+
+    interface FolderModifier extends ContentModifier<FolderModel, FolderModifier>,
+            ResourceIntroducer<Specifier.MultiContentSpecifier>, ResourceRemover<Specifier.AssociationSpecifier>
+    {}
+
+    interface FileModifier extends ContentModifier<FileModel, FileModifier>
+    {}
+
+    interface CategoryModifier extends Modifier<RestCategoryModel, CategoryModifier>,
+            ResourceIntroducer<Specifier.CategoriesSpecifier>
+    {}
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultiCreator.java

@@ -0,0 +1,92 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import java.util.List;
+import java.util.random.RandomGenerator;
+
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FileType;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TestModel;
+import org.alfresco.utility.model.UserModel;
+
+/**
+ * Declares actions, which can be performed to create multiple repository resources.
+ *
+ * @param <RESOURCE>
+ *            repository resource, e.g. folder, category, etc.
+ * @param <SELF>
+ *            return type - this interface extension or implementation
+ */
+public interface MultiCreator<RESOURCE extends TestModel, SELF extends MultiCreator<RESOURCE, ?>>
+{
+    SELF withNames(String... names);
+
+    <USER extends UserModel> SELF asUser(USER user);
+
+    List<RESOURCE> create();
+
+    interface ContentsCreator<MODEL extends ContentModel, SELF extends ContentsCreator<MODEL, ?>> extends MultiCreator<MODEL, SELF>
+    {
+        SELF withTitles(String... titles);
+
+        SELF withRandomTitles();
+
+        SELF withDescriptions(String... descriptions);
+
+        SELF withRandomDescriptions();
+
+        <FOLDER extends FolderModel> SELF underFolder(FOLDER parent);
+
+        <SITE extends SiteModel> SELF withinSite(SITE site);
+    }
+
+    interface FoldersCreator extends ContentsCreator<FolderModel, FoldersCreator>
+    {}
+
+    interface FilesCreator extends ContentsCreator<FileModel, FilesCreator>
+    {
+        FilesCreator ofTypes(FileType... fileTypes);
+
+        FilesCreator withContents(List<String> filesContents);
+
+        default FilesCreator withRandomContents()
+        {
+            return withRandomContents(RandomGenerator.getDefault().nextInt(30, 70), 10);
+        }
+
+        FilesCreator withRandomContents(int wordsCount, int wordsMaxLength);
+    }
+
+    interface CategoriesCreator extends MultiCreator<RestCategoryModel, CategoriesCreator>
+    {
+        <CATEGORY extends RestCategoryModel> CategoriesCreator underCategory(CATEGORY parent);
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleContentsCreator.java

@@ -0,0 +1,106 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.UserModel;
+
+public abstract class MultipleContentsCreator<CONTENT extends ContentModel, SELF extends MultiCreator.ContentsCreator<CONTENT, ?>>
+        extends MultipleResourcesCreator<CONTENT, SELF>
+        implements MultiCreator.ContentsCreator<CONTENT, SELF>
+{
+
+    protected FolderModel parent;
+    protected SiteModel site;
+    protected UserModel user;
+    protected List<String> titles = new ArrayList<>();
+    protected List<String> descriptions = new ArrayList<>();
+
+    public SELF withTitles(String... titles)
+    {
+        this.titles = Stream.of(titles).collect(Collectors.toList());
+        return self();
+    }
+
+    public SELF withRandomTitles()
+    {
+        this.titles = IntStream.range(0, names.size()).mapToObj(i -> RandomStringUtils.randomAlphanumeric(10)).collect(Collectors.toList());
+        return self();
+    }
+
+    public SELF withDescriptions(String... descriptions)
+    {
+        this.descriptions = Stream.of(descriptions).collect(Collectors.toList());
+        return self();
+    }
+
+    public SELF withRandomDescriptions()
+    {
+        this.descriptions = IntStream.range(0, names.size()).mapToObj(i -> RandomStringUtils.randomAlphanumeric(20)).collect(Collectors.toList());
+        return self();
+    }
+
+    public <FOLDER extends FolderModel> SELF underFolder(FOLDER parent)
+    {
+        this.parent = parent;
+        return self();
+    }
+
+    public <SITE extends SiteModel> SELF withinSite(SITE site)
+    {
+        this.site = site;
+        return self();
+    }
+
+    protected void verifyDataConsistency()
+    {
+        if (CollectionUtils.isEmpty(names))
+        {
+            throw new IllegalArgumentException("Names of files/folders to create needs to be provided");
+        }
+
+        if (CollectionUtils.isNotEmpty(titles) && titles.size() < names.size())
+        {
+            throw new IllegalArgumentException("Provided titles size is different from created files/folders amount");
+        }
+
+        if (CollectionUtils.isNotEmpty(descriptions) && descriptions.size() < names.size())
+        {
+            throw new IllegalArgumentException("Provided descriptions size is different from created files/folders amount");
+        }
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleResourcesCreator.java

@@ -0,0 +1,129 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.requests.Node;
+import org.alfresco.utility.model.RepoTestModel;
+import org.alfresco.utility.model.TestModel;
+import org.alfresco.utility.model.UserModel;
+
+public abstract class MultipleResourcesCreator<RESOURCE extends TestModel, SELF extends MultiCreator<RESOURCE, ?>>
+        implements MultiCreator<RESOURCE, SELF>
+{
+
+    protected UserModel user;
+    protected List<String> names;
+    protected List<String> aliases;
+
+    protected abstract SELF self();
+
+    public SELF withNames(String... names)
+    {
+        this.names = Stream.of(names).collect(Collectors.toList());
+        return self();
+    }
+
+    public SELF withRandomNames(String... prefixes)
+    {
+        this.aliases = Stream.of(prefixes).toList();
+        return withNames(Stream.of(prefixes).map(this::generateRandomNameWith).toArray(String[]::new));
+    }
+
+    public SELF withRandomNames(List<String> prefixes, List<String> suffixes)
+    {
+        this.aliases = prefixes;
+        if (CollectionUtils.isEmpty(prefixes) || CollectionUtils.isEmpty(suffixes) || prefixes.size() != suffixes.size())
+        {
+            throw new IllegalArgumentException("Provided suffixes size is different from prefixes size");
+        }
+
+        AtomicInteger i = new AtomicInteger();
+        return withNames(prefixes.stream()
+                .map(this::generateRandomNameWith)
+                .map(name -> name + suffixes.get(i.getAndIncrement()))
+                .toArray(String[]::new));
+    }
+
+    public SELF withRandomNames(int namesCount)
+    {
+        return withNames(IntStream.range(0, namesCount).mapToObj(i -> generateRandomName()).toArray(String[]::new));
+    }
+
+    @Override
+    public <USER extends UserModel> SELF asUser(USER user)
+    {
+        this.user = user;
+        return self();
+    }
+
+    protected String generateRandomName()
+    {
+        return generateRandomNameWith(RandomStringUtils.randomAlphanumeric(5) + "_");
+    }
+
+    protected String generateRandomNameWith(String prefix)
+    {
+        return generateRandomNameWith(prefix, EMPTY);
+    }
+
+    protected String generateRandomNameWith(String prefix, String suffix)
+    {
+        return prefix + UUID.randomUUID() + suffix;
+    }
+
+    protected Node buildNodeRestRequest(RestWrapper restClient, RepoTestModel node)
+    {
+        return restClient.authenticateUser(user).withCoreAPI().usingNode(node);
+    }
+
+    protected <T> T getOrNull(List<T> list, int index)
+    {
+        if (CollectionUtils.isEmpty(list))
+        {
+            return null;
+        }
+
+        if (index < 0 || index >= list.size())
+        {
+            return null;
+        }
+
+        return list.get(index);
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceCreator.java

@@ -0,0 +1,104 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import java.util.UUID;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.requests.Node;
+import org.alfresco.utility.model.RepoTestModel;
+import org.alfresco.utility.model.TestModel;
+import org.alfresco.utility.model.UserModel;
+
+public abstract class ResourceCreator<RESOURCE extends TestModel, SELF extends Creator<RESOURCE, ?>>
+        implements Creator<RESOURCE, SELF>
+{
+
+    protected UserModel user;
+    protected String name;
+    protected String alias;
+
+    protected abstract SELF self();
+
+    @Override
+    public SELF withName(String name)
+    {
+        this.name = name;
+        return self();
+    }
+
+    public SELF withAlias(String alias)
+    {
+        this.alias = alias;
+        return self();
+    }
+
+    public SELF withRandomName()
+    {
+        return withName(generateRandomName());
+    }
+
+    public SELF withRandomName(String prefix)
+    {
+        return withName(generateRandomNameWith(prefix));
+    }
+
+    public SELF withRandomName(String prefix, String suffix)
+    {
+        return withName(generateRandomNameWith(prefix, suffix));
+    }
+
+    @Override
+    public <USER extends UserModel> SELF asUser(USER user)
+    {
+        this.user = user;
+        return self();
+    }
+
+    protected String generateRandomName()
+    {
+        return generateRandomNameWith(RandomStringUtils.randomAlphanumeric(5) + "_");
+    }
+
+    protected String generateRandomNameWith(String prefix)
+    {
+        return generateRandomNameWith(prefix, EMPTY);
+    }
+
+    protected String generateRandomNameWith(String prefix, String suffix)
+    {
+        return prefix + UUID.randomUUID() + suffix;
+    }
+
+    protected Node buildNodeRestRequest(RestWrapper restClient, RepoTestModel node)
+    {
+        return restClient.authenticateUser(user).withCoreAPI().usingNode(node);
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceIntroducer.java

@@ -0,0 +1,37 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+/**
+ * Declares an action introducing new repository resource like: folder, file, category, association, etc.
+ *
+ * @param <SPECIFIER>
+ *            repository resource specifier, see {@link Specifier}
+ */
+public interface ResourceIntroducer<SPECIFIER extends Specifier>
+{
+    SPECIFIER add();
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceModifier.java

@@ -0,0 +1,53 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.requests.Node;
+import org.alfresco.utility.model.RepoTestModel;
+import org.alfresco.utility.model.TestModel;
+import org.alfresco.utility.model.UserModel;
+
+public abstract class ResourceModifier<RESOURCE extends TestModel, SELF extends Modifier<RESOURCE, ?>>
+        implements Modifier<RESOURCE, SELF>
+{
+
+    protected UserModel user;
+
+    protected abstract SELF self();
+
+    @Override
+    public SELF asUser(UserModel user)
+    {
+        this.user = user;
+        return self();
+    }
+
+    protected Node buildNodeRestRequest(RestWrapper restClient, RepoTestModel node)
+    {
+        return restClient.authenticateUser(user).withCoreAPI().usingNode(node);
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceRemover.java

@@ -0,0 +1,37 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+/**
+ * Declares an action, which removes repository resource like association.
+ *
+ * @param <SPECIFIER>
+ *            repository resource specifier, see {@link Specifier}
+ */
+public interface ResourceRemover<SPECIFIER extends Specifier>
+{
+    SPECIFIER remove();
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Specifier.java

@@ -0,0 +1,106 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.repo.resource.general;
+
+import org.alfresco.rest.model.RestTagModel;
+import org.alfresco.utility.model.ContentModel;
+
+/**
+ * Specifies repository resource to perform an operation on, like: add, modify, remove.
+ */
+public interface Specifier
+{
+    interface FolderSpecifier extends Specifier
+    {
+        Creator.FolderCreator folder(String name);
+
+        Creator.FolderCreator randomFolder();
+
+        Creator.FolderCreator randomFolder(String prefix);
+
+        MultiCreator.FoldersCreator folders(String... names);
+
+        MultiCreator.FoldersCreator randomFolders(String... prefixes);
+
+        MultiCreator.FoldersCreator randomFolders(int quantity);
+
+        MultiCreator.FoldersCreator nestedFolders(String... names);
+
+        MultiCreator.FoldersCreator nestedRandomFolders(String... prefixes);
+
+        MultiCreator.FoldersCreator nestedRandomFolders(int depth);
+    }
+
+    interface FileSpecifier extends Specifier
+    {
+        Creator.FileCreator file(String name);
+
+        Creator.FileCreator randomFile();
+
+        Creator.FileCreator randomFile(String prefix);
+
+        MultiCreator.FilesCreator files(String... names);
+
+        MultiCreator.FilesCreator randomFiles(String... prefixes);
+
+        MultiCreator.FilesCreator randomFiles(int quantity);
+    }
+
+    interface AssociationSpecifier extends Specifier
+    {
+        <CONTENT extends ContentModel> void secondaryContent(CONTENT content);
+
+        <TAG extends RestTagModel> void tag(TAG tag);
+    }
+
+    interface MultiContentSpecifier extends FolderSpecifier, FileSpecifier, AssociationSpecifier
+    {
+        <CONTENT extends ContentModel> void secondaryContent(CONTENT... contents);
+
+        <TAG extends RestTagModel> void tags(TAG... tags);
+    }
+
+    interface CategoriesSpecifier extends Specifier
+    {
+        Creator.CategoryCreator category(String name);
+
+        Creator.CategoryCreator randomCategory();
+
+        Creator.CategoryCreator randomCategory(String prefix);
+
+        MultiCreator.CategoriesCreator categories(String... names);
+
+        MultiCreator.CategoriesCreator randomCategories(String... prefixes);
+
+        MultiCreator.CategoriesCreator randomCategories(int quantity);
+
+        MultiCreator.CategoriesCreator nestedCategories(String... names);
+
+        MultiCreator.CategoriesCreator nestedRandomCategories(String... prefixes);
+
+        MultiCreator.CategoriesCreator nestedRandomCategories(int depth);
+    }
+}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java

@@ -2,6 +2,11 @@ package org.alfresco.rest.favorites;
 
 import java.util.List;
 
+import org.hamcrest.Matchers;
+import org.springframework.http.HttpStatus;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestErrorModel;
@@ -20,14 +25,11 @@ import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
-import org.hamcrest.Matchers;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 public class GetFavoritesTests extends RestTest
 {
     private static final String ALLOWABLE_OPERATIONS = "allowableOperations";
+    private static final String ASPECT_NAMES = "aspectNames";
     private UserModel adminUserModel, userModel;
     private SiteModel firstSiteModel;
     private SiteModel secondSiteModel;
@@ -56,7 +58,7 @@ public class GetFavoritesTests extends RestTest
         firstSiteUsers = dataUser.addUsersWithRolesToSite(firstSiteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer,
                 UserRole.SiteContributor);
         secondSiteUsers = dataUser.addUsersWithRolesToSite(secondSiteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer,
-            UserRole.SiteContributor);
+                UserRole.SiteContributor);
 
         restClient.authenticateUser(userModel);
         restClient.withCoreAPI().usingUser(userModel).addSiteToFavorites(firstSiteModel);
@@ -64,9 +66,9 @@ public class GetFavoritesTests extends RestTest
         restClient.withCoreAPI().usingUser(userModel).addSiteToFavorites(thirdSiteModel);
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.SANITY,
             description = "Verify Manager user gets favorites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY})
     public void managerIsAbleToRetrieveFavorites()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteManager));
@@ -79,10 +81,10 @@ public class GetFavoritesTests extends RestTest
                 .assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.SANITY,
             description = "Verify user gets status code 401 if authentication call fails")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY })
-//    @Bug(id = "MNT-16904", description = "It fails only on environment with tenants")
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY})
+    // @Bug(id = "MNT-16904", description = "It fails only on environment with tenants")
     public void userIsNotAbleToRetrieveFavoritesIfAuthenticationFails()
     {
         UserModel siteManager = firstSiteUsers.getOneUserWithRole(UserRole.SiteManager);
@@ -91,44 +93,44 @@ public class GetFavoritesTests extends RestTest
         restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED);
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify Admin user gets favorites sites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void adminIsAbleToRetrieveFavoritesSites()
     {
         restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(firstSiteModel);
         restClient.withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(secondSiteModel);
-        
+
         userFavorites = restClient.withCoreAPI()
                 .usingAuthUser().where().targetSiteExist().getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.OK);
         userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid())
-                  .and().entriesListContains("targetGuid", secondSiteModel.getGuid());    
+                .and().entriesListContains("targetGuid", secondSiteModel.getGuid());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify Admin user gets favorites folders with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void adminIsAbleToRetrieveFavoritesFolders()
     {
         restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(firstFolderModel);
         restClient.withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(secondFolderModel);
-        
+
         userFavorites = restClient.withCoreAPI()
                 .usingAuthUser().where().targetFolderExist().getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.OK);
         userFavorites.assertThat().entriesListContains("targetGuid", firstFolderModel.getNodeRef())
-                  .and().entriesListContains("targetGuid", secondFolderModel.getNodeRef());    
+                .and().entriesListContains("targetGuid", secondFolderModel.getNodeRef());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify Admin user gets favorites files with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void adminIsAbleToRetrieveFavoritesFiles()
     {
         restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addFileToFavorites(firstFileModel);
         restClient.withCoreAPI().usingUser(adminUserModel).addFileToFavorites(secondFileModel);
-        
+
         userFavorites = restClient.withCoreAPI()
                 .usingAuthUser().where().targetFileExist().getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -136,87 +138,87 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListContains("targetGuid", secondFileModel.getNodeRefWithoutVersion());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify Collaborator user gets favorites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void collaboratorIsAbleToRetrieveFavorites()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator))
-                  .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
+                .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
         restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel);
-        
+
         userFavorites = restClient.withCoreAPI().usingAuthUser().getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.OK);
         userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid())
-                  .and().entriesListContains("targetGuid", secondSiteModel.getGuid());
+                .and().entriesListContains("targetGuid", secondSiteModel.getGuid());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify Contributor user gets favorites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void contributorIsAbleToRetrieveFavorites()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteContributor))
-                  .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
+                .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
         restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel);
-        
+
         userFavorites = restClient.withCoreAPI().usingAuthUser().getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.OK);
         userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()).and()
-                  .entriesListContains("targetGuid", secondSiteModel.getGuid());
+                .entriesListContains("targetGuid", secondSiteModel.getGuid());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify Consumer user gets favorites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void consumerIsAbleToRetrieveFavorites()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer))
-                  .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
+                .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
         restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel);
-        
+
         userFavorites = restClient.withCoreAPI().usingAuthUser().getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.OK);
         userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid())
-                  .assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid());    
+                .assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify user doesn't have permission to get favorites of another user with Rest API and status code is 404")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsNotAbleToRetrieveFavoritesOfAnotherUser()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer))
-                  .withCoreAPI().usingUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)).getFavorites();
+                .withCoreAPI().usingUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)).getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND)
                 .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator).getUsername()));
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify user doesn't have permission to get favorites of admin user with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION  })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsNotAbleToRetrieveFavoritesOfAdminUser()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer)).withCoreAPI()
-                  .usingUser(adminUserModel).getFavorites();
+                .usingUser(adminUserModel).getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND)
-                  .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, adminUserModel.getUsername()));
+                .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, adminUserModel.getUsername()));
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify admin user doesn't have permission to get favorites of another user with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void adminIsNotAbleToRetrieveFavoritesOfAnotherUser()
     {
         restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator))
-                  .getFavorites();
+                .getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND)
-                  .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator).getUsername()));
+                .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator).getUsername()));
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify User gets only favorites sites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToRetrieveOnlyFavoritesSites()
     {
         restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager));
@@ -232,9 +234,9 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListDoesNotContain("targetGuid", firstFolderModel.getNodeRef());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify User gets only favorites files with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToRetrieveOnlyFavoritesFiles()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator));
@@ -250,9 +252,9 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListDoesNotContain("targetGuid", firstFolderModel.getNodeRef());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify User gets only favorites folders with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToRetrieveOnlyFavoritesFolders()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator));
@@ -268,9 +270,9 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListDoesNotContain("targetGuid", firstFileModel.getNodeRefWithoutVersion());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify User gets only favorites files or folders with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToRetrieveFavoritesFilesOrFolders()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer));
@@ -289,9 +291,9 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListDoesNotContain("targetGuid", firstSiteModel.getGuid());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify User gets only favorites files or sites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToRetrieveFavoritesFilesOrSites()
     {
         restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager));
@@ -310,9 +312,9 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListDoesNotContain("targetGuid", firstFolderModel.getNodeRef());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify User gets only favorites folders or sites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToRetrieveFavoritesFoldersOrSites()
     {
         restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager));
@@ -331,9 +333,9 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListDoesNotContain("targetGuid", firstFileModel.getNodeRefWithoutVersion());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify User gets all favorites with Rest API and status code is 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToRetrieveAllFavorites()
     {
         restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator));
@@ -362,9 +364,9 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListDoesNotContain("targetGuid", secondFileModel.getNodeRefWithoutVersion());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify request for a user with no favorites returns status 200")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userHasNoFavorites()
     {
         restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteContributor));
@@ -374,9 +376,9 @@ public class GetFavoritesTests extends RestTest
         userFavorites.assertThat().entriesListIsEmpty().and().paginationField("totalItems").is("0");
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify request using invalid where parameter returns status 400")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void getFavoritesUsingInvalidWhereParameter()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer));
@@ -390,9 +392,9 @@ public class GetFavoritesTests extends RestTest
                 .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query"));
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify User gets correct favorites after deleting a favorite")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void checkFavoriteFolderIsRemoved()
     {
         restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteManager));
@@ -408,9 +410,9 @@ public class GetFavoritesTests extends RestTest
                 .and().paginationField("totalItems").is("2");
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify get favorites specifying -me- string in place of <personid> for request")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToGetFavoritesWhenUsingMeAsUsername()
     {
         userFavorites = restClient.authenticateUser(userModel).withCoreAPI().usingMe().getFavorites();
@@ -418,9 +420,9 @@ public class GetFavoritesTests extends RestTest
         userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()).and().entriesListContains("targetGuid", secondSiteModel.getGuid());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify get favorites using empty for where parameter for request")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToGetFavoritesWhenUsingEmptyWhereParameter()
     {
         userFavorites = restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().where().getFavorites();
@@ -428,27 +430,27 @@ public class GetFavoritesTests extends RestTest
                 .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query"));
     }
 
-    @TestRail(section = { TestGroup.REST_API,TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify that for invalid maxItems parameter status code returned is 400.")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void checkInvalidMaxItemsStatusCode()
     {
         restClient.authenticateUser(adminUserModel).withParams("maxItems=AB").withCoreAPI().usingUser(adminUserModel).getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary("Invalid paging parameter");
     }
 
-    @TestRail(section = { TestGroup.REST_API,TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify that for invalid skipCount parameter status code returned is 400.")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void checkInvalidSkipCountStatusCode()
     {
         restClient.authenticateUser(adminUserModel).withParams("skipCount=AB").withCoreAPI().usingUser(adminUserModel).getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary("Invalid paging parameter");
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify get favorites when using invalid network id for non-tenant user")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void getFavoritesWhenNetworkIdIsInvalid()
     {
         UserModel networkUserModel = dataUser.createRandomTestUser();
@@ -457,9 +459,9 @@ public class GetFavoritesTests extends RestTest
         restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, networkUserModel.getUsername()));
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify get favorites using AND instead of OR in where parameter for request")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsNotAbleToGetFavoritesWhenUsingANDInWhereParameter()
     {
         userFavorites = restClient.withCoreAPI().usingAuthUser().where().targetFolderExist().invalidWhereParameter("AND").targetFileExist().getFavorites();
@@ -467,9 +469,9 @@ public class GetFavoritesTests extends RestTest
                 .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query"));
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify get favorites using wrong name instead of EXISTS in where parameter for request")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsNotAbleToGetFavoritesWhenUsingWrongWhereParameter()
     {
         userFavorites = restClient.withCoreAPI().usingAuthUser().where().invalidWhereParameter("EXIST((target/site))").targetFileExist().getFavorites();
@@ -477,9 +479,9 @@ public class GetFavoritesTests extends RestTest
                 .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query"));
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify get favorites except the first one for request")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToGetFavoritesExceptTheFirstOne()
     {
         userFavorites = restClient.authenticateUser(userModel).withParams("skipCount=1").withCoreAPI().usingUser(userModel).getFavorites();
@@ -490,9 +492,9 @@ public class GetFavoritesTests extends RestTest
                 .and().entriesListDoesNotContain("targetGuid", thirdSiteModel.getGuid());
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify get first two favorites sites")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToGetFirstTwoFavorites()
     {
         userFavorites = restClient.authenticateUser(userModel).withParams("maxItems=2").withCoreAPI().usingUser(userModel).getFavorites();
@@ -506,9 +508,9 @@ public class GetFavoritesTests extends RestTest
                 .and().field("count").is("2");
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify get favorites sites when using empty values for skipCount and maxItems")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToGetFavoritesWhenSkipCountAndMaxItemsAreEmpty()
     {
         restClient.authenticateUser(userModel).withParams("skipCount= ").withCoreAPI().usingUser(userModel).getFavorites();
@@ -518,9 +520,9 @@ public class GetFavoritesTests extends RestTest
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary(String.format(RestErrorModel.INVALID_MAXITEMS, " "));
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify the get favorites request for a high value for skipCount parameter")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToGetFavoritesWithHighSkipCount()
     {
         userFavorites = restClient.authenticateUser(userModel).withParams("skipCount=999999999").withCoreAPI().usingUser(userModel).getFavorites();
@@ -529,9 +531,9 @@ public class GetFavoritesTests extends RestTest
         userFavorites.assertThat().entriesListIsEmpty().assertThat().paginationField("skipCount").is("999999999");
     }
 
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify the get favorites request with properties parameter applied")
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
     public void userIsAbleToGetFavoritesWithPropertiesParamApplied()
     {
         userFavorites = restClient.authenticateUser(userModel).withParams("properties=targetGuid").withCoreAPI().usingUser(userModel).getFavorites();
@@ -541,8 +543,8 @@ public class GetFavoritesTests extends RestTest
         restPersonFavoritesModel.assertThat().field("targetGuid").is(thirdSiteModel.getGuid()).and().field("createdAt").isNull();
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, description = "Verify entry details for get favorites response with Rest API")
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify entry details for get favorites response with Rest API")
     public void checkResponseSchemaForGetFavorites()
     {
         userFavorites = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().getFavorites();
@@ -564,8 +566,7 @@ public class GetFavoritesTests extends RestTest
             description = "Verify if get favorites response returns allowableOperations object when requested")
     public void checkResponsesForGetFavoritesWithAllowableOperations()
     {
-        final RestPersonFavoritesModelsCollection adminFavorites =
-                restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().include(ALLOWABLE_OPERATIONS).getFavorites();
+        final RestPersonFavoritesModelsCollection adminFavorites = restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().include(ALLOWABLE_OPERATIONS).getFavorites();
         restClient.assertStatusCodeIs(HttpStatus.OK);
 
         adminFavorites.getEntries().stream()
@@ -576,18 +577,30 @@ public class GetFavoritesTests extends RestTest
     @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
             description = "Verify the get favorites request with properties parameter applied")
     @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
-    public void checkSearchResponseContainsIsFavoriteWhenRequested() throws InterruptedException {
+    public void checkSearchResponseContainsIsFavoriteWhenRequested() throws InterruptedException
+    {
         final SearchRequest query = new SearchRequest();
         final RestRequestQueryModel queryReq = new RestRequestQueryModel();
         queryReq.setQuery(firstFileModel.getName());
         query.setQuery(queryReq);
         query.setInclude(List.of("isFavorite"));
 
-        Utility.sleep(500, 60000, () ->
-                {
-                    restClient.authenticateUser(adminUserModel).withSearchAPI().search(query);
-                    restClient.onResponse().assertThat().body("list.entries.entry[0].isFavorite", Matchers.notNullValue());
-                }
-        );
+        Utility.sleep(500, 60000, () -> {
+            restClient.authenticateUser(adminUserModel).withSearchAPI().search(query);
+            restClient.onResponse().assertThat().body("list.entries.entry[0].isFavorite", Matchers.notNullValue());
+        });
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify if get favorites response returns aspectNames when requested")
+    public void checkResponsesForGetFavoritesWithAspectNames()
+    {
+        final RestPersonFavoritesModelsCollection adminFavorites = restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().include(ASPECT_NAMES).getFavorites();
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+
+        adminFavorites.getEntries().stream()
+                .map(RestPersonFavoritesModel::onModel)
+                .forEach(m -> m.assertThat().field(ASPECT_NAMES).isNotEmpty());
     }
 }

packaging/tests/tas-webdav/pom.xml

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

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <properties>

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>23.4.0.26</version>
+    <version>23.4.0.42</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -51,27 +51,27 @@
         <dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-core.version>5.1.4</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-transform-service.version>4.1.4</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>5.1.5-A1</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>4.1.5-A1</dependency.alfresco-transform-service.version>
         <dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>
+        <dependency.acs-event-model.version>0.0.33</dependency.acs-event-model.version>
 
         <dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
-        <dependency.spring.version>6.0.19</dependency.spring.version>
+        <dependency.spring.version>6.1.13</dependency.spring.version>
         <dependency.spring-security.version>6.3.3</dependency.spring-security.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
         <dependency.jackson.version>2.17.2</dependency.jackson.version>
         <dependency.cxf.version>4.0.5</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
-        <dependency.webscripts.version>9.3</dependency.webscripts.version>
+        <dependency.webscripts.version>9.4</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.78.1</dependency.bouncycastle.version>
-        <dependency.mockito-core.version>5.13.0</dependency.mockito-core.version>
+        <dependency.mockito-core.version>5.14.1</dependency.mockito-core.version>
         <dependency.assertj.version>3.26.3</dependency.assertj.version>
         <dependency.org-json.version>20240303</dependency.org-json.version>
         <dependency.commons-dbcp.version>2.12.0</dependency.commons-dbcp.version>
         <dependency.commons-io.version>2.16.1</dependency.commons-io.version>
         <dependency.gson.version>2.11.0</dependency.gson.version>
-        <dependency.guava.version>33.3.0-jre</dependency.guava.version>
+        <dependency.guava.version>33.3.1-jre</dependency.guava.version>
         <dependency.httpclient.version>4.5.14</dependency.httpclient.version>
         <dependency.httpcore.version>4.4.16</dependency.httpcore.version>
         <dependency.httpcomponents-httpclient5.version>5.2.1</dependency.httpcomponents-httpclient5.version>
@@ -126,7 +126,7 @@
         <dependency.mysql.version>8.0.30</dependency.mysql.version>
         <dependency.mysql-image.version>8</dependency.mysql-image.version>
         <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
-        <dependency.tas-utility.version>5.0.1</dependency.tas-utility.version>
+        <dependency.tas-utility.version>5.0.2</dependency.tas-utility.version>
         <dependency.rest-assured.version>5.5.0</dependency.rest-assured.version>
         <dependency.tas-email.version>2.0.0</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.21</dependency.tas-webdav.version>
@@ -154,7 +154,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>23.4.0.26</tag>
+        <tag>23.4.0.42</tag>
     </scm>
 
     <distributionManagement>
@@ -1015,7 +1015,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.5.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -1028,7 +1028,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.7.0</version>
+                    <version>3.10.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <dependencies>

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

@@ -25,15 +25,24 @@
  */
 package org.alfresco.repo.web.scripts.content;
 
+import static java.util.Optional.ofNullable;
+import static java.util.function.Predicate.not;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.web.context.ServletContextAware;
+
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.web.scripts.MimeTypeUtil;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -42,13 +51,6 @@ import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.extensions.webscripts.WebScriptException;
-import org.springframework.extensions.webscripts.WebScriptRequest;
-import org.springframework.extensions.webscripts.WebScriptResponse;
-import org.springframework.web.context.ServletContextAware;
-
 
 /**
  * Content Retrieval Service
@@ -62,7 +64,7 @@ public class ContentGet extends StreamContent implements ServletContextAware
     // Logger
     @SuppressWarnings("unused")
     private static final Log logger = LogFactory.getLog(ContentGet.class);
-    
+
     // Component dependencies
     private ServletContext servletContext;
     private DictionaryService dictionaryService;
@@ -72,18 +74,19 @@ public class ContentGet extends StreamContent implements ServletContextAware
     private List<String> nonAttachContentTypes = Collections.emptyList();
 
     /**
-     * @param nonAttachContentTypes List<String>
+     * @param nonAttachContentTypes
+     *            List<String>
      */
     public void setNonAttachContentTypes(List<String> nonAttachContentTypes)
     {
-        if (nonAttachContentTypes != null && !nonAttachContentTypes.isEmpty())
-        {
-            this.nonAttachContentTypes = nonAttachContentTypes;
-        }
+        this.nonAttachContentTypes = ofNullable(nonAttachContentTypes)
+                .map(types -> types.stream().filter(not(String::isBlank)).toList())
+                .orElse(Collections.emptyList());
     }
 
     /**
-     * @param servletContext ServletContext
+     * @param servletContext
+     *            ServletContext
      */
     public void setServletContext(ServletContext servletContext)
     {
@@ -91,23 +94,26 @@ public class ContentGet extends StreamContent implements ServletContextAware
     }
 
     /**
-     * @param dictionaryService DictionaryService
+     * @param dictionaryService
+     *            DictionaryService
      */
     public void setDictionaryService(DictionaryService dictionaryService)
     {
-        this.dictionaryService = dictionaryService; 
+        this.dictionaryService = dictionaryService;
     }
 
     /**
-     * @param namespaceService NamespaceService
+     * @param namespaceService
+     *            NamespaceService
      */
     public void setNamespaceService(NamespaceService namespaceService)
     {
-        this.namespaceService = namespaceService; 
+        this.namespaceService = namespaceService;
     }
-    
+
     /**
-     * @param contentService ContentService
+     * @param contentService
+     *            ContentService
      */
     public void setContentService(ContentService contentService)
     {
@@ -118,7 +124,7 @@ public class ContentGet extends StreamContent implements ServletContextAware
      * @see org.springframework.extensions.webscripts.WebScript#execute(WebScriptRequest, WebScriptResponse)
      */
     public void execute(WebScriptRequest req, WebScriptResponse res)
-        throws IOException
+            throws IOException
     {
         // create map of args
         String[] names = req.getParameterNames();
@@ -127,10 +133,10 @@ public class ContentGet extends StreamContent implements ServletContextAware
         {
             args.put(name, req.getParameter(name));
         }
-        
+
         // create map of template vars
         Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
-        
+
         // create object reference from url
         ObjectReference reference = createObjectReferenceFromUrl(args, templateVars);
         NodeRef nodeRef = reference.getNodeRef();
@@ -139,7 +145,6 @@ public class ContentGet extends StreamContent implements ServletContextAware
             throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find " + reference.toString());
         }
 
-        
         // render content
         QName propertyQName = ContentModel.PROP_CONTENT;
         String contentPart = templateVars.get("property");
@@ -186,7 +191,7 @@ public class ContentGet extends StreamContent implements ServletContextAware
         if (attach && rfc5987Supported)
         {
             String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
-            
+
             // maintain the original name of the node during the download - do not modify it - see MNT-16510
             streamContent(req, res, nodeRef, propertyQName, attach, name, model);
         }
@@ -195,4 +200,4 @@ public class ContentGet extends StreamContent implements ServletContextAware
             streamContent(req, res, nodeRef, propertyQName, attach, null, model);
         }
     }
-}
+}

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

@@ -1,460 +1,460 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2019 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.api.impl;
-
-import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS;
-
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.model.ContentModel;
-import org.alfresco.query.PagingResults;
-import org.alfresco.repo.favourites.PersonFavourite;
-import org.alfresco.repo.site.SiteDoesNotExistException;
-import org.alfresco.repo.site.SiteModel;
-import org.alfresco.rest.api.Favourites;
-import org.alfresco.rest.api.Nodes;
-import org.alfresco.rest.api.People;
-import org.alfresco.rest.api.Sites;
-import org.alfresco.rest.api.model.Document;
-import org.alfresco.rest.api.model.DocumentTarget;
-import org.alfresco.rest.api.model.Favourite;
-import org.alfresco.rest.api.model.Folder;
-import org.alfresco.rest.api.model.FolderTarget;
-import org.alfresco.rest.api.model.Node;
-import org.alfresco.rest.api.model.PathInfo;
-import org.alfresco.rest.api.model.Site;
-import org.alfresco.rest.api.model.SiteTarget;
-import org.alfresco.rest.api.model.Target;
-import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
-import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
-import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
-import org.alfresco.rest.framework.resource.parameters.Paging;
-import org.alfresco.rest.framework.resource.parameters.Parameters;
-import org.alfresco.rest.framework.resource.parameters.Params;
-import org.alfresco.rest.framework.resource.parameters.SortColumn;
-import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
-import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerCallbackAdapter;
-import org.alfresco.service.cmr.favourites.FavouritesService;
-import org.alfresco.service.cmr.favourites.FavouritesService.SortFields;
-import org.alfresco.service.cmr.favourites.FavouritesService.Type;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.site.SiteInfo;
-import org.alfresco.service.cmr.site.SiteService;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.util.Pair;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Public REST API: Centralises access to favourites functionality and maps between representations repository and api representations.
- * 
- * @author steveglover
- * @since publicapi1.0
- */
-public class FavouritesImpl implements Favourites
-{
-    private static final Log logger = LogFactory.getLog(FavouritesImpl.class);
-
-    private static final List<String> ALLOWED_INCLUDES = List.of(PARAM_INCLUDE_PROPERTIES, PARAM_INCLUDE_ALLOWABLEOPERATIONS);
-
-    private People people;
-	private Sites sites;
-	private Nodes nodes;
-	private FavouritesService favouritesService;
-	private SiteService siteService;
-    private NamespaceService namespaceService;
-
-    // additional exclude properties for favourites as these can be already top-level properties
-    private static final List<QName> EXCLUDED_PROPS = Arrays.asList(
-            ContentModel.PROP_TITLE,
-            ContentModel.PROP_DESCRIPTION,
-            SiteModel.PROP_SITE_VISIBILITY,
-            SiteModel.PROP_SITE_PRESET
-            );
-
-	public void setPeople(People people)
-	{
-		this.people = people;
-	}
-
-	public void setSites(Sites sites)
-	{
-		this.sites = sites;
-	}
-
-	public void setNodes(Nodes nodes)
-	{
-		this.nodes = nodes;
-	}
-
-	public void setFavouritesService(FavouritesService favouritesService)
-	{
-		this.favouritesService = favouritesService;
-	}
-	
-	public void setSiteService(SiteService siteService)
-	{
-		this.siteService = siteService;
-	}
-
-    public void setNamespaceService(NamespaceService namespaceService)
-    {
-        this.namespaceService = namespaceService;
-    }
-
-	private Target getTarget(PersonFavourite personFavourite, Parameters parameters)
-	{
-		Target target = null;
-		NodeRef nodeRef = personFavourite.getNodeRef();
-		Type type = personFavourite.getType();
-		if(type.equals(Type.FILE))
-		{
-			Document document = nodes.getDocument(nodeRef);
-            setPathInfo(document, parameters.getInclude());
-            target = new DocumentTarget(document);
-		}
-		else if(type.equals(Type.FOLDER))
-		{
-			Folder folder = nodes.getFolder(nodeRef);
-            setPathInfo(folder, parameters.getInclude());
-			target = new FolderTarget(folder);
-		}
-		else if(type.equals(Type.SITE))
-		{
-			SiteInfo siteInfo = siteService.getSite(nodeRef);
-			String role = sites.getSiteRole(siteInfo.getShortName());
-			Site site = new Site(siteInfo, role);
-			target = new SiteTarget(site);
-		}
-		else
-		{
-			throw new AlfrescoRuntimeException("Unexpected favourite target type: " + type);
-		}
-		
-		return target;
-	}
-
-	private Favourite getFavourite(PersonFavourite personFavourite, Parameters parameters)
-	{
-		Favourite fav = new Favourite();
-		fav.setTargetGuid(personFavourite.getNodeRef().getId());
-		fav.setCreatedAt(personFavourite.getCreatedAt());
-		Target target = getTarget(personFavourite, parameters);
-		fav.setTarget(target);
-
-		// REPO-1147 allow retrieving additional properties
-        final List<String> paramsInclude = parameters.getInclude();
-        if (!Collections.disjoint(paramsInclude, ALLOWED_INCLUDES))
-        {
-            final List<String> includes = ALLOWED_INCLUDES.stream().filter(a -> paramsInclude.contains(a)).collect(Collectors.toList());
-            // get node representation with only properties included
-            Node node = nodes.getFolderOrDocument(personFavourite.getNodeRef(), null, null, includes, null);
-            // Create a map from node properties excluding properties already in this Favorite
-            Map<String, Object> filteredNodeProperties = filterProps(node.getProperties(), EXCLUDED_PROPS);
-            if(filteredNodeProperties.size() > 0 && paramsInclude.contains(PARAM_INCLUDE_PROPERTIES))
-            {
-                fav.setProperties(filteredNodeProperties);
-            }
-            final List<String> allowableOperations = node.getAllowableOperations();
-            if (CollectionUtils.isNotEmpty(allowableOperations) && paramsInclude.contains(PARAM_INCLUDE_ALLOWABLEOPERATIONS))
-            {
-                fav.setAllowableOperations(allowableOperations);
-            }
-        }
-
-		return fav;
-	}
-
-    private Map<String, Object> filterProps(Map<String, Object> properties, List<QName> toRemove)
-    {
-        Map<String, Object> filteredProps = properties == null ? new HashMap<>() : new HashMap<>(properties);
-        List<String> propsToRemove = toRemove.stream().map(e -> e.toPrefixString(namespaceService)).collect(Collectors.toList());
-        filteredProps.keySet().removeAll(propsToRemove);
-        return filteredProps;
-    }
-
-    private CollectionWithPagingInfo<Favourite> wrap(Paging paging, PagingResults<PersonFavourite> personFavourites, Parameters parameters)
-    {
-    	final List<PersonFavourite> page = personFavourites.getPage();
-    	final List<Favourite> list = new AbstractList<Favourite>()
-		{
-			@Override
-			public Favourite get(int index)
-			{
-				PersonFavourite personFavourite = page.get(index);
-				Favourite fav = getFavourite(personFavourite, parameters);
-				return fav;
-			}
-
-			@Override
-			public int size()
-			{
-				return page.size();
-			}
-		};
-		Pair<Integer, Integer> pair = personFavourites.getTotalResultCount();
-		Integer total = null;
-		if(pair.getFirst().equals(pair.getSecond()))
-		{
-			total = pair.getFirst();
-		}
-    	return CollectionWithPagingInfo.asPaged(paging, list, personFavourites.hasMoreItems(), total);
-    }
-
-    @Override
-	public Favourite addFavourite(String personId, Favourite favourite)
-    {
-        Parameters parameters = getDefaultParameters(personId, null);
-        return addFavourite(personId, favourite, parameters);
-    }
-
-    @Override
-    public Favourite addFavourite(String personId, Favourite favourite, Parameters parameters)
-    {
-        Favourite ret = null;
-
-        personId = people.validatePerson(personId, true);
-        Target target = favourite.getTarget();
-        if(target == null)
-        {
-            throw new InvalidArgumentException("target is missing");
-        }
-        else if(target instanceof SiteTarget)
-        {
-            SiteTarget siteTarget = (SiteTarget)target;
-            String guid = siteTarget.getSite().getGuid();
-            SiteInfo siteInfo = sites.validateSite(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, guid));
-            NodeRef siteNodeRef = siteInfo.getNodeRef();
-            String siteId = siteInfo.getShortName();
-
-            try
-            {
-                PersonFavourite personFavourite = favouritesService.addFavourite(personId, siteNodeRef);
-                ret = getFavourite(personFavourite, parameters);
-            }
-            catch(SiteDoesNotExistException e)
-            {
-                throw new RelationshipResourceNotFoundException(personId, siteId);
-            }
-        }
-        else if(target instanceof DocumentTarget)
-        {
-            DocumentTarget documentTarget = (DocumentTarget)target;
-            NodeRef nodeRef = documentTarget.getFile().getGuid();
-            if(!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null))
-            {
-                throw new RelationshipResourceNotFoundException(personId, nodeRef.getId());
-            }
-
-            PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef);
-            ret = getFavourite(personFavourite, parameters);
-        }
-        else if(target instanceof FolderTarget)
-        {
-            FolderTarget folderTarget = (FolderTarget)target;
-            NodeRef nodeRef = folderTarget.getFolder().getGuid();
-            if(!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), Collections.singleton(SiteModel.TYPE_SITE)))
-            {
-                throw new RelationshipResourceNotFoundException(personId, nodeRef.getId());
-            }
-
-            PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef);
-            ret = getFavourite(personFavourite, parameters);
-        }
-
-        return ret;
-    }
-
-    @Override
-    public void removeFavourite(String personId, String id)
-    {
-    	personId = people.validatePerson(personId, true);
-    	NodeRef nodeRef = nodes.validateNode(id);
-    	boolean exists = false;
-
-    	Type type = favouritesService.getType(nodeRef);
-    	if(type.equals(Type.SITE))
-    	{
-    		SiteInfo siteInfo = siteService.getSite(nodeRef);
-    		if(siteInfo == null)
-    		{
-    			// shouldn't happen because the type implies it's a site
-    			throw new AlfrescoRuntimeException("Unable to find site with nodeRef " + nodeRef);
-    		}
-    		exists = favouritesService.removeFavourite(personId, siteInfo.getNodeRef());
-    	}
-    	else if(type.equals(Type.FILE))
-    	{
-    		exists = favouritesService.removeFavourite(personId, nodeRef);
-    	}
-    	else if(type.equals(Type.FOLDER))
-    	{
-    		exists = favouritesService.removeFavourite(personId, nodeRef);
-    	}
-    	if(!exists)
-    	{
-    		throw new RelationshipResourceNotFoundException(personId, id);
-    	}
-    }
-
-    @Override
-    public Favourite getFavourite(String personId, String favouriteId)
-    {
-        Parameters parameters = getDefaultParameters(personId, favouriteId);
-        return getFavourite(personId, favouriteId, parameters);
-    }
-
-    @Override
-    public Favourite getFavourite(String personId, String favouriteId, Parameters parameters)
-    {
-        NodeRef nodeRef = nodes.validateNode(favouriteId);
-        personId = people.validatePerson(personId, true);
-
-        PersonFavourite personFavourite = favouritesService.getFavourite(personId, nodeRef);
-        if(personFavourite != null)
-        {
-            Favourite favourite = getFavourite(personFavourite, parameters);
-            return favourite;
-        }
-        else
-        {
-            throw new RelationshipResourceNotFoundException(personId, favouriteId);
-        }
-    }
-
-    @Override
-    public CollectionWithPagingInfo<Favourite> getFavourites(String personId, final Parameters parameters)
-    {
-    	personId = people.validatePerson(personId, true);
-
-    	Paging paging = parameters.getPaging();
-
-    	List<Pair<FavouritesService.SortFields, Boolean>> sortProps = getSortProps(parameters);
-
-    	final Set<Type> filteredByClientQuery = new HashSet<Type>();
-    	Set<Type> filterTypes = FavouritesService.Type.ALL_FILTER_TYPES;  //Default all
-    	
-    	// filterType is of the form 'target.<site|file|folder>'
-    	QueryHelper.walk(parameters.getQuery(), new WalkerCallbackAdapter()
-        {
-			@Override
-			public void or() {
-				//OR is supported but exists() will be called for each EXISTS so we don't
-				//need to do anything here.  If we don't override it then it will be assumed
-				//that OR in the grammar is not supported.
-			}
-
-			@Override
-			public void exists(String filteredByClient, boolean negated) {
-                if(filteredByClient != null)
-                {
-                    int idx = filteredByClient.lastIndexOf("/");
-                    if(idx == -1 || idx == filteredByClient.length())
-                    {
-                        throw new InvalidArgumentException();
-                    }
-                    else
-                    {
-                    	String filtertype = filteredByClient.substring(idx + 1).toUpperCase();
-                        filteredByClientQuery.add(Type.valueOf(filtertype));
-                    }
-                }
-				
-			}
-        });
-    	
-    	if (filteredByClientQuery.size() > 0)
-    	{
-    	    filterTypes = filteredByClientQuery;
-    	}
-
-        final PagingResults<PersonFavourite> favourites = favouritesService.getPagedFavourites(personId, filterTypes, sortProps, Util.getPagingRequest(paging));
-
-    	return wrap(paging, favourites, parameters);
-    }
-
-    private void setPathInfo(Node node, List<String> includeParam)
-    {
-        if (includeParam.contains(PARAM_INCLUDE_PATH))
-        {
-            PathInfo pathInfo = nodes.lookupPathInfo(node.getNodeRef(), null);
-            node.setPath(pathInfo);
-        }
-    }
-
-    /**
-     * Returns a {@code {@link Parameters} object where almost all of its values are null.
-     * the non-null value is the {@literal include} and whatever value is passed for {@code personId} and {@code favouriteId}
-     */
-    private Parameters getDefaultParameters(String personId, String favouriteId)
-    {
-        Params.RecognizedParams recognizedParams = new Params.RecognizedParams(null, null, null, null, Collections.emptyList(), null, null, null,
-                    false);
-        Parameters parameters = Params.valueOf(recognizedParams, personId, favouriteId, null);
-        return parameters;
-    }
-
-    private List<Pair<FavouritesService.SortFields, Boolean>> getSortProps(Parameters parameters)
-    {
-        List<Pair<FavouritesService.SortFields, Boolean>> sortProps = new ArrayList<>();
-        List<SortColumn> sortCols = parameters.getSorting();
-        if ((sortCols != null) && (sortCols.size() > 0))
-        {
-            for (SortColumn sortCol : sortCols)
-            {
-                SortFields sortField;
-                try
-                {
-                    sortField = SortFields.valueOf(sortCol.column);
-                }
-                catch (Exception e)
-                {
-                    throw new InvalidArgumentException("Invalid sort field: " + sortCol.column);
-                }
-                sortProps.add(new Pair<>(sortField, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE)));
-            }
-        }
-        else
-        {
-            // default sort order
-            sortProps = FavouritesService.DEFAULT_SORT_PROPS;
-        }
-        return sortProps;
-    }
-}
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASPECTNAMES;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.favourites.PersonFavourite;
+import org.alfresco.repo.site.SiteDoesNotExistException;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.rest.api.Favourites;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.Document;
+import org.alfresco.rest.api.model.DocumentTarget;
+import org.alfresco.rest.api.model.Favourite;
+import org.alfresco.rest.api.model.Folder;
+import org.alfresco.rest.api.model.FolderTarget;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.PathInfo;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.model.SiteTarget;
+import org.alfresco.rest.api.model.Target;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerCallbackAdapter;
+import org.alfresco.service.cmr.favourites.FavouritesService;
+import org.alfresco.service.cmr.favourites.FavouritesService.SortFields;
+import org.alfresco.service.cmr.favourites.FavouritesService.Type;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+
+/**
+ * Public REST API: Centralises access to favourites functionality and maps between representations repository and api representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class FavouritesImpl implements Favourites
+{
+    private static final List<String> ALLOWED_INCLUDES = List.of(PARAM_INCLUDE_PROPERTIES, PARAM_INCLUDE_ASPECTNAMES, PARAM_INCLUDE_ALLOWABLEOPERATIONS);
+
+    private People people;
+    private Sites sites;
+    private Nodes nodes;
+    private FavouritesService favouritesService;
+    private SiteService siteService;
+    private NamespaceService namespaceService;
+
+    // additional exclude properties for favourites as these can be already top-level properties
+    private static final List<QName> EXCLUDED_PROPS = Arrays.asList(
+            ContentModel.PROP_TITLE,
+            ContentModel.PROP_DESCRIPTION,
+            SiteModel.PROP_SITE_VISIBILITY,
+            SiteModel.PROP_SITE_PRESET);
+
+    public void setPeople(People people)
+    {
+        this.people = people;
+    }
+
+    public void setSites(Sites sites)
+    {
+        this.sites = sites;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setFavouritesService(FavouritesService favouritesService)
+    {
+        this.favouritesService = favouritesService;
+    }
+
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    private Target getTarget(PersonFavourite personFavourite, Parameters parameters)
+    {
+        Target target;
+        NodeRef nodeRef = personFavourite.getNodeRef();
+        Type type = personFavourite.getType();
+        if (type.equals(Type.FILE))
+        {
+            Document document = nodes.getDocument(nodeRef);
+            setPathInfo(document, parameters.getInclude());
+            target = new DocumentTarget(document);
+        }
+        else if (type.equals(Type.FOLDER))
+        {
+            Folder folder = nodes.getFolder(nodeRef);
+            setPathInfo(folder, parameters.getInclude());
+            target = new FolderTarget(folder);
+        }
+        else if (type.equals(Type.SITE))
+        {
+            SiteInfo siteInfo = siteService.getSite(nodeRef);
+            String role = sites.getSiteRole(siteInfo.getShortName());
+            Site site = new Site(siteInfo, role);
+            target = new SiteTarget(site);
+        }
+        else
+        {
+            throw new AlfrescoRuntimeException("Unexpected favourite target type: " + type);
+        }
+
+        return target;
+    }
+
+    private Favourite getFavourite(PersonFavourite personFavourite, Parameters parameters)
+    {
+        Favourite fav = new Favourite();
+        fav.setTargetGuid(personFavourite.getNodeRef().getId());
+        fav.setCreatedAt(personFavourite.getCreatedAt());
+        Target target = getTarget(personFavourite, parameters);
+        fav.setTarget(target);
+
+        // REPO-1147 allow retrieving additional properties
+        final List<String> paramsInclude = parameters.getInclude();
+        if (!Collections.disjoint(paramsInclude, ALLOWED_INCLUDES))
+        {
+            final List<String> includes = ALLOWED_INCLUDES.stream().filter(paramsInclude::contains).collect(Collectors.toList());
+            // get node representation with only properties included
+            Node node = nodes.getFolderOrDocument(personFavourite.getNodeRef(), null, null, includes, null);
+            // Create a map from node properties excluding properties already in this Favorite
+            Map<String, Object> filteredNodeProperties = filterProps(node.getProperties(), EXCLUDED_PROPS);
+            if (!filteredNodeProperties.isEmpty() && paramsInclude.contains(PARAM_INCLUDE_PROPERTIES))
+            {
+                fav.setProperties(filteredNodeProperties);
+            }
+            if (paramsInclude.contains(PARAM_INCLUDE_ASPECTNAMES))
+            {
+                fav.setAspectNames(node.getAspectNames());
+            }
+            final List<String> allowableOperations = node.getAllowableOperations();
+            if (CollectionUtils.isNotEmpty(allowableOperations) && paramsInclude.contains(PARAM_INCLUDE_ALLOWABLEOPERATIONS))
+            {
+                fav.setAllowableOperations(allowableOperations);
+            }
+        }
+
+        return fav;
+    }
+
+    private Map<String, Object> filterProps(Map<String, Object> properties, List<QName> toRemove)
+    {
+        Map<String, Object> filteredProps = properties == null ? new HashMap<>() : new HashMap<>(properties);
+        List<String> propsToRemove = toRemove.stream().map(e -> e.toPrefixString(namespaceService)).collect(Collectors.toList());
+        filteredProps.keySet().removeAll(propsToRemove);
+        return filteredProps;
+    }
+
+    private CollectionWithPagingInfo<Favourite> wrap(Paging paging, PagingResults<PersonFavourite> personFavourites, Parameters parameters)
+    {
+        final List<PersonFavourite> page = personFavourites.getPage();
+        final List<Favourite> list = new AbstractList<>() {
+            @Override
+            public Favourite get(int index)
+            {
+                PersonFavourite personFavourite = page.get(index);
+                Favourite fav = getFavourite(personFavourite, parameters);
+                return fav;
+            }
+
+            @Override
+            public int size()
+            {
+                return page.size();
+            }
+        };
+        Pair<Integer, Integer> pair = personFavourites.getTotalResultCount();
+        Integer total = null;
+        if (pair.getFirst().equals(pair.getSecond()))
+        {
+            total = pair.getFirst();
+        }
+        return CollectionWithPagingInfo.asPaged(paging, list, personFavourites.hasMoreItems(), total);
+    }
+
+    @Override
+    public Favourite addFavourite(String personId, Favourite favourite)
+    {
+        Parameters parameters = getDefaultParameters(personId, null);
+        return addFavourite(personId, favourite, parameters);
+    }
+
+    @Override
+    public Favourite addFavourite(String personId, Favourite favourite, Parameters parameters)
+    {
+        Favourite ret = null;
+
+        personId = people.validatePerson(personId, true);
+        Target target = favourite.getTarget();
+        if (target == null)
+        {
+            throw new InvalidArgumentException("target is missing");
+        }
+        else if (target instanceof SiteTarget)
+        {
+            SiteTarget siteTarget = (SiteTarget) target;
+            String guid = siteTarget.getSite().getGuid();
+            SiteInfo siteInfo = sites.validateSite(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, guid));
+            NodeRef siteNodeRef = siteInfo.getNodeRef();
+            String siteId = siteInfo.getShortName();
+
+            try
+            {
+                PersonFavourite personFavourite = favouritesService.addFavourite(personId, siteNodeRef);
+                ret = getFavourite(personFavourite, parameters);
+            }
+            catch (SiteDoesNotExistException e)
+            {
+                throw new RelationshipResourceNotFoundException(personId, siteId);
+            }
+        }
+        else if (target instanceof DocumentTarget)
+        {
+            DocumentTarget documentTarget = (DocumentTarget) target;
+            NodeRef nodeRef = documentTarget.getFile().getGuid();
+            if (!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null))
+            {
+                throw new RelationshipResourceNotFoundException(personId, nodeRef.getId());
+            }
+
+            PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef);
+            ret = getFavourite(personFavourite, parameters);
+        }
+        else if (target instanceof FolderTarget)
+        {
+            FolderTarget folderTarget = (FolderTarget) target;
+            NodeRef nodeRef = folderTarget.getFolder().getGuid();
+            if (!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), Collections.singleton(SiteModel.TYPE_SITE)))
+            {
+                throw new RelationshipResourceNotFoundException(personId, nodeRef.getId());
+            }
+
+            PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef);
+            ret = getFavourite(personFavourite, parameters);
+        }
+
+        return ret;
+    }
+
+    @Override
+    public void removeFavourite(String personId, String id)
+    {
+        personId = people.validatePerson(personId, true);
+        NodeRef nodeRef = nodes.validateNode(id);
+        boolean exists = false;
+
+        Type type = favouritesService.getType(nodeRef);
+        if (type.equals(Type.SITE))
+        {
+            SiteInfo siteInfo = siteService.getSite(nodeRef);
+            if (siteInfo == null)
+            {
+                // shouldn't happen because the type implies it's a site
+                throw new AlfrescoRuntimeException("Unable to find site with nodeRef " + nodeRef);
+            }
+            exists = favouritesService.removeFavourite(personId, siteInfo.getNodeRef());
+        }
+        else if (type.equals(Type.FILE))
+        {
+            exists = favouritesService.removeFavourite(personId, nodeRef);
+        }
+        else if (type.equals(Type.FOLDER))
+        {
+            exists = favouritesService.removeFavourite(personId, nodeRef);
+        }
+        if (!exists)
+        {
+            throw new RelationshipResourceNotFoundException(personId, id);
+        }
+    }
+
+    @Override
+    public Favourite getFavourite(String personId, String favouriteId)
+    {
+        Parameters parameters = getDefaultParameters(personId, favouriteId);
+        return getFavourite(personId, favouriteId, parameters);
+    }
+
+    @Override
+    public Favourite getFavourite(String personId, String favouriteId, Parameters parameters)
+    {
+        NodeRef nodeRef = nodes.validateNode(favouriteId);
+        personId = people.validatePerson(personId, true);
+
+        PersonFavourite personFavourite = favouritesService.getFavourite(personId, nodeRef);
+        if (personFavourite != null)
+        {
+            Favourite favourite = getFavourite(personFavourite, parameters);
+            return favourite;
+        }
+        else
+        {
+            throw new RelationshipResourceNotFoundException(personId, favouriteId);
+        }
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Favourite> getFavourites(String personId, final Parameters parameters)
+    {
+        personId = people.validatePerson(personId, true);
+
+        Paging paging = parameters.getPaging();
+
+        List<Pair<FavouritesService.SortFields, Boolean>> sortProps = getSortProps(parameters);
+
+        final Set<Type> filteredByClientQuery = new HashSet<>();
+        Set<Type> filterTypes = FavouritesService.Type.ALL_FILTER_TYPES; // Default all
+
+        // filterType is of the form 'target.<site|file|folder>'
+        QueryHelper.walk(parameters.getQuery(), new WalkerCallbackAdapter() {
+            @Override
+            public void or()
+            {
+                // OR is supported but exists() will be called for each EXISTS so we don't
+                // need to do anything here. If we don't override it then it will be assumed
+                // that OR in the grammar is not supported.
+            }
+
+            @Override
+            public void exists(String filteredByClient, boolean negated)
+            {
+                if (filteredByClient != null)
+                {
+                    int idx = filteredByClient.lastIndexOf('/');
+                    if (idx == -1 || idx == filteredByClient.length())
+                    {
+                        throw new InvalidArgumentException();
+                    }
+                    else
+                    {
+                        String filtertype = filteredByClient.substring(idx + 1).toUpperCase();
+                        filteredByClientQuery.add(Type.valueOf(filtertype));
+                    }
+                }
+
+            }
+        });
+
+        if (!filteredByClientQuery.isEmpty())
+        {
+            filterTypes = filteredByClientQuery;
+        }
+
+        final PagingResults<PersonFavourite> favourites = favouritesService.getPagedFavourites(personId, filterTypes, sortProps, Util.getPagingRequest(paging));
+
+        return wrap(paging, favourites, parameters);
+    }
+
+    private void setPathInfo(Node node, List<String> includeParam)
+    {
+        if (includeParam.contains(PARAM_INCLUDE_PATH))
+        {
+            PathInfo pathInfo = nodes.lookupPathInfo(node.getNodeRef(), null);
+            node.setPath(pathInfo);
+        }
+    }
+
+    /**
+     * Returns a {@code {@link Parameters} object where almost all of its values are null. the non-null value is the {@literal include} and whatever value is passed for {@code personId} and {@code favouriteId}
+     */
+    private Parameters getDefaultParameters(String personId, String favouriteId)
+    {
+        Params.RecognizedParams recognizedParams = new Params.RecognizedParams(null, null, null, null, Collections.emptyList(), null, null, null,
+                false);
+        Parameters parameters = Params.valueOf(recognizedParams, personId, favouriteId, null);
+        return parameters;
+    }
+
+    private List<Pair<FavouritesService.SortFields, Boolean>> getSortProps(Parameters parameters)
+    {
+        List<Pair<FavouritesService.SortFields, Boolean>> sortProps = new ArrayList<>();
+        List<SortColumn> sortCols = parameters.getSorting();
+        if (sortCols != null && !sortCols.isEmpty())
+        {
+            for (SortColumn sortCol : sortCols)
+            {
+                SortFields sortField;
+                try
+                {
+                    sortField = SortFields.valueOf(sortCol.column);
+                }
+                catch (Exception e)
+                {
+                    throw new InvalidArgumentException("Invalid sort field: " + sortCol.column);
+                }
+                sortProps.add(new Pair<>(sortField, sortCol.asc ? Boolean.TRUE : Boolean.FALSE));
+            }
+        }
+        else
+        {
+            // default sort order
+            sortProps = FavouritesService.DEFAULT_SORT_PROPS;
+        }
+        return sortProps;
+    }
+}

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

@@ -23,43 +23,65 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.rest.api.model;
-
-/**
- * A document target favourite.
- * 
- * @author steveglover
- *
- */
-public class DocumentTarget extends Target
-{
-	private Document file;
-
-	public DocumentTarget()
-	{
-		super();
-	}
-
-	public DocumentTarget(Document file)
-	{
-		super();
-		this.file = file;
-	}
-
-	public void setDocument(Document file)
-	{
-		this.file = file;
-	}
-
-	public Document getFile()
-	{
-		return file;
-	}
-
-	@Override
-	public String toString()
-	{
-		return "DocumentTarget [file=" + file + "]";
-	}
-
-}
+package org.alfresco.rest.api.model;
+
+import java.util.Objects;
+
+/**
+ * A document target favourite.
+ * 
+ * @author steveglover
+ *
+ */
+public class DocumentTarget extends Target
+{
+    private Document file;
+
+    public DocumentTarget()
+    {
+        super();
+    }
+
+    public DocumentTarget(Document file)
+    {
+        super();
+        this.file = file;
+    }
+
+    public void setDocument(Document file)
+    {
+        this.file = file;
+    }
+
+    public Document getFile()
+    {
+        return file;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "DocumentTarget [file=" + file + "]";
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+        DocumentTarget that = (DocumentTarget) o;
+        return Objects.equals(file, that.file);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hashCode(file);
+    }
+}

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

@@ -1,103 +1,144 @@
-/*
- * #%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.rest.api.model;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.rest.framework.resource.UniqueId;
-
-/**
- * Representation of a favourite (document, folder, site, ...).
- * 
- * @author steveglover
- *
- */
-public class Favourite
-{
-	private String targetGuid;
-	private Date createdAt;
-	private Target target;
-	private Map<String, Object> properties;
-	private List<String> allowableOperations;
-
-	public Date getCreatedAt()
-	{
-		return createdAt;
-	}
-
-	public void setCreatedAt(Date createdAt)
-	{
-		this.createdAt = createdAt;
-	}
-
-	@UniqueId(name="targetGuid")
-	public String getTargetGuid()
-	{
-		return targetGuid;
-	}
-	
-	public void setTargetGuid(String targetGuid)
-	{
-	    this.targetGuid = targetGuid;
-	}
-	
-	public Target getTarget()
-	{
-		return target;
-	}
-
-	public void setTarget(Target target)
-	{
-		this.target = target;
-	}
-
-	public Map<String, Object> getProperties()
-	{
-		return properties;
-	}
-
-	public void setProperties(Map<String, Object> properties)
-	{
-		this.properties = properties;
-	}
-
-	public List<String> getAllowableOperations() {
-		return allowableOperations;
-	}
-
-	public void setAllowableOperations(List<String> allowableOperations) {
-		this.allowableOperations = allowableOperations;
-	}
-
-	@Override
-	public String toString()
-	{
-		return "Favourite [targetGuid=" + targetGuid
-				+ ", createdAt=" + createdAt + ", target=" + target + ", properties=" + properties + "]";
-	}
-}
+/*
+ * #%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.rest.api.model;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Representation of a favourite (document, folder, site, ...).
+ * 
+ * @author steveglover
+ *
+ */
+public class Favourite
+{
+    private String targetGuid;
+    private Date createdAt;
+    private Target target;
+    private Map<String, Object> properties;
+    private List<String> aspectNames;
+    private List<String> allowableOperations;
+
+    public Date getCreatedAt()
+    {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt)
+    {
+        this.createdAt = createdAt;
+    }
+
+    @UniqueId(name = "targetGuid")
+    public String getTargetGuid()
+    {
+        return targetGuid;
+    }
+
+    public void setTargetGuid(String targetGuid)
+    {
+        this.targetGuid = targetGuid;
+    }
+
+    public Target getTarget()
+    {
+        return target;
+    }
+
+    public void setTarget(Target target)
+    {
+        this.target = target;
+    }
+
+    public Map<String, Object> getProperties()
+    {
+        return properties;
+    }
+
+    public void setProperties(Map<String, Object> properties)
+    {
+        this.properties = properties;
+    }
+
+    public List<String> getAspectNames()
+    {
+        return aspectNames;
+    }
+
+    public void setAspectNames(List<String> aspectNames)
+    {
+        this.aspectNames = aspectNames;
+    }
+
+    public List<String> getAllowableOperations()
+    {
+        return allowableOperations;
+    }
+
+    public void setAllowableOperations(List<String> allowableOperations)
+    {
+        this.allowableOperations = allowableOperations;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Favourite{" +
+                "targetGuid='" + targetGuid + '\'' +
+                ", createdAt=" + createdAt +
+                ", target=" + target +
+                ", properties=" + properties +
+                ", aspectNames=" + aspectNames +
+                ", allowableOperations=" + allowableOperations +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+        Favourite favourite = (Favourite) o;
+        return Objects.equals(targetGuid, favourite.targetGuid) && Objects.equals(createdAt, favourite.createdAt) && Objects.equals(target, favourite.target) && Objects.equals(properties, favourite.properties) && Objects.equals(aspectNames, favourite.aspectNames) && Objects.equals(allowableOperations, favourite.allowableOperations);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(targetGuid, createdAt, target, properties, aspectNames, allowableOperations);
+    }
+}

remote-api/src/main/resources/alfresco/web-scripts-application-context.xml

@@ -250,7 +250,7 @@
       <property name="delegate" ref="webscript.content.streamer" />
       <property name="contentService" ref="contentService" />
       <property name="repository" ref="repositoryHelper" />
-      <property name="nonAttachContentTypes" value="#{T(java.util.Arrays).asList('${content.nonAttach.mimetypes}')}" />
+      <property name="nonAttachContentTypes" value="#{'${content.nonAttach.mimetypes}'.split(',')}" />
    </bean>
    
    <!--  Content Info -->

remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java

@@ -25,59 +25,59 @@
  */
 package org.alfresco;
 
-import org.alfresco.repo.web.scripts.TestWebScriptRepoServer;
-import org.alfresco.util.testing.category.DBTests;
-import org.alfresco.util.testing.category.NonBuildTests;
 import org.junit.experimental.categories.Categories;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
+import org.alfresco.repo.web.scripts.TestWebScriptRepoServer;
+import org.alfresco.util.testing.category.DBTests;
+import org.alfresco.util.testing.category.NonBuildTests;
+
 @RunWith(Categories.class)
 @Categories.ExcludeCategory({DBTests.class, NonBuildTests.class})
 @Suite.SuiteClasses({
-    // [classpath:alfresco/application-context.xml, classpath:alfresco/web-scripts-application-context-test.xml,
-    // classpath:alfresco/web-scripts-application-context.xml]
-    org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest.class,
-    org.alfresco.repo.web.scripts.admin.AdminWebScriptTest.class,
-    org.alfresco.repo.web.scripts.audit.AuditWebScriptTest.class,
-    org.alfresco.repo.web.scripts.blogs.BlogServiceTest.class,
-    org.alfresco.repo.web.scripts.dictionary.DictionaryRestApiTest.class,
-    org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest.class,
-    org.alfresco.repo.web.scripts.activities.feed.control.FeedControlTest.class,
-    org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test.class,
-    org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test.class,
-    org.alfresco.repo.web.scripts.groups.GroupsTest.class,
-    org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest.class,
-    org.alfresco.repo.web.scripts.invite.InviteServiceTest.class,
-    org.alfresco.repo.web.scripts.LoginTest.class,
-    org.alfresco.repo.web.scripts.search.PersonSearchTest.class,
-    org.alfresco.repo.web.scripts.person.PersonServiceTest.class,
-    org.alfresco.repo.web.scripts.preference.PreferenceServiceTest.class,
-    org.alfresco.repo.web.scripts.rating.RatingRestApiTest.class,
-    org.alfresco.repo.web.scripts.replication.ReplicationRestApiTest.class,
-    org.alfresco.repo.web.scripts.RepositoryContainerTest.class,
-    org.alfresco.repo.web.scripts.rule.RuleServiceTest.class,
-    org.alfresco.repo.web.scripts.action.RunningActionRestApiTest.class,
-    org.alfresco.repo.web.scripts.site.SiteServiceTest.class,
-    org.alfresco.repo.web.scripts.tagging.TaggingServiceTest.class,
-    org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest.class,
-    org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest.class,
-    org.alfresco.repo.web.scripts.workflow.ActivitiWorkflowRestApiTest.class,
-    org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest.class,
-    org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceRestApiTest.class,
-    org.alfresco.repo.web.scripts.facet.FacetRestApiTest.class,
-    org.alfresco.repo.web.scripts.comment.CommentsApiTest.class,
-    org.alfresco.repo.web.scripts.content.ContentGetTest.class,
-    org.alfresco.repo.web.scripts.XssVulnerabilityTest.class,
-    org.alfresco.repo.web.scripts.links.LinksRestApiTest.class,
-    org.alfresco.repo.model.filefolder.RemoteFileFolderLoaderTest.class,
-    org.alfresco.repo.web.scripts.ReadOnlyTransactionInGetRestApiTest.class,
-    org.alfresco.repo.web.scripts.custommodel.CustomModelImportTest.class,
-    org.alfresco.repo.web.scripts.site.SurfConfigTest.class,
-    org.alfresco.repo.web.scripts.node.NodeWebScripTest.class,
-    org.alfresco.rest.api.impl.CommentsImplUnitTest.class,
-    org.alfresco.rest.api.impl.DownloadsImplCheckArchiveStatusUnitTest.class,
-    org.alfresco.rest.api.impl.RestApiDirectUrlConfigUnitTest.class
+        org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest.class,
+        org.alfresco.repo.web.scripts.admin.AdminWebScriptTest.class,
+        org.alfresco.repo.web.scripts.audit.AuditWebScriptTest.class,
+        org.alfresco.repo.web.scripts.blogs.BlogServiceTest.class,
+        org.alfresco.repo.web.scripts.dictionary.DictionaryRestApiTest.class,
+        org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest.class,
+        org.alfresco.repo.web.scripts.activities.feed.control.FeedControlTest.class,
+        org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test.class,
+        org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test.class,
+        org.alfresco.repo.web.scripts.groups.GroupsTest.class,
+        org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest.class,
+        org.alfresco.repo.web.scripts.invite.InviteServiceTest.class,
+        org.alfresco.repo.web.scripts.LoginTest.class,
+        org.alfresco.repo.web.scripts.search.PersonSearchTest.class,
+        org.alfresco.repo.web.scripts.person.PersonServiceTest.class,
+        org.alfresco.repo.web.scripts.preference.PreferenceServiceTest.class,
+        org.alfresco.repo.web.scripts.rating.RatingRestApiTest.class,
+        org.alfresco.repo.web.scripts.replication.ReplicationRestApiTest.class,
+        org.alfresco.repo.web.scripts.RepositoryContainerTest.class,
+        org.alfresco.repo.web.scripts.rule.RuleServiceTest.class,
+        org.alfresco.repo.web.scripts.action.RunningActionRestApiTest.class,
+        org.alfresco.repo.web.scripts.site.SiteServiceTest.class,
+        org.alfresco.repo.web.scripts.tagging.TaggingServiceTest.class,
+        org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest.class,
+        org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest.class,
+        org.alfresco.repo.web.scripts.workflow.ActivitiWorkflowRestApiTest.class,
+        org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest.class,
+        org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceRestApiTest.class,
+        org.alfresco.repo.web.scripts.facet.FacetRestApiTest.class,
+        org.alfresco.repo.web.scripts.comment.CommentsApiTest.class,
+        org.alfresco.repo.web.scripts.content.ContentGetTest.class,
+        org.alfresco.repo.web.scripts.XssVulnerabilityTest.class,
+        org.alfresco.repo.web.scripts.links.LinksRestApiTest.class,
+        org.alfresco.repo.model.filefolder.RemoteFileFolderLoaderTest.class,
+        org.alfresco.repo.web.scripts.ReadOnlyTransactionInGetRestApiTest.class,
+        org.alfresco.repo.web.scripts.custommodel.CustomModelImportTest.class,
+        org.alfresco.repo.web.scripts.site.SurfConfigTest.class,
+        org.alfresco.repo.web.scripts.node.NodeWebScripTest.class,
+        org.alfresco.rest.api.impl.CommentsImplUnitTest.class,
+        org.alfresco.rest.api.impl.DownloadsImplCheckArchiveStatusUnitTest.class,
+        org.alfresco.rest.api.impl.FavouritesImplUnitTest.class,
+        org.alfresco.rest.api.impl.RestApiDirectUrlConfigUnitTest.class
 })
 public class AppContext04TestSuite
 {

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

@@ -0,0 +1,134 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import static java.util.Collections.singleton;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+import static org.alfresco.model.ContentModel.TYPE_CONTENT;
+import static org.alfresco.service.cmr.favourites.FavouritesService.Type.FILE;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+
+import org.alfresco.repo.favourites.PersonFavourite;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.model.Document;
+import org.alfresco.rest.api.model.DocumentTarget;
+import org.alfresco.rest.api.model.Favourite;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.favourites.FavouritesService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.NamespaceService;
+
+/**
+ * Unit tests for {@link FavouritesImpl} class.
+ */
+public class FavouritesImplUnitTest
+{
+    static final String NODE_ID = "12345678";
+    static final NodeRef NODE_REF = new NodeRef("favourite://node/" + NODE_ID);
+    static final String PERSON_ID = "personId";
+    static final String ASPECT_NAME = "some:aspect";
+
+    @InjectMocks
+    FavouritesImpl favouritesImpl;
+    @Mock
+    People people;
+    @Mock
+    Nodes nodes;
+    @Mock
+    FavouritesService favouritesService;
+    @Mock
+    NamespaceService namespaceService;
+    @Mock
+    Favourite favourite;
+    @Mock
+    Document document;
+    @Mock
+    PersonFavourite personFavourite;
+
+    @Before
+    public void setUp()
+    {
+        openMocks(this);
+
+        when(nodes.getDocument(NODE_REF)).thenReturn(document);
+        when(nodes.nodeMatches(NODE_REF, singleton(TYPE_CONTENT), null)).thenReturn(true);
+        when(document.getGuid()).thenReturn(NODE_REF);
+        when(people.validatePerson(PERSON_ID, true)).thenReturn(PERSON_ID);
+        when(personFavourite.getNodeRef()).thenReturn(NODE_REF);
+        when(personFavourite.getType()).thenReturn(FILE);
+        when(favouritesService.addFavourite(PERSON_ID, NODE_REF)).thenReturn(personFavourite);
+        when(namespaceService.getPrefixes(anyString())).thenReturn(List.of("prefix"));
+    }
+
+    @Test
+    public void testAddFavourite()
+    {
+        DocumentTarget documentTarget = new DocumentTarget(document);
+        when(favourite.getTarget()).thenReturn(documentTarget);
+
+        Favourite response = favouritesImpl.addFavourite(PERSON_ID, favourite);
+
+        Favourite expected = new Favourite();
+        expected.setTarget(documentTarget);
+        expected.setTargetGuid(NODE_ID);
+        assertEquals(expected, response);
+    }
+
+    @Test
+    public void testAddFavouriteIncludeAspectNames()
+    {
+        List<String> includes = List.of("aspectNames");
+
+        DocumentTarget documentTarget = new DocumentTarget(document);
+        when(favourite.getTarget()).thenReturn(documentTarget);
+        when(nodes.getFolderOrDocument(NODE_REF, null, null, includes, null)).thenReturn(document);
+        when(document.getAspectNames()).thenReturn(List.of(ASPECT_NAME));
+
+        Parameters parameters = mock(Parameters.class);
+        when(parameters.getInclude()).thenReturn(includes);
+
+        Favourite response = favouritesImpl.addFavourite(PERSON_ID, favourite, parameters);
+
+        Favourite expected = new Favourite();
+        expected.setTarget(documentTarget);
+        expected.setTargetGuid(NODE_ID);
+        expected.setAspectNames(List.of(ASPECT_NAME));
+        assertEquals(expected, response);
+    }
+}

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.26</version>
+        <version>23.4.0.42</version>
     </parent>
 
     <dependencies>

repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java

@@ -38,6 +38,12 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
+
 import org.alfresco.repo.domain.node.NodeDAO;
 import org.alfresco.repo.domain.node.TransactionEntity;
 import org.alfresco.repo.event.v1.model.DataAttributes;
@@ -81,11 +87,6 @@ import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.PropertyCheck;
 import org.alfresco.util.TriPredicate;
 import org.alfresco.util.transaction.TransactionListenerAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 
 /**
  * Generates events and sends them to an event topic.
@@ -93,8 +94,8 @@ import org.springframework.extensions.surf.util.AbstractLifecycleBean;
  * @author Jamal Kaabi-Mofrad
  */
 public class EventGenerator extends AbstractLifecycleBean implements InitializingBean, EventSupportedPolicies,
-                                                                     ChildAssociationEventSupportedPolicies,
-                                                                     PeerAssociationEventSupportedPolicies
+        ChildAssociationEventSupportedPolicies,
+        PeerAssociationEventSupportedPolicies
 {
     private static final Log LOGGER = LogFactory.getLog(EventGenerator.class);
 
@@ -354,7 +355,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
     }
 
     protected ChildAssociationEventConsolidator createChildAssociationEventConsolidator(
-                ChildAssociationRef childAssociationRef)
+            ChildAssociationRef childAssociationRef)
     {
         return new ChildAssociationEventConsolidator(childAssociationRef, nodeResourceHelper);
     }
@@ -417,8 +418,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
     }
 
     /**
-     * @return the {@link NodeEventConsolidator} for the supplied {@code nodeRef} from
-     * the current transaction context.
+     * @return the {@link NodeEventConsolidator} for the supplied {@code nodeRef} from the current transaction context.
      */
     protected NodeEventConsolidator getEventConsolidator(NodeRef nodeRef)
     {
@@ -438,7 +438,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
         return eventConsolidator;
     }
 
-
     protected Consolidators getTxnConsolidators(Object resourceKey)
     {
         Consolidators consolidators = AlfrescoTransactionSupport.getResource(resourceKey);
@@ -451,8 +450,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
     }
 
     /**
-     * @return the {@link ChildAssociationEventConsolidator} for the supplied {@code childAssociationRef} from
-     * the current transaction context.
+     * @return the {@link ChildAssociationEventConsolidator} for the supplied {@code childAssociationRef} from the current transaction context.
      */
     private ChildAssociationEventConsolidator getEventConsolidator(ChildAssociationRef childAssociationRef)
     {
@@ -473,8 +471,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
     }
 
     /**
-     * @return the {@link PeerAssociationEventConsolidator} for the supplied {@code peerAssociationRef} from
-     * the current transaction context.
+     * @return the {@link PeerAssociationEventConsolidator} for the supplied {@code peerAssociationRef} from the current transaction context.
      */
     private PeerAssociationEventConsolidator getEventConsolidator(AssociationRef peerAssociationRef)
     {
@@ -507,10 +504,10 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
     protected EventInfo getEventInfo(String user)
     {
         return new EventInfo().setTimestamp(getCurrentTransactionTimestamp())
-                              .setId(UUID.randomUUID().toString())
-                              .setTxnId(AlfrescoTransactionSupport.getTransactionId())
-                              .setPrincipal(user)
-                              .setSource(URI.create("/" + descriptorService.getCurrentRepositoryDescriptor().getId()));
+                .setId(UUID.randomUUID().toString())
+                .setTxnId(AlfrescoTransactionSupport.getTransactionId())
+                .setPrincipal(user)
+                .setSource(URI.create("/" + descriptorService.getCurrentRepositoryDescriptor().getId()));
     }
 
     private ZonedDateTime getCurrentTransactionTimestamp()
@@ -523,13 +520,12 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
     private static ChildAssociationRef childAssociationWithoutParentOf(ChildAssociationRef childAssociationRef)
     {
         return new ChildAssociationRef(
-            null,
-            null,
-            childAssociationRef.getQName(),
-            childAssociationRef.getChildRef(),
-            childAssociationRef.isPrimary(),
-            childAssociationRef.getNthSibling()
-        );
+                null,
+                null,
+                childAssociationRef.getQName(),
+                childAssociationRef.getChildRef(),
+                childAssociationRef.isPrimary(),
+                childAssociationRef.getNthSibling());
     }
 
     @Override
@@ -546,7 +542,10 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
     @Override
     protected void onShutdown(ApplicationEvent applicationEvent)
     {
-        //NOOP
+        if (eventSender != null)
+        {
+            eventSender.destroy();
+        }
     }
 
     protected class EventTransactionListener extends TransactionListenerAdapter
@@ -586,8 +585,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
         }
 
         /**
-         * @return true if a node transaction is not only active, but also committed with modifications.
-         * This means that a {@link TransactionEntity} object was created.
+         * @return true if a node transaction is not only active, but also committed with modifications. This means that a {@link TransactionEntity} object was created.
          */
         protected boolean isTransactionCommitted()
         {
@@ -601,7 +599,8 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
                 try
                 {
                     sendEvents();
-                } catch (Exception e)
+                }
+                catch (Exception e)
                 {
                     // Must consume the exception to protect other TransactionListeners
                     LOGGER.error("Unexpected error while sending repository events", e);
@@ -650,14 +649,19 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
         /**
          * Handles all kinds of events and sends them within dedicated transaction.
          *
-         * @param entityReference - reference to an entity (e.g. node, child association, peer association)
-         * @param eventConsolidator - object encapsulating events occurred in a transaction
-         * @param entityToEventEligibilityVerifier - allows to verify if entity is eligible to generate an even. If null no verification is necessary
-         * @param <REF> - entity reference type (e.g. {@link NodeRef}, {@link AssociationRef}, {@link ChildAssociationRef})
-         * @param <CON> - event consolidator type - extension of {@link EventConsolidator}
+         * @param entityReference
+         *            - reference to an entity (e.g. node, child association, peer association)
+         * @param eventConsolidator
+         *            - object encapsulating events occurred in a transaction
+         * @param entityToEventEligibilityVerifier
+         *            - allows to verify if entity is eligible to generate an even. If null no verification is necessary
+         * @param <REF>
+         *            - entity reference type (e.g. {@link NodeRef}, {@link AssociationRef}, {@link ChildAssociationRef})
+         * @param <CON>
+         *            - event consolidator type - extension of {@link EventConsolidator}
          */
-        private  <REF extends EntityRef, CON extends EventConsolidator<REF, ? extends Resource>> void sendEvent(
-            final REF entityReference, final CON eventConsolidator, final TriPredicate<REF, CON, EventInfo> entityToEventEligibilityVerifier)
+        private <REF extends EntityRef, CON extends EventConsolidator<REF, ? extends Resource>> void sendEvent(
+                final REF entityReference, final CON eventConsolidator, final TriPredicate<REF, CON, EventInfo> entityToEventEligibilityVerifier)
         {
             final EventInfo eventInfo = getEventInfo(AuthenticationUtil.getFullyAuthenticatedUser());
             if (isSendingEventBeforeCommitRequired())
@@ -676,16 +680,22 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
         /**
          * Creates events from various kinds of entities.
          *
-         * @param entityReference - reference to an entity (e.g. node, child association, peer association)
-         * @param eventConsolidator - object encapsulating events occurred in a transaction
-         * @param eventInfo - object holding the event information
-         * @param entityToEventEligibilityVerifier - allows to verify if entity is eligible to generate an even. If null no verification is necessary
-         * @param <REF> - entity reference type (e.g. {@link NodeRef}, {@link AssociationRef}, {@link ChildAssociationRef})
-         * @param <CON> - event consolidator type - extension of {@link EventConsolidator}
+         * @param entityReference
+         *            - reference to an entity (e.g. node, child association, peer association)
+         * @param eventConsolidator
+         *            - object encapsulating events occurred in a transaction
+         * @param eventInfo
+         *            - object holding the event information
+         * @param entityToEventEligibilityVerifier
+         *            - allows to verify if entity is eligible to generate an even. If null no verification is necessary
+         * @param <REF>
+         *            - entity reference type (e.g. {@link NodeRef}, {@link AssociationRef}, {@link ChildAssociationRef})
+         * @param <CON>
+         *            - event consolidator type - extension of {@link EventConsolidator}
          */
         private <REF extends EntityRef, CON extends EventConsolidator<REF, ? extends Resource>> Optional<RepoEvent<?>> createEvent(
-            final REF entityReference, final CON eventConsolidator, final EventInfo eventInfo,
-            final TriPredicate<REF, CON, EventInfo> entityToEventEligibilityVerifier)
+                final REF entityReference, final CON eventConsolidator, final EventInfo eventInfo,
+                final TriPredicate<REF, CON, EventInfo> entityToEventEligibilityVerifier)
         {
             if (eventConsolidator.isTemporaryEntity())
             {
@@ -719,8 +729,8 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
                     if (LOGGER.isTraceEnabled())
                     {
                         LOGGER.trace("EventFilter - Excluding node: '" + nodeReference + "' of type: '"
-                            + ((nodeType == null) ? "Unknown' " : nodeType.toPrefixString())
-                            + "' created by: " + user);
+                                + ((nodeType == null) ? "Unknown' " : nodeType.toPrefixString())
+                                + "' created by: " + user);
                     }
                     return false;
                 }
@@ -747,8 +757,8 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
                     if (LOGGER.isTraceEnabled())
                     {
                         LOGGER.trace("EventFilter - Excluding child association: '" + childAssociationReference + "' of type: '"
-                            + ((childAssocType == null) ? "Unknown' " : childAssocType.toPrefixString())
-                            + "' created by: " + user);
+                                + ((childAssocType == null) ? "Unknown' " : childAssocType.toPrefixString())
+                                + "' created by: " + user);
                     }
                     return false;
                 }
@@ -757,8 +767,8 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
                     if (LOGGER.isTraceEnabled())
                     {
                         LOGGER.trace("EventFilter - Excluding primary child association: '" + childAssociationReference + "' of type: '"
-                            + ((childAssocType == null) ? "Unknown' " : childAssocType.toPrefixString())
-                            + "' created by: " + user);
+                                + ((childAssocType == null) ? "Unknown' " : childAssocType.toPrefixString())
+                                + "' created by: " + user);
                     }
                     return false;
                 }
@@ -804,7 +814,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
         {
             if (peerAssocs == null)
             {
-                 peerAssocs = new LinkedHashMap<>(29);
+                peerAssocs = new LinkedHashMap<>(29);
             }
             return peerAssocs;
         }

repository/src/main/java/org/alfresco/repo/event2/EventSender.java

@@ -37,17 +37,26 @@ public interface EventSender
 {
     /**
      * Accepts a callback function creating an event and sends this event to specified destination.
-     * @param eventProducer - callback function that creates an event
+     * 
+     * @param eventProducer
+     *            - callback function that creates an event
      */
     void accept(Callable<Optional<RepoEvent<?>>> eventProducer);
 
     /**
-     * It's called right after event sender instantiation (see {@link org.alfresco.repo.event2.EventSenderFactoryBean}).
-     * It might be used to initialize the sender implementation.
+     * It's called right after event sender instantiation (see {@link org.alfresco.repo.event2.EventSenderFactoryBean}). It might be used to initialize the sender implementation.
      */
     default void initialize()
     {
-        //no initialization by default
+        // no initialization by default
+    }
+
+    /**
+     * It's called when the application context is closing, allowing {@link org.alfresco.repo.event2.EventGenerator} to perform cleanup operations.
+     */
+    default void destroy()
+    {
+        // no destruction by default
     }
 
     default boolean shouldParticipateInTransaction()

repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java

@@ -997,7 +997,7 @@ public class LockServiceImpl implements LockService,
         }
         
         // Never return a null LockState
-        Assert.notNull(lockState);
+        Assert.notNull(lockState, "The lockState should not be null");
         return lockState;
     }
 

repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -23,133 +23,127 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.security.permissions;
-
-import java.util.Collection;
-
-import org.springframework.aop.IntroductionAdvisor;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.support.DefaultIntroductionAdvisor;
-import org.springframework.aop.support.DelegatingIntroductionInterceptor;
-
-/**
- * Interface for collection-based results that describe permission filtering
- * behaviour around cut-off limits.
- * 
- * @author Derek Hulley
- * @since 4.0
- */
-public interface PermissionCheckCollection<T>
-{
-    /**
-     * Get the desired number of results.  Permission checks can stop once the number of
-     * return objects reaches this number.
-     * 
-     * @return                          the number of results desired
-     */
-    int getTargetResultCount();
-
-    /**
-     * Get the maximum time for permission checks to execute before cutting the results off.
-     * <br/>Zero: Ignore this value.
-     * 
-     * @return                          the time allowed for permission checks before cutoff
-     */
-    long getCutOffAfterTimeMs();
-
-    /**
-     * Get the maximum number of permission checks to perform before cutting the results off
-     * 
-     * @return                          the maximum number of permission checks before cutoff
-     */
-    int getCutOffAfterCount();
-
-    /**
-     * Helper 'introduction' to allow simple addition of the {@link PermissionCheckCollection} interface to
-     * existing collections.
-     *
-     * @param <T>       the type of the <code>Collection</code> in use
-     * 
-     * @author Derek Hulley
-     * @since 4.0
-     */
-    @SuppressWarnings("serial")
-    public static class PermissionCheckCollectionMixin<T> extends DelegatingIntroductionInterceptor implements PermissionCheckCollection<T>
-    {
-        private final int targetResultCount;
-        private final long cutOffAfterTimeMs;
-        private final int cutOffAfterCount;
-        
-        private PermissionCheckCollectionMixin(int targetResultCount, long cutOffAfterTimeMs, int cutOffAfterCount)
-        {
-            super();
-            this.targetResultCount = targetResultCount;
-            this.cutOffAfterTimeMs = cutOffAfterTimeMs;
-            this.cutOffAfterCount = cutOffAfterCount;
-            if (cutOffAfterTimeMs <= 0)
-            {
-                cutOffAfterTimeMs = 0;
-            }
-            if (cutOffAfterCount <= 0)
-            {
-                cutOffAfterCount = 0;
-            }
-        }
-
-        @Override
-        public int getTargetResultCount()
-        {
-            return targetResultCount;
-        }
-
-        @Override
-        public long getCutOffAfterTimeMs()
-        {
-            return cutOffAfterTimeMs;
-        }
-
-        @Override
-        public int getCutOffAfterCount()
-        {
-            return cutOffAfterCount;
-        }
-
-        /**
-         * Helper method to create a {@link PermissionCheckCollection} from an existing <code>Collection</code>
-         * 
-         * @param <TT>              the type of the <code>Collection</code>
-         * @param collection        the <code>Collection</code> to proxy
-         * @param targetResultCount the desired number of results or default to the collection size
-         * @param cutOffAfterTimeMs the number of milliseconds to wait before cut-off or zero to use the system default
-         *                          time-based cut-off.
-         * @param cutOffAfterCount  the number of permission checks to process before cut-off or zero to use the system default
-         *                          count-based cut-off.
-         * @return                  a <code>Collection</code> of the same type but including the
-         *                          {@link PermissionCheckCollection} interface
-         */
-        @SuppressWarnings("unchecked")
-        public static final <TT> Collection<TT> create(
-                Collection<TT> collection,
-                int targetResultCount, long cutOffAfterTimeMs, int cutOffAfterCount)
-        {
-            if (targetResultCount <= 0)
-            {
-                targetResultCount = collection.size();
-            }
-            // Create the mixin
-            DelegatingIntroductionInterceptor mixin = new PermissionCheckCollectionMixin<Integer>(
-                    targetResultCount,
-                    cutOffAfterTimeMs,
-                    cutOffAfterCount);
-            // Create the advisor
-            IntroductionAdvisor advisor = new DefaultIntroductionAdvisor(mixin, PermissionCheckCollection.class);
-            // Proxy
-            ProxyFactory pf = new ProxyFactory(collection);
-            pf.addAdvisor(advisor);
-            Object proxiedObject = pf.getProxy();
-            
-            // Done
-            return (Collection<TT>) proxiedObject;
-        }
-    }
-}
+package org.alfresco.repo.security.permissions;
+
+import java.util.Collection;
+
+import org.springframework.aop.IntroductionAdvisor;
+import org.springframework.aop.support.DefaultIntroductionAdvisor;
+import org.springframework.aop.support.DelegatingIntroductionInterceptor;
+
+/**
+ * Interface for collection-based results that describe permission filtering behaviour around cut-off limits.
+ * 
+ * @author Derek Hulley
+ * @since 4.0
+ */
+public interface PermissionCheckCollection<T>
+{
+    /**
+     * Get the desired number of results. Permission checks can stop once the number of return objects reaches this number.
+     * 
+     * @return the number of results desired
+     */
+    int getTargetResultCount();
+
+    /**
+     * Get the maximum time for permission checks to execute before cutting the results off. <br/>
+     * Zero: Ignore this value.
+     * 
+     * @return the time allowed for permission checks before cutoff
+     */
+    long getCutOffAfterTimeMs();
+
+    /**
+     * Get the maximum number of permission checks to perform before cutting the results off
+     * 
+     * @return the maximum number of permission checks before cutoff
+     */
+    int getCutOffAfterCount();
+
+    /**
+     * Helper 'introduction' to allow simple addition of the {@link PermissionCheckCollection} interface to existing collections.
+     *
+     * @param <T>
+     *            the type of the <code>Collection</code> in use
+     * 
+     * @author Derek Hulley
+     * @since 4.0
+     */
+    @SuppressWarnings("serial")
+    class PermissionCheckCollectionMixin<T> extends DelegatingIntroductionInterceptor implements PermissionCheckCollection<T>
+    {
+        private final int targetResultCount;
+        private final long cutOffAfterTimeMs;
+        private final int cutOffAfterCount;
+
+        private PermissionCheckCollectionMixin(int targetResultCount, long cutOffAfterTimeMs, int cutOffAfterCount)
+        {
+            super();
+            this.targetResultCount = targetResultCount;
+            this.cutOffAfterTimeMs = cutOffAfterTimeMs;
+            this.cutOffAfterCount = cutOffAfterCount;
+            if (cutOffAfterTimeMs <= 0)
+            {
+                cutOffAfterTimeMs = 0;
+            }
+            if (cutOffAfterCount <= 0)
+            {
+                cutOffAfterCount = 0;
+            }
+        }
+
+        @Override
+        public int getTargetResultCount()
+        {
+            return targetResultCount;
+        }
+
+        @Override
+        public long getCutOffAfterTimeMs()
+        {
+            return cutOffAfterTimeMs;
+        }
+
+        @Override
+        public int getCutOffAfterCount()
+        {
+            return cutOffAfterCount;
+        }
+
+        /**
+         * Helper method to create a {@link PermissionCheckCollection} from an existing <code>Collection</code>
+         * 
+         * @param <TT>
+         *            the type of the <code>Collection</code>
+         * @param collection
+         *            the <code>Collection</code> to proxy
+         * @param targetResultCount
+         *            the desired number of results or default to the collection size
+         * @param cutOffAfterTimeMs
+         *            the number of milliseconds to wait before cut-off or zero to use the system default time-based cut-off.
+         * @param cutOffAfterCount
+         *            the number of permission checks to process before cut-off or zero to use the system default count-based cut-off.
+         * @return a <code>Collection</code> of the same type but including the {@link PermissionCheckCollection} interface
+         */
+        @SuppressWarnings("unchecked")
+        public static <TT> Collection<TT> create(
+                Collection<TT> collection,
+                int targetResultCount, long cutOffAfterTimeMs, int cutOffAfterCount)
+        {
+            if (targetResultCount <= 0)
+            {
+                targetResultCount = collection.size();
+            }
+            // Create the mixin
+            DelegatingIntroductionInterceptor mixin = new PermissionCheckCollectionMixin<>(
+                    targetResultCount,
+                    cutOffAfterTimeMs,
+                    cutOffAfterCount);
+            // Create the advisor
+            IntroductionAdvisor advisor = new DefaultIntroductionAdvisor(mixin, PermissionCheckCollection.class);
+            // Create Proxy
+            return (Collection<TT>) ProxyFactoryUtils.createProxy(collection, advisor);
+        }
+    }
+}

repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java

@@ -2,161 +2,160 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
  * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
+ * 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.security.permissions;
-
-import java.util.Collection;
-
-import org.springframework.aop.IntroductionAdvisor;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.support.DefaultIntroductionAdvisor;
-import org.springframework.aop.support.DelegatingIntroductionInterceptor;
-
-/**
- * Interface for collection-based results that carry extra information
- * about the state of permission cut-offs.
- * 
- * @author Derek Hulley
- * @since 4.0
- */
-public interface PermissionCheckedCollection<T>
-{
-    /**
-     * Check if the results have been truncated by permission check limits.
-     *
-     * @return              <tt>true</tt> - if the results (usually a collection) have been
-     *                      cut off by permission check limits
-     */
-    boolean isCutOff();
-    
-    /**
-     * Get the number of objects in the original (unfiltered) collection that did
-     * <b>not</b> have any permission checks.
-     * 
-     * @return              number of entries from the original collection that were not checked
-     */
-    int sizeUnchecked();
-    
-    /**
-     * Get the number of objects in the original (unfiltered) collection.
-     * 
-     * @return              number of entries in the original, pre-checked collection
-     */
-    int sizeOriginal();
-
-    /**
-     * Helper 'introduction' to allow simple addition of the {@link PermissionCheckedCollection} interface to
-     * existing collections.
-     *
-     * @param <T>       the type of the <code>Collection</code> in use
-     * 
-     * @author Derek Hulley
-     * @since 4.0
-     */
-    @SuppressWarnings("serial")
-    public static class PermissionCheckedCollectionMixin<T> extends DelegatingIntroductionInterceptor implements PermissionCheckedCollection<T>
-    {
-        private final boolean isCutOff;
-        private final int sizeUnchecked;
-        private final int sizeOriginal;
-        private PermissionCheckedCollectionMixin(boolean isCutOff, int sizeUnchecked, int sizeOriginal)
-        {
-            super();
-            this.isCutOff = isCutOff;
-            this.sizeUnchecked = sizeUnchecked;
-            this.sizeOriginal = sizeOriginal;
-        }
-        @Override
-        public boolean isCutOff()
-        {
-            return isCutOff;
-        }
-        @Override
-        public int sizeUnchecked()
-        {
-            return sizeUnchecked;
-        }
-        @Override
-        public int sizeOriginal()
-        {
-            return sizeOriginal;
-        }
-        /**
-         * Helper method to create a {@link PermissionCheckedCollection} from an existing <code>Collection</code>
-         * by applying the same values as present on a potentially permission-checked source.  If the
-         * existing checked source is <b>NOT</b> permission-checked, then the collection will not be
-         * decorated.
-         * 
-         * @param <TT>              the type of the <code>Collection</code>
-         * @param collection        the <code>Collection</code> to proxy
-         * @param checkedSource     a collection that might implement {@link PermissionCheckedCollection}
-         * @return                  a <code>Collection</code> of the same type but including the
-         *                          {@link PermissionCheckedCollection} interface
-         */
-        public static final <TT> Collection<TT> create(
-                Collection<TT> collection, Collection<?> checkedSource)
-        {
-            if (checkedSource instanceof PermissionCheckedCollection)
-            {
-                PermissionCheckedCollection<?> source = (PermissionCheckedCollection<?>) checkedSource;
-                return create(collection, source.isCutOff(), source.sizeUnchecked(), source.sizeOriginal());
-            }
-            else
-            {
-                return collection;
-            }
-        }
-        /**
-         * Helper method to create a {@link PermissionCheckedCollection} from an existing <code>Collection</code>
-         * 
-         * @param <TT>              the type of the <code>Collection</code>
-         * @param collection        the <code>Collection</code> to proxy
-         * @param isCutOff          <tt>true</tt> if permission checking was cut off before completion
-         * @param sizeUnchecked     number of entries from the original collection that were not checked
-         * @param sizeOriginal      number of entries in the original, pre-checked collection
-         * @return                  a <code>Collection</code> of the same type but including the
-         *                          {@link PermissionCheckedCollection} interface
-         */
-        @SuppressWarnings("unchecked")
-        public static final <TT> Collection<TT> create(
-                Collection<TT> collection,
-                boolean isCutOff, int sizeUnchecked, int sizeOriginal)
-        {
-            // Create the mixin
-            DelegatingIntroductionInterceptor mixin = new PermissionCheckedCollectionMixin<Integer>(
-                    isCutOff,
-                    sizeUnchecked,
-                    sizeOriginal
-                    );
-            // Create the advisor
-            IntroductionAdvisor advisor = new DefaultIntroductionAdvisor(mixin, PermissionCheckedCollection.class);
-            // Proxy
-            ProxyFactory pf = new ProxyFactory(collection);
-            pf.addAdvisor(advisor);
-            Object proxiedObject = pf.getProxy();
-            
-            // Done
-            return (Collection<TT>) proxiedObject;
-        }
-    }
-}
+package org.alfresco.repo.security.permissions;
+
+import java.util.Collection;
+
+import org.springframework.aop.IntroductionAdvisor;
+import org.springframework.aop.support.DefaultIntroductionAdvisor;
+import org.springframework.aop.support.DelegatingIntroductionInterceptor;
+
+/**
+ * Interface for collection-based results that carry extra information about the state of permission cut-offs.
+ *
+ * @author Derek Hulley
+ * @since 4.0
+ */
+public interface PermissionCheckedCollection<T>
+{
+    /**
+     * Check if the results have been truncated by permission check limits.
+     *
+     * @return <tt>true</tt> - if the results (usually a collection) have been cut off by permission check limits
+     */
+    boolean isCutOff();
+
+    /**
+     * Get the number of objects in the original (unfiltered) collection that did <b>not</b> have any permission checks.
+     *
+     * @return number of entries from the original collection that were not checked
+     */
+    int sizeUnchecked();
+
+    /**
+     * Get the number of objects in the original (unfiltered) collection.
+     *
+     * @return number of entries in the original, pre-checked collection
+     */
+    int sizeOriginal();
+
+    /**
+     * Helper 'introduction' to allow simple addition of the {@link PermissionCheckedCollection} interface to existing collections.
+     *
+     * @param <T>
+     *            the type of the <code>Collection</code> in use
+     *
+     * @author Derek Hulley
+     * @since 4.0
+     */
+    @SuppressWarnings("serial")
+    class PermissionCheckedCollectionMixin<T> extends DelegatingIntroductionInterceptor implements PermissionCheckedCollection<T>
+    {
+        private final boolean isCutOff;
+        private final int sizeUnchecked;
+        private final int sizeOriginal;
+
+        private PermissionCheckedCollectionMixin(boolean isCutOff, int sizeUnchecked, int sizeOriginal)
+        {
+            super();
+            this.isCutOff = isCutOff;
+            this.sizeUnchecked = sizeUnchecked;
+            this.sizeOriginal = sizeOriginal;
+        }
+
+        @Override
+        public boolean isCutOff()
+        {
+            return isCutOff;
+        }
+
+        @Override
+        public int sizeUnchecked()
+        {
+            return sizeUnchecked;
+        }
+
+        @Override
+        public int sizeOriginal()
+        {
+            return sizeOriginal;
+        }
+
+        /**
+         * Helper method to create a {@link PermissionCheckedCollection} from an existing <code>Collection</code> by applying the same values as present on a potentially permission-checked source. If the existing checked source is <b>NOT</b> permission-checked, then the collection will not be decorated.
+         *
+         * @param <TT>
+         *            the type of the <code>Collection</code>
+         * @param collection
+         *            the <code>Collection</code> to proxy
+         * @param checkedSource
+         *            a collection that might implement {@link PermissionCheckedCollection}
+         * @return a <code>Collection</code> of the same type but including the {@link PermissionCheckedCollection} interface
+         */
+        public static <TT> Collection<TT> create(
+                Collection<TT> collection, Collection<?> checkedSource)
+        {
+            if (checkedSource instanceof PermissionCheckedCollection)
+            {
+                PermissionCheckedCollection<?> source = (PermissionCheckedCollection<?>) checkedSource;
+                return create(collection, source.isCutOff(), source.sizeUnchecked(), source.sizeOriginal());
+            }
+            else
+            {
+                return collection;
+            }
+        }
+
+        /**
+         * Helper method to create a {@link PermissionCheckedCollection} from an existing <code>Collection</code>
+         *
+         * @param <TT>
+         *            the type of the <code>Collection</code>
+         * @param collection
+         *            the <code>Collection</code> to proxy
+         * @param isCutOff
+         *            <tt>true</tt> if permission checking was cut off before completion
+         * @param sizeUnchecked
+         *            number of entries from the original collection that were not checked
+         * @param sizeOriginal
+         *            number of entries in the original, pre-checked collection
+         * @return a <code>Collection</code> of the same type but including the {@link PermissionCheckedCollection} interface
+         */
+        @SuppressWarnings("unchecked")
+        public static <TT> Collection<TT> create(
+                Collection<TT> collection,
+                boolean isCutOff, int sizeUnchecked, int sizeOriginal)
+        {
+            // Create the mixin
+            DelegatingIntroductionInterceptor mixin = new PermissionCheckedCollectionMixin<>(
+                    isCutOff,
+                    sizeUnchecked,
+                    sizeOriginal);
+            // Create the advisor
+            IntroductionAdvisor advisor = new DefaultIntroductionAdvisor(mixin, PermissionCheckedCollection.class);
+            // Create Proxy
+            return (Collection<TT>) ProxyFactoryUtils.createProxy(collection, advisor);
+        }
+    }
+}

repository/src/main/java/org/alfresco/repo/security/permissions/ProxyFactoryUtils.java

@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2024 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.security.permissions;
+
+import java.util.Collection;
+import java.util.Deque;
+import java.util.List;
+
+import org.springframework.aop.IntroductionAdvisor;
+import org.springframework.aop.framework.ProxyFactory;
+
+class ProxyFactoryUtils
+{
+    private ProxyFactoryUtils()
+    {}
+
+    /**
+     * Delegate creation of {@link ProxyFactory} and proxy to have control over it in one place.
+     *
+     * @param collection
+     *            given collection for ProxyFactory.
+     * @param advisor
+     *            given advisor for ProxyFactory.
+     * @return the proxy object.
+     */
+    protected static Object createProxy(Collection<?> collection, IntroductionAdvisor advisor)
+    {
+        ProxyFactory pf = new ProxyFactory(collection);
+        pf.addAdvisor(advisor);
+        if (pf.isInterfaceProxied(List.class) && pf.isInterfaceProxied(Deque.class))
+        {
+            pf.removeInterface(Deque.class);
+        }
+        return pf.getProxy();
+    }
+}

scripts/ci/docker-compose/docker-compose.yaml

@@ -68,4 +68,4 @@ services:
     volumes:
       - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json
     ports:
-      - 8999:8080
+      - 8999:8080