[APPS-3172] Update License Header

This reverts commit 7f8dd30305.

.github/workflows/master_release.yml

@@ -31,15 +31,15 @@ jobs:
       !contains(github.event.head_commit.message, '[no release]') &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - 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@v8.24.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.2.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -60,15 +60,15 @@ jobs:
       !contains(github.event.head_commit.message, '[no downstream]') &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - 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@v8.24.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.2.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}

.github/workflows/precommit_formatter.yml

@@ -1,32 +0,0 @@
-name: Pre-Commit formatter
-
-on:
-  push:
-    branches:
-      - precommit/**
-
-jobs:
-  format-code:
-    name: "Reformat code"
-    runs-on: ubuntu-latest
-    if: contains(github.event.head_commit.message, '[reformat code]')
-    steps:
-      - uses: actions/checkout@v5
-      - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.9"
-      - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
-        continue-on-error: true
-        with:
-          extra_args: --all-files
-      - name: Update secrets baseline
-        run: pip install detect-secrets && detect-secrets scan --baseline .secrets.baseline
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.24.1
-        with:
-          username: ${{ secrets.BOT_GITHUB_USERNAME }}
-          add-options: -u
-          commit-message: "Apply Pre-Commit code formatting"
-          skip-if-no-changes: true
-      - name: Push changes
-        run: git push

.secrets.baseline

@@ -127,6 +127,29 @@
     }
   ],
   "results": {
+    ".github/workflows/ci.yml": [
+      {
+        "type": "Secret Keyword",
+        "filename": ".github/workflows/ci.yml",
+        "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572",
+        "is_verified": false,
+        "line_number": 299
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": ".github/workflows/ci.yml",
+        "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966",
+        "is_verified": false,
+        "line_number": 374
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": ".github/workflows/ci.yml",
+        "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39",
+        "is_verified": false,
+        "line_number": 908
+      }
+    ],
     ".github/workflows/master_release.yml": [
       {
         "type": "Secret Keyword",
@@ -224,7 +247,7 @@
         "filename": "core/src/main/java/org/alfresco/encryption/AlfrescoKeyStore.java",
         "hashed_secret": "a718763bca0f328b0e7ce2a98d9e79fc271bf827",
         "is_verified": false,
-        "line_number": 34,
+        "line_number": 35,
         "is_secret": false
       }
     ],
@@ -234,7 +257,7 @@
         "filename": "core/src/main/java/org/alfresco/httpclient/HttpClientFactory.java",
         "hashed_secret": "5d3c708390e5f51413e414393d4ad2a6d0e59a45",
         "is_verified": false,
-        "line_number": 128,
+        "line_number": 126,
         "is_secret": false
       }
     ],
@@ -400,7 +423,7 @@
         "filename": "packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java",
         "hashed_secret": "a28cecdb5056cf30135809b921e38a84deb6c345",
         "is_verified": false,
-        "line_number": 100,
+        "line_number": 102,
         "is_secret": false
       },
       {
@@ -408,7 +431,7 @@
         "filename": "packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java",
         "hashed_secret": "5e39d8e2991ef9705998de26b33f11be0f3cdcde",
         "is_verified": false,
-        "line_number": 101,
+        "line_number": 103,
         "is_secret": false
       }
     ],
@@ -516,7 +539,7 @@
         "filename": "packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSitePersonMembershipRequestModelsCollection.java",
         "hashed_secret": "8b30a14989d7b8093ac29462fe29423d836625b4",
         "is_verified": false,
-        "line_number": 33,
+        "line_number": 39,
         "is_secret": false
       }
     ],
@@ -600,7 +623,7 @@
         "filename": "remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/AbstractTenantAdminWebScript.java",
         "hashed_secret": "889d2688743fdce6115117a5ba7dbc5f33e0ce03",
         "is_verified": false,
-        "line_number": 39,
+        "line_number": 38,
         "is_secret": false
       }
     ],
@@ -610,7 +633,7 @@
         "filename": "remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java",
         "hashed_secret": "43d52295ed5cb7e2b772f2b8be9695ddde971c49",
         "is_verified": false,
-        "line_number": 60,
+        "line_number": 62,
         "is_secret": false
       },
       {
@@ -618,7 +641,7 @@
         "filename": "remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java",
         "hashed_secret": "1bd5147ff91b8b1220d2f1ffde850ebabbc5ec8c",
         "is_verified": false,
-        "line_number": 61,
+        "line_number": 63,
         "is_secret": false
       }
     ],
@@ -648,7 +671,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java",
         "hashed_secret": "a926a50b320cea0d6c008a04322627400fe33f55",
         "is_verified": false,
-        "line_number": 73,
+        "line_number": 74,
         "is_secret": false
       }
     ],
@@ -658,7 +681,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/node/NodeWebScripTest.java",
         "hashed_secret": "a926a50b320cea0d6c008a04322627400fe33f55",
         "is_verified": false,
-        "line_number": 96,
+        "line_number": 95,
         "is_secret": false
       }
     ],
@@ -668,7 +691,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java",
         "hashed_secret": "4ffa743f28fc949c19e65ab045d7906d0609a2c2",
         "is_verified": false,
-        "line_number": 268,
+        "line_number": 269,
         "is_secret": false
       }
     ],
@@ -678,7 +701,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilterTest.java",
         "hashed_secret": "76ed0a056aa77060de25754586440cff390791d0",
         "is_verified": false,
-        "line_number": 59,
+        "line_number": 63,
         "is_secret": false
       }
     ],
@@ -688,7 +711,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 108,
+        "line_number": 109,
         "is_secret": false
       }
     ],
@@ -718,7 +741,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/RepoService.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 412,
+        "line_number": 418,
         "is_secret": false
       }
     ],
@@ -728,7 +751,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMIS.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 175,
+        "line_number": 182,
         "is_secret": false
       }
     ],
@@ -738,7 +761,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
         "is_verified": false,
-        "line_number": 595,
+        "line_number": 592,
         "is_secret": false
       },
       {
@@ -746,7 +769,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "53dad674827218e94c8fe9c1984c8dd9db512a17",
         "is_verified": false,
-        "line_number": 731,
+        "line_number": 728,
         "is_secret": false
       },
       {
@@ -754,7 +777,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "be66cf01c56d963de61462f37a43df2305367216",
         "is_verified": false,
-        "line_number": 1434,
+        "line_number": 1429,
         "is_secret": false
       },
       {
@@ -762,7 +785,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "283d47a9338ed1100b5fe2a5aff2d1f7c799bfd0",
         "is_verified": false,
-        "line_number": 1435,
+        "line_number": 1430,
         "is_secret": false
       },
       {
@@ -770,7 +793,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "425a715491af2bbec1eef2def6fa8d79c3050401",
         "is_verified": false,
-        "line_number": 1457,
+        "line_number": 1452,
         "is_secret": false
       }
     ],
@@ -860,7 +883,7 @@
         "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java",
         "hashed_secret": "b003370e1497c5003e21f1ec5da89e3d2d819506",
         "is_verified": false,
-        "line_number": 59,
+        "line_number": 60,
         "is_secret": false
       },
       {
@@ -868,7 +891,7 @@
         "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java",
         "hashed_secret": "fc99e6a90240c45f46ed33a4d96a3dbecef41c60",
         "is_verified": false,
-        "line_number": 60,
+        "line_number": 61,
         "is_secret": false
       }
     ],
@@ -878,7 +901,7 @@
         "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJob.java",
         "hashed_secret": "b003370e1497c5003e21f1ec5da89e3d2d819506",
         "is_verified": false,
-        "line_number": 54,
+        "line_number": 52,
         "is_secret": false
       }
     ],
@@ -888,7 +911,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/admin/patch/impl/AdminUserPatch.java",
         "hashed_secret": "87a754b00f7ee047d496808125d6259104e9382a",
         "is_verified": false,
-        "line_number": 62,
+        "line_number": 60,
         "is_secret": false
       }
     ],
@@ -908,7 +931,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java",
         "hashed_secret": "a172ffc990129fe6f68b50f6037c54a1894ee3fd",
         "is_verified": false,
-        "line_number": 205,
+        "line_number": 204,
         "is_secret": false
       },
       {
@@ -916,7 +939,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java",
         "hashed_secret": "a172ffc990129fe6f68b50f6037c54a1894ee3fd",
         "is_verified": false,
-        "line_number": 205,
+        "line_number": 204,
         "is_secret": false
       }
     ],
@@ -926,7 +949,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java",
         "hashed_secret": "e25df0eeed8d8eb4e198c3464c7bf747bc26eff8",
         "is_verified": false,
-        "line_number": 91,
+        "line_number": 92,
         "is_secret": false
       }
     ],
@@ -936,7 +959,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java",
         "hashed_secret": "304de25a3d73b68ad408ca3843356b5cf67f6f14",
         "is_verified": false,
-        "line_number": 89,
+        "line_number": 93,
         "is_secret": false
       }
     ],
@@ -946,7 +969,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl2.java",
         "hashed_secret": "9ae9f2be7702b726809545808a8a9ba2e5a38410",
         "is_verified": false,
-        "line_number": 129,
+        "line_number": 130,
         "is_secret": false
       }
     ],
@@ -1250,7 +1273,7 @@
         "filename": "repository/src/main/resources/alfresco/repository.properties",
         "hashed_secret": "84551ae5442affc9f1a2d3b4c86ae8b24860149d",
         "is_verified": false,
-        "line_number": 771,
+        "line_number": 770,
         "is_secret": false
       }
     ],
@@ -1280,7 +1303,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 86,
+        "line_number": 88,
         "is_secret": false
       },
       {
@@ -1288,7 +1311,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
         "hashed_secret": "c464af817287343305cbd6493c593885695df531",
         "is_verified": false,
-        "line_number": 90,
+        "line_number": 92,
         "is_secret": false
       },
       {
@@ -1296,7 +1319,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
         "hashed_secret": "8ad8572a0b3fc4cb3afc1baaebc97a2cae58eb8c",
         "is_verified": false,
-        "line_number": 91,
+        "line_number": 93,
         "is_secret": false
       },
       {
@@ -1304,7 +1327,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
         "hashed_secret": "915692b4d7465b0084354173d552ac90145dc315",
         "is_verified": false,
-        "line_number": 92,
+        "line_number": 94,
         "is_secret": false
       }
     ],
@@ -1314,7 +1337,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java",
         "hashed_secret": "8c85434f6f339a24b808810bd95629d0f5856355",
         "is_verified": false,
-        "line_number": 1257,
+        "line_number": 1280,
         "is_secret": false
       }
     ],
@@ -1324,7 +1347,7 @@
         "filename": "repository/src/test/java/org/alfresco/opencmis/CMISTest.java",
         "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684",
         "is_verified": false,
-        "line_number": 4001,
+        "line_number": 4134,
         "is_secret": false
       }
     ],
@@ -1334,7 +1357,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 141,
+        "line_number": 140,
         "is_secret": false
       }
     ],
@@ -1344,7 +1367,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 101,
+        "line_number": 102,
         "is_secret": false
       }
     ],
@@ -1354,7 +1377,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 116,
+        "line_number": 118,
         "is_secret": false
       }
     ],
@@ -1364,7 +1387,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 66,
+        "line_number": 68,
         "is_secret": false
       }
     ],
@@ -1374,7 +1397,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 111,
+        "line_number": 116,
         "is_secret": false
       }
     ],
@@ -1384,7 +1407,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/LoadTester.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 79,
+        "line_number": 80,
         "is_secret": false
       }
     ],
@@ -1394,7 +1417,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java",
         "hashed_secret": "678721c0433c8cf5c9069a0e70784cf1839e866b",
         "is_verified": false,
-        "line_number": 55,
+        "line_number": 58,
         "is_secret": false
       }
     ],
@@ -1404,7 +1427,27 @@
         "filename": "repository/src/test/java/org/alfresco/repo/invitation/site/InviteSenderTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 108,
+        "line_number": 109,
+        "is_secret": false
+      }
+    ],
+    "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java": [
+      {
+        "type": "Secret Keyword",
+        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 112,
+        "is_secret": false
+      }
+    ],
+    "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java": [
+      {
+        "type": "Secret Keyword",
+        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 103,
         "is_secret": false
       }
     ],
@@ -1440,7 +1483,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java",
         "hashed_secret": "9e10e28cb9c3e381c13d13fa97dd97148982cdaa",
         "is_verified": false,
-        "line_number": 590,
+        "line_number": 595,
         "is_secret": false
       }
     ],
@@ -1450,7 +1493,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 75,
+        "line_number": 74,
         "is_secret": false
       }
     ],
@@ -1460,7 +1503,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java",
         "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0",
         "is_verified": false,
-        "line_number": 62,
+        "line_number": 61,
         "is_secret": false
       },
       {
@@ -1468,7 +1511,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java",
         "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0",
         "is_verified": false,
-        "line_number": 62,
+        "line_number": 61,
         "is_secret": false
       },
       {
@@ -1476,7 +1519,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java",
         "hashed_secret": "ad8a621976e9a19cc78af501a84638a04fca9b83",
         "is_verified": false,
-        "line_number": 66,
+        "line_number": 65,
         "is_secret": false
       }
     ],
@@ -1486,7 +1529,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java",
         "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0",
         "is_verified": false,
-        "line_number": 64,
+        "line_number": 70,
         "is_secret": false
       }
     ],
@@ -1496,7 +1539,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 130,
+        "line_number": 127,
         "is_secret": false
       }
     ],
@@ -1506,7 +1549,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 1317,
+        "line_number": 1328,
         "is_secret": false
       }
     ],
@@ -1516,7 +1559,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationServiceImplTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 69,
+        "line_number": 68,
         "is_secret": false
       }
     ],
@@ -1526,7 +1569,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java",
         "hashed_secret": "607e729c2f77c4e821e68e26b4c1f5a4398624e9",
         "is_verified": false,
-        "line_number": 2121,
+        "line_number": 2129,
         "is_secret": false
       }
     ],
@@ -1536,7 +1579,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthorizationTest.java",
         "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684",
         "is_verified": false,
-        "line_number": 36,
+        "line_number": 37,
         "is_secret": false
       }
     ],
@@ -1546,7 +1589,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/CompositePasswordEncoderTest.java",
         "hashed_secret": "4360136f24381dcec1d35d79fbf7dac4b54dfe97",
         "is_verified": false,
-        "line_number": 310,
+        "line_number": 301,
         "is_secret": false
       }
     ],
@@ -1574,7 +1617,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/LazyInstantiatingIdentityServiceFacadeUnitTest.java",
         "hashed_secret": "12e59296b0d17c1ceb345a7adca98574c835ba24",
         "is_verified": false,
-        "line_number": 46,
+        "line_number": 45,
         "is_secret": false
       }
     ],
@@ -1584,7 +1627,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacadeUnitTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 48,
+        "line_number": 47,
         "is_secret": false
       }
     ],
@@ -1604,7 +1647,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/HttpClientTransmitterImplTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 73,
+        "line_number": 75,
         "is_secret": false
       }
     ],
@@ -1614,7 +1657,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 658,
+        "line_number": 664,
         "is_secret": false
       }
     ],
@@ -1624,7 +1667,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 202,
+        "line_number": 203,
         "is_secret": false
       },
       {
@@ -1632,7 +1675,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java",
         "hashed_secret": "ad782ecdac770fc6eb9a62e44f90873fb97fb26b",
         "is_verified": false,
-        "line_number": 512,
+        "line_number": 513,
         "is_secret": false
       },
       {
@@ -1640,7 +1683,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 3593,
+        "line_number": 3687,
         "is_secret": false
       }
     ],
@@ -1650,7 +1693,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java",
         "hashed_secret": "8be3c943b1609fffbfc51aad666d0a04adf83c9d",
         "is_verified": false,
-        "line_number": 2510,
+        "line_number": 2682,
         "is_secret": false
       },
       {
@@ -1658,7 +1701,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 3517,
+        "line_number": 3772,
         "is_secret": false
       }
     ],
@@ -1668,7 +1711,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 114,
+        "line_number": 115,
         "is_secret": false
       }
     ],
@@ -1678,7 +1721,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/manifest/TransferManifestTest.java",
         "hashed_secret": "5395ebfd174b0a5617e6f409dfbb3e064e3fdf0a",
         "is_verified": false,
-        "line_number": 126,
+        "line_number": 127,
         "is_secret": false
       }
     ],
@@ -1688,7 +1731,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/version/BaseVersionStoreTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 144,
+        "line_number": 149,
         "is_secret": false
       }
     ],
@@ -1708,7 +1751,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/version/VersionServiceImplTest.java",
         "hashed_secret": "dee17075a8c96d9c57c15d56b1f64e5abc1caf0b",
         "is_verified": false,
-        "line_number": 121,
+        "line_number": 122,
         "is_secret": false
       }
     ],
@@ -1718,7 +1761,7 @@
         "filename": "repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoTenant.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 73,
+        "line_number": 67,
         "is_secret": false
       }
     ],
@@ -1728,7 +1771,7 @@
         "filename": "repository/src/test/java/org/alfresco/util/test/testusers/TestUserComponentImpl.java",
         "hashed_secret": "f73e110427648014568f7144031a6d48060eab0a",
         "is_verified": false,
-        "line_number": 63,
+        "line_number": 55,
         "is_secret": false
       }
     ],
@@ -1845,5 +1888,5 @@
       }
     ]
   },
-  "generated_at": "2025-06-09T16:43:14Z"
-}
+  "generated_at": "2025-01-07T10:56:22Z"
+}

CONTRIBUTING.md

@@ -10,9 +10,7 @@ pre-commit install
 When you make a commit then these hooks will run and check the modified files. If it makes changes then you can review them and then `git commit` again to accept the changes.
 
 #### Code Quality
-This project uses `spotless` that enforces `alfresco-formatter.xml` to ensure code quality. 
-The code style definition file is taken always form the `master` branch of `alfresco-community-repo`. 
-All downstream projects use this code style definition file as well. 
+This project uses `spotless` that enforces `alfresco-formatter.xml` to ensure code quality.
 
 To check code-style violations you can use:
 ```bash

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>25.3.0.35</version>
+      <version>25.1.0.21-SNAPSHOT</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>25.3.0.35</version>
+      <version>25.1.0.21-SNAPSHOT</version>
    </parent>
 
    <modules>

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

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>25.3.0.35</version>
+      <version>25.1.0.21-SNAPSHOT</version>
    </parent>
 
    <build>
@@ -74,6 +74,16 @@
          <artifactId>alfresco-testng</artifactId>
          <version>1.1</version>
       </dependency>
+      <dependency>
+         <groupId>com.epam.reportportal</groupId>
+         <artifactId>agent-java-testng</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>com.squareup.okhttp3</groupId>
+         <artifactId>okhttp</artifactId>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.awaitility</groupId>
          <artifactId>awaitility</artifactId>
@@ -83,7 +93,7 @@
       <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>commons-collections4</artifactId>
-         <version>4.5.0</version>
+         <version>4.4</version>
       </dependency>
       <dependency>
          <groupId>com.github.docker-java</groupId>

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

@@ -1,30 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.model;
-
-public record CapabilityModel(String name, String title, String description, GroupModel group, int index)
-{}

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

@@ -1,30 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.model;
-
-public record GroupModel(String id, String title)
-{}

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

@@ -1,91 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.model.role;
-
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.rm.community.model.CapabilityModel;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for role
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Role extends TestModel
-{
-
-    @JsonProperty(required = true)
-    private String name;
-
-    @JsonProperty(required = true)
-    private List<CapabilityModel> capabilities;
-
-    @JsonProperty(required = true)
-    private String displayLabel;
-
-    @JsonProperty(required = true)
-    private String groupShortName;
-
-    private List<String> assignedUsers;
-
-    private List<String> assignedGroups;
-
-    private String roleGroupName;
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass())
-        {
-            return false;
-        }
-        Role role = (Role) o;
-        return Objects.equals(name, role.name) && Objects.equals(capabilities, role.capabilities)
-                && Objects.equals(displayLabel, role.displayLabel) && Objects.equals(groupShortName, role.groupShortName) && Objects.equals(assignedUsers, role.assignedUsers)
-                && Objects.equals(assignedGroups, role.assignedGroups) && Objects.equals(roleGroupName, role.roleGroupName);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(name, capabilities, displayLabel, groupShortName, assignedUsers, assignedGroups, roleGroupName);
-    }
-}

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

@@ -1,32 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.model.role;
-
-import org.alfresco.rest.core.RestModels;
-
-public class RoleCollection extends RestModels<RoleEntry, RoleCollection>
-{}

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

@@ -1,47 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.model.role;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.core.RestModels;
-
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class RoleEntry extends RestModels<Role, RoleEntry>
-{
-    @JsonProperty
-    private Role entry;
-}

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

@@ -35,7 +35,7 @@ package org.alfresco.rest.rm.community.model.user;
  */
 public enum UserRoles
 {
-    IN_PLACE_WRITERS("ExtendedWriters", "In-Place Writers"), ROLE_RM_ADMIN("Administrator", "Records Management Administrator"), ROLE_RM_MANAGER("RecordsManager", "Records Management Manager"), ROLE_RM_POWER_USER("PowerUser", "Records Management Power User"), ROLE_RM_SECURITY_OFFICER("SecurityOfficer", "Records Management Security Officer"), ROLE_RM_USER("User", "Records Management User"), IN_PLACE_READERS("ExtendedReaders", "In-Place Readers");
+    IN_PLACE_WRITERS("ExtendedWriters", "In-Place Writers"), ROLE_RM_ADMIN("Administrator", "Records Management Administrator"), ROLE_RM_MANAGER("RecordsManager", "Records Management Manager"), ROLE_RM_POWER_USER("PowerUser", "Records Management Power User"), ROLE_RM_SECURITY_OFFICER("SecurityOfficer", "Records Management Security Officer"), ROLE_RM_USER("User", "Records Management User");
 
     public final String roleId;
     public final String displayName;

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

@@ -43,7 +43,6 @@ import org.alfresco.rest.rm.community.model.hold.Hold;
 import org.alfresco.rest.rm.community.model.hold.HoldCollection;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryCollection;
-import org.alfresco.rest.rm.community.model.role.RoleCollection;
 import org.alfresco.rest.rm.community.requests.RMModelRequest;
 
 /**
@@ -304,39 +303,4 @@ public class FilePlanAPI extends RMModelRequest
     {
         return getHolds(filePlanId, EMPTY);
     }
-
-    /**
-     * Gets the roles of a file plan.
-     *
-     * @param filePlanId
-     *            The identifier of a file plan
-     * @param parameters
-     *            The URL parameters to add
-     * @return The {Pagination and RoleModel Entries} for the given {@code filePlanId}
-     * @throws RuntimeException
-     *             for the following cases:
-     *             <ul>
-     *             <li>authentication fails</li>
-     *             <li>current user does not have permission to read {@code filePlanId}</li>
-     *             <li>{@code filePlanId} does not exist</li>
-     *             </ul>
-     */
-    public RoleCollection getFilePlanRoles(String filePlanId, String parameters)
-    {
-        mandatoryString("filePlanId", filePlanId);
-        return getRmRestWrapper().processModels(RoleCollection.class, simpleRequest(
-                GET,
-                "file-plans/{filePlanId}/roles?{parameters}",
-                filePlanId,
-                parameters));
-    }
-
-    /**
-     * See {@link #getFilePlanRoles(String, String)}
-     */
-    public RoleCollection getFilePlanRoles(String filePlanId)
-    {
-        return getFilePlanRoles(filePlanId, EMPTY);
-    }
-
 }

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

@@ -43,7 +43,7 @@ import com.github.dockerjava.core.command.LogContainerResultCallback;
 import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -93,7 +93,6 @@ import org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI;
 import org.alfresco.rest.search.RestRequestQueryModel;
 import org.alfresco.rest.search.SearchNodeModel;
 import org.alfresco.rest.search.SearchRequest;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
 import org.alfresco.rest.v0.SearchAPI;
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.data.DataUserAIS;
@@ -128,10 +127,6 @@ public class BaseRMRestTest extends RestTest
     @Getter(value = PROTECTED)
     private SearchAPI searchApi;
 
-    @Autowired
-    @Getter(PROTECTED)
-    private RMRolesAndActionsAPI rmRolesAndActionsV0API;
-
     protected static final String iso8601_DateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
 
     /**

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

@@ -28,7 +28,6 @@ package org.alfresco.rest.rm.community.fileplans;
 
 import static java.util.Arrays.asList;
 
-import static com.google.common.collect.Sets.newHashSet;
 import static org.springframework.http.HttpStatus.CONFLICT;
 import static org.springframework.http.HttpStatus.CREATED;
 import static org.springframework.http.HttpStatus.FORBIDDEN;
@@ -57,27 +56,19 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentType.UNFILED_CONTAINER_TYPE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentType.UNFILED_RECORD_FOLDER_TYPE;
 import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_FILING;
-import static org.alfresco.rest.rm.community.model.user.UserRoles.IN_PLACE_READERS;
-import static org.alfresco.rest.rm.community.model.user.UserRoles.IN_PLACE_WRITERS;
-import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_ADMIN;
 import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_MANAGER;
-import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_POWER_USER;
-import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_SECURITY_OFFICER;
-import static org.alfresco.rest.rm.community.model.user.UserRoles.ROLE_RM_USER;
 import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
 import static org.alfresco.utility.data.RandomData.getRandomName;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Set;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
 import org.alfresco.rest.rm.community.base.DataProviderClass;
-import org.alfresco.rest.rm.community.model.CapabilityModel;
 import org.alfresco.rest.rm.community.model.fileplan.FilePlan;
 import org.alfresco.rest.rm.community.model.fileplan.FilePlanProperties;
 import org.alfresco.rest.rm.community.model.hold.Hold;
@@ -85,9 +76,6 @@ import org.alfresco.rest.rm.community.model.hold.HoldCollection;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryCollection;
 import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryProperties;
-import org.alfresco.rest.rm.community.model.role.Role;
-import org.alfresco.rest.rm.community.model.role.RoleCollection;
-import org.alfresco.rest.rm.community.model.user.UserCapabilities;
 import org.alfresco.rest.rm.community.requests.gscore.api.RMSiteAPI;
 import org.alfresco.utility.constants.ContainerName;
 import org.alfresco.utility.model.UserModel;
@@ -99,7 +87,6 @@ import org.alfresco.utility.report.Bug;
  * @author Rodica Sutu
  * @since 2.6
  */
-@SuppressWarnings("PMD.UnitTestShouldIncludeAssert")
 public class FilePlanTests extends BaseRMRestTest
 {
     // ** Number of children (for children creation test) */
@@ -279,7 +266,7 @@ public class FilePlanTests extends BaseRMRestTest
      * When I ask the API to create a root record category
      * Then it is created as a root record category
      * </pre>
-     *
+     * 
      * <pre>
      * Given that a file plan exists
      * When I use the API to create a folder (cm:folder type) into the fileplan
@@ -327,7 +314,7 @@ public class FilePlanTests extends BaseRMRestTest
      * When I ask the API to create a root category having the same name
      * Then  the response code received is 409 - name clashes with an existing node
      * </pre>
-     *
+     * 
      * <pre>
      * Given a root category
      * When I ask the API to create a root category having the same name  with autoRename parameter on true
@@ -607,171 +594,4 @@ public class FilePlanTests extends BaseRMRestTest
             }
         });
     }
-
-    /**
-     * <pre>
-     * Given that a file plan exists
-     * When rmAdmin user ask the API for roles
-     * It provides list of all default roles
-     * </pre>
-     */
-    @Test
-    public void listFilePlanAllDefaultRoles()
-    {
-        List<String> defaultRolesDisplayNames = asList(IN_PLACE_READERS.displayName, ROLE_RM_ADMIN.displayName, ROLE_RM_MANAGER.displayName, ROLE_RM_POWER_USER.displayName, ROLE_RM_USER.displayName, IN_PLACE_WRITERS.displayName, ROLE_RM_SECURITY_OFFICER.displayName);
-        // Call to new API to get the roles and capabilities
-        RoleCollection roleCollection = getRestAPIFactory().getFilePlansAPI().getFilePlanRoles(FILE_PLAN_ALIAS);
-        assertStatusCode(OK);
-        roleCollection.getEntries().forEach(roleModelEntry -> {
-            Role role = roleModelEntry.getEntry();
-            assertTrue(defaultRolesDisplayNames.contains(role.getDisplayLabel()));
-            assertNotNull(role.getCapabilities());
-        });
-    }
-
-    /**
-     * <pre>
-     * Given that a file plan exists
-     * When rmAdmin user ask the API for roles with SystemRoles as false
-     * It provides list of all roles excluding SystemRoles
-     * </pre>
-     */
-    @Test
-    public void listFilePlanAllRolesExcludeSystemRoles()
-    {
-        String parameters = "where=(systemRoles=false)";
-        List<String> systemRolesDisplayNames = asList(IN_PLACE_WRITERS.displayName, IN_PLACE_READERS.displayName);
-        // Call to new API to get the roles and capabilities
-        RoleCollection roleCollection = getRestAPIFactory().getFilePlansAPI().getFilePlanRoles(FILE_PLAN_ALIAS, parameters);
-        assertStatusCode(OK);
-        roleCollection.getEntries().forEach(roleModelEntry -> {
-            Role role = roleModelEntry.getEntry();
-            assertFalse(systemRolesDisplayNames.contains(role.getDisplayLabel()));
-            assertNotNull(role.getCapabilities());
-        });
-    }
-
-    /**
-     * <pre>
-     * Given that a file plan exists
-     * When a non-RM user asks the API for the roles
-     * Then the status code 403 (Permission denied) is return
-     * </pre>
-     */
-    @Test
-    public void nonRmUserFilePlanRoles()
-    {
-        // Create a random user
-        UserModel nonRMuser = getDataUser().createRandomTestUser("testUser");
-        // Call to new API to get the roles and capabilities
-        getRestAPIFactory().getFilePlansAPI(nonRMuser).getFilePlanRoles(FILE_PLAN_ALIAS);
-        assertStatusCode(FORBIDDEN);
-    }
-
-    /**
-     * <pre>
-     * Given that a file plan exists
-     * When a RM_Manager user asks the API for the roles
-     * returns the RM_Manager role and capabilities
-     * </pre>
-     */
-    @Test
-    public void rmManagerFilePlanRolesAndCapabilities()
-    {
-        // Create a random user
-        UserModel managerUser = getDataUser().createRandomTestUser("managerUser");
-        // Assign RecordsManager role to user
-        getRestAPIFactory().getRMUserAPI().assignRoleToUser(managerUser.getUsername(), ROLE_RM_MANAGER.roleId);
-        String parameters = "where=(personId='" + managerUser.getUsername() + "')";
-        // Call to new API to get the roles and capabilities
-        RoleCollection roleCollection = getRestAPIFactory().getFilePlansAPI(managerUser).getFilePlanRoles(FILE_PLAN_ALIAS, parameters);
-        roleCollection.getEntries().forEach(roleModelEntry -> {
-            Role role = roleModelEntry.getEntry();
-            assertEquals(ROLE_RM_MANAGER.displayName, role.getDisplayLabel());
-            assertNotNull(role.getCapabilities());
-        });
-
-    }
-
-    /**
-     * <pre>
-     * Given that a file plan exists
-     * When a User with more than one role asks the API for the roles and relation
-     * returns the roles and capabilities
-     * </pre>
-     */
-    @Test
-    public void multipleRoleUserFilePlanRolesAndCapabilities()
-    {
-        // Create a random user
-        UserModel rmUser = getDataUser().createRandomTestUser("rmUser");
-        // Assign rmUser role to user
-        getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), ROLE_RM_USER.roleId);
-        getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), ROLE_RM_POWER_USER.roleId);
-        String parameters = "where=(personId='" + rmUser.getUsername() + "')";
-        // Call to new API to get the roles and capabilities
-        RoleCollection roleCollection = getRestAPIFactory().getFilePlansAPI(rmUser).getFilePlanRoles(FILE_PLAN_ALIAS, parameters);
-        assertStatusCode(OK);
-        assertEquals(roleCollection.getEntries().size(), 2);
-        roleCollection.getEntries().forEach(roleModelEntry -> {
-            Role role = roleModelEntry.getEntry();
-            assertTrue(role.getDisplayLabel().equals(ROLE_RM_USER.displayName) || role.getDisplayLabel().equals(ROLE_RM_POWER_USER.displayName));
-            assertNotNull(role.getCapabilities());
-        });
-    }
-
-    /**
-     * <pre>
-     * Given that a file plan exists
-     * When a new user with a new role asks the API for the roles and relation
-     * returns the new role and new capabilities
-     * </pre>
-     */
-    @Test
-    public void newRoleUserFilePlanRolesAndCapabilities()
-    {
-        /** A list of capabilities. */
-        Set<String> newCapabilities = newHashSet(UserCapabilities.VIEW_RECORDS_CAP, UserCapabilities.DECLARE_RECORDS_CAP);
-        // Create a new role using old API
-        getRmRolesAndActionsV0API().createRole(getAdminUser().getUsername(), getAdminUser().getPassword(), "NewTestRole",
-                "New Role Label", newCapabilities);
-        // Create a random user
-        UserModel rmNewUser = getDataUser().createRandomTestUser("rmPowerUser");
-        // Assign New role to user
-        getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmNewUser.getUsername(), "NewTestRole");
-        String parameters = "where=(personId='" + rmNewUser.getUsername() + "')";
-        // Call to new API to get the roles and capabilities
-        RoleCollection roleCollection = getRestAPIFactory().getFilePlansAPI(rmNewUser).getFilePlanRoles(FILE_PLAN_ALIAS, parameters);
-        assertStatusCode(OK);
-        assertEquals(roleCollection.getEntries().size(), 1);
-        roleCollection.getEntries().forEach(roleModelEntry -> {
-            List<CapabilityModel> capabilities = roleModelEntry.getEntry().getCapabilities();
-            capabilities.forEach(capabilityModel -> {
-                assertTrue(newCapabilities.contains(capabilityModel.name()));
-            });
-        });
-    }
-
-    /**
-     * <pre>
-     * Given that a file plan exists
-     * When API call happens with Capability filter
-     * returns roles associated with the capability
-     * </pre>
-     */
-    @Test
-    public void filePlanRolesAndCapabilitiesFilter()
-    {
-        String parameters = "where=(systemRoles=true and capabilityName in ('ManageRules'))";
-        // Call to new API to get the roles and capabilities, filter by capability, include assigned users
-        RoleCollection roleCollection = getRestAPIFactory().getFilePlansAPI().getFilePlanRoles(FILE_PLAN_ALIAS, parameters);
-        assertStatusCode(OK);
-        assertEquals(roleCollection.getEntries().size(), 1);
-        roleCollection.getEntries().forEach(roleModelEntry -> {
-            Role role = roleModelEntry.getEntry();
-            assertEquals(ROLE_RM_ADMIN.displayName, role.getDisplayLabel());
-            assertNotNull(role.getCapabilities());
-        });
-    }
-
 }

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

@@ -134,16 +134,6 @@ public class AddToHoldsBulkV1Tests extends BaseRMRestTest
                 .until(() -> getRestAPIFactory().getSearchAPI(null).search(searchRequest).getPagination()
                         .getTotalItems() == NUMBER_OF_FILES);
 
-        RestRequestQueryModel ancestorReq = getContentFromFolderAndAllSubfoldersQuery(rootFolder.getNodeRefWithoutVersion());
-        SearchRequest ancestorSearchRequest = new SearchRequest();
-        ancestorSearchRequest.setQuery(ancestorReq);
-
-        STEP("Wait until paths are indexed.");
-        // to improve stability on CI - seems that sometimes during big load we need to wait longer for the condition
-        await().atMost(120, TimeUnit.SECONDS)
-                .until(() -> getRestAPIFactory().getSearchAPI(null).search(ancestorSearchRequest).getPagination()
-                        .getTotalItems() == NUMBER_OF_FILES);
-
         holdBulkOperation = HoldBulkOperation.builder()
                 .query(queryReq)
                 .op(HoldBulkOperationType.ADD).build();

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

@@ -37,7 +37,7 @@ import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPr
 
 import java.util.Collections;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
@@ -56,7 +56,7 @@ import org.alfresco.test.AlfrescoTest;
 
 /**
  * Add Relationship tests
- *
+ * 
  * @author Kavit Shah
  */
 public class AddRelationshipTests extends BaseRMRestTest

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

@@ -45,7 +45,7 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

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

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

amps/ags/rm-community/documentation/destruction/README.md

@@ -23,7 +23,7 @@ Recorded content can be explicitly destroyed whilst maintaining the original nod
 * License: Alfresco Community
 * Issue Tracker Link: [JIRA RM](https://issues.alfresco.com/jira/projects/RM/summary)
 * Contribution Model: Alfresco Closed Source
-* Documentation: [docs.alfresco.com (Records Management)](https://support.hyland.com/access?dita:id=job1721300866386&vrm_version=25.1&component=Alfresco%20Governance%20Services%20Community%20Edition)
+* Documentation: [docs.alfresco.com (Records Management)](http://docs.alfresco.com/rm2.4/concepts/welcome-rm.html)
 
 *** 
 

amps/ags/rm-community/documentation/overview.md

@@ -21,18 +21,18 @@ RM is split into two main parts - a repository integration and a Share integrati
 * [Community License](../LICENSE.txt)
 * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository)
 * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM)
-* [Community Documentation Link](https://support.hyland.com/access?dita:id=job1721300866386&vrm_version=25.1&component=Alfresco%20Governance%20Services%20Community%20Edition)
-* [Enterprise Documentation Link](https://support.hyland.com/access?dita:id=job1721300866386&vrm_version=25.1)
+* [Community Documentation Link](http://docs.alfresco.com/rm-community/concepts/welcome-rm.html)
+* [Enterprise Documentation Link](http://docs.alfresco.com/rm/concepts/welcome-rm.html)
 * [Contribution Model](../../CONTRIBUTING.md)
 
 *** 
 
 ### Prerequisite Knowledge
-An understanding of Alfresco Content Services is assumed. The following pages from the [developer documentation](https://support.hyland.com/access?dita:id=lsl1724405261585&vrm_version=25.2&component=Alfresco%20Content%20Services%20Community%20Edition) give useful background information:
+An understanding of Alfresco Content Services is assumed. The following pages from the [developer documentation](http://docs.alfresco.com/5.2/concepts/dev-for-developers.html) give useful background information:
 
-* [ACS Architecture](https://support.hyland.com/access?dita:id=lfo1719554691023&vrm_version=25.2)
-* [Platform Extensions](https://support.hyland.com/access?dita:id=ifr1720080387005&vrm_version=25.2)
-* [Share Extensions](https://support.hyland.com/access?dita:id=wqu1720687386891&vrm_version=25.2)
+* [ACS Architecture](http://docs.alfresco.com/5.2/concepts/dev-arch-overview.html)
+* [Platform Extensions](http://docs.alfresco.com/5.2/concepts/dev-platform-extensions.html)
+* [Share Extensions](http://docs.alfresco.com/5.2/concepts/dev-extensions-share.html)
 
 *** 
 
@@ -44,12 +44,12 @@ The RM Share module communicates with the repository module via REST APIs. Inter
 * A DAO layer responsible for CRUD operations against the database.
 
 #### REST API
-The REST API endpoints fall into two main types - v0 (Webscripts) and v1. The [v0 API](https://support.hyland.com/access?dita:id=fga1720080409048&vrm_version=25.2) is older and not recommended for integrations. The [v1 API](https://support.hyland.com/access?dita:id=cmm1721136574006&vrm_version=25.2) is newer but isn't yet feature complete. If you are running RM locally then the GS API Explorer will be available at [this link](http://localhost:8080/gs-api-explorer/).
+The REST API endpoints fall into two main types - v0 (Webscripts) and v1. The [v0 API](http://docs.alfresco.com/5.2/references/dev-extension-points-webscripts.html) is older and not recommended for integrations. The [v1 API](http://docs.alfresco.com/5.1/pra/1/topics/pra-welcome-aara.html) is newer but isn't yet feature complete. If you are running RM locally then the GS API Explorer will be available at [this link](http://localhost:8080/gs-api-explorer/).
 
 Internally the GS v1 REST API is built on the [Alfresco v1 REST API framework](https://community.alfresco.com/community/ecm/blog/2016/10/11/v1-rest-api-part-1-introduction). It aims to be consistent with this in terms of behaviour and naming.
 
 #### Java Public API
-The Java service layer is fronted by a [Java Public API](https://support.hyland.com/access?dita:id=lol1721390191517&vrm_version=25.2), which we will ensure backward compatible with previous releases. Before we remove any methods there will first be a release containing that method deprecated to allow third party integrations to migrate to a new method.  The Java Public API also includes a set of POJO objects which are needed to communicate with the services. It is easy to identify classes that are part of the Java Public API as they are annotated `@AlfrescoPublicApi`.
+The Java service layer is fronted by a [Java Public API](http://docs.alfresco.com/5.2/concepts/java-public-api-list.html), which we will ensure backward compatible with previous releases. Before we remove any methods there will first be a release containing that method deprecated to allow third party integrations to migrate to a new method.  The Java Public API also includes a set of POJO objects which are needed to communicate with the services. It is easy to identify classes that are part of the Java Public API as they are annotated `@AlfrescoPublicApi`.
 
 Each Java service will have at least four beans defined for it:
 
@@ -61,7 +61,7 @@ Each Java service will have at least four beans defined for it:
 #### DAOs
 The DAOs are not part of the Java Public API, but handle CRUD operations against RM stored data. We have some custom queries to improve performance for particularly heavy operations.
 
-We use standard Alfresco [data modelling](https://support.hyland.com/access?dita:id=ekx1720080373621&vrm_version=25.2) to store RM metadata. We extend the [Alfresco patching mechanism](https://support.hyland.com/access?dita:id=ato1720080396825&vrm_version=25.2) to provide community and enterprise schema upgrades.
+We use standard Alfresco [data modelling](http://docs.alfresco.com/5.2/references/dev-extension-points-content-model.html) to store RM metadata. We extend the [Alfresco patching mechanism](http://docs.alfresco.com/5.2/references/dev-extension-points-patch.html) to provide community and enterprise schema upgrades.
 
 ***
 

amps/ags/rm-community/pom.xml

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

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

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.16
-POSTGRES_TAG=16.6
+SOLR6_TAG=2.0.13
+POSTGRES_TAG=15.4
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

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

@@ -119,11 +119,6 @@ rm.patch.v35.holdNewChildAssocPatch.batchSize=1000
 rm.haspermissionmap.read=Read
 rm.haspermissionmap.write=WriteProperties,AddChildren,ReadContent
 
-# Extended Permissions
-# Enable matching the given username with the correct casing username when retrieving an IPR group.
-# Only needs to be used if there are owners that don't have the username in the correct casing.
-rm.extendedSecurity.enableUsernameNormalization=false
-
 #
 # Extended auto-version behaviour.  If true and other auto-version properties are satisfied, then
 # a document will be auto-versioned when its type is changed.

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

@@ -33,8 +33,5 @@
 
    <!-- content cleanser -->
    <bean id="contentCleanser.522022M" class="org.alfresco.module.org_alfresco_module_rm.content.cleanser.ContentCleanser522022M"/>
-   
-    <!-- content cleanser -->
-   <bean id="contentCleanser.SevenPass" class="org.alfresco.module.org_alfresco_module_rm.content.cleanser.ContentCleanserSevenPass"/>
 
 </beans>

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

@@ -78,12 +78,6 @@
       <property name="transactionService" ref="transactionService" />
    </bean>
 
-    <bean class="org.alfresco.rm.rest.api.fileplans.FilePlanRolesRelation">
-        <property name="apiUtils" ref="apiUtils" />
-        <property name="rmRoles" ref="rm.roles" />
-        <property name="filePlanService" ref="FilePlanService" />
-    </bean>
-
    <bean class="org.alfresco.rm.rest.api.holds.HoldsEntityResource" >
       <property name="holdService" ref="HoldService" />
       <property name="apiUtils" ref="apiUtils" />
@@ -234,11 +228,6 @@
         <property name="siteSurfConfig" ref="rm.siteSurfConfig" />
    </bean>
 
-    <bean id="rm.roles" class="org.alfresco.rm.rest.api.impl.RMRolesImpl">
-        <property name="nodesModelFactory" ref="nodesModelFactory" />
-        <property name="filePlanRoleService" ref="FilePlanRoleService"/>
-    </bean>
-
     <bean id="rm.siteSurfConfig" class="org.alfresco.rest.api.impl.SiteSurfConfig">
         <property name="configPath" value="alfresco/module/org_alfresco_module_rm/bootstrap/site"/>
     </bean>
@@ -291,4 +280,4 @@
       <property name="beanName" value="restJsonModule" />
       <property name="extendingBeanName" value="rm.restJsonModule" />
    </bean>
-</beans>
+</beans>

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

@@ -611,7 +611,6 @@
         <property name="authorityService" ref="authorityService"/>
         <property name="permissionService" ref="permissionService"/>
         <property name="transactionService" ref="transactionService"/>
-        <property name="enableUsernameNormalization" value="${rm.extendedSecurity.enableUsernameNormalization}" />
     </bean>
 
     <bean id="ExtendedSecurityService" class="org.springframework.aop.framework.ProxyFactoryBean">

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>25.3.0.35</version>
+      <version>25.1.0.21-SNAPSHOT</version>
    </parent>
 
    <properties>
@@ -84,6 +84,11 @@
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>com.epam.reportportal</groupId>
+         <artifactId>agent-java-testng</artifactId>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
@@ -422,7 +427,7 @@
                   <configuration>
                      <images>
                         <image>
-                           <name>postgres:16.6</name>
+                           <name>postgres:15.4</name>
                            <run>
                               <ports>
                                  <port>${postgresql.tests.port}:${postgresql.port}</port>

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_dod5015/caveat/RMListOfValuesConstraint.java

@@ -30,12 +30,11 @@ package org.alfresco.module.org_alfresco_module_dod5015.caveat;
 /**
  * Compatibility Implementation.
  * <p>
- * Used as a compatibility implementation when migrating from V1.0 to V2.0.  RMCustom model still references
- * this class implementation, but package has been changed.
+ * Used as a compatibility implementation when migrating from V1.0 to V2.0. RMCustom model still references this class implementation, but package has been changed.
  * 
  * @author Roy Wetherall
  */
 public class RMListOfValuesConstraint extends org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint
 {
     // No implementation
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java

@@ -27,9 +27,10 @@
 
 package org.alfresco.module.org_alfresco_module_rm;
 
-import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.surf.util.I18NUtil;
 
+import org.alfresco.service.namespace.QName;
+
 /**
  * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.CannotApplyConstraintMetadataException}
  */
@@ -37,9 +38,9 @@ public class CannotApplyConstraintMetadataException extends CustomMetadataExcept
 {
     private static final long serialVersionUID = -6194867814140009959L;
     public static final String MSG_CANNOT_APPLY_CONSTRAINT = "rm.admin.cannot-apply-constraint";
-    
+
     public CannotApplyConstraintMetadataException(QName lovConstraint, String propIdAsString, QName dataType)
     {
         super(I18NUtil.getMessage(CannotApplyConstraintMetadataException.MSG_CANNOT_APPLY_CONSTRAINT, lovConstraint, propIdAsString, dataType));
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java

@@ -33,9 +33,9 @@ package org.alfresco.module.org_alfresco_module_rm;
 public abstract class CustomMetadataException extends Exception
 {
     private static final long serialVersionUID = -6676112294794381360L;
-    
+
     public CustomMetadataException(String msg)
     {
         super(msg);
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java

@@ -27,9 +27,10 @@
 
 package org.alfresco.module.org_alfresco_module_rm;
 
-import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.surf.util.I18NUtil;
 
+import org.alfresco.service.namespace.QName;
+
 /**
  * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.InvalidCustomAspectMetadataException}
  */
@@ -37,9 +38,9 @@ public class InvalidCustomAspectMetadataException extends CustomMetadataExceptio
 {
     private static final long serialVersionUID = -6194867814140009959L;
     public static final String MSG_INVALID_CUSTOM_ASPECT = "rm.admin.invalid-custom-aspect";
-    
+
     public InvalidCustomAspectMetadataException(QName customAspect, String aspectName)
     {
         super(I18NUtil.getMessage(MSG_INVALID_CUSTOM_ASPECT, customAspect, aspectName));
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java

@@ -36,9 +36,9 @@ public class NotCustomisableMetadataException extends CustomMetadataException
 {
     private static final long serialVersionUID = -6194867814140009959L;
     public static final String MSG_NOT_CUSTOMISABLE = "rm.admin.not-customisable";
-    
+
     public NotCustomisableMetadataException(String aspectName)
     {
         super(I18NUtil.getMessage(MSG_NOT_CUSTOMISABLE, aspectName));
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java

@@ -37,9 +37,9 @@ public class PropertyAlreadyExistsMetadataException extends CustomMetadataExcept
     private static final long serialVersionUID = -6194867814140009959L;
 
     public static final String MSG_PROPERTY_ALREADY_EXISTS = "rm.admin.property-already-exists";
-    
+
     public PropertyAlreadyExistsMetadataException(String propIdAsString)
     {
         super(I18NUtil.getMessage(MSG_PROPERTY_ALREADY_EXISTS, propIdAsString));
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementAdminService.java

@@ -30,8 +30,8 @@ package org.alfresco.module.org_alfresco_module_rm;
 /**
  * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService}
  */
-public interface RecordsManagementAdminService 
-       extends org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService
+public interface RecordsManagementAdminService
+        extends org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService
 {
-	
-}
+
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementService.java

@@ -305,4 +305,4 @@ public interface RecordsManagementService
      */
     @Deprecated
     boolean isRecord(NodeRef nodeRef);
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java

@@ -53,10 +53,10 @@ import org.alfresco.service.namespace.QName;
  * @deprecated as of 2.2
  */
 public class RecordsManagementServiceImpl extends ServiceBaseImpl
-                                          implements RecordsManagementService,
-                                                     RecordsManagementModel 
+        implements RecordsManagementService,
+        RecordsManagementModel
 {
-   /** Store that the RM roots are contained within */
+    /** Store that the RM roots are contained within */
     @SuppressWarnings("unused")
     @Deprecated
     private StoreRef defaultStoreRef = StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
@@ -67,7 +67,8 @@ public class RecordsManagementServiceImpl extends ServiceBaseImpl
     /**
      * Set the service registry service
      *
-     * @param serviceRegistry   service registry
+     * @param serviceRegistry
+     *            service registry
      */
     public void setRecordsManagementServiceRegistry(RecordsManagementServiceRegistry serviceRegistry)
     {
@@ -78,7 +79,9 @@ public class RecordsManagementServiceImpl extends ServiceBaseImpl
 
     /**
      * Sets the default RM store reference
-     * @param defaultStoreRef    store reference
+     * 
+     * @param defaultStoreRef
+     *            store reference
      */
     @Deprecated
     public void setDefaultStoreRef(StoreRef defaultStoreRef)
@@ -91,7 +94,7 @@ public class RecordsManagementServiceImpl extends ServiceBaseImpl
      */
     private FilePlanService getFilePlanService()
     {
-    	return serviceRegistry.getFilePlanService();
+        return serviceRegistry.getFilePlanService();
     }
 
     /**
@@ -425,7 +428,7 @@ public class RecordsManagementServiceImpl extends ServiceBaseImpl
      * @deprecated As of 2.2, see {@link RecordFolderService#createRecordFolder(NodeRef, String, Map)}
      */
     @Override
-    public NodeRef createRecordFolder(NodeRef parent, String name,  Map<QName, Serializable> properties)
+    public NodeRef createRecordFolder(NodeRef parent, String name, Map<QName, Serializable> properties)
     {
         return getRecordFolderService().createRecordFolder(parent, name, properties);
     }
@@ -501,4 +504,4 @@ public class RecordsManagementServiceImpl extends ServiceBaseImpl
     {
         return getRecordService().isRecord(nodeRef);
     }
-}
+}

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

@@ -80,4 +80,4 @@ public interface RecordsManagementAuditServiceDeprecated
     @Deprecated
     void auditRMAction(RecordsManagementAction action, NodeRef nodeRef, Map<String, Serializable> parameters);
 
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java

@@ -46,7 +46,7 @@ import java.util.Map;
 
         for (Map.Entry<String, List<String>> entry : source.entrySet())
         {
-            List<String>values = entry.getValue();
+            List<String> values = entry.getValue();
             for (String value : values)
             {
                 String authority = entry.getKey();
@@ -54,7 +54,7 @@ import java.util.Map;
                 {
                     // already exists
                     List<String> list = pivot.get(value);
-                    list.add(authority );
+                    list.add(authority);
                 }
                 else
                 {
@@ -68,4 +68,4 @@ import java.util.Map;
 
         return pivot;
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponent.java

@@ -65,7 +65,8 @@ public interface RMCaveatConfigComponent
     /**
      * Get RM constraint list
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      */
     RMConstraintInfo getRMConstraint(String listName);
 
@@ -82,12 +83,12 @@ public interface RMCaveatConfigComponent
     /**
      * Update RM constraint values for given authority
      */
-    void updateRMConstraintListAuthority(String listName, String authorityName, List<String>values);
+    void updateRMConstraintListAuthority(String listName, String authorityName, List<String> values);
 
     /**
      * Update RM constraint authorities for given value
      */
-    void updateRMConstraintListValue(String listName, String valueName, List<String>authorities);
+    void updateRMConstraintListValue(String listName, String valueName, List<String> authorities);
 
     /**
      * Remove RM constraint value (all authorities)
@@ -102,12 +103,14 @@ public interface RMCaveatConfigComponent
     /**
      * Delete RM Constraint
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      */
     void deleteRMConstraint(String listName);
 
     /**
      * Get the details of a caveat list
+     * 
      * @param listName
      * @return
      */
@@ -118,4 +121,4 @@ public interface RMCaveatConfigComponent
     NodeRef updateOrCreateCaveatConfig(String jsonString);
 
     NodeRef updateOrCreateCaveatConfig(InputStream is);
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java

@@ -45,6 +45,11 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import net.sf.acegisecurity.AccessDeniedException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint.MatchLogic;
@@ -77,10 +82,6 @@ import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.JSONtoFmModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 /**
  * RM Caveat Config component impl
@@ -89,9 +90,9 @@ import org.json.JSONObject;
  */
 @BehaviourBean(defaultType = "rma:caveatConfig")
 public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnContentUpdatePolicy,
-                                                    NodeServicePolicies.BeforeDeleteNodePolicy,
-                                                    NodeServicePolicies.OnCreateNodePolicy,
-                                                    RMCaveatConfigComponent
+        NodeServicePolicies.BeforeDeleteNodePolicy,
+        NodeServicePolicies.OnCreateNodePolicy,
+        RMCaveatConfigComponent
 {
     private static Log logger = LogFactory.getLog(RMCaveatConfigComponentImpl.class);
 
@@ -122,12 +123,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
     private Lock readLock = lock.readLock();
     private Lock writeLock = lock.writeLock();
 
-    /*
-     * Caveat Config (Shared) config
-     * first string is property name
-     * second string is authority name (user or group full name)
-     * third string is list of values of property
-     */
+    /* Caveat Config (Shared) config first string is property name second string is authority name (user or group full name) third string is list of values of property */
     private SimpleCache<String, Map<String, List<String>>> caveatConfig;
 
     public void setCaveatConfig(SimpleCache<String, Map<String, List<String>>> caveatConfig)
@@ -194,7 +190,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
             if (logger.isInfoEnabled())
             {
-                logger.info("Caveat aspects configured "+caveatAspectQNames);
+                logger.info("Caveat aspects configured " + caveatAspectQNames);
             }
         }
         else
@@ -211,7 +207,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
             if (logger.isInfoEnabled())
             {
-                logger.info("Caveat models configured "+caveatModelQNames);
+                logger.info("Caveat models configured " + caveatModelQNames);
             }
         }
         else
@@ -227,20 +223,17 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
     }
 
     /**
-     * @see org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy#onContentUpdate(org.alfresco.service.cmr.repository.NodeRef, boolean)
-     * RM-2770 - this method has to be fired on transaction commit to be able to validate the content when the content store is encrypted
+     * @see org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy#onContentUpdate(org.alfresco.service.cmr.repository.NodeRef, boolean) RM-2770 - this method has to be fired on transaction commit to be able to validate the content when the content store is encrypted
      */
     @Override
-    @Behaviour
-    (
-            kind = BehaviourKind.CLASS, 
-            notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT
-    )
+    @Behaviour(
+            kind = BehaviourKind.CLASS,
+            notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT)
     public void onContentUpdate(NodeRef nodeRef, boolean newContent)
     {
         if (logger.isInfoEnabled())
         {
-            logger.info("onContentUpdate: "+nodeRef+", "+newContent);
+            logger.info("onContentUpdate: " + nodeRef + ", " + newContent);
         }
 
         validateAndReset(nodeRef);
@@ -255,7 +248,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
     {
         if (logger.isInfoEnabled())
         {
-            logger.info("beforeDeleteNode: "+nodeRef);
+            logger.info("beforeDeleteNode: " + nodeRef);
         }
 
         validateAndReset(nodeRef);
@@ -270,7 +263,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
     {
         if (logger.isInfoEnabled())
         {
-            logger.info("onCreateNode: "+childAssocRef);
+            logger.info("onCreateNode: " + childAssocRef);
         }
 
         validateAndReset(childAssocRef.getChildRef());
@@ -279,8 +272,9 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
     /**
      * Validate the caveat config and optionally update the cache.
      *
-     * @param nodeRef The nodeRef of the config
-    */
+     * @param nodeRef
+     *            The nodeRef of the config
+     */
     @SuppressWarnings("unchecked")
     protected void validateAndReset(NodeRef nodeRef)
     {
@@ -294,9 +288,9 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
             if (caveatConfigData != null)
             {
                 NodeRef existing = getCaveatConfigNode();
-                if ((existing != null && (! existing.equals(nodeRef))))
+                if ((existing != null && (!existing.equals(nodeRef))))
                 {
-                    throw new AlfrescoRuntimeException("Cannot create more than one caveat config (existing="+existing+", new="+nodeRef+")");
+                    throw new AlfrescoRuntimeException("Cannot create more than one caveat config (existing=" + existing + ", new=" + nodeRef + ")");
                 }
 
                 try
@@ -321,7 +315,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
                     if (logger.isTraceEnabled())
                     {
-                        logger.trace("validateAndReset: models to check "+models);
+                        logger.trace("validateAndReset: models to check " + models);
                     }
 
                     for (QName model : models)
@@ -338,7 +332,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                     {
                         if (logger.isTraceEnabled())
                         {
-                            logger.trace("validateAndReset: properties to check "+props);
+                            logger.trace("validateAndReset: properties to check " + props);
                         }
                     }
 
@@ -361,12 +355,12 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                             }
                         }
 
-                        if (! prefixFound)
+                        if (!prefixFound)
                         {
-                            throw new AlfrescoRuntimeException("Unexpected prefix: "+ conPrefix + " (" + conStr +") expected one of "+expectedPrefixes+")");
+                            throw new AlfrescoRuntimeException("Unexpected prefix: " + conPrefix + " (" + conStr + ") expected one of " + expectedPrefixes + ")");
                         }
 
-                        Map<String, List<String>> caveatMap = (Map<String, List<String>>)conEntry.getValue();
+                        Map<String, List<String>> caveatMap = (Map<String, List<String>>) conEntry.getValue();
 
                         List<String> allowedValues = null;
                         @SuppressWarnings("unused")
@@ -381,15 +375,14 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                                 final Constraint con = conDef.getConstraint();
                                 if (con instanceof RMListOfValuesConstraint)
                                 {
-                                    String conName = ((RMListOfValuesConstraint)con).getShortName();
+                                    String conName = ((RMListOfValuesConstraint) con).getShortName();
                                     if (conName.equals(conStr))
                                     {
                                         // note: assumes only one caveat/LOV against a given property
-                                        allowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>()
-                                        {
+                                        allowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>() {
                                             public List<String> doWork()
                                             {
-                                                return ((RMListOfValuesConstraint)con).getAllowedValues();
+                                                return ((RMListOfValuesConstraint) con).getAllowedValues();
                                             }
                                         }, AuthenticationUtil.getSystemUserName());
 
@@ -404,7 +397,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                         {
                             if (logger.isInfoEnabled())
                             {
-                                logger.info("Processing constraint: "+conQName);
+                                logger.info("Processing constraint: " + conQName);
                             }
 
                             for (Map.Entry<String, List<String>> caveatEntry : caveatMap.entrySet())
@@ -413,20 +406,20 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                                 List<String> caveatList = caveatEntry.getValue();
 
                                 // validate authority (user or group) - note: groups are configured with fullname (ie. GROUP_xxx)
-                                if ((! authorityService.authorityExists(authorityName) && ! personService.personExists(authorityName)))
+                                if ((!authorityService.authorityExists(authorityName) && !personService.personExists(authorityName)))
                                 {
                                     // TODO - review warnings (& I18N)
-                                    String msg = "User/group does not exist: "+authorityName+" (constraint="+conStr+")";
+                                    String msg = "User/group does not exist: " + authorityName + " (constraint=" + conStr + ")";
                                     logger.warn(msg);
                                 }
 
                                 // validate caveat list
                                 for (String value : caveatList)
                                 {
-                                    if (! allowedValues.contains(value))
+                                    if (!allowedValues.contains(value))
                                     {
                                         // TODO - review warnings (& add I18N)
-                                        String msg = "Invalid value in list: "+value+" (authority="+authorityName+", constraint="+conStr+")";
+                                        String msg = "Invalid value in list: " + value + " (authority=" + authorityName + ", constraint=" + conStr + ")";
                                         logger.warn(msg);
                                     }
                                 }
@@ -444,7 +437,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                         for (Map.Entry<String, Object> conEntry : caveatConfigMap.entrySet())
                         {
                             String conStr = conEntry.getKey();
-                            Map<String, List<String>> caveatMap = (Map<String, List<String>>)conEntry.getValue();
+                            Map<String, List<String>> caveatMap = (Map<String, List<String>>) conEntry.getValue();
 
                             Map<String, List<String>> cacheValue = caveatConfig.get(conStr);
                             if (cacheValue == null || !cacheValue.equals(caveatMap))
@@ -461,7 +454,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                 }
                 catch (JSONException e)
                 {
-                    throw new AlfrescoRuntimeException("Invalid caveat config syntax: "+e);
+                    throw new AlfrescoRuntimeException("Invalid caveat config syntax: " + e);
                 }
             }
         }
@@ -473,7 +466,6 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
         return nodeService.getChildByName(rootNode, RecordsManagementModel.ASSOC_CAVEAT_CONFIG, CAVEAT_CONFIG_NAME);
     }
 
-
     public NodeRef updateOrCreateCaveatConfig(InputStream is)
     {
         NodeRef caveatConfig = getOrCreateCaveatConfig();
@@ -523,9 +515,9 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
             // Create caveat config
             caveatConfig = nodeService.createNode(rootNode,
-                                                  RecordsManagementModel.ASSOC_CAVEAT_CONFIG,
-                                                  QName.createQName(RecordsManagementModel.RM_URI, CAVEAT_CONFIG_NAME),
-                                                  RecordsManagementModel.TYPE_CAVEAT_CONFIG).getChildRef();
+                    RecordsManagementModel.ASSOC_CAVEAT_CONFIG,
+                    QName.createQName(RecordsManagementModel.RM_URI, CAVEAT_CONFIG_NAME),
+                    RecordsManagementModel.TYPE_CAVEAT_CONFIG).getChildRef();
 
             nodeService.setProperty(caveatConfig, ContentModel.PROP_NAME, CAVEAT_CONFIG_NAME);
         }
@@ -569,7 +561,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
     private List<String> getRMAllowedValues(String userName, Set<String> userGroupFullNames, String constraintName)
     {
-        Set<String>allowedValues = new HashSet<>();
+        Set<String> allowedValues = new HashSet<>();
 
         // note: userName and userGroupNames must not be null
         Map<String, List<String>> caveatConstraintDef = null;
@@ -586,22 +578,22 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
         if (caveatConstraintDef != null)
         {
             List<String> direct = caveatConstraintDef.get(userName);
-            if(direct != null)
+            if (direct != null)
             {
                 allowedValues.addAll(direct);
             }
 
-            for (String group :  userGroupFullNames)
+            for (String group : userGroupFullNames)
             {
                 List<String> values = caveatConstraintDef.get(group);
-                if(values != null)
+                if (values != null)
                 {
                     allowedValues.addAll(values);
                 }
             }
         }
 
-        List<String>ret = new ArrayList<>();
+        List<String> ret = new ArrayList<>();
         ret.addAll(allowedValues);
         return Collections.unmodifiableList(ret);
     }
@@ -617,7 +609,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
     {
         try
         {
-            if ((! nodeService.exists(nodeRef)) || (caveatAspectQNames.size() == 0))
+            if ((!nodeService.exists(nodeRef)) || (caveatAspectQNames.size() == 0))
             {
                 return true;
             }
@@ -632,7 +624,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                 }
             }
 
-            if (! found)
+            if (!found)
             {
                 // no caveat aspect
                 return true;
@@ -658,7 +650,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                                 Constraint con = conDef.getConstraint();
                                 if (con instanceof RMListOfValuesConstraint)
                                 {
-                                    RMListOfValuesConstraint rmCon = ((RMListOfValuesConstraint)con);
+                                    RMListOfValuesConstraint rmCon = ((RMListOfValuesConstraint) con);
                                     String conName = rmCon.getShortName();
                                     MatchLogic matchLogic = rmCon.getMatchLogicEnum();
                                     Map<String, List<String>> caveatConstraintDef = caveatConfig.get(conName);
@@ -676,18 +668,18 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                                         if (val instanceof String)
                                         {
                                             propValues = new ArrayList<>(1);
-                                            propValues.add((String)val);
+                                            propValues.add((String) val);
                                         }
                                         else if (val instanceof List)
                                         {
-                                            propValues = (List<String>)val;
+                                            propValues = (List<String>) val;
                                         }
 
                                         if (propValues != null && !isAllowed(propValues, allowedValues, matchLogic))
                                         {
                                             if (logger.isDebugEnabled())
                                             {
-                                                logger.debug("Veto access: caveat="+conName+", userName="+userName+", nodeRef="+nodeRef+", propName="+propName+", propValues="+propValues+", allowedValues="+allowedValues);
+                                                logger.debug("Veto access: caveat=" + conName + ", userName=" + userName + ", nodeRef=" + nodeRef + ", propName=" + propName + ", propValues=" + propValues + ", allowedValues=" + allowedValues);
                                             }
                                             return false;
                                         }
@@ -714,11 +706,11 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
             // check user/group values match all values on node
             for (String propValue : propValues)
             {
-                if (! userGroupValues.contains(propValue))
+                if (!userGroupValues.contains(propValue))
                 {
                     if (logger.isTraceEnabled())
                     {
-                        logger.trace("Not allowed: "+propValues+", "+userGroupValues+", "+matchLogic);
+                        logger.trace("Not allowed: " + propValues + ", " + userGroupValues + ", " + matchLogic);
                     }
 
                     return false;
@@ -740,23 +732,25 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
             if (logger.isTraceEnabled())
             {
-                logger.trace("Not allowed: "+propValues+", "+userGroupValues+", "+matchLogic);
+                logger.trace("Not allowed: " + propValues + ", " + userGroupValues + ", " + matchLogic);
             }
 
             return false;
         }
 
-        logger.error("Unexpected match logic type: "+matchLogic);
+        logger.error("Unexpected match logic type: " + matchLogic);
         return false;
     }
 
     /**
-     * Add a single value to an authority in a list.   The existing values of the list remain.
+     * Add a single value to an authority in a list. The existing values of the list remain.
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      * @param value
-     * @throws AlfrescoRuntimeException if either the list or the authority do not already exist.
+     * @throws AlfrescoRuntimeException
+     *             if either the list or the authority do not already exist.
      */
     public void addRMConstraintListValue(String listName, String authorityName, String value)
     {
@@ -765,9 +759,9 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
         {
             readLock.lock();
             members = caveatConfig.get(listName);
-            if(members == null)
+            if (members == null)
             {
-                throw new AlfrescoRuntimeException("unable to add to list, list not defined:"+ listName);
+                throw new AlfrescoRuntimeException("unable to add to list, list not defined:" + listName);
             }
 
             try
@@ -776,15 +770,15 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
                 writeLock.lock();
                 // check again
                 members = caveatConfig.get(listName);
-                if(members == null)
+                if (members == null)
                 {
-                    throw new AlfrescoRuntimeException("unable to add to list, list not defined:"+ listName);
+                    throw new AlfrescoRuntimeException("unable to add to list, list not defined:" + listName);
                 }
 
                 List<String> values = members.get(authorityName);
-                if(values == null)
+                if (values == null)
                 {
-                    throw new AlfrescoRuntimeException("Unable to add to authority in list.   Authority not member listName: "+ listName + " authorityName:" +authorityName);
+                    throw new AlfrescoRuntimeException("Unable to add to authority in list.   Authority not member listName: " + listName + " authorityName:" + authorityName);
                 }
                 values.add(value);
 
@@ -806,6 +800,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
     /**
      * Get the member details of the specified list
+     * 
      * @param listName
      * @return the details of the specified list
      */
@@ -837,23 +832,23 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
     }
 
     /**
-     * Replace the values for an authority in a list.
-     * The existing values are removed.
+     * Replace the values for an authority in a list. The existing values are removed.
      *
      * If the authority does not already exist in the list, it will be added
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      * @param values
      */
-    public void updateRMConstraintListAuthority(String listName, String authorityName, List<String>values)
+    public void updateRMConstraintListAuthority(String listName, String authorityName, List<String> values)
     {
         Map<String, List<String>> members = null;
         try
         {
             writeLock.lock();
             members = caveatConfig.get(listName);
-            if(members == null)
+            if (members == null)
             {
                 // Create the new list, with the authority name
                 Map<String, List<String>> constraint = new HashMap<>(0);
@@ -881,7 +876,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
      * @param valueName
      * @param authorities
      */
-    public void updateRMConstraintListValue(String listName, String valueName, List<String>authorities)
+    public void updateRMConstraintListValue(String listName, String valueName, List<String> authorities)
     {
 
         Map<String, List<String>> members = caveatConfig.get(listName);
@@ -889,7 +884,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
         {
             writeLock.lock();
 
-            if(members == null)
+            if (members == null)
             {
                 // Members List does not exist
                 Map<String, List<String>> emptyConstraint = new HashMap<>(0);
@@ -903,21 +898,21 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
             // remove all authorities which have this value
             List<String> existingAuthorities = pivot.get(valueName);
-            if(existingAuthorities != null)
+            if (existingAuthorities != null)
             {
-                for(String authority : existingAuthorities)
+                for (String authority : existingAuthorities)
                 {
                     List<String> vals = members.get(authority);
                     vals.remove(valueName);
                 }
             }
             // add the new authorities for this value
-            for(String authority : authorities)
+            for (String authority : authorities)
             {
                 List<String> vals = members.get(authority);
-                if(vals == null)
+                if (vals == null)
                 {
-                    vals= new ArrayList<>();
+                    vals = new ArrayList<>();
                     members.put(authority, vals);
                 }
                 vals.add(valueName);
@@ -955,9 +950,9 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
                         // remove all authorities which have this value
                         List<String> existingAuthorities = pivot.get(valueName);
-                        if(existingAuthorities != null)
+                        if (existingAuthorities != null)
                         {
-                            for(String authority : existingAuthorities)
+                            for (String authority : existingAuthorities)
                             {
                                 List<String> vals = members.get(authority);
                                 vals.remove(valueName);
@@ -984,7 +979,8 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
     /**
      * Remove an authority from a list
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      */
     public void removeRMConstraintListAuthority(String listName, String authorityName)
@@ -994,7 +990,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
         {
             writeLock.lock();
             members = caveatConfig.get(listName);
-            if(members != null)
+            if (members != null)
             {
                 members.remove(listName);
             }
@@ -1007,10 +1003,11 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
         {
             writeLock.unlock();
         }
-}
+    }
 
     /**
-     * @param config the configuration to convert
+     * @param config
+     *            the configuration to convert
      * @return a String containing the JSON representation of the configuration.
      */
     private String convertToJSONString(SimpleCache<String, Map<String, List<String>>> config)
@@ -1070,24 +1067,24 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
 
     /**
      * Get an RMConstraintInfo
+     * 
      * @param listQName
      * @return the constraint or null if it does not exist
      */
     public RMConstraintInfo getRMConstraint(QName listQName)
     {
         ConstraintDefinition dictionaryDef = dictionaryService.getConstraint(listQName);
-        if(dictionaryDef != null)
+        if (dictionaryDef != null)
         {
             Constraint con = dictionaryDef.getConstraint();
             if (con instanceof RMListOfValuesConstraint)
             {
-                final RMListOfValuesConstraint def = (RMListOfValuesConstraint)con;
+                final RMListOfValuesConstraint def = (RMListOfValuesConstraint) con;
 
                 RMConstraintInfo info = new RMConstraintInfo();
                 info.setName(listQName.toPrefixString());
                 info.setTitle(con.getTitle());
-                List<String> allowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>()
-                {
+                List<String> allowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>() {
                     public List<String> doWork()
                     {
                         return def.getAllowedValues();
@@ -1141,4 +1138,4 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
             writeLock.unlock();
         }
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigService.java

@@ -42,6 +42,7 @@ public interface RMCaveatConfigService
 
     /**
      * Get allowed values for given caveat list (for current user)
+     * 
      * @param constraintName
      * @return
      */
@@ -55,18 +56,15 @@ public interface RMCaveatConfigService
      */
     boolean hasAccess(NodeRef nodeRef);
 
-    /*
-     *  Get a single RM constraint
-     */
+    /* Get a single RM constraint */
     RMConstraintInfo getRMConstraint(String listName);
 
-    /*
-     *  Get the names of all the caveat lists
-     */
+    /* Get the names of all the caveat lists */
     Set<RMConstraintInfo> getAllRMConstraints();
 
     /**
      * Get the details of a caveat list
+     * 
      * @param listName
      * @return
      */
@@ -80,80 +78,91 @@ public interface RMCaveatConfigService
 
     /**
      * add RM constraint list
-     * @param listName the name of the RMConstraintList
+     * 
+     * @param listName
+     *            the name of the RMConstraintList
      * @param listTitle
      */
     RMConstraintInfo addRMConstraint(String listName, String listTitle, String[] allowedValues);
 
     /**
      * update RM constraint list allowed values
-     * @param listName the name of the RMConstraintList - can not be changed
+     * 
+     * @param listName
+     *            the name of the RMConstraintList - can not be changed
      * @param allowedValues
      */
     RMConstraintInfo updateRMConstraintAllowedValues(String listName, String[] allowedValues);
 
     /**
      * update RM constraint Title
-     * @param listName the name of the RMConstraintList - can not be changed
-     * @param newTitle the new value for the title constraint
+     * 
+     * @param listName
+     *            the name of the RMConstraintList - can not be changed
+     * @param newTitle
+     *            the new value for the title constraint
      */
     RMConstraintInfo updateRMConstraintTitle(String listName, String newTitle);
 
-
     /**
      * delete RM Constraint
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      */
     void deleteRMConstraint(String listName);
 
     /**
-     * Add a single value to an authority in a list.   The existing values of the list remain.
+     * Add a single value to an authority in a list. The existing values of the list remain.
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      * @param value
-     * @throws AlfrescoRuntimeException if either the list or the authority do not already exist.
+     * @throws AlfrescoRuntimeException
+     *             if either the list or the authority do not already exist.
      */
     void addRMConstraintListValue(String listName, String authorityName, String value);
 
     /**
-     * Replace the values for an authority in a list.
-     * The existing values are removed.
+     * Replace the values for an authority in a list. The existing values are removed.
      *
      * If the authority does not already exist in the list, it will be added
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      * @param values
      */
-    void updateRMConstraintListAuthority(String listName, String authorityName, List<String>values);
+    void updateRMConstraintListAuthority(String listName, String authorityName, List<String> values);
 
     /**
      * Remove an authority from a list
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      */
     void removeRMConstraintListAuthority(String listName, String authorityName);
 
     /**
-     * Replace the values for an authority in a list.
-     * The existing values are removed.
+     * Replace the values for an authority in a list. The existing values are removed.
      *
      * If the authority does not already exist in the list, it will be added
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param value
      * @param authorities
      */
-    void updateRMConstraintListValue(String listName, String value, List<String>authorities);
+    void updateRMConstraintListValue(String listName, String value, List<String> authorities);
 
     /**
      * Remove an authority from a list
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param valueName
      */
     void removeRMConstraintListValue(String listName, String valueName);
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java

@@ -36,6 +36,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint.MatchLogic;
@@ -48,8 +51,6 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * RM Caveat Config Service impl
@@ -66,7 +67,6 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
     private RMCaveatConfigComponent rmCaveatConfigComponent;
     private RecordsManagementAdminService recordsManagementAdminService;
 
-
     public void setNamespaceService(NamespaceService namespaceService)
     {
         this.namespaceService = namespaceService;
@@ -131,7 +131,9 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
 
     /**
      * add RM constraint list
-     * @param listName the name of the RMConstraintList
+     * 
+     * @param listName
+     *            the name of the RMConstraintList
      */
     public RMConstraintInfo addRMConstraint(String listName, String title, String[] values)
     {
@@ -150,8 +152,8 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
             listName = sb.toString();
         }
 
-        List<String>allowedValues = new ArrayList<>();
-        for(String value : values)
+        List<String> allowedValues = new ArrayList<>();
+        for (String value : values)
         {
             allowedValues.add(value);
         }
@@ -185,7 +187,8 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
     /**
      * delete RM Constraint List
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      */
     public void deleteRMConstraint(String listName)
     {
@@ -197,12 +200,14 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
     }
 
     /**
-     * Add a single value to an authority in a list.   The existing values of the list remain.
+     * Add a single value to an authority in a list. The existing values of the list remain.
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      * @param value
-     * @throws AlfrescoRuntimeException if either the list or the authority do not already exist.
+     * @throws AlfrescoRuntimeException
+     *             if either the list or the authority do not already exist.
      */
     public void addRMConstraintListValue(String listName, String authorityName, String value)
     {
@@ -211,6 +216,7 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
 
     /**
      * Get the details of the specified list
+     * 
      * @param listName
      * @return the details of the specified list
      */
@@ -220,16 +226,16 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
     }
 
     /**
-     * Replace the values for an authority in a list.
-     * The existing values are removed.
+     * Replace the values for an authority in a list. The existing values are removed.
      *
      * If the authority does not already exist in the list, it will be added
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      * @param values
      */
-    public void updateRMConstraintListAuthority(String listName, String authorityName, List<String>values)
+    public void updateRMConstraintListAuthority(String listName, String authorityName, List<String> values)
     {
         rmCaveatConfigComponent.updateRMConstraintListAuthority(listName, authorityName, values);
     }
@@ -241,7 +247,7 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
      * @param valueName
      * @param authorities
      */
-    public void updateRMConstraintListValue(String listName, String valueName, List<String>authorities)
+    public void updateRMConstraintListValue(String listName, String valueName, List<String> authorities)
     {
         rmCaveatConfigComponent.updateRMConstraintListValue(listName, valueName, authorities);
     }
@@ -249,7 +255,8 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
     /**
      * Remove an authority from a list
      *
-     * @param listName the name of the RMConstraintList
+     * @param listName
+     *            the name of the RMConstraintList
      * @param authorityName
      */
     public void removeRMConstraintListAuthority(String listName, String authorityName)
@@ -270,19 +277,18 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
             defs.addAll(recordsManagementAdminService.getCustomConstraintDefinitions(caveatModelQName));
         }
 
-        for(ConstraintDefinition dictionaryDef : defs)
+        for (ConstraintDefinition dictionaryDef : defs)
         {
             Constraint con = dictionaryDef.getConstraint();
             if (con instanceof RMListOfValuesConstraint)
             {
-                final RMListOfValuesConstraint def = (RMListOfValuesConstraint)con;
+                final RMListOfValuesConstraint def = (RMListOfValuesConstraint) con;
                 RMConstraintInfo i = new RMConstraintInfo();
                 i.setName(def.getShortName());
                 i.setTitle(def.getTitle());
 
                 // note: assumes only one caveat/LOV against a given property
-                List<String> allowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>()
-                {
+                List<String> allowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>() {
                     public List<String> doWork()
                     {
                         return def.getAllowedValues();
@@ -301,24 +307,24 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
 
     /**
      * Get an RMConstraintInfo
+     * 
      * @param listQName
      * @return the constraint or null if it does not exist
      */
     public RMConstraintInfo getRMConstraint(QName listQName)
     {
         ConstraintDefinition dictionaryDef = dictionaryService.getConstraint(listQName);
-        if(dictionaryDef != null)
+        if (dictionaryDef != null)
         {
             Constraint con = dictionaryDef.getConstraint();
             if (con instanceof RMListOfValuesConstraint)
             {
-                final RMListOfValuesConstraint def = (RMListOfValuesConstraint)con;
+                final RMListOfValuesConstraint def = (RMListOfValuesConstraint) con;
 
                 RMConstraintInfo info = new RMConstraintInfo();
                 info.setName(listQName.toPrefixString());
                 info.setTitle(con.getTitle());
-                List<String> allowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>()
-                {
+                List<String> allowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>() {
                     public List<String> doWork()
                     {
                         return def.getAllowedValues();
@@ -348,18 +354,20 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
     /**
      * Update The allowed values for an RM Constraint.
      *
-     * @param listName  The name of the list.
-     * @param allowedValues the new alowed values
+     * @param listName
+     *            The name of the list.
+     * @param allowedValues
+     *            the new alowed values
      *
      */
     public RMConstraintInfo updateRMConstraintAllowedValues(String listName, String[] allowedValues)
     {
         QName listQName = QName.createQName(listName, namespaceService);
 
-        if(allowedValues != null)
+        if (allowedValues != null)
         {
-            List<String>allowedValueList = new ArrayList<>();
-            for(String value : allowedValues)
+            List<String> allowedValueList = new ArrayList<>();
+            for (String value : allowedValues)
             {
                 allowedValueList.add(value);
             }
@@ -368,21 +376,20 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
             Constraint con = dictionaryDef.getConstraint();
             if (con instanceof RMListOfValuesConstraint)
             {
-                final RMListOfValuesConstraint def = (RMListOfValuesConstraint)con;
-                List<String> oldAllowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>()
-                {
+                final RMListOfValuesConstraint def = (RMListOfValuesConstraint) con;
+                List<String> oldAllowedValues = AuthenticationUtil.runAs(new RunAsWork<List<String>>() {
                     public List<String> doWork()
                     {
-                       return def.getAllowedValues();
+                        return def.getAllowedValues();
                     }
                 }, AuthenticationUtil.getSystemUserName());
 
                 /**
                  * Deal with any additions
                  */
-                for(String newValue : allowedValueList)
+                for (String newValue : allowedValueList)
                 {
-                    if(!oldAllowedValues.contains(newValue) && logger.isDebugEnabled())
+                    if (!oldAllowedValues.contains(newValue) && logger.isDebugEnabled())
                     {
                         // This is an addition
                         logger.debug("value added to list:" + listQName + ":" + newValue);
@@ -392,12 +399,12 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
                 /**
                  * Deal with any deletions
                  */
-                for(String oldValue : oldAllowedValues)
+                for (String oldValue : oldAllowedValues)
                 {
-                    if(!allowedValueList.contains(oldValue))
+                    if (!allowedValueList.contains(oldValue))
                     {
                         // This is a deletion
-                        if(logger.isDebugEnabled())
+                        if (logger.isDebugEnabled())
                         {
                             logger.debug("value removed from list:" + listQName + ":" + oldValue);
                         }
@@ -417,7 +424,7 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
      */
     public void removeRMConstraintListValue(String listName, String valueName)
     {
-        //TODO need to update the rm constraint definition
+        // TODO need to update the rm constraint definition
         // recordsManagementAdminService.
 
         rmCaveatConfigComponent.removeRMConstraintListValue(listName, valueName);
@@ -433,4 +440,4 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
         recordsManagementAdminService.changeCustomConstraintTitle(listQName, newTitle);
         return getRMConstraint(listName);
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintInfo.java

@@ -40,30 +40,37 @@ public class RMConstraintInfo
     {
         this.name = name;
     }
+
     public String getName()
     {
         return name;
     }
+
     public void setTitle(String title)
     {
         this.title = title;
     }
+
     public String getTitle()
     {
         return title;
     }
+
     public void setCaseSensitive(boolean caseSensitive)
     {
         this.caseSensitive = caseSensitive;
     }
+
     public boolean isCaseSensitive()
     {
         return caseSensitive;
     }
+
     public void setAllowedValues(String[] values)
     {
         this.allowedValues = values.clone();
     }
+
     public String[] getAllowedValues()
     {
         return allowedValues;
@@ -85,4 +92,4 @@ public class RMConstraintInfo
         return builder.toString();
     }
 
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintMessageKeys.java

@@ -36,4 +36,4 @@ public class RMConstraintMessageKeys
 {
     public static final String ERR_NON_STRING = "d_dictionary.constraint.string_length.non_string";
     public static final String ERR_INVALID_VALUE = "d_dictionary.constraint.list_of_values.invalid_value";
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java

@@ -33,18 +33,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.extensions.surf.util.I18NUtil;
+
 import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.dictionary.ConstraintException;
 import org.alfresco.service.cmr.i18n.MessageLookup;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
- * RM Constraint implementation that ensures the value is one of a constrained
- * <i>list of values</i>.  By default, this constraint is case-sensitive.
+ * RM Constraint implementation that ensures the value is one of a constrained <i>list of values</i>. By default, this constraint is case-sensitive.
  *
  * @see #setAllowedValues(List)
  * @see #setCaseSensitive(boolean)
@@ -63,7 +63,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
     {
         // closed marking - all values must match
         AND,
-        // open marking   - at least one value must match
+        // open marking - at least one value must match
         OR
     }
 
@@ -75,17 +75,16 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
         RMListOfValuesConstraint.caveatConfigService = caveatConfigService;
     }
 
-
     @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder(80);
         sb.append("RMListOfValuesConstraint")
-          .append("[allowedValues=").append(getAllowedValues())
-          .append(", caseSensitive=").append(isCaseSensitive())
-          .append(", sorted=").append(isSorted())
-          .append(", matchLogic=").append(getMatchLogic())
-          .append("]");
+                .append("[allowedValues=").append(getAllowedValues())
+                .append(", caseSensitive=").append(isCaseSensitive())
+                .append(", sorted=").append(isSorted())
+                .append(", matchLogic=").append(getMatchLogic())
+                .append("]");
         return sb.toString();
     }
 
@@ -98,8 +97,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
     }
 
     /**
-     * Get the allowed values.  Note that these are <tt>String</tt> instances, but may
-     * represent non-<tt>String</tt> values.  It is up to the caller to distinguish.
+     * Get the allowed values. Note that these are <tt>String</tt> instances, but may represent non-<tt>String</tt> values. It is up to the caller to distinguish.
      *
      * @return Returns the values allowed
      */
@@ -107,7 +105,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
     public List<String> getRawAllowedValues()
     {
         String runAsUser = AuthenticationUtil.getRunAsUser();
-        if ((runAsUser != null) && (! runAsUser.equals(AuthenticationUtil.getSystemUserName())) && (caveatConfigService != null))
+        if ((runAsUser != null) && (!runAsUser.equals(AuthenticationUtil.getSystemUserName())) && (caveatConfigService != null))
         {
             // get allowed values for current user
             List<String> allowedForUser = caveatConfigService.getRMAllowedValues(getShortName());
@@ -148,7 +146,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
     private List<String> getAllowedValuesUpper()
     {
         String runAsUser = AuthenticationUtil.getRunAsUser();
-        if ((runAsUser != null) && (! runAsUser.equals(AuthenticationUtil.getSystemUserName())) && (caveatConfigService != null))
+        if ((runAsUser != null) && (!runAsUser.equals(AuthenticationUtil.getSystemUserName())) && (caveatConfigService != null))
         {
             // get allowed values for current user
             List<String> allowedForUser = caveatConfigService.getRMAllowedValues(getType());
@@ -169,12 +167,14 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
             return this.allowedValuesUpper;
         }
     }
+
     /**
      * Set the values that are allowed by the constraint.
      *
-     * @param allowedValues a list of allowed values
+     * @param allowedValues
+     *            a list of allowed values
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
     public void setAllowedValues(List allowedValues)
     {
@@ -256,4 +256,4 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
             }
         }
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptAuthority.java

@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.io.Serializable;
 
-
 public class ScriptAuthority implements Serializable
 {
     /**
@@ -38,23 +37,25 @@ public class ScriptAuthority implements Serializable
     private static final long serialVersionUID = 1L;
     private String authorityTitle;
     private String authorityName;
-    
+
     public void setAuthorityName(String authorityName)
     {
         this.authorityName = authorityName;
     }
+
     public String getAuthorityName()
     {
         return authorityName;
     }
+
     public void setAuthorityTitle(String authorityName)
     {
         this.authorityTitle = authorityName;
     }
+
     public String getAuthorityTitle()
     {
         return authorityTitle;
     }
 
-                                     
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java

@@ -35,14 +35,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.service.cmr.security.AuthorityService;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import org.alfresco.service.cmr.security.AuthorityService;
+
 public class ScriptConstraint implements Serializable
 {
-   /**
+    /**
      *
      */
     private static final long serialVersionUID = 1L;
@@ -64,10 +65,12 @@ public class ScriptConstraint implements Serializable
     {
         info.setTitle(title);
     }
+
     public String getTitle()
     {
         return info.getTitle();
     }
+
     public void setName(String name)
     {
         info.setName(name);
@@ -90,22 +93,22 @@ public class ScriptConstraint implements Serializable
 
     public ScriptConstraintAuthority[] getAuthorities()
     {
-         Map<String, List<String>> values = rmCaveatconfigService.getListDetails(info.getName());
+        Map<String, List<String>> values = rmCaveatconfigService.getListDetails(info.getName());
 
-         if (values == null)
-         {
-             return new ScriptConstraintAuthority[0];
-         }
+        if (values == null)
+        {
+            return new ScriptConstraintAuthority[0];
+        }
 
-         ArrayList<ScriptConstraintAuthority> constraints = new ArrayList<>(values.size());
+        ArrayList<ScriptConstraintAuthority> constraints = new ArrayList<>(values.size());
         for (Map.Entry<String, List<String>> entry : values.entrySet())
-         {
-              ScriptConstraintAuthority constraint = new ScriptConstraintAuthority();
-              constraint.setAuthorityName(entry.getKey());
-              constraint.setValues(entry.getValue());
-              constraints.add(constraint);
-         }
-         return constraints.toArray(new ScriptConstraintAuthority[constraints.size()]);
+        {
+            ScriptConstraintAuthority constraint = new ScriptConstraintAuthority();
+            constraint.setAuthorityName(entry.getKey());
+            constraint.setValues(entry.getValue());
+            constraints.add(constraint);
+        }
+        return constraints.toArray(new ScriptConstraintAuthority[constraints.size()]);
     }
 
     /**
@@ -114,7 +117,7 @@ public class ScriptConstraint implements Serializable
     public void updateTitle(String newTitle)
     {
         info.setTitle(newTitle);
-        rmCaveatconfigService.updateRMConstraintTitle(info.getName(), newTitle)  ;
+        rmCaveatconfigService.updateRMConstraintTitle(info.getName(), newTitle);
     }
 
     /**
@@ -128,18 +131,19 @@ public class ScriptConstraint implements Serializable
 
     /**
      * Update a value
+     * 
      * @param bodge
      */
     public void updateValues(JSONArray bodge) throws Exception
     {
-        for(int i = 0; i < bodge.length(); i++)
+        for (int i = 0; i < bodge.length(); i++)
         {
 
             JSONObject obj = bodge.getJSONObject(i);
             String value = obj.getString("value");
             JSONArray authorities = obj.getJSONArray("authorities");
             List<String> aList = new ArrayList<>();
-            for(int j = 0; j < authorities.length();j++)
+            for (int j = 0; j < authorities.length(); j++)
             {
                 aList.add(authorities.getString(j));
             }
@@ -149,6 +153,7 @@ public class ScriptConstraint implements Serializable
 
     /**
      * Update a value
+     * 
      * @param value
      * @param authorities
      */
@@ -160,25 +165,27 @@ public class ScriptConstraint implements Serializable
 
     /**
      * Cascade delete an authority
+     * 
      * @param authority
      */
     public void deleteAuthority(String authority)
     {
-        //Do nothing
+        // Do nothing
     }
 
     /**
      * Cascade delete a value
+     * 
      * @param value
      */
     public void deleteValue(String value)
     {
-        //Do nothing
+        // Do nothing
     }
 
-
     /**
      * Get a single value
+     * 
      * @param value
      * @return
      */
@@ -186,9 +193,9 @@ public class ScriptConstraint implements Serializable
     {
         ScriptConstraintValue[] values = getValues();
 
-        for(ScriptConstraintValue val : values)
+        for (ScriptConstraintValue val : values)
         {
-            if(val.getValueName().equalsIgnoreCase(value))
+            if (val.getValueName().equalsIgnoreCase(value))
             {
                 return val;
             }
@@ -212,39 +219,39 @@ public class ScriptConstraint implements Serializable
         ArrayList<ScriptConstraintValue> constraints = new ArrayList<>(pivot.size());
         for (Map.Entry<String, List<String>> entry : pivot.entrySet())
         {
-             ScriptConstraintValue constraint = new ScriptConstraintValue();
-             constraint.setValueName(entry.getKey());
-             constraint.setValueTitle(entry.getKey());
+            ScriptConstraintValue constraint = new ScriptConstraintValue();
+            constraint.setValueName(entry.getKey());
+            constraint.setValueTitle(entry.getKey());
 
             List<String> authorities = entry.getValue();
-             List<ScriptAuthority> sauth = new ArrayList<>();
-             for(String authority : authorities)
-             {
-                 ScriptAuthority a = new ScriptAuthority();
-                 a.setAuthorityName(authority);
+            List<ScriptAuthority> sauth = new ArrayList<>();
+            for (String authority : authorities)
+            {
+                ScriptAuthority a = new ScriptAuthority();
+                a.setAuthorityName(authority);
 
-                 String displayName = authorityService.getAuthorityDisplayName(authority);
-                 if(StringUtils.isNotBlank(displayName))
-                 {
-                     a.setAuthorityTitle(displayName);
-                 }
-                 else
-                 {
-                     a.setAuthorityTitle(authority);
-                 }
-                 sauth.add(a);
-             }
-             constraint.setAuthorities(sauth);
-             constraints.add(constraint);
+                String displayName = authorityService.getAuthorityDisplayName(authority);
+                if (StringUtils.isNotBlank(displayName))
+                {
+                    a.setAuthorityTitle(displayName);
+                }
+                else
+                {
+                    a.setAuthorityTitle(authority);
+                }
+                sauth.add(a);
+            }
+            constraint.setAuthorities(sauth);
+            constraints.add(constraint);
         }
 
         /**
          * Now go through and add any "empty" values
          */
         Set<String> values = pivot.keySet();
-        for(String value : info.getAllowedValues())
+        for (String value : info.getAllowedValues())
         {
-            if(!values.contains(value))
+            if (!values.contains(value))
             {
                 ScriptConstraintValue constraint = new ScriptConstraintValue();
                 constraint.setValueName(value);
@@ -258,4 +265,4 @@ public class ScriptConstraint implements Serializable
         return constraints.toArray(new ScriptConstraintValue[constraints.size()]);
     }
 
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintAuthority.java

@@ -37,22 +37,25 @@ public class ScriptConstraintAuthority implements Serializable
      */
     private static final long serialVersionUID = -4659454215122271811L;
     private String authorityName;
-    private List<String>values;
-    
+    private List<String> values;
+
     public void setValues(List<String> values)
     {
         this.values = values;
     }
+
     public List<String> getValues()
     {
         return values;
     }
+
     public void setAuthorityName(String authorityName)
     {
         this.authorityName = authorityName;
     }
+
     public String getAuthorityName()
     {
         return authorityName;
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintValue.java

@@ -37,30 +37,35 @@ public class ScriptConstraintValue implements Serializable
      */
     private static final long serialVersionUID = -4659454215122271811L;
     private String value;
-    private List<ScriptAuthority>authorities;
-    
+    private List<ScriptAuthority> authorities;
+
     public void setAuthorities(List<ScriptAuthority> values)
     {
         this.authorities = values;
     }
+
     public List<ScriptAuthority> getAuthorities()
     {
         return authorities;
     }
+
     public void setValueName(String authorityName)
     {
         this.value = authorityName;
     }
+
     public String getValueName()
     {
         return value;
     }
+
     public void setValueTitle(String authorityName)
     {
         this.value = authorityName;
     }
+
     public String getValueTitle()
     {
         return value;
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java

@@ -66,12 +66,12 @@ public class ScriptRMCaveatConfigService extends BaseScopableProcessorExtension
 
     public ScriptConstraint getConstraint(String listName)
     {
-        //TODO Temporary conversion
+        // TODO Temporary conversion
         String xxx = listName.replace("_", ":");
 
         RMConstraintInfo info = caveatConfigService.getRMConstraint(xxx);
 
-        if(info != null)
+        if (info != null)
         {
             return new ScriptConstraint(info, caveatConfigService, getAuthorityService());
         }
@@ -81,12 +81,12 @@ public class ScriptRMCaveatConfigService extends BaseScopableProcessorExtension
 
     public ScriptConstraint[] getAllConstraints()
     {
-    	return getConstraints(true);
+        return getConstraints(true);
     }
 
     public ScriptConstraint[] getConstraintsWithoutEmptyList()
     {
-    	return getConstraints(false);
+        return getConstraints(false);
     }
 
     private ScriptConstraint[] getConstraints(boolean includeEmptyList)
@@ -94,19 +94,19 @@ public class ScriptRMCaveatConfigService extends BaseScopableProcessorExtension
         Set<RMConstraintInfo> values = caveatConfigService.getAllRMConstraints();
 
         List<ScriptConstraint> vals = new ArrayList<>(values.size());
-        for(RMConstraintInfo value : values)
+        for (RMConstraintInfo value : values)
         {
             ScriptConstraint c = new ScriptConstraint(value, caveatConfigService, getAuthorityService());
             if (includeEmptyList)
             {
-            	vals.add(c);
+                vals.add(c);
             }
             else
             {
-            	if (c.getValues().length > 0)
-            	{
-            		vals.add(c);
-            	}
+                if (c.getValues().length > 0)
+                {
+                    vals.add(c);
+                }
             }
         }
 
@@ -115,44 +115,43 @@ public class ScriptRMCaveatConfigService extends BaseScopableProcessorExtension
 
     /**
      * Delete list
+     * 
      * @param listName
-
+     * 
      */
     public void deleteConstraintList(String listName)
     {
-        //TODO Temporary conversion
+        // TODO Temporary conversion
         String xxx = listName.replace("_", ":");
         caveatConfigService.deleteRMConstraint(xxx);
     }
 
-
-
     /**
      * Update value
      */
-    public void updateConstraintValues(String listName, String authorityName, String[]values)
+    public void updateConstraintValues(String listName, String authorityName, String[] values)
     {
         List<String> vals = new ArrayList<>();
         caveatConfigService.updateRMConstraintListAuthority(listName, authorityName, vals);
     }
 
     /**
-     * Delete the constraint values.   i.e remove an authority from a constraint list
+     * Delete the constraint values. i.e remove an authority from a constraint list
      */
     public void deleteRMConstraintListAuthority(String listName, String authorityName)
     {
-        //TODO Temporary conversion
+        // TODO Temporary conversion
         String xxx = listName.replace("_", ":");
 
         caveatConfigService.removeRMConstraintListAuthority(xxx, authorityName);
     }
 
     /**
-     * Delete the constraint values.   i.e remove a value from a constraint list
+     * Delete the constraint values. i.e remove a value from a constraint list
      */
     public void deleteRMConstraintListValue(String listName, String valueName)
     {
-        //TODO Temporary conversion
+        // TODO Temporary conversion
         String xxx = listName.replace("_", ":");
 
         caveatConfigService.removeRMConstraintListValue(xxx, valueName);
@@ -161,8 +160,8 @@ public class ScriptRMCaveatConfigService extends BaseScopableProcessorExtension
 
     public ScriptConstraint createConstraint(String listName, String title, String[] allowedValues)
     {
-        //TODO Temporary conversion
-        if(listName != null)
+        // TODO Temporary conversion
+        if (listName != null)
         {
             listName = listName.replace("_", ":");
         }
@@ -171,4 +170,4 @@ public class ScriptRMCaveatConfigService extends BaseScopableProcessorExtension
         return new ScriptConstraint(info, caveatConfigService, getAuthorityService());
     }
 
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/compatibility/CompatibilityModel.java

@@ -45,4 +45,4 @@ public interface CompatibilityModel extends DOD5015Model
     String NAME_CUSTOM_RECORD_FOLDER_PROPERTIES = "customRecordFolderProperties";
     String NAME_CUSTOM_RECORD_CATEGORY_PROPERTIES = "customRecordCategoryProperties";
     String NAME_CUSTOM_RECORD_SERIES_PROPERTIES = "customRecordSeriesProperties";
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/DeprecatedExtendedSecurityService.java

@@ -41,7 +41,8 @@ public interface DeprecatedExtendedSecurityService
     /**
      * Gets the set of authorities that are extended readers for the given node.
      *
-     * @param nodeRef   node reference
+     * @param nodeRef
+     *            node reference
      * @return {@link Set}<{@link String}> set of extended readers
      * 
      * @deprecated as of 2.5, use {@link ExtendedSecurityService#getReaders(NodeRef)}
@@ -51,98 +52,113 @@ public interface DeprecatedExtendedSecurityService
     /**
      * Get the set of authorities that are extended writers for the given node.
      *
-     * @param nodeRef   node reference
-     * @return {@link Set}<{@link String}>  set of extended writers
+     * @param nodeRef
+     *            node reference
+     * @return {@link Set}<{@link String}> set of extended writers
      * 
      * @deprecated as of 2.5, use {@link ExtendedSecurityService#getWriters(NodeRef)}
      */
     Set<String> getExtendedWriters(NodeRef nodeRef);
-    
+
     /**
      * Add extended security for the specified authorities to a node.
      * 
      * As of, 2.5 this method no longer applies the extended security to parents.
      *
-     * @param nodeRef   node reference
-     * @param readers   set of authorities to add extended read permissions
-     * @param writers   set of authorities to add extended write permissions
+     * @param nodeRef
+     *            node reference
+     * @param readers
+     *            set of authorities to add extended read permissions
+     * @param writers
+     *            set of authorities to add extended write permissions
      * 
      * @deprecated as of 2.5, use {@link ExtendedSecurityService#set(NodeRef, Set, Set)}
      */
     @Deprecated
     void addExtendedSecurity(NodeRef nodeRef, Set<String> readers, Set<String> writers);
-    
+
     /**
      * Add extended security for the specified authorities to a node.
      * <p>
-     * If specified, the read and write extended permissions are applied to all parents up to the file plan as
-     * extended read.  This ensures parental read, but not parental write.
+     * If specified, the read and write extended permissions are applied to all parents up to the file plan as extended read. This ensures parental read, but not parental write.
      *
-     * @param nodeRef   node reference
-     * @param readers   set of authorities to add extended read permissions
-     * @param writers   set of authorities to add extended write permissions
-     * @param applyToParents true if extended security applied to parents (read only) false otherwise.
+     * @param nodeRef
+     *            node reference
+     * @param readers
+     *            set of authorities to add extended read permissions
+     * @param writers
+     *            set of authorities to add extended write permissions
+     * @param applyToParents
+     *            true if extended security applied to parents (read only) false otherwise.
      * 
-     * @deprecated as of 2.5, because extended security is no longer applied to parents.  Note that calling this method will
-     * only apply the extended security to the node and the applyToParents parameter value will be ignored.
+     * @deprecated as of 2.5, because extended security is no longer applied to parents. Note that calling this method will only apply the extended security to the node and the applyToParents parameter value will be ignored.
      * 
      * @see ExtendedSecurityService#set(NodeRef, Set, Set)
      */
-    @Deprecated void addExtendedSecurity(NodeRef nodeRef, Set<String> readers, Set<String> writers, boolean applyToParents);
+    @Deprecated
+    void addExtendedSecurity(NodeRef nodeRef, Set<String> readers, Set<String> writers, boolean applyToParents);
 
     /**
      * Remove all extended readers and writers from the given node reference.
      *
-     * @param nodeRef   node reference
+     * @param nodeRef
+     *            node reference
      * 
      * @deprecated as of 2.5, see {@link ExtendedSecurityService#remove(NodeRef)}
      */
-    @Deprecated void removeAllExtendedSecurity(NodeRef nodeRef);
-    
+    @Deprecated
+    void removeAllExtendedSecurity(NodeRef nodeRef);
+
     /**
      * Remove the extended security for the specified authorities from a node.
      *
-     * @param nodeRef   node reference
-     * @param readers   set of authorities to remove as extended readers
-     * @param writers   set of authorities to remove as extended writers
+     * @param nodeRef
+     *            node reference
+     * @param readers
+     *            set of authorities to remove as extended readers
+     * @param writers
+     *            set of authorities to remove as extended writers
      * 
-     * @deprecated as of 2.5, because partial removal of readers and writers from node or parents is no longer supported.
-     * Note that calling this method will now remove all extended security from the node and never applied to parents.
+     * @deprecated as of 2.5, because partial removal of readers and writers from node or parents is no longer supported. Note that calling this method will now remove all extended security from the node and never applied to parents.
      * 
      * @see {@link ExtendedSecurityService#remove(NodeRef)}
      */
-    @Deprecated void removeExtendedSecurity(NodeRef nodeRef, Set<String> readers, Set<String> writers);
+    @Deprecated
+    void removeExtendedSecurity(NodeRef nodeRef, Set<String> readers, Set<String> writers);
 
     /**
      * Remove the extended security for the specified authorities from a node.
      * <p>
-     * If specified, extended security will also be removed from the parent hierarchy.(read only).  Note that
-     * extended security is records as a reference count, so security will only be utterly removed from the parent
-     * hierarchy if all references to the authority are removed.
+     * If specified, extended security will also be removed from the parent hierarchy.(read only). Note that extended security is records as a reference count, so security will only be utterly removed from the parent hierarchy if all references to the authority are removed.
      *
-     * @param nodeRef           node reference
-     * @param readers           set of authorities to remove as extended readers
-     * @param writers           set of authorities to remove as extedned writers
-     * @param applyToParents    true if removal of extended security is applied to parent hierarchy (read only), false
-     *                          otherwise
+     * @param nodeRef
+     *            node reference
+     * @param readers
+     *            set of authorities to remove as extended readers
+     * @param writers
+     *            set of authorities to remove as extedned writers
+     * @param applyToParents
+     *            true if removal of extended security is applied to parent hierarchy (read only), false otherwise
      * 
-     * @deprecated as of 2.5, because partial removal of readers and writers from node or parents is no longer supported.
-     * Note that calling this method will now remove all extended security from the node and never applied to parents.
+     * @deprecated as of 2.5, because partial removal of readers and writers from node or parents is no longer supported. Note that calling this method will now remove all extended security from the node and never applied to parents.
      * 
      * @see {@link ExtendedSecurityService#remove(NodeRef)}
      */
-    @Deprecated void removeExtendedSecurity(NodeRef nodeRef, Set<String> readers, Set<String> writers, boolean applyToParents);    
+    @Deprecated
+    void removeExtendedSecurity(NodeRef nodeRef, Set<String> readers, Set<String> writers, boolean applyToParents);
 
     /**
      * Remove all extended readers and writers from the given node reference.
      *
-     * @param nodeRef           node reference
-     * @param applyToParents    if true then apply removal to parent hierarchy (read only) false otherwise.
+     * @param nodeRef
+     *            node reference
+     * @param applyToParents
+     *            if true then apply removal to parent hierarchy (read only) false otherwise.
      * 
-     * @deprecated as of 2.5, because partial removal of readers and writers from node or parents is no longer supported.
-     * Note that calling this method will now remove all extended security from the node and never applied to parents.
+     * @deprecated as of 2.5, because partial removal of readers and writers from node or parents is no longer supported. Note that calling this method will now remove all extended security from the node and never applied to parents.
      * 
      * @see {@link ExtendedSecurityService#remove(NodeRef)}
      */
-    @Deprecated void removeAllExtendedSecurity(NodeRef nodeRef, boolean applyToParents);
-}
+    @Deprecated
+    void removeAllExtendedSecurity(NodeRef nodeRef, boolean applyToParents);
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java

@@ -46,7 +46,7 @@ public class ExtendedReaderDynamicAuthority extends ExtendedSecurityBaseDynamicA
 {
     /** Extended reader role */
     public static final String EXTENDED_READER = "ROLE_EXTENDED_READER";
-    
+
     /**
      * @see org.alfresco.repo.security.permissions.DynamicAuthority#getAuthority()
      */
@@ -54,7 +54,7 @@ public class ExtendedReaderDynamicAuthority extends ExtendedSecurityBaseDynamicA
     public String getAuthority()
     {
         return EXTENDED_READER;
-    }    
+    }
 
     /**
      * @see org.alfresco.repo.security.permissions.DynamicAuthority#requiredFor()
@@ -62,37 +62,37 @@ public class ExtendedReaderDynamicAuthority extends ExtendedSecurityBaseDynamicA
     @Override
     public Set<PermissionReference> requiredFor()
     {
-    	if (requiredFor == null)
-    	{
-    		requiredFor = Collections.singleton(getModelDAO().getPermissionReference(null, RMPermissionModel.READ_RECORDS));
-    	}
-    	
-    	return requiredFor;
+        if (requiredFor == null)
+        {
+            requiredFor = Collections.singleton(getModelDAO().getPermissionReference(null, RMPermissionModel.READ_RECORDS));
+        }
+
+        return requiredFor;
     }
 
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityBaseDynamicAuthority#getAuthorites(org.alfresco.service.cmr.repository.NodeRef)
      */
     @SuppressWarnings("unchecked")
-	protected Set<String> getAuthorites(NodeRef nodeRef) 
+    protected Set<String> getAuthorites(NodeRef nodeRef)
     {
         Set<String> result = null;
-        
-        Map<String, Integer> readerMap = (Map<String, Integer>)getNodeService().getProperty(nodeRef, PROP_READERS);
+
+        Map<String, Integer> readerMap = (Map<String, Integer>) getNodeService().getProperty(nodeRef, PROP_READERS);
         if (readerMap != null)
         {
             result = readerMap.keySet();
         }
-        
+
         return result;
     }
-    
+
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityBaseDynamicAuthority#getTransactionCacheName()
      */
     @Override
-    protected String getTransactionCacheName() 
+    protected String getTransactionCacheName()
     {
-    	return "rm.extendedreaderdynamicauthority";
+        return "rm.extendedreaderdynamicauthority";
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java

@@ -30,6 +30,9 @@ package org.alfresco.module.org_alfresco_module_rm.security;
 import java.util.Map;
 import java.util.Set;
 
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.repo.security.permissions.DynamicAuthority;
 import org.alfresco.repo.security.permissions.PermissionReference;
@@ -39,8 +42,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.util.Pair;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 
 /**
  * Extended readers dynamic authority implementation.
@@ -50,8 +51,8 @@ import org.springframework.context.ApplicationContextAware;
  */
 @Deprecated
 public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAuthority,
-                                                                      RecordsManagementModel,
-                                                                      ApplicationContextAware
+        RecordsManagementModel,
+        ApplicationContextAware
 {
     /** Authority service */
     private AuthorityService authorityService;
@@ -72,58 +73,58 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut
     protected Set<PermissionReference> requiredFor;
 
     // NOTE: we get the services directly from the application context in this way to avoid
-    //       cyclic relationships and issues when loading the application context
+    // cyclic relationships and issues when loading the application context
 
     /**
-     * @return  authority service
+     * @return authority service
      */
     protected AuthorityService getAuthorityService()
     {
         if (authorityService == null)
         {
-            authorityService = (AuthorityService)applicationContext.getBean("authorityService");
+            authorityService = (AuthorityService) applicationContext.getBean("authorityService");
         }
         return authorityService;
     }
 
     /**
-     * @return  extended security service
+     * @return extended security service
      */
     protected ExtendedSecurityService getExtendedSecurityService()
     {
         if (extendedSecurityService == null)
         {
-            extendedSecurityService = (ExtendedSecurityService)applicationContext.getBean("extendedSecurityService");
+            extendedSecurityService = (ExtendedSecurityService) applicationContext.getBean("extendedSecurityService");
         }
         return extendedSecurityService;
     }
 
     /**
-     * @return  node service
+     * @return node service
      */
     protected NodeService getNodeService()
     {
         if (nodeService == null)
         {
-            nodeService = (NodeService)applicationContext.getBean("dbNodeService");
+            nodeService = (NodeService) applicationContext.getBean("dbNodeService");
         }
         return nodeService;
     }
 
     /**
-     * @return	model DAO
+     * @return model DAO
      */
     protected ModelDAO getModelDAO()
     {
-    	if (modelDAO == null)
-    	{
-    		modelDAO = (ModelDAO)applicationContext.getBean("permissionsModelDAO");
-    	}
-    	return modelDAO;
+        if (modelDAO == null)
+        {
+            modelDAO = (ModelDAO) applicationContext.getBean("permissionsModelDAO");
+        }
+        return modelDAO;
     }
 
     /**
-     * @return	String transaction cache name
+     * @return String transaction cache name
      */
     protected abstract String getTransactionCacheName();
 
@@ -137,8 +138,7 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut
     }
 
     /**
-     * Gets a list of the authorities from the extended security aspect that this dynamic
-     * authority is checking against.
+     * Gets a list of the authorities from the extended security aspect that this dynamic authority is checking against.
      *
      * @param nodeRef
      * @return
@@ -162,31 +162,31 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut
         }
         else
         {
-	        if (getNodeService().hasAspect(nodeRef, ASPECT_EXTENDED_SECURITY))
-	        {
-	            Set<String> authorities = getAuthorites(nodeRef);
-	            if (authorities != null)
-	            {
-	            	// check for everyone or the user
-	            	if (authorities.contains("GROUP_EVEYONE") ||
-	            		authorities.contains(userName))
-	            	{
-	            		result = true;
-	            	}
-	            	else
-	            	{
-	            		// determine whether any of the users groups are in the extended security
-	            		Set<String> contained = getAuthorityService().getAuthoritiesForUser(userName);
-	            		authorities.retainAll(contained);
-	            		result = (authorities.size() != 0);
-	            	}
-	            }
-	        }
+            if (getNodeService().hasAspect(nodeRef, ASPECT_EXTENDED_SECURITY))
+            {
+                Set<String> authorities = getAuthorites(nodeRef);
+                if (authorities != null)
+                {
+                    // check for everyone or the user
+                    if (authorities.contains("GROUP_EVEYONE") ||
+                            authorities.contains(userName))
+                    {
+                        result = true;
+                    }
+                    else
+                    {
+                        // determine whether any of the users groups are in the extended security
+                        Set<String> contained = getAuthorityService().getAuthoritiesForUser(userName);
+                        authorities.retainAll(contained);
+                        result = (authorities.size() != 0);
+                    }
+                }
+            }
 
-	        // cache result
-	        transactionCache.put(key, result);
+            // cache result
+            transactionCache.put(key, result);
         }
 
         return result;
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java

@@ -47,7 +47,7 @@ public class ExtendedWriterDynamicAuthority extends ExtendedSecurityBaseDynamicA
 {
     /** Extended writer role */
     public static final String EXTENDED_WRITER = "ROLE_EXTENDED_WRITER";
-    
+
     /**
      * @see org.alfresco.repo.security.permissions.DynamicAuthority#getAuthority()
      */
@@ -56,48 +56,48 @@ public class ExtendedWriterDynamicAuthority extends ExtendedSecurityBaseDynamicA
     {
         return EXTENDED_WRITER;
     }
-    
+
     /**
      * @see org.alfresco.repo.security.permissions.DynamicAuthority#requiredFor()
      */
     @Override
     public Set<PermissionReference> requiredFor()
     {
-    	if (requiredFor == null)
-    	{
-    		requiredFor = new HashSet<>(3);
-    		Collections.addAll(requiredFor, 
-    						   getModelDAO().getPermissionReference(null, RMPermissionModel.READ_RECORDS),
-    				           getModelDAO().getPermissionReference(null, RMPermissionModel.FILING), 
-    				           getModelDAO().getPermissionReference(null, RMPermissionModel.FILE_RECORDS));
-    	}
-    	
-    	return requiredFor;
+        if (requiredFor == null)
+        {
+            requiredFor = new HashSet<>(3);
+            Collections.addAll(requiredFor,
+                    getModelDAO().getPermissionReference(null, RMPermissionModel.READ_RECORDS),
+                    getModelDAO().getPermissionReference(null, RMPermissionModel.FILING),
+                    getModelDAO().getPermissionReference(null, RMPermissionModel.FILE_RECORDS));
+        }
+
+        return requiredFor;
     }
 
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityBaseDynamicAuthority#getAuthorites(org.alfresco.service.cmr.repository.NodeRef)
      */
     @SuppressWarnings("unchecked")
-	protected Set<String> getAuthorites(NodeRef nodeRef) 
+    protected Set<String> getAuthorites(NodeRef nodeRef)
     {
-    	Set<String> result = null;
-        
-        Map<String, Integer> map = (Map<String, Integer>)getNodeService().getProperty(nodeRef, PROP_WRITERS);
+        Set<String> result = null;
+
+        Map<String, Integer> map = (Map<String, Integer>) getNodeService().getProperty(nodeRef, PROP_WRITERS);
         if (map != null)
         {
             result = map.keySet();
         }
-        
+
         return result;
-    }  
-    
+    }
+
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityBaseDynamicAuthority#getTransactionCacheName()
      */
     @Override
-    protected String getTransactionCacheName() 
+    protected String getTransactionCacheName()
     {
-    	return "rm.extendedwriterdynamicauthority";
-    }  
-}
+        return "rm.extendedwriterdynamicauthority";
+    }
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationService.java

@@ -40,7 +40,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 public interface FilePlanAuthenticationService
 {
     /**
-     * @return  rm admin user name
+     * @return rm admin user name
      *
      * @deprecated as of 2.2, use {@link AuthenticationUtil#getAdminUserName()}
      */
@@ -49,14 +49,16 @@ public interface FilePlanAuthenticationService
     /**
      * Run provided work as the global rm admin user.
      *
-     * @param <R>       return type
-     * @param runAsWork work to execute as the rm admin user
-     * @return R        result of work execution
+     * @param <R>
+     *            return type
+     * @param runAsWork
+     *            work to execute as the rm admin user
+     * @return R result of work execution
      *
      * @deprecated as of 2.2, use
      *
      *
-     * {@link AuthenticationUtil#runAs(RunAsWork, String)}
+     *             {@link AuthenticationUtil#runAs(RunAsWork, String)}
      */
     <R> R runAsRmAdmin(RunAsWork<R> runAsWork);
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationServiceImpl.java

@@ -60,4 +60,4 @@ public class FilePlanAuthenticationServiceImpl implements FilePlanAuthentication
     {
         return AuthenticationUtil.runAs(runAsWork, AuthenticationUtil.getAdminUserName());
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityService.java

@@ -43,40 +43,42 @@ import org.alfresco.service.namespace.QName;
  * @deprecated As of release 2.1, replaced by {@link ModelSecurityService}, {@link FilePlanRoleService} and {@link FilePlanPermissionService}
  */
 public interface RecordsManagementSecurityService
-{    
+{
     /**
      * Creates the initial set of default roles for a root records management node
      * 
-     * @param rmRootNode    root node
+     * @param rmRootNode
+     *            root node
      * 
-     * @deprecated As of release 2.1, operation no longer supported 
+     * @deprecated As of release 2.1, operation no longer supported
      */
     @Deprecated
     void bootstrapDefaultRoles(NodeRef rmRootNode);
-    
+
     /**
-     * Returns the name of the container group for all roles of a specified file
-     * plan.
+     * Returns the name of the container group for all roles of a specified file plan.
      * 
-     * @param filePlan  file plan node reference
-     * @return String   group name
+     * @param filePlan
+     *            file plan node reference
+     * @return String group name
      * 
      * @deprecated As of release 2.1, replaced by {@link FilePlanRoleService#getAllRolesContainerGroup(NodeRef)}
      */
     @Deprecated
     String getAllRolesContainerGroup(NodeRef filePlan);
-    
+
     /**
      * Get all the available roles for the given records management root node
      * 
-     * @param rmRootNode    root node
-     * @return {@link Set}<{@link Role}>    all roles for a given root node
+     * @param rmRootNode
+     *            root node
+     * @return {@link Set}<{@link Role}> all roles for a given root node
      * 
      * @deprecated As of release 2.1, replaced by {@link FilePlanRoleService#getRoles(NodeRef)}
      */
     @Deprecated
     Set<Role> getRoles(NodeRef rmRootNode);
-    
+
     /**
      * Gets the roles for a given user
      * 
@@ -88,7 +90,7 @@ public interface RecordsManagementSecurityService
      */
     @Deprecated
     Set<Role> getRolesByUser(NodeRef rmRootNode, String user);
-    
+
     /**
      * Get a role by name
      * 
@@ -99,10 +101,11 @@ public interface RecordsManagementSecurityService
      * @deprecated As of release 2.1, replaced by {@link FilePlanRoleService#getRole(NodeRef, String)}
      */
     @Deprecated
-    Role getRole(NodeRef rmRootNode, String role);    
-    
+    Role getRole(NodeRef rmRootNode, String role);
+
     /**
      * Indicate whether a role exists for a given records management root node
+     * 
      * @param rmRootNode
      * @param role
      * @return
@@ -111,19 +114,21 @@ public interface RecordsManagementSecurityService
      */
     @Deprecated
     boolean existsRole(NodeRef rmRootNode, String role);
-    
+
     /**
      * Determines whether the given user has the RM Admin role
      * 
-     * @param rmRootNode RM root node
-     * @param user user name to check
+     * @param rmRootNode
+     *            RM root node
+     * @param user
+     *            user name to check
      * @return true if the user has the RM Admin role, false otherwise
      * 
      * @deprecated As of release 2.1, replaced by {@link FilePlanRoleService#hasRMAdminRole(NodeRef, String)}
      */
     @Deprecated
     boolean hasRMAdminRole(NodeRef rmRootNode, String user);
-    
+
     /**
      * Create a new role
      * 
@@ -137,7 +142,7 @@ public interface RecordsManagementSecurityService
      */
     @Deprecated
     Role createRole(NodeRef rmRootNode, String role, String roleDisplayLabel, Set<Capability> capabilities);
-    
+
     /**
      * Update an existing role
      * 
@@ -151,7 +156,7 @@ public interface RecordsManagementSecurityService
      */
     @Deprecated
     Role updateRole(NodeRef rmRootNode, String role, String roleDisplayLabel, Set<Capability> capabilities);
-    
+
     /**
      * Delete a role
      * 
@@ -162,7 +167,7 @@ public interface RecordsManagementSecurityService
      */
     @Deprecated
     void deleteRole(NodeRef rmRootNode, String role);
-    
+
     /**
      * Assign a role to an authority
      * 
@@ -174,42 +179,47 @@ public interface RecordsManagementSecurityService
      */
     @Deprecated
     void assignRoleToAuthority(NodeRef rmRootNode, String role, String authorityName);
-    
+
     /**
-     * Sets a permission on a RM object.  Assumes allow is true.  Cascades permission down to record folder.  
-     * Cascades ReadRecord up to file plan.
+     * Sets a permission on a RM object. Assumes allow is true. Cascades permission down to record folder. Cascades ReadRecord up to file plan.
      * 
-     * @param nodeRef       node reference
-     * @param authority     authority 
-     * @param permission    permission
+     * @param nodeRef
+     *            node reference
+     * @param authority
+     *            authority
+     * @param permission
+     *            permission
      * 
      * @deprecated As of release 2.1, replaced by {@link FilePlanPermissionService#setPermission(NodeRef, String, String)}
      */
     @Deprecated
     void setPermission(NodeRef nodeRef, String authority, String permission);
-    
+
     /**
-     * Deletes a permission from a RM object.  Cascades removal down to record folder.
+     * Deletes a permission from a RM object. Cascades removal down to record folder.
      * 
-     * @param nodeRef       node reference
-     * @param authority     authority 
-     * @param permission    permission
+     * @param nodeRef
+     *            node reference
+     * @param authority
+     *            authority
+     * @param permission
+     *            permission
      * 
      * @deprecated As of release 2.1, replaced by {@link FilePlanPermissionService#deletePermission(NodeRef, String, String)}
      */
     @Deprecated
     void deletePermission(NodeRef nodeRef, String authority, String permission);
-    
+
     /**
-     * @return  {@link Set}&lt;{@link QName}&gt;  protected aspect names
+     * @return {@link Set}&lt;{@link QName}&gt; protected aspect names
      * @deprecated As of release 2.1, replaced by {@link ModelSecurityService#getProtectedAspects}
      */
     @Deprecated
     Set<QName> getProtectedAspects();
-   
+
     /**
-     * @return {@link Set}&lt;{@link QName}&gt;   protected properties
-     * @deprecated  As of release 2.1, replaced by {@link ModelSecurityService#getProtectedProperties}
+     * @return {@link Set}&lt;{@link QName}&gt; protected properties
+     * @deprecated As of release 2.1, replaced by {@link ModelSecurityService#getProtectedProperties}
      */
     Set<QName> getProtectedProperties();
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java

@@ -43,27 +43,29 @@ import org.alfresco.service.namespace.QName;
  */
 @SuppressWarnings("deprecation")
 public class RecordsManagementSecurityServiceImpl implements RecordsManagementSecurityService,
-                                                             RecordsManagementModel
+        RecordsManagementModel
 {
     /** Model security service */
     private ModelSecurityService modelSecurityService;
-    
+
     /** File plan role service */
     private FilePlanRoleService filePlanRoleService;
-    
+
     /** File plan permission service */
     private FilePlanPermissionService filePlanPermissionService;
 
     /**
-     * @param modelSecurityService  model security service
+     * @param modelSecurityService
+     *            model security service
      */
     public void setModelSecurityService(ModelSecurityService modelSecurityService)
     {
         this.modelSecurityService = modelSecurityService;
     }
-    
+
     /**
-     * @param filePlanRoleService   file plan role service
+     * @param filePlanRoleService
+     *            file plan role service
      */
     public void setFilePlanRoleService(FilePlanRoleService filePlanRoleService)
     {
@@ -71,13 +73,14 @@ public class RecordsManagementSecurityServiceImpl implements RecordsManagementSe
     }
 
     /**
-     * @param filePlanPermissionService file plan permission service
+     * @param filePlanPermissionService
+     *            file plan permission service
      */
     public void setFilePlanPermissionService(FilePlanPermissionService filePlanPermissionService)
     {
         this.filePlanPermissionService = filePlanPermissionService;
     }
-    
+
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService#getProtectedAspects()
      */
@@ -227,4 +230,4 @@ public class RecordsManagementSecurityServiceImpl implements RecordsManagementSe
     {
         filePlanPermissionService.setPermission(nodeRef, authority, permission);
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java

@@ -48,7 +48,7 @@ public class Role extends org.alfresco.module.org_alfresco_module_rm.role.Role
     {
         return new Role(role.getName(), role.getDisplayLabel(), role.getCapabilities(), role.getRoleGroupName());
     }
-    
+
     /**
      * Compatibility method
      */
@@ -61,7 +61,7 @@ public class Role extends org.alfresco.module.org_alfresco_module_rm.role.Role
         }
         return result;
     }
-    
+
     /**
      * Constructor
      */
@@ -70,4 +70,4 @@ public class Role extends org.alfresco.module.org_alfresco_module_rm.role.Role
     {
         super(name, displayLabel, capabilities, roleGroupName);
     }
-}
+}

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

@@ -92,12 +92,9 @@ public interface RecordsManagementPolicies
     interface OnRemoveReference extends ClassPolicy
     {
         /**
-         * @param fromNodeRef
-         *            from node reference
-         * @param toNodeRef
-         *            to node reference
-         * @param reference
-         *            name of reference
+         * @param fromNodeRef   from node reference
+         * @param toNodeRef     to node reference
+         * @param reference     name of reference
          */
         void onRemoveReference(NodeRef fromNodeRef, NodeRef toNodeRef, QName reference);
     }
@@ -113,8 +110,7 @@ public interface RecordsManagementPolicies
         QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeRecordFile");
 
         /**
-         * @param nodeRef
-         *            node reference
+         * @param nodeRef   node reference
          */
         void beforeFileRecord(NodeRef nodeRef);
     }
@@ -130,15 +126,13 @@ public interface RecordsManagementPolicies
         QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onRecordFile");
 
         /**
-         * @param nodeRef
-         *            node reference
+         * @param nodeRef   node reference
          */
         void onFileRecord(NodeRef nodeRef);
     }
 
     /**
      * Before record declaration
-     * 
      * @since 2.5
      */
     interface BeforeRecordDeclaration extends ClassPolicy
@@ -148,7 +142,6 @@ public interface RecordsManagementPolicies
 
     /**
      * On record declaration
-     * 
      * @since 2.5
      */
     interface OnRecordDeclaration extends ClassPolicy
@@ -158,7 +151,6 @@ public interface RecordsManagementPolicies
 
     /**
      * Before record rejection
-     * 
      * @since 2.5
      */
     interface BeforeRecordRejection extends ClassPolicy
@@ -168,11 +160,10 @@ public interface RecordsManagementPolicies
 
     /**
      * On record rejection
-     * 
      * @since 2.5
      */
     interface OnRecordRejection extends ClassPolicy
     {
         void onRecordRejection(NodeRef nodeRef);
     }
-}
+}

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

@@ -77,14 +77,15 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
     @Deprecated
     QName RECORDS_MANAGEMENT_SECURITY_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "RecordsManagementSecurityService");
 
+
     /**
-     * @return records management service
+     * @return  records management service
      */
     @NotAuditable
     RecordsManagementService getRecordsManagementService();
 
     /**
-     * @return record service
+     * @return  record service
      */
     @NotAuditable
     RecordService getRecordService();
@@ -96,25 +97,25 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
     DispositionService getDispositionService();
 
     /**
-     * @return records management admin service
+     * @return  records management admin service
      */
     @NotAuditable
     RecordsManagementAdminService getRecordsManagementAdminService();
 
     /**
-     * @return records management action service
+     * @return  records management action service
      */
     @NotAuditable
     RecordsManagementActionService getRecordsManagementActionService();
 
     /**
-     * @return records management event service
+     * @return  records management event service
      */
     @NotAuditable
     RecordsManagementEventService getRecordsManagementEventService();
 
     /**
-     * @return records management security service
+     * @return  records management security service
      *
      * @deprecated As of release 2.1, replaced with {@link FilePlanRoleService}, {@link FilePlanPermissionService} and {@link ModelSecurityService}
      */
@@ -123,20 +124,20 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
     RecordsManagementSecurityService getRecordsManagementSecurityService();
 
     /**
-     * @return records management audit service
+     * @return  records management audit service
      */
     @NotAuditable
     RecordsManagementAuditService getRecordsManagementAuditService();
 
     /**
-     * @return capability service
+     * @return  capability service
      * @since 2.0
      */
     @NotAuditable
     CapabilityService getCapabilityService();
 
     /**
-     * @return freeze service
+     * @return  freeze service
      * @since 2.1
      */
     @NotAuditable
@@ -150,21 +151,21 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
     ExtendedSecurityService getExtendedSecurityService();
 
     /**
-     * @return file plan service
+     * @return  file plan service
      * @since 2.1
      */
     @NotAuditable
     FilePlanService getFilePlanService();
 
     /**
-     * @return file plan role service
+     * @return  file plan role service
      * @since 2.1
      */
     @NotAuditable
     FilePlanRoleService getFilePlanRoleService();
 
     /**
-     * @return file plan permission service
+     * @return  file plan permission service
      * @since 2.1
      */
     @NotAuditable
@@ -177,16 +178,16 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
     IdentifierService getIdentifierService();
 
     /**
-     * @return record folder service
+     * @return  record folder service
      * @since 2.2
      */
     @NotAuditable
     RecordFolderService getRecordFolderService();
 
     /**
-     * @return transfer service
+     * @return  transfer service
      * @since 2.2
      */
     @NotAuditable
     TransferService getTransferService();
-}
+}

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

@@ -51,7 +51,7 @@ import org.alfresco.repo.service.ServiceDescriptorRegistry;
  */
 @SuppressWarnings("deprecation")
 public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegistry
-        implements RecordsManagementServiceRegistry
+                                                  implements RecordsManagementServiceRegistry
 {
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getRecordsManagementActionService()
@@ -205,4 +205,4 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
     {
         return (TransferService) getService(TRANSFER_SERVICE);
     }
-}
+}

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

@@ -33,10 +33,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
-
 import org.alfresco.repo.batch.BatchProcessWorkProvider;
 import org.alfresco.repo.batch.BatchProcessor;
 import org.alfresco.repo.batch.BatchProcessor.BatchProcessWorker;
@@ -49,6 +45,9 @@ import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.transaction.TransactionService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
 
 /**
  * A base class for executing bulk operations on nodes based on search query results
@@ -80,10 +79,8 @@ public abstract class BulkBaseService<T> implements InitializingBean
     /**
      * Execute bulk operation on node based on the search query results
      *
-     * @param nodeRef
-     *            node reference
-     * @param bulkOperation
-     *            bulk operation
+     * @param nodeRef       node reference
+     * @param bulkOperation bulk operation
      * @return bulk status
      */
     public T execute(NodeRef nodeRef, BulkOperation bulkOperation)
@@ -104,19 +101,19 @@ public abstract class BulkBaseService<T> implements InitializingBean
         bulkMonitor.registerProcess(nodeRef, processId, bulkOperation);
 
         BulkProgress bulkProgress = new BulkProgress(totalItems, processId, new AtomicBoolean(false),
-                new AtomicInteger(0));
+            new AtomicInteger(0));
         BatchProcessWorker<NodeRef> batchProcessWorker = getWorkerProvider(nodeRef, bulkOperation, bulkProgress);
         BulkStatusUpdater bulkStatusUpdater = getBulkStatusUpdater();
 
         BatchProcessor<NodeRef> batchProcessor = new BatchProcessor<>(
-                processId,
-                transactionService.getRetryingTransactionHelper(),
-                getWorkProvider(bulkOperation, bulkStatusUpdater, bulkProgress),
-                threadCount,
-                itemsPerTransaction,
-                bulkStatusUpdater,
-                LOG,
-                loggingInterval);
+            processId,
+            transactionService.getRetryingTransactionHelper(),
+            getWorkProvider(bulkOperation, bulkStatusUpdater, bulkProgress),
+            threadCount,
+            itemsPerTransaction,
+            bulkStatusUpdater,
+            LOG,
+            loggingInterval);
 
         runAsyncBatchProcessor(batchProcessor, batchProcessWorker, bulkStatusUpdater);
         return initBulkStatus;
@@ -126,7 +123,7 @@ public abstract class BulkBaseService<T> implements InitializingBean
      * Run batch processor
      */
     protected void runAsyncBatchProcessor(BatchProcessor<NodeRef> batchProcessor,
-            BatchProcessWorker<NodeRef> batchProcessWorker, BulkStatusUpdater bulkStatusUpdater)
+        BatchProcessWorker<NodeRef> batchProcessWorker, BulkStatusUpdater bulkStatusUpdater)
     {
         Runnable backgroundLogic = () -> {
             try
@@ -157,10 +154,8 @@ public abstract class BulkBaseService<T> implements InitializingBean
     /**
      * Get initial bulk status
      *
-     * @param processId
-     *            process id
-     * @param totalItems
-     *            total items
+     * @param processId  process id
+     * @param totalItems total items
      * @return bulk status
      */
     protected abstract T getInitBulkStatus(String processId, long totalItems);
@@ -175,38 +170,30 @@ public abstract class BulkBaseService<T> implements InitializingBean
     /**
      * Get work provider
      *
-     * @param bulkOperation
-     *            bulk operation
-     * @param bulkStatusUpdater
-     *            bulk status updater
-     * @param bulkProgress
-     *            bulk progress
+     * @param bulkOperation     bulk operation
+     * @param bulkStatusUpdater bulk status updater
+     * @param bulkProgress      bulk progress
      * @return work provider
      */
     protected abstract BatchProcessWorkProvider<NodeRef> getWorkProvider(BulkOperation bulkOperation,
-            BulkStatusUpdater bulkStatusUpdater, BulkProgress bulkProgress);
+        BulkStatusUpdater bulkStatusUpdater, BulkProgress bulkProgress);
 
     /**
      * Get worker provider
      *
-     * @param nodeRef
-     *            node reference
-     * @param bulkOperation
-     *            bulk operation
-     * @param bulkProgress
-     *            bulk progress
+     * @param nodeRef       node reference
+     * @param bulkOperation bulk operation
+     * @param bulkProgress  bulk progress
      * @return worker provider
      */
     protected abstract BatchProcessWorker<NodeRef> getWorkerProvider(NodeRef nodeRef, BulkOperation bulkOperation,
-            BulkProgress bulkProgress);
+        BulkProgress bulkProgress);
 
     /**
      * Check permissions
      *
-     * @param nodeRef
-     *            node reference
-     * @param bulkOperation
-     *            bulk operation
+     * @param nodeRef       node reference
+     * @param bulkOperation bulk operation
      */
     protected abstract void checkPermissions(NodeRef nodeRef, BulkOperation bulkOperation);
 
@@ -275,4 +262,4 @@ public abstract class BulkBaseService<T> implements InitializingBean
     {
         this.maxParallelRequests = maxParallelRequests;
     }
-}
+}

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

@@ -30,4 +30,5 @@ package org.alfresco.module.org_alfresco_module_rm.bulk;
  * An immutable POJO to represent a bulk cancellation request
  */
 public record BulkCancellationRequest(String reason)
-{}
+{
+}

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

@@ -36,28 +36,23 @@ public interface BulkMonitor<T>
     /**
      * Update the bulk status
      *
-     * @param bulkStatus
-     *            the bulk status
+     * @param bulkStatus the bulk status
      */
     void updateBulkStatus(T bulkStatus);
 
     /**
      * Register a process
      *
-     * @param nodeRef
-     *            the node reference
-     * @param processId
-     *            the process id
-     * @param bulkOperation
-     *            the bulk operation
+     * @param nodeRef       the node reference
+     * @param processId     the process id
+     * @param bulkOperation the bulk operation
      */
     void registerProcess(NodeRef nodeRef, String processId, BulkOperation bulkOperation);
 
     /**
      * Get the bulk status
      *
-     * @param bulkStatusId
-     *            the bulk status id
+     * @param bulkStatusId the bulk status id
      * @return the bulk status
      */
     T getBulkStatus(String bulkStatusId);
@@ -85,4 +80,4 @@ public interface BulkMonitor<T>
      * @return cancellation reason
      */
     BulkCancellationRequest getBulkCancellationRequest(String bulkStatusId);
-}
+}

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

@@ -42,4 +42,4 @@ public record BulkOperation(Query searchQuery, String operationType) implements
             throw new IllegalArgumentException("Operation type and search query must not be null");
         }
     }
-}
+}

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

@@ -33,4 +33,5 @@ import java.util.concurrent.atomic.AtomicInteger;
  * An immutable POJO to represent the progress of a bulk operation
  */
 public record BulkProgress(long totalItems, String processId, AtomicBoolean cancelled, AtomicInteger currentNodeNumber)
-{}
+{
+}

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

@@ -37,4 +37,4 @@ public interface BulkStatusUpdater extends ApplicationEventPublisher
      * Update the bulk status
      */
     void update();
-}
+}

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

@@ -33,14 +33,13 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 
-import org.springframework.context.ApplicationEvent;
-import org.springframework.extensions.surf.util.AbstractLifecycleBean;
-
 import org.alfresco.module.org_alfresco_module_rm.bulk.BulkCancellationRequest;
 import org.alfresco.module.org_alfresco_module_rm.bulk.BulkOperation;
 import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.util.Pair;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 
 /**
  * Default hold bulk monitor implementation
@@ -63,7 +62,7 @@ public class DefaultHoldBulkMonitor extends AbstractLifecycleBean implements Hol
         if (holdRef != null && processId != null)
         {
             holdProcessRegistry.put(new Pair<>(holdRef.getId(), processId),
-                    new HoldBulkProcessDetails(processId, getCurrentInstanceDetails(), bulkOperation));
+                new HoldBulkProcessDetails(processId, getCurrentInstanceDetails(), bulkOperation));
         }
     }
 
@@ -95,22 +94,22 @@ public class DefaultHoldBulkMonitor extends AbstractLifecycleBean implements Hol
     public List<HoldBulkStatusAndProcessDetails> getBulkStatusesWithProcessDetails(String holdId)
     {
         return holdProcessRegistry.getKeys().stream()
-                .filter(holdIdAndBulkStatusId -> holdId.equals(holdIdAndBulkStatusId.getFirst()))
-                .map(holdIdAndBulkStatusId -> holdProcessRegistry.get(holdIdAndBulkStatusId))
-                .filter(Objects::nonNull)
-                .map(createHoldBulkStatusAndProcessDetails())
-                .filter(statusAndProcess -> Objects.nonNull(statusAndProcess.holdBulkStatus()))
-                .sorted(sortBulkStatuses())
-                .toList();
+            .filter(holdIdAndBulkStatusId -> holdId.equals(holdIdAndBulkStatusId.getFirst()))
+            .map(holdIdAndBulkStatusId -> holdProcessRegistry.get(holdIdAndBulkStatusId))
+            .filter(Objects::nonNull)
+            .map(createHoldBulkStatusAndProcessDetails())
+            .filter(statusAndProcess -> Objects.nonNull(statusAndProcess.holdBulkStatus()))
+            .sorted(sortBulkStatuses())
+            .toList();
     }
 
     @Override
     public HoldBulkStatusAndProcessDetails getBulkStatusWithProcessDetails(String holdId, String bulkStatusId)
     {
         return Optional.ofNullable(holdProcessRegistry.get(new Pair<>(holdId, bulkStatusId)))
-                .map(createHoldBulkStatusAndProcessDetails())
-                .filter(statusAndProcess -> Objects.nonNull(statusAndProcess.holdBulkStatus()))
-                .orElse(null);
+            .map(createHoldBulkStatusAndProcessDetails())
+            .filter(statusAndProcess -> Objects.nonNull(statusAndProcess.holdBulkStatus()))
+            .orElse(null);
     }
 
     protected String getCurrentInstanceDetails()
@@ -121,33 +120,33 @@ public class DefaultHoldBulkMonitor extends AbstractLifecycleBean implements Hol
     protected Function<HoldBulkProcessDetails, HoldBulkStatusAndProcessDetails> createHoldBulkStatusAndProcessDetails()
     {
         return bulkProcessDetails -> new HoldBulkStatusAndProcessDetails(
-                getBulkStatus(bulkProcessDetails.bulkStatusId()), bulkProcessDetails);
+            getBulkStatus(bulkProcessDetails.bulkStatusId()), bulkProcessDetails);
     }
 
     protected static Comparator<HoldBulkStatusAndProcessDetails> sortBulkStatuses()
     {
-        return Comparator.<HoldBulkStatusAndProcessDetails, Date> comparing(
+        return Comparator.<HoldBulkStatusAndProcessDetails, Date>comparing(
                 statusAndProcess -> statusAndProcess.holdBulkStatus().endTime(),
                 Comparator.nullsLast(Comparator.naturalOrder()))
-                .thenComparing(statusAndProcess -> statusAndProcess.holdBulkStatus().startTime(),
-                        Comparator.nullsLast(Comparator.naturalOrder()))
-                .reversed();
+            .thenComparing(statusAndProcess -> statusAndProcess.holdBulkStatus().startTime(),
+                Comparator.nullsLast(Comparator.naturalOrder()))
+            .reversed();
     }
 
     public void setHoldProgressCache(
-            SimpleCache<String, HoldBulkStatus> holdProgressCache)
+        SimpleCache<String, HoldBulkStatus> holdProgressCache)
     {
         this.holdProgressCache = holdProgressCache;
     }
 
     public void setHoldProcessRegistry(
-            SimpleCache<Pair<String, String>, HoldBulkProcessDetails> holdProcessRegistry)
+        SimpleCache<Pair<String, String>, HoldBulkProcessDetails> holdProcessRegistry)
     {
         this.holdProcessRegistry = holdProcessRegistry;
     }
 
     public void setBulkCancellationsCache(
-            SimpleCache<String, BulkCancellationRequest> bulkCancellationsCache)
+        SimpleCache<String, BulkCancellationRequest> bulkCancellationsCache)
     {
         this.bulkCancellationsCache = bulkCancellationsCache;
     }
@@ -163,4 +162,4 @@ public class DefaultHoldBulkMonitor extends AbstractLifecycleBean implements Hol
     {
         // NOOP
     }
-}
+}

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

@@ -38,8 +38,7 @@ public interface HoldBulkMonitor extends BulkMonitor<HoldBulkStatus>
     /**
      * Get the bulk statuses with process details for a hold
      *
-     * @param holdId
-     *            the hold id
+     * @param holdId the hold id
      * @return the bulk statuses with process details
      */
     List<HoldBulkStatusAndProcessDetails> getBulkStatusesWithProcessDetails(String holdId);
@@ -47,11 +46,9 @@ public interface HoldBulkMonitor extends BulkMonitor<HoldBulkStatus>
     /**
      * Get the bulk status with process details
      *
-     * @param holdId
-     *            the hold id
-     * @param bulkStatusId
-     *            the bulk status id
+     * @param holdId       the hold id
+     * @param bulkStatusId the bulk status id
      * @return the bulk status with process details
      */
     HoldBulkStatusAndProcessDetails getBulkStatusWithProcessDetails(String holdId, String bulkStatusId);
-}
+}

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

@@ -34,4 +34,5 @@ import org.alfresco.module.org_alfresco_module_rm.bulk.BulkOperation;
  * A simple immutable POJO to hold the details of a bulk process
  */
 public record HoldBulkProcessDetails(String bulkStatusId, String creatorInstance, BulkOperation bulkOperation) implements Serializable
-{}
+{
+}

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

@@ -38,10 +38,8 @@ public interface HoldBulkService
     /**
      * Initiates a bulk operation on a hold.
      *
-     * @param holdRef
-     *            The hold reference
-     * @param bulkOperation
-     *            The bulk operation
+     * @param holdRef       The hold reference
+     * @param bulkOperation The bulk operation
      * @return The initial status of the bulk operation
      */
     HoldBulkStatus execute(NodeRef holdRef, BulkOperation bulkOperation);
@@ -49,12 +47,9 @@ public interface HoldBulkService
     /**
      * Cancels a bulk operation.
      *
-     * @param holdRef
-     *            The hold reference
-     * @param bulkStatusId
-     *            The bulk status id
-     * @param bulkCancellationRequest
-     *            The bulk cancellation request
+     * @param holdRef                 The hold reference
+     * @param bulkStatusId            The bulk status id
+     * @param bulkCancellationRequest The bulk cancellation request
      */
     void cancelBulkOperation(NodeRef holdRef, String bulkStatusId, BulkCancellationRequest bulkCancellationRequest);
-}
+}

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

@@ -34,10 +34,6 @@ import java.util.Collections;
 import java.util.Locale;
 import java.util.Optional;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.extensions.surf.util.I18NUtil;
-
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.bulk.BulkBaseService;
 import org.alfresco.module.org_alfresco_module_rm.bulk.BulkCancellationRequest;
@@ -60,6 +56,9 @@ import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.PermissionService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * Implementation of the {@link HoldBulkService} interface.
@@ -89,23 +88,23 @@ public class HoldBulkServiceImpl extends BulkBaseService<HoldBulkStatus> impleme
 
     @Override
     protected BatchProcessWorkProvider<NodeRef> getWorkProvider(BulkOperation bulkOperation,
-            BulkStatusUpdater bulkStatusUpdater, BulkProgress bulkProgress)
+        BulkStatusUpdater bulkStatusUpdater, BulkProgress bulkProgress)
     {
         return new AddToHoldWorkerProvider(bulkOperation, bulkStatusUpdater, bulkProgress,
-                (HoldBulkMonitor) bulkMonitor);
+            (HoldBulkMonitor) bulkMonitor);
     }
 
     @Override
     protected BatchProcessWorker<NodeRef> getWorkerProvider(NodeRef nodeRef, BulkOperation bulkOperation,
-            BulkProgress bulkProgress)
+        BulkProgress bulkProgress)
     {
         try
         {
             HoldBulkOperationType holdBulkOperationType = HoldBulkOperationType.valueOf(bulkOperation.operationType()
-                    .toUpperCase(Locale.ENGLISH));
+                .toUpperCase(Locale.ENGLISH));
             return switch (holdBulkOperationType)
             {
-            case ADD -> new AddToHoldWorkerBatch(nodeRef, bulkProgress);
+                case ADD -> new AddToHoldWorkerBatch(nodeRef, bulkProgress);
             };
         }
         catch (IllegalArgumentException e)
@@ -128,8 +127,8 @@ public class HoldBulkServiceImpl extends BulkBaseService<HoldBulkStatus> impleme
             throw new InvalidArgumentException(I18NUtil.getMessage("rm.hold.not-hold", holdName), null);
         }
         if (ADD.name().equals(bulkOperation.operationType()) && (!AccessStatus.ALLOWED.equals(
-                capabilityService.getCapabilityAccessState(holdRef, RMPermissionModel.ADD_TO_HOLD)) ||
-                permissionService.hasPermission(holdRef, RMPermissionModel.FILING) == AccessStatus.DENIED))
+            capabilityService.getCapabilityAccessState(holdRef, RMPermissionModel.ADD_TO_HOLD)) ||
+            permissionService.hasPermission(holdRef, RMPermissionModel.FILING) == AccessStatus.DENIED))
         {
             throw new AccessDeniedException(I18NUtil.getMessage(MSG_ERR_ACCESS_DENIED));
         }
@@ -142,13 +141,13 @@ public class HoldBulkServiceImpl extends BulkBaseService<HoldBulkStatus> impleme
         if (bulkMonitor instanceof HoldBulkMonitor holdBulkMonitor)
         {
             HoldBulkStatusAndProcessDetails statusAndProcessDetails = holdBulkMonitor.getBulkStatusWithProcessDetails(
-                    holdRef.getId(), bulkStatusId);
+                holdRef.getId(), bulkStatusId);
 
             Optional.ofNullable(statusAndProcessDetails).map(HoldBulkStatusAndProcessDetails::holdBulkProcessDetails)
-                    .map(HoldBulkProcessDetails::bulkOperation).ifPresent(bulkOperation -> {
-                        checkPermissions(holdRef, bulkOperation);
-                        holdBulkMonitor.cancelBulkOperation(bulkStatusId, cancellationRequest);
-                    });
+                .map(HoldBulkProcessDetails::bulkOperation).ifPresent(bulkOperation -> {
+                    checkPermissions(holdRef, bulkOperation);
+                    holdBulkMonitor.cancelBulkOperation(bulkStatusId, cancellationRequest);
+                });
         }
     }
 
@@ -203,7 +202,7 @@ public class HoldBulkServiceImpl extends BulkBaseService<HoldBulkStatus> impleme
         private final BulkStatusUpdater bulkStatusUpdater;
 
         public AddToHoldWorkerProvider(BulkOperation bulkOperation,
-                BulkStatusUpdater bulkStatusUpdater, BulkProgress bulkProgress, HoldBulkMonitor holdBulkMonitor)
+            BulkStatusUpdater bulkStatusUpdater, BulkProgress bulkProgress, HoldBulkMonitor holdBulkMonitor)
         {
             this.searchQuery = bulkOperation.searchQuery();
             this.bulkProgress = bulkProgress;
@@ -244,7 +243,7 @@ public class HoldBulkServiceImpl extends BulkBaseService<HoldBulkStatus> impleme
             if (LOGGER.isDebugEnabled())
             {
                 LOGGER.debug("Processing the next work for the batch processor, skipCount={}, size={}",
-                        searchParams.getSkipCount(), result.getNumberFound());
+                    searchParams.getSkipCount(), result.getNumberFound());
             }
             bulkProgress.currentNodeNumber().addAndGet(batchSize);
             bulkStatusUpdater.update();
@@ -284,4 +283,4 @@ public class HoldBulkServiceImpl extends BulkBaseService<HoldBulkStatus> impleme
     {
         this.nodeService = nodeService;
     }
-}
+}

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

@@ -33,12 +33,15 @@ import java.util.Date;
  * An immutable POJO that contains the status of a hold bulk operation
  */
 public record HoldBulkStatus(String bulkStatusId, Date startTime, Date endTime, long processedItems, long errorsCount,
-        long totalItems, String lastError, boolean isCancelled, String cancellationReason)
-        implements Serializable
+                             long totalItems, String lastError, boolean isCancelled, String cancellationReason)
+    implements Serializable
 {
     public enum Status
     {
-        PENDING("PENDING"), IN_PROGRESS("IN PROGRESS"), DONE("DONE"), CANCELLED("CANCELLED");
+        PENDING("PENDING"),
+        IN_PROGRESS("IN PROGRESS"),
+        DONE("DONE"),
+        CANCELLED("CANCELLED");
 
         private final String value;
 
@@ -72,4 +75,4 @@ public record HoldBulkStatus(String bulkStatusId, Date startTime, Date endTime,
             return Status.DONE.getValue();
         }
     }
-}
+}

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

@@ -30,5 +30,6 @@ package org.alfresco.module.org_alfresco_module_rm.bulk.hold;
  * An immutable POJO that contains the status of a hold bulk operation and the details of the process
  */
 public record HoldBulkStatusAndProcessDetails(HoldBulkStatus holdBulkStatus,
-        HoldBulkProcessDetails holdBulkProcessDetails)
-{}
+                                              HoldBulkProcessDetails holdBulkProcessDetails)
+{
+}

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

@@ -44,17 +44,17 @@ public class HoldBulkStatusUpdater implements BulkStatusUpdater
     public HoldBulkStatusUpdater(HoldBulkMonitor holdBulkMonitor)
     {
         this.task = () -> holdBulkMonitor.updateBulkStatus(
-                new HoldBulkStatus(batchMonitor.getProcessName(),
-                        batchMonitor.getStartTime(),
-                        batchMonitor.getEndTime(),
-                        batchMonitor.getSuccessfullyProcessedEntriesLong() + batchMonitor.getTotalErrorsLong(),
-                        batchMonitor.getTotalErrorsLong(),
-                        batchMonitor.getTotalResultsLong(),
-                        batchMonitor.getLastError(),
-                        holdBulkMonitor.isCancelled(batchMonitor.getProcessName()),
-                        Optional.ofNullable(holdBulkMonitor.getBulkCancellationRequest(batchMonitor.getProcessName()))
-                                .map(BulkCancellationRequest::reason)
-                                .orElse(null)));
+            new HoldBulkStatus(batchMonitor.getProcessName(),
+                batchMonitor.getStartTime(),
+                batchMonitor.getEndTime(),
+                batchMonitor.getSuccessfullyProcessedEntriesLong() + batchMonitor.getTotalErrorsLong(),
+                batchMonitor.getTotalErrorsLong(),
+                batchMonitor.getTotalResultsLong(),
+                batchMonitor.getLastError(),
+                holdBulkMonitor.isCancelled(batchMonitor.getProcessName()),
+                Optional.ofNullable(holdBulkMonitor.getBulkCancellationRequest(batchMonitor.getProcessName()))
+                    .map(BulkCancellationRequest::reason)
+                    .orElse(null)));
     }
 
     @Override
@@ -74,4 +74,4 @@ public class HoldBulkStatusUpdater implements BulkStatusUpdater
             batchMonitor = batchMonitorEvent.getBatchMonitor();
         }
     }
-}
+}

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

@@ -40,10 +40,11 @@ import org.alfresco.rm.rest.api.model.HoldBulkStatusEntry;
 public final class HoldBulkUtils
 {
     private HoldBulkUtils()
-    {}
+    {
+    }
 
     public static HoldBulkStatusEntry toHoldBulkStatusEntry(
-            HoldBulkStatusAndProcessDetails holdBulkStatusAndProcessDetails)
+        HoldBulkStatusAndProcessDetails holdBulkStatusAndProcessDetails)
     {
         HoldBulkStatus bulkStatus = holdBulkStatusAndProcessDetails.holdBulkStatus();
         BulkOperation bulkOperation = holdBulkStatusAndProcessDetails.holdBulkProcessDetails().bulkOperation();
@@ -51,13 +52,13 @@ public final class HoldBulkUtils
         try
         {
             HoldBulkOperation holdBulkOperation = new HoldBulkOperation(
-                    new Query(bulkOperation.searchQuery().getLanguage(),
-                            bulkOperation.searchQuery().getQuery(), bulkOperation.searchQuery().getUserQuery()),
-                    HoldBulkOperationType.valueOf(bulkOperation.operationType()));
+                new Query(bulkOperation.searchQuery().getLanguage(),
+                    bulkOperation.searchQuery().getQuery(), bulkOperation.searchQuery().getUserQuery()),
+                HoldBulkOperationType.valueOf(bulkOperation.operationType()));
             return new HoldBulkStatusEntry(bulkStatus.bulkStatusId(), bulkStatus.startTime(),
-                    bulkStatus.endTime(), bulkStatus.processedItems(), bulkStatus.errorsCount(),
-                    bulkStatus.totalItems(), bulkStatus.lastError(), bulkStatus.getStatus(),
-                    bulkStatus.cancellationReason(), holdBulkOperation);
+                bulkStatus.endTime(), bulkStatus.processedItems(), bulkStatus.errorsCount(),
+                bulkStatus.totalItems(), bulkStatus.lastError(), bulkStatus.getStatus(),
+                bulkStatus.cancellationReason(), holdBulkOperation);
         }
         catch (IllegalArgumentException e)
         {
@@ -65,4 +66,4 @@ public final class HoldBulkUtils
             throw new InvalidArgumentException(errorMsg + bulkOperation.operationType());
         }
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPass.java

@@ -1,51 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package org.alfresco.module.org_alfresco_module_rm.content.cleanser;
-
-import java.io.File;
-
-/**
- * DoD 5220-22M Seven Pass data cleansing implementation.
- * 
- */
-public class ContentCleanserSevenPass extends ContentCleanser522022M
-{
-    /**
-     * @see org.alfresco.module.org_alfresco_module_rm.content.cleanser.ContentCleanser#cleanse(java.io.File)
-     */
-    @Override
-    public void cleanse(File file)
-    {
-        super.cleanse(file);
-        overwrite(file, overwriteZeros);
-        overwrite(file, overwriteZeros);
-        overwrite(file, overwriteOnes);
-        overwrite(file, overwriteRandom);
-
-    }
-}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldService.java

@@ -42,19 +42,18 @@ import org.alfresco.service.cmr.repository.NodeRef;
 public interface HoldService
 {
     /**
-     * Indicates whether the passed node reference is a hold. A hold is a container for a group of frozen object and contains the freeze reason.
+     * Indicates whether the passed node reference is a hold.  A hold is a container for a group of frozen object and contains the freeze
+     * reason.
      *
-     * @param nodeRef
-     *            hold node reference
-     * @return boolean true if hold, false otherwise
+     * @param nodeRef   hold node reference
+     * @return boolean  true if hold, false otherwise
      */
     boolean isHold(NodeRef nodeRef);
 
     /**
      * Gets the list of all the holds within the holds container in the given file plan
      *
-     * @param filePlan
-     *            The {@link NodeRef} of the file plan
+     * @param filePlan The {@link NodeRef} of the file plan
      * @return List of hold node references
      */
     List<NodeRef> getHolds(NodeRef filePlan);
@@ -62,8 +61,7 @@ public interface HoldService
     /**
      * Gets the node reference for the hold with the given name in the given file plan
      *
-     * @param name
-     *            {@link String} The name of the hold
+     * @param name {@link String} The name of the hold
      * @return {@link NodeRef} of the hold with the given name
      */
     NodeRef getHold(NodeRef filePlan, String name);
@@ -71,10 +69,9 @@ public interface HoldService
     /**
      * Gets the list of all the holds within the holds container for the given node reference
      *
-     * @param nodeRef
-     *            The {@link NodeRef} of the record / record folder /active content
-     * @param includedInHold
-     *            <code>true</code> to retrieve the list of hold node references which will include the node reference <code>false</code> to get a list of node references which will not have the given node reference
+     * @param nodeRef The {@link NodeRef} of the record / record folder /active content
+     * @param includedInHold <code>true</code> to retrieve the list of hold node references which will include the node reference
+     * <code>false</code> to get a list of node references which will not have the given node reference
      * @return List of hold node references
      */
     List<NodeRef> heldBy(NodeRef nodeRef, boolean includedInHold);
@@ -82,8 +79,7 @@ public interface HoldService
     /**
      * Gets the list of item node references which are in the given hold
      *
-     * @param hold
-     *            {@link NodeRef} of the hold
+     * @param hold {@link NodeRef} of the hold
      * @return Lost of item {@link NodeRef}s which are in the given hold
      */
     List<NodeRef> getHeld(NodeRef hold);
@@ -91,14 +87,10 @@ public interface HoldService
     /**
      * Creates a hold with the given name, reason and description for the given file plan
      *
-     * @param filePlan
-     *            The {@link NodeRef} of the file plan
-     * @param name
-     *            {@link String} The name of the hold
-     * @param reason
-     *            {@link String} The reason of the hold
-     * @param description
-     *            {@link String} The description of the hold
+     * @param filePlan The {@link NodeRef} of the file plan
+     * @param name {@link String} The name of the hold
+     * @param reason {@link String} The reason of the hold
+     * @param description {@link String} The description of the hold
      * @return The {@link NodeRef} of the created hold
      */
     NodeRef createHold(NodeRef filePlan, String name, String reason, String description);
@@ -106,8 +98,7 @@ public interface HoldService
     /**
      * Gets the hold reason for the given hold node reference
      *
-     * @param hold
-     *            The {@link NodeRef} of the hold
+     * @param hold The {@link NodeRef} of the hold
      * @return {@link String} The reason of the hold
      */
     String getHoldReason(NodeRef hold);
@@ -115,138 +106,111 @@ public interface HoldService
     /**
      * Sets the hold reason
      *
-     * @param hold
-     *            The {@link NodeRef} of the hold
-     * @param reason
-     *            {@link String} The reason for the hold
+     * @param hold The {@link NodeRef} of the hold
+     * @param reason {@link String} The reason for the hold
      */
     void setHoldReason(NodeRef hold, String reason);
 
     /**
      * Sets the reason for the hold deletion
      *
-     * @param hold
-     *            The {@link NodeRef} of the hold
-     * @param reason
-     *            {@link String} The reason for the hold
+     * @param hold The {@link NodeRef} of the hold
+     * @param reason {@link String} The reason for the hold
      */
     void setHoldDeletionReason(NodeRef hold, String reason);
 
     /**
      * Updates a hold with the given name, reason and description
      *
-     * @param hold
-     *            The {@link NodeRef} of the hold
-     * @param name
-     *            {@link String} The name of the hold
-     * @param reason
-     *            {@link String} The reason of the hold
-     * @param description
-     *            {@link String} The description of the hold
+     * @param hold The {@link NodeRef} of the hold
+     * @param name {@link String} The name of the hold
+     * @param reason {@link String} The reason of the hold
+     * @param description {@link String} The description of the hold
      */
     void updateHold(NodeRef hold, String name, String reason, String description);
 
     /**
      * Deletes the hold
      *
-     * @param hold
-     *            The {@link NodeRef} of the hold
+     * @param hold The {@link NodeRef} of the hold
      */
     void deleteHold(NodeRef hold);
 
     /**
      * Adds the item to the given hold
      *
-     * @param hold
-     *            The {@link NodeRef} of the hold
-     * @param nodeRef
-     *            The {@link NodeRef} of the record / record folder / active content which will be added to the given hold
+     * @param hold    The {@link NodeRef} of the hold
+     * @param nodeRef The {@link NodeRef} of the record / record folder / active content which will be added to the given hold
      */
     void addToHold(NodeRef hold, NodeRef nodeRef);
 
     /**
      * Adds the items to the the given hold
      *
-     * @param hold
-     *            The {@link NodeRef} of the hold to which the items will be added
-     * @param nodeRefs
-     *            The item {@link NodeRef}s which will be added to the hold
+     * @param hold The {@link NodeRef} of the hold to which the items will be added
+     * @param nodeRefs The item {@link NodeRef}s which will be added to the hold
      */
     void addToHold(NodeRef hold, List<NodeRef> nodeRefs);
 
     /**
      * Adds the item to the given list of holds
      *
-     * @param holds
-     *            The list of {@link NodeRef}s of the holds
-     * @param nodeRef
-     *            The {@link NodeRef} of the record / record folder / active content which will be added to the given holds
+     * @param holds The list of {@link NodeRef}s of the holds
+     * @param nodeRef The {@link NodeRef} of the record / record folder / active content which will be added to the given holds
      */
     void addToHolds(List<NodeRef> holds, NodeRef nodeRef);
 
     /**
      * Adds the given items to the given list of holds
      *
-     * @param holds
-     *            List of holds to which the given items will be added
-     * @param nodeRefs
-     *            The list of items which will be added to the given holds
+     * @param holds List of holds to which the given items will be added
+     * @param nodeRefs The list of items which will be added to the given holds
      */
     void addToHolds(List<NodeRef> holds, List<NodeRef> nodeRefs);
 
     /**
      * Removes the record from the given hold
      *
-     * @param hold
-     *            The {@link NodeRef} of the hold
-     * @param nodeRef
-     *            The {@link NodeRef} of the record / record folder which will be removed from the given hold
+     * @param hold The {@link NodeRef} of the hold
+     * @param nodeRef The {@link NodeRef} of the record / record folder which will be removed from the given hold
      */
     void removeFromHold(NodeRef hold, NodeRef nodeRef);
 
     /**
      * Removes the given items from the given hold
      *
-     * @param hold
-     *            The hold {@link NodeRef} from which the given items will be removed
-     * @param nodeRefs
-     *            The list of items which will be removed from the given holds
+     * @param hold The hold {@link NodeRef} from which the given items will be removed
+     * @param nodeRefs The list of items which will be removed from the given holds
      */
     void removeFromHold(NodeRef hold, List<NodeRef> nodeRefs);
 
     /**
      * Removes the item from the given list of hold
      *
-     * @param holds
-     *            The list {@link NodeRef}s of the holds
-     * @param nodeRef
-     *            The {@link NodeRef} of the record / record folder which will be removed from the given holds
+     * @param holds The list {@link NodeRef}s of the holds
+     * @param nodeRef The {@link NodeRef} of the record / record folder which will be removed from the given holds
      */
     void removeFromHolds(List<NodeRef> holds, NodeRef nodeRef);
 
     /**
      * Removes the items from the given holds
      *
-     * @param holds
-     *            List of hold {@link NodeRef}s from which the items will be removed
-     * @param nodeRefs
-     *            List of item {@link NodeRef}s which will be removed from the given holds
+     * @param holds List of hold {@link NodeRef}s from which the items will be removed
+     * @param nodeRefs List of item {@link NodeRef}s which will be removed from the given holds
      */
     void removeFromHolds(List<NodeRef> holds, List<NodeRef> nodeRefs);
 
     /**
      * Removes the given {@link NodeRef} from all the holds
      *
-     * @param nodeRef
-     *            The {@link NodeRef} of item which will be removed from all the holds
+     * @param nodeRef The {@link NodeRef} of item which will be removed from all the holds
      */
     void removeFromAllHolds(NodeRef nodeRef);
 
     /**
      * Removes the given list of {@link NodeRef}s from all the holds
      *
-     * @param nodeRefs
-     *            The list of item {@link NodeRef}s which will be removed from all the holds
+     * @param nodeRefs The list of item {@link NodeRef}s which will be removed from all the holds
      */
     void removeFromAllHolds(List<NodeRef> nodeRefs);
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java

@@ -43,12 +43,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.ListUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.extensions.surf.util.I18NUtil;
-
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
@@ -85,6 +79,11 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.util.ParameterCheck;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.ListUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * Hold service implementation
@@ -94,9 +93,9 @@ import org.alfresco.util.ParameterCheck;
  */
 @BehaviourBean
 public class HoldServiceImpl extends ServiceBaseImpl
-        implements HoldService,
-        NodeServicePolicies.BeforeDeleteNodePolicy,
-        RecordsManagementModel
+                             implements HoldService,
+                                        NodeServicePolicies.BeforeDeleteNodePolicy,
+                                        RecordsManagementModel
 {
     /** Logger */
     private static Log logger = LogFactory.getLog(HoldServiceImpl.class);
@@ -130,8 +129,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Set the file plan service
      *
-     * @param filePlanService
-     *            the file plan service
+     * @param filePlanService the file plan service
      */
     public void setFilePlanService(FilePlanService filePlanService)
     {
@@ -141,8 +139,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Set the record service
      *
-     * @param recordService
-     *            the record service
+     * @param recordService the record service
      */
     public void setRecordService(RecordService recordService)
     {
@@ -152,8 +149,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Set the record folder service
      *
-     * @param recordFolderService
-     *            the record folder service
+     * @param recordFolderService   the record folder service
      */
     public void setRecordFolderService(RecordFolderService recordFolderService)
     {
@@ -163,17 +159,15 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Set the permission service
      *
-     * @param permissionService
-     *            the permission services
+     * @param permissionService the permission services
      */
     public void setPermissionService(PermissionService permissionService)
     {
         this.permissionService = permissionService;
     }
 
-    /**
-     * @param capabilityService
-     *            capability service
+     /**
+     * @param capabilityService capability service
      */
     public void setCapabilityService(CapabilityService capabilityService)
     {
@@ -193,8 +187,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Sets the policy component instance
      *
-     * @param policyComponent
-     *            The policy component instance
+     * @param policyComponent The policy component instance
      */
     public void setPolicyComponent(PolicyComponent policyComponent)
     {
@@ -235,7 +228,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
      *
      * @see org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy#beforeDeleteNode(org.alfresco.service.cmr.repository.NodeRef)
      */
-    @Behaviour(kind = BehaviourKind.CLASS, type = "rma:hold", notificationFrequency = NotificationFrequency.EVERY_EVENT)
+    @Behaviour(kind=BehaviourKind.CLASS, type="rma:hold", notificationFrequency=NotificationFrequency.EVERY_EVENT)
     @Override
     public void beforeDeleteNode(final NodeRef hold)
     {
@@ -243,14 +236,15 @@ public class HoldServiceImpl extends ServiceBaseImpl
         {
             checkPermissionsForDeleteHold(hold);
 
-            RunAsWork<Void> work = new RunAsWork<Void>() {
+            RunAsWork<Void> work = new RunAsWork<Void>()
+            {
                 @Override
                 public Void doWork()
                 {
                     List<NodeRef> frozenNodes = getHeld(hold);
                     for (NodeRef frozenNode : frozenNodes)
                     {
-                        // set in transaction cache in order not to trigger update policy when removing the child association
+                        //set in transaction cache in order not to trigger update policy when removing the child association
                         transactionalResourceHelper.getSet("frozen").add(frozenNode);
                         removeFreezeAspect(frozenNode, 1);
                     }
@@ -264,7 +258,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
     }
 
     /**
-     * Helper method removes the freeze aspect from the record and record folder if it is no longer in a hold.
+     * Helper method removes the freeze aspect from the record and record folder if it is no longer
+     * in a hold.
      *
      * @param nodeRef
      */
@@ -276,7 +271,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
             if (nodeService.hasAspect(nodeRef, ASPECT_FROZEN))
             {
                 // remove the freeze aspect from the node
-                // set in transaction cache in order not to trigger update policy when removing the aspect
+                //set in transaction cache in order not to trigger update policy when removing the aspect
                 transactionalResourceHelper.getSet("frozen").add(nodeRef);
                 nodeService.removeAspect(nodeRef, ASPECT_FROZEN);
             }
@@ -292,7 +287,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
                         if (recordsOtherHolds.size() == index)
                         {
                             // remove the freeze aspect from the node
-                            // set in transaction cache in order not to trigger update policy when removing the aspect
+                            //set in transaction cache in order not to trigger update policy when removing the aspect
                             transactionalResourceHelper.getSet("frozen").add(record);
                             nodeService.removeAspect(record, ASPECT_FROZEN);
                         }
@@ -364,7 +359,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
             if (!CollectionUtils.isEmpty(filePlans))
             {
                 final List<NodeRef> holdsNotIncludingNodeRef = new ArrayList<>();
-                filePlans.forEach(filePlan -> {
+                filePlans.forEach(filePlan ->
+                {
                     // invert list to get list of holds that do not contain this node
                     final List<NodeRef> allHolds = getHolds(filePlan);
                     holdsNotIncludingNodeRef.addAll(ListUtils.subtract(allHolds, new ArrayList<>(holdsIncludingNodeRef)));
@@ -383,8 +379,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Helper method to get holds that are direct parents of the given node.
      *
-     * @param nodeRef
-     *            node reference
+     * @param nodeRef   node reference
      * @return Set<{@link NodeRef}> set of parent holds
      */
     private Set<NodeRef> getParentHolds(NodeRef nodeRef)
@@ -497,7 +492,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
         if (nodeService.exists(hold) && isHold(hold))
         {
             // get the reason
-            reason = (String) nodeService.getProperty(hold, PROP_HOLD_REASON);
+            reason = (String)nodeService.getProperty(hold, PROP_HOLD_REASON);
         }
 
         return reason;
@@ -578,8 +573,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Helper method to check if user has correct permissions to delete hold
      *
-     * @param hold
-     *            hold to be deleted
+     * @param hold hold to be deleted
      */
     private void checkPermissionsForDeleteHold(NodeRef hold)
     {
@@ -598,7 +592,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
                 }
                 else
                 {
-                    permission = PermissionService.READ;
+                    permission =  PermissionService.READ;
                 }
 
                 if (permissionService.hasPermission(nodeRef, permission) == AccessStatus.DENIED)
@@ -675,7 +669,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
             }
 
             if (!AccessStatus.ALLOWED.equals(
-                    capabilityService.getCapabilityAccessState(hold, RMPermissionModel.ADD_TO_HOLD)))
+                            capabilityService.getCapabilityAccessState(hold, RMPermissionModel.ADD_TO_HOLD)))
             {
                 throw new AccessDeniedException(I18NUtil.getMessage(MSG_ERR_ACCESS_DENIED));
             }
@@ -686,7 +680,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
                 // fire before add to hold policy
                 invokeBeforeAddToHold(hold, nodeRef);
                 // run as system to ensure we have all the appropriate permissions to perform the manipulations we require
-                authenticationUtil.runAsSystem((RunAsWork<Void>) () -> {
+                authenticationUtil.runAsSystem((RunAsWork<Void>) () ->
+                {
                     // gather freeze properties
                     final Map<QName, Serializable> props = new HashMap<>(2);
                     props.put(PROP_FROZEN_AT, new Date());
@@ -695,7 +690,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
                     addFrozenAspect(nodeRef, props);
 
                     // Link the record to the hold
-                    // set in transaction cache in order not to trigger update policy when adding the association
+                    //set in transaction cache in order not to trigger update policy when adding the association
                     transactionalResourceHelper.getSet("frozen").add(nodeRef);
                     nodeService.addChild(hold, nodeRef, ASSOC_FROZEN_CONTENT, ASSOC_FROZEN_CONTENT);
                     // get the documents primary parent assoc
@@ -721,8 +716,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Check if the given node is eligible to be added into a hold
      *
-     * @param nodeRef
-     *            the node to be checked
+     * @param nodeRef the node to be checked
      */
     private void checkNodeCanBeAddedToHold(NodeRef nodeRef)
     {
@@ -754,16 +748,14 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Add Frozen aspect only if node isn't already frozen
      *
-     * @param nodeRef
-     *            node on which aspect will be added
-     * @param props
-     *            aspect properties map
+     * @param nodeRef node on which aspect will be added
+     * @param props aspect properties map
      */
     private void addFrozenAspect(NodeRef nodeRef, Map<QName, Serializable> props)
     {
         if (!nodeService.hasAspect(nodeRef, ASPECT_FROZEN))
         {
-            // set in transaction cache in order not to trigger update policy when adding the aspect
+            //set in transaction cache in order not to trigger update policy when adding the aspect
             transactionalResourceHelper.getSet("frozen").add(nodeRef);
             // add freeze aspect
             nodeService.addAspect(nodeRef, ASPECT_FROZEN, props);
@@ -853,9 +845,10 @@ public class HoldServiceImpl extends ServiceBaseImpl
                     invokeBeforeRemoveFromHold(hold, nodeRef);
                     // run as system so we don't run into further permission issues
                     // we already know we have to have the correct capability to get here
-                    authenticationUtil.runAsSystem((RunAsWork<Void>) () -> {
+                    authenticationUtil.runAsSystem((RunAsWork<Void>) () ->
+                    {
                         // remove from hold
-                        // set in transaction cache in order not to trigger update policy when removing the child association
+                        //set in transaction cache in order not to trigger update policy when removing the child association
                         transactionalResourceHelper.getSet("frozen").add(nodeRef);
                         nodeService.removeChild(hold, nodeRef);
 
@@ -866,7 +859,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
             }
 
             // run as system as we can't be sure if have remove aspect rights on node
-            authenticationUtil.runAsSystem((RunAsWork<Void>) () -> {
+            authenticationUtil.runAsSystem((RunAsWork<Void>) () ->
+            {
                 removeFreezeAspect(nodeRef, 0);
                 return null;
             });
@@ -927,12 +921,9 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Invoke beforeCreateHold policy
      *
-     * @param nodeRef
-     *            node reference
-     * @param name
-     *            hold name
-     * @param reason
-     *            hold reason
+     * @param nodeRef node reference
+     * @param name    hold name
+     * @param reason  hold reason
      */
     protected void invokeBeforeCreateHold(NodeRef nodeRef, String name, String reason)
     {
@@ -944,8 +935,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Invoke onCreateHold policy
      *
-     * @param nodeRef
-     *            node reference
+     * @param nodeRef node reference
      */
     protected void invokeOnCreateHold(NodeRef nodeRef)
     {
@@ -956,8 +946,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Invoke beforeDeleteHold policy
      *
-     * @param nodeRef
-     *            node reference
+     * @param nodeRef node reference
      */
     protected void invokeBeforeDeleteHold(NodeRef nodeRef)
     {
@@ -968,10 +957,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Invoke onDeleteHold policy
      *
-     * @param holdName
-     *            name of the hold
-     * @param classQNames
-     *            hold types and aspects
+     * @param holdName name of the hold
+     * @param classQNames hold types and aspects
      */
     protected void invokeOnDeleteHold(String holdName, Set<QName> classQNames)
     {
@@ -984,10 +971,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Invoke beforeAddToHold policy
      *
-     * @param hold
-     *            hold node reference
-     * @param contentNodeRef
-     *            content node reference
+     * @param hold           hold node reference
+     * @param contentNodeRef content node reference
      */
     protected void invokeBeforeAddToHold(NodeRef hold, NodeRef contentNodeRef)
     {
@@ -998,10 +983,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Invoke onAddToHold policy
      *
-     * @param hold
-     *            hold node reference
-     * @param contentNodeRef
-     *            content node reference
+     * @param hold           hold node reference
+     * @param contentNodeRef content node reference
      */
     protected void invokeOnAddToHold(NodeRef hold, NodeRef contentNodeRef)
     {
@@ -1012,10 +995,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Invoke beforeRemoveFromHold policy
      *
-     * @param hold
-     *            hold node reference
-     * @param contentNodeRef
-     *            content node reference
+     * @param hold           hold node reference
+     * @param contentNodeRef content node reference
      */
     protected void invokeBeforeRemoveFromHold(NodeRef hold, NodeRef contentNodeRef)
     {
@@ -1026,10 +1007,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /**
      * Invoke onRemoveFromHold policy
      *
-     * @param hold
-     *            hold node reference
-     * @param contentNodeRef
-     *            content node reference
+     * @param hold           hold node reference
+     * @param contentNodeRef content node reference
      */
     protected void invokeOnRemoveFromHold(NodeRef hold, NodeRef contentNodeRef)
     {
@@ -1037,4 +1016,4 @@ public class HoldServiceImpl extends ServiceBaseImpl
         policy.onRemoveFromHold(hold, contentNodeRef);
 
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServicePolicies.java

@@ -45,14 +45,11 @@ public interface HoldServicePolicies
     interface BeforeCreateHoldPolicy extends ClassPolicy
     {
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeCreateHold");
-
         /**
          * Called before a hold is created.
          *
-         * @param name
-         *            name of the hold to be created
-         * @param reason
-         *            reason for the hold to be created
+         * @param name   name of the hold to be created
+         * @param reason reason for the hold to be created
          */
         void beforeCreateHold(String name, String reason);
     }
@@ -60,12 +57,10 @@ public interface HoldServicePolicies
     interface OnCreateHoldPolicy extends ClassPolicy
     {
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateHold");
-
         /**
          * Called when a hold is created.
          *
-         * @param hold
-         *            node reference
+         * @param hold node reference
          */
         void onCreateHold(NodeRef hold);
     }
@@ -73,12 +68,10 @@ public interface HoldServicePolicies
     interface BeforeDeleteHoldPolicy extends ClassPolicy
     {
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeDeleteHold");
-
         /**
          * Called before a hold is deleted.
          *
-         * @param hold
-         *            node reference
+         * @param hold node reference
          */
         void beforeDeleteHold(NodeRef hold);
     }
@@ -90,8 +83,7 @@ public interface HoldServicePolicies
         /**
          * Called when a hold is deleted.
          *
-         * @param holdname
-         *            name of the deleted hold
+         * @param holdname name of the deleted hold
          */
         void onDeleteHold(String holdname);
     }
@@ -103,10 +95,8 @@ public interface HoldServicePolicies
         /**
          * Called before adding content to hold.
          *
-         * @param hold
-         *            the hold to be added into
-         * @param contentNodeRef
-         *            the item to be added to hold
+         * @param hold           the hold to be added into
+         * @param contentNodeRef the item to be added to hold
          */
         void beforeAddToHold(NodeRef hold, NodeRef contentNodeRef);
     }
@@ -118,10 +108,8 @@ public interface HoldServicePolicies
         /**
          * Called when content is added to hold.
          *
-         * @param hold
-         *            the hold to be added into
-         * @param contentNodeRef
-         *            the item to be added to hold
+         * @param hold           the hold to be added into
+         * @param contentNodeRef the item to be added to hold
          */
         void onAddToHold(NodeRef hold, NodeRef contentNodeRef);
     }
@@ -133,10 +121,8 @@ public interface HoldServicePolicies
         /**
          * Called before removing content from hold.
          *
-         * @param hold
-         *            the hold to be removed from
-         * @param contentNodeRef
-         *            the item to be removed from hold
+         * @param hold           the hold to be removed from
+         * @param contentNodeRef the item to be removed from hold
          */
         void beforeRemoveFromHold(NodeRef hold, NodeRef contentNodeRef);
     }
@@ -148,12 +134,10 @@ public interface HoldServicePolicies
         /**
          * Called when removing content from hold.
          *
-         * @param hold
-         *            the hold to be removed from
-         * @param contentNodeRef
-         *            the item to be removed from hold
+         * @param hold           the hold to be removed from
+         * @param contentNodeRef the item to be removed from hold
          */
         void onRemoveFromHold(NodeRef hold, NodeRef contentNodeRef);
     }
 
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java

@@ -36,9 +36,9 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
-
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
+
 import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -50,8 +50,10 @@ import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.PersonService;
 
+
 /**
- * The Disposition Lifecycle Job Finds all disposition action nodes which are for disposition actions specified Where asOf > now OR dispositionEventsEligible = true; Runs the cut off or retain action for eligible records.
+ * The Disposition Lifecycle Job Finds all disposition action nodes which are for disposition actions specified Where
+ * asOf  > now OR dispositionEventsEligible = true; Runs the cut off or retain action for eligible records.
  *
  * @author mrogers
  * @author Roy Wetherall
@@ -86,8 +88,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     private FreezeService freezeService;
 
     /**
-     * @param freezeService
-     *            freeze service
+     * @param freezeService freeze service
      */
     public void setFreezeService(FreezeService freezeService)
     {
@@ -97,8 +98,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     /**
      * List of disposition actions to automatically execute when eligible.
      *
-     * @param dispositionActions
-     *            disposition actions
+     * @param dispositionActions disposition actions
      */
     public void setDispositionActions(List<String> dispositionActions)
     {
@@ -111,8 +111,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     }
 
     /**
-     * @param recordsManagementActionService
-     *            records management action service
+     * @param recordsManagementActionService records management action service
      */
     public void setRecordsManagementActionService(RecordsManagementActionService recordsManagementActionService)
     {
@@ -120,8 +119,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     }
 
     /**
-     * @param nodeService
-     *            node service
+     * @param nodeService node service
      */
     public void setNodeService(NodeService nodeService)
     {
@@ -129,8 +127,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     }
 
     /**
-     * @param searchService
-     *            search service
+     * @param searchService search service
      */
     public void setSearchService(SearchService searchService)
     {
@@ -218,10 +215,13 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
 
                 // execute search
                 ResultSet results = searchService.query(params);
-                if (results != null)
+                if(results != null)
                 {
                     // filtering out the hold/freezed cases from the result set
-                    resultNodes = results.getNodeRefs().stream().filter(node -> nodeService.getPrimaryParent(node) == null ? !freezeService.isFrozenOrHasFrozenChildren(node) : !freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList());
+                    resultNodes =
+                            results.getNodeRefs().stream().filter(node -> nodeService.getPrimaryParent(node) == null ?
+                                    !freezeService.isFrozenOrHasFrozenChildren(node) :
+                                    !freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList());
                 }
                 hasMore = results.hasMore();
                 skipCount += resultNodes.size(); // increase by page size
@@ -246,8 +246,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     /**
      * Helper method that executes a disposition action
      *
-     * @param actionNodes
-     *            - the disposition actions to execute
+     * @param actionNodes - the disposition actions to execute
      */
     private void executeAction(final List<NodeRef> actionNodes)
     {
@@ -278,7 +277,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
                 {
                     // execute disposition action
                     recordsManagementActionService
-                            .executeRecordsManagementAction(parent.getParentRef(), dispAction, props);
+                        .executeRecordsManagementAction(parent.getParentRef(), dispAction, props);
 
                     log.debug("Processed action: " + dispAction + "on" + parent);
 
@@ -303,4 +302,4 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     {
         this.personService = personService;
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java

@@ -30,9 +30,6 @@ package org.alfresco.module.org_alfresco_module_rm.job;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.job.publish.PublishExecutor;
 import org.alfresco.module.org_alfresco_module_rm.job.publish.PublishExecutorRegistry;
@@ -45,9 +42,12 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.QueryConsistency;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Job to publish any pending updates on marked node references.
@@ -75,8 +75,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
     private BehaviourFilter behaviourFilter;
 
     /**
-     * @param nodeService
-     *            node service
+     * @param nodeService   node service
      */
     public void setNodeService(NodeService nodeService)
     {
@@ -84,8 +83,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
     }
 
     /**
-     * @param searchService
-     *            search service
+     * @param searchService search service
      */
     public void setSearchService(SearchService searchService)
     {
@@ -93,8 +91,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
     }
 
     /**
-     * @param publishExecutorRegistry
-     *            public executor registry
+     * @param publishExecutorRegistry   public executor registry
      */
     public void setPublishExecutorRegistry(PublishExecutorRegistry publishExecutorRegistry)
     {
@@ -102,8 +99,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
     }
 
     /**
-     * @param behaviourFilter
-     *            behaviour filter
+     * @param behaviourFilter   behaviour filter
      */
     public void setBehaviourFilter(BehaviourFilter behaviourFilter)
     {
@@ -111,8 +107,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
     }
 
     /**
-     * @param dictionaryService
-     *            dictionary service
+     * @param dictionaryService dictionary service
      */
     public void setDictionaryService(DictionaryService dictionaryService)
     {
@@ -129,7 +124,8 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
             logger.debug("Job Starting");
         }
 
-        AuthenticationUtil.runAs(new RunAsWork<Object>() {
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+        {
             public Object doWork()
             {
                 if (rmLoaded())
@@ -142,7 +138,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
                     {
                         if (nodeService.exists(nodeRef))
                         {
-                            boolean publishing = ((Boolean) nodeService.getProperty(nodeRef, PROP_PUBLISH_IN_PROGRESS)).booleanValue();
+                            boolean publishing = ((Boolean)nodeService.getProperty(nodeRef, PROP_PUBLISH_IN_PROGRESS)).booleanValue();
                             if (!publishing)
                             {
                                 // Mark the update node as publishing in progress
@@ -160,6 +156,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
                                     // Publish updates
                                     publishUpdates(nodeRef);
 
+
                                     if (logger.isDebugEnabled())
                                     {
                                         Date end = new Date();
@@ -192,7 +189,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
     /**
      * Helper method to determine whether the RM content model has been loaded yet.
      *
-     * @return boolean true if RM content model loaded, false otherwise
+     * @return  boolean true if RM content model loaded, false otherwise
      */
     private boolean rmLoaded()
     {
@@ -200,7 +197,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
 
         // ensure that the rm content model has been loaded
         if (dictionaryService != null &&
-                dictionaryService.getAspect(ASPECT_UNPUBLISHED_UPDATE) != null)
+            dictionaryService.getAspect(ASPECT_UNPUBLISHED_UPDATE) != null)
         {
             result = true;
         }
@@ -210,36 +207,37 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
 
     /**
      * Get a list of the nodes with updates pending publish
-     * 
-     * @return List<NodeRef> list of node refences with updates pending publication
+     * @return  List<NodeRef>   list of node refences with updates pending publication
      */
     private List<NodeRef> getUpdatedNodes()
     {
-        RetryingTransactionCallback<List<NodeRef>> execution = new RetryingTransactionHelper.RetryingTransactionCallback<List<NodeRef>>() {
-            @Override
-            public List<NodeRef> execute()
+        RetryingTransactionCallback<List<NodeRef>> execution =
+            new RetryingTransactionHelper.RetryingTransactionCallback<List<NodeRef>>()
             {
-                // Build the query string
-                StringBuilder sb = new StringBuilder();
-                sb.append("ASPECT:\"rma:").append(ASPECT_UNPUBLISHED_UPDATE.getLocalName()).append("\"");
-                String query = sb.toString();
-
-                if (logger.isDebugEnabled())
+                @Override
+                public List<NodeRef> execute()
                 {
-                    logger.debug("Executing query " + query);
-                }
+                    // Build the query string
+                    StringBuilder sb = new StringBuilder();
+                    sb.append("ASPECT:\"rma:").append(ASPECT_UNPUBLISHED_UPDATE.getLocalName()).append("\"");
+                    String query = sb.toString();
 
-                // Execute query to find updates awaiting publishing
-                List<NodeRef> resultNodes = null;
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug("Executing query " + query);
+                    }
 
-                SearchParameters searchParameters = new SearchParameters();
-                searchParameters.setQuery(query);
-                searchParameters.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
-                searchParameters.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+                    // Execute query to find updates awaiting publishing
+                    List<NodeRef> resultNodes = null;
 
-                try
-                {
-                    ResultSet results = searchService.query(searchParameters);
+                    SearchParameters searchParameters = new SearchParameters();
+                    searchParameters.setQuery(query);
+                    searchParameters.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+                    searchParameters.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+
+                    try
+                    {
+                        ResultSet results = searchService.query(searchParameters);
                     try
                     {
                         resultNodes = results.getNodeRefs();
@@ -248,169 +246,170 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter
                     {
                         results.close();
                     }
-                }
-                catch (AlfrescoRuntimeException exception)
-                {
+                    }
+                    catch (AlfrescoRuntimeException exception)
+                    {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("Error executing query, " + exception.getMessage());
+                        }
+                        throw exception;
+                    }
+
                     if (logger.isDebugEnabled())
                     {
-                        logger.debug("Error executing query, " + exception.getMessage());
+                        logger.debug("Found " + resultNodes.size() + " disposition action definitions updates awaiting publishing.");
                     }
-                    throw exception;
-                }
 
-                if (logger.isDebugEnabled())
-                {
-                    logger.debug("Found " + resultNodes.size() + " disposition action definitions updates awaiting publishing.");
+                    return resultNodes;
                 }
-
-                return resultNodes;
-            }
-        };
+            };
         return retryingTransactionHelper.doInTransaction(execution, true);
     }
 
     /**
-     * Mark the node as publish in progress. This is often used as a marker to prevent any further updates to a node.
-     * 
-     * @param nodeRef
-     *            node reference
+     * Mark the node as publish in progress.  This is often used as a marker to prevent any further updates
+     * to a node.
+     * @param nodeRef   node reference
      */
     private void markPublishInProgress(final NodeRef nodeRef)
     {
-        RetryingTransactionHelper.RetryingTransactionCallback<Void> execution = new RetryingTransactionHelper.RetryingTransactionCallback<Void>() {
-            @Override
-            public Void execute()
+        RetryingTransactionHelper.RetryingTransactionCallback<Void> execution =
+            new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
             {
-                if (logger.isDebugEnabled())
+                @Override
+                public Void execute()
                 {
-                    logger.debug("Marking updated node as publish in progress. (node=" + nodeRef.toString() + ")");
-                }
-
-                behaviourFilter.disableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
-                try
-                {
-                    if (nodeService.exists(nodeRef))
+                    if (logger.isDebugEnabled())
                     {
-                        // Mark the node as publish in progress
-                        nodeService.setProperty(nodeRef, PROP_PUBLISH_IN_PROGRESS, true);
+                        logger.debug("Marking updated node as publish in progress. (node=" + nodeRef.toString() + ")");
                     }
+
+                    behaviourFilter.disableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
+                    try
+                    {
+                        if (nodeService.exists(nodeRef))
+                        {
+                            // Mark the node as publish in progress
+                            nodeService.setProperty(nodeRef, PROP_PUBLISH_IN_PROGRESS, true);
+                        }
+                    }
+                    finally
+                    {
+                        behaviourFilter.enableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
+                    }
+                    return null;
                 }
-                finally
-                {
-                    behaviourFilter.enableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
-                }
-                return null;
-            }
-        };
+            };
         retryingTransactionHelper.doInTransaction(execution);
     }
 
     /**
      * Publish the updates made to the node.
-     * 
-     * @param nodeRef
-     *            node reference
+     * @param nodeRef   node reference
      */
     private void publishUpdates(final NodeRef nodeRef)
     {
-        RetryingTransactionHelper.RetryingTransactionCallback<Void> execution = new RetryingTransactionHelper.RetryingTransactionCallback<Void>() {
-            @Override
-            public Void execute()
+        RetryingTransactionHelper.RetryingTransactionCallback<Void> execution =
+            new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
             {
-                behaviourFilter.disableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
-                try
+                @Override
+                public Void execute()
                 {
-                    // Get the update to value for the node
-                    String updateTo = (String) nodeService.getProperty(nodeRef, PROP_UPDATE_TO);
-
-                    if (updateTo != null)
+                    behaviourFilter.disableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
+                    try
                     {
-                        if (logger.isDebugEnabled())
-                        {
-                            logger.debug("Node update to " + updateTo + " (noderef=" + nodeRef.toString() + ")");
-                        }
+                        // Get the update to value for the node
+                        String updateTo = (String)nodeService.getProperty(nodeRef, PROP_UPDATE_TO);
 
-                        // Get the publish executor
-                        PublishExecutor executor = publishExecutorRegistry.get(updateTo);
-                        if (executor == null)
+                        if (updateTo != null)
                         {
                             if (logger.isDebugEnabled())
                             {
-                                logger.debug("Unable to find a corresponding publish executor. (noderef=" + nodeRef.toString() + ", updateTo=" + updateTo + ")");
+                                logger.debug("Node update to " +  updateTo + " (noderef=" + nodeRef.toString() + ")");
                             }
-                            throw new AlfrescoRuntimeException("Unable to find a corresponding publish executor. (noderef=" + nodeRef.toString() + ", updateTo=" + updateTo + ")");
+
+                            // Get the publish executor
+                            PublishExecutor executor = publishExecutorRegistry.get(updateTo);
+                            if (executor == null)
+                            {
+                                if (logger.isDebugEnabled())
+                                {
+                                    logger.debug("Unable to find a corresponding publish executor. (noderef=" + nodeRef.toString() + ", updateTo=" + updateTo + ")");
+                                }
+                                throw new AlfrescoRuntimeException("Unable to find a corresponding publish executor. (noderef=" + nodeRef.toString() + ", updateTo=" + updateTo + ")");
+                            }
+
+                            if (logger.isDebugEnabled())
+                            {
+                                logger.debug("Attempting to publish updates. (nodeRef=" + nodeRef.toString() + ")");
+                            }
+
+                            // Publish
+                            executor.publish(nodeRef);
                         }
+                        else
+                        {
+                            if (logger.isDebugEnabled())
+                            {
+                                logger.debug("Unable to publish, because publish executor is not set.");
+                            }
+                        }
+
+                        // Remove the unpublished update aspect
+                        nodeService.removeAspect(nodeRef, ASPECT_UNPUBLISHED_UPDATE);
 
                         if (logger.isDebugEnabled())
                         {
-                            logger.debug("Attempting to publish updates. (nodeRef=" + nodeRef.toString() + ")");
-                        }
-
-                        // Publish
-                        executor.publish(nodeRef);
-                    }
-                    else
-                    {
-                        if (logger.isDebugEnabled())
-                        {
-                            logger.debug("Unable to publish, because publish executor is not set.");
+                            logger.debug("Publish updates complete. (nodeRef=" + nodeRef.toString() + ")");
                         }
                     }
-
-                    // Remove the unpublished update aspect
-                    nodeService.removeAspect(nodeRef, ASPECT_UNPUBLISHED_UPDATE);
-
-                    if (logger.isDebugEnabled())
+                    finally
                     {
-                        logger.debug("Publish updates complete. (nodeRef=" + nodeRef.toString() + ")");
+                        behaviourFilter.enableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
                     }
-                }
-                finally
-                {
-                    behaviourFilter.enableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
-                }
 
-                return null;
-            }
-        };
+                    return null;
+                }
+            };
         retryingTransactionHelper.doInTransaction(execution);
     }
 
     /**
      * Unmark node as publish in progress, assuming publish failed.
-     * 
-     * @param nodeRef
-     *            node reference
+     * @param nodeRef   node reference
      */
     private void unmarkPublishInProgress(final NodeRef nodeRef)
     {
-        RetryingTransactionHelper.RetryingTransactionCallback<Void> execution = new RetryingTransactionHelper.RetryingTransactionCallback<Void>() {
-            @Override
-            public Void execute()
+        RetryingTransactionHelper.RetryingTransactionCallback<Void> execution =
+            new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
             {
-                behaviourFilter.disableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
-                try
+                @Override
+                public Void execute()
                 {
-                    // Assuming the node still has unpublished information, then unmark it in progress
-                    if (nodeService.exists(nodeRef) &&
-                            nodeService.hasAspect(nodeRef, ASPECT_UNPUBLISHED_UPDATE))
+                    behaviourFilter.disableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
+                    try
                     {
-                        if (logger.isDebugEnabled())
+                        // Assuming the node still has unpublished information, then unmark it in progress
+                        if (nodeService.exists(nodeRef) &&
+                            nodeService.hasAspect(nodeRef, ASPECT_UNPUBLISHED_UPDATE))
                         {
-                            logger.debug("Removing publish in progress marker from updated node, because update was not successful. (node=" + nodeRef.toString() + ")");
+                            if (logger.isDebugEnabled())
+                            {
+                                logger.debug("Removing publish in progress marker from updated node, because update was not successful. (node=" + nodeRef.toString() + ")");
+                            }
+
+                            nodeService.setProperty(nodeRef, PROP_PUBLISH_IN_PROGRESS, false);
                         }
-
-                        nodeService.setProperty(nodeRef, PROP_PUBLISH_IN_PROGRESS, false);
                     }
-                }
-                finally
-                {
-                    behaviourFilter.enableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
-                }
+                    finally
+                    {
+                        behaviourFilter.enableBehaviour(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION);
+                    }
 
-                return null;
-            }
-        };
+                    return null;
+                }
+            };
         retryingTransactionHelper.doInTransaction(execution);
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java

@@ -29,12 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.job;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.lock.JobLockService.JobLockRefreshCallback;
@@ -43,6 +37,11 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
 
 /**
  * Base records management job implementation.
@@ -113,29 +112,20 @@ public class RecordsManagementJob implements Job
 
         // get the job lock service
         jobLockService = (JobLockService) context.getJobDetail().getJobDataMap().get("jobLockService");
-        if (jobLockService == null)
-        {
-            throw new AlfrescoRuntimeException("Job lock service has not been specified.");
-        }
+        if (jobLockService == null) { throw new AlfrescoRuntimeException("Job lock service has not been specified."); }
 
         // get the job executer
         jobExecuter = (RecordsManagementJobExecuter) context.getJobDetail().getJobDataMap().get("jobExecuter");
-        if (jobExecuter == null)
-        {
-            throw new AlfrescoRuntimeException("Job executer has not been specified.");
-        }
+        if (jobExecuter == null) { throw new AlfrescoRuntimeException("Job executer has not been specified."); }
 
         // get the job name
         jobName = (String) context.getJobDetail().getJobDataMap().get("jobName");
 
-        if (jobName == null)
-        {
-            throw new AlfrescoRuntimeException("Job name has not been specified.");
-        }
+        if (jobName == null) { throw new AlfrescoRuntimeException("Job name has not been specified."); }
 
         if (jobName.compareTo("dispositionLifecycle") == 0)
         {
-            // RM-3293 - set user for audit
+            //RM-3293 - set user for audit
             if (jobExecuter instanceof DispositionLifecycleJobExecuter)
             {
                 String auditUser = (String) context.getJobDetail().getJobDataMap().get("runAuditAs");
@@ -160,7 +150,8 @@ public class RecordsManagementJob implements Job
 
         final LockCallback lockCallback = new LockCallback();
 
-        AuthenticationUtil.runAs(new RunAsWork<Void>() {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
             public Void doWork()
             {
                 // try and get the lock
@@ -186,7 +177,7 @@ public class RecordsManagementJob implements Job
                             if (logger.isDebugEnabled())
                             {
                                 logger.debug("Lock release failed: " + getLockQName() + ": " + lockToken + "("
-                                        + e.getMessage() + ")");
+                                            + e.getMessage() + ")");
                             }
                         }
                     }
@@ -209,4 +200,4 @@ public class RecordsManagementJob implements Job
         this.runAuditAs = runAuditAs;
     }
 
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java

@@ -46,8 +46,7 @@ public abstract class RecordsManagementJobExecuter implements RecordsManagementM
     protected RepositoryState repositoryState;
 
     /**
-     * @param retryingTransactionHelper
-     *            retrying transaction helper
+     * @param retryingTransactionHelper retrying transaction helper
      */
     public void setRetryingTransactionHelper(RetryingTransactionHelper retryingTransactionHelper)
     {
@@ -55,8 +54,7 @@ public abstract class RecordsManagementJobExecuter implements RecordsManagementM
     }
 
     /**
-     * @param repositoryState
-     *            repository state helper component
+     * @param repositoryState   repository state helper component
      */
     public void setRepositoryState(RepositoryState repositoryState)
     {
@@ -82,4 +80,4 @@ public abstract class RecordsManagementJobExecuter implements RecordsManagementM
      * Jobs work implementation.
      */
     public abstract void executeImpl();
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/BasePublishExecutor.java

@@ -36,23 +36,21 @@ public abstract class BasePublishExecutor implements PublishExecutor
 {
     /** Publish executor registry */
     public PublishExecutorRegistry registry;
-
+    
     /**
      * Set publish executor registry
-     * 
-     * @param registry
-     *            publish executor registry
+     * @param registry  publish executor registry
      */
     public void setPublishExecutorRegistry(PublishExecutorRegistry registry)
     {
         this.registry = registry;
     }
-
+    
     /**
      * Init method
      */
     public void init()
     {
         registry.register(this);
-    }
-}
+    }    
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java

@@ -54,9 +54,7 @@ public class DispositionActionDefinitionPublishExecutor extends BasePublishExecu
 
     /**
      * Set node service
-     * 
-     * @param nodeService
-     *            node service
+     * @param nodeService   node service
      */
     public void setNodeService(NodeService nodeService)
     {
@@ -65,9 +63,7 @@ public class DispositionActionDefinitionPublishExecutor extends BasePublishExecu
 
     /**
      * Set records management service
-     * 
-     * @param rmActionService
-     *            records management service
+     * @param rmActionService   records management service
      */
     public void setRmActionService(RecordsManagementActionService rmActionService)
     {
@@ -90,12 +86,12 @@ public class DispositionActionDefinitionPublishExecutor extends BasePublishExecu
     @Override
     public void publish(NodeRef nodeRef)
     {
-        List<QName> updatedProps = (List<QName>) nodeService.getProperty(nodeRef, RecordsManagementModel.PROP_UPDATED_PROPERTIES);
+        List<QName> updatedProps = (List<QName>)nodeService.getProperty(nodeRef, RecordsManagementModel.PROP_UPDATED_PROPERTIES);
         if (updatedProps != null)
         {
             Map<String, Serializable> params = new HashMap<>();
-            params.put(BroadcastDispositionActionDefinitionUpdateAction.CHANGED_PROPERTIES, (Serializable) updatedProps);
+            params.put(BroadcastDispositionActionDefinitionUpdateAction.CHANGED_PROPERTIES, (Serializable)updatedProps);
             rmActionService.executeRecordsManagementAction(nodeRef, BroadcastDispositionActionDefinitionUpdateAction.NAME, params);
         }
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutor.java

@@ -37,15 +37,14 @@ import org.alfresco.service.cmr.repository.NodeRef;
 public interface PublishExecutor
 {
     /**
-     * @return publish exector name
+     * @return  publish exector name
      */
     String getName();
-
+    
     /**
      * Publish changes to node.
      * 
-     * @param nodeRef
-     *            node reference
+     * @param nodeRef   node reference
      */
     void publish(NodeRef nodeRef);
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java

@@ -39,27 +39,25 @@ public class PublishExecutorRegistry
 {
     /** Map of publish executors */
     private Map<String, PublishExecutor> publishExectors = new HashMap<>(3);
-
+    
     /**
      * Register a publish executor
      * 
-     * @param publishExecutor
-     *            publish executor
+     * @param publishExecutor   publish executor
      */
     public void register(PublishExecutor publishExecutor)
     {
         publishExectors.put(publishExecutor.getName(), publishExecutor);
     }
-
+    
     /**
      * Get registered publish executor by name.
      * 
-     * @param name
-     *            name
+     * @param name  name
      * @return {@link PublishExecutor}]
      */
     public PublishExecutor get(String name)
     {
         return publishExectors.get(name);
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleService.java

@@ -45,84 +45,79 @@ import org.alfresco.service.cmr.repository.NodeRef;
 public interface FilePlanRoleService
 {
     /** Default role names */
-    String ROLE_USER = "User";
-    String ROLE_POWER_USER = "PowerUser";
-    String ROLE_SECURITY_OFFICER = "SecurityOfficer";
-    String ROLE_RECORDS_MANAGER = "RecordsManager";
-    String ROLE_ADMIN = "Administrator";
-    String ROLE_EXTENDED_READERS = "ExtendedReaders";
-    String ROLE_EXTENDED_WRITERS = "ExtendedWriters";
+    String ROLE_USER                = "User";
+    String ROLE_POWER_USER          = "PowerUser";
+    String ROLE_SECURITY_OFFICER    = "SecurityOfficer";
+    String ROLE_RECORDS_MANAGER     = "RecordsManager";
+    String ROLE_ADMIN               = "Administrator";
+    String ROLE_EXTENDED_READERS    = "ExtendedReaders";
+    String ROLE_EXTENDED_WRITERS    = "ExtendedWriters";
 
     /** System roles */
     List<String> SYSTEM_ROLES = Arrays.asList(
-            ROLE_EXTENDED_READERS,
-            ROLE_EXTENDED_WRITERS);
+        ROLE_EXTENDED_READERS,
+        ROLE_EXTENDED_WRITERS
+    );
 
     /**
      * Sets up the roles on a new file plan.
      *
-     * @param filePlan
-     *            file plan
+     * @param filePlan  file plan
      */
     void setupFilePlanRoles(NodeRef filePlan);
 
     /**
      * Tears down the roles on a file plan.
      *
-     * @param filePlan
-     *            file plan
+     * @param filePlan  file plan
      */
     void tearDownFilePlanRoles(NodeRef filePlan);
 
     /**
-     * Returns the name of the container group for all roles of a specified file plan.
+     * Returns the name of the container group for all roles of a specified file
+     * plan.
      *
-     * @param filePlan
-     *            file plan node reference
-     * @return String group name
+     * @param filePlan  file plan node reference
+     * @return String   group name
      */
     String getAllRolesContainerGroup(NodeRef filePlan);
 
     /**
-     * Get all the available roles for the given records management root node (includes also the system roles)
+     * Get all the available roles for the given records management root node
+     * (includes also the system roles)
      *
-     * @param filePlan
-     *            file plan
+     * @param filePlan  file plan
      * @return
      */
     Set<Role> getRoles(NodeRef filePlan);
 
     /**
-     * Get all the available roles for the given records management root node. System roles can be filtered
+     * Get all the available roles for the given records management root node.
+     * System roles can be filtered
      *
-     * @param filePlan
-     *            file plan
-     * @param includeSystemRoles
-     *            system roles
+     * @param filePlan  file plan
+     * @param includeSystemRoles system roles
      * @return
      */
     Set<Role> getRoles(NodeRef filePlan, boolean includeSystemRoles);
 
     /**
-     * Gets the roles for a given user (includes also the system roles)
+     * Gets the roles for a given user
+     * (includes also the system roles)
      *
-     * @param filePlan
-     *            file plan
-     * @param user
-     *            user
+     * @param filePlan  file plan
+     * @param user      user
      * @return
      */
     Set<Role> getRolesByUser(NodeRef filePlan, String user);
 
     /**
-     * Gets the roles for a given user. System roles can be filtered
+     * Gets the roles for a given user.
+     * System roles can be filtered
      *
-     * @param filePlan
-     *            file plan
-     * @param user
-     *            user
-     * @param includeSystemRoles
-     *            system roles
+     * @param filePlan  file plan
+     * @param user      user
+     * @param includeSystemRoles system roles
      * @return
      */
     Set<Role> getRolesByUser(NodeRef filePlan, String user, boolean includeSystemRoles);
@@ -130,21 +125,16 @@ public interface FilePlanRoleService
     /**
      * Get a role by name
      *
-     * @param filePlan
-     *            file plan
-     * @param role
-     *            role
+     * @param filePlan  file plan
+     * @param role      role
      * @return
      */
     Role getRole(NodeRef filePlan, String role);
 
     /**
      * Indicate whether a role exists for a given records management root node
-     * 
-     * @param filePlan
-     *            file plan
-     * @param role
-     *            role
+     * @param filePlan  file plan
+     * @param role      role
      * @return
      */
     boolean existsRole(NodeRef filePlan, String role);
@@ -152,10 +142,8 @@ public interface FilePlanRoleService
     /**
      * Determines whether the given user has the RM Admin role
      *
-     * @param filePlan
-     *            filePlan
-     * @param user
-     *            user name to check
+     * @param filePlan  filePlan
+     * @param user user name to check
      * @return true if the user has the RM Admin role, false otherwise
      */
     boolean hasRMAdminRole(NodeRef filePlan, String user);
@@ -163,8 +151,7 @@ public interface FilePlanRoleService
     /**
      * Create a new role
      *
-     * @param filePlan
-     *            file plan
+     * @param filePlan  file plan
      * @param role
      * @param roleDisplayLabel
      * @param capabilities
@@ -175,8 +162,7 @@ public interface FilePlanRoleService
     /**
      * Update an existing role
      *
-     * @param filePlan
-     *            file plan
+     * @param filePlan  file plan
      * @param role
      * @param roleDisplayLabel
      * @param capabilities
@@ -187,67 +173,54 @@ public interface FilePlanRoleService
     /**
      * Delete a role
      *
-     * @param filePlan
-     *            file plan
-     * @param role
-     *            role
+     * @param filePlan  file plan
+     * @param role      role
      */
     void deleteRole(NodeRef filePlan, String role);
 
     /**
      * Gets all the users that have been directly assigned to a role.
      *
-     * @param filePlan
-     *            file plan
-     * @param role
-     *            role
-     * @return {@link Set}&lt;{@link String}&gt; set of users
+     * @param filePlan  file plan
+     * @param role      role
+     * @return {@link Set}&lt;{@link String}&gt;  set of users
      */
     Set<String> getUsersAssignedToRole(NodeRef filePlan, String role);
 
     /**
      * Gets all the groups that have been directly assigned to a role.
      *
-     * @param filePlan
-     *            file plan
-     * @param role
-     *            role
-     * @return {@link Set}&lt;{@link String}&gt; set of groups
+     * @param filePlan  file plan
+     * @param role      role
+     * @return {@link Set}&lt;{@link String}&gt;  set of groups
      */
     Set<String> getGroupsAssignedToRole(NodeRef filePlan, String role);
 
     /**
      * Gets all the groups and users that have been directly assigned to a role.
      *
-     * @param filePlan
-     *            file plan
-     * @param role
-     *            role
-     * @return {@link Set}&lt;{@link String}&gt; set of groups and users
+     * @param filePlan  file plan
+     * @param role      role
+     * @return {@link Set}&lt;{@link String}&gt;  set of groups and users
      */
     Set<String> getAllAssignedToRole(NodeRef filePlan, String role);
 
     /**
      * Assign a role to an authority
      *
-     * @param filePlan
-     *            file plan
-     * @param role
-     *            role
-     * @param authorityName
-     *            authority name
+     * @param filePlan      file plan
+     * @param role          role
+     * @param authorityName authority name
      */
     void assignRoleToAuthority(NodeRef filePlan, String role, String authorityName);
 
+
     /**
      * Unassign a role from an authority
      *
-     * @param filePlan
-     *            file plan
-     * @param role
-     *            role
-     * @param authorityName
-     *            authority name
+     * @param filePlan      file plan
+     * @param role          role
+     * @param authorityName authority name
      */
     void unassignRoleFromAuthority(NodeRef filePlan, String role, String authorityName);
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java

@@ -35,14 +35,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.extensions.surf.util.I18NUtil;
-
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.bootstrap.BootstrapImporterModuleComponent;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
@@ -62,6 +54,13 @@ import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.security.AuthorityType;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.util.ParameterCheck;
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * Role service implementation
@@ -70,7 +69,7 @@ import org.alfresco.util.ParameterCheck;
  * @since 2.1
  */
 public class FilePlanRoleServiceImpl implements FilePlanRoleService,
-        RecordsManagementModel
+                                                RecordsManagementModel
 {
     /** Logger for the class. */
     private static final Logger LOGGER = LoggerFactory.getLogger(FilePlanRoleServiceImpl.class);
@@ -110,8 +109,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     private static final String CONFIG_NODEID = "rm_config_folder";
 
     /**
-     * @param capabilityService
-     *            capability service
+     * @param capabilityService capability service
      */
     public void setCapabilityService(CapabilityService capabilityService)
     {
@@ -119,8 +117,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     }
 
     /**
-     * @param authorityService
-     *            authority service
+     * @param authorityService  authority service
      */
     public void setAuthorityService(AuthorityService authorityService)
     {
@@ -128,8 +125,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     }
 
     /**
-     * @param permissionService
-     *            permission service
+     * @param permissionService permission service
      */
     public void setPermissionService(PermissionService permissionService)
     {
@@ -137,8 +133,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     }
 
     /**
-     * @param nodeService
-     *            node service
+     * @param nodeService   node service
      */
     public void setNodeService(NodeService nodeService)
     {
@@ -146,8 +141,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     }
 
     /**
-     * @param filePlanService
-     *            file plan service
+     * @param filePlanService   file plan service
      */
     public void setFilePlanService(FilePlanService filePlanService)
     {
@@ -170,7 +164,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     public void setupFilePlanRoles(final NodeRef filePlan)
     {
         // Do not execute behaviour if this has been created in the archive store
-        if (filePlan.getStoreRef().equals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE))
+        if(filePlan.getStoreRef().equals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE))
         {
             // This is not the spaces store - probably the archive store
             return;
@@ -178,12 +172,13 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
 
         if (nodeService.exists(filePlan))
         {
-            List<NodeRef> systemContainers = AuthenticationUtil.runAsSystem(new AuthenticationUtil.RunAsWork<List<NodeRef>>() {
+            List<NodeRef> systemContainers = AuthenticationUtil.runAsSystem(new AuthenticationUtil.RunAsWork<List<NodeRef>>()
+            {
                 public List<NodeRef> doWork()
                 {
                     List<NodeRef> systemContainers = new ArrayList<>(3);
 
-                    // In a multi tenant store we need to initialize the rm config if it has been done yet
+                    //In a multi tenant store we need to initialize the rm config if it has been done yet
                     NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CONFIG_NODEID);
                     if (!nodeService.exists(nodeRef))
                     {
@@ -192,9 +187,9 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
 
                     // Create "all" role group for root node
                     String allRoles = authorityService.createAuthority(
-                            AuthorityType.GROUP,
-                            getAllRolesGroupShortName(filePlan),
-                            I18NUtil.getMessage(MSG_ALL_ROLES),
+                    						AuthorityType.GROUP,
+                    						getAllRolesGroupShortName(filePlan),
+                    						I18NUtil.getMessage(MSG_ALL_ROLES),
                             new HashSet<>(Arrays.asList(RMAuthority.ZONE_APP_RM)));
 
                     // Set the permissions
@@ -223,7 +218,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     @Override
     public void tearDownFilePlanRoles(final NodeRef filePlan)
     {
-        AuthenticationUtil.runAsSystem(new AuthenticationUtil.RunAsWork<Object>() {
+        AuthenticationUtil.runAsSystem(new AuthenticationUtil.RunAsWork<Object>()
+        {
             public Object doWork()
             {
                 // cascade delete the 'all' roles group for the site
@@ -255,14 +251,13 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     /**
      * Bootstraps the default roles
      *
-     * @param filePlan
-     *            file plan
-     * @param systemContainers
-     *            system containers
+     * @param filePlan          file plan
+     * @param systemContainers  system containers
      */
     private void bootstrapDefaultRoles(final NodeRef filePlan, final List<NodeRef> systemContainers)
     {
-        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>() {
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
+        {
             public Object doWork()
             {
                 try
@@ -272,7 +267,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
                     {
                         // Load up the default roles from JSON
                         InputStream is = getClass().getClassLoader().getResourceAsStream(BOOTSTRAP_ROLE_JSON_LOCATION);
-                        if (is == null)
+                        if  (is == null)
                         {
                             throw new AlfrescoRuntimeException("Could not load default bootstrap roles configuration");
                         }
@@ -303,6 +298,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
                             throw new AlfrescoRuntimeException("No name given to default bootstrap role.  Check json configuration file.");
                         }
 
+
                         // Get the role's display label
                         String displayLabel = name;
                         if (object.has(JSON_DISPLAY_LABEL))
@@ -375,8 +371,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     /**
      * Helper method to check whether the current authority is a system role or not
      *
-     * @param roleAuthority
-     *            The role to check
+     * @param roleAuthority The role to check
      * @return Returns true if roleAuthority is a system role, false otherwise
      */
     private boolean isSystemRole(String roleAuthority)
@@ -409,7 +404,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     @Override
     public Set<Role> getRoles(final NodeRef rmRootNode, final boolean includeSystemRoles)
     {
-        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Set<Role>>() {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Set<Role>>()
+        {
             public Set<Role> doWork()
             {
                 Set<Role> result = new HashSet<>(13);
@@ -453,7 +449,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     @Override
     public Set<Role> getRolesByUser(final NodeRef rmRootNode, final String user, final boolean includeSystemRoles)
     {
-        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Set<Role>>() {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Set<Role>>()
+        {
             public Set<Role> doWork()
             {
                 Set<Role> result = new HashSet<>(13);
@@ -523,7 +520,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
      */
     public Role getRole(final NodeRef rmRootNode, final String role)
     {
-        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Role>() {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Role>()
+        {
             public Role doWork()
             {
                 Role result = null;
@@ -574,7 +572,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
      */
     public boolean existsRole(final NodeRef rmRootNode, final String role)
     {
-        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Boolean>() {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Boolean>()
+        {
             public Boolean doWork()
             {
                 String fullRoleName = authorityService.getName(AuthorityType.GROUP, getFullRoleName(role, rmRootNode));
@@ -589,7 +588,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService#hasRMAdminRole(org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
      *
-     *      TODO .. change this to check a property of the role its self
+     * TODO .. change this to check a property of the role its self
      */
     public boolean hasRMAdminRole(NodeRef rmRootNode, String user)
     {
@@ -616,7 +615,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
      */
     public Role createRole(final NodeRef filePlan, final String role, final String roleDisplayLabel, final Set<Capability> capabilities)
     {
-        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Role>() {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Role>()
+        {
             public Role doWork()
             {
                 String fullRoleName = getFullRoleName(role, filePlan);
@@ -650,7 +650,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
                 }
 
                 // TODO .. we should be creating a permission set containing all the capabilities and then assigning that
-                // single permission group to the file plan .. would be tidier
+                //         single permission group to the file plan .. would be tidier
 
                 // Assign the various capabilities to the group on the root records management node
                 if (capabilities != null)
@@ -666,12 +666,15 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
         }, AuthenticationUtil.getSystemUserName());
     }
 
+
+
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService#updateRole(org.alfresco.service.cmr.repository.NodeRef, java.lang.String, java.lang.String, java.util.Set)
      */
     public Role updateRole(final NodeRef rmRootNode, final String role, final String roleDisplayLabel, final Set<Capability> capabilities)
     {
-        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Role>() {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Role>()
+        {
             public Role doWork()
             {
                 if (!existsRole(rmRootNode, role))
@@ -718,7 +721,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
             throw new AlfrescoRuntimeException("'" + role + "' is a system role and cannot be deleted.");
         }
 
-        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>() {
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
+        {
             public Void doWork()
             {
                 String roleAuthority = authorityService.getName(AuthorityType.GROUP, getFullRoleName(role, rmRootNode));
@@ -744,17 +748,15 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     /**
      * Gets all the authorities of a given type directly assigned to the given role in the file plan.
      *
-     * @param filePlan
-     *            file plan
-     * @param roleName
-     *            role name
-     * @param authorityType
-     *            authority type
-     * @return Set<String> directly assigned authorities
+     * @param filePlan          file plan
+     * @param roleName          role name
+     * @param authorityType     authority type
+     * @return Set<String>      directly assigned authorities
      */
     private Set<String> getAuthoritiesAssignedToRole(final NodeRef filePlan, final String roleName, final AuthorityType authorityType)
     {
-        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Set<String>>() {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Set<String>>()
+        {
             public Set<String> doWork()
             {
                 Role role = getRole(filePlan, roleName);
@@ -800,21 +802,22 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
      */
     public void assignRoleToAuthority(final NodeRef filePlan, final String role, final String authorityName)
     {
-        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>() {
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>()
+        {
             public Void doWork()
             {
                 if (authorityService.authorityExists(authorityName) &&
-                        !getAllAssignedToRole(filePlan, role).contains(authorityName))
+                    !getAllAssignedToRole(filePlan, role).contains(authorityName))
                 {
                     String roleAuthority = authorityService.getName(AuthorityType.GROUP, getFullRoleName(role, filePlan));
                     try
                     {
-                        authorityService.addAuthority(roleAuthority, authorityName);
+                    	authorityService.addAuthority(roleAuthority, authorityName);
                     }
                     catch (DuplicateChildNodeNameException exception)
-                    {
-                        // ignore, because the work has already been performed
-                    }
+                	{
+                    	// ignore, because the work has already been performed
+                	}
                 }
                 return null;
 
@@ -828,7 +831,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     @Override
     public void unassignRoleFromAuthority(final NodeRef filePlan, final String role, final String authorityName)
     {
-        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>() {
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>()
+        {
             public Void doWork()
             {
                 String roleAuthority = authorityService.getName(AuthorityType.GROUP, getFullRoleName(role, filePlan));
@@ -847,4 +851,4 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     {
         return authorityService.getName(AuthorityType.GROUP, getAllRolesGroupShortName(filePlan));
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/role/Role.java

@@ -122,4 +122,4 @@ public class Role
         return this.groupShortName;
     }
 
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java

@@ -36,10 +36,8 @@ import java.util.Set;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.extensions.webscripts.ui.common.StringUtils;
 
-import org.alfresco.model.ContentModel;
 import org.alfresco.model.RenditionModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -98,8 +96,6 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
     /** transaction service */
     private TransactionService transactionService;
 
-    private boolean enableUsernameNormalization;
-
     /**
      * @param filePlanService
      *            file plan service
@@ -145,15 +141,6 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
         this.transactionService = transactionService;
     }
 
-    /**
-     * @param enableUsernameNormalization
-     *            enable username normalization to ensure correct casing
-     */
-    public void setEnableUsernameNormalization(boolean enableUsernameNormalization)
-    {
-        this.enableUsernameNormalization = enableUsernameNormalization;
-    }
-
     /**
      * Application context refresh event handler
      */
@@ -372,18 +359,12 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
     {
         String group = null;
 
-        // If enabled, the authorities are forced to match the correct casing of the usernames in case they were set
-        // with the incorrect casing.
-        // If not, it will just use the authorities as they are.
-        // In normal circumstances, the authorities are in the correct casing, so this is disabled by default.
-        Set<String> authoritySet = normalizeAuthorities(authorities);
-
         // find group or determine what the next index is if no group exists or there is a clash
-        Pair<String, Integer> groupResult = findIPRGroup(groupPrefix, authoritySet);
+        Pair<String, Integer> groupResult = findIPRGroup(groupPrefix, authorities);
 
         if (groupResult.getFirst() == null)
         {
-            group = createIPRGroup(groupPrefix, authoritySet, groupResult.getSecond());
+            group = createIPRGroup(groupPrefix, authorities, groupResult.getSecond());
         }
         else
         {
@@ -418,8 +399,7 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
         while (hasMoreItems == true)
         {
             // get matching authorities
-            PagingResults<String> results = authorityService.getAuthorities(
-                    AuthorityType.GROUP,
+            PagingResults<String> results = authorityService.getAuthorities(AuthorityType.GROUP,
                     RMAuthority.ZONE_APP_RM,
                     groupShortNamePrefix,
                     false,
@@ -447,63 +427,6 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
         return new Pair<>(iprGroup, nextGroupIndex);
     }
 
-    /**
-     * Given a set of authorities, normalizes the authority names to ensure correct casing.
-     * 
-     * @param authNames
-     * @return
-     */
-    private Set<String> normalizeAuthorities(Set<String> authNames)
-    {
-        // If disabled or no authorities, return as is
-        if (!enableUsernameNormalization || authNames == null || authNames.isEmpty())
-        {
-            return authNames;
-        }
-
-        Set<String> normalizedAuthorities = new HashSet<>();
-        for (String authorityName : authNames)
-        {
-            normalizedAuthorities.add(normalizeAuthorityName(authorityName));
-        }
-        return normalizedAuthorities;
-    }
-
-    /**
-     * Usernames are case insensitive but affect the IPR group matching when set with different casing. For a given authority of type user, this method normalizes the authority name. If group, it returns the name as-is.
-     *
-     * @param authorityName
-     *            the authority name to normalize
-     * @return the normalized authority name
-     */
-    private String normalizeAuthorityName(String authorityName)
-    {
-        if (authorityName == null || authorityName.startsWith(GROUP_PREFIX))
-        {
-            return authorityName;
-        }
-
-        // For users, attempt to get the correct casing from the username property of the user node
-        if (authorityService.authorityExists(authorityName))
-        {
-            try
-            {
-                NodeRef authorityNodeRef = authorityService.getAuthorityNodeRef(authorityName);
-                if (authorityNodeRef != null)
-                {
-                    String username = (String) nodeService.getProperty(authorityNodeRef, ContentModel.PROP_USERNAME);
-                    return username != null ? username : authorityName;
-                }
-            }
-            catch (Exception e)
-            {
-                // If anything goes wrong, fallback to the original name
-            }
-        }
-
-        return authorityName;
-    }
-
     /**
      * Determines whether a group exactly matches a list of authorities.
      *
@@ -650,8 +573,8 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
         }
         catch (DuplicateChildNodeNameException ex)
         {
-            // Rethrow as ConcurrencyFailureException so that is can be retried and linked to the group created by the concurrent transaction
-            throw new ConcurrencyFailureException("IPR group creation failed due to concurrent duplicate group name creation: " + groupShortName);
+            // the group was concurrently created
+            group = authorityService.getName(AuthorityType.GROUP, groupShortName);
         }
 
         return group;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/site/GetChildrenCannedQueryFactory.java

@@ -46,7 +46,7 @@ import org.alfresco.util.Pair;
  * @author Roy Wetherall
  */
 public class GetChildrenCannedQueryFactory extends org.alfresco.repo.node.getchildren.GetChildrenCannedQueryFactory
-        implements RecordsManagementModel
+                                           implements RecordsManagementModel
 {
     @Override
     public CannedQuery<NodeRef> getCannedQuery(NodeRef parentRef, String pattern, Set<QName> assocTypeQNames, Set<QName> childTypeQNames, List<FilterProp> filterProps, List<Pair<QName, Boolean>> sortProps, PagingRequest pagingRequest)
@@ -54,4 +54,4 @@ public class GetChildrenCannedQueryFactory extends org.alfresco.repo.node.getchi
         childTypeQNames.add(TYPE_RM_SITE);
         return super.getCannedQuery(parentRef, pattern, assocTypeQNames, childTypeQNames, filterProps, sortProps, pagingRequest);
     }
-}
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/AlfrescoTransactionSupport.java

@@ -43,7 +43,7 @@ public class AlfrescoTransactionSupport
     {
         org.alfresco.repo.transaction.AlfrescoTransactionSupport.bindResource(key, resource);
     }
-
+    
     /**
      * @see org.alfresco.repo.transaction.AlfrescoTransactionSupport#unbindResource(Object)
      */
@@ -60,4 +60,4 @@ public class AlfrescoTransactionSupport
     {
         return org.alfresco.repo.transaction.AlfrescoTransactionSupport.getResource(key);
     }
-}
+}