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

This reverts commit 933aced67c.

.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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - id: changed-files
-        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v8.2.0
         with:
           write-list-to-env: true
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.2.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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v8.2.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.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
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v8.2.0
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
           repository: "Alfresco/veracode-baseline-archive"
@@ -142,9 +142,9 @@ 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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -270,7 +270,7 @@ jobs:
         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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }}
@@ -301,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -334,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: Run MariaDB ${{ matrix.version }} database
@@ -345,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.version }}
@@ -376,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -405,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run MariaDB 10.6 database"
@@ -416,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -447,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -476,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run MySQL 8 database"
@@ -487,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -518,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -546,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 13.12 database"
@@ -557,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -588,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -616,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 14.9 database"
@@ -627,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -658,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -686,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 15.4 database"
@@ -697,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -728,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -754,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -794,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -854,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Set transformers tag"
@@ -879,7 +879,7 @@ jobs:
         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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} ${{ matrix.idp }}
@@ -910,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -968,9 +968,9 @@ jobs:
       REQUIRES_LOCAL_IMAGES: true
     steps:
       - uses: actions/checkout@v4
-      - 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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -986,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.test-name }}
@@ -1024,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.tests.outcome }}
@@ -1050,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -1090,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -1124,9 +1124,9 @@ jobs:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
       - uses: actions/checkout@v4
-      - 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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1134,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (PostgreSQL) ${{ matrix.test-name }}
@@ -1170,9 +1170,9 @@ jobs:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
       - uses: actions/checkout@v4
-      - 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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1180,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (MySQL) ${{ matrix.test-name }}
@@ -1212,9 +1212,9 @@ jobs:
       REQUIRES_LOCAL_IMAGES: true
     steps:
       - uses: actions/checkout@v4
-      - 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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1228,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -1260,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.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -1302,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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.2.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.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/get-build-info@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.2.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.4.0.67</version>
+      <version>25.1.0.13</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.67</version>
+      <version>25.1.0.13</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.67</version>
+      <version>25.1.0.13</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.67</version>
+      <version>25.1.0.13</version>
    </parent>
 
    <modules>

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

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.4.0.67</version>
+      <version>25.1.0.13</version>
    </parent>
 
    <properties>

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

@@ -3,8 +3,8 @@
 #
 
 # Version label
-version.major=23
-version.minor=4
+version.major=25
+version.minor=1
 version.revision=0
 version.label=
 

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

@@ -33,14 +33,15 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAO;
-import org.alfresco.repo.domain.propval.PropertyStringValueEntity;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAO;
+import org.alfresco.repo.domain.propval.PropertyStringValueEntity;
+
 /**
  * RM V3.3 Hold audit entries values patch unit test
  *
@@ -55,7 +56,6 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
     @InjectMocks
     private RMv33HoldAuditEntryValuesPatch patch;
 
-
     @Before
     public void setUp()
     {
@@ -93,15 +93,15 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
         verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(deleteHoldPropertyStringValueEntity);
 
         assertEquals("Add To Hold", addToHoldPropertyStringValueEntity.getStringValue());
-        assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringLower());
+        assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringEndLower());
         assertEquals(Long.valueOf(770_786_109L), addToHoldPropertyStringValueEntity.getStringCrc());
 
         assertEquals("Remove From Hold", removeFromHoldPropertyStringValueEntity.getStringValue());
-        assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringLower());
+        assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringEndLower());
         assertEquals(Long.valueOf(2_967_613_012L), removeFromHoldPropertyStringValueEntity.getStringCrc());
 
         assertEquals("Delete Hold", deleteHoldPropertyStringValueEntity.getStringValue());
-        assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringLower());
+        assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringEndLower());
         assertEquals(Long.valueOf(132_640_810L), deleteHoldPropertyStringValueEntity.getStringCrc());
     }
 
@@ -123,5 +123,3 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
         verify(mockedRecordsManagementQueryDAO, times(0)).updatePropertyStringValueEntity(any());
     }
 }
-
-

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.67</version>
+        <version>25.1.0.13</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.67</version>
+        <version>25.1.0.13</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.67</version>
+        <version>25.1.0.13</version>
     </parent>
 
     <properties>

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.4.0.67</version>
+      <version>25.1.0.13</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.67</version>
+        <version>25.1.0.13</version>
     </parent>
 
     <properties>
@@ -118,6 +118,18 @@
             <groupId>org.jibx</groupId>
             <artifactId>jibx-run</artifactId>
             <version>1.4.2</version>
+            <exclusions>
+                <!-- [ACS-5371] Excluded to avoid conflict in JDK9+ as it includes javax.xml-->
+                <exclusion>
+                    <groupId>xpp3</groupId>
+                    <artifactId>xpp3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.kxml</groupId>
+            <artifactId>kxml2</artifactId>
+            <version>${dependency.kxml2.version}</version>
         </dependency>
         <dependency> 
             <groupId>com.fasterxml.jackson.core</groupId> 

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.67</version>
+        <version>25.1.0.13</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.67</version>
+        <version>25.1.0.13</version>
     </parent>
 </project>

packaging/distribution/src/main/resources/licenses/notice.txt

@@ -146,6 +146,7 @@ libgif  http://giflib.sourceforge.net/
 libfreetype http://www.freetype.org/
 PostgreSQL  http://www.postgresql.org/
 PostgreSQL JDBC Driver  http://www.postgresql.org/
+kXML 2 	http://kxml.sourceforge.net/
 
 
 === CDDL 1.0 ===

packaging/docker-alfresco/pom.xml

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

packaging/pom.xml

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

packaging/tests/pom.xml

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

packaging/tests/scripts/wait-for-alfresco-start.sh

@@ -55,4 +55,4 @@ else
    echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:"
    docker logs --tail=200 $ALFCONTAINER
    exit 1
-fi
+fi

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.67</version>
+        <version>25.1.0.13</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.67</version>
+        <version>25.1.0.13</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.67</version>
+        <version>25.1.0.13</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.67</version>
+        <version>25.1.0.13</version>
     </parent>
 
     <properties>
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>3.0.22</version>
+            <version>3.0.23</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/People.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2022 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 
@@ -29,6 +29,12 @@ import static io.restassured.RestAssured.given;
 
 import java.io.File;
 
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.response.ValidatableResponse;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+
 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
 import org.alfresco.rest.core.RestResponse;
@@ -56,12 +62,6 @@ import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.UserModel;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import io.restassured.response.ValidatableResponse;
 
 /**
  * Declares all Rest API under the /people path
@@ -97,9 +97,7 @@ public class People extends ModelRequest<People>
     }
 
     /**
-     * Retrieve list of activities for a specific person using GET call on "people/{personId}/activities"
-     * Please note that it retries to get the list of activities several times before returning the empty list. The list of activities are not displayed as
-     * they are created.
+     * Retrieve list of activities for a specific person using GET call on "people/{personId}/activities" Please note that it retries to get the list of activities several times before returning the empty list. The list of activities are not displayed as they are created.
      */
     public RestActivityModelsCollection getPersonActivitiesUntilEntriesCountIs(int expectedNoOfEntries)
     {
@@ -173,6 +171,15 @@ public class People extends ModelRequest<People>
         return restWrapper.processModel(RestPreferenceModel.class, request);
     }
 
+    /**
+     * Updates a specific preference of a specific person using PUT call on "people/{personId}/preferences/{preferenceName}"
+     */
+    public RestPreferenceModel updatePersonPreferenceInformation(String preferenceName, RestPreferenceModel preferenceModel)
+    {
+        RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, preferenceModel.toJson(), "people/{personId}/preferences/{preferenceName}", this.person.getUsername(), preferenceName);
+        return restWrapper.processModel(RestPreferenceModel.class, request);
+    }
+
     /**
      * Remove a specific site from favorite sites list of a person using DELETE call on "people/{personId}/favorite-sites/{siteId}"
      */
@@ -334,7 +341,7 @@ public class People extends ModelRequest<People>
      */
     public RestWrapper deleteSiteFromFavorites(SiteModel site)
     {
-        RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "people/{personId}/favorites/{favoriteId}", this.person.getUsername(), site.getGuid()); 
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "people/{personId}/favorites/{favoriteId}", this.person.getUsername(), site.getGuid());
         restWrapper.processEmptyModel(request);
         return restWrapper;
     }
@@ -379,7 +386,7 @@ public class People extends ModelRequest<People>
     public RestNetworkModel getNetwork(UserModel tenant)
     {
         Utility.checkObjectIsInitialized(tenant.getDomain(), "tenant.getDomain()");
-        String personId = tenant.getUsername().contains("-me-@")? "-me-" : tenant.getUsername();
+        String personId = tenant.getUsername().contains("-me-@") ? "-me-" : tenant.getUsername();
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/networks/{networkId}?{parameters}", personId, tenant.getDomain(), restWrapper.getParameters());
         return restWrapper.processModel(RestNetworkModel.class, request);
     }
@@ -410,10 +417,9 @@ public class People extends ModelRequest<People>
         RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, newPerson.toJson(), "people");
         return restWrapper.processModel(RestPersonModel.class, request);
     }
-    
+
     /**
-     * Get people avatar image using GET call on '/people/{personId}/avatar Please note that it retries to get the
-     * renditions response several times because on the alfresco server the rendition can take a while to be created.
+     * Get people avatar image using GET call on '/people/{personId}/avatar Please note that it retries to get the renditions response several times because on the alfresco server the rendition can take a while to be created.
      */
     public RestResponse downloadAvatarContent()
     {
@@ -456,17 +462,8 @@ public class People extends ModelRequest<People>
         return new WhereClause(this);
     }
 
-/**
-     * Construct the Where clause of getFavorites
-     * You can use the where parameter to restrict the list in the response to entries of a specific kind. The where parameter takes a value. The value is a
-     * single predicate that can include one or more EXISTS conditions. The EXISTS condition uses a single operand to limit the list to include entries that
-     * include that one property. The property values are:-
-     * target/file
-     * target/folder
-     * target/site
-     * Usage:
-     * where.. targetFileExist().or().targetSiteExist().filterAnd().getFavorites(...)
-     * At this point this method is working only with @link {@link RestFavoritesApi#getFavorites(UserModel) method.
+    /**
+     * Construct the Where clause of getFavorites You can use the where parameter to restrict the list in the response to entries of a specific kind. The where parameter takes a value. The value is a single predicate that can include one or more EXISTS conditions. The EXISTS condition uses a single operand to limit the list to include entries that include that one property. The property values are:- target/file target/folder target/site Usage: where.. targetFileExist().or().targetSiteExist().filterAnd().getFavorites(...) At this point this method is working only with @link {@link RestFavoritesApi#getFavorites(UserModel) method.
      * 
      * @author paul.brodner
      */

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceFullTests.java

@@ -1,5 +1,11 @@
 package org.alfresco.rest.people.preferences;
 
+import java.nio.file.Paths;
+
+import org.springframework.http.HttpStatus;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestPreferenceModel;
@@ -9,11 +15,6 @@ import org.alfresco.utility.model.*;
 import org.alfresco.utility.report.Bug;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.nio.file.Paths;
 
 public class GetPeoplePreferenceFullTests extends RestTest
 {
@@ -29,53 +30,53 @@ public class GetPeoplePreferenceFullTests extends RestTest
         dataSite.usingUser(userModel).usingSite(siteModel).addSiteToFavorites();
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Check that properties parameter is applied")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Check that properties parameter is applied")
     public void propertiesParameterIsAppliedWhenRetrievingPreference() throws Exception
     {
         restPreferenceModel = restClient.authenticateUser(userModel).withParams("properties=id").withCoreAPI().usingUser(userModel)
                 .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()));
         restClient.assertStatusCodeIs(HttpStatus.OK);
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()))
-            .and().field("value").isNull();
-        
+                .and().field("value").isNull();
+
         restPreferenceModel = restClient.authenticateUser(userModel).withParams("properties=id,value").withCoreAPI().usingUser(userModel)
                 .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()));
         restClient.assertStatusCodeIs(HttpStatus.OK);
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()))
-            .and().field("value").is("true");
-     }
-    
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Validate ID element in get site preference response")
+                .and().field("value").is("true");
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Validate ID element in get site preference response")
     public void validateIdElementInGetSitePreferenceResponse() throws Exception
     {
         restPreferenceModel = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()));
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()))
-            .and().field("value").is("true");
-     }
-    
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE, TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Validate ID element in get folder preference response")
+                .and().field("value").is("true");
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Validate ID element in get folder preference response")
     public void validateIdElementInGetFolderPreferenceResponse() throws Exception
     {
         FolderModel folderFavorite = new FolderModel("favoriteFolder");
         folderFavorite = dataContent.usingSite(siteModel).createFolder(folderFavorite);
         dataContent.getContentActions().setFolderAsFavorite(userModel.getUsername(), userModel.getPassword(), siteModel.getId(), folderFavorite.getName());
-        
+
         restPreferenceModel = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.FOLDERS_FAVORITES_PREFIX.toString());
         restPreferenceModel.assertThat().field("id").is(PreferenceName.FOLDERS_FAVORITES_PREFIX)
-            .and().field("value").is(Utility.removeLastSlash(Utility.buildPath("workspace://SpacesStore", folderFavorite.getNodeRef())));
-     }
-    
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE, TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Validate ID element in get file preference response")
+                .and().field("value").is(Utility.removeLastSlash(Utility.buildPath("workspace://SpacesStore", folderFavorite.getNodeRef())));
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Validate ID element in get file preference response")
     public void validateIdElementInGetFilePreferenceResponse() throws Exception
     {
         FileModel fileFavorite = new FileModel("favoriteFile", FileType.TEXT_PLAIN);
@@ -85,86 +86,86 @@ public class GetPeoplePreferenceFullTests extends RestTest
         restPreferenceModel = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.DOCUMENTS_FAVORITES_PREFIX.toString());
         restPreferenceModel.assertThat().field("id").is(PreferenceName.DOCUMENTS_FAVORITES_PREFIX)
-            .and().field("value").is(Utility.removeLastSlash(Utility.buildPath("workspace://SpacesStore", fileFavorite.getNodeRefWithoutVersion())));
-     }
-    
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Get preference of an user that has no preferences")
+                .and().field("value").is(Utility.removeLastSlash(Utility.buildPath("workspace://SpacesStore", fileFavorite.getNodeRefWithoutVersion())));
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Get preference of an user that has no preferences")
     public void getPreferenceForUserWithoutPreferences() throws Exception
     {
         UserModel newUser = dataUser.createRandomTestUser();
-        
+
         restPreferenceModel = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.DOCUMENTS_FAVORITES_PREFIX.toString());
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.DOCUMENTS_FAVORITES_PREFIX.toString()));
-        
+
         restPreferenceModel = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.FOLDERS_FAVORITES_PREFIX.toString());
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.FOLDERS_FAVORITES_PREFIX.toString()));
-        
+
         restPreferenceModel = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX.toString());
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.SITES_FAVORITES_PREFIX.toString()));
-     }
-    
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Change one preference for an user then perform get call")
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Change one preference for an user then perform get call")
     @Bug(id = "REPO-1922")
     public void changePreferenceThenPerformGetPreferenceCall() throws Exception
     {
         UserModel newUser = dataUser.createRandomTestUser();
         SiteModel site = dataSite.usingUser(newUser).createPublicRandomSite();
-        
+
         dataSite.usingUser(newUser).usingSite(site).addSiteToFavorites();
-        
+
         FileModel fileFavorite = new FileModel("favoriteFile", FileType.TEXT_PLAIN);
         fileFavorite = dataContent.usingSite(site).createContent(fileFavorite);
         dataContent.getContentActions().setFileAsFavorite(newUser.getUsername(), newUser.getPassword(), site.getId(), String.format("%s.%s", fileFavorite.getName(), fileFavorite.getFileType().extension));
-        
+
         FolderModel folderFavorite = new FolderModel("favoriteFolder");
         folderFavorite = dataContent.usingSite(site).createFolder(folderFavorite);
         dataContent.getContentActions().setFolderAsFavorite(newUser.getUsername(), newUser.getPassword(), site.getId(), folderFavorite.getName());
-        
+
         dataSite.usingUser(newUser).usingSite(site).removeSiteFromFavorites();
         dataContent.getContentActions().removeFavorite(newUser.getUsername(), newUser.getPassword(), site.getId(), folderFavorite.getName());
         dataContent.getContentActions().removeFavorite(newUser.getUsername(), newUser.getPassword(), site.getId(), Paths.get(fileFavorite.getCmisLocation()).getFileName().toString());
-        
+
         restPreferenceModel = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.FOLDERS_FAVORITES_PREFIX.toString());
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.FOLDERS_FAVORITES_PREFIX.toString()));
-        
+
         restPreferenceModel = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX.toString());
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.SITES_FAVORITES_PREFIX.toString()));
-        
+
         restPreferenceModel = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.DOCUMENTS_FAVORITES_PREFIX.toString());
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.DOCUMENTS_FAVORITES_PREFIX.toString()));
-        
+
         restPreferenceModel = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.FOLDERS_FAVORITES_PREFIX.toString());
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.FOLDERS_FAVORITES_PREFIX.toString()));
-     }
-    
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Verify admin is able to get preference of another user")
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify admin is able to get preference of another user")
     public void adminIsAbleToGetOtherUserPreference() throws Exception
     {
         restPreferenceModel = restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingUser(userModel)
@@ -172,18 +173,62 @@ public class GetPeoplePreferenceFullTests extends RestTest
         restClient.assertStatusCodeIs(HttpStatus.OK);
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId())).and().field("value").is("true");
     }
-    
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Verify regular user is not able to get preference of admin user")
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify regular user is not able to get preference of admin user")
     public void regularUserIsNotAbleToGetAdminPreference() throws Exception
     {
         SiteModel newSite = dataSite.usingUser(dataUser.getAdminUser()).createPublicRandomSite();
         dataSite.usingUser(dataUser.getAdminUser()).usingSite(newSite).addSiteToFavorites();
-        
+
         restClient.authenticateUser(userModel).withCoreAPI().usingUser(dataUser.getAdminUser())
                 .getPersonPreferenceInformation(PreferenceName.SITES_FAVORITES_PREFIX + newSite.getId());
         restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN);
         restClient.assertLastError().containsSummary(RestErrorModel.PERMISSION_WAS_DENIED);
     }
-}
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify regular user is able to change own preferences")
+    public void regularUserIsAbleToChangeOwnPreference() throws Exception
+    {
+        var newUser = dataUser.createRandomTestUser();
+        var newSite = dataSite.usingUser(newUser).createPublicRandomSite();
+        var preferenceId = String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), newSite.getId());
+        var updatedPreferenceModel = new RestPreferenceModel();
+        updatedPreferenceModel.setId(preferenceId);
+        updatedPreferenceModel.setValue("");
+
+        dataSite.usingUser(newUser).usingSite(newSite).addSiteToFavorites();
+        restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
+                .getPersonPreferenceInformation(preferenceId);
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+
+        restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser().updatePersonPreferenceInformation(preferenceId, updatedPreferenceModel);
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+        var personPreferences = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser().getPersonPreferences();
+        personPreferences.assertThat().entriesListDoesNotContain("id", preferenceId);
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify admin is not able to change regular user preferences")
+    public void adminIsNotAbleToChangeRegularUserPreference() throws Exception
+    {
+        var newUser = dataUser.createRandomTestUser();
+        var newSite = dataSite.usingUser(newUser).createPublicRandomSite();
+        var preferenceId = String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), newSite.getId());
+        var updatedPreferenceModel = new RestPreferenceModel();
+        updatedPreferenceModel.setId(preferenceId);
+        updatedPreferenceModel.setValue("");
+
+        dataSite.usingUser(newUser).usingSite(newSite).addSiteToFavorites();
+        restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
+                .getPersonPreferenceInformation(preferenceId);
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+
+        restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingUser(newUser).updatePersonPreferenceInformation(preferenceId, updatedPreferenceModel);
+        restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND);
+    }
+}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceSanityTests.java

@@ -1,7 +1,10 @@
 package org.alfresco.rest.people.preferences;
 
+import org.springframework.http.HttpStatus;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestPreferenceModel;
 import org.alfresco.utility.constants.PreferenceName;
 import org.alfresco.utility.constants.UserRole;
@@ -10,9 +13,6 @@ 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.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 /**
  * Tests for Get a Peference (/people/{personId}/preferences/{preferenceName}) RestAPI call
@@ -33,8 +33,8 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         siteModel = dataSite.usingUser(userModel).createPublicRandomSite();
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.SANITY, description = "Verify manager user gets a specific preference with Rest API and response is successful (200)")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify manager user gets a specific preference with Rest API and response is successful (200)")
     public void managerUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel managerUser = dataUser.usingAdmin().createRandomTestUser();
@@ -47,8 +47,8 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId())).and().field("value").is("true");
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.SANITY, description = "Verify collaborator user gets a specific preference with Rest API and response is successful (200)")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify collaborator user gets a specific preference with Rest API and response is successful (200)")
     public void collaboratorUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel collaboratorUser = dataUser.usingAdmin().createRandomTestUser();
@@ -61,8 +61,24 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId())).and().field("value").is("true");
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.SANITY, description = "Verify contributor user gets a specific preference with Rest API and response is successful (200)")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify collaborator user gets a specific preference with Rest API and response is successful (200)")
+    public void collaboratorUserUpdatesAPreferenceWithSuccess() throws Exception
+    {
+        UserModel collaboratorUser = dataUser.usingAdmin().createRandomTestUser();
+
+        var updatedRestPreferenceModel = new RestPreferenceModel();
+        updatedRestPreferenceModel.setId("user.preference");
+        updatedRestPreferenceModel.setValue("user.value");
+
+        restPreferenceModel = restClient.authenticateUser(collaboratorUser).withCoreAPI().usingAuthUser()
+                .updatePersonPreferenceInformation(updatedRestPreferenceModel.getId(), updatedRestPreferenceModel);
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+        restPreferenceModel.assertThat().field("id").is("user.preference").and().field("value").is("user.value");
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify contributor user gets a specific preference with Rest API and response is successful (200)")
     public void contributorUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser();
@@ -75,8 +91,8 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId())).and().field("value").is("true");
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY })
-    @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE, TestGroup.PREFERENCES }, executionType = ExecutionType.SANITY, description = "Verify consumer user gets a specific preference with Rest API and response is successful (200)")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify consumer user gets a specific preference with Rest API and response is successful (200)")
     public void consumerUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel consumerUser = dataUser.usingAdmin().createRandomTestUser();
@@ -84,13 +100,13 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         dataSite.usingUser(consumerUser).usingSite(siteModel).addSiteToFavorites();
 
         restPreferenceModel = restClient.authenticateUser(consumerUser).withCoreAPI().usingAuthUser()
-                .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(),siteModel.getId()));
+                .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()));
         restClient.assertStatusCodeIs(HttpStatus.OK);
-        restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(),siteModel.getId())).and().field("value").is("true");
+        restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId())).and().field("value").is("true");
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.SANITY, description = "Verify admin user gets a specific preference with Rest API and response is successful (200)")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify admin user gets a specific preference with Rest API and response is successful (200)")
     public void adminUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel adminUser = dataUser.getAdminUser();
@@ -102,9 +118,9 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId())).and().field("value").is("true");
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.SANITY, description = "Verify manager user is NOT Authorized to get a specific preference with Rest API when authentication fails (401)")
-//    @Bug(id = "MNT-16904", description = "fails only on environment with tenants")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify manager user is NOT Authorized to get a specific preference with Rest API when authentication fails (401)")
+    // @Bug(id = "MNT-16904", description = "fails only on environment with tenants")
     public void managerUserNotAuthorizedFailsToGetsAPreference() throws Exception
     {
         UserModel managerUser = dataUser.usingAdmin().createRandomTestUser();

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.67</version>
+        <version>25.1.0.13</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.67</version>
+        <version>25.1.0.13</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.67</version>
+    <version>25.1.0.13</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -23,8 +23,8 @@
     </modules>
 
     <properties>
-        <acs.version.major>23</acs.version.major>
-        <acs.version.minor>4</acs.version.minor>
+        <acs.version.major>25</acs.version.major>
+        <acs.version.minor>1</acs.version.minor>
         <acs.version.revision>0</acs.version.revision>
         <acs.version.label />
         <amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -54,7 +54,7 @@
         <dependency.alfresco-transform-core.version>5.1.5</dependency.alfresco-transform-core.version>
         <dependency.alfresco-transform-service.version>4.1.5</dependency.alfresco-transform-service.version>
         <dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.33</dependency.acs-event-model.version>
+        <dependency.acs-event-model.version>1.0.2</dependency.acs-event-model.version>
 
         <dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
         <dependency.spring.version>6.1.14</dependency.spring.version>
@@ -64,38 +64,39 @@
         <dependency.cxf.version>4.0.5</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
         <dependency.webscripts.version>9.4</dependency.webscripts.version>
-        <dependency.bouncycastle.version>1.78.1</dependency.bouncycastle.version>
+        <dependency.bouncycastle.version>1.79</dependency.bouncycastle.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.17.0</dependency.commons-io.version>
+        <dependency.commons-io.version>2.18.0</dependency.commons-io.version>
         <dependency.gson.version>2.11.0</dependency.gson.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>
+        <dependency.httpcomponents-httpclient5.version>5.4.1</dependency.httpcomponents-httpclient5.version>
         <dependency.httpcomponents-httpcore5.version>5.3</dependency.httpcomponents-httpcore5.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
         <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
         <dependency.slf4j.version>2.0.16</dependency.slf4j.version>
         <dependency.log4j.version>2.23.1</dependency.log4j.version>
-        <dependency.groovy.version>3.0.22</dependency.groovy.version>
+        <dependency.groovy.version>3.0.23</dependency.groovy.version>
         <dependency.tika.version>2.9.2</dependency.tika.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>5.3.0</dependency.poi.version>
         <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
         <dependency.camel.version>4.6.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
         <dependency.netty.version>4.1.113.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
-        <dependency.activemq.version>5.18.3</dependency.activemq.version>
+        <dependency.activemq.version>5.18.6</dependency.activemq.version>
         <dependency.apache-compress.version>1.27.1</dependency.apache-compress.version>
         <dependency.awaitility.version>4.2.2</dependency.awaitility.version>
         <dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.version>
-        <dependency.swagger-parser.version>1.0.71</dependency.swagger-parser.version>
+        <dependency.swagger-parser.version>1.0.72</dependency.swagger-parser.version>
         <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
         <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
         <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
         <dependency.pooled-jms.version>3.1.6</dependency.pooled-jms.version>
+        <dependency.kxml2.version>2.3.0</dependency.kxml2.version>
 
         <dependency.jakarta-ee-jaxb-api.version>4.0.2</dependency.jakarta-ee-jaxb-api.version>
         <dependency.jakarta-ee-jaxb-impl.version>4.0.5</dependency.jakarta-ee-jaxb-impl.version>
@@ -154,7 +155,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.67</tag>
+        <tag>25.1.0.13</tag>
     </scm>
 
     <distributionManagement>
@@ -371,7 +372,7 @@
             <dependency>
                 <groupId>org.quartz-scheduler</groupId>
                 <artifactId>quartz</artifactId>
-                <version>2.3.2</version>
+                <version>2.5.0</version>
                 <!-- exclude c3p0 -->
                 <!-- see https://issues.alfresco.com/jira/browse/REPO-3447 -->
                 <exclusions>
@@ -465,7 +466,7 @@
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
-                <version>5.2.1</version>
+                <version>5.2.2</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -703,7 +704,7 @@
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>json-schema-validator</artifactId>
-                <version>1.5.1</version>
+                <version>1.5.4</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -950,7 +951,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.34</version>
+                <version>1.18.36</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -1015,7 +1016,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>3.5.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -1028,7 +1029,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.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.67</version>
+        <version>25.1.0.13</version>
     </parent>
 
     <dependencies>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
-            <version>4.0.2</version>
+            <version>4.0.3</version>
         </dependency>
         <!-- newer version, see REPO-3133 -->
         <dependency>
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>11.0.15</version>
+            <version>11.0.24</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

remote-api/src/main/java/org/alfresco/rest/api/Preferences.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * 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,14 +23,17 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.rest.api;
-
-import org.alfresco.rest.api.model.Preference;
-import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
-import org.alfresco.rest.framework.resource.parameters.Paging;
-
-public interface Preferences
-{
-	public Preference getPreference(String personId, String preferenceName);
-	public CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging);
-}
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.Preference;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+
+public interface Preferences
+{
+    Preference getPreference(String personId, String preferenceName);
+
+    CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging);
+
+    Preference updatePreference(String personId, Preference preference);
+}

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

@@ -85,7 +85,7 @@ public class AuditImpl implements Audit
 
     // list of equals filter's auditEntry (via where clause)
     private final static Set<String> LIST_AUDIT_ENTRY_EQUALS_QUERY_PROPERTIES = new HashSet<>(
-            Arrays.asList(new String[] { CREATED_BY_USER, VALUES_KEY, VALUES_VALUE }));
+            Arrays.asList(new String[]{CREATED_BY_USER, VALUES_KEY, VALUES_VALUE}));
 
     // map of sort parameters for the moment one createdAt
     private final static Map<String, String> SORT_PARAMS_TO_NAMES;
@@ -295,23 +295,29 @@ public class AuditImpl implements Audit
         }
         else
         {
-            if (hasMoreItems) {
-                if (q != null) {
+            if (hasMoreItems)
+            {
+                if (q != null)
+                {
                     // filtering via "where" clause
                     AuditEntryQueryWalker propertyWalker = new AuditEntryQueryWalker();
                     QueryHelper.walk(q, propertyWalker);
                     totalItems = getAuditEntriesCountByAppAndProperties(auditApplication, propertyWalker);
-                } else {
+                }
+                else
+                {
                     totalItems = getAuditEntriesCountByApp(auditApplication);
                 }
-            } else {
+            }
+            else
+            {
                 totalItems = totalRetrievedItems;
             }
         }
 
         entriesAudit = (skipCount >= totalRetrievedItems)
-                        ? Collections.emptyList()
-                        : entriesAudit.subList(skipCount, end);
+                ? Collections.emptyList()
+                : entriesAudit.subList(skipCount, end);
         return CollectionWithPagingInfo.asPaged(paging, entriesAudit, hasMoreItems, totalItems);
     }
 
@@ -475,8 +481,7 @@ public class AuditImpl implements Audit
         final Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
 
         // create the callback for auditQuery method
-        final AuditQueryCallback callback = new AuditQueryCallback()
-        {
+        final AuditQueryCallback callback = new AuditQueryCallback() {
             public boolean valuesRequired()
             {
                 return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
@@ -532,7 +537,7 @@ public class AuditImpl implements Audit
         params.setApplicationName(auditApplication.getName());
         params.setFromId(auditEntryId);
         params.setToId(auditEntryId + 1);
-        
+
         List<String> includeParam = new ArrayList<>();
         if (parameters != null)
         {
@@ -545,8 +550,7 @@ public class AuditImpl implements Audit
         final List<AuditEntry> results = new ArrayList<>();
 
         // create the callback for auditQuery method
-        final AuditQueryCallback callback = new AuditQueryCallback()
-        {
+        final AuditQueryCallback callback = new AuditQueryCallback() {
             public boolean valuesRequired()
             {
                 return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
@@ -710,8 +714,7 @@ public class AuditImpl implements Audit
     @Override
     public CollectionWithPagingInfo<AuditEntry> listAuditEntriesByNodeId(String nodeId, Parameters parameters)
     {
-        AuthenticationUtil.runAs(new RunAsWork<Void>()
-        {
+        AuthenticationUtil.runAs(new RunAsWork<Void>() {
             public Void doWork() throws Exception
             {
                 checkEnabled();
@@ -772,8 +775,7 @@ public class AuditImpl implements Audit
         final List<AuditEntry> results = new ArrayList<>();
 
         String auditAppId = "alfresco-access";
-        String auditApplicationName = AuthenticationUtil.runAs(new RunAsWork<String>()
-        {
+        String auditApplicationName = AuthenticationUtil.runAs(new RunAsWork<String>() {
             public String doWork() throws Exception
             {
                 return findAuditAppByIdOr404(auditAppId).getName();
@@ -781,8 +783,7 @@ public class AuditImpl implements Audit
         }, AuthenticationUtil.getSystemUserName());
 
         // create the callback for auditQuery method
-        final AuditQueryCallback callback = new AuditQueryCallback()
-        {
+        final AuditQueryCallback callback = new AuditQueryCallback() {
             public boolean valuesRequired()
             {
                 return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
@@ -808,8 +809,7 @@ public class AuditImpl implements Audit
         Long toTime = propertyWalker.getToTime();
         validateWhereBetween(nodeRef.getId(), fromTime, toTime);
 
-        AuthenticationUtil.runAs(new RunAsWork<Object>()
-        {
+        AuthenticationUtil.runAs(new RunAsWork<Object>() {
             public Object doWork() throws Exception
             {
                 // QueryParameters
@@ -820,7 +820,7 @@ public class AuditImpl implements Audit
                 pathParams.setFromTime(fromTime);
                 pathParams.setToTime(toTime);
                 pathParams.setApplicationName(auditApplicationName);
-                pathParams.addSearchKey("/"+auditAppId+"/transaction/path", nodePath);
+                pathParams.addSearchKey("/" + auditAppId + "/transaction/path", nodePath);
                 auditService.auditQuery(callback, pathParams, limit);
 
                 AuditQueryParameters copyFromPathParams = new AuditQueryParameters();
@@ -830,7 +830,7 @@ public class AuditImpl implements Audit
                 copyFromPathParams.setFromTime(fromTime);
                 copyFromPathParams.setToTime(toTime);
                 copyFromPathParams.setApplicationName(auditApplicationName);
-                copyFromPathParams.addSearchKey("/"+auditAppId+"/transaction/copy/from/path", nodePath);
+                copyFromPathParams.addSearchKey("/" + auditAppId + "/transaction/copy/from/path", nodePath);
                 auditService.auditQuery(callback, copyFromPathParams, limit);
 
                 AuditQueryParameters moveFromPathParams = new AuditQueryParameters();
@@ -840,7 +840,7 @@ public class AuditImpl implements Audit
                 moveFromPathParams.setFromTime(fromTime);
                 moveFromPathParams.setToTime(toTime);
                 moveFromPathParams.setApplicationName(auditApplicationName);
-                moveFromPathParams.addSearchKey("/"+auditAppId+"/transaction/move/from/path", nodePath);
+                moveFromPathParams.addSearchKey("/" + auditAppId + "/transaction/move/from/path", nodePath);
                 auditService.auditQuery(callback, moveFromPathParams, limit);
 
                 return null;
@@ -857,7 +857,7 @@ public class AuditImpl implements Audit
 
         public AuditEntriesByNodeIdQueryWalker()
         {
-            super(new HashSet<>(Arrays.asList(new String[] { CREATED_BY_USER })), null);
+            super(new HashSet<>(Arrays.asList(new String[]{CREATED_BY_USER})), null);
         }
 
         @Override
@@ -904,19 +904,22 @@ public class AuditImpl implements Audit
     public int getAuditEntriesCountByApp(AuditService.AuditApplication auditApplication)
     {
         final String applicationName = auditApplication.getKey().substring(1);
+
         return auditService.getAuditEntriesCountByApp(applicationName);
     }
 
     public int getAuditEntriesCountByAppAndProperties(AuditService.AuditApplication auditApplication, AuditEntryQueryWalker propertyWalker)
     {
+        final String applicationName = auditApplication.getKey().substring(1);
+
         AuditQueryParameters parameters = new AuditQueryParameters();
-        parameters.setApplicationName(auditApplication.getName());
+        parameters.setApplicationName(applicationName);
         parameters.setFromTime(propertyWalker.getFromTime());
         parameters.setToTime(propertyWalker.getToTime());
         parameters.setFromId(propertyWalker.getFromId());
         parameters.setToId(propertyWalker.getToId());
         parameters.setUser(propertyWalker.getCreatedByUser());
 
-        return auditService.getAuditEntriesCountByAppAndProperties(parameters);
+        return auditService.getAuditEntriesCountByAppAndProperties(applicationName, parameters);
     }
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * 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,69 +23,92 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.rest.api.impl;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.alfresco.query.PagingResults;
-import org.alfresco.rest.api.People;
-import org.alfresco.rest.api.Preferences;
-import org.alfresco.rest.api.model.Preference;
-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.service.cmr.preference.PreferenceService;
-import org.alfresco.util.Pair;
-
-/**
- * Centralises access to preference services and maps between representations.
- * 
- * @author steveglover
- * @since publicapi1.0
- */
-public class PreferencesImpl implements Preferences
-{
-	private People people;
-    private PreferenceService preferenceService;
-    
-	public void setPeople(People people)
-	{
-		this.people = people;
-	}
-
-	public void setPreferenceService(PreferenceService preferenceService)
-	{
-		this.preferenceService = preferenceService;
-	}
-
-	public Preference getPreference(String personId, String preferenceName)
-	{
-		personId = people.validatePerson(personId);
-		Serializable preferenceValue = preferenceService.getPreference(personId, preferenceName);
-		if(preferenceValue != null)
-		{
-			return new Preference(preferenceName, preferenceValue);
-		}
-		else
-		{
-			throw new RelationshipResourceNotFoundException(personId, preferenceName);
-		}
-	}
-	
-	public CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging)
-	{
-		personId = people.validatePerson(personId);
-
-		PagingResults<Pair<String, Serializable>> preferences = preferenceService.getPagedPreferences(personId, null, Util.getPagingRequest(paging));
-		List<Preference> ret = new ArrayList<Preference>(preferences.getPage().size());
-		for(Pair<String, Serializable> prefEntity : preferences.getPage())
-		{
-			Preference pref = new Preference(prefEntity.getFirst(), prefEntity.getSecond());
-			ret.add(pref);
-		}
-
-        return CollectionWithPagingInfo.asPaged(paging, ret, preferences.hasMoreItems(), preferences.getTotalResultCount().getFirst());
-	}
-}
+package org.alfresco.rest.api.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.Preferences;
+import org.alfresco.rest.api.model.Preference;
+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.service.cmr.preference.PreferenceService;
+import org.alfresco.util.Pair;
+
+/**
+ * Centralises access to preference services and maps between representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class PreferencesImpl implements Preferences
+{
+    private People people;
+    private PreferenceService preferenceService;
+
+    public void setPeople(People people)
+    {
+        this.people = people;
+    }
+
+    public void setPreferenceService(PreferenceService preferenceService)
+    {
+        this.preferenceService = preferenceService;
+    }
+
+    @Override
+    public Preference getPreference(String personId, String preferenceName)
+    {
+        personId = people.validatePerson(personId);
+        Serializable preferenceValue = preferenceService.getPreference(personId, preferenceName);
+        if (preferenceValue != null)
+        {
+            return new Preference(preferenceName, preferenceValue);
+        }
+        else
+        {
+            throw new RelationshipResourceNotFoundException(personId, preferenceName);
+        }
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging)
+    {
+        personId = people.validatePerson(personId);
+
+        PagingResults<Pair<String, Serializable>> preferences = preferenceService.getPagedPreferences(personId, null, Util.getPagingRequest(paging));
+        List<Preference> ret = new ArrayList<>(preferences.getPage().size());
+        for (Pair<String, Serializable> prefEntity : preferences.getPage())
+        {
+            Preference pref = new Preference(prefEntity.getFirst(), prefEntity.getSecond());
+            ret.add(pref);
+        }
+
+        return CollectionWithPagingInfo.asPaged(paging, ret, preferences.hasMoreItems(), preferences.getTotalResultCount().getFirst());
+    }
+
+    @Override
+    public Preference updatePreference(String personId, Preference preference)
+    {
+        personId = people.validatePerson(personId, true);
+        final Map<String, Serializable> preferencesToSet;
+        if (preference.getValue() == null || "".equals(preference.getValue()))
+        {
+            preferencesToSet = new HashMap<>(1);
+            preferencesToSet.put(preference.getName(), null);
+        }
+        else
+        {
+            preferencesToSet = Map.of(preference.getName(), preference.getValue());
+        }
+
+        preferenceService.setPreferences(personId, preferencesToSet);
+        return new Preference(preference.getName(), preferenceService.getPreference(personId, preference.getName()));
+    }
+}

remote-api/src/main/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java

@@ -1,93 +1,105 @@
-/*
- * #%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.people;
-
-import org.alfresco.rest.api.Preferences;
-import org.alfresco.rest.api.model.Preference;
-import org.alfresco.rest.framework.WebApiDescription;
-import org.alfresco.rest.framework.resource.RelationshipResource;
-import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
-import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
-import org.alfresco.rest.framework.resource.parameters.Parameters;
-import org.alfresco.util.ParameterCheck;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
-
-@RelationshipResource(name = "preferences", entityResource = PeopleEntityResource.class, title = "Person Preferences")
-public class PersonPreferencesRelation implements RelationshipResourceAction.Read<Preference>, RelationshipResourceAction.ReadById<Preference>, InitializingBean
-{
-    private static final Log logger = LogFactory.getLog(PersonPreferencesRelation.class);
-
-    private Preferences preferences;
-
-	public void setPreferences(Preferences preferences)
-	{
-		this.preferences = preferences;
-	}
-
-	@Override
-    public void afterPropertiesSet()
-    {
-        ParameterCheck.mandatory("preferences", this.preferences);
-    }
-	
-	/**
-	 * Returns a paged list of preferences for the user personId.
-	 * 
-	 * If personId does not exist, NotFoundException (status 404).
-	 * 
-	 * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
-	 */
-    @Override
-    @WebApiDescription(title = "A paged list of the persons preferences.")
-    public CollectionWithPagingInfo<Preference> readAll(String personId, Parameters parameters)
-	{
-    	return preferences.getPreferences(personId, parameters.getPaging());
-	}
-    
-	/**
-	 * Returns information regarding the preference 'preferenceName' for user personId.
-	 * 
-	 * If personId does not exist, NotFoundException (status 404).
-	 * 
-	 * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.ReadById#readById(String, String, org.alfresco.rest.framework.resource.parameters.Parameters)
-	 */
-    @Override
-    @WebApiDescription(title = "Preference value for preference 'preferenceName' for person 'personId'.")
-    public Preference readById(String personId, String preferenceName, Parameters parameters)
-	{
-        // fix for REPO-855
-		String url = parameters.getRequest().getURL();
-		if(url.matches(".*workspace://SpacesStore/.*")){
-            preferenceName += url.substring(url.indexOf("//SpacesStore/"));
-        }
-		//
-
-    	return preferences.getPreference(personId, preferenceName);
-	}
-
-}
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * 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.api.people;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+import org.alfresco.rest.api.Preferences;
+import org.alfresco.rest.api.model.Preference;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+
+@RelationshipResource(name = "preferences", entityResource = PeopleEntityResource.class, title = "Person Preferences")
+public class PersonPreferencesRelation implements RelationshipResourceAction.Read<Preference>, RelationshipResourceAction.ReadById<Preference>, RelationshipResourceAction.Update<Preference>, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(PersonPreferencesRelation.class);
+
+    private Preferences preferences;
+
+    public void setPreferences(Preferences preferences)
+    {
+        this.preferences = preferences;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("preferences", this.preferences);
+    }
+
+    /**
+     * Returns a paged list of preferences for the user personId.
+     * 
+     * If personId does not exist, NotFoundException (status 404).
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "A paged list of the persons preferences.")
+    public CollectionWithPagingInfo<Preference> readAll(String personId, Parameters parameters)
+    {
+        return preferences.getPreferences(personId, parameters.getPaging());
+    }
+
+    /**
+     * Returns information regarding the preference 'preferenceName' for user personId.
+     * 
+     * If personId does not exist, NotFoundException (status 404).
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.ReadById#readById(String, String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Preference value for preference 'preferenceName' for person 'personId'.")
+    public Preference readById(String personId, String preferenceName, Parameters parameters)
+    {
+        // fix for REPO-855
+        String url = parameters.getRequest().getURL();
+        if (url.matches(".*workspace://SpacesStore/.*"))
+        {
+            preferenceName += url.substring(url.indexOf("//SpacesStore/"));
+        }
+        //
+
+        return preferences.getPreference(personId, preferenceName);
+    }
+
+    @Override
+    public Preference update(String personId, Preference preference, Parameters parameters)
+    {
+        if (preference.getName() == null || preference.getName().isBlank())
+        {
+            throw new InvalidArgumentException();
+        }
+        return preferences.updatePreference(personId, preference);
+    }
+}

remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2020 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 
@@ -30,6 +30,15 @@ import java.io.InputStream;
 import java.util.Locale;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.rest.framework.core.ResourceLocator;
 import org.alfresco.rest.framework.core.ResourceMetadata;
@@ -47,14 +56,7 @@ import org.alfresco.rest.framework.resource.parameters.Params;
 import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams;
 import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
 import org.alfresco.rest.framework.tools.RequestReader;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.extensions.webscripts.WebScriptRequest;
-import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
-import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
+
 /**
  * Handles the HTTP PUT for a Resource, equivalent to CRUD Update
  * 
@@ -64,15 +66,15 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
         RecognizedParamsExtractor, RequestReader
 {
 
-    private static Log logger = LogFactory.getLog(ResourceWebScriptPut.class);
-    
+    private static final Log logger = LogFactory.getLog(ResourceWebScriptPut.class);
+
     public ResourceWebScriptPut()
     {
-       super();
-       setHttpMethod(HttpMethod.PUT);
-       setParamsExtractor(this);
+        super();
+        setHttpMethod(HttpMethod.PUT);
+        setParamsExtractor(this);
     }
-    
+
     @Override
     public Params extractParams(ResourceMetadata resourceMeta, WebScriptRequest req)
     {
@@ -86,81 +88,87 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
 
         switch (resourceMeta.getType())
         {
-            case ENTITY:
-                if (StringUtils.isBlank(entityId))
-                {
-                    throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");                  
-                } else
-                {
+        case ENTITY:
+            if (StringUtils.isBlank(entityId))
+            {
+                throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");
+            }
+            else
+            {
 
-                    Object putEnt = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
-                    return Params.valueOf(entityId,params,putEnt, req);
-                }
-            case RELATIONSHIP:
-                if (StringUtils.isBlank(relationshipId))
+                Object putEnt = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
+                return Params.valueOf(entityId, params, putEnt, req);
+            }
+        case RELATIONSHIP:
+            if (StringUtils.isBlank(relationshipId))
+            {
+                throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");
+            }
+            Object putRel = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
+            if (StringUtils.isNotBlank(relationship2Id))
+            {
+                ResourceWebScriptHelper.setUniqueId(putRel, relationship2Id);
+                return Params.valueOf(false, entityId, relationshipId, relationship2Id,
+                        putRel, null, null, params, null, req);
+            }
+            else
+            {
+                ResourceWebScriptHelper.setUniqueId(putRel, relationshipId);
+                return Params.valueOf(entityId, relationshipId, params, putRel, req);
+            }
+        case PROPERTY:
+            final String resourceName = resourceVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
+            final String propertyName = resourceVars.get(ResourceLocator.PROPERTY);
+
+            if (StringUtils.isNotBlank(entityId) && StringUtils.isNotBlank(resourceName))
+            {
+                if (StringUtils.isNotBlank(propertyName))
                 {
-                    throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");                  
-                }
-                Object putRel = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
-                if (StringUtils.isNotBlank(relationship2Id))
-                {
-                    ResourceWebScriptHelper.setUniqueId(putRel, relationship2Id);
-                    return Params.valueOf(false, entityId, relationshipId, relationship2Id,
-                            putRel, null, null, params, null, req);
+                    return Params.valueOf(entityId, relationshipId, null, getStream(req), propertyName, params, getContentInfo(req), req);
                 }
                 else
                 {
-                    ResourceWebScriptHelper.setUniqueId(putRel,relationshipId);
-                    return Params.valueOf(entityId, params, putRel, req);
+                    return Params.valueOf(entityId, null, null, getStream(req), resourceName, params, getContentInfo(req), req);
                 }
-            case PROPERTY:
-                final String resourceName = resourceVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
-                final String propertyName = resourceVars.get(ResourceLocator.PROPERTY);
 
-                if (StringUtils.isNotBlank(entityId) && StringUtils.isNotBlank(resourceName))
-                {
-                    if (StringUtils.isNotBlank(propertyName))
-                    {
-                        return Params.valueOf(entityId, relationshipId, null, getStream(req), propertyName, params, getContentInfo(req), req);
-                    }
-                    else
-                    {
-                        return Params.valueOf(entityId, null, null, getStream(req), resourceName, params, getContentInfo(req), req);
-                    }
-
-                }
-                //Fall through to unsupported.
-            default:
-                throw new UnsupportedResourceOperationException("PUT not supported for this request.");
+            }
+            // Fall through to unsupported.
+        default:
+            throw new UnsupportedResourceOperationException("PUT not supported for this request.");
         }
     }
 
-	/**
+    /**
      * Returns the basic content info from the request.
-     * @param req WebScriptRequest
+     * 
+     * @param req
+     *            WebScriptRequest
      * @return BasicContentInfo
      */
-    private BasicContentInfo getContentInfo(WebScriptRequest req) {
-    	
-		String encoding = "UTF-8";
-		String contentType = MimetypeMap.MIMETYPE_BINARY;
-		
-		if (StringUtils.isNotEmpty(req.getContentType()))
-		{
-			MediaType media = MediaType.parseMediaType(req.getContentType());
-			contentType = media.getType()+'/'+media.getSubtype();
-			if (media.getCharset() != null)
-			{
-				encoding = media.getCharset().toString();
-			}			
-		}
+    private BasicContentInfo getContentInfo(WebScriptRequest req)
+    {
+
+        String encoding = "UTF-8";
+        String contentType = MimetypeMap.MIMETYPE_BINARY;
+
+        if (StringUtils.isNotEmpty(req.getContentType()))
+        {
+            MediaType media = MediaType.parseMediaType(req.getContentType());
+            contentType = media.getType() + '/' + media.getSubtype();
+            if (media.getCharset() != null)
+            {
+                encoding = media.getCharset().toString();
+            }
+        }
 
         return new ContentInfoImpl(contentType, encoding, -1, Locale.getDefault());
-	}
+    }
 
-	/**
+    /**
      * Returns the input stream for the request
-     * @param req WebScriptRequest
+     * 
+     * @param req
+     *            WebScriptRequest
      * @return InputStream
      */
     private InputStream getStream(WebScriptRequest req)
@@ -186,11 +194,14 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
 
         return null;
     }
-    
+
     /**
      * Executes the action on the resource
-     * @param resource ResourceWithMetadata
-     * @param params parameters to use
+     * 
+     * @param resource
+     *            ResourceWithMetadata
+     * @param params
+     *            parameters to use
      * @return anObject the result of the execute
      */
     @Override
@@ -198,87 +209,87 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
     {
         switch (resource.getMetaData().getType())
         {
-            case ENTITY:
-                if (EntityResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+        case ENTITY:
+            if (EntityResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(EntityResourceAction.Update.class))
                 {
-                    if (resource.getMetaData().isDeleted(EntityResourceAction.Update.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    EntityResourceAction.Update<Object> updateEnt = (EntityResourceAction.Update<Object>) resource.getResource();
-                    Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params);
-                    return result;
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                else
+                EntityResourceAction.Update<Object> updateEnt = (EntityResourceAction.Update<Object>) resource.getResource();
+                Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params);
+                return result;
+            }
+            else
+            {
+                if (resource.getMetaData().isDeleted(EntityResourceAction.UpdateWithResponse.class))
                 {
-                    if (resource.getMetaData().isDeleted(EntityResourceAction.UpdateWithResponse.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    EntityResourceAction.UpdateWithResponse<Object> updateEnt = (EntityResourceAction.UpdateWithResponse<Object>) resource.getResource();
-                    Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
-                    return result;
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-            case RELATIONSHIP:
-                if (RelationshipResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                EntityResourceAction.UpdateWithResponse<Object> updateEnt = (EntityResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
+                return result;
+            }
+        case RELATIONSHIP:
+            if (RelationshipResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(RelationshipResourceAction.UpdateWithResponse.class))
                 {
-                    if (resource.getMetaData().isDeleted(RelationshipResourceAction.UpdateWithResponse.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    RelationshipResourceAction.UpdateWithResponse<Object> relationUpdater = (RelationshipResourceAction.UpdateWithResponse<Object>) resource.getResource();
-                    Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
-                    return relResult;
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                else
+                RelationshipResourceAction.UpdateWithResponse<Object> relationUpdater = (RelationshipResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
+                return relResult;
+            }
+            else
+            {
+                if (resource.getMetaData().isDeleted(RelationshipResourceAction.Update.class))
                 {
-                    if (resource.getMetaData().isDeleted(RelationshipResourceAction.Update.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    RelationshipResourceAction.Update<Object> relationUpdater = (RelationshipResourceAction.Update<Object>) resource.getResource();
-                    Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params);
-                    return relResult;
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-            case PROPERTY:
-                if (BinaryResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+                RelationshipResourceAction.Update<Object> relationUpdater = (RelationshipResourceAction.Update<Object>) resource.getResource();
+                Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params);
+                return relResult;
+            }
+        case PROPERTY:
+            if (BinaryResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(BinaryResourceAction.Update.class))
                 {
-                    if (resource.getMetaData().isDeleted(BinaryResourceAction.Update.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    BinaryResourceAction.Update<Object> binUpdater = (BinaryResourceAction.Update<Object>) resource.getResource();
-                    return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params);
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                if (BinaryResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                BinaryResourceAction.Update<Object> binUpdater = (BinaryResourceAction.Update<Object>) resource.getResource();
+                return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params);
+            }
+            if (BinaryResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(BinaryResourceAction.UpdateWithResponse.class))
                 {
-                    if (resource.getMetaData().isDeleted(BinaryResourceAction.UpdateWithResponse.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    BinaryResourceAction.UpdateWithResponse<Object> binUpdater = (BinaryResourceAction.UpdateWithResponse<Object>) resource.getResource();
-                    return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params, withResponse);
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                if (RelationshipResourceBinaryAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+                BinaryResourceAction.UpdateWithResponse<Object> binUpdater = (BinaryResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params, withResponse);
+            }
+            if (RelationshipResourceBinaryAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.Update.class))
                 {
-                    if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.Update.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    RelationshipResourceBinaryAction.Update<Object> binUpdater = (RelationshipResourceBinaryAction.Update<Object>) resource.getResource();
-                    return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params);
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                if (RelationshipResourceBinaryAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                RelationshipResourceBinaryAction.Update<Object> binUpdater = (RelationshipResourceBinaryAction.Update<Object>) resource.getResource();
+                return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params);
+            }
+            if (RelationshipResourceBinaryAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.UpdateWithResponse.class))
                 {
-                    if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.UpdateWithResponse.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    RelationshipResourceBinaryAction.UpdateWithResponse<Object> binUpdater = (RelationshipResourceBinaryAction.UpdateWithResponse<Object>) resource.getResource();
-                    return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params, withResponse);
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-            default:
-                throw new UnsupportedResourceOperationException("PUT not supported for Actions");
+                RelationshipResourceBinaryAction.UpdateWithResponse<Object> binUpdater = (RelationshipResourceBinaryAction.UpdateWithResponse<Object>) resource.getResource();
+                return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params, withResponse);
+            }
+        default:
+            throw new UnsupportedResourceOperationException("PUT not supported for Actions");
         }
     }
 

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

@@ -1,416 +1,411 @@
-/*
- * #%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.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.*;
-
-import org.alfresco.repo.tenant.TenantUtil;
-import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
-import org.alfresco.rest.api.tests.RepoService.TestNetwork;
-import org.alfresco.rest.api.tests.RepoService.TestPerson;
-import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
-import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
-import org.alfresco.rest.api.tests.client.PublicApiClient.People;
-import org.alfresco.rest.api.tests.client.PublicApiException;
-import org.alfresco.rest.api.tests.client.RequestContext;
-import org.alfresco.rest.api.tests.client.data.Preference;
-import org.alfresco.util.GUID;
-import org.apache.commons.httpclient.HttpStatus;
-import org.junit.Test;
-
-public class TestUserPreferences extends EnterpriseTestApi
-{
-	@Test
-	public void testUserPreferences() throws Exception
-	{
-		Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
-		assertTrue(networksIt.hasNext());
-		final TestNetwork network1 = networksIt.next();
-		assertTrue(networksIt.hasNext());
-		final TestNetwork network2 = networksIt.next();
-
-		final List<TestPerson> people = new ArrayList<TestPerson>(3);
-
-		// create users and some preferences
-		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
-		{
-			@Override
-			public Void doWork() throws Exception
-			{
-				TestPerson person = network1.createUser();
-				people.add(person);
-				person = network1.createUser();
-				people.add(person);
-				return null;
-			}
-		}, network1.getId());
-		
-		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
-		{
-			@Override
-			public Void doWork() throws Exception
-			{
-				TestPerson person = network2.createUser();
-				people.add(person);
-				return null;
-			}
-		}, network2.getId());
-		
-		final TestPerson person1 = people.get(0);
-		final TestPerson person2 = people.get(1);
-		final TestPerson person3 = people.get(2);
-
-        final List<Preference> expectedPreferences = new ArrayList<Preference>();
-        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference2", String.valueOf(true)));
-        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference1", String.valueOf(true)));
-        expectedPreferences.add(new Preference("org.alfresco.share.documentList.sortAscending", String.valueOf(true)));
-        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference3", String.valueOf(true)));
-		// new preference name for issue REPO-855
-		expectedPreferences.add(new Preference("org.alfresco.ext.folders.favourites.workspace://SpacesStore/4e3d0779-388a-4b94-91e1-eab588a7da3d.createdAt", String.valueOf(true)));
-
-		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
-		{
-			@Override
-			public Void doWork() throws Exception
-			{
-				for(Preference pref : expectedPreferences)
-				{
-					// TODO add preferences thru api
-					repoService.addPreference(person1.getId(), pref.getId(), pref.getValue());
-				}
-
-	    		return null;
-			}
-		}, person1.getId(), network1.getId());
-
-        Collections.sort(expectedPreferences);
-
-        People peopleProxy = publicApiClient.people();
-        
-        // GET preferences
-        // Test case: cloud-1492
-
-        // unknown user
-        try
-        {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        peopleProxy.getPreferences(GUID.generate(), createParams(paging, null));
-
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
-        }
-
-        // test paging
-        {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
-        }
-
-        {
-	        int skipCount = 2;
-	        int maxItems = 10;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
-        }
-        
-        // "-me-" user
-        {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        ListResponse<Preference> resp = peopleProxy.getPreferences(org.alfresco.rest.api.People.DEFAULT_USER, createParams(paging, null));
-	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
-        }
-
-		// invalid user - 404
-        try
-        {
-	        int skipCount = 2;
-	        int maxItems = 10;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        peopleProxy.getPreferences("invalid.user", createParams(paging, null));
-			fail("");
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
-        }
-
-		// user from another account - 401
-        try
-        {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-//	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-//	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
-	        peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-	        fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(e.getHttpResponse().getStatusCode(), HttpStatus.SC_UNAUTHORIZED);
-        }
-
-		// another user from the same account - 403
-        try
-        {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-	        fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());        	
-        }
-
-        // get a single preference
-        // Test Case: cloud-1493
-        
-        {
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Preference pref = expectedPreferences.get(0);
-        	Preference ret = peopleProxy.getPreference(person1.getId(), pref.getId());
-        	pref.expected(ret);
-        }
-        
-        // unknown person id
-        try
-        {
-	        Preference pref = expectedPreferences.get(0);
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
-        	peopleProxy.getPreference(GUID.generate(), pref.getId());
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
-        }
-        
-        // unknown preference id
-        try
-        {
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.getPreference(person1.getId(), GUID.generate());
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
-        }
-        
-        // Invalid methods
-        // Test case: cloud-1968
-        try
-        {
-	        Preference pref = expectedPreferences.get(0);
-
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.create("people", person1.getId(), "preferences", pref.getId(), pref.toJSON().toString(), "Unable to POST to a preference");
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
-        }
-        
-        try
-        {
-	        Preference pref = expectedPreferences.get(0);
-
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.update("people", person1.getId(), "preferences", pref.getId(), pref.toJSON().toString(), "Unable to PUT a preference");
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
-        }
-        
-        try
-        {
-	        Preference pref = expectedPreferences.get(0);
-
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.remove("people", person1.getId(), "preferences", pref.getId(), "Unable to DELETE a preference");
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
-        }
-        
-        try
-        {
-	        Preference pref = expectedPreferences.get(0);
-
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.create("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to POST to preferences");
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
-        }
-
-        try
-        {
-	        Preference pref = expectedPreferences.get(0);
-
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.update("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to PUT preferences");
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
-        }
-        
-        try
-        {
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.remove("people", person1.getId(), "preferences", null, "Unable to DELETE preferences");
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
-        }
-
-		{
-			// REPO-1061, REPO-890
-			try
-			{
-				String skipCount = "a";
-				String maxItems = "hi";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("skipCount", skipCount);
-				params.put("maxItems", maxItems);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-
-			try
-			{
-				String skipCount = "a";
-				String maxItems = "null";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("skipCount", skipCount);
-				params.put("maxItems", maxItems);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-
-			try
-			{
-				String maxItems = "Red";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("maxItems", maxItems);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-                peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-
-			try
-			{
-				String skipCount = "yuck";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("skipCount", skipCount);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-
-			try
-			{
-				String skipCount = "-1";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("skipCount", skipCount);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-
-			try
-			{
-				String maxItems = "0";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("maxItems", maxItems);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-		}
-	}
-}
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * 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.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.*;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Test;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.People;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Preference;
+import org.alfresco.util.GUID;
+
+public class TestUserPreferences extends EnterpriseTestApi
+{
+    @Test
+    public void testUserPreferences() throws Exception
+    {
+        Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+        assertTrue(networksIt.hasNext());
+        final TestNetwork network1 = networksIt.next();
+        assertTrue(networksIt.hasNext());
+        final TestNetwork network2 = networksIt.next();
+
+        final List<TestPerson> people = new ArrayList<TestPerson>(3);
+
+        // create users and some preferences
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>() {
+            @Override
+            public Void doWork() throws Exception
+            {
+                TestPerson person = network1.createUser();
+                people.add(person);
+                person = network1.createUser();
+                people.add(person);
+                return null;
+            }
+        }, network1.getId());
+
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>() {
+            @Override
+            public Void doWork() throws Exception
+            {
+                TestPerson person = network2.createUser();
+                people.add(person);
+                return null;
+            }
+        }, network2.getId());
+
+        final TestPerson person1 = people.get(0);
+        final TestPerson person2 = people.get(1);
+        final TestPerson person3 = people.get(2);
+
+        final List<Preference> expectedPreferences = new ArrayList<Preference>();
+        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference2", String.valueOf(true)));
+        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference1", String.valueOf(true)));
+        expectedPreferences.add(new Preference("org.alfresco.share.documentList.sortAscending", String.valueOf(true)));
+        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference3", String.valueOf(true)));
+        // new preference name for issue REPO-855
+        expectedPreferences.add(new Preference("org.alfresco.ext.folders.favourites.workspace://SpacesStore/4e3d0779-388a-4b94-91e1-eab588a7da3d.createdAt", String.valueOf(true)));
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>() {
+            @Override
+            public Void doWork() throws Exception
+            {
+                for (Preference pref : expectedPreferences)
+                {
+                    // TODO add preferences thru api
+                    repoService.addPreference(person1.getId(), pref.getId(), pref.getValue());
+                }
+
+                return null;
+            }
+        }, person1.getId(), network1.getId());
+
+        Collections.sort(expectedPreferences);
+
+        People peopleProxy = publicApiClient.people();
+
+        // GET preferences
+        // Test case: cloud-1492
+
+        // unknown user
+        try
+        {
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            peopleProxy.getPreferences(GUID.generate(), createParams(paging, null));
+
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // test paging
+        {
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+        {
+            int skipCount = 2;
+            int maxItems = 10;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+        // "-me-" user
+        {
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            ListResponse<Preference> resp = peopleProxy.getPreferences(org.alfresco.rest.api.People.DEFAULT_USER, createParams(paging, null));
+            checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+        // invalid user - 404
+        try
+        {
+            int skipCount = 2;
+            int maxItems = 10;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            peopleProxy.getPreferences("invalid.user", createParams(paging, null));
+            fail("");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // user from another account - 401
+        try
+        {
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            // ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            // checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(e.getHttpResponse().getStatusCode(), HttpStatus.SC_UNAUTHORIZED);
+        }
+
+        // another user from the same account - 403
+        try
+        {
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+        }
+
+        // get a single preference
+        // Test Case: cloud-1493
+
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Preference pref = expectedPreferences.get(0);
+            Preference ret = peopleProxy.getPreference(person1.getId(), pref.getId());
+            pref.expected(ret);
+        }
+
+        // unknown person id
+        try
+        {
+            Preference pref = expectedPreferences.get(0);
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+            peopleProxy.getPreference(GUID.generate(), pref.getId());
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // unknown preference id
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.getPreference(person1.getId(), GUID.generate());
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // Invalid methods
+        // Test case: cloud-1968
+        try
+        {
+            Preference pref = expectedPreferences.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.create("people", person1.getId(), "preferences", pref.getId(), pref.toJSON().toString(), "Unable to POST to a preference");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        {
+            Preference updatedPref = new Preference("preference.to.update", "updated.value");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Preference response = peopleProxy.updatePreference(person1.getId(), updatedPref);
+
+            assertEquals(updatedPref.getId(), response.getId());
+            assertEquals(updatedPref.getValue(), response.getValue());
+        }
+
+        try
+        {
+            Preference pref = expectedPreferences.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.remove("people", person1.getId(), "preferences", pref.getId(), "Unable to DELETE a preference");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            Preference pref = expectedPreferences.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.create("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to POST to preferences");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            Preference pref = expectedPreferences.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.update("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to PUT preferences");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.remove("people", person1.getId(), "preferences", null, "Unable to DELETE preferences");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        {
+            // REPO-1061, REPO-890
+            try
+            {
+                String skipCount = "a";
+                String maxItems = "hi";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("skipCount", skipCount);
+                params.put("maxItems", maxItems);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                String skipCount = "a";
+                String maxItems = "null";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("skipCount", skipCount);
+                params.put("maxItems", maxItems);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                String maxItems = "Red";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("maxItems", maxItems);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                String skipCount = "yuck";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("skipCount", skipCount);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                String skipCount = "-1";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("skipCount", skipCount);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                String maxItems = "0";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("maxItems", maxItems);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+        }
+    }
+}

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.67</version>
+        <version>25.1.0.13</version>
     </parent>
 
     <dependencies>
@@ -397,7 +397,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.5.16</version>
+            <version>3.5.17</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
@@ -850,12 +850,12 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <complianceLevel>1.8</complianceLevel>
+                    <complianceLevel>17</complianceLevel>
                     <outxml>false</outxml>
                     <verbose>true</verbose>
                     <showWeaveInfo>true</showWeaveInfo>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <additionalCompilerArgs>
                         <arg>-parameters</arg>
                     </additionalCompilerArgs>

repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java

@@ -1,286 +1,282 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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.repo.audit;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.repo.audit.model.AuditApplication;
-import org.alfresco.repo.audit.model.AuditModelRegistry;
-import org.alfresco.repo.audit.model._3.AuditPath;
-import org.alfresco.service.cmr.audit.AuditQueryParameters;
-import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
-
-/**
- * The audit component. Used by the AuditService and AuditMethodInterceptor to insert audit entries.
- * 
- * @author Derek Hulley
- */
-public interface AuditComponent
-{
-    /**
-     * Determines whether audit is globally enabled or disabled.
-     * 
-     * @return                  Returns <code>true</code> if audit is enabled
-     * 
-     * @since 3.3
-     */
-    public boolean isAuditEnabled();
-    
-    /**
-     * Switch auditing on or off
-     * 
-     * @param enable            <tt>true</tt> to enable auditing or <tt>false</tt> to disable
-     * 
-     * @since 3.4
-     */
-    public void setAuditEnabled(boolean enable);
-
-    /**
-     * @param userAuditFilter UserAuditFilter
-     * 
-     * @since 4.2
-     */
-    public void setUserAuditFilter(UserAuditFilter userAuditFilter);
-    
-    /**
-     * Get all registered audit applications, whether active or not.
-     * 
-     * @return                  Returns a map of registered audit applications keyed by name
-     * 
-     * @since 3.4
-     */
-    public Map<String, AuditApplication> getAuditApplications();
-    
-    /**
-     * Determine whether the audit infrastructure expects audit values to be passed in.
-     * This is a helper method to allow optimizations in the client code.  Reasons why
-     * this method might return <tt>false</tt> are: auditing is disabled; no audit applications
-     * have been registered.  Sometimes, depending on the log level, this method may always
-     * return <tt>true</tt>.
-     * 
-     * 
-     * @return                  Returns <code>true</code> if the calling code (data producers)
-     *                          should go ahead and generate the data for
-     *                          {@link #recordAuditValues(String, Map) recording}.
-     * 
-     * @since 3.3
-     */
-    public boolean areAuditValuesRequired();
-    
-    /**
-     * Determines if audit values are required based on whether there are any audit applications
-     * registered to record data for the given path. This helper method gives data producers a 
-     * shortcut in the event that nothing would be recorded in any event.
-     * 
-     * @param path              the audit path
-     * @return                  Returns <tt>true</tt> if there is at least one audit application
-     *                          registered to handle the given path.
-     * 
-     * @since 3.4                         
-     */
-    public boolean areAuditValuesRequired(String path);
-    
-    /**
-     * Delete audit entries for the given application and time range
-     * 
-     * @param applicationName   the name of the application
-     * @param fromTime          the start time of entries to remove (inclusive and optional)
-     * @param toTime            the end time of entries to remove (exclusive and optional)
-     * @return                  Returns the number of entries deleted
-     * 
-     * @since 3.2
-     */
-    int deleteAuditEntries(String applicationName, Long fromTime, Long toTime);
-
-    /**
-     * Delete audit entries for the given application and id range
-     *
-     * @param applicationName   the name of the application
-     * @param fromId          the start time of entries to remove (inclusive and optional)
-     * @param toId            the end time of entries to remove (exclusive and optional)
-     * @return                  Returns the number of entries deleted
-     *
-     * @since 5.2.2
-     */
-    int deleteAuditEntriesByIdRange(String applicationName, Long fromId, Long toId);
-
-    /**
-     * Delete a discrete list of audit entries based on ID
-     * 
-     * @param auditEntryIds     the audit entry IDs to delete
-     * @return                  Returns the number of entries deleted
-     */
-    int deleteAuditEntries(List<Long> auditEntryIds);
-    
-    /**
-     * Check if an audit path is enabled.  The path will be disabled if it or any higher
-     * path has been explicitly disabled.  Any disabled path will not be processed when
-     * data is audited.
-     * 
-     * @param applicationName   the name of the application being logged to
-     * @param path              the audit path to check or <tt>null</tt> to assume the
-     *                          application's root path
-     * @return                  Returns <tt>true</tt> if the audit path has been disabled
-     * 
-     * @since 3.2
-     */
-    boolean isAuditPathEnabled(String applicationName, String path);
-    
-    /**
-     * Enable auditing (if it is not already enabled) for all paths that contain the given path.
-     * The path is the path as originally logged and
-     * not the path that the generated data may contain - although this would be similarly
-     * enabled.
-     * <p>
-     * If the enabled 
-     * 
-     * @param applicationName   the name of the application being logged to
-     * @param path              the audit path to check or <tt>null</tt> to assume the
-     *                          application's root path
-     * 
-     * @since 3.2
-     */
-    void enableAudit(String applicationName, String path);
-
-    /**
-     * Disable auditing (if it is not already disabled) for all paths that contain the given path.
-     * The path is the path as originally logged and
-     * not the path that the generated data may contain - although this would be similarly
-     * disabled.
-     * <p>
-     * If the path is <b>/x/y</b> then any data paths that start with <b>/x/y</b> will be stripped
-     * out <u>before</u> data generators and data recorders are applied.  If the path represents
-     * the root path of the application, then auditing for that application is effectively disabled. 
-     * 
-     * @param applicationName   the name of the application being logged to
-     * @param path              the audit path to check or <tt>null</tt> to assume the
-     *                          application's root path
-     * 
-     * @since 3.2
-     */
-    void disableAudit(String applicationName, String path);
-    
-    /**
-     * Remove all disabled paths i.e. enable all per-path based auditing.  Auditing may still be
-     * disabled globally.  This is primarily for test purposes; applications should know which
-     * paths need {@link #enableAudit(String, String) enabling} or
-     * {@link #disableAudit(String, String) disabled}.
-     * 
-     * @param applicationName   the name of the application
-     * 
-     * @since 3.2
-     */
-    void resetDisabledPaths(String applicationName);
-
-    /**
-     * Create an audit entry for the given map of values.  The map key is a path - starting with '/'
-     * ({@link AuditApplication#AUDIT_PATH_SEPARATOR}) - relative to the root path provided.
-     * <p/>
-     * The root path and value keys are combined to produce a map of data keyed by full path.  This
-     * fully-pathed map is then passed through the
-     * {@link AuditModelRegistry#getAuditPathMapper() audit path mapper}.  The result may yield data
-     * destined for several different
-     * {@link AuditModelRegistry#getAuditApplicationByKey(String) audit applications}.  depending on
-     * the data extraction and generation defined in the applications, values (or derived values) may
-     * be recorded against several audit entries (one per application represented).
-     * <p/>
-     * The return values reflect what was actually persisted and is controlled by the data extractors
-     * defined in the audit configuration.
-     * <p/>
-     * A new read-write transaction is started if there are values to write that there is not a viable
-     * transaction present.
-     * 
-     * @param rootPath          a base path of {@link AuditPath} key entries concatenated with the path separator
-     *                          '/' ({@link AuditApplication#AUDIT_PATH_SEPARATOR})
-     * @param values            the values to audit mapped by {@link AuditPath} key relative to root path
-     *                          (may be <tt>null</tt>)
-     * @return                  Returns the values that were actually persisted, keyed by their full path.
-     * @throws IllegalStateException if the transaction state could not be determined
-     * 
-     * @since 3.2
-     */
-    Map<String, Serializable> recordAuditValues(String rootPath, Map<String, Serializable> values);
-    
-    /**
-     * The same as {@link AuditComponent#recordAuditValues(String, Map)}, but with controlled usage of userFilter
-     * 
-     * @param rootPath          a base path of {@link AuditPath} key entries concatenated with the path separator
-     *                          '/' ({@link AuditApplication#AUDIT_PATH_SEPARATOR})
-     * @param values            the values to audit mapped by {@link AuditPath} key relative to root path
-     *                          (may be <tt>null</tt>)
-     * @param useUserFilter     if <tt>false</tt> the user filter is disabled.
-     * @return                  Returns the values that were actually persisted, keyed by their full path.
-     * @throws IllegalStateException if the transaction state could not be determined
-     */
-    Map<String, Serializable> recordAuditValuesWithUserFilter(String rootPath, Map<String, Serializable> values, boolean useUserFilter);
-    
-    /**
-     * Find audit entries using the given parameters
-     * 
-     * @param callback          the data callback per entry
-     * @param parameters        the parameters for the query (may not be <tt>null</tt>)
-     * @param maxResults        the maximum number of results to retrieve (must be greater than 0)
-     * 
-     * @throws IllegalArgumentException if maxResults less or equal to zero
-     * 
-     * @since 3.2
-     */
-    void auditQuery(AuditQueryCallback callback, AuditQueryParameters parameters, int maxResults);
-
-    /**
-     * Issue an audit query to retrieve min / max audit record id for a given application.
-     *
-     * @param applicationName               the name of the application
-     * @param extremes                      a list containing min/max or both
-     * @return                              a map containing min/max and the associated value
-     */
-    HashMap<String, Long> getAuditMinMaxByApp(String applicationName, List<String> extremes);
-
-    /**
-     * Issue an audit query to retrieve count of records for a given application.
-     *
-     * @param applicationName             the name of the application
-     * @return                  a map containing min/max and the associated value
-     */
-    default int getAuditEntriesCountByApp(String applicationName)
-    {
-        return -1;
-    }
-
-    /**
-     * Issue an audit query to retrieve count of records for a given application and properties
-     *
-     * @param parameters                  audit parameters provided by the <code>where</code> clause on the ReST API
-     * @return                            a map containing min/max and the associated value
-     */
-    default int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters)
-    {
-        return -1;
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.repo.audit;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.audit.model.AuditApplication;
+import org.alfresco.repo.audit.model.AuditModelRegistry;
+import org.alfresco.repo.audit.model._3.AuditPath;
+import org.alfresco.service.cmr.audit.AuditQueryParameters;
+import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
+
+/**
+ * The audit component. Used by the AuditService and AuditMethodInterceptor to insert audit entries.
+ *
+ * @author Derek Hulley
+ */
+public interface AuditComponent
+{
+    /**
+     * Determines whether audit is globally enabled or disabled.
+     *
+     * @return Returns <code>true</code> if audit is enabled
+     *
+     * @since 3.3
+     */
+    public boolean isAuditEnabled();
+
+    /**
+     * Switch auditing on or off
+     *
+     * @param enable
+     *            <tt>true</tt> to enable auditing or <tt>false</tt> to disable
+     *
+     * @since 3.4
+     */
+    public void setAuditEnabled(boolean enable);
+
+    /**
+     * @param userAuditFilter
+     *            UserAuditFilter
+     *
+     * @since 4.2
+     */
+    public void setUserAuditFilter(UserAuditFilter userAuditFilter);
+
+    /**
+     * Get all registered audit applications, whether active or not.
+     *
+     * @return Returns a map of registered audit applications keyed by name
+     *
+     * @since 3.4
+     */
+    public Map<String, AuditApplication> getAuditApplications();
+
+    /**
+     * Determine whether the audit infrastructure expects audit values to be passed in. This is a helper method to allow optimizations in the client code. Reasons why this method might return <tt>false</tt> are: auditing is disabled; no audit applications have been registered. Sometimes, depending on the log level, this method may always return <tt>true</tt>.
+     *
+     *
+     * @return Returns <code>true</code> if the calling code (data producers) should go ahead and generate the data for {@link #recordAuditValues(String, Map) recording}.
+     *
+     * @since 3.3
+     */
+    public boolean areAuditValuesRequired();
+
+    /**
+     * Determines if audit values are required based on whether there are any audit applications registered to record data for the given path. This helper method gives data producers a shortcut in the event that nothing would be recorded in any event.
+     *
+     * @param path
+     *            the audit path
+     * @return Returns <tt>true</tt> if there is at least one audit application registered to handle the given path.
+     *
+     * @since 3.4
+     */
+    public boolean areAuditValuesRequired(String path);
+
+    /**
+     * Delete audit entries for the given application and time range
+     *
+     * @param applicationName
+     *            the name of the application
+     * @param fromTime
+     *            the start time of entries to remove (inclusive and optional)
+     * @param toTime
+     *            the end time of entries to remove (exclusive and optional)
+     * @return Returns the number of entries deleted
+     *
+     * @since 3.2
+     */
+    int deleteAuditEntries(String applicationName, Long fromTime, Long toTime);
+
+    /**
+     * Delete audit entries for the given application and id range
+     *
+     * @param applicationName
+     *            the name of the application
+     * @param fromId
+     *            the start time of entries to remove (inclusive and optional)
+     * @param toId
+     *            the end time of entries to remove (exclusive and optional)
+     * @return Returns the number of entries deleted
+     *
+     * @since 5.2.2
+     */
+    int deleteAuditEntriesByIdRange(String applicationName, Long fromId, Long toId);
+
+    /**
+     * Delete a discrete list of audit entries based on ID
+     *
+     * @param auditEntryIds
+     *            the audit entry IDs to delete
+     * @return Returns the number of entries deleted
+     */
+    int deleteAuditEntries(List<Long> auditEntryIds);
+
+    /**
+     * Check if an audit path is enabled. The path will be disabled if it or any higher path has been explicitly disabled. Any disabled path will not be processed when data is audited.
+     *
+     * @param applicationName
+     *            the name of the application being logged to
+     * @param path
+     *            the audit path to check or <tt>null</tt> to assume the application's root path
+     * @return Returns <tt>true</tt> if the audit path has been disabled
+     *
+     * @since 3.2
+     */
+    boolean isAuditPathEnabled(String applicationName, String path);
+
+    /**
+     * Enable auditing (if it is not already enabled) for all paths that contain the given path. The path is the path as originally logged and not the path that the generated data may contain - although this would be similarly enabled.
+     * <p>
+     * If the enabled
+     *
+     * @param applicationName
+     *            the name of the application being logged to
+     * @param path
+     *            the audit path to check or <tt>null</tt> to assume the application's root path
+     *
+     * @since 3.2
+     */
+    void enableAudit(String applicationName, String path);
+
+    /**
+     * Disable auditing (if it is not already disabled) for all paths that contain the given path. The path is the path as originally logged and not the path that the generated data may contain - although this would be similarly disabled.
+     * <p>
+     * If the path is <b>/x/y</b> then any data paths that start with <b>/x/y</b> will be stripped out <u>before</u> data generators and data recorders are applied. If the path represents the root path of the application, then auditing for that application is effectively disabled.
+     *
+     * @param applicationName
+     *            the name of the application being logged to
+     * @param path
+     *            the audit path to check or <tt>null</tt> to assume the application's root path
+     *
+     * @since 3.2
+     */
+    void disableAudit(String applicationName, String path);
+
+    /**
+     * Remove all disabled paths i.e. enable all per-path based auditing. Auditing may still be disabled globally. This is primarily for test purposes; applications should know which paths need {@link #enableAudit(String, String) enabling} or {@link #disableAudit(String, String) disabled}.
+     *
+     * @param applicationName
+     *            the name of the application
+     *
+     * @since 3.2
+     */
+    void resetDisabledPaths(String applicationName);
+
+    /**
+     * Create an audit entry for the given map of values. The map key is a path - starting with '/' ({@link AuditApplication#AUDIT_PATH_SEPARATOR}) - relative to the root path provided.
+     * <p/>
+     * The root path and value keys are combined to produce a map of data keyed by full path. This fully-pathed map is then passed through the {@link AuditModelRegistry#getAuditPathMapper() audit path mapper}. The result may yield data destined for several different {@link AuditModelRegistry#getAuditApplicationByKey(String) audit applications}. depending on the data extraction and generation defined in the applications, values (or derived values) may be recorded against several audit entries (one per application represented).
+     * <p/>
+     * The return values reflect what was actually persisted and is controlled by the data extractors defined in the audit configuration.
+     * <p/>
+     * A new read-write transaction is started if there are values to write that there is not a viable transaction present.
+     *
+     * @param rootPath
+     *            a base path of {@link AuditPath} key entries concatenated with the path separator '/' ({@link AuditApplication#AUDIT_PATH_SEPARATOR})
+     * @param values
+     *            the values to audit mapped by {@link AuditPath} key relative to root path (may be <tt>null</tt>)
+     * @return Returns the values that were actually persisted, keyed by their full path.
+     * @throws IllegalStateException
+     *             if the transaction state could not be determined
+     *
+     * @since 3.2
+     */
+    Map<String, Serializable> recordAuditValues(String rootPath, Map<String, Serializable> values);
+
+    /**
+     * The same as {@link AuditComponent#recordAuditValues(String, Map)}, but with controlled usage of userFilter
+     *
+     * @param rootPath
+     *            a base path of {@link AuditPath} key entries concatenated with the path separator '/' ({@link AuditApplication#AUDIT_PATH_SEPARATOR})
+     * @param values
+     *            the values to audit mapped by {@link AuditPath} key relative to root path (may be <tt>null</tt>)
+     * @param useUserFilter
+     *            if <tt>false</tt> the user filter is disabled.
+     * @return Returns the values that were actually persisted, keyed by their full path.
+     * @throws IllegalStateException
+     *             if the transaction state could not be determined
+     */
+    Map<String, Serializable> recordAuditValuesWithUserFilter(String rootPath, Map<String, Serializable> values, boolean useUserFilter);
+
+    /**
+     * Find audit entries using the given parameters
+     *
+     * @param callback
+     *            the data callback per entry
+     * @param parameters
+     *            the parameters for the query (may not be <tt>null</tt>)
+     * @param maxResults
+     *            the maximum number of results to retrieve (must be greater than 0)
+     *
+     * @throws IllegalArgumentException
+     *             if maxResults less or equal to zero
+     *
+     * @since 3.2
+     */
+    void auditQuery(AuditQueryCallback callback, AuditQueryParameters parameters, int maxResults);
+
+    /**
+     * Issue an audit query to retrieve min / max audit record id for a given application.
+     *
+     * @param applicationName
+     *            the name of the application
+     * @param extremes
+     *            a list containing min/max or both
+     * @return a map containing min/max and the associated value
+     */
+    HashMap<String, Long> getAuditMinMaxByApp(String applicationName, List<String> extremes);
+
+    /**
+     * Issue an audit query to retrieve count of records for a given application.
+     *
+     * @param applicationName
+     *            the name of the application
+     * @return a map containing min/max and the associated value
+     */
+    default int getAuditEntriesCountByApp(String applicationName)
+    {
+        return -1;
+    }
+
+    /**
+     * Issue an audit query to retrieve count of records for a given application and properties
+     *
+     * @param applicationName
+     *            the name of the application
+     * @param parameters
+     *            audit parameters provided by the <code>where</code> clause on the ReST API
+     * @return a map containing min/max and the associated value
+     */
+    default int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters)
+    {
+        return -1;
+    }
+}

repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java

@@ -1,197 +1,210 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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.repo.audit;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.alfresco.service.cmr.audit.AuditQueryParameters;
-import org.alfresco.service.cmr.audit.AuditService;
-
-/**
- * The implementation of the AuditService for application auditing.
- * 
- * @author Derek Hulley
- * @since 3.2
- */
-public class AuditServiceImpl implements AuditService
-{
-    private AuditComponent auditComponent;
-
-    public AuditServiceImpl()
-    {
-        super();
-    }
-
-    public void setAuditComponent(AuditComponent auditComponent)
-    {
-        this.auditComponent = auditComponent;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.4
-     */
-    public boolean isAuditEnabled()
-    {
-        return auditComponent.isAuditEnabled();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.4
-     */
-    @Override
-    public void setAuditEnabled(boolean enable)
-    {
-        auditComponent.setAuditEnabled(enable);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.4
-     */
-    @Override
-    public Map<String, AuditApplication> getAuditApplications()
-    {
-        Map<String, org.alfresco.repo.audit.model.AuditApplication> apps = auditComponent.getAuditApplications();
-
-        Map<String, AuditApplication> ret = new TreeMap<String, AuditApplication>();
-        for (String app : apps.keySet())
-        {
-            String name = app;
-            String key = org.alfresco.repo.audit.model.AuditApplication.AUDIT_PATH_SEPARATOR + apps.get(app).getApplicationKey();
-            boolean enabled = auditComponent.isAuditPathEnabled(app, key);
-            AuditApplication auditApplication = new AuditApplication(name, key, enabled);
-            ret.put(name, auditApplication);
-        }
-        return ret;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.2
-     */
-    public boolean isAuditEnabled(String applicationName, String path)
-    {
-        return auditComponent.isAuditPathEnabled(applicationName, path);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.2
-     */
-    public void enableAudit(String applicationName, String path)
-    {
-        auditComponent.enableAudit(applicationName, path);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.2
-     */
-    public void disableAudit(String applicationName, String path)
-    {
-        auditComponent.disableAudit(applicationName, path);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.2
-     */
-    public int clearAudit(String applicationName)
-    {
-        Long now = Long.valueOf(System.currentTimeMillis());
-        return auditComponent.deleteAuditEntries(applicationName, null, now);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.4
-     */
-    @Override
-    public int clearAudit(String applicationName, Long fromTime, Long toTime)
-    {
-        toTime = (toTime == null) ? Long.valueOf(System.currentTimeMillis()) : toTime;
-        return auditComponent.deleteAuditEntries(applicationName, fromTime, toTime);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 5.2.2
-     */
-    @Override
-    public int clearAuditByIdRange(String applicationName, Long fromId, Long toId)
-    {
-        return auditComponent.deleteAuditEntriesByIdRange(applicationName, fromId, toId);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.4
-     */
-    @Override
-    public int clearAudit(List<Long> auditEntryIds)
-    {
-        return auditComponent.deleteAuditEntries(auditEntryIds);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since 3.3
-     */
-    public void auditQuery(AuditQueryCallback callback, AuditQueryParameters parameters, int maxResults)
-    {
-        auditComponent.auditQuery(callback, parameters, maxResults);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public HashMap<String, Long> getAuditMinMaxByApp(String applicationName, List<String> extremes)
-    {
-        return auditComponent.getAuditMinMaxByApp(applicationName, extremes);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getAuditEntriesCountByApp(String applicationName)
-    {
-        return auditComponent.getAuditEntriesCountByApp(applicationName);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override public int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters)
-    {
-        return auditComponent.getAuditEntriesCountByAppAndProperties(parameters);
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.repo.audit;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.alfresco.service.cmr.audit.AuditQueryParameters;
+import org.alfresco.service.cmr.audit.AuditService;
+
+/**
+ * The implementation of the AuditService for application auditing.
+ * 
+ * @author Derek Hulley
+ * @since 3.2
+ */
+public class AuditServiceImpl implements AuditService
+{
+    private AuditComponent auditComponent;
+
+    public AuditServiceImpl()
+    {
+        super();
+    }
+
+    public void setAuditComponent(AuditComponent auditComponent)
+    {
+        this.auditComponent = auditComponent;
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.4
+     */
+    public boolean isAuditEnabled()
+    {
+        return auditComponent.isAuditEnabled();
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.4
+     */
+    @Override
+    public void setAuditEnabled(boolean enable)
+    {
+        auditComponent.setAuditEnabled(enable);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.4
+     */
+    @Override
+    public Map<String, AuditApplication> getAuditApplications()
+    {
+        Map<String, org.alfresco.repo.audit.model.AuditApplication> apps = auditComponent.getAuditApplications();
+
+        Map<String, AuditApplication> ret = new TreeMap<String, AuditApplication>();
+        for (String app : apps.keySet())
+        {
+            String name = app;
+            String key = org.alfresco.repo.audit.model.AuditApplication.AUDIT_PATH_SEPARATOR + apps.get(app).getApplicationKey();
+            boolean enabled = auditComponent.isAuditPathEnabled(app, key);
+            AuditApplication auditApplication = new AuditApplication(name, key, enabled);
+            ret.put(name, auditApplication);
+        }
+        return ret;
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.2
+     */
+    public boolean isAuditEnabled(String applicationName, String path)
+    {
+        return auditComponent.isAuditPathEnabled(applicationName, path);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.2
+     */
+    public void enableAudit(String applicationName, String path)
+    {
+        auditComponent.enableAudit(applicationName, path);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.2
+     */
+    public void disableAudit(String applicationName, String path)
+    {
+        auditComponent.disableAudit(applicationName, path);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.2
+     */
+    public int clearAudit(String applicationName)
+    {
+        Long now = Long.valueOf(System.currentTimeMillis());
+        return auditComponent.deleteAuditEntries(applicationName, null, now);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.4
+     */
+    @Override
+    public int clearAudit(String applicationName, Long fromTime, Long toTime)
+    {
+        toTime = (toTime == null) ? Long.valueOf(System.currentTimeMillis()) : toTime;
+        return auditComponent.deleteAuditEntries(applicationName, fromTime, toTime);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 5.2.2
+     */
+    @Override
+    public int clearAuditByIdRange(String applicationName, Long fromId, Long toId)
+    {
+        return auditComponent.deleteAuditEntriesByIdRange(applicationName, fromId, toId);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.4
+     */
+    @Override
+    public int clearAudit(List<Long> auditEntryIds)
+    {
+        return auditComponent.deleteAuditEntries(auditEntryIds);
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @since 3.3
+     */
+    public void auditQuery(AuditQueryCallback callback, AuditQueryParameters parameters, int maxResults)
+    {
+        auditComponent.auditQuery(callback, parameters, maxResults);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public HashMap<String, Long> getAuditMinMaxByApp(String applicationName, List<String> extremes)
+    {
+        return auditComponent.getAuditMinMaxByApp(applicationName, extremes);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getAuditEntriesCountByApp(String applicationName)
+    {
+        return auditComponent.getAuditEntriesCountByApp(applicationName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters)
+    {
+        return auditComponent.getAuditEntriesCountByAppAndProperties(applicationName, parameters);
+
+    }
+}

repository/src/main/java/org/alfresco/repo/content/AbstractRoutingContentStore.java

@@ -1,493 +1,484 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * 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.content;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.cache.SimpleCache;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.util.GUID;
-import org.alfresco.util.Pair;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A store providing support for content store implementations that provide
- * routing of content read and write requests based on context.
- * 
- * @see ContentContext
- * 
- * @since 2.1
- * @author Derek Hulley
- */
-public abstract class AbstractRoutingContentStore implements ContentStore
-{
-    private static Log logger = LogFactory.getLog(AbstractRoutingContentStore.class);
-    
-    private String instanceKey = GUID.generate();
-    private SimpleCache<Pair<String, String>, ContentStore> storesByContentUrl;
-    private ReadLock storesCacheReadLock;
-    private WriteLock storesCacheWriteLock;
-    
-    protected AbstractRoutingContentStore()
-    {
-        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-        storesCacheReadLock = lock.readLock();
-        storesCacheWriteLock = lock.writeLock();
-    }
-
-    /**
-     * @param storesCache       cache of stores used to access URLs 
-     */
-    public void setStoresCache(SimpleCache<Pair<String, String>, ContentStore> storesCache)
-    {
-        this.storesByContentUrl = storesCache;
-    }
-
-    /**
-     * @return          Returns a list of all possible stores available for reading or writing
-     */
-    protected abstract List<ContentStore> getAllStores();
-    
-    /**
-     * Get a content store based on the context provided.  The applicability of the
-     * context and even the types of context allowed are up to the implementation, but
-     * normally there should be a fallback case for when the parameters are not adequate
-     * to make a decision.
-     * 
-     * @param ctx       the context to use to make the choice
-     * @return          Returns the store most appropriate for the given context and
-     *                  <b>never <tt>null</tt></b>
-     */
-    protected abstract ContentStore selectWriteStore(ContentContext ctx);
-    
-    /**
-     * Checks the cache for the store and ensures that the URL is in the store.
-     * 
-     * @param contentUrl    the content URL to search for
-     * @return              Returns the store matching the content URL
-     */
-    private ContentStore selectReadStore(String contentUrl)
-    {
-        Pair<String, String> cacheKey = new Pair<String, String>(instanceKey, contentUrl);
-        storesCacheReadLock.lock();
-        try
-        {
-            // Check if the store is in the cache
-            ContentStore store = storesByContentUrl.get(cacheKey);
-            if (store != null)
-            {
-                // We found a store that was previously used
-                try
-                {
-                    // It is possible for content to be removed from a store and
-                    // it might have moved into another store.
-                    if (store.exists(contentUrl))
-                    {
-                        // We found a store and can use it
-                        return store;
-                    }
-                }
-                catch (UnsupportedContentUrlException e)
-                {
-                    // This is odd.  The store that previously supported the content URL
-                    // no longer does so.  I can't think of a reason why that would be.
-                    throw new AlfrescoRuntimeException(
-                            "Found a content store that previously supported a URL, but no longer does: \n" +
-                            "   Store:       " + store + "\n" +
-                            "   Content URL: " + contentUrl);
-                }
-            }
-        }
-        finally
-        {
-            storesCacheReadLock.unlock();
-        }
-        // Get the write lock and double check
-        storesCacheWriteLock.lock();
-        try
-        {
-            // Double check
-            ContentStore store = storesByContentUrl.get(cacheKey);
-            if (store != null && store.exists(contentUrl))
-            {
-                // We found a store and can use it
-                if (logger.isDebugEnabled())
-                {
-                    logger.debug(
-                            "Found mapped store for content URL: \n" +
-                            "   Content URL: " + contentUrl + "\n" +
-                            "   Store:       " + store);
-                }
-                return store;
-            }
-            else
-            {
-                store = null;
-            }
-            // It isn't, so search all the stores
-            List<ContentStore> stores = getAllStores();
-            // Keep track of the unsupported state of the content URL - it might be a rubbish URL
-            boolean contentUrlSupported = false;
-            for (ContentStore storeInList : stores)
-            {
-                boolean exists = false;
-                try
-                {
-                    exists = storeInList.exists(contentUrl);
-                    // At least the content URL was supported
-                    contentUrlSupported = true;
-                }
-                catch (UnsupportedContentUrlException e)
-                {
-                    // The store can't handle the content URL
-                }
-                if (!exists)
-                {
-                    // It is not in the store
-                    continue;
-                }
-                // We found one
-                store = storeInList;
-                // Put the value in the cache
-                storesByContentUrl.put(cacheKey, store);
-                break;
-            }
-            // Check if the content URL was supported
-            if (!contentUrlSupported)
-            {
-                throw new UnsupportedContentUrlException(this, contentUrl);
-            }
-            // Done
-            if (logger.isDebugEnabled())
-            {
-                logger.debug(
-                        "Mapped content URL to store for reading: \n" +
-                        "   Content URL: " + contentUrl + "\n" +
-                        "   Store:       " + store);
-            }
-            return store;
-        }
-        finally
-        {
-            storesCacheWriteLock.unlock();
-        }
-    }
-
-    /**
-     * @return      Returns <tt>true</tt> if the URL is supported by any of the stores.
-     */
-    public boolean isContentUrlSupported(String contentUrl)
-    {
-        List<ContentStore> stores = getAllStores();
-        boolean supported = false;
-        for (ContentStore store : stores)
-        {
-            if (store.isContentUrlSupported(contentUrl))
-            {
-                supported = true;
-                break;
-            }
-        }
-        // Done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("The url " + (supported ? "is" : "is not") + " supported by at least one store.");
-        }
-        return supported;
-    }
-
-    /**
-     * @return      Returns <tt>true</tt> if write is supported by any of the stores.
-     */
-    public boolean isWriteSupported()
-    {
-        List<ContentStore> stores = getAllStores();
-        boolean supported = false;
-        for (ContentStore store : stores)
-        {
-            if (store.isWriteSupported())
-            {
-                supported = true;
-                break;
-            }
-        }
-        // Done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Writing " + (supported ? "is" : "is not") + " supported by at least one store.");
-        }
-        return supported;
-    }
-
-    /**
-     * @return      Returns <b>.</b> always
-     */
-    public String getRootLocation()
-    {
-        return ".";
-    }
-
-    /**
-     * @return      Returns <tt>-1</tt> always
-     */
-    @Override
-    public long getSpaceFree()
-    {
-        return -1L;
-    }
-
-    /**
-     * @return      Returns <tt>-1</tt> always
-     */
-    @Override
-    public long getSpaceTotal()
-    {
-        return -1L;
-    }
-
-    /**
-     * @see #selectReadStore(String)
-     */
-    public boolean exists(String contentUrl) throws ContentIOException
-    {
-        ContentStore store = selectReadStore(contentUrl);
-        return (store != null);
-    }
-
-    /**
-     * @return  Returns a valid reader from one of the stores otherwise
-     *          a {@link EmptyContentReader} is returned.
-     */
-    public ContentReader getReader(String contentUrl) throws ContentIOException
-    {
-        ContentStore store = selectReadStore(contentUrl);
-        if (store != null)
-        {
-            if (logger.isDebugEnabled())
-            {
-                logger.debug("Getting reader from store: \n" +
-                        "   Content URL: " + contentUrl + "\n" +
-                        "   Store:       " + store);
-            }
-            return store.getReader(contentUrl);
-        }
-        else
-        {
-            if (logger.isDebugEnabled())
-            {
-                logger.debug("Getting empty reader for content URL: " + contentUrl);
-            }
-            return new EmptyContentReader(contentUrl);
-        }
-    }
-
-    /**
-     * Selects a store for the given context and caches store that was used.
-     * 
-     * @see #selectWriteStore(ContentContext)
-     */
-    public ContentWriter getWriter(ContentContext context) throws ContentIOException
-    {
-        String contentUrl = context.getContentUrl();
-        Pair<String, String> cacheKey = new Pair<String, String>(instanceKey, contentUrl);
-        if (contentUrl != null)
-        {
-            // Check to see if it is in the cache
-            storesCacheReadLock.lock();
-            try
-            {
-                // Check if the store is in the cache
-                ContentStore store = storesByContentUrl.get(cacheKey);
-                if (store != null)
-                {
-                    throw new ContentExistsException(this, contentUrl);
-                }
-                /*
-                 * We could go further and check each store for the existence of the URL,
-                 * but that would be overkill.  The main problem we need to prevent is
-                 * the simultaneous access of the same store.  The router represents
-                 * a single store and therefore if the URL is present in any of the stores,
-                 * it is effectively present in all of them.
-                 */
-            }
-            finally
-            {
-                storesCacheReadLock.unlock();
-            }
-        }
-        // Select the store for writing
-        ContentStore store = selectWriteStore(context);
-        // Check that we were given a valid store
-        if (store == null)
-        {
-            throw new NullPointerException(
-                    "Unable to find a writer.  'selectWriteStore' may not return null: \n" +
-                    "   Router: " + this + "\n" +
-                    "   Chose:  " + store);
-        }
-        else if (!store.isWriteSupported())
-        {
-            throw new AlfrescoRuntimeException(
-                    "A write store was chosen that doesn't support writes: \n" +
-                    "   Router: " + this + "\n" +
-                    "   Chose:  " + store);
-        }
-        ContentWriter writer = store.getWriter(context);
-        String newContentUrl = writer.getContentUrl();
-        Pair<String, String> newCacheKey = new Pair<String, String>(instanceKey, newContentUrl);
-        // Cache the store against the URL
-        storesCacheWriteLock.lock();
-        try
-        {
-            storesByContentUrl.put(newCacheKey, store);
-        }
-        finally
-        {
-            storesCacheWriteLock.unlock();
-        }
-        // Done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug(
-                    "Got writer and cache URL from store: \n" +
-                    "   Context: " + context + "\n" +
-                    "   Writer:  " + writer + "\n" +
-                    "   Store:   " + store);
-        }
-        return writer;
-    }
-
-    public ContentWriter getWriter(ContentReader existingContentReader, String newContentUrl) throws ContentIOException
-    {
-        return getWriter(new ContentContext(existingContentReader, newContentUrl));
-    }
-
-    /**
-     * This operation has to be performed on all the stores in order to maintain the
-     * {@link ContentStore#exists(String)} contract.
-     */
-    public boolean delete(String contentUrl) throws ContentIOException
-    {
-        boolean deleted = true;
-        List<ContentStore> stores = getAllStores();
-        for (ContentStore store : stores)
-        {
-            if (store.isWriteSupported())
-            {
-                deleted &= store.delete(contentUrl);
-            }
-        }
-        // Done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Deleted content URL from stores: \n" +
-                    "   Stores:  " + stores.size() + "\n" +
-                    "   Deleted: " + deleted);
-        }
-        return deleted;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Map<String, String> getStorageProperties(String contentUrl)
-    {
-        ContentStore contentStore = selectReadStore(contentUrl);
-
-        if (contentStore == null)
-        {
-            logNoContentStore(contentUrl);
-            return Collections.emptyMap();
-        }
-        final String message = "Getting storage properties from store: ";
-        logExecution(contentUrl, contentStore, message);
-
-        return contentStore.getStorageProperties(contentUrl);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
-    {
-        final ContentStore contentStore = selectReadStore(contentUrl);
-        if (contentStore == null)
-        {
-            logNoContentStore(contentUrl);
-            return ContentStore.super.requestSendContentToArchive(contentUrl, archiveParams);
-        }
-        final String message = "Sending content to archive: ";
-        logExecution(contentUrl, contentStore, message);
-        return contentStore.requestSendContentToArchive(contentUrl, archiveParams);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
-    {
-        final ContentStore contentStore = selectReadStore(contentUrl);
-        if (contentStore == null)
-        {
-            logNoContentStore(contentUrl);
-            return ContentStore.super.requestRestoreContentFromArchive(contentUrl, restoreParams);
-        }
-        final String message = "Restoring content from archive: ";
-        logExecution(contentUrl, contentStore, message);
-        return ContentStore.super.requestRestoreContentFromArchive(contentUrl, restoreParams);
-    }
-
-    private void logExecution(final String contentUrl, final ContentStore contentStore, final String message)
-    {
-        if (logger.isTraceEnabled())
-        {
-            logger.trace(message + "\n" +
-                    "   Content URL: " + contentUrl + "\n" +
-                    "   Store:       " + contentStore);
-        }
-    }
-
-    private void logNoContentStore(String contentUrl)
-    {
-        if (logger.isTraceEnabled())
-        {
-            logger.trace("Content Store not found for content URL: " + contentUrl);
-        }
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * 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.content;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.util.GUID;
+import org.alfresco.util.Pair;
+
+/**
+ * A store providing support for content store implementations that provide routing of content read and write requests based on context.
+ * 
+ * @see ContentContext
+ * 
+ * @since 2.1
+ * @author Derek Hulley
+ */
+public abstract class AbstractRoutingContentStore implements ContentStore
+{
+    private static Log logger = LogFactory.getLog(AbstractRoutingContentStore.class);
+
+    private String instanceKey = GUID.generate();
+    private SimpleCache<Pair<String, String>, ContentStore> storesByContentUrl;
+    private ReadLock storesCacheReadLock;
+    private WriteLock storesCacheWriteLock;
+
+    protected AbstractRoutingContentStore()
+    {
+        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+        storesCacheReadLock = lock.readLock();
+        storesCacheWriteLock = lock.writeLock();
+    }
+
+    /**
+     * @param storesCache
+     *            cache of stores used to access URLs
+     */
+    public void setStoresCache(SimpleCache<Pair<String, String>, ContentStore> storesCache)
+    {
+        this.storesByContentUrl = storesCache;
+    }
+
+    /**
+     * @return Returns a list of all possible stores available for reading or writing
+     */
+    protected abstract List<ContentStore> getAllStores();
+
+    /**
+     * Get a content store based on the context provided. The applicability of the context and even the types of context allowed are up to the implementation, but normally there should be a fallback case for when the parameters are not adequate to make a decision.
+     * 
+     * @param ctx
+     *            the context to use to make the choice
+     * @return Returns the store most appropriate for the given context and <b>never <tt>null</tt></b>
+     */
+    protected abstract ContentStore selectWriteStore(ContentContext ctx);
+
+    /**
+     * Checks the cache for the store and ensures that the URL is in the store.
+     * 
+     * @param contentUrl
+     *            the content URL to search for
+     * @return Returns the store matching the content URL
+     */
+    private ContentStore selectReadStore(String contentUrl)
+    {
+        Pair<String, String> cacheKey = new Pair<String, String>(instanceKey, contentUrl);
+        storesCacheReadLock.lock();
+        try
+        {
+            // Check if the store is in the cache
+            ContentStore store = storesByContentUrl.get(cacheKey);
+            if (store != null)
+            {
+                // We found a store that was previously used
+                try
+                {
+                    // It is possible for content to be removed from a store and
+                    // it might have moved into another store.
+                    if (store.exists(contentUrl))
+                    {
+                        // We found a store and can use it
+                        return store;
+                    }
+                }
+                catch (UnsupportedContentUrlException e)
+                {
+                    // This is odd. The store that previously supported the content URL
+                    // no longer does so. I can't think of a reason why that would be.
+                    throw new AlfrescoRuntimeException(
+                            "Found a content store that previously supported a URL, but no longer does: \n" +
+                                    "   Store:       " + store + "\n" +
+                                    "   Content URL: " + contentUrl);
+                }
+            }
+        }
+        finally
+        {
+            storesCacheReadLock.unlock();
+        }
+        // Get the write lock and double check
+        storesCacheWriteLock.lock();
+        try
+        {
+            // Double check
+            ContentStore store = storesByContentUrl.get(cacheKey);
+            if (store != null && store.exists(contentUrl))
+            {
+                // We found a store and can use it
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug(
+                            "Found mapped store for content URL: \n" +
+                                    "   Content URL: " + contentUrl + "\n" +
+                                    "   Store:       " + store);
+                }
+                return store;
+            }
+            else
+            {
+                store = null;
+            }
+            // It isn't, so search all the stores
+            List<ContentStore> stores = getAllStores();
+            // Keep track of the unsupported state of the content URL - it might be a rubbish URL
+            boolean contentUrlSupported = false;
+            for (ContentStore storeInList : stores)
+            {
+                boolean exists = false;
+                try
+                {
+                    exists = storeInList.exists(contentUrl);
+                    // At least the content URL was supported
+                    contentUrlSupported = true;
+                }
+                catch (UnsupportedContentUrlException e)
+                {
+                    // The store can't handle the content URL
+                }
+                if (!exists)
+                {
+                    // It is not in the store
+                    continue;
+                }
+                // We found one
+                store = storeInList;
+                // Put the value in the cache
+                storesByContentUrl.put(cacheKey, store);
+                break;
+            }
+            // Check if the content URL was supported
+            if (!contentUrlSupported)
+            {
+                throw new UnsupportedContentUrlException(this, contentUrl);
+            }
+            // Done
+            if (logger.isDebugEnabled())
+            {
+                logger.debug(
+                        "Mapped content URL to store for reading: \n" +
+                                "   Content URL: " + contentUrl + "\n" +
+                                "   Store:       " + store);
+            }
+            return store;
+        }
+        finally
+        {
+            storesCacheWriteLock.unlock();
+        }
+    }
+
+    /**
+     * @return Returns <tt>true</tt> if the URL is supported by any of the stores.
+     */
+    public boolean isContentUrlSupported(String contentUrl)
+    {
+        List<ContentStore> stores = getAllStores();
+        boolean supported = false;
+        for (ContentStore store : stores)
+        {
+            if (store.isContentUrlSupported(contentUrl))
+            {
+                supported = true;
+                break;
+            }
+        }
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("The url " + (supported ? "is" : "is not") + " supported by at least one store.");
+        }
+        return supported;
+    }
+
+    /**
+     * @return Returns <tt>true</tt> if write is supported by any of the stores.
+     */
+    public boolean isWriteSupported()
+    {
+        List<ContentStore> stores = getAllStores();
+        boolean supported = false;
+        for (ContentStore store : stores)
+        {
+            if (store.isWriteSupported())
+            {
+                supported = true;
+                break;
+            }
+        }
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Writing " + (supported ? "is" : "is not") + " supported by at least one store.");
+        }
+        return supported;
+    }
+
+    /**
+     * @return Returns <b>.</b> always
+     */
+    public String getRootLocation()
+    {
+        return ".";
+    }
+
+    /**
+     * @return Returns <tt>-1</tt> always
+     */
+    @Override
+    public long getSpaceFree()
+    {
+        return -1L;
+    }
+
+    /**
+     * @return Returns <tt>-1</tt> always
+     */
+    @Override
+    public long getSpaceTotal()
+    {
+        return -1L;
+    }
+
+    /**
+     * @see #selectReadStore(String)
+     */
+    public boolean exists(String contentUrl) throws ContentIOException
+    {
+        ContentStore store = selectReadStore(contentUrl);
+        return (store != null);
+    }
+
+    /**
+     * @return Returns a valid reader from one of the stores otherwise a {@link EmptyContentReader} is returned.
+     */
+    public ContentReader getReader(String contentUrl) throws ContentIOException
+    {
+        ContentStore store = selectReadStore(contentUrl);
+        if (store != null)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Getting reader from store: \n" +
+                        "   Content URL: " + contentUrl + "\n" +
+                        "   Store:       " + store);
+            }
+            return store.getReader(contentUrl);
+        }
+        else
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Getting empty reader for content URL: " + contentUrl);
+            }
+            return new EmptyContentReader(contentUrl);
+        }
+    }
+
+    /**
+     * Selects a store for the given context and caches store that was used.
+     * 
+     * @see #selectWriteStore(ContentContext)
+     */
+    public ContentWriter getWriter(ContentContext context) throws ContentIOException
+    {
+        String contentUrl = context.getContentUrl();
+        Pair<String, String> cacheKey = new Pair<String, String>(instanceKey, contentUrl);
+        if (contentUrl != null)
+        {
+            // Check to see if it is in the cache
+            storesCacheReadLock.lock();
+            try
+            {
+                // Check if the store is in the cache
+                ContentStore store = storesByContentUrl.get(cacheKey);
+                if (store != null)
+                {
+                    throw new ContentExistsException(this, contentUrl);
+                }
+                /* We could go further and check each store for the existence of the URL, but that would be overkill. The main problem we need to prevent is the simultaneous access of the same store. The router represents a single store and therefore if the URL is present in any of the stores, it is effectively present in all of them. */
+            }
+            finally
+            {
+                storesCacheReadLock.unlock();
+            }
+        }
+        // Select the store for writing
+        ContentStore store = selectWriteStore(context);
+        // Check that we were given a valid store
+        if (store == null)
+        {
+            throw new NullPointerException(
+                    "Unable to find a writer.  'selectWriteStore' may not return null: \n" +
+                            "   Router: " + this + "\n" +
+                            "   Chose:  " + store);
+        }
+        else if (!store.isWriteSupported())
+        {
+            throw new AlfrescoRuntimeException(
+                    "A write store was chosen that doesn't support writes: \n" +
+                            "   Router: " + this + "\n" +
+                            "   Chose:  " + store);
+        }
+        ContentWriter writer = store.getWriter(context);
+        String newContentUrl = writer.getContentUrl();
+        Pair<String, String> newCacheKey = new Pair<String, String>(instanceKey, newContentUrl);
+        // Cache the store against the URL
+        storesCacheWriteLock.lock();
+        try
+        {
+            storesByContentUrl.put(newCacheKey, store);
+        }
+        finally
+        {
+            storesCacheWriteLock.unlock();
+        }
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(
+                    "Got writer and cache URL from store: \n" +
+                            "   Context: " + context + "\n" +
+                            "   Writer:  " + writer + "\n" +
+                            "   Store:   " + store);
+        }
+        return writer;
+    }
+
+    public ContentWriter getWriter(ContentReader existingContentReader, String newContentUrl) throws ContentIOException
+    {
+        return getWriter(new ContentContext(existingContentReader, newContentUrl));
+    }
+
+    /**
+     * This operation has to be performed on all the stores in order to maintain the {@link ContentStore#exists(String)} contract.
+     */
+    public boolean delete(String contentUrl) throws ContentIOException
+    {
+        boolean deleted = true;
+        List<ContentStore> stores = getAllStores();
+        for (ContentStore store : stores)
+        {
+            if (store.isWriteSupported())
+            {
+                deleted &= store.delete(contentUrl);
+            }
+        }
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Deleted content URL from stores: \n" +
+                    "   Stores:  " + stores.size() + "\n" +
+                    "   Deleted: " + deleted);
+        }
+        return deleted;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Map<String, String> getStorageProperties(String contentUrl)
+    {
+        ContentStore contentStore = selectReadStore(contentUrl);
+
+        if (contentStore == null)
+        {
+            logNoContentStore(contentUrl);
+            return Collections.emptyMap();
+        }
+        final String message = "Getting storage properties from store: ";
+        logExecution(contentUrl, contentStore, message);
+
+        return contentStore.getStorageProperties(contentUrl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
+    {
+        final ContentStore contentStore = selectReadStore(contentUrl);
+        if (contentStore == null)
+        {
+            logNoContentStore(contentUrl);
+            return ContentStore.super.requestSendContentToArchive(contentUrl, archiveParams);
+        }
+        final String message = "Sending content to archive: ";
+        logExecution(contentUrl, contentStore, message);
+        return contentStore.requestSendContentToArchive(contentUrl, archiveParams);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
+    {
+        final ContentStore contentStore = selectReadStore(contentUrl);
+        if (contentStore == null)
+        {
+            logNoContentStore(contentUrl);
+            return ContentStore.super.requestRestoreContentFromArchive(contentUrl, restoreParams);
+        }
+        final String message = "Restoring content from archive: ";
+        logExecution(contentUrl, contentStore, message);
+        return contentStore.requestRestoreContentFromArchive(contentUrl, restoreParams);
+    }
+
+    private void logExecution(final String contentUrl, final ContentStore contentStore, final String message)
+    {
+        if (logger.isTraceEnabled())
+        {
+            logger.trace(message + "\n" +
+                    "   Content URL: " + contentUrl + "\n" +
+                    "   Store:       " + contentStore);
+        }
+    }
+
+    private void logNoContentStore(String contentUrl)
+    {
+        if (logger.isTraceEnabled())
+        {
+            logger.trace("Content Store not found for content URL: " + contentUrl);
+        }
+    }
+}

repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java

@@ -1,123 +1,117 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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.repo.domain;
-
-import java.io.UnsupportedEncodingException;
-import java.util.zip.CRC32;
-
-import org.alfresco.util.Pair;
-
-/**
- * Helper class to calculate CRC values for string persistence.
- * 
- * @author Derek Hulley
- * @since 3.2
- */
-public class CrcHelper
-{
-    public static final String EMPTY_STRING = ".empty";
-    
-    /**
-     * Calculate a persistable, unique pair of values that can be persisted in a database unique
-     * key and guarantee correct case-sensitivity.
-     * <p>
-     * While the short-string version of the value is always lowercase, the CRC is
-     * calculated from the virgin string if case-sensitivity is enforced; in the case-insensitive
-     * case, the CRC is calculated from a lowercase version of the string.
-     * <p>
-     * If the value is an empty string, then {@link #EMPTY_STRING} is used instead.  This ensures
-     * that persisted values don't fall foul of the Oracle empty string comparison "behaviour" i.e
-     * you should never persist an empty string in Oracle as it equates to a SQL <b>NULL</b>.
-     * 
-     * @param value             the raw value that will be persisted
-     * @param dataLength        the maximum number of characters that can be persisted
-     * @param useCharsFromStart <tt>true</tt> if the shortened string value must be made from
-     *                          the first characters of the string or <tt>false</tt> to use
-     *                          characters from the end of the string.
-     * @param caseSensitive     <tt>true</tt> if the resulting pair must be case-sensitive or
-     *                          <tt>false</tt> if the pair must be case-insensitive.
-     * @return                  Return the persistable pair.  The result will never be <tt>null</tt>,
-     *                          but the individual pair values will be <tt>null</tt> if the
-     *                          value given is <tt>null</tt>
-     */
-    public static Pair<String, Long> getStringCrcPair(
-            String value,
-            int dataLength,
-            boolean useCharsFromStart,
-            boolean caseSensitive)
-    {
-        String valueLowerCase;
-        if (value == null)
-        {
-            return new Pair<String, Long>(null, null);
-        }
-        else if (value.length() == 0)
-        {
-            value = CrcHelper.EMPTY_STRING;
-            valueLowerCase = value;
-        }
-        else
-        {
-            valueLowerCase = value.toLowerCase();
-        }
-        Long valueCrc;
-        try
-        {
-            CRC32 crc = new CRC32();
-            if (caseSensitive)
-            {
-                crc.update(value.getBytes("UTF-8"));
-            }
-            else
-            {
-                crc.update(valueLowerCase.getBytes("UTF-8"));
-            }
-            valueCrc = crc.getValue();
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            throw new RuntimeException("UTF-8 encoding is not supported");
-        }
-        // Crc Value will change based on the case-sensitive, So we need to get the short value based on case-sensitive
-        String valueShort = null;
-        String currentValue = caseSensitive ? value : valueLowerCase;
-        int valueLen = currentValue.length();
-        if (valueLen < dataLength)
-        {
-            valueShort = currentValue;
-        }
-        else if (useCharsFromStart)
-        {
-            valueShort = currentValue.substring(0, dataLength - 1);
-        }
-        else
-        {
-            valueShort = currentValue.substring(valueLen - dataLength);
-        }
-        return new Pair<String, Long>(valueShort, valueCrc);
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.repo.domain;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.CRC32;
+
+import org.alfresco.util.Pair;
+
+/**
+ * Helper class to calculate CRC values for string persistence.
+ * 
+ * @author Derek Hulley
+ * @since 3.2
+ */
+public class CrcHelper
+{
+    public static final String EMPTY_STRING = ".empty";
+
+    /**
+     * Calculate a persistable, unique pair of values that can be persisted in a database unique key and guarantee correct case-sensitivity.
+     * <p>
+     * While the short-string version of the value is always lowercase, the CRC is calculated from the virgin string if case-sensitivity is enforced; in the case-insensitive case, the CRC is calculated from a lowercase version of the string.
+     * <p>
+     * If the value is an empty string, then {@link #EMPTY_STRING} is used instead. This ensures that persisted values don't fall foul of the Oracle empty string comparison "behaviour" i.e you should never persist an empty string in Oracle as it equates to a SQL <b>NULL</b>.
+     * 
+     * @param value
+     *            the raw value that will be persisted
+     * @param dataLength
+     *            the maximum number of characters that can be persisted
+     * @param useCharsFromStart
+     *            <tt>true</tt> if the shortened string value must be made from the first characters of the string or <tt>false</tt> to use characters from the end of the string.
+     * @param caseSensitive
+     *            <tt>true</tt> if the resulting pair must be case-sensitive or <tt>false</tt> if the pair must be case-insensitive.
+     * @return Return the persistable pair. The result will never be <tt>null</tt>, but the individual pair values will be <tt>null</tt> if the value given is <tt>null</tt>
+     */
+    public static Pair<String, Long> getStringCrcPair(
+            String value,
+            int dataLength,
+            boolean useCharsFromStart,
+            boolean caseSensitive)
+    {
+        String valueLowerCase;
+        if (value == null)
+        {
+            return new Pair<String, Long>(null, null);
+        }
+        else if (value.length() == 0)
+        {
+            value = CrcHelper.EMPTY_STRING;
+            valueLowerCase = value;
+        }
+        else
+        {
+            valueLowerCase = value.toLowerCase();
+        }
+        Long valueCrc;
+        try
+        {
+            CRC32 crc = new CRC32();
+            if (caseSensitive)
+            {
+                crc.update(value.getBytes("UTF-8"));
+            }
+            else
+            {
+                crc.update(valueLowerCase.getBytes("UTF-8"));
+            }
+            valueCrc = crc.getValue();
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            throw new RuntimeException("UTF-8 encoding is not supported");
+
+        }
+        // Get the short value (case-sensitive or not)
+        String valueShort = null;
+        int valueLen = valueLowerCase.length();
+        if (valueLen < dataLength)
+        {
+            valueShort = valueLowerCase;
+        }
+        else if (useCharsFromStart)
+        {
+            valueShort = valueLowerCase.substring(0, dataLength - 1);
+        }
+        else
+        {
+            valueShort = valueLowerCase.substring(valueLen - dataLength);
+        }
+        return new Pair<String, Long>(valueShort, valueCrc);
+    }
+}

repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java

@@ -1,258 +1,285 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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.repo.domain.audit;
-
-import java.io.Serializable;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
-import org.alfresco.service.cmr.repository.ContentData;
-import org.alfresco.util.Pair;
-
-/**
- * DAO services for <b>alf_audit_XXX</b> tables.
- * <p>
- * The older methods are supported by a different implementation and will eventually
- * be deprecated and phased out.
- * 
- * @author Derek Hulley
- * @since 3.2
- */
-public interface AuditDAO
-{
-    /*
-     * V3.2 methods after here only, please
-     */
-
-    /**
-     * Information about the audit application to be passed in an out of the interface.
-     * 
-     * @author Derek Hulley
-     * @since 3.2
-     */
-    public static class AuditApplicationInfo
-    {
-        private Long id;
-        private String name;
-        private Long modelId;
-        private Long disabledPathsId;
-        
-        @Override
-        public String toString()
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.append("AuditApplicationInfo ")
-              .append("[ id=").append(id)
-              .append(", name=").append(name)
-              .append(", modelId=").append(modelId)
-              .append(", disabledPathsId=").append(disabledPathsId)
-              .append("]");
-            return sb.toString();
-        }
-        
-        public Long getId()
-        {
-            return id;
-        }
-        public void setId(Long id)
-        {
-            this.id = id;
-        }
-        public String getName()
-        {
-            return name;
-        }
-        public void setname(String name)
-        {
-            this.name = name;
-        }
-        public Long getModelId()
-        {
-            return modelId;
-        }
-        public void setModelId(Long modelId)
-        {
-            this.modelId = modelId;
-        }
-        public Long getDisabledPathsId()
-        {
-            return disabledPathsId;
-        }
-        public void setDisabledPathsId(Long disabledPathsId)
-        {
-            this.disabledPathsId = disabledPathsId;
-        }
-    }
-    
-    /**
-     * Creates a new audit model entry or finds an existing one
-     * 
-     * @param  url          the URL of the configuration
-     * @return              Returns the ID of the config matching the input stream and the
-     *                      content storage details
-     * @since 3.2
-     */
-    Pair<Long, ContentData> getOrCreateAuditModel(URL url);
-    
-    /**
-     * Get the audit application details.
-     * 
-     * @param applicationName   the name of the application
-     * @return                  Returns details of an existing application or <tt>null</tt> if it doesn't exist
-     * 
-     * @since 3.2
-     */
-    AuditApplicationInfo getAuditApplication(String applicationName);
-
-    /**
-     * Creates a new audit application.  The application name must be unique.
-     * 
-     * @param application       the name of the application
-     * @param modelId           the ID of the model configuration
-     * 
-     * @since 3.2
-     */
-    AuditApplicationInfo createAuditApplication(String application, Long modelId);
-    
-    /**
-     * Update the audit application to refer to a new model.
-     * If the model did not change, then nothing will be done.
-     * 
-     * @param id                the ID of the audit application
-     * @param modelId           the ID of the new model
-     * 
-     * @since 3.2
-     */
-    void updateAuditApplicationModel(Long id, Long modelId);
-    
-    /**
-     * Update the audit application to hold a new set of disabled paths.
-     * If the value did not change, then nothing will be done.
-     * 
-     * @param id                the ID of the audit application
-     * @param disabledPaths     the new disabled paths
-     * 
-     * @since 3.2
-     */
-    void updateAuditApplicationDisabledPaths(Long id, Set<String> disabledPaths);
-    
-    /**
-     * Delete audit entries for the application, possibly limiting the time range.
-     * 
-     * @param applicationId     an existing audit application ID
-     * @param fromTime          the minimum entry time (inclusive, optional)
-     * @param toTime            the maximum entry time (exclusive, optional)
-     * @return                  Returns the number of entries deleted
-     * 
-     * @since 3.2
-     */
-    int deleteAuditEntries(Long applicationId, Long fromTime, Long toTime);
-
-    /**
-     * Delete audit entries for the application for given id range.
-     *
-     * @param applicationId     an existing audit application ID
-     * @param fromId            the minimum fromId (inclusive, optional)
-     * @param toId              the maximum toId (exclusive, optional)
-     * @return                  Returns the number of entries deleted
-     *
-     * @since 5.2.2
-     */
-    int deleteAuditEntriesByIdRange(Long applicationId, Long fromId, Long toId);
-
-    /**
-     * Delete a discrete list of audit entries.  Duplicate entries are collapsed
-     * and the number of entries deleted will match the count of unique IDs in
-     * the list; otherwise a concurrency condition has occured and an exception
-     * will be generated.
-     * 
-     * @param auditEntryIds     the IDs of all audit entries to delete
-     * @return                  Returns the number of entries deleted
-     */
-    int deleteAuditEntries(List<Long> auditEntryIds);
-    
-    /**
-     * Create a new audit entry with the given map of values.
-     * 
-     * @param applicationId     an existing audit application ID
-     * @param time              the time (ms since epoch) to log the entry against
-     * @param username          the authenticated user (<tt>null</tt> if not present)
-     * @param values            the values to record
-     * @return                  Returns the unique entry ID
-     * 
-     * @since 3.2
-     */
-    Long createAuditEntry(Long applicationId, long time, String username, Map<String, Serializable> values);
-    
-    /**
-     * Find audit entries using the given parameters, any of which may be null
-     * 
-     * @param callback          the data callback per entry
-     * @param parameters        the parameters for the query (may not be <tt>null</tt>)
-     * @param maxResults        the maximum number of results to retrieve (must be greater than 0)
-     * 
-     * @throws IllegalArgumentException if maxResults less or equal to zero
-     */
-    void findAuditEntries(
-            AuditQueryCallback callback,
-            org.alfresco.service.cmr.audit.AuditQueryParameters parameters,
-            int maxResults);
-
-    /**
-     * Issue an audit query to retrieve min / max audit record id for a given application.
-     *
-     * @param appId             the database id of the application
-     * @param extremes          a list containing min/max or both
-     * @return                  a map containing min/max and the associated value
-     */
-    HashMap<String, Long> getAuditMinMaxByApp(long appId, List<String> extremes);
-
-    /**
-     * Issue an audit query to retrieve count of records for a given application.
-     *
-     * @param applicationId             the database id of the application
-     * @return                  a map containing min/max and the associated value
-     */
-    default int getAuditEntriesCountByApp(long applicationId)
-    {
-        return -1;
-    }
-
-    /**
-     * Issue an audit query to retrieve count of records for a given application and properties
-     *
-     * @param parameters        audit parameters provided by the <code>where</code> clause on the ReST API
-     * @return                  a map containing min/max and the associated value
-     */
-    default int getAuditEntriesCountByAppAndProperties(org.alfresco.service.cmr.audit.AuditQueryParameters parameters)
-    {
-        return -1;
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.repo.domain.audit;
+
+import java.io.Serializable;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.util.Pair;
+
+/**
+ * DAO services for <b>alf_audit_XXX</b> tables.
+ * <p>
+ * The older methods are supported by a different implementation and will eventually be deprecated and phased out.
+ * 
+ * @author Derek Hulley
+ * @since 3.2
+ */
+public interface AuditDAO
+{
+    /* V3.2 methods after here only, please */
+
+    /**
+     * Information about the audit application to be passed in an out of the interface.
+     * 
+     * @author Derek Hulley
+     * @since 3.2
+     */
+    public static class AuditApplicationInfo
+    {
+        private Long id;
+        private String name;
+        private Long modelId;
+        private Long disabledPathsId;
+
+        @Override
+        public String toString()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.append("AuditApplicationInfo ")
+                    .append("[ id=").append(id)
+                    .append(", name=").append(name)
+                    .append(", modelId=").append(modelId)
+                    .append(", disabledPathsId=").append(disabledPathsId)
+                    .append("]");
+            return sb.toString();
+        }
+
+        public Long getId()
+        {
+            return id;
+        }
+
+        public void setId(Long id)
+        {
+            this.id = id;
+        }
+
+        public String getName()
+        {
+            return name;
+        }
+
+        public void setname(String name)
+        {
+            this.name = name;
+        }
+
+        public Long getModelId()
+        {
+            return modelId;
+        }
+
+        public void setModelId(Long modelId)
+        {
+            this.modelId = modelId;
+        }
+
+        public Long getDisabledPathsId()
+        {
+            return disabledPathsId;
+        }
+
+        public void setDisabledPathsId(Long disabledPathsId)
+        {
+            this.disabledPathsId = disabledPathsId;
+        }
+    }
+
+    /**
+     * Creates a new audit model entry or finds an existing one
+     * 
+     * @param url
+     *            the URL of the configuration
+     * @return Returns the ID of the config matching the input stream and the content storage details
+     * @since 3.2
+     */
+    Pair<Long, ContentData> getOrCreateAuditModel(URL url);
+
+    /**
+     * Get the audit application details.
+     * 
+     * @param applicationName
+     *            the name of the application
+     * @return Returns details of an existing application or <tt>null</tt> if it doesn't exist
+     * 
+     * @since 3.2
+     */
+    AuditApplicationInfo getAuditApplication(String applicationName);
+
+    /**
+     * Creates a new audit application. The application name must be unique.
+     * 
+     * @param application
+     *            the name of the application
+     * @param modelId
+     *            the ID of the model configuration
+     * 
+     * @since 3.2
+     */
+    AuditApplicationInfo createAuditApplication(String application, Long modelId);
+
+    /**
+     * Update the audit application to refer to a new model. If the model did not change, then nothing will be done.
+     * 
+     * @param id
+     *            the ID of the audit application
+     * @param modelId
+     *            the ID of the new model
+     * 
+     * @since 3.2
+     */
+    void updateAuditApplicationModel(Long id, Long modelId);
+
+    /**
+     * Update the audit application to hold a new set of disabled paths. If the value did not change, then nothing will be done.
+     * 
+     * @param id
+     *            the ID of the audit application
+     * @param disabledPaths
+     *            the new disabled paths
+     * 
+     * @since 3.2
+     */
+    void updateAuditApplicationDisabledPaths(Long id, Set<String> disabledPaths);
+
+    /**
+     * Delete audit entries for the application, possibly limiting the time range.
+     * 
+     * @param applicationId
+     *            an existing audit application ID
+     * @param fromTime
+     *            the minimum entry time (inclusive, optional)
+     * @param toTime
+     *            the maximum entry time (exclusive, optional)
+     * @return Returns the number of entries deleted
+     * 
+     * @since 3.2
+     */
+    int deleteAuditEntries(Long applicationId, Long fromTime, Long toTime);
+
+    /**
+     * Delete audit entries for the application for given id range.
+     *
+     * @param applicationId
+     *            an existing audit application ID
+     * @param fromId
+     *            the minimum fromId (inclusive, optional)
+     * @param toId
+     *            the maximum toId (exclusive, optional)
+     * @return Returns the number of entries deleted
+     *
+     * @since 5.2.2
+     */
+    int deleteAuditEntriesByIdRange(Long applicationId, Long fromId, Long toId);
+
+    /**
+     * Delete a discrete list of audit entries. Duplicate entries are collapsed and the number of entries deleted will match the count of unique IDs in the list; otherwise a concurrency condition has occured and an exception will be generated.
+     * 
+     * @param auditEntryIds
+     *            the IDs of all audit entries to delete
+     * @return Returns the number of entries deleted
+     */
+    int deleteAuditEntries(List<Long> auditEntryIds);
+
+    /**
+     * Create a new audit entry with the given map of values.
+     * 
+     * @param applicationId
+     *            an existing audit application ID
+     * @param time
+     *            the time (ms since epoch) to log the entry against
+     * @param username
+     *            the authenticated user (<tt>null</tt> if not present)
+     * @param values
+     *            the values to record
+     * @return Returns the unique entry ID
+     * 
+     * @since 3.2
+     */
+    Long createAuditEntry(Long applicationId, long time, String username, Map<String, Serializable> values);
+
+    /**
+     * Find audit entries using the given parameters, any of which may be null
+     * 
+     * @param callback
+     *            the data callback per entry
+     * @param parameters
+     *            the parameters for the query (may not be <tt>null</tt>)
+     * @param maxResults
+     *            the maximum number of results to retrieve (must be greater than 0)
+     * 
+     * @throws IllegalArgumentException
+     *             if maxResults less or equal to zero
+     */
+    void findAuditEntries(
+            AuditQueryCallback callback,
+            org.alfresco.service.cmr.audit.AuditQueryParameters parameters,
+            int maxResults);
+
+    /**
+     * Issue an audit query to retrieve min / max audit record id for a given application.
+     *
+     * @param appId
+     *            the database id of the application
+     * @param extremes
+     *            a list containing min/max or both
+     * @return a map containing min/max and the associated value
+     */
+    HashMap<String, Long> getAuditMinMaxByApp(long appId, List<String> extremes);
+
+    /**
+     * Issue an audit query to retrieve count of records for a given application.
+     *
+     * @param applicationId
+     *            the database id of the application
+     * @return a map containing min/max and the associated value
+     */
+    default int getAuditEntriesCountByApp(long applicationId)
+    {
+        return -1;
+    }
+
+    /**
+     * Issue an audit query to retrieve count of records for a given application and properties
+     *
+     * @param applicationName
+     *            name of the application to be queried
+     * @param parameters
+     *            audit parameters provided by the <code>where</code> clause on the ReST API
+     * @return a map containing min/max and the associated value
+     */
+    default int getAuditEntriesCountByAppAndProperties(String applicationName, org.alfresco.service.cmr.audit.AuditQueryParameters parameters)
+    {
+        return -1;
+    }
+}

repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java

@@ -1,316 +1,315 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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.repo.domain.audit.ibatis;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.alfresco.repo.domain.audit.AbstractAuditDAOImpl;
-import org.alfresco.repo.domain.audit.AuditApplicationEntity;
-import org.alfresco.repo.domain.audit.AuditDeleteParameters;
-import org.alfresco.repo.domain.audit.AuditEntryEntity;
-import org.alfresco.repo.domain.audit.AuditModelEntity;
-import org.alfresco.repo.domain.audit.AuditQueryParameters;
-import org.alfresco.repo.domain.audit.AuditQueryResult;
-import org.alfresco.repo.domain.propval.PropertyValueDAO.PropertyFinderCallback;
-import org.alfresco.util.Pair;
-import org.apache.ibatis.session.RowBounds;
-import org.mybatis.spring.SqlSessionTemplate;
-import org.springframework.dao.ConcurrencyFailureException;
-
-/**
- * iBatis-specific implementation of the DAO for <b>alf_audit_XXX</b> tables.
- * 
- * @author Derek Hulley
- * @since 3.2
- */
-public class AuditDAOImpl extends AbstractAuditDAOImpl
-{
-    private static final String SELECT_MODEL_BY_CRC = "alfresco.audit.select_AuditModelByCrc";
-    private static final String INSERT_MODEL = "alfresco.audit.insert.insert_AuditModel";
-    
-    private static final String SELECT_APPLICATION_BY_ID = "alfresco.audit.select_AuditApplicationById";
-    private static final String SELECT_APPLICATION_BY_NAME_ID = "alfresco.audit.select_AuditApplicationByNameId";
-    private static final String INSERT_APPLICATION = "alfresco.audit.insert.insert_AuditApplication";
-    private static final String UPDATE_APPLICATION = "alfresco.audit.update_AuditApplication";
-    
-    private static final String DELETE_ENTRIES = "alfresco.audit.delete_AuditEntries";
-    private static final String DELETE_ENTRIES_BY_ID = "alfresco.audit.delete_AuditEntriesById";
-    private static final String INSERT_ENTRY = "alfresco.audit.insert.insert_AuditEntry";
-    private static final String SELECT_MINMAX_ENTRY_FOR_APP = "alfresco.audit.select_MinMaxAuditEntryId";
-    private static final String SELECT_COUNT_ENTRIES_FOR_APP = "alfresco.audit.select_CountAuditEntryId";
-    private static final String SELECT_COUNT_ENTRIES_FOR_APP_WITH_PROPERTIES = "select_CountAuditEntryIdWithWhereClause";
-    
-    @SuppressWarnings("unused")
-    private static final String SELECT_ENTRIES_SIMPLE = "alfresco.audit.select_AuditEntriesSimple";
-    private static final String SELECT_ENTRIES_WITH_VALUES = "alfresco.audit.select_AuditEntriesWithValues";
-    private static final String SELECT_ENTRIES_WITHOUT_VALUES = "alfresco.audit.select_AuditEntriesWithoutValues";
-    
-    private SqlSessionTemplate template;
-    
-    public final void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) 
-    {
-        this.template = sqlSessionTemplate;
-    }
-
-    @Override
-    protected AuditModelEntity getAuditModelByCrc(long crc)
-    {
-        AuditModelEntity entity = new AuditModelEntity();
-        entity.setContentCrc(crc);
-        entity = template.selectOne(
-                SELECT_MODEL_BY_CRC,
-                entity);
-        // Done
-        return entity;
-    }
-
-    @Override
-    protected AuditModelEntity createAuditModel(Long contentDataId, long crc)
-    {
-        AuditModelEntity entity = new AuditModelEntity();
-        entity.setContentDataId(contentDataId);
-        entity.setContentCrc(crc);
-        template.insert(INSERT_MODEL, entity);
-        return entity;
-    }
-
-    @Override
-    protected AuditApplicationEntity getAuditApplicationById(Long id)
-    {
-        Map<String, Object> params = new HashMap<String, Object>(11);
-        params.put("id", id);
-        AuditApplicationEntity entity = template.selectOne(
-                SELECT_APPLICATION_BY_ID,
-                params);
-        // Done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Searched for audit application ID " + id + " and found: " + entity);
-        }
-        return entity;
-    }
-
-    @Override
-    protected AuditApplicationEntity getAuditApplicationByName(String appName)
-    {
-        // Resolve the name as a property ID
-        Pair<Long, Serializable> appNamePair = propertyValueDAO.getPropertyValue(appName);
-        if (appNamePair == null)
-        {
-            // There will be no results
-            return null;
-        }
-        
-        Map<String, Object> params = new HashMap<String, Object>(11);
-        params.put("id", appNamePair.getFirst());
-        AuditApplicationEntity entity = template.selectOne(
-                SELECT_APPLICATION_BY_NAME_ID,
-                params);
-        // Done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Searched for audit application '" + appName + "' and found: " + entity);
-        }
-        return entity;
-    }
-
-    @Override
-    protected AuditApplicationEntity createAuditApplication(Long appNameId, Long modelId, Long disabledPathsId)
-    {
-        AuditApplicationEntity entity = new AuditApplicationEntity();
-        entity.setVersion((short)0);
-        entity.setApplicationNameId(appNameId);
-        entity.setAuditModelId(modelId);
-        entity.setDisabledPathsId(disabledPathsId);
-        template.insert(INSERT_APPLICATION, entity);
-        return entity;
-    }
-
-    @Override
-    protected AuditApplicationEntity updateAuditApplication(AuditApplicationEntity entity)
-    {
-        AuditApplicationEntity updateEntity = new AuditApplicationEntity();
-        updateEntity.setId(entity.getId());
-        updateEntity.setVersion(entity.getVersion());
-        updateEntity.incrementVersion();
-        updateEntity.setApplicationNameId(entity.getApplicationNameId());
-        updateEntity.setAuditModelId(entity.getAuditModelId());
-        updateEntity.setDisabledPathsId(entity.getDisabledPathsId());
-        
-        int updated = template.update(UPDATE_APPLICATION, updateEntity);
-        if (updated != 1)
-        {
-            // unexpected number of rows affected
-            throw new ConcurrencyFailureException("Incorrect number of rows affected for updateAuditApplication: " + updateEntity + ": expected 1, actual " + updated);
-        }
-        
-        // Done
-        return updateEntity;
-    }
-
-    public int deleteAuditEntries(Long applicationId, Long from, Long to)
-    {
-        AuditDeleteParameters params = new AuditDeleteParameters();
-        params.setAuditApplicationId(applicationId);
-        params.setAuditFromTime(from);
-        params.setAuditToTime(to);
-        return template.delete(DELETE_ENTRIES, params);
-    }
-
-    public int deleteAuditEntriesByIdRange(Long applicationId, Long fromId, Long toId)
-    {
-        AuditDeleteParameters params = new AuditDeleteParameters();
-        params.setAuditApplicationId(applicationId);
-        params.setAuditFromId(fromId);
-        params.setAuditToId(toId);
-        return template.delete(DELETE_ENTRIES, params);
-    }
-
-    @Override
-    protected int deleteAuditEntriesImpl(List<Long> auditEntryIds)
-    {
-        AuditDeleteParameters params = new AuditDeleteParameters();
-        params.setAuditEntryIds(auditEntryIds);
-        return template.delete(DELETE_ENTRIES_BY_ID, params);
-    }
-
-    @Override
-    protected AuditEntryEntity createAuditEntry(Long applicationId, long time, Long usernameId, Long valuesId)
-    {
-        AuditEntryEntity entity = new AuditEntryEntity();
-        entity.setAuditApplicationId(applicationId);
-        entity.setAuditTime(time);
-        entity.setAuditUserId(usernameId);
-        entity.setAuditValuesId(valuesId);
-        template.insert(INSERT_ENTRY, entity);
-        return entity;
-    }
-
-    public HashMap<String, Long> getAuditMinMaxByApp(long appId, List<String> extremes)
-    {
-        // Build parameters to be used in the query. Filter the duplicates when inserting into map
-        Map<String, Object> params = extremes.stream().collect(Collectors.toMap(s -> s, s -> Boolean.TRUE, (s1, s2) -> s1));
-        params.put("auditAppId", appId);
-
-        HashMap<String, Long> result = template.selectOne(SELECT_MINMAX_ENTRY_FOR_APP, params);
-
-        return result;
-    }
-
-    @Override
-    public int getAuditEntriesCountByApp(long applicationId)
-    {
-        Map<String, Object> params = new HashMap<>();
-        params.put("auditAppId", applicationId);
-
-        int result = template.selectOne(SELECT_COUNT_ENTRIES_FOR_APP, params);
-
-        return result;
-    }
-
-    @Override
-    public int getAuditEntriesCountByAppAndProperties(org.alfresco.service.cmr.audit.AuditQueryParameters parameters)
-    {
-        AuditQueryParameters dbParameters = convertFromRestAuditQueryParameters(parameters);
-
-        int result = template.selectOne(SELECT_COUNT_ENTRIES_FOR_APP_WITH_PROPERTIES, dbParameters);
-
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void findAuditEntries(
-            final AuditQueryRowHandler rowHandler,
-            int maxResults,
-            org.alfresco.service.cmr.audit.AuditQueryParameters restParameters)
-    {
-        AuditQueryParameters params = convertFromRestAuditQueryParameters(restParameters);
-        if (params==null)
-        {
-            return;
-        }
-
-        if (maxResults > 0)
-        {
-            // Query without getting the values.  We gather all the results and batch-fetch the audited
-            // values afterwards.
-            final Map<Long, AuditQueryResult> resultsByValueId = new HashMap<Long, AuditQueryResult>(173);
-            PropertyFinderCallback propertyFinderCallback = new PropertyFinderCallback()
-            {
-                public void handleProperty(Long id, Serializable value)
-                {
-                    // get the row
-                    AuditQueryResult row = resultsByValueId.get(id);
-                    try
-                    {
-                        row.setAuditValue((Map<String, Serializable>) value);
-                    }
-                    catch (ClassCastException e)
-                    {
-                        // The handler will deal with the entry
-                    }
-                }
-            };
-            
-            List<AuditQueryResult> rows = template.selectList(SELECT_ENTRIES_WITHOUT_VALUES, params, new RowBounds(0, maxResults));
-            for (AuditQueryResult row : rows)
-            {
-                resultsByValueId.put(row.getAuditValuesId(), row);
-                if (resultsByValueId.size() >= 100)
-                {
-                    // Fetch values for the results.  The treemap is ordered.
-                    List<Long> valueIds = new ArrayList<Long>(resultsByValueId.keySet());
-                    propertyValueDAO.getPropertiesByIds(valueIds, propertyFinderCallback);
-                    // Clear and continue
-                    resultsByValueId.clear();
-                }
-            }
-            // Process any remaining results
-            if (resultsByValueId.size() > 0)
-            {
-                // Fetch values for the results.  The treemap is ordered.
-                List<Long> valueIds = new ArrayList<Long>(resultsByValueId.keySet());
-                propertyValueDAO.getPropertiesByIds(valueIds, propertyFinderCallback);
-            }
-            // Now pass the filled-out results to the row handler (order-preserved)
-            for (AuditQueryResult row : rows)
-            {
-                rowHandler.processResult(row);
-            }
-        }
-        else
-        {
-            throw new IllegalArgumentException("maxResults must be greater than 0");
-        }
-    }
-}
-
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.repo.domain.audit.ibatis;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.ibatis.session.RowBounds;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.springframework.dao.ConcurrencyFailureException;
+
+import org.alfresco.repo.domain.audit.AbstractAuditDAOImpl;
+import org.alfresco.repo.domain.audit.AuditApplicationEntity;
+import org.alfresco.repo.domain.audit.AuditDeleteParameters;
+import org.alfresco.repo.domain.audit.AuditEntryEntity;
+import org.alfresco.repo.domain.audit.AuditModelEntity;
+import org.alfresco.repo.domain.audit.AuditQueryParameters;
+import org.alfresco.repo.domain.audit.AuditQueryResult;
+import org.alfresco.repo.domain.propval.PropertyValueDAO.PropertyFinderCallback;
+import org.alfresco.util.Pair;
+
+/**
+ * iBatis-specific implementation of the DAO for <b>alf_audit_XXX</b> tables.
+ *
+ * @author Derek Hulley
+ * @since 3.2
+ */
+public class AuditDAOImpl extends AbstractAuditDAOImpl
+{
+    private static final String SELECT_MODEL_BY_CRC = "alfresco.audit.select_AuditModelByCrc";
+    private static final String INSERT_MODEL = "alfresco.audit.insert.insert_AuditModel";
+
+    private static final String SELECT_APPLICATION_BY_ID = "alfresco.audit.select_AuditApplicationById";
+    private static final String SELECT_APPLICATION_BY_NAME_ID = "alfresco.audit.select_AuditApplicationByNameId";
+    private static final String INSERT_APPLICATION = "alfresco.audit.insert.insert_AuditApplication";
+    private static final String UPDATE_APPLICATION = "alfresco.audit.update_AuditApplication";
+
+    private static final String DELETE_ENTRIES = "alfresco.audit.delete_AuditEntries";
+    private static final String DELETE_ENTRIES_BY_ID = "alfresco.audit.delete_AuditEntriesById";
+    private static final String INSERT_ENTRY = "alfresco.audit.insert.insert_AuditEntry";
+    private static final String SELECT_MINMAX_ENTRY_FOR_APP = "alfresco.audit.select_MinMaxAuditEntryId";
+    private static final String SELECT_COUNT_ENTRIES_FOR_APP = "alfresco.audit.select_CountAuditEntryId";
+    private static final String SELECT_COUNT_ENTRIES_FOR_APP_WITH_PROPERTIES = "select_CountAuditEntryIdWithWhereClause";
+
+    @SuppressWarnings("unused")
+    private static final String SELECT_ENTRIES_SIMPLE = "alfresco.audit.select_AuditEntriesSimple";
+    private static final String SELECT_ENTRIES_WITH_VALUES = "alfresco.audit.select_AuditEntriesWithValues";
+    private static final String SELECT_ENTRIES_WITHOUT_VALUES = "alfresco.audit.select_AuditEntriesWithoutValues";
+
+    private SqlSessionTemplate template;
+
+    public final void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate)
+    {
+        this.template = sqlSessionTemplate;
+    }
+
+    @Override
+    protected AuditModelEntity getAuditModelByCrc(long crc)
+    {
+        AuditModelEntity entity = new AuditModelEntity();
+        entity.setContentCrc(crc);
+        entity = template.selectOne(
+                SELECT_MODEL_BY_CRC,
+                entity);
+        // Done
+        return entity;
+    }
+
+    @Override
+    protected AuditModelEntity createAuditModel(Long contentDataId, long crc)
+    {
+        AuditModelEntity entity = new AuditModelEntity();
+        entity.setContentDataId(contentDataId);
+        entity.setContentCrc(crc);
+        template.insert(INSERT_MODEL, entity);
+        return entity;
+    }
+
+    @Override
+    protected AuditApplicationEntity getAuditApplicationById(Long id)
+    {
+        Map<String, Object> params = new HashMap<String, Object>(11);
+        params.put("id", id);
+        AuditApplicationEntity entity = template.selectOne(
+                SELECT_APPLICATION_BY_ID,
+                params);
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Searched for audit application ID " + id + " and found: " + entity);
+        }
+        return entity;
+    }
+
+    @Override
+    protected AuditApplicationEntity getAuditApplicationByName(String appName)
+    {
+        // Resolve the name as a property ID
+        Pair<Long, Serializable> appNamePair = propertyValueDAO.getPropertyValue(appName);
+        if (appNamePair == null)
+        {
+            // There will be no results
+            return null;
+        }
+
+        Map<String, Object> params = new HashMap<String, Object>(11);
+        params.put("id", appNamePair.getFirst());
+        AuditApplicationEntity entity = template.selectOne(
+                SELECT_APPLICATION_BY_NAME_ID,
+                params);
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Searched for audit application '" + appName + "' and found: " + entity);
+        }
+        return entity;
+    }
+
+    @Override
+    protected AuditApplicationEntity createAuditApplication(Long appNameId, Long modelId, Long disabledPathsId)
+    {
+        AuditApplicationEntity entity = new AuditApplicationEntity();
+        entity.setVersion((short) 0);
+        entity.setApplicationNameId(appNameId);
+        entity.setAuditModelId(modelId);
+        entity.setDisabledPathsId(disabledPathsId);
+        template.insert(INSERT_APPLICATION, entity);
+        return entity;
+    }
+
+    @Override
+    protected AuditApplicationEntity updateAuditApplication(AuditApplicationEntity entity)
+    {
+        AuditApplicationEntity updateEntity = new AuditApplicationEntity();
+        updateEntity.setId(entity.getId());
+        updateEntity.setVersion(entity.getVersion());
+        updateEntity.incrementVersion();
+        updateEntity.setApplicationNameId(entity.getApplicationNameId());
+        updateEntity.setAuditModelId(entity.getAuditModelId());
+        updateEntity.setDisabledPathsId(entity.getDisabledPathsId());
+
+        int updated = template.update(UPDATE_APPLICATION, updateEntity);
+        if (updated != 1)
+        {
+            // unexpected number of rows affected
+            throw new ConcurrencyFailureException("Incorrect number of rows affected for updateAuditApplication: " + updateEntity + ": expected 1, actual " + updated);
+        }
+
+        // Done
+        return updateEntity;
+    }
+
+    public int deleteAuditEntries(Long applicationId, Long from, Long to)
+    {
+        AuditDeleteParameters params = new AuditDeleteParameters();
+        params.setAuditApplicationId(applicationId);
+        params.setAuditFromTime(from);
+        params.setAuditToTime(to);
+        return template.delete(DELETE_ENTRIES, params);
+    }
+
+    public int deleteAuditEntriesByIdRange(Long applicationId, Long fromId, Long toId)
+    {
+        AuditDeleteParameters params = new AuditDeleteParameters();
+        params.setAuditApplicationId(applicationId);
+        params.setAuditFromId(fromId);
+        params.setAuditToId(toId);
+        return template.delete(DELETE_ENTRIES, params);
+    }
+
+    @Override
+    protected int deleteAuditEntriesImpl(List<Long> auditEntryIds)
+    {
+        AuditDeleteParameters params = new AuditDeleteParameters();
+        params.setAuditEntryIds(auditEntryIds);
+        return template.delete(DELETE_ENTRIES_BY_ID, params);
+    }
+
+    @Override
+    protected AuditEntryEntity createAuditEntry(Long applicationId, long time, Long usernameId, Long valuesId)
+    {
+        AuditEntryEntity entity = new AuditEntryEntity();
+        entity.setAuditApplicationId(applicationId);
+        entity.setAuditTime(time);
+        entity.setAuditUserId(usernameId);
+        entity.setAuditValuesId(valuesId);
+        template.insert(INSERT_ENTRY, entity);
+        return entity;
+    }
+
+    public HashMap<String, Long> getAuditMinMaxByApp(long appId, List<String> extremes)
+    {
+        // Build parameters to be used in the query. Filter the duplicates when inserting into map
+        Map<String, Object> params = extremes.stream().collect(Collectors.toMap(s -> s, s -> Boolean.TRUE, (s1, s2) -> s1));
+        params.put("auditAppId", appId);
+
+        HashMap<String, Long> result = template.selectOne(SELECT_MINMAX_ENTRY_FOR_APP, params);
+
+        return result;
+    }
+
+    @Override
+    public int getAuditEntriesCountByApp(long applicationId)
+    {
+        Map<String, Object> params = new HashMap<>();
+        params.put("auditAppId", applicationId);
+
+        int result = template.selectOne(SELECT_COUNT_ENTRIES_FOR_APP, params);
+
+        return result;
+    }
+
+    @Override
+    public int getAuditEntriesCountByAppAndProperties(String applicationName, org.alfresco.service.cmr.audit.AuditQueryParameters parameters)
+    {
+        AuditQueryParameters dbParameters = convertFromRestAuditQueryParameters(parameters);
+
+        int result = template.selectOne(SELECT_COUNT_ENTRIES_FOR_APP_WITH_PROPERTIES, dbParameters);
+
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void findAuditEntries(
+            final AuditQueryRowHandler rowHandler,
+            int maxResults,
+            org.alfresco.service.cmr.audit.AuditQueryParameters restParameters)
+    {
+        AuditQueryParameters params = convertFromRestAuditQueryParameters(restParameters);
+        if (params == null)
+        {
+            return;
+        }
+
+        if (maxResults > 0)
+        {
+            // Query without getting the values. We gather all the results and batch-fetch the audited
+            // values afterwards.
+            final Map<Long, AuditQueryResult> resultsByValueId = new HashMap<Long, AuditQueryResult>(173);
+            PropertyFinderCallback propertyFinderCallback = new PropertyFinderCallback() {
+                public void handleProperty(Long id, Serializable value)
+                {
+                    // get the row
+                    AuditQueryResult row = resultsByValueId.get(id);
+                    try
+                    {
+                        row.setAuditValue((Map<String, Serializable>) value);
+                    }
+                    catch (ClassCastException e)
+                    {
+                        // The handler will deal with the entry
+                    }
+                }
+            };
+
+            List<AuditQueryResult> rows = template.selectList(SELECT_ENTRIES_WITHOUT_VALUES, params, new RowBounds(0, maxResults));
+            for (AuditQueryResult row : rows)
+            {
+                resultsByValueId.put(row.getAuditValuesId(), row);
+                if (resultsByValueId.size() >= 100)
+                {
+                    // Fetch values for the results. The treemap is ordered.
+                    List<Long> valueIds = new ArrayList<Long>(resultsByValueId.keySet());
+                    propertyValueDAO.getPropertiesByIds(valueIds, propertyFinderCallback);
+                    // Clear and continue
+                    resultsByValueId.clear();
+                }
+            }
+            // Process any remaining results
+            if (resultsByValueId.size() > 0)
+            {
+                // Fetch values for the results. The treemap is ordered.
+                List<Long> valueIds = new ArrayList<Long>(resultsByValueId.keySet());
+                propertyValueDAO.getPropertiesByIds(valueIds, propertyFinderCallback);
+            }
+            // Now pass the filled-out results to the row handler (order-preserved)
+            for (AuditQueryResult row : rows)
+            {
+                rowHandler.processResult(row);
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("maxResults must be greater than 0");
+        }
+    }
+}

repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java

@@ -1,173 +1,159 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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.repo.domain.propval;
-
-import org.alfresco.repo.domain.CrcHelper;
-import org.alfresco.util.EqualsHelper;
-import org.alfresco.util.Pair;
-
-/**
- * Entity bean for <b>alf_prop_string_value</b> table.
- * 
- * @author Derek Hulley
- * @since 3.2
- */
-public class PropertyStringValueEntity
-{
-    public static final String EMPTY_STRING = "";
-    public static final String EMPTY_STRING_REPLACEMENT = ".empty";
-    
-    private Long id;
-    private String stringValue;
-    private String stringEndLower;
-    private Long stringCrc;
-    private String stringLower;
-    
-    public PropertyStringValueEntity()
-    {
-    }
-    
-    @Override
-    public int hashCode()
-    {
-        return (stringValue == null ? 0 : stringValue.hashCode());
-    }
-    
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        else if (obj != null && obj instanceof PropertyStringValueEntity)
-        {
-            PropertyStringValueEntity that = (PropertyStringValueEntity) obj;
-            return EqualsHelper.nullSafeEquals(this.stringValue, that.stringValue);
-        }
-        else
-        {
-            return false;
-        }
-    }
-    
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(512);
-        sb.append("PropertyStringValueEntity")
-          .append("[ ID=").append(id)
-          .append(", stringValue=").append(stringValue)
-          .append("]");
-        return sb.toString();
-    }
-    
-    public Pair<Long, String> getEntityPair()
-    {
-        if (stringValue != null && stringValue.equals(PropertyStringValueEntity.EMPTY_STRING_REPLACEMENT))
-        {
-            return new Pair<Long, String>(id, PropertyStringValueEntity.EMPTY_STRING);
-        }
-        else
-        {
-            return new Pair<Long, String>(id, stringValue);
-        }
-    }
-    
-    /**
-     * Set the string and string-end values
-     */
-    public void setValue(String value)
-    {
-        if (value == null)
-        {
-            throw new IllegalArgumentException("Null strings cannot be persisted");
-        }
-        if (value != null && value.equals(PropertyStringValueEntity.EMPTY_STRING))
-        {
-            // Oracle: We can't insert empty strings into the column.
-            value = PropertyStringValueEntity.EMPTY_STRING_REPLACEMENT;
-        }
-        stringValue = value;
-        // Calculate the crc value from the original value
-        Pair<String, Long> crcPair = CrcHelper.getStringCrcPair(value, 16, false, true);
-        stringEndLower = crcPair.getFirst();
-        stringCrc = crcPair.getSecond();
-        // Calculate the crc value with case-insensitive
-        Pair<String, Long> crcPairWithCaseInSensitive = CrcHelper.getStringCrcPair(value, 16, false, false);
-        stringLower = crcPairWithCaseInSensitive.getFirst();
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public String getStringValue()
-    {
-        return stringValue;
-    }
-
-    public void setStringValue(String stringValue)
-    {
-        this.stringValue = stringValue;
-    }
-    
-    public String getStringEndLower()
-    {
-        return stringEndLower;
-    }
-
-    public void setStringEndLower(String stringEndLower)
-    {
-        this.stringEndLower = stringEndLower;
-    }
-
-    public Long getStringCrc()
-    {
-        return stringCrc;
-    }
-
-    public void setStringCrc(Long stringCrc)
-    {
-        this.stringCrc = stringCrc;
-    }
-
-    public String getStringLower()
-    {
-        return stringLower;
-    }
-
-    public void setStringLower(String stringLower)
-    {
-        this.stringLower = stringLower;
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.repo.domain.propval;
+
+import org.alfresco.repo.domain.CrcHelper;
+import org.alfresco.util.EqualsHelper;
+import org.alfresco.util.Pair;
+
+/**
+ * Entity bean for <b>alf_prop_string_value</b> table.
+ * 
+ * @author Derek Hulley
+ * @since 3.2
+ */
+public class PropertyStringValueEntity
+{
+    public static final String EMPTY_STRING = "";
+    public static final String EMPTY_STRING_REPLACEMENT = ".empty";
+
+    private Long id;
+    private String stringValue;
+    private String stringEndLower;
+    private Long stringCrc;
+
+    public PropertyStringValueEntity()
+    {}
+
+    @Override
+    public int hashCode()
+    {
+        return (stringValue == null ? 0 : stringValue.hashCode());
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        else if (obj != null && obj instanceof PropertyStringValueEntity)
+        {
+            PropertyStringValueEntity that = (PropertyStringValueEntity) obj;
+            return EqualsHelper.nullSafeEquals(this.stringValue, that.stringValue);
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder(512);
+        sb.append("PropertyStringValueEntity")
+                .append("[ ID=").append(id)
+                .append(", stringValue=").append(stringValue)
+                .append("]");
+        return sb.toString();
+    }
+
+    public Pair<Long, String> getEntityPair()
+    {
+        if (stringValue != null && stringValue.equals(PropertyStringValueEntity.EMPTY_STRING_REPLACEMENT))
+        {
+            return new Pair<Long, String>(id, PropertyStringValueEntity.EMPTY_STRING);
+        }
+        else
+        {
+            return new Pair<Long, String>(id, stringValue);
+        }
+    }
+
+    /**
+     * Set the string and string-end values
+     */
+    public void setValue(String value)
+    {
+        if (value == null)
+        {
+            throw new IllegalArgumentException("Null strings cannot be persisted");
+        }
+        if (value != null && value.equals(PropertyStringValueEntity.EMPTY_STRING))
+        {
+            // Oracle: We can't insert empty strings into the column.
+            value = PropertyStringValueEntity.EMPTY_STRING_REPLACEMENT;
+        }
+        stringValue = value;
+        // Calculate the crc value from the original value
+        Pair<String, Long> crcPair = CrcHelper.getStringCrcPair(value, 16, false, true);
+        stringEndLower = crcPair.getFirst();
+        stringCrc = crcPair.getSecond();
+
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public String getStringValue()
+    {
+        return stringValue;
+    }
+
+    public void setStringValue(String stringValue)
+    {
+        this.stringValue = stringValue;
+    }
+
+    public String getStringEndLower()
+    {
+        return stringEndLower;
+    }
+
+    public void setStringEndLower(String stringEndLower)
+    {
+        this.stringEndLower = stringEndLower;
+    }
+
+    public Long getStringCrc()
+    {
+        return stringCrc;
+    }
+
+    public void setStringCrc(Long stringCrc)
+    {
+        this.stringCrc = stringCrc;
+    }
+}

repository/src/main/java/org/alfresco/repo/download/ZipDownloadExporter.java

@@ -1,329 +1,344 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.repo.download;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.attribute.FileTime;
-import java.util.Date;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.cmr.coci.CheckOutCheckInService;
-import org.alfresco.service.cmr.dictionary.DictionaryService;
-import org.alfresco.service.cmr.download.DownloadStatus;
-import org.alfresco.service.cmr.download.DownloadStatus.Status;
-import org.alfresco.service.cmr.repository.ContentData;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.view.ExporterContext;
-import org.alfresco.service.cmr.view.ExporterException;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.util.Pair;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
-import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream.UnicodeExtraFieldPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Handler for exporting node content to a ZIP file
- * 
- * @author Alex Miller
- */
-public class ZipDownloadExporter extends BaseExporter
-{
-    private static Logger log = LoggerFactory.getLogger(ZipDownloadExporter.class);
-    
-    private static final String PATH_SEPARATOR = "/";
-
-    protected ZipArchiveOutputStream zipStream;
-
-    private NodeRef downloadNodeRef;
-    private int sequenceNumber = 1;
-    private long total;
-    private long done;
-    private long totalFileCount;
-    private long filesAddedCount;
-    
-    private RetryingTransactionHelper transactionHelper;
-    private DownloadStorage downloadStorage;
-    private DictionaryService dictionaryService;
-    private DownloadStatusUpdateService updateService;
-
-    private Deque<Pair<String, NodeRef>> path = new LinkedList<Pair<String, NodeRef>>();
-    private String currentName;
-
-    private OutputStream outputStream;
-    private Date zipTimestampCreated;
-    private Date zipTimestampModified;
-
-    /**
-     * Construct
-     *
-     * @param zipFile File
-     * @param checkOutCheckInService CheckOutCheckInService
-     * @param nodeService NodeService
-     * @param transactionHelper RetryingTransactionHelper
-     * @param updateService DownloadStatusUpdateService
-     * @param downloadStorage DownloadStorage
-     * @param dictionaryService DictionaryService
-     * @param downloadNodeRef NodeRef
-     * @param total long
-     * @param totalFileCount long
-     */
-    public ZipDownloadExporter(File zipFile, CheckOutCheckInService checkOutCheckInService, NodeService nodeService, RetryingTransactionHelper transactionHelper, DownloadStatusUpdateService updateService, DownloadStorage downloadStorage, DictionaryService dictionaryService, NodeRef downloadNodeRef, long total, long totalFileCount)
-    {
-        super(checkOutCheckInService, nodeService);
-        try
-        {
-            this.outputStream = new FileOutputStream(zipFile);
-            this.updateService = updateService;
-            this.transactionHelper = transactionHelper;
-            this.downloadStorage = downloadStorage;
-            this.dictionaryService = dictionaryService;
-            
-            this.downloadNodeRef = downloadNodeRef;
-            this.total = total;
-            this.totalFileCount = totalFileCount;
-        }
-        catch (FileNotFoundException e)
-        {
-            throw new ExporterException("Failed to create zip file", e);
-        }
-    }
-
-    @Override
-    public void start(final ExporterContext context)
-    {
-        zipStream = new ZipArchiveOutputStream(outputStream);
-        // NOTE: This encoding allows us to workaround bug...
-        //       http://bugs.sun.com/bugdatabase/view_bug.do;:WuuT?bug_id=4820807
-        zipStream.setEncoding("UTF-8");
-        zipStream.setCreateUnicodeExtraFields(UnicodeExtraFieldPolicy.ALWAYS);
-        zipStream.setUseLanguageEncodingFlag(true);
-        zipStream.setFallbackToUTF8(true);
-    }
-
-    @Override
-    public void startNode(NodeRef nodeRef)
-    {
-        this.currentName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
-        this.zipTimestampCreated = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED);
-        this.zipTimestampModified = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
-        path.push(new Pair<String, NodeRef>(currentName, nodeRef));
-        if (dictionaryService.isSubClass(nodeService.getType(nodeRef), ContentModel.TYPE_FOLDER))
-        {
-            String path = getPath() + PATH_SEPARATOR;
-            ZipArchiveEntry archiveEntry = new ZipArchiveEntry(path);
-            try
-            {
-                archiveEntry.setTime(zipTimestampCreated.getTime());
-                archiveEntry.setCreationTime(FileTime.fromMillis(zipTimestampCreated.getTime()));
-                archiveEntry.setLastModifiedTime(FileTime.fromMillis(zipTimestampModified.getTime()));
-                zipStream.putArchiveEntry(archiveEntry);
-                zipStream.closeArchiveEntry();
-            }
-            catch (IOException e)
-            {
-                throw new ExporterException("Unexpected IOException adding folder entry", e);
-            }
-        }
-    }
-    
-    @Override
-    public void contentImpl(NodeRef nodeRef, QName property, InputStream content, ContentData contentData, int index)
-    {
-        // if the content stream to output is empty, then just return content descriptor as is
-        if (content == null)
-        {
-            return;
-        }
-        
-        try
-        {
-            if (log.isDebugEnabled())
-            {
-                log.debug("Archiving content for nodeRef: "+nodeRef+" with contentURL: "+contentData.getContentUrl());
-            }
-            // ALF-2016
-            ZipArchiveEntry zipEntry=new ZipArchiveEntry(getPath());
-            zipEntry.setTime(zipTimestampCreated.getTime());
-            zipEntry.setCreationTime(FileTime.fromMillis(zipTimestampCreated.getTime()));
-            zipEntry.setLastModifiedTime(FileTime.fromMillis(zipTimestampModified.getTime()));
-            zipStream.putArchiveEntry(zipEntry);
-            
-            // copy export stream to zip
-            copyStream(zipStream, content);
-            
-            zipStream.closeArchiveEntry();
-            filesAddedCount = filesAddedCount + 1;
-        }
-        catch (IOException e)
-        {
-            throw new ExporterException("Failed to zip export stream", e);
-        }
-    }
-    
-    @Override
-    public void endNode(NodeRef nodeRef)
-    {
-        path.pop();
-    }
-
-    @Override
-    public void end()
-    {
-        try
-        {
-            zipStream.close();
-        }
-        catch (IOException error)
-        {
-            throw new ExporterException("Unexpected error closing zip stream!", error);
-        }
-    }
-
-    private String getPath()
-    {
-        if (path.size() < 1) 
-        {
-            throw new IllegalStateException("No elements in path!");    
-        }
-        
-        Iterator<Pair<String, NodeRef>> iter = path.descendingIterator();
-        StringBuilder pathBuilder = new StringBuilder();
-        
-        while (iter.hasNext())
-        {
-            Pair<String, NodeRef> element = iter.next();
-            
-            pathBuilder.append(element.getFirst());
-            if (iter.hasNext())
-            {
-                pathBuilder.append(PATH_SEPARATOR);
-            }
-        }
-        
-        return pathBuilder.toString();
-    }
-
-    /**
-     * Copy input stream to output stream
-     * 
-     * @param output  output stream
-     * @param in  input stream
-     * @throws IOException
-     */
-    private void copyStream(OutputStream output, InputStream in)
-        throws IOException
-    {
-        byte[] buffer = new byte[2048 * 10];
-        int read = in.read(buffer, 0, 2048 *10);
-        int i = 0;
-        while (read != -1)
-        {
-            output.write(buffer, 0, read);
-            done = done + read;
-            
-            // ALF-16289 - only update the status every 10MB
-            if (i++%500 == 0)
-            {
-                updateStatus();
-                checkCancelled();
-            }
-            
-            read = in.read(buffer, 0, 2048 *10);
-        }
-    }
-    
-    private void checkCancelled()
-    {
-        boolean downloadCancelled = transactionHelper.doInTransaction(new RetryingTransactionCallback<Boolean>()
-        {
-            @Override
-            public Boolean execute() throws Throwable
-            {
-                return downloadStorage.isCancelled(downloadNodeRef);                
-            }
-        }, true, true);
-
-        if ( downloadCancelled == true)
-        {
-            log.debug("Download cancelled");
-            throw new DownloadCancelledException();
-        }
-    }
-
-    private void updateStatus()
-    {
-        transactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
-        {
-            @Override
-            public Object execute() throws Throwable
-            {
-                DownloadStatus status = new DownloadStatus(Status.IN_PROGRESS, done, total, filesAddedCount, totalFileCount);
-                
-                updateService.update(downloadNodeRef, status, getNextSequenceNumber());
-                return null;
-            }
-        }, false, true);
-    }
-
-    public int getNextSequenceNumber()
-    {
-        return sequenceNumber++;
-    }
-
-    public long getDone()
-    {
-        return done;
-    }
-
-    public long getTotal()
-    {
-        return total;
-    }
-
-    public long getFilesAdded()
-    {
-        return filesAddedCount;
-    }
-
-    public long getTotalFiles()
-    {
-        return totalFileCount;
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.repo.download;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.attribute.FileTime;
+import java.util.Date;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream.UnicodeExtraFieldPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.download.DownloadStatus;
+import org.alfresco.service.cmr.download.DownloadStatus.Status;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.view.ExporterContext;
+import org.alfresco.service.cmr.view.ExporterException;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+
+/**
+ * Handler for exporting node content to a ZIP file
+ *
+ * @author Alex Miller
+ */
+public class ZipDownloadExporter extends BaseExporter
+{
+    private static Logger log = LoggerFactory.getLogger(ZipDownloadExporter.class);
+
+    private static final String PATH_SEPARATOR = "/";
+
+    protected ZipArchiveOutputStream zipStream;
+
+    private NodeRef downloadNodeRef;
+    private int sequenceNumber = 1;
+    private long total;
+    private long done;
+    private long totalFileCount;
+    private long filesAddedCount;
+
+    private RetryingTransactionHelper transactionHelper;
+    private DownloadStorage downloadStorage;
+    private DictionaryService dictionaryService;
+    private DownloadStatusUpdateService updateService;
+
+    private Deque<Pair<String, NodeRef>> path = new LinkedList<Pair<String, NodeRef>>();
+    private String currentName;
+
+    private OutputStream outputStream;
+    private Date zipTimestampCreated;
+    private Date zipTimestampModified;
+
+    /**
+     * Construct
+     *
+     * @param zipFile
+     *            File
+     * @param checkOutCheckInService
+     *            CheckOutCheckInService
+     * @param nodeService
+     *            NodeService
+     * @param transactionHelper
+     *            RetryingTransactionHelper
+     * @param updateService
+     *            DownloadStatusUpdateService
+     * @param downloadStorage
+     *            DownloadStorage
+     * @param dictionaryService
+     *            DictionaryService
+     * @param downloadNodeRef
+     *            NodeRef
+     * @param total
+     *            long
+     * @param totalFileCount
+     *            long
+     */
+    public ZipDownloadExporter(File zipFile, CheckOutCheckInService checkOutCheckInService, NodeService nodeService,
+            RetryingTransactionHelper transactionHelper, DownloadStatusUpdateService updateService,
+            DownloadStorage downloadStorage, DictionaryService dictionaryService,
+            NodeRef downloadNodeRef, long total, long totalFileCount)
+    {
+        super(checkOutCheckInService, nodeService);
+        try
+        {
+            this.outputStream = new FileOutputStream(zipFile);
+            this.updateService = updateService;
+            this.transactionHelper = transactionHelper;
+            this.downloadStorage = downloadStorage;
+            this.dictionaryService = dictionaryService;
+
+            this.downloadNodeRef = downloadNodeRef;
+            this.total = total;
+            this.totalFileCount = totalFileCount;
+        }
+        catch (FileNotFoundException e)
+        {
+            throw new ExporterException("Failed to create zip file", e);
+        }
+    }
+
+    @Override
+    public void start(final ExporterContext context)
+    {
+        zipStream = new ZipArchiveOutputStream(outputStream);
+        // NOTE: This encoding allows us to workaround bug...
+        // http://bugs.sun.com/bugdatabase/view_bug.do;:WuuT?bug_id=4820807
+        zipStream.setEncoding("UTF-8");
+        zipStream.setCreateUnicodeExtraFields(UnicodeExtraFieldPolicy.ALWAYS);
+        zipStream.setUseLanguageEncodingFlag(true);
+        zipStream.setFallbackToUTF8(true);
+    }
+
+    @Override
+    public void startNode(NodeRef nodeRef)
+    {
+        this.currentName = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+        this.zipTimestampCreated = (Date) nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED);
+        this.zipTimestampModified = (Date) nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
+        path.push(new Pair<String, NodeRef>(currentName, nodeRef));
+        if (dictionaryService.isSubClass(nodeService.getType(nodeRef), ContentModel.TYPE_FOLDER))
+        {
+            String path = getPath() + PATH_SEPARATOR;
+            ZipArchiveEntry archiveEntry = new ZipArchiveEntry(path);
+            try
+            {
+                archiveEntry.setTime(zipTimestampCreated.getTime());
+                archiveEntry.setCreationTime(FileTime.fromMillis(zipTimestampCreated.getTime()));
+                archiveEntry.setLastModifiedTime(FileTime.fromMillis(zipTimestampModified.getTime()));
+                zipStream.putArchiveEntry(archiveEntry);
+                zipStream.closeArchiveEntry();
+            }
+            catch (IOException e)
+            {
+                throw new ExporterException("Unexpected IOException adding folder entry", e);
+            }
+        }
+    }
+
+    @Override
+    public void contentImpl(NodeRef nodeRef, QName property, InputStream content, ContentData contentData, int index)
+    {
+        // if the content stream to output is empty, then just return content descriptor as is
+        if (content == null)
+        {
+            log.info("Archiving content has been removed or modified for the specified NodeReference: " + nodeRef
+                    + ", and the size of the content is " + contentData.getSize());
+            return;
+        }
+
+        try
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug("Archiving content for nodeRef: " + nodeRef + " with contentURL: "
+                        + contentData.getContentUrl());
+            }
+            // ALF-2016
+            ZipArchiveEntry zipEntry = new ZipArchiveEntry(getPath());
+            zipEntry.setTime(zipTimestampCreated.getTime());
+            zipEntry.setCreationTime(FileTime.fromMillis(zipTimestampCreated.getTime()));
+            zipEntry.setLastModifiedTime(FileTime.fromMillis(zipTimestampModified.getTime()));
+            zipStream.putArchiveEntry(zipEntry);
+
+            // copy export stream to zip
+            copyStream(zipStream, content);
+
+            zipStream.closeArchiveEntry();
+            filesAddedCount = filesAddedCount + 1;
+        }
+        catch (IOException e)
+        {
+            throw new ExporterException("Failed to zip export stream", e);
+        }
+    }
+
+    @Override
+    public void endNode(NodeRef nodeRef)
+    {
+        path.pop();
+    }
+
+    @Override
+    public void end()
+    {
+        try
+        {
+            zipStream.close();
+        }
+        catch (IOException error)
+        {
+            throw new ExporterException("Unexpected error closing zip stream!", error);
+        }
+    }
+
+    private String getPath()
+    {
+        if (path.size() < 1)
+        {
+            throw new IllegalStateException("No elements in path!");
+        }
+
+        Iterator<Pair<String, NodeRef>> iter = path.descendingIterator();
+        StringBuilder pathBuilder = new StringBuilder();
+
+        while (iter.hasNext())
+        {
+            Pair<String, NodeRef> element = iter.next();
+
+            pathBuilder.append(element.getFirst());
+            if (iter.hasNext())
+            {
+                pathBuilder.append(PATH_SEPARATOR);
+            }
+        }
+
+        return pathBuilder.toString();
+    }
+
+    /**
+     * Copy input stream to output stream
+     *
+     * @param output
+     *            output stream
+     * @param in
+     *            input stream
+     * @throws IOException
+     */
+    private void copyStream(OutputStream output, InputStream in) throws IOException
+    {
+        byte[] buffer = new byte[2048 * 10];
+        int read = in.read(buffer, 0, 2048 * 10);
+        int i = 0;
+        while (read != -1)
+        {
+            output.write(buffer, 0, read);
+            done = done + read;
+
+            // ALF-16289 - only update the status every 10MB
+            if (i++ % 500 == 0)
+            {
+                updateStatus();
+                checkCancelled();
+            }
+
+            read = in.read(buffer, 0, 2048 * 10);
+        }
+    }
+
+    private void checkCancelled()
+    {
+        boolean downloadCancelled = transactionHelper.doInTransaction(new RetryingTransactionCallback<Boolean>() {
+            @Override
+            public Boolean execute() throws Throwable
+            {
+                return downloadStorage.isCancelled(downloadNodeRef);
+            }
+        }, true, true);
+
+        if (downloadCancelled == true)
+        {
+            log.debug("Download cancelled");
+            throw new DownloadCancelledException();
+        }
+    }
+
+    private void updateStatus()
+    {
+        transactionHelper.doInTransaction(new RetryingTransactionCallback<Object>() {
+            @Override
+            public Object execute() throws Throwable
+            {
+                DownloadStatus status = new DownloadStatus(Status.IN_PROGRESS, done, total, filesAddedCount, totalFileCount);
+
+                updateService.update(downloadNodeRef, status, getNextSequenceNumber());
+                return null;
+            }
+        }, false, true);
+    }
+
+    public int getNextSequenceNumber()
+    {
+        return sequenceNumber++;
+    }
+
+    public long getDone()
+    {
+        return done;
+    }
+
+    public long getTotal()
+    {
+        return total;
+    }
+
+    public long getFilesAdded()
+    {
+        return filesAddedCount;
+    }
+
+    public long getTotalFiles()
+    {
+        return totalFileCount;
+    }
+}

repository/src/main/java/org/alfresco/repo/site/SiteMembership.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 
@@ -25,14 +25,15 @@
  */
 package org.alfresco.repo.site;
 
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
 import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.query.CannedQuerySortDetails;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.util.Pair;
 
-import java.util.Comparator;
-import java.util.List;
-
 /**
  * Conveys information for a member of a site.
  *
@@ -52,7 +53,7 @@ public class SiteMembership extends AbstractSiteMembership
     public SiteMembership(SiteInfo siteInfo, String id, String firstName, String lastName,
             String role)
     {
-        super(siteInfo,id, role);
+        super(siteInfo, id, role);
         if (firstName == null)
         {
             throw new java.lang.IllegalArgumentException(
@@ -76,13 +77,8 @@ public class SiteMembership extends AbstractSiteMembership
             throw new java.lang.IllegalArgumentException(
                     "FirstName required building site membership of " + siteInfo.getShortName());
         }
-        if (lastName == null)
-        {
-            throw new java.lang.IllegalArgumentException(
-                    "LastName required building site membership of " + siteInfo.getShortName());
-        }
         this.firstName = firstName;
-        this.lastName = lastName;
+        this.lastName = Optional.ofNullable(lastName).orElse("");
         this.isMemberOfGroup = isMemberOfGroup;
     }
 
@@ -164,7 +160,6 @@ public class SiteMembership extends AbstractSiteMembership
                 ", isMemberOfGroup = " + isMemberOfGroup + "]";
     }
 
-
     static int compareTo(List<Pair<? extends Object, CannedQuerySortDetails.SortOrder>> sortPairs, SiteMembership o1, SiteMembership o2)
     {
         String personId1 = o1.getPersonId();

repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java

@@ -1,266 +1,299 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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.service.cmr.audit;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The public API by which applications can query the audit logs and enable or disable auditing.
- * 
- * @author Derek Hulley
- */
-public interface AuditService
-{
-    /**
-     * @return                  Returns <tt>true</tt> if auditing is globally enabled
-     * 
-     * @since 3.4
-     */
-    boolean isAuditEnabled();
-    
-    /**
-     * Enable or disable the global auditing state
-     * 
-     * @param enable            <tt>true</tt> to enable auditing globally or <tt>false</tt> to disable
-     * 
-     * @since 3.4
-     */
-    void setAuditEnabled(boolean enable);
-
-    /**
-     * Helper bean to carry information about an audit application.
-     * 
-     * @author Derek Hulley
-     * @since 3.4
-     */
-    public static class AuditApplication
-    {
-        private final String name;
-        private final String key;
-        private final boolean enabled;
-        /**
-         * Constructor for final variables
-         */
-        public AuditApplication(String name, String key, boolean enabled)
-        {
-            this.name = name;
-            this.key = key;
-            this.enabled = enabled;
-        }
-        public String getName()
-        {
-            return name;
-        }
-        public String getKey()
-        {
-            return key;
-        }
-        public boolean isEnabled()
-        {
-            return enabled;
-        }
-    }
-    
-    /**
-     * Get all registered audit applications
-     * 
-     * @return                  Returns a map of audit applications keyed by their name
-     * 
-     * @since 3.4
-     */
-    Map<String, AuditApplication> getAuditApplications();
-    
-    /**
-     * @param applicationName   the name of the application to check 
-     * @param path              the path to check
-     * @return                  Returns <tt>true</tt> if auditing is enabled for the given path
-     * 
-     * @since 3.2
-     */
-    boolean isAuditEnabled(String applicationName, String path);
-    
-    /**
-     * Enable auditing for an application path
-     * 
-     * @param applicationName   the name of the application to check 
-     * @param path              the path to enable
-     * 
-     * @since 3.2
-     */
-    void enableAudit(String applicationName, String path);
-    
-    /**
-     * Disable auditing for an application path
-     * 
-     * @param applicationName   the name of the application to check 
-     * @param path              the path to disable
-     * 
-     * @since 3.2
-     */
-    void disableAudit(String applicationName, String path);
-    
-    /**
-     * Remove all audit entries for the given application
-     * 
-     * @param applicationName   the name of the application for which to remove entries
-     * @return                  Returns the number of audit entries deleted
-     * 
-     * @since 3.2
-     * 
-     * @deprecated          Use {@link #clearAudit(String, Long, Long)}
-     */
-    int clearAudit(String applicationName);
-    
-    /**
-     * Remove audit entries for the given application between the time ranges.  If no start
-     * time is given then entries are deleted as far back as they exist.  If no end time is
-     * given then entries are deleted up until the current time.
-     * 
-     * @param applicationName   the name of the application for which to remove entries
-     * @param fromTime          the start time of entries to remove (inclusive and optional)
-     * @param toTime            the end time of entries to remove (exclusive and optional)
-     * @return                  Returns the number of audit entries deleted
-     * 
-     * @since 3.4
-     */
-    int clearAudit(String applicationName, Long fromTime, Long toTime);
-
-    /**
-     * Remove audit entries for the given application between the audit entry ids.
-     *
-     * @param applicationName   the name of the application for which to remove entries
-     * @param fromId            the start time of entries to remove (inclusive and optional)
-     * @param toId              the end time of entries to remove (exclusive and optional)
-     * @return                  Returns the number of audit entries deleted
-     *
-     * @since 5.2.2
-     */
-    int clearAuditByIdRange(String applicationName, Long fromId, Long toId);
-
-    /**
-     * Delete a discrete list of audit entries.
-     * <p/>
-     * This method should not be called <i>while</i> processing
-     * {@link #auditQuery(AuditQueryCallback, AuditQueryParameters, int) query results}.
-     * 
-     * @param auditEntryIds     the IDs of all audit entries to delete
-     * @return                  Returns the number of audit entries deleted
-     * 
-     * @since 3.4
-     */
-    int clearAudit(List<Long> auditEntryIds);
-    
-    /**
-     * The interface that will be used to give query results to the calling code.
-     * 
-     * @since 3.2
-     */
-    public static interface AuditQueryCallback
-    {
-        /**
-         * Determines whether this callback requires the values argument to be populated when {@link #handleAuditEntry}
-         * is called.
-         * 
-         * @return <code>true</code> if this callback requires the values argument to be populated
-         */
-        boolean valuesRequired();
-        
-        /**
-         * Handle a row of audit entry data.
-         * 
-         * @param entryId                   the unique audit entry ID
-         * @param applicationName           the name of the application
-         * @param user                      the user that logged the entry
-         * @param time                      the time of the entry
-         * @param values                    the values map as created
-         * @return                          Return <tt>true</tt> to continue processing rows or <tt>false</tt> to stop
-         */
-        boolean handleAuditEntry(
-                Long entryId,
-                String applicationName,
-                String user,
-                long time,
-                Map<String, Serializable> values);
-        
-        /**
-         * Handle audit entry failures
-         * 
-         * @param entryId                   the entry ID
-         * @param errorMsg                  the error message
-         * @param error                     the exception causing the error (may be <tt>null</tt>)
-         * @return                          Return <tt>true</tt> to continue processing rows or <tt>false</tt> to stop
-         */
-        boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error);
-    }
-    
-    /**
-     * Issue an audit query using the given parameters and consuming results in the callback.
-     * Results are returned in entry order, corresponding to time order.
-     * 
-     * @param callback          the callback that will handle results
-     * @param parameters        the parameters for the query (may not be <tt>null</tt>)
-     * @param maxResults        the maximum number of results to retrieve (must be greater than 0)
-     * 
-     * @throws IllegalArgumentException if maxResults less or equal to zero
-     * 
-     * @since 3.3
-     */
-    void auditQuery(AuditQueryCallback callback, AuditQueryParameters parameters, int maxResults);
-
-    /**
-     * Issue an audit query to retrieve min / max audit record id for a given application.
-     *
-     * @param applicationName               the name of the application
-     * @param extremes                      a list containing min/max or both
-     * @return                              a map containing min/max and the associated value
-     */
-    HashMap<String, Long> getAuditMinMaxByApp(String applicationName, List<String> extremes);
-
-    /**
-     * Issue an audit query to retrieve min / max audit record id for a given application.
-     *
-     * @param applicationName               the name of the application
-     * @return                              a map containing min/max and the associated value
-     */
-    default int getAuditEntriesCountByApp(String applicationName)
-    {
-        return -1;
-    }
-
-    /**
-     * Issue an audit query to retrieve min / max audit record id for a given application and properties
-     *
-     * @param parameters                    audit parameters provided by the <code>where</code> clause on the ReST API
-     * @return                              a map containing min/max and the associated value
-     */
-    default int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters)
-    {
-        return -1;
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.service.cmr.audit;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The public API by which applications can query the audit logs and enable or disable auditing.
+ * 
+ * @author Derek Hulley
+ */
+public interface AuditService
+{
+    /**
+     * @return Returns <tt>true</tt> if auditing is globally enabled
+     * 
+     * @since 3.4
+     */
+    boolean isAuditEnabled();
+
+    /**
+     * Enable or disable the global auditing state
+     * 
+     * @param enable
+     *            <tt>true</tt> to enable auditing globally or <tt>false</tt> to disable
+     * 
+     * @since 3.4
+     */
+    void setAuditEnabled(boolean enable);
+
+    /**
+     * Helper bean to carry information about an audit application.
+     * 
+     * @author Derek Hulley
+     * @since 3.4
+     */
+    public static class AuditApplication
+    {
+        private final String name;
+        private final String key;
+        private final boolean enabled;
+
+        /**
+         * Constructor for final variables
+         */
+        public AuditApplication(String name, String key, boolean enabled)
+        {
+            this.name = name;
+            this.key = key;
+            this.enabled = enabled;
+        }
+
+        public String getName()
+        {
+            return name;
+        }
+
+        public String getKey()
+        {
+            return key;
+        }
+
+        public boolean isEnabled()
+        {
+            return enabled;
+        }
+    }
+
+    /**
+     * Get all registered audit applications
+     * 
+     * @return Returns a map of audit applications keyed by their name
+     * 
+     * @since 3.4
+     */
+    Map<String, AuditApplication> getAuditApplications();
+
+    /**
+     * @param applicationName
+     *            the name of the application to check
+     * @param path
+     *            the path to check
+     * @return Returns <tt>true</tt> if auditing is enabled for the given path
+     * 
+     * @since 3.2
+     */
+    boolean isAuditEnabled(String applicationName, String path);
+
+    /**
+     * Enable auditing for an application path
+     * 
+     * @param applicationName
+     *            the name of the application to check
+     * @param path
+     *            the path to enable
+     * 
+     * @since 3.2
+     */
+    void enableAudit(String applicationName, String path);
+
+    /**
+     * Disable auditing for an application path
+     * 
+     * @param applicationName
+     *            the name of the application to check
+     * @param path
+     *            the path to disable
+     * 
+     * @since 3.2
+     */
+    void disableAudit(String applicationName, String path);
+
+    /**
+     * Remove all audit entries for the given application
+     * 
+     * @param applicationName
+     *            the name of the application for which to remove entries
+     * @return Returns the number of audit entries deleted
+     * 
+     * @since 3.2
+     * 
+     * @deprecated Use {@link #clearAudit(String, Long, Long)}
+     */
+    int clearAudit(String applicationName);
+
+    /**
+     * Remove audit entries for the given application between the time ranges. If no start time is given then entries are deleted as far back as they exist. If no end time is given then entries are deleted up until the current time.
+     * 
+     * @param applicationName
+     *            the name of the application for which to remove entries
+     * @param fromTime
+     *            the start time of entries to remove (inclusive and optional)
+     * @param toTime
+     *            the end time of entries to remove (exclusive and optional)
+     * @return Returns the number of audit entries deleted
+     * 
+     * @since 3.4
+     */
+    int clearAudit(String applicationName, Long fromTime, Long toTime);
+
+    /**
+     * Remove audit entries for the given application between the audit entry ids.
+     *
+     * @param applicationName
+     *            the name of the application for which to remove entries
+     * @param fromId
+     *            the start time of entries to remove (inclusive and optional)
+     * @param toId
+     *            the end time of entries to remove (exclusive and optional)
+     * @return Returns the number of audit entries deleted
+     *
+     * @since 5.2.2
+     */
+    int clearAuditByIdRange(String applicationName, Long fromId, Long toId);
+
+    /**
+     * Delete a discrete list of audit entries.
+     * <p/>
+     * This method should not be called <i>while</i> processing {@link #auditQuery(AuditQueryCallback, AuditQueryParameters, int) query results}.
+     * 
+     * @param auditEntryIds
+     *            the IDs of all audit entries to delete
+     * @return Returns the number of audit entries deleted
+     * 
+     * @since 3.4
+     */
+    int clearAudit(List<Long> auditEntryIds);
+
+    /**
+     * The interface that will be used to give query results to the calling code.
+     * 
+     * @since 3.2
+     */
+    public static interface AuditQueryCallback
+    {
+        /**
+         * Determines whether this callback requires the values argument to be populated when {@link #handleAuditEntry} is called.
+         * 
+         * @return <code>true</code> if this callback requires the values argument to be populated
+         */
+        boolean valuesRequired();
+
+        /**
+         * Handle a row of audit entry data.
+         * 
+         * @param entryId
+         *            the unique audit entry ID
+         * @param applicationName
+         *            the name of the application
+         * @param user
+         *            the user that logged the entry
+         * @param time
+         *            the time of the entry
+         * @param values
+         *            the values map as created
+         * @return Return <tt>true</tt> to continue processing rows or <tt>false</tt> to stop
+         */
+        boolean handleAuditEntry(
+                Long entryId,
+                String applicationName,
+                String user,
+                long time,
+                Map<String, Serializable> values);
+
+        /**
+         * Handle audit entry failures
+         * 
+         * @param entryId
+         *            the entry ID
+         * @param errorMsg
+         *            the error message
+         * @param error
+         *            the exception causing the error (may be <tt>null</tt>)
+         * @return Return <tt>true</tt> to continue processing rows or <tt>false</tt> to stop
+         */
+        boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error);
+    }
+
+    /**
+     * Issue an audit query using the given parameters and consuming results in the callback. Results are returned in entry order, corresponding to time order.
+     * 
+     * @param callback
+     *            the callback that will handle results
+     * @param parameters
+     *            the parameters for the query (may not be <tt>null</tt>)
+     * @param maxResults
+     *            the maximum number of results to retrieve (must be greater than 0)
+     * 
+     * @throws IllegalArgumentException
+     *             if maxResults less or equal to zero
+     * 
+     * @since 3.3
+     */
+    void auditQuery(AuditQueryCallback callback, AuditQueryParameters parameters, int maxResults);
+
+    /**
+     * Issue an audit query to retrieve min / max audit record id for a given application.
+     *
+     * @param applicationName
+     *            the name of the application
+     * @param extremes
+     *            a list containing min/max or both
+     * @return a map containing min/max and the associated value
+     */
+    HashMap<String, Long> getAuditMinMaxByApp(String applicationName, List<String> extremes);
+
+    /**
+     * Issue an audit query to retrieve min / max audit record id for a given application.
+     *
+     * @param applicationName
+     *            the name of the application
+     * @return a map containing min/max and the associated value
+     */
+    default int getAuditEntriesCountByApp(String applicationName)
+    {
+        return -1;
+    }
+
+    /**
+     * Issue an audit query to retrieve min / max audit record id for a given application and properties
+     *
+     * @param applicationName
+     *            the name of the application
+     * @param parameters
+     *            audit parameters provided by the <code>where</code> clause on the ReST API
+     * @return a map containing min/max and the associated value
+     */
+    default int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters)
+    {
+        return -1;
+
+    }
+}

repository/src/main/resources/alfresco/repository.properties

@@ -3,7 +3,7 @@
 repository.name=Main Repository
 
 # Schema number
-version.schema=19300
+version.schema=20000
 
 # Directory configuration
 

repository/src/test/java/org/alfresco/repo/site/SiteMembershipTest.java

@@ -1,136 +1,137 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.repo.site;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.UUID;
-
-import org.alfresco.service.cmr.site.SiteInfo;
-import org.alfresco.service.cmr.site.SiteVisibility;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test Membership constructor logs. Based on REPO-2520
- * 
- * @author Alexandru Epure
- */
-public class SiteMembershipTest
-{
-    SiteInfo siteInfo;
-    SiteMembership siteMember;
-    String personId = UUID.randomUUID().toString();
-    String firstName = UUID.randomUUID().toString();
-    String lastName = UUID.randomUUID().toString();
-    String role = "Consumer";
-
-    String idErrorMessage = "Id required building site membership";
-    String firstNameErrorMessage = "FirstName required building site membership of ";
-    String lastNameErrorMessage = "LastName required building site membership of ";
-    String roleErrorMessage = "Role required building site membership";
-
-    @Before
-    public void createSite()
-    {
-        String sitePreset = "testSiteMembershipPreset";
-        String shortName = "testSiteMembershipShortName";
-        String title = "testSiteMembershipTile";
-        String description = "testSiteMembershipDescription";
-        siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description,
-                SiteVisibility.PUBLIC, null);
-    }
-
-    @Test
-    public void testNullpersonInfo() throws Exception
-    {
-        try
-        {
-            siteMember = new SiteMembership(siteInfo, null, firstName, lastName, role);
-        }
-        catch (IllegalArgumentException e)
-        {
-            assertEquals(idErrorMessage, e.getMessage());
-        }
-
-        try
-        {
-            siteMember = new SiteMembership(siteInfo, null, role);
-        }
-        catch (IllegalArgumentException e)
-        {
-            assertEquals(idErrorMessage, e.getMessage());
-        }
-    }
-
-    @Test
-    public void testNullRole() throws Exception
-    {
-        try
-        {
-            siteMember = new SiteMembership(siteInfo, personId, firstName, lastName, null);
-        }
-        catch (IllegalArgumentException e)
-        {
-            assertEquals(roleErrorMessage, e.getMessage());
-        }
-
-        try
-        {
-            siteMember = new SiteMembership(siteInfo, personId, null);
-        }
-        catch (IllegalArgumentException e)
-        {
-            assertEquals(roleErrorMessage, e.getMessage());
-        }
-    }
-
-    @Test
-    public void testNullFirstName() throws Exception
-    {
-        try
-        {
-            siteMember = new SiteMembership(siteInfo, personId, null, lastName, role);
-        }
-        catch (IllegalArgumentException e)
-        {
-            assertEquals(firstNameErrorMessage + siteInfo.getShortName(), e.getMessage());
-        }
-    }
-
-    @Test
-    public void testNullLastName() throws Exception
-    {
-        try
-        {
-            siteMember = new SiteMembership(siteInfo, personId, firstName, null, role);
-        }
-        catch (IllegalArgumentException e)
-        {
-            assertEquals(lastNameErrorMessage + siteInfo.getShortName(), e.getMessage());
-        }
-    }
-}
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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.repo.site;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.UUID;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteVisibility;
+
+/**
+ * Test Membership constructor logs. Based on REPO-2520
+ * 
+ * @author Alexandru Epure
+ */
+public class SiteMembershipTest
+{
+    SiteInfo siteInfo;
+    SiteMembership siteMember;
+    String personId = UUID.randomUUID().toString();
+    String firstName = UUID.randomUUID().toString();
+    String lastName = UUID.randomUUID().toString();
+    String role = "Consumer";
+
+    String idErrorMessage = "Id required building site membership";
+    String firstNameErrorMessage = "FirstName required building site membership of ";
+    String lastNameErrorMessage = "LastName required building site membership of ";
+    String roleErrorMessage = "Role required building site membership";
+
+    @Before
+    public void createSite()
+    {
+        var sitePreset = "testSiteMembershipPreset";
+        var shortName = "testSiteMembershipShortName";
+        var title = "testSiteMembershipTile";
+        var description = "testSiteMembershipDescription";
+        siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description,
+                SiteVisibility.PUBLIC, null);
+    }
+
+    @Test
+    public void testNullpersonInfo() throws Exception
+    {
+        try
+        {
+            siteMember = new SiteMembership(siteInfo, null, firstName, lastName, role);
+        }
+        catch (IllegalArgumentException e)
+        {
+            assertEquals(idErrorMessage, e.getMessage());
+        }
+
+        try
+        {
+            siteMember = new SiteMembership(siteInfo, null, role);
+        }
+        catch (IllegalArgumentException e)
+        {
+            assertEquals(idErrorMessage, e.getMessage());
+        }
+    }
+
+    @Test
+    public void testNullRole() throws Exception
+    {
+        try
+        {
+            siteMember = new SiteMembership(siteInfo, personId, firstName, lastName, null);
+        }
+        catch (IllegalArgumentException e)
+        {
+            assertEquals(roleErrorMessage, e.getMessage());
+        }
+
+        try
+        {
+            siteMember = new SiteMembership(siteInfo, personId, null);
+        }
+        catch (IllegalArgumentException e)
+        {
+            assertEquals(roleErrorMessage, e.getMessage());
+        }
+    }
+
+    @Test
+    public void testNullFirstName() throws Exception
+    {
+        try
+        {
+            siteMember = new SiteMembership(siteInfo, personId, null, lastName, role);
+        }
+        catch (IllegalArgumentException e)
+        {
+            assertEquals(firstNameErrorMessage + siteInfo.getShortName(), e.getMessage());
+        }
+    }
+
+    @Test
+    public void testNullLastName() throws Exception
+    {
+        try
+        {
+            siteMember = new SiteMembership(siteInfo, personId, firstName, null, role);
+        }
+        catch (IllegalArgumentException e)
+        {
+            assertEquals(lastNameErrorMessage + siteInfo.getShortName(), e.getMessage());
+        }
+    }
+}