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

(cherry picked from commit 0b6b405c5f)

.github/workflows/ci.yml

@@ -23,6 +23,7 @@ env:
   MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
   QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
   QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
+  CI_WORKSPACE: ${{ github.workspace }}
   TAS_ENVIRONMENT: ./packaging/tests/environment
   TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
 
@@ -32,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     if: >
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -51,7 +52,7 @@ jobs:
     if: >
       ((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request') &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -72,7 +73,7 @@ jobs:
     if: >
       !contains(github.event.head_commit.message, '[skip repo]') &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -93,7 +94,7 @@ jobs:
     if: >
       !contains(github.event.head_commit.message, '[skip repo]') &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     strategy:
       fail-fast: false
       matrix:
@@ -138,7 +139,7 @@ jobs:
       !contains(github.event.head_commit.message, '[skip db]')) ||
       contains(github.event.head_commit.message, '[db]')) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     strategy:
       fail-fast: false
       matrix:
@@ -168,7 +169,7 @@ jobs:
       contains(github.event.head_commit.message, '[latest db]') ||
       contains(github.event.head_commit.message, '[db]')) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -194,7 +195,7 @@ jobs:
       contains(github.event.head_commit.message, '[latest db]') ||
       contains(github.event.head_commit.message, '[db]')) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -219,7 +220,7 @@ jobs:
       !contains(github.event.head_commit.message, '[skip db]')) ||
       contains(github.event.head_commit.message, '[db]')) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -244,7 +245,7 @@ jobs:
       contains(github.event.head_commit.message, '[latest db]') ||
       contains(github.event.head_commit.message, '[db]')) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -267,7 +268,7 @@ jobs:
     if: >
       !contains(github.event.head_commit.message, '[skip repo]') &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -288,7 +289,7 @@ jobs:
     if: >
       !contains(github.event.head_commit.message, '[skip repo]') &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     strategy:
       fail-fast: false
       matrix:
@@ -316,7 +317,8 @@ jobs:
           - testSuite: MTLSTestSuite
             compose-profile: with-mtls-transform-core-aio
             mtls: true
-            mvn-options: '-Dencryption.ssl.keystore.location=${GITHUB_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${GITHUB_WORKSPACE}/keystores/alfresco/alfresco.truststore'
+            disabledHostnameVerification: false
+            mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore'
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -328,8 +330,14 @@ jobs:
       - name: "Generate Keystores and Truststores for Mutual TLS configuration"
         if: ${{ matrix.mtls }}
         run: |
-         git clone -b "master" --depth=1 "https://${{ secrets.BOT_GITHUB_USERNAME }}:${{ secrets.BOT_GITHUB_TOKEN }}@github.com/Alfresco/alfresco-ssl-generator.git"
-         bash ./scripts/ci/generate_keystores.sh
+          git clone -b "master" --depth=1 "https://${{ secrets.BOT_GITHUB_USERNAME }}:${{ secrets.BOT_GITHUB_TOKEN }}@github.com/Alfresco/alfresco-ssl-generator.git"
+          if ${{ matrix.disabledHostnameVerification }} ; then
+            bash ${{ env.CI_WORKSPACE }}/alfresco-ssl-generator/scripts/ci/generate_keystores_wrong_hostnames.sh
+            echo "HOSTNAME_VERIFICATION_DISABLED=true" >> "$GITHUB_ENV"
+          else
+            bash ${{ env.CI_WORKSPACE }}/alfresco-ssl-generator/scripts/ci/generate_keystores.sh
+            echo "HOSTNAME_VERIFICATION_DISABLED=false" >> "$GITHUB_ENV"
+          fi
       - name: "Set up the environment"
         run: |
           if [ -e ./scripts/ci/tests/${{ matrix.testSuite }}-setup.sh ]; then
@@ -350,7 +358,7 @@ jobs:
       !contains(github.event.head_commit.message, '[skip tas]')) ||
       contains(github.event.head_commit.message, '[tas]')) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     strategy:
       fail-fast: false
       matrix:
@@ -417,7 +425,7 @@ jobs:
     if: >
       !contains(github.event.head_commit.message, '[skip repo]') &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -440,7 +448,7 @@ jobs:
       !contains(github.event.head_commit.message, '[skip ags]')) ||
       contains(github.event.head_commit.message, '[ags]')) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     strategy:
       fail-fast: false
       matrix:
@@ -471,7 +479,7 @@ jobs:
       !contains(github.event.head_commit.message, '[skip ags]')) ||
       contains(github.event.head_commit.message, '[ags on MySQL]')) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     strategy:
       fail-fast: false
       matrix:
@@ -502,7 +510,7 @@ jobs:
       !contains(github.event.head_commit.message, '[skip ags]') && !contains(github.event.head_commit.message, '[skip tas]')) ||
       (contains(github.event.head_commit.message, '[ags]') && contains(github.event.head_commit.message, '[tas]'))) &&
       !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
     env:
       REQUIRES_LOCAL_IMAGES: true
     steps:

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>20.140</version>
+      <version>21.9</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>20.140</version>
+      <version>21.9</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>20.140</version>
+      <version>21.9</version>
    </parent>
 
    <build>

amps/ags/rm-community/pom.xml

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

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

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.7-A2
+SOLR6_TAG=2.0.7-A5
 POSTGRES_TAG=14.4
 ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

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

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

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

@@ -5,7 +5,7 @@
 # Version label
 version.major=7
 version.minor=4
-version.revision=0
+version.revision=1
 version.label=
 
 # Edition label

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

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

amps/ags/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml

@@ -38,9 +38,7 @@ tags:
     description: Retrieve and manage unfiled records containers
   - name: unfiled-record-folders
     description: Retrieve and manage unfiled record folders
-  - name: events
-    description: Retrieve and manage retention events
-    
+
 paths:
   ## GS sites
   '/gs-sites':
@@ -2094,172 +2092,8 @@ paths:
           description: Unexpected error
           schema:
             $ref: '#/definitions/Error'
-  '/events':
-    get:
-      tags:
-        - events
-      summary: List all available retention events
-      description: |
-        Gets the list of events that can be used by retention steps
-      operationId: getAllEvents
-      produces:
-        - application/json
-      parameters:
-        - $ref: '#/parameters/skipCountParam'
-        - $ref: '#/parameters/maxItemsParam'
-      responses:
-        '200':
-          description: Successful response
-          schema:
-            $ref: '#/definitions/EventPaging'
-        '400':
-          description: |
-            Invalid parameter: value of **maxItems** or **skipCount** is invalid
-        '401':
-          description: Authentication failed
-        default:
-          description: Unexpected error
-          schema:
-            $ref: '#/definitions/Error'
 
-    post:
-      tags:
-        - events
-      summary: Create a new retention event
-      description: |
-        Creates a new event that can be used by retention schedules.
-      operationId: createEvent
-      parameters:
-        - in: body
-          name: eventBodyCreate
-          description: The new event.
-          required: true
-          schema:
-            $ref: '#/definitions/EventBody'
-      consumes:
-        - application/json
-      produces:
-        - application/json
-      responses:
-        '201':
-          description: Successful response
-          schema:
-            $ref: '#/definitions/EventEntry'
-        '400':
-          description: |
-            Invalid parameter: **name** or **type** is invalid
-        '401':
-          description: Authentication failed
-        '403':
-          description: Current user does not have permission to create event
-        '409':
-          description: Cannot create event. An event with the name **name** already exists
-        default:
-          description: Unexpected error
-          schema:
-            $ref: '#/definitions/Error'
-  
-  '/events/{eventId}':
-    get:
-      tags:
-        - events
-      summary: Return event for given eventId
-      description: |
-        Gets information about the retention event with id **eventId**.
-      operationId: getEvent
-      produces:
-        - application/json
-      parameters:
-        - $ref: '#/parameters/eventIdParam'
-      responses:
-        '200':
-          description: Successful response
-          schema:
-            $ref: '#/definitions/EventEntry'
-        '400':
-          description: |
-            Invalid parameter: **eventId** is invalid    
-        '401':
-          description: Authentication failed
-        '404':
-          description: "**eventId** does not exist"
-        default:
-          description: Unexpected error
-          schema:
-            $ref: '#/definitions/Error'
-    put:
-      tags:
-        - events
-      summary: Update event for given eventId
-      operationId: updateEvent
-      description: |
-        Updates retention event with id **eventId**.
-      produces:
-        - application/json
-      parameters:
-        - $ref: '#/parameters/eventIdParam'
-        - in: body
-          name: eventBodyUpdate
-          description: The event information to update.
-          required: true
-          schema:
-            $ref: '#/definitions/EventBody'
-      responses:
-        '200':
-          description: Successful response
-          schema:
-            $ref: '#/definitions/EventEntry'
-        '400':
-          description: |
-            Invalid parameter: The update request is invalid or **eventId** is not a valid format or **eventBodyUpdate** is invalid
-        '401':
-          description: Authentication failed
-        '403':
-          description: Current user does not have permission to update events
-        '404':
-          description: "**eventId** does not exist"
-        '409':
-          description: Cannot update event. An event with the name **name** already exists
-        default:
-          description: Unexpected error
-          schema:
-            $ref: '#/definitions/Error'
-  
-  '/event-types':
-    get:
-      tags:
-        - events
-      summary: List all the retention event types
-      description: |
-        Gets a list of all the retention event types.
-      operationId: getAllEventTypes
-      produces:
-        - application/json
-      parameters:
-        - $ref: '#/parameters/skipCountParam'
-        - $ref: '#/parameters/maxItemsParam'
-      responses:
-        '200':
-          description: Successful response
-          schema:
-            $ref: '#/definitions/EventTypePaging'
-        '400':
-          description: |
-            Invalid parameter: value of **maxItems** or **skipCount** is invalid
-        '401':
-          description: Authentication failed
-        default:
-          description: Unexpected error
-          schema:
-            $ref: '#/definitions/Error'          
 parameters:
-  ## event
-  eventIdParam:
-    name: eventId
-    in: path
-    description: The identifier of an event.
-    required: true
-    type: string
   ## File plans
   filePlanEntryIncludeParam:
     name: include
@@ -3927,92 +3761,4 @@ definitions:
           - SiteConsumer
           - SiteCollaborator
           - SiteContributor
-          - SiteManager
-  EventPaging:
-    type: object
-    properties:
-      list:
-        type: object
-        properties:
-          pagination:
-            $ref: '#/definitions/Pagination'
-          entries:
-            type: array
-            items:
-              $ref: '#/definitions/EventEntry'
-  EventEntry:
-    type: object
-    required:
-      - entry
-    properties:
-      entry:
-        $ref: '#/definitions/Event'
-  Event:
-    type: object
-    required:
-      - id
-      - name
-      - type
-    properties:
-      id:
-        type: string
-        description: this is the id of the event
-      name:
-        type: string
-        description: This is the unique display label of the event
-      type:
-        type: string
-        description: this is event type
-  EventBody:
-    type: object
-    required:
-      - name
-    properties:
-      name:
-        type: string
-        description: This is the unique display label of the event
-      type:
-        type: string
-        description: this is event type
-        default: Simple
-  EventTypePaging:
-    type: object
-    properties:
-      list:
-        type: object
-        properties:
-          pagination:
-            $ref: '#/definitions/Pagination'
-          entries:
-            type: array
-            items:
-              $ref: '#/definitions/EventTypeEntry'
-  EventTypeEntry:
-    type: object
-    required:
-      - entry
-    properties:
-      entry:
-        $ref: '#/definitions/EventType'
-  EventType:
-    type: object
-    required:
-      - id
-      - name
-    properties:
-      id:
-        type: string
-        description: this is the event type id
-      name:
-        type: string
-        description: this is event type name
-      isAutomatic:
-        type: boolean
-        description: Whether events of this type need completing manually or can be completed automatically
-        default: true
-      associationName:
-        type: string
-        description: The association used to determine whether automatic events of this type are complete
-      actionOnAssociatedNode:
-        type: string
-        description: If an association name is set for this event type then it is possible to require an action to be completed on the associated node
+          - SiteManager

amps/pom.xml

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

amps/share-services/pom.xml

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

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js

@@ -48,7 +48,7 @@ function tagQuery()
    }
    query += "ASPECT:\"{http://www.alfresco.org/model/content/1.0}taggable\"";
    //MNT-2118 Share inconsistencies when displaying locked files with tags
-   query += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";
+   query += " AND -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";
 
    // MNT-20091 check to prevent cm:taggable with NULL
    query += " AND ISNOTNULL:\"{http://www.alfresco.org/model/content/1.0}taggable\"";
@@ -60,7 +60,7 @@ function tagQuery()
          query: query,
          language: "lucene",
          page: {
-            // query minimum rows because all usefull info will come with facets 
+            // query minimum rows because all useful info will come with facets
             maxItems: 1,
             skipCount: 0
          },

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/categorynode.get.js

@@ -24,7 +24,7 @@ function getCategoryNode()
       else
       {
          var queryPath = "/" + catAspect + "/" + encodePath(path);
-         categoryResults = search.luceneSearch("+PATH:\"" + queryPath + "/*\" -PATH:\"" + queryPath + "/member\"");
+         categoryResults = search.luceneSearch("+PATH:\"" + queryPath + "/*\" AND -PATH:\"" + queryPath + "/member\"");
       }
       
       // make each result an object and indicate it is selectable in the UI
@@ -71,4 +71,4 @@ function encodePath(path)
 function sortByName(a, b)
 {
    return (b.node.name.toLowerCase() > a.node.name.toLowerCase() ? -1 : 1);
-}
+}

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/images.get.js

@@ -29,7 +29,7 @@ function main()
    {
       query = "+PATH:\"" + parsedArgs.pathNode.qnamePath + "//*\" ";
    }
-   query += "+TYPE:\"cm:content\" +@cm\\:content.mimetype:image/*";
+   query += "AND +TYPE:\"cm:content\" AND +@cm\\:content.mimetype:\"image/*\"";
    
    // Sort the list before trimming to page chunks 
    assets = search.query(
@@ -52,4 +52,4 @@ function main()
 /**
  * Images List Component: images
  */
-model.images = main();
+model.images = main();

core/pom.xml

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

data-model/pom.xml

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

data-model/src/main/java/org/alfresco/service/cmr/search/SearchParameters.java

@@ -201,6 +201,11 @@ public class SearchParameters implements BasicSearchParameters
 
     private String timezone;
     
+    /**
+     * Configure the limit to track the total hits on search results
+     */
+    private int trackTotalHits;
+
     /**
      * Default constructor
      */
@@ -251,6 +256,7 @@ public class SearchParameters implements BasicSearchParameters
         sp.stats = this.stats;
         sp.ranges = this.ranges;
         sp.timezone = this.timezone;
+        sp.trackTotalHits = this.trackTotalHits;
         return sp;
     }
     
@@ -1641,6 +1647,21 @@ public class SearchParameters implements BasicSearchParameters
     {
         this.includeMetadata = includeMetadata;
     }
-    
+
+    public int getTrackTotalHits()
+    {
+        return trackTotalHits;
+    }
+
+    /**
+     * Set a maximum value for the report of total hits. The reported number of hits will never exceed this limit even
+     * if more are found. If unset, the engine’s default tracking limit is applied. To remove any limit, set to -1.
+     *
+     * @param trackTotalHits int
+     */
+    public void setTrackTotalHits(int trackTotalHits)
+    {
+        this.trackTotalHits = trackTotalHits;
+    }
 
 }

mmt/pom.xml

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

packaging/distribution/pom.xml

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

packaging/docker-alfresco/pom.xml

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

packaging/pom.xml

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

packaging/tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.7-A2
+SOLR6_TAG=2.0.7-A5
 POSTGRES_TAG=14.4
 ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

packaging/tests/pom.xml

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

packaging/tests/tas-cmis/pom.xml

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

packaging/tests/tas-email/pom.xml

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

packaging/tests/tas-integration/pom.xml

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

packaging/tests/tas-restapi/pom.xml

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

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

@@ -52,6 +52,11 @@ This must be unique within the parent category.
     */
     private long count;
 
+    /**
+     The path to this category.
+     */
+    private String path;
+
     public String getId()
     {
         return this.id;
@@ -102,6 +107,14 @@ This must be unique within the parent category.
         this.count = count;
     }
 
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
     @Override
     public boolean equals(Object o)
     {
@@ -126,6 +139,7 @@ This must be unique within the parent category.
                 ", parentId='" + parentId + '\'' +
                 ", hasChildren=" + hasChildren +
                 ", count=" + count +
+                ", path=" + path +
                 '}';
     }
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestLimitsModel.java

@@ -0,0 +1,82 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2023 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.search;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RestRequestLimitsModel extends TestModel implements IRestModel<RestRequestLimitsModel>
+{
+    @JsonProperty
+    RestRequestLimitsModel model;
+
+    private Integer permissionEvaluationTime;
+    private Integer permissionEvaluationCount;
+    private Integer trackTotalHitsLimit;
+
+    @Override
+    public RestRequestLimitsModel onModel()
+    {
+        return model;
+    }
+    
+    public RestRequestLimitsModel(Integer permissionEvaluationTime, Integer permissionEvaluationCount,
+            Integer trackTotalHitsLimit)
+    {
+        super();
+        this.permissionEvaluationTime = permissionEvaluationTime;
+        this.permissionEvaluationCount = permissionEvaluationCount;
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
+    }
+
+    public Integer getPermissionEvaluationTime()
+    {
+        return permissionEvaluationTime;
+    }
+    public void setPermissionEvaluationTime(Integer permissionEvaluationTime)
+    {
+        this.permissionEvaluationTime = permissionEvaluationTime;
+    }
+    public Integer getPermissionEvaluationCount()
+    {
+        return permissionEvaluationCount;
+    }
+    public void setPermissionEvaluationCount(Integer permissionEvaluationCount)
+    {
+        this.permissionEvaluationCount = permissionEvaluationCount;
+    }
+    public Integer getTrackTotalHitsLimit()
+    {
+        return trackTotalHitsLimit;
+    }
+    public void setTrackTotalHitsLimit(Integer trackTotalHitsLimit)
+    {
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
+    }
+}
+ 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java

@@ -76,6 +76,7 @@ public class SearchRequest extends TestModel
     String facetFormat;
     List<String> include;
     List<SortClause> sort;
+    RestRequestLimitsModel limits;
 
     public SearchRequest()
     {
@@ -279,4 +280,15 @@ public class SearchRequest extends TestModel
 
         return this;
     }
+
+    public RestRequestLimitsModel getLimits()
+    {
+        return limits;
+    }
+
+    public void setLimits(RestRequestLimitsModel limits)
+    {
+        this.limits = limits;
+    }
+
 }

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/CategoriesPathTests.java

@@ -0,0 +1,223 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2023 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.categories;
+
+import static org.alfresco.utility.data.RandomData.getRandomName;
+import static org.alfresco.utility.report.log.Step.STEP;
+import static org.springframework.http.HttpStatus.CREATED;
+import static org.springframework.http.HttpStatus.OK;
+import static org.testng.Assert.assertTrue;
+
+import org.alfresco.dataprep.CMISUtil;
+import org.alfresco.rest.model.RestCategoryLinkBodyModel;
+import org.alfresco.rest.model.RestCategoryModel;
+import org.alfresco.rest.model.RestCategoryModelsCollection;
+import org.alfresco.utility.Utility;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TestGroup;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class CategoriesPathTests extends CategoriesRestTest
+{
+    private FileModel file;
+    private RestCategoryModel category;
+
+    @BeforeClass(alwaysRun = true)
+    @Override
+    public void dataPreparation() throws Exception
+    {
+        STEP("Create user and site");
+        user = dataUser.createRandomTestUser();
+        SiteModel site = dataSite.usingUser(user).createPublicRandomSite();
+
+        STEP("Create a folder, file in it and a category");
+        FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
+        file = dataContent.usingUser(user).usingResource(folder).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
+        category = prepareCategoryUnderRoot();
+
+        STEP("Wait for indexing to complete");
+        Utility.sleep(1000, 60000, () -> restClient.authenticateUser(user)
+                .withCoreAPI()
+                .usingCategory(category)
+                .include(INCLUDE_PATH_PARAM)
+                .getCategory()
+                .assertThat()
+                .field(FIELD_PATH)
+                .isNotNull());
+    }
+
+    /**
+     * Verify path for a category got by ID.
+     */
+    @Test(groups = { TestGroup.REST_API })
+    public void testGetCategoryById_includePath()
+    {
+        STEP("Get category and verify if path is a general path for categories");
+        final RestCategoryModel actualCategory = restClient.authenticateUser(user)
+                .withCoreAPI()
+                .usingCategory(category)
+                .include(INCLUDE_PATH_PARAM)
+                .getCategory();
+
+        restClient.assertStatusCodeIs(OK);
+        actualCategory.assertThat().field(FIELD_ID).is(category.getId());
+        actualCategory.assertThat().field(FIELD_PATH).is("/categories/General");
+    }
+
+    /**
+     * Verify path for category.
+     */
+    @Test(groups = { TestGroup.REST_API })
+    public void testGetCategories_includePath()
+    {
+        STEP("Get few categories and verify its paths");
+        final RestCategoryModel parentCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
+        final RestCategoryModelsCollection actualCategories = restClient.authenticateUser(user)
+                .withCoreAPI()
+                .usingCategory(parentCategory)
+                .include(INCLUDE_PATH_PARAM)
+                .getCategoryChildren();
+
+        restClient.assertStatusCodeIs(OK);
+        assertTrue(actualCategories.getEntries().stream()
+                .map(RestCategoryModel::onModel)
+                .allMatch(cat -> cat.getPath().equals("/categories/General")));
+    }
+
+    /**
+     * Verify path for child category.
+     */
+    @Test(groups = { TestGroup.REST_API })
+    public void testGetChildCategory_includePath()
+    {
+        STEP("Create parent and child categories");
+        final RestCategoryModel parentCategory = prepareCategoryUnderRoot();
+        final RestCategoryModel childCategory = prepareCategoryUnder(parentCategory);
+
+        STEP("Verify path for created child categories");
+        final RestCategoryModelsCollection actualCategories = restClient.authenticateUser(user)
+                .withCoreAPI()
+                .usingCategory(parentCategory)
+                .include(INCLUDE_PATH_PARAM)
+                .getCategoryChildren();
+
+        restClient.assertStatusCodeIs(OK);
+        actualCategories.getEntries().stream()
+                .map(RestCategoryModel::onModel)
+                .forEach(cat -> cat.assertThat().field(FIELD_PATH).is("/categories/General/" + parentCategory.getName()));
+    }
+
+    /**
+     * Create category and verify that it has a path.
+     */
+    @Test(groups = { TestGroup.REST_API })
+    public void testCreateCategory_includingPath()
+    {
+        STEP("Create a category under root and verify if path is a general path for categories");
+        final String categoryName = getRandomName("Category");
+        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
+        final RestCategoryModel aCategory = createCategoryModelWithName(categoryName);
+        final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser())
+                .withCoreAPI()
+                .include(INCLUDE_PATH_PARAM)
+                .usingCategory(rootCategory)
+                .createSingleCategory(aCategory);
+
+        restClient.assertStatusCodeIs(CREATED);
+        createdCategory.assertThat().field(FIELD_NAME).is(categoryName);
+        createdCategory.assertThat().field(FIELD_PATH).is("/categories/General");
+    }
+
+    /**
+     * Update category and verify that it has a path.
+     */
+    @Test(groups = { TestGroup.REST_API })
+    public void testUpdateCategory_includePath()
+    {
+        STEP("Update linked category and verify if path is a general path for categories");
+        final String categoryNewName = getRandomName("NewCategoryName");
+        final RestCategoryModel fixedCategoryModel = createCategoryModelWithName(categoryNewName);
+        final RestCategoryModel updatedCategory = restClient.authenticateUser(dataUser.getAdminUser())
+                .withCoreAPI()
+                .usingCategory(category)
+                .include(INCLUDE_PATH_PARAM)
+                .updateCategory(fixedCategoryModel);
+
+        restClient.assertStatusCodeIs(OK);
+        updatedCategory.assertThat().field(FIELD_ID).is(category.getId());
+        updatedCategory.assertThat().field(FIELD_PATH).is("/categories/General");
+    }
+
+    /**
+     * Link node to categories and verify that they have path.
+     */
+    @Test(groups = { TestGroup.REST_API })
+    public void testLinkNodeToCategories_includePath()
+    {
+        STEP("Link node to categories and verify if path is a general path");
+        final RestCategoryLinkBodyModel categoryLinkModel = createCategoryLinkModelWithId(category.getId());
+        final RestCategoryModel linkedCategory = restClient.authenticateUser(dataUser.getAdminUser())
+                .withCoreAPI()
+                .usingNode(file)
+                .include(INCLUDE_PATH_PARAM)
+                .linkToCategory(categoryLinkModel);
+
+        restClient.assertStatusCodeIs(CREATED);
+        linkedCategory.assertThat().field(FIELD_ID).is(category.getId());
+        linkedCategory.assertThat().field(FIELD_PATH).is("/categories/General");
+    }
+
+    /**
+     * List categories for given node and verify that they have a path.
+     */
+    @Test(groups = { TestGroup.REST_API })
+    public void testListCategoriesForNode_includePath()
+    {
+        STEP("Link file to category");
+        final RestCategoryLinkBodyModel categoryLink = createCategoryLinkModelWithId(category.getId());
+        final RestCategoryModel linkedCategory = restClient.authenticateUser(dataUser.getAdminUser())
+                .withCoreAPI()
+                .usingNode(file)
+                .include(INCLUDE_PATH_PARAM)
+                .linkToCategory(categoryLink);
+
+        STEP("Get linked category and verify if path is a general path");
+        final RestCategoryModelsCollection linkedCategories = restClient.authenticateUser(dataUser.getAdminUser())
+                .withCoreAPI()
+                .usingNode(file)
+                .include(INCLUDE_PATH_PARAM)
+                .getLinkedCategories();
+
+        restClient.assertStatusCodeIs(OK);
+        linkedCategories.assertThat().entriesListCountIs(1);
+        linkedCategories.getEntries().get(0).onModel().assertThat().field(FIELD_ID).is(category.getId());
+        linkedCategories.getEntries().get(0).onModel().assertThat().field(FIELD_PATH).is("/categories/General");
+    }
+}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/CategoriesRestTest.java

@@ -46,6 +46,7 @@ import org.testng.annotations.BeforeClass;
 abstract class CategoriesRestTest extends RestTest
 {
     protected static final String INCLUDE_COUNT_PARAM = "count";
+    protected static final String INCLUDE_PATH_PARAM = "path";
     protected static final String ROOT_CATEGORY_ID = "-root-";
     protected static final String CATEGORY_NAME_PREFIX = "CategoryName";
     protected static final String FIELD_NAME = "name";
@@ -53,6 +54,7 @@ abstract class CategoriesRestTest extends RestTest
     protected static final String FIELD_PARENT_ID = "parentId";
     protected static final String FIELD_HAS_CHILDREN = "hasChildren";
     protected static final String FIELD_COUNT = "count";
+    protected static final String FIELD_PATH = "path";
 
     protected UserModel user;
 

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagTests.java

@@ -26,7 +26,7 @@ public class GetTagTests extends TagsDataPrep
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION, description = "Verify admin user gets tag using REST API and status code is OK (200)")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
-    public void adminIsAbleToGetTag() throws Exception
+    public void adminIsAbleToGetTag()
     {
         RestTagModel returnedTag = restClient.authenticateUser(adminUserModel).withCoreAPI().getTag(documentTag);
         restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -35,7 +35,7 @@ public class GetTagTests extends TagsDataPrep
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.SANITY, description = "Verify user with Manager role gets tag using REST API and status code is OK (200)")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.SANITY })
-    public void userWithManagerRoleIsAbleToGetTag() throws Exception
+    public void userWithManagerRoleIsAbleToGetTag()
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager));
 
@@ -47,7 +47,7 @@ public class GetTagTests extends TagsDataPrep
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION, description = "Verify user with Collaborator role gets tag using REST API and status code is OK (200)")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
-    public void userWithCollaboratorRoleIsAbleToGetTag() throws Exception
+    public void userWithCollaboratorRoleIsAbleToGetTag()
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator));
         RestTagModel returnedTag = restClient.withCoreAPI().getTag(documentTag);
@@ -57,7 +57,7 @@ public class GetTagTests extends TagsDataPrep
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION, description = "Verify user with Contributor role gets tag using REST API and status code is OK (200)")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
-    public void userWithContributorRoleIsAbleToGetTag() throws Exception
+    public void userWithContributorRoleIsAbleToGetTag()
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor));
         RestTagModel returnedTag = restClient.withCoreAPI().getTag(documentTag);
@@ -67,7 +67,7 @@ public class GetTagTests extends TagsDataPrep
     
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION, description = "Verify user with Consumer role gets tag using REST API and status code is OK (200)")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
-    public void userWithConsumerRoleIsAbleToGetTag() throws Exception
+    public void userWithConsumerRoleIsAbleToGetTag()
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
         RestTagModel returnedTag = restClient.withCoreAPI().getTag(documentTag);
@@ -78,7 +78,7 @@ public class GetTagTests extends TagsDataPrep
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.SANITY, description = "Verify Manager user gets status code 401 if authentication call fails")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.SANITY })
 //    @Bug(id="MNT-16904", description = "It fails only on environment with tenants")
-    public void managerIsNotAbleToGetTagIfAuthenticationFails() throws Exception
+    public void managerIsNotAbleToGetTagIfAuthenticationFails()
     {
         UserModel managerUser = dataUser.usingAdmin().createRandomTestUser();
         String managerPassword = managerUser.getPassword();
@@ -92,7 +92,7 @@ public class GetTagTests extends TagsDataPrep
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION,
             description = "Verify that if tag id is invalid status code returned is 400")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
-    public void invalidTagIdTest() throws Exception
+    public void invalidTagIdTest()
     {
         String tagId = documentTag.getId();
         documentTag.setId("random_tag_value");
@@ -104,7 +104,7 @@ public class GetTagTests extends TagsDataPrep
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS },
             executionType = ExecutionType.REGRESSION, description = "Check that properties filter is applied when getting tag using Manager user.")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
-    public void checkPropertiesFilterIsApplied() throws Exception
+    public void checkPropertiesFilterIsApplied()
     {
         RestTagModel returnedTag = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager))
                 .withParams("properties=id,tag").withCoreAPI().getTag(documentTag);
@@ -117,7 +117,7 @@ public class GetTagTests extends TagsDataPrep
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS },
             executionType = ExecutionType.REGRESSION, description = "Check that Manager user can get tag of a folder.")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
-    public void getTagOfAFolder() throws Exception
+    public void getTagOfAFolder()
     {
         RestTagModel returnedTag = restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager))
                 .withCoreAPI().getTag(folderTag);
@@ -128,7 +128,7 @@ public class GetTagTests extends TagsDataPrep
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS },
             executionType = ExecutionType.REGRESSION, description = "Check default error model schema. Use invalid skipCount parameter.")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
-    public void checkDefaultErrorModelSchema() throws Exception
+    public void checkDefaultErrorModelSchema()
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager))
                 .withParams("skipCount=abc").withCoreAPI().getTag(documentTag);
@@ -140,13 +140,14 @@ public class GetTagTests extends TagsDataPrep
     }
 
     /**
-     * Verify that count field is not present for searched tag.
+     * Verify that count field is not present for searched tag when not requested.
      */
     @Test(groups = {TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION})
     public void testGetTag_notIncludingCount()
     {
         STEP("Create single tag as admin");
-        final RestTagModel tagModel = createTagModelWithName(getRandomName(TAG_NAME_PREFIX).toLowerCase());
+        String tagName = getRandomName(TAG_NAME_PREFIX).toLowerCase();
+        final RestTagModel tagModel = createTagModelWithName(tagName);
         final RestTagModel createdTag = restClient.authenticateUser(adminUserModel).withCoreAPI().createSingleTag(tagModel);
 
         restClient.assertStatusCodeIs(CREATED);
@@ -155,8 +156,26 @@ public class GetTagTests extends TagsDataPrep
         final RestTagModel searchedTag = restClient.withCoreAPI().getTag(createdTag);
 
         restClient.assertStatusCodeIs(OK);
-        searchedTag.assertThat().field(FIELD_TAG).is(tagModel.getTag())
-                .assertThat().field(FIELD_ID).isNotEmpty()
-                .assertThat().field(FIELD_COUNT).isNull();
+        RestTagModel expected = RestTagModel.builder().id(createdTag.getId()).tag(tagName).create();
+        searchedTag.assertThat().isEqualTo(expected);
+    }
+
+    /**
+     * Check that the count field can be included.
+     */
+    @Test (groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTag_includeCount()
+    {
+        STEP("Create unused tag as admin");
+        String tagName = getRandomName(TAG_NAME_PREFIX).toLowerCase();
+        RestTagModel tagModel = createTagModelWithName(tagName);
+        RestTagModel createdTag = restClient.authenticateUser(adminUserModel).withCoreAPI().createSingleTag(tagModel);
+
+        STEP("Get a single tag with the count field");
+        RestTagModel searchedTag = restClient.withCoreAPI().include("count").getTag(createdTag);
+
+        restClient.assertStatusCodeIs(OK);
+        RestTagModel expected = RestTagModel.builder().id(createdTag.getId()).tag(tagName).count(0).create();
+        searchedTag.assertThat().isEqualTo(expected);
     }
 }

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagsTests.java

@@ -2,6 +2,7 @@ package org.alfresco.rest.tags;
 
 import static org.alfresco.utility.data.RandomData.getRandomName;
 import static org.alfresco.utility.report.log.Step.STEP;
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.OK;
 
 import java.util.Set;
@@ -16,6 +17,11 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.Test;
 
+import java.util.Set;
+import java.util.stream.IntStream;
+
+import static org.alfresco.utility.report.log.Step.STEP;
+
 @Test(groups = {TestGroup.REQUIRE_SOLR})
 public class GetTagsTests extends TagsDataPrep
 {
@@ -72,6 +78,138 @@ public class GetTagsTests extends TagsDataPrep
             .and().entriesListContains("tag", documentTagValue2);
     }
 
+    /**
+     * Include count in the query parameters and ensure count is as expected for returned tags.
+     */
+    @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTags_withIncludeCount()
+    {
+        STEP("Get tags including count filter and ensure count is as expected for returned tags");
+        returnedCollection = restClient.authenticateUser(adminUserModel)
+                .withParams("include=count")
+                .withCoreAPI()
+                .getTags();
+        restClient.assertStatusCodeIs(OK);
+
+        returnedCollection.getEntries().stream()
+                .filter(e -> e.onModel().getTag().equals(folderTagValue) || e.onModel().getTag().equals(documentTagValue))
+                .forEach(e -> e.onModel().assertThat().field("count").is(2));
+
+        returnedCollection.getEntries().stream()
+                .filter(e -> e.onModel().getTag().equals(documentTagValue2))
+                .forEach(e -> e.onModel().assertThat().field("count").is(1));
+    }
+
+    /**
+     * Get tags and order results by count. Default sort order should be ascending
+     */
+    @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTags_withOrderByCountDefaultOrderShouldBeAsc()
+    {
+        STEP("Get tags and order results by count. Default sort order should be ascending");
+        returnedCollection = restClient.authenticateUser(adminUserModel)
+                .withParams("include=count&orderBy=count")
+                .withCoreAPI()
+                .getTags();
+
+        restClient.assertStatusCodeIs(OK);
+        returnedCollection.assertThat().entriesListIsSortedAscBy("count");
+    }
+
+    /**
+     * Get tags and order results by count in ascending order
+     */
+    @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTags_withOrderByCountAsc()
+    {
+        STEP("Get tags and order results by count in ascending order");
+        returnedCollection = restClient.authenticateUser(adminUserModel)
+                .withParams("include=count&orderBy=count ASC")
+                .withCoreAPI()
+                .getTags();
+
+        restClient.assertStatusCodeIs(OK);
+        returnedCollection.assertThat().entriesListIsSortedAscBy("count");
+    }
+
+    /**
+     * Get tags and order results by count in descending order
+     */
+    @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTags_withOrderByCountDesc()
+    {
+        STEP("Get tags and order results by count in descending order");
+        returnedCollection = restClient.authenticateUser(adminUserModel)
+                .withParams("include=count&orderBy=count DESC")
+                .withCoreAPI()
+                .getTags();
+
+        restClient.assertStatusCodeIs(OK);
+        returnedCollection.assertThat().entriesListIsSortedDescBy("count");
+    }
+
+    /**
+     * Get tags and order results by tag name. Default sort order should be ascending
+     */
+    @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTags_withOrderByTagDefaultOrderShouldBeAsc()
+    {
+        STEP("Get tags and order results by tag name. Default sort order should be ascending");
+        returnedCollection = restClient.authenticateUser(adminUserModel)
+                .withParams("orderBy=tag")
+                .withCoreAPI()
+                .getTags();
+
+        restClient.assertStatusCodeIs(OK);
+        returnedCollection.assertThat().entriesListIsSortedAscBy("tag");
+    }
+
+    /**
+     * Get tags and order results by tag name in ascending order
+     */
+    @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTags_withOrderByTagAsc()
+    {
+        STEP("Get tags and order results by tag name in ascending order");
+        returnedCollection = restClient.authenticateUser(adminUserModel)
+                .withParams("orderBy=tag ASC")
+                .withCoreAPI()
+                .getTags();
+
+        restClient.assertStatusCodeIs(OK);
+        returnedCollection.assertThat().entriesListIsSortedAscBy("tag");
+    }
+
+    /**
+     * Get tags and order results by tag name in descending order
+     */
+    @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTags_withOrderByTagDesc()
+    {
+        STEP("Get tags and order results by tag name in descending order");
+        returnedCollection = restClient.authenticateUser(adminUserModel)
+                .withParams("orderBy=tag DESC")
+                .withCoreAPI()
+                .getTags();
+
+        restClient.assertStatusCodeIs(OK);
+        returnedCollection.assertThat().entriesListIsSortedDescBy("tag");
+    }
+
+    /**
+     * Ensure that we get a 400 error when we request to order by count without also including the tag count.
+     */
+    @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
+    public void testGetTags_orderByCountWithoutIncludeCount()
+    {
+        restClient.authenticateUser(adminUserModel)
+                .withParams("orderBy=count")
+                .withCoreAPI()
+                .getTags();
+
+        restClient.assertStatusCodeIs(BAD_REQUEST);
+    }
+
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.SANITY, description = "Failed authentication get tags call returns status code 401 with Manager role")
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.SANITY })
 //    @Bug(id="MNT-16904", description = "It fails only on environment with tenants")
@@ -193,8 +331,7 @@ public class GetTagsTests extends TagsDataPrep
                 .getPagination().assertThat().field("maxItems").is(100)
                 .and().field("hasMoreItems").is("false")
                 .and().field("count").is("0")
-                .and().field("skipCount").is(20000)
-                .and().field("totalItems").is(0);
+                .and().field("skipCount").is(20000);
     }
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION,

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/TagsDataPrep.java

@@ -22,7 +22,8 @@ public class TagsDataPrep extends RestTest
     protected static ListUserWithRoles usersWithRoles;
     protected static SiteModel siteModel;
     protected static FileModel document;
-    protected static FolderModel folder;
+    protected static FolderModel folder, folder2;
+    protected static RestTagModelsCollection folder2tags;
     protected static String documentTagValue, documentTagValue2, folderTagValue;
     protected static RestTagModel documentTag, documentTag2, folderTag, orphanTag, returnedModel;
     protected static RestTagModelsCollection returnedCollection;
@@ -38,6 +39,7 @@ public class TagsDataPrep extends RestTest
         usersWithRoles = dataUser.usingAdmin().addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor);
         document = dataContent.usingUser(adminUserModel).usingSite(siteModel).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
         folder = dataContent.usingUser(adminUserModel).usingSite(siteModel).createFolder();
+        folder2 = dataContent.usingUser(adminUserModel).usingSite(siteModel).createFolder();
 
         documentTagValue = RandomData.getRandomName("tag").toLowerCase();
         documentTagValue2 = RandomData.getRandomName("tag").toLowerCase();
@@ -48,6 +50,7 @@ public class TagsDataPrep extends RestTest
         documentTag2 = restClient.withCoreAPI().usingResource(document).addTag(documentTagValue2);
         folderTag = restClient.withCoreAPI().usingResource(folder).addTag(folderTagValue);
         orphanTag = restClient.withCoreAPI().createSingleTag(RestTagModel.builder().tag(RandomData.getRandomName("orphan-tag").toLowerCase()).create());
+        folder2tags = restClient.withCoreAPI().usingResource(folder2).addTags(folderTagValue, documentTagValue);
 
         // Allow indexing to complete.
         Utility.sleep(500, 60000, () ->

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java

@@ -305,7 +305,24 @@ public class UpdateTagTests extends TagsDataPrep
         returnedModel = restClient.authenticateUser(adminUserModel).withCoreAPI().usingTag(orphanTag).update(newTagName);
 
         restClient.assertStatusCodeIs(HttpStatus.OK);
-        returnedModel.assertThat().field("tag").is(newTagName);
-        returnedModel.assertThat().field("id").isNotNull();
+        RestTagModel expected = RestTagModel.builder().id(orphanTag.getId()).tag(newTagName).create();
+        returnedModel.assertThat().isEqualTo(expected);
+    }
+
+    @Test (groups = { TestGroup.REST_API, TestGroup.TAGS })
+    public void canUpdateTagAndGetCount()
+    {
+        STEP("Create an orphaned tag");
+        String tagName = RandomData.getRandomName("tag").toLowerCase();
+        RestTagModel createdTag = RestTagModel.builder().tag(tagName).create();
+        RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().createSingleTag(createdTag);
+
+        STEP("Update tag and request the count field");
+        String newTagName = RandomData.getRandomName("new").toLowerCase();
+        returnedModel = restClient.authenticateUser(adminUserModel).withCoreAPI().include("count").usingTag(tag).update(newTagName);
+
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+        RestTagModel expected = RestTagModel.builder().id(tag.getId()).tag(newTagName).count(0).create();
+        returnedModel.assertThat().isEqualTo(expected);
     }
 }

packaging/tests/tas-webdav/pom.xml

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

packaging/war/pom.xml

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

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>20.140</version>
+    <version>21.9</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -25,7 +25,7 @@
     <properties>
         <acs.version.major>7</acs.version.major>
         <acs.version.minor>4</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.revision>1</acs.version.revision>
         <acs.version.label />
         <amp.min.version>${acs.version.major}.0.0</amp.min.version>
 
@@ -52,17 +52,17 @@
         <dependency.alfresco-messaging-repo.version>1.2.20</dependency.alfresco-messaging-repo.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-service.version>2.1.0-A5</dependency.alfresco-transform-service.version>
-        <dependency.alfresco-transform-core.version>3.1.0-A5</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>2.1.0</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>3.1.0</dependency.alfresco-transform-core.version>
         <dependency.alfresco-greenmail.version>6.5</dependency.alfresco-greenmail.version>
         <dependency.acs-event-model.version>0.0.18</dependency.acs-event-model.version>
 
-        <dependency.spring.version>5.3.25</dependency.spring.version>
+        <dependency.spring.version>5.3.27</dependency.spring.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
         <dependency.jackson.version>2.15.0-rc1</dependency.jackson.version>
         <dependency.cxf.version>3.5.5</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.40</dependency.webscripts.version>
+        <dependency.webscripts.version>8.44</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
         <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
         <dependency.assertj.version>3.24.2</dependency.assertj.version>
@@ -79,7 +79,7 @@
         <dependency.gytheio.version>0.18</dependency.gytheio.version>
         <dependency.groovy.version>3.0.16</dependency.groovy.version>
         <dependency.tika.version>2.4.1</dependency.tika.version>
-        <dependency.spring-security.version>5.8.2</dependency.spring-security.version>
+        <dependency.spring-security.version>5.8.3</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>5.2.2</dependency.poi.version>
         <dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.version>
@@ -111,8 +111,8 @@
         <dependency.json-smart.version>2.4.10</dependency.json-smart.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
-        <alfresco.googledrive.version>3.4.0-M1</alfresco.googledrive.version>
-        <alfresco.aos-module.version>1.6.0-A4</alfresco.aos-module.version>
+        <alfresco.googledrive.version>3.4.0</alfresco.googledrive.version>
+        <alfresco.aos-module.version>1.6.0</alfresco.aos-module.version>
         <alfresco.api-explorer.version>7.3.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
@@ -150,7 +150,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>20.140</tag>
+        <tag>21.9</tag>
     </scm>
 
     <distributionManagement>
@@ -936,7 +936,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.42.0</version>
+                    <version>0.42.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>

remote-api/pom.xml

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

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

@@ -38,10 +38,10 @@ import org.alfresco.service.cmr.repository.StoreRef;
 public interface Tags
 {
     List<Tag> addTags(String nodeId, List<Tag> tags, Parameters parameters);
-    Tag getTag(StoreRef storeRef, String tagId);
+    Tag getTag(StoreRef storeRef, String tagId, Parameters parameters);
     void deleteTag(String nodeId, String tagId);
     CollectionWithPagingInfo<Tag> getTags(StoreRef storeRef, Parameters params);
-    Tag changeTag(StoreRef storeRef, String tagId, Tag tag);
+    Tag changeTag(StoreRef storeRef, String tagId, Tag tag, Parameters parameters);
     CollectionWithPagingInfo<Tag> getTags(String nodeId, Parameters params);
 
     @Experimental

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

@@ -111,6 +111,11 @@ public class CategoriesImpl implements Categories
             category.setCount(categoriesCount.getOrDefault(category.getId(), 0));
         }
 
+        if (parameters.getInclude().contains(Nodes.PARAM_INCLUDE_PATH))
+        {
+            category.setPath(getCategoryPath(category));
+        }
+
         return category;
     }
 
@@ -128,6 +133,10 @@ public class CategoriesImpl implements Categories
                     {
                         category.setCount(0);
                     }
+                    if (parameters.getInclude().contains(Nodes.PARAM_INCLUDE_PATH))
+                    {
+                        category.setPath(getCategoryPath(category));
+                    }
                 })
                 .collect(Collectors.toList());
     }
@@ -136,11 +145,18 @@ public class CategoriesImpl implements Categories
     public List<Category> getCategoryChildren(final StoreRef storeRef, final String parentCategoryId, final Parameters parameters)
     {
         final NodeRef parentNodeRef = getCategoryNodeRef(storeRef, parentCategoryId);
-        final List<Category> categories = nodeService.getChildAssocs(parentNodeRef).stream()
-            .filter(ca -> ContentModel.ASSOC_SUBCATEGORIES.equals(ca.getTypeQName()))
-            .map(ChildAssociationRef::getChildRef)
-            .map(this::mapToCategory)
-            .collect(Collectors.toList());
+        final List<Category> categories = nodeService.getChildAssocs(parentNodeRef)
+                .stream()
+                .filter(ca -> ContentModel.ASSOC_SUBCATEGORIES.equals(ca.getTypeQName()))
+                .map(ChildAssociationRef::getChildRef)
+                .map(this::mapToCategory)
+                .peek(category -> {
+                    if (parameters.getInclude().contains(Nodes.PARAM_INCLUDE_PATH))
+                    {
+                        category.setPath(getCategoryPath(category));
+                    }
+                })
+                .collect(Collectors.toList());
 
         if (parameters.getInclude().contains(INCLUDE_COUNT_PARAM))
         {
@@ -170,6 +186,11 @@ public class CategoriesImpl implements Categories
             category.setCount(categoriesCount.getOrDefault(category.getId(), 0));
         }
 
+        if (parameters.getInclude().contains(Nodes.PARAM_INCLUDE_PATH))
+        {
+            category.setPath(getCategoryPath(category));
+        }
+
         return category;
     }
 
@@ -200,7 +221,16 @@ public class CategoriesImpl implements Categories
         }
         final Collection<NodeRef> actualCategories = DefaultTypeConverter.INSTANCE.getCollection(NodeRef.class, currentCategories);
 
-        return actualCategories.stream().map(this::mapToCategory).collect(Collectors.toList());
+        return actualCategories
+                .stream()
+                .map(this::mapToCategory)
+                .peek(category -> {
+                    if (parameters.getInclude().contains(Nodes.PARAM_INCLUDE_PATH))
+                    {
+                        category.setPath(getCategoryPath(category));
+                    }
+                })
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -230,7 +260,16 @@ public class CategoriesImpl implements Categories
 
         linkNodeToCategories(contentNodeRef, categoryNodeRefs);
 
-        return categoryNodeRefs.stream().map(this::mapToCategory).collect(Collectors.toList());
+        return categoryNodeRefs
+                .stream()
+                .map(this::mapToCategory)
+                .peek(category -> {
+                    if (parameters.getInclude().contains(Nodes.PARAM_INCLUDE_PATH))
+                    {
+                        category.setPath(getCategoryPath(category));
+                    }
+                })
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -475,4 +514,16 @@ public class CategoriesImpl implements Categories
             .stream()
             .collect(Collectors.toMap(pair -> pair.getFirst().toString().replace(idPrefix, StringUtils.EMPTY), Pair::getSecond));
     }
+
+    /**
+     * Get path for a given category in human-readable form.
+     *
+     * @param category Category to provide path for.
+     * @return Path for a category in human-readable form.
+     */
+    private String getCategoryPath(final Category category)
+    {
+        final NodeRef categoryNodeRef = nodes.getNode(category.getId()).getNodeRef();
+        return nodeService.getPath(categoryNodeRef).toDisplayPath(nodeService, permissionService);
+    }
 }

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

@@ -30,11 +30,13 @@ import static java.util.stream.Collectors.toList;
 import static org.alfresco.rest.antlr.WhereClauseParser.EQUALS;
 import static org.alfresco.rest.antlr.WhereClauseParser.IN;
 import static org.alfresco.rest.antlr.WhereClauseParser.MATCHES;
+import static org.alfresco.service.cmr.repository.StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
 import static org.alfresco.service.cmr.tagging.TaggingService.TAG_ROOT_NODE_REF;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -43,6 +45,8 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.ListBackedPagingResults;
 import org.alfresco.query.PagingResults;
 import org.alfresco.repo.tagging.NonExistentTagException;
 import org.alfresco.repo.tagging.TagExistsException;
@@ -59,10 +63,12 @@ import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationE
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
 import org.alfresco.rest.framework.resource.parameters.where.Query;
 import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
 import org.alfresco.rest.framework.resource.parameters.where.QueryImpl;
 import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
@@ -80,40 +86,40 @@ import org.apache.commons.collections.CollectionUtils;
  */
 public class TagsImpl implements Tags
 {
-	private static final String PARAM_INCLUDE_COUNT = "count";
-	private static final String PARAM_WHERE_TAG = "tag";
-	static final String NOT_A_VALID_TAG = "An invalid parameter has been supplied";
-	static final String NO_PERMISSION_TO_MANAGE_A_TAG = "Current user does not have permission to manage a tag";
+    public static final String PARAM_INCLUDE_COUNT = "count";
+    private static final String PARAM_WHERE_TAG = "tag";
+    static final String NOT_A_VALID_TAG = "An invalid parameter has been supplied";
+    static final String NO_PERMISSION_TO_MANAGE_A_TAG = "Current user does not have permission to manage a tag";
 
     private Nodes nodes;
-	private NodeService nodeService;
-	private TaggingService taggingService;
-	private TypeConstraint typeConstraint;
-	private AuthorityService authorityService;
+    private NodeService nodeService;
+    private TaggingService taggingService;
+    private TypeConstraint typeConstraint;
+    private AuthorityService authorityService;
 
-	public void setTypeConstraint(TypeConstraint typeConstraint)
-	{
-		this.typeConstraint = typeConstraint;
-	}
-
-	public void setNodes(Nodes nodes)
+    public void setTypeConstraint(TypeConstraint typeConstraint)
     {
-		this.nodes = nodes;
-	}
-	public void setNodeService(NodeService nodeService)
-	{
-		this.nodeService = nodeService;
-	}
-	
+        this.typeConstraint = typeConstraint;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
     public void setTaggingService(TaggingService taggingService)
     {
-		this.taggingService = taggingService;
-	}
+        this.taggingService = taggingService;
+    }
 
-	public void setAuthorityService(AuthorityService authorityService)
-	{
-		this.authorityService = authorityService;
-	}
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
 
     public List<Tag> addTags(String nodeId, final List<Tag> tags, final Parameters parameters)
     {
@@ -128,14 +134,15 @@ public class TagsImpl implements Tags
         {
             List<Pair<String, NodeRef>> tagNodeRefs = taggingService.addTags(nodeRef, tagValues);
             List<Tag> ret = new ArrayList<>(tags.size());
-			List<Pair<String, Integer>> tagsCountPairList = taggingService.findTaggedNodesAndCountByTagName(nodeRef.getStoreRef());
-			Map<String, Integer> tagsCountMap = tagsCountPairList.stream().collect(Collectors.toMap(Pair::getFirst,Pair::getSecond));
+            List<Pair<String, Integer>> tagsCountPairList = taggingService.findTaggedNodesAndCountByTagName(nodeRef.getStoreRef());
+            Map<String, Long> tagsCountMap = tagsCountPairList.stream().collect(Collectors.toMap(Pair::getFirst, pair -> Long.valueOf(pair.getSecond())));
             for (Pair<String, NodeRef> pair : tagNodeRefs)
             {
-				Tag createdTag = new Tag(pair.getSecond(), pair.getFirst());
-				if (parameters.getInclude().contains(PARAM_INCLUDE_COUNT)) {
-					createdTag.setCount(Optional.ofNullable(tagsCountMap.get(createdTag.getTag())).orElse(0) + 1);
-				}
+                Tag createdTag = new Tag(pair.getSecond(), pair.getFirst());
+                if (parameters.getInclude().contains(PARAM_INCLUDE_COUNT))
+                {
+                    createdTag.setCount(Optional.ofNullable(tagsCountMap.get(createdTag.getTag())).orElse(0L) + 1);
+                }
                 ret.add(createdTag);
             }
             return ret;
@@ -145,105 +152,112 @@ public class TagsImpl implements Tags
             throw new InvalidArgumentException(e.getMessage());
         }
     }
-	
+
     public void deleteTag(String nodeId, String tagId)
     {
-		NodeRef nodeRef = nodes.validateNode(nodeId);
-		getTag(tagId);
-    	NodeRef existingTagNodeRef = validateTag(tagId);
-    	String tagValue = taggingService.getTagName(existingTagNodeRef);
-    	taggingService.removeTag(nodeRef, tagValue);
+        NodeRef nodeRef = nodes.validateNode(nodeId);
+        getTag(STORE_REF_WORKSPACE_SPACESSTORE, tagId, null);
+        NodeRef existingTagNodeRef = validateTag(tagId);
+        String tagValue = taggingService.getTagName(existingTagNodeRef);
+        taggingService.removeTag(nodeRef, tagValue);
     }
 
     @Override
-	public void deleteTagById(StoreRef storeRef, String tagId) {
-		verifyAdminAuthority();
+    public void deleteTagById(StoreRef storeRef, String tagId) {
+        verifyAdminAuthority();
 
-		NodeRef tagNodeRef = validateTag(storeRef, tagId);
-		String tagValue = taggingService.getTagName(tagNodeRef);
-		taggingService.deleteTag(storeRef, tagValue);
-	}
+        NodeRef tagNodeRef = validateTag(storeRef, tagId);
+        String tagValue = taggingService.getTagName(tagNodeRef);
+        taggingService.deleteTag(storeRef, tagValue);
+    }
 
     @Override
     public CollectionWithPagingInfo<Tag> getTags(StoreRef storeRef, Parameters params)
     {
         Paging paging = params.getPaging();
+        Pair<String, Boolean> sorting = !params.getSorting().isEmpty() ? new Pair<>(params.getSorting().get(0).column, params.getSorting().get(0).asc) : null;
         Map<Integer, Collection<String>> namesFilters = resolveTagNamesQuery(params.getQuery());
-        PagingResults<Pair<NodeRef, String>> results = taggingService.getTags(storeRef, Util.getPagingRequest(paging), namesFilters.get(EQUALS), namesFilters.get(MATCHES));
 
-        Integer totalItems = results.getTotalResultCount().getFirst();
-        List<Pair<NodeRef, String>> page = results.getPage();
-        List<Tag> tags = new ArrayList<>(page.size());
-        for (Pair<NodeRef, String> pair : page)
-        {
-            Tag selectedTag = new Tag(pair.getFirst(), pair.getSecond());
-            tags.add(selectedTag);
-        }
+        Map<NodeRef, Long> results = taggingService.getTags(storeRef, params.getInclude(), sorting, namesFilters.get(EQUALS), namesFilters.get(MATCHES));
+
+        List<Tag> tagsList = results.entrySet().stream().map(entry -> new Tag(entry.getKey(), (String)nodeService.getProperty(entry.getKey(), ContentModel.PROP_NAME))).collect(Collectors.toList());
+
         if (params.getInclude().contains(PARAM_INCLUDE_COUNT))
         {
-            List<Pair<String, Integer>> tagsByCount = taggingService.findTaggedNodesAndCountByTagName(storeRef);
-            Map<String, Integer> tagsByCountMap = new HashMap<>();
-            if (tagsByCount != null)
-            {
-                for (Pair<String, Integer> tagByCountElem : tagsByCount)
-                {
-                    tagsByCountMap.put(tagByCountElem.getFirst(), tagByCountElem.getSecond());
-                }
-            }
-            tags.forEach(tag -> tag.setCount(Optional.ofNullable(tagsByCountMap.get(tag.getTag())).orElse(0)));
+            tagsList.forEach(tag -> tag.setCount(results.get(tag.getNodeRef())));
         }
 
-        return CollectionWithPagingInfo.asPaged(paging, tags, results.hasMoreItems(), totalItems);
+        ListBackedPagingResults listBackedPagingResults = new ListBackedPagingResults(tagsList, Util.getPagingRequest(params.getPaging()));
+
+        return CollectionWithPagingInfo.asPaged(paging, listBackedPagingResults.getPage(), listBackedPagingResults.hasMoreItems(), (Integer) listBackedPagingResults.getTotalResultCount().getFirst());
     }
 
     public NodeRef validateTag(String tagId)
     {
-    	NodeRef tagNodeRef = nodes.validateNode(tagId);
-		return checkTagRootAsNodePrimaryParent(tagId, tagNodeRef);
+        NodeRef tagNodeRef = nodes.validateNode(tagId);
+        return checkTagRootAsNodePrimaryParent(tagId, tagNodeRef);
     }
     
     public NodeRef validateTag(StoreRef storeRef, String tagId)
     {
-    	NodeRef tagNodeRef = nodes.validateNode(storeRef, tagId);
-		return checkTagRootAsNodePrimaryParent(tagId, tagNodeRef);
+        NodeRef tagNodeRef = nodes.validateNode(storeRef, tagId);
+        return checkTagRootAsNodePrimaryParent(tagId, tagNodeRef);
     }
 
-    public Tag changeTag(StoreRef storeRef, String tagId, Tag tag)
+    /**
+     * Find the number of times the given tag is used (if requested).
+     *
+     * @param storeRef The store the tag is in.
+     * @param tagName The name of the tag.
+     * @param parameters The request parameters object containing the includes parameter.
+     * @return The number of times the tag is applied, or null if "count" wasn't in the include parameter.
+     */
+    private Long findCountIfRequested(StoreRef storeRef, String tagName, Parameters parameters)
     {
-    	try
-    	{
-	    	NodeRef existingTagNodeRef = validateTag(storeRef, tagId);
-	    	String existingTagName = taggingService.getTagName(existingTagNodeRef);
-	    	String newTagName = tag.getTag();
-	    	NodeRef newTagNodeRef = taggingService.changeTag(storeRef, existingTagName, newTagName);
-	    	return new Tag(newTagNodeRef, newTagName);
-    	}
-    	catch(NonExistentTagException e)
-    	{
-    		throw new NotFoundException(e.getMessage());
-    	}
-    	catch(TagExistsException e)
-    	{
-    		throw new ConstraintViolatedException(e.getMessage());
-    	}
-    	catch(TaggingException e)
-    	{
-    		throw new InvalidArgumentException(e.getMessage());
-    	}
+        Long count = null;
+        if (parameters != null && parameters.getInclude() != null && parameters.getInclude().contains(PARAM_INCLUDE_COUNT))
+        {
+            count = taggingService.findCountByTagName(storeRef, tagName);
+        }
+        return count;
     }
 
-    public Tag getTag(String tagId)
+    @Override
+    public Tag changeTag(StoreRef storeRef, String tagId, Tag tag, Parameters parameters)
     {
-    	return getTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, tagId);
+        try
+        {
+            NodeRef existingTagNodeRef = validateTag(storeRef, tagId);
+            String existingTagName = taggingService.getTagName(existingTagNodeRef);
+            Long count = findCountIfRequested(storeRef, existingTagName, parameters);
+            String newTagName = tag.getTag();
+            NodeRef newTagNodeRef = taggingService.changeTag(storeRef, existingTagName, newTagName);
+            return Tag.builder().nodeRef(newTagNodeRef).tag(newTagName).count(count).create();
+        }
+        catch(NonExistentTagException e)
+        {
+            throw new NotFoundException(e.getMessage());
+        }
+        catch(TagExistsException e)
+        {
+            throw new ConstraintViolatedException(e.getMessage());
+        }
+        catch(TaggingException e)
+        {
+            throw new InvalidArgumentException(e.getMessage());
+        }
     }
 
-    public Tag getTag(StoreRef storeRef, String tagId)
+    @Override
+    public Tag getTag(StoreRef storeRef, String tagId, Parameters parameters)
     {
-    	NodeRef tagNodeRef = validateTag(storeRef, tagId);
-    	String tagValue = taggingService.getTagName(tagNodeRef);
-    	return new Tag(tagNodeRef, tagValue);
+        NodeRef tagNodeRef = validateTag(storeRef, tagId);
+        String tagName = taggingService.getTagName(tagNodeRef);
+        Long count = findCountIfRequested(storeRef, tagName, parameters);
+        return Tag.builder().nodeRef(tagNodeRef).tag(tagName).count(count).create();
     }
 
+    @Override
     public CollectionWithPagingInfo<Tag> getTags(String nodeId, Parameters params)
     {
         NodeRef nodeRef = nodes.validateOrLookupNode(nodeId);
@@ -259,80 +273,80 @@ public class TagsImpl implements Tags
         return CollectionWithPagingInfo.asPaged(params.getPaging(), tags, results.hasMoreItems(), (totalItems == null ? null : totalItems.intValue()));
     }
 
-	@Experimental
-	@Override
-	public List<Tag> createTags(final StoreRef storeRef, final List<Tag> tags, final Parameters parameters)
-	{
-		verifyAdminAuthority();
-		final List<String> tagNames = Optional.ofNullable(tags).orElse(Collections.emptyList()).stream()
-			.filter(Objects::nonNull)
-			.map(Tag::getTag)
-			.distinct()
-			.collect(toList());
+    @Experimental
+    @Override
+    public List<Tag> createTags(final StoreRef storeRef, final List<Tag> tags, final Parameters parameters)
+    {
+        verifyAdminAuthority();
+        final List<String> tagNames = Optional.ofNullable(tags).orElse(Collections.emptyList()).stream()
+            .filter(Objects::nonNull)
+            .map(Tag::getTag)
+            .distinct()
+            .collect(toList());
 
-		if (CollectionUtils.isEmpty(tagNames))
-		{
-			throw new InvalidArgumentException(NOT_A_VALID_TAG);
-		}
+        if (CollectionUtils.isEmpty(tagNames))
+        {
+            throw new InvalidArgumentException(NOT_A_VALID_TAG);
+        }
 
-		return taggingService.createTags(storeRef, tagNames).stream()
-			.map(pair -> Tag.builder().tag(pair.getFirst()).nodeRef(pair.getSecond()).create())
-			.peek(tag -> {
-				if (parameters.getInclude().contains(PARAM_INCLUDE_COUNT))
-				{
-					tag.setCount(0);
-				}
-			}).collect(toList());
-	}
+        return taggingService.createTags(storeRef, tagNames).stream()
+            .map(pair -> Tag.builder().tag(pair.getFirst()).nodeRef(pair.getSecond()).create())
+            .peek(tag -> {
+                if (parameters.getInclude().contains(PARAM_INCLUDE_COUNT))
+                {
+                    tag.setCount(0L);
+                }
+            }).collect(toList());
+    }
 
-	private void verifyAdminAuthority()
-	{
-		if (!authorityService.hasAdminAuthority())
-		{
-			throw new PermissionDeniedException(NO_PERMISSION_TO_MANAGE_A_TAG);
-		}
-	}
+    private void verifyAdminAuthority()
+    {
+        if (!authorityService.hasAdminAuthority())
+        {
+            throw new PermissionDeniedException(NO_PERMISSION_TO_MANAGE_A_TAG);
+        }
+    }
 
-	/**
-	 * Method resolves where query looking for clauses: EQUALS, IN or MATCHES.
-	 * Expected values for EQUALS and IN will be merged under EQUALS clause.
-	 * @param namesQuery Where query with expected tag name(s).
-	 * @return Map of expected exact and alike tag names.
-	 */
-	private Map<Integer, Collection<String>> resolveTagNamesQuery(final Query namesQuery)
-	{
-		if (namesQuery == null || namesQuery == QueryImpl.EMPTY)
-		{
-			return Collections.emptyMap();
-		}
+    /**
+     * Method resolves where query looking for clauses: EQUALS, IN or MATCHES.
+     * Expected values for EQUALS and IN will be merged under EQUALS clause.
+     * @param namesQuery Where query with expected tag name(s).
+     * @return Map of expected exact and alike tag names.
+     */
+    private Map<Integer, Collection<String>> resolveTagNamesQuery(final Query namesQuery)
+    {
+        if (namesQuery == null || namesQuery == QueryImpl.EMPTY)
+        {
+            return Collections.emptyMap();
+        }
 
-		final Map<Integer, Collection<String>> properties = QueryHelper
-			.resolve(namesQuery)
-			.usingOrOperator()
-			.withoutNegations()
-			.getProperty(PARAM_WHERE_TAG)
-			.getExpectedValuesForAnyOf(EQUALS, IN, MATCHES)
-			.skipNegated();
+        final Map<Integer, Collection<String>> properties = QueryHelper
+            .resolve(namesQuery)
+            .usingOrOperator()
+            .withoutNegations()
+            .getProperty(PARAM_WHERE_TAG)
+            .getExpectedValuesForAnyOf(EQUALS, IN, MATCHES)
+            .skipNegated();
 
-		return properties.entrySet().stream()
-			.collect(Collectors.groupingBy((entry) -> {
-				if (entry.getKey() == EQUALS || entry.getKey() == IN)
-				{
-					return EQUALS;
-				}
-				else
-				{
-					return MATCHES;
-				}
-			}, Collectors.flatMapping((entry) -> entry.getValue().stream().map(String::toLowerCase), Collectors.toCollection(HashSet::new))));
-	}
+        return properties.entrySet().stream()
+            .collect(Collectors.groupingBy((entry) -> {
+                if (entry.getKey() == EQUALS || entry.getKey() == IN)
+                {
+                    return EQUALS;
+                }
+                else
+                {
+                    return MATCHES;
+                }
+            }, Collectors.flatMapping((entry) -> entry.getValue().stream().map(String::toLowerCase), Collectors.toCollection(HashSet::new))));
+    }
 
-	private NodeRef checkTagRootAsNodePrimaryParent(String tagId, NodeRef tagNodeRef)
-	{
-		if ( tagNodeRef == null || !nodeService.getPrimaryParent(tagNodeRef).getParentRef().equals(TAG_ROOT_NODE_REF))
-		{
-			throw new EntityNotFoundException(tagId);
-		}
-		return tagNodeRef;
-	}
+    private NodeRef checkTagRootAsNodePrimaryParent(String tagId, NodeRef tagNodeRef)
+    {
+        if ( tagNodeRef == null || !nodeService.getPrimaryParent(tagNodeRef).getParentRef().equals(TAG_ROOT_NODE_REF))
+        {
+            throw new EntityNotFoundException(tagId);
+        }
+        return tagNodeRef;
+    }
 }

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

@@ -35,6 +35,7 @@ public class Category
     private String parentId;
     private boolean hasChildren;
     private Integer count;
+    private String path;
 
     public String getId()
     {
@@ -91,6 +92,14 @@ public class Category
         this.count = count;
     }
 
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
     @Override
     public boolean equals(Object o)
     {
@@ -100,19 +109,20 @@ public class Category
             return false;
         Category category = (Category) o;
         return hasChildren == category.hasChildren && Objects.equals(id, category.id) && Objects.equals(name, category.name) && Objects.equals(parentId, category.parentId)
-            && Objects.equals(count, category.count);
+            && Objects.equals(count, category.count) && Objects.equals(path, category.path);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(id, name, parentId, hasChildren, count);
+        return Objects.hash(id, name, parentId, hasChildren, count, path);
     }
 
     @Override
     public String toString()
     {
-        return "Category{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", parentId='" + parentId + '\'' + ", hasChildren=" + hasChildren + ", count=" + count + '}';
+        return "Category{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", parentId='" + parentId + '\'' + ", hasChildren=" + hasChildren
+                + ", count=" + count + ", path=" + path + '}';
     }
 
     public static Builder builder()
@@ -127,6 +137,7 @@ public class Category
         private String parentId;
         private boolean hasChildren;
         private Integer count;
+        private String path;
 
         public Builder id(String id)
         {
@@ -158,6 +169,12 @@ public class Category
             return this;
         }
 
+        public Builder path(String path)
+        {
+            this.path = path;
+            return this;
+        }
+
         public Category create()
         {
             final Category category = new Category();
@@ -166,6 +183,7 @@ public class Category
             category.setParentId(parentId);
             category.setHasChildren(hasChildren);
             category.setCount(count);
+            category.setPath(path);
             return category;
         }
     }

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

@@ -42,7 +42,7 @@ public class Tag implements Comparable<Tag>
 {
 	private NodeRef nodeRef;
 	private String tag;
-	private Integer count;
+	private Long count;
 
     public Tag()
 	{
@@ -76,13 +76,13 @@ public class Tag implements Comparable<Tag>
 		this.tag = Optional.ofNullable(tag).map(String::toLowerCase).orElse(null);
 	}
 	
-	public Integer getCount()
+	public Long getCount()
 	{
 	
 	    return count;
 	}
 
-	public void setCount(Integer count)
+	public void setCount(Long count)
 	{
 	    this.count = count;
 	}
@@ -133,7 +133,7 @@ public class Tag implements Comparable<Tag>
 	{
 		private NodeRef nodeRef;
 		private String tag;
-		private Integer count;
+		private Long count;
 
 		public Builder nodeRef(NodeRef nodeRef)
 		{
@@ -147,7 +147,7 @@ public class Tag implements Comparable<Tag>
 			return this;
 		}
 
-		public Builder count(Integer count)
+		public Builder count(Long count)
 		{
 			this.count = count;
 			return this;

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

@@ -823,6 +823,11 @@ public class SearchMapper
                 sp.setLimitBy(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS);
                 sp.setMaxPermissionCheckTimeMillis(limits.getPermissionEvaluationTime());
             }
+
+            if(limits.getTrackTotalHitsLimit() != null)
+            {
+                sp.setTrackTotalHits(limits.getTrackTotalHitsLimit());
+            }
         }
     }
 

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

@@ -93,7 +93,7 @@ public class FacetField
 
     public String toFilterQuery(String value)
     {
-        return field+":\""+value+"\"";
+        return ("Null".equals(value)) ? "ISNULL:\"" + field + "\"" : field + ":\"" + value + "\"";
     }
 
     public String getPrefix()

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

@@ -37,13 +37,16 @@ public class Limits
 
     private final Integer permissionEvaluationTime;
     private final Integer permissionEvaluationCount;
+    private final Integer trackTotalHitsLimit;
 
     @JsonCreator
     public Limits(@JsonProperty("permissionEvaluationTime") Integer permissionEvaluationTime,
-                  @JsonProperty("permissionEvaluationCount") Integer permissionEvaluationCount)
+                  @JsonProperty("permissionEvaluationCount") Integer permissionEvaluationCount,
+                  @JsonProperty("trackTotalHitsLimit") Integer trackTotalHitsLimit)
     {
         this.permissionEvaluationTime = permissionEvaluationTime;
         this.permissionEvaluationCount = permissionEvaluationCount;
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
     }
 
     public Integer getPermissionEvaluationTime()
@@ -55,4 +58,9 @@ public class Limits
     {
         return permissionEvaluationCount;
     }
+
+    public Integer getTrackTotalHitsLimit()
+    {
+        return trackTotalHitsLimit;
+    }
 }

remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java

@@ -25,8 +25,8 @@
  */
 package org.alfresco.rest.api.tags;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.rest.api.Tags;
 import org.alfresco.rest.api.model.Tag;
@@ -73,13 +73,13 @@ public class TagsEntityResource implements EntityResourceAction.Read<Tag>,
     @WebApiDescription(title="Updates a tag by unique Id")
 	public Tag update(String id, Tag entity, Parameters parameters)
 	{
-		return tags.changeTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id, entity);
+		return tags.changeTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id, entity, parameters);
 	}
 
 	@Override
 	public Tag readById(String id, Parameters parameters) throws EntityNotFoundException
 	{
-		return tags.getTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id);
+		return tags.getTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id, parameters);
 	}
 
 	/**

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

@@ -60,6 +60,7 @@ import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.transfer.PathHelper;
 import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.Category;
 import org.alfresco.rest.api.model.Node;
@@ -71,6 +72,7 @@ import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.CategoryService;
 import org.alfresco.service.cmr.security.AccessStatus;
@@ -100,6 +102,9 @@ public class CategoriesImplTest
     private static final Category CATEGORY = createDefaultCategory();
     private static final String CONTENT_NODE_ID = "content-node-id";
     private static final NodeRef CONTENT_NODE_REF = createNodeRefWithId(CONTENT_NODE_ID);
+    private static final String MOCK_ROOT_LEVEL = "/{mockRootLevel}";
+    private static final String MOCK_CHILD_LEVEL = "/{mockChild}";
+    private static final String MOCK_CATEGORY_PATH = "//" + MOCK_ROOT_LEVEL + "//" + MOCK_CHILD_LEVEL;
 
     @Mock
     private Nodes nodesMock;
@@ -252,6 +257,27 @@ public class CategoriesImplTest
             .isEqualTo(1);
     }
 
+    @Test
+    public void testGetCategoryById_includePath()
+    {
+        final QName categoryQName = createCmQNameOf(CATEGORY_NAME);
+        final NodeRef parentCategoryNodeRef = createNodeRefWithId(PARENT_ID);
+        final ChildAssociationRef parentAssociation = createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, categoryQName);
+        given(nodesMock.getNode(any())).willReturn(createNode());
+        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
+        given(parametersMock.getInclude()).willReturn(List.of(Nodes.PARAM_INCLUDE_PATH));
+        given(nodeServiceMock.getPath(any())).willReturn(mockCategoryPath());
+
+        // when
+        final Category actualCategory = objectUnderTest.getCategoryById(CATEGORY_ID, parametersMock);
+
+        assertThat(actualCategory)
+                .isNotNull()
+                .extracting(Category::getPath)
+                .isNotNull()
+                .isEqualTo(MOCK_CATEGORY_PATH);
+    }
+
     @Test
     public void testGetCategoryById_notACategory()
     {
@@ -479,6 +505,36 @@ public class CategoriesImplTest
             .isEqualTo(0);
     }
 
+    @Test
+    public void testCreateCategory_includePath()
+    {
+        final QName categoryQName = createCmQNameOf(CATEGORY_NAME);
+        final NodeRef categoryNodeRef = createNodeRefWithId(CATEGORY_ID);
+        final NodeRef parentCategoryNodeRef = createNodeRefWithId(PARENT_ID);
+        final ChildAssociationRef parentAssociation = createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, categoryQName);
+        given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef);
+        given(categoryServiceMock.createCategory(parentCategoryNodeRef, CATEGORY_NAME)).willReturn(categoryNodeRef);
+        given(nodesMock.getNode(any())).willReturn(createNode());
+        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
+        given(parametersMock.getInclude()).willReturn(List.of(Nodes.PARAM_INCLUDE_PATH));
+        given(nodeServiceMock.getPath(any())).willReturn(mockCategoryPath());
+        final List<Category> categoryModels = new ArrayList<>(prepareCategories());
+
+        // when
+        final List<Category> actualCreatedCategories = objectUnderTest.createSubcategories(PARENT_ID, categoryModels, parametersMock);
+
+        then(categoryServiceMock).should().createCategory(any(), any());
+        then(categoryServiceMock).shouldHaveNoMoreInteractions();
+
+        assertThat(actualCreatedCategories)
+                .isNotNull()
+                .hasSize(1)
+                .element(0)
+                .extracting(Category::getPath)
+                .isNotNull()
+                .isEqualTo(MOCK_CATEGORY_PATH);
+    }
+
     @Test
     public void testCreateCategories_noPermissions()
     {
@@ -628,6 +684,30 @@ public class CategoriesImplTest
             .isEqualTo(List.of(0, 2, 0));
     }
 
+    @Test
+    public void testGetCategoryChildren_includePath()
+    {
+        final NodeRef parentCategoryNodeRef = createNodeRefWithId(PARENT_ID);
+        given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef);
+        given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true);
+        final int childrenCount = 3;
+        final List<ChildAssociationRef> childAssociationRefMocks = prepareChildAssocMocks(childrenCount, parentCategoryNodeRef);
+        given(nodeServiceMock.getChildAssocs(parentCategoryNodeRef)).willReturn(childAssociationRefMocks);
+        childAssociationRefMocks.forEach(this::prepareCategoryNodeMocks);
+        given(parametersMock.getInclude()).willReturn(List.of(Nodes.PARAM_INCLUDE_PATH));
+        given(nodeServiceMock.getPath(any())).willReturn(mockCategoryPath());
+
+        // when
+        final List<Category> actualCategoryChildren = objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock);
+
+        assertThat(actualCategoryChildren)
+                .isNotNull()
+                .hasSize(3)
+                .extracting(Category::getPath)
+                .isNotNull()
+                .isEqualTo(List.of(MOCK_CATEGORY_PATH, MOCK_CATEGORY_PATH, MOCK_CATEGORY_PATH));
+    }
+
     @Test
     public void testGetCategoryChildren_noChildren()
     {
@@ -751,6 +831,32 @@ public class CategoriesImplTest
             .isEqualTo(1);
     }
 
+    @Test
+    public void testUpdateCategoryById_includePath()
+    {
+        final String categoryNewName = "categoryNewName";
+        final Category fixedCategory = createCategoryOnlyWithName(categoryNewName);
+        // simulate path provided by client to check if it will be ignored
+        fixedCategory.setPath("/test/TestCat");
+        final QName categoryQName = createCmQNameOf(CATEGORY_NAME);
+        final NodeRef parentCategoryNodeRef = createNodeRefWithId(PARENT_ID);
+        final ChildAssociationRef parentAssociation = createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, categoryQName);
+        given(nodesMock.getNode(any())).willReturn(createNode(categoryNewName));
+        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
+        given(nodeServiceMock.moveNode(any(), any(), any(), any())).willReturn(createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, createCmQNameOf(categoryNewName)));
+        given(parametersMock.getInclude()).willReturn(List.of(Nodes.PARAM_INCLUDE_PATH));
+        given(nodeServiceMock.getPath(any())).willReturn(mockCategoryPath());
+
+        // when
+        final Category actualCategory = objectUnderTest.updateCategoryById(CATEGORY_ID, fixedCategory, parametersMock);
+
+        assertThat(actualCategory)
+                .isNotNull()
+                .extracting(Category::getPath)
+                .isNotNull()
+                .isEqualTo(MOCK_CATEGORY_PATH);
+    }
+
     @Test
     public void testUpdateCategoryById_noPermission()
     {
@@ -918,6 +1024,7 @@ public class CategoriesImplTest
         then(nodeServiceMock).should().getParentAssocs(categoryParentNodeRef);
         then(nodeServiceMock).shouldHaveNoMoreInteractions();
         final List<Category> expectedLinkedCategories = List.of(CATEGORY);
+        expectedLinkedCategories.get(0).setPath(null);
         assertThat(actualLinkedCategories)
             .isNotNull().usingRecursiveComparison()
             .isEqualTo(expectedLinkedCategories);
@@ -984,6 +1091,36 @@ public class CategoriesImplTest
             .isEqualTo(expectedLinkedCategories);
     }
 
+    @Test
+    public void testLinkNodeToCategories_includePath()
+    {
+        final NodeRef categoryParentNodeRef = createNodeRefWithId(PARENT_ID);
+        final ChildAssociationRef parentAssociation = createAssociationOf(categoryParentNodeRef, CATEGORY_NODE_REF);
+        given(nodesMock.getNode(any())).willReturn(createNode());
+        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
+        given(nodeServiceMock.hasAspect(any(), any())).willReturn(true);
+        given(parametersMock.getInclude()).willReturn(List.of(Nodes.PARAM_INCLUDE_PATH));
+        given(nodeServiceMock.getPath(any())).willReturn(mockCategoryPath());
+
+        // when
+        final List<Category> actualLinkedCategories = objectUnderTest.linkNodeToCategories(CONTENT_NODE_ID, List.of(CATEGORY), parametersMock);
+
+        then(nodesMock).should(times(2)).getNode(CATEGORY_ID);
+        then(nodeServiceMock).should().getChildAssocs(CATEGORY_NODE_REF, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
+        then(nodeServiceMock).should().getPrimaryParent(CATEGORY_NODE_REF);
+        then(nodeServiceMock).should().getParentAssocs(CATEGORY_NODE_REF);
+        then(nodeServiceMock).should().hasAspect(CONTENT_NODE_REF, ContentModel.ASPECT_GEN_CLASSIFIABLE);
+        then(nodeServiceMock).should().getProperty(CONTENT_NODE_REF, ContentModel.PROP_CATEGORIES);
+        final Serializable expectedCategories = (Serializable) List.of(CATEGORY_NODE_REF);
+        then(nodeServiceMock).should().setProperty(CONTENT_NODE_REF, ContentModel.PROP_CATEGORIES, expectedCategories);
+        then(nodeServiceMock).should().getParentAssocs(categoryParentNodeRef);
+        final List<Category> expectedLinkedCategories = List.of(CATEGORY);
+        expectedLinkedCategories.get(0).setPath(MOCK_CATEGORY_PATH);
+        assertThat(actualLinkedCategories)
+                .isNotNull().usingRecursiveComparison()
+                .isEqualTo(expectedLinkedCategories);
+    }
+
     @Test
     public void testLinkNodeToCategories_withPreviouslyLinkedCategories()
     {
@@ -1168,11 +1305,46 @@ public class CategoriesImplTest
         then(nodeServiceMock).should().getParentAssocs(categoryParentNodeRef);
         then(nodeServiceMock).shouldHaveNoMoreInteractions();
         final List<Category> expectedCategories = List.of(CATEGORY);
+        expectedCategories.get(0).setPath(null);
         assertThat(actualCategories)
             .isNotNull().usingRecursiveComparison()
             .isEqualTo(expectedCategories);
     }
 
+    @Test
+    public void testListCategoriesForNode_includePath()
+    {
+        final NodeRef categoryParentNodeRef = createNodeRefWithId(PARENT_ID);
+        final ChildAssociationRef parentAssociation = createAssociationOf(categoryParentNodeRef, CATEGORY_NODE_REF);
+        given(nodeServiceMock.getProperty(any(), eq(ContentModel.PROP_CATEGORIES))).willReturn((Serializable) List.of(CATEGORY_NODE_REF));
+        given(nodesMock.getNode(any())).willReturn(createNode());
+        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
+        given(parametersMock.getInclude()).willReturn(List.of(Nodes.PARAM_INCLUDE_PATH));
+        given(nodeServiceMock.getPath(any())).willReturn(mockCategoryPath());
+
+        // when
+        final List<Category> actualCategories = objectUnderTest.listCategoriesForNode(CONTENT_NODE_ID, parametersMock);
+
+        then(nodesMock).should().validateOrLookupNode(CONTENT_NODE_ID);
+        then(permissionServiceMock).should().hasReadPermission(CONTENT_NODE_REF);
+        then(permissionServiceMock).shouldHaveNoMoreInteractions();
+        then(typeConstraint).should().matches(CONTENT_NODE_REF);
+        then(typeConstraint).shouldHaveNoMoreInteractions();
+        then(nodesMock).should(times(2)).getNode(CATEGORY_ID);
+        then(nodesMock).shouldHaveNoMoreInteractions();
+        then(nodeServiceMock).should().getProperty(CONTENT_NODE_REF, ContentModel.PROP_CATEGORIES);
+        then(nodeServiceMock).should().getChildAssocs(CATEGORY_NODE_REF, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
+        then(nodeServiceMock).should().getPrimaryParent(CATEGORY_NODE_REF);
+        then(nodeServiceMock).should().getParentAssocs(categoryParentNodeRef);
+        then(nodeServiceMock).should().getPath(any());
+        then(nodeServiceMock).shouldHaveNoMoreInteractions();
+        final List<Category> expectedCategories = List.of(CATEGORY);
+        expectedCategories.get(0).setPath(MOCK_CATEGORY_PATH);
+        assertThat(actualCategories)
+                .isNotNull().usingRecursiveComparison()
+                .isEqualTo(expectedCategories);
+    }
+
     @Test
     public void testListCategoriesForNode_withInvalidNodeId()
     {
@@ -1329,4 +1501,13 @@ public class CategoriesImplTest
     {
         return new ChildAssociationRef(ContentModel.ASSOC_SUBCATEGORIES, parentNode, childNodeName, childNode);
     }
+
+    private Path mockCategoryPath()
+    {
+        final Path mockPath = new Path();
+        mockPath.append(PathHelper.stringToPath(MOCK_ROOT_LEVEL));
+        mockPath.append(PathHelper.stringToPath(MOCK_CHILD_LEVEL));
+        mockPath.append(PathHelper.stringToPath("/"));
+        return mockPath;
+    }
 }

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

@@ -40,10 +40,14 @@ import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
+import org.alfresco.model.ContentModel;
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
 import org.alfresco.rest.api.Nodes;
@@ -55,6 +59,7 @@ import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationE
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
 import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
 import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -83,6 +88,8 @@ public class TagsImplTest
     private static final NodeRef TAG_PARENT_NODE_REF = new NodeRef(STORE_REF_WORKSPACE_SPACESSTORE, PARENT_NODE_ID);
     private static final String CONTENT_NODE_ID = "content-node-id";
     private static final NodeRef CONTENT_NODE_REF = new NodeRef(STORE_REF_WORKSPACE_SPACESSTORE, CONTENT_NODE_ID);
+    private static final String PARAM_INCLUDE_COUNT = "count";
+
 
     private final RecognizedParamsExtractor queryExtractor = new RecognizedParamsExtractor() {};
 
@@ -115,19 +122,23 @@ public class TagsImplTest
         given(nodesMock.validateNode(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID)).willReturn(TAG_NODE_REF);
         given(taggingServiceMock.getTagName(TAG_NODE_REF)).willReturn(TAG_NAME);
         given(nodeServiceMock.getPrimaryParent(TAG_NODE_REF)).willReturn(primaryParentMock);
+        given(primaryParentMock.getParentRef()).willReturn(TAG_PARENT_NODE_REF);
     }
 
     @Test
     public void testGetTags()
     {
         given(parametersMock.getPaging()).willReturn(pagingMock);
-        given(taggingServiceMock.getTags(any(StoreRef.class), any(PagingRequest.class), any(), any())).willReturn(pagingResultsMock);
-        given(pagingResultsMock.getTotalResultCount()).willReturn(new Pair<>(Integer.MAX_VALUE, 0));
-        given(pagingResultsMock.getPage()).willReturn(List.of(new Pair<>(TAG_NODE_REF, TAG_NAME)));
+        given(parametersMock.getSorting()).willReturn(new ArrayList<>());
+        given(parametersMock.getInclude()).willReturn(new ArrayList<>());
+
+        //given(taggingServiceMock.getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(), any(), isNull(), isNull())).willReturn(List.of(new Pair<>(TAG_NODE_REF, null)));
+        given(taggingServiceMock.getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(), any(), isNull(), isNull())).willReturn(Map.of(TAG_NODE_REF, 0L));
+        given(nodeServiceMock.getProperty(any(NodeRef.class), eq(ContentModel.PROP_NAME))).willReturn("tag-dummy-name");
 
         final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
 
-        then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(PagingRequest.class), isNull(), isNull());
+        then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(), any(), isNull(), isNull());
         then(taggingServiceMock).shouldHaveNoMoreInteractions();
         final List<Tag> expectedTags = createTagsWithNodeRefs(List.of(TAG_NAME));
         assertEquals(expectedTags, actualTags.getCollection());
@@ -137,16 +148,17 @@ public class TagsImplTest
     public void testGetTags_verifyIfCountIsZero()
     {
         given(parametersMock.getPaging()).willReturn(pagingMock);
-        given(taggingServiceMock.getTags(any(StoreRef.class), any(PagingRequest.class), any(), any())).willReturn(pagingResultsMock);
-        given(pagingResultsMock.getTotalResultCount()).willReturn(new Pair<>(Integer.MAX_VALUE, 0));
-        given(pagingResultsMock.getPage()).willReturn(List.of(new Pair<>(TAG_NODE_REF, TAG_NAME)));
+        given(parametersMock.getSorting()).willReturn(new ArrayList<>());
+        given(parametersMock.getInclude()).willReturn(List.of(PARAM_INCLUDE_COUNT));
+        given(taggingServiceMock.getTags(any(StoreRef.class), any(), any(), any(), any())).willReturn(Map.of(TAG_NODE_REF, 0L));
+
+        given(nodeServiceMock.getProperty(any(NodeRef.class), eq(ContentModel.PROP_NAME))).willReturn("tag-dummy-name");
         given(parametersMock.getInclude()).willReturn(List.of("count"));
 
         final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
 
-        then(taggingServiceMock).should().findTaggedNodesAndCountByTagName(STORE_REF_WORKSPACE_SPACESSTORE);
         final List<Tag> expectedTags = createTagsWithNodeRefs(List.of(TAG_NAME)).stream()
-            .peek(tag -> tag.setCount(0))
+            .peek(tag -> tag.setCount(0L))
             .collect(toList());
         assertEquals(expectedTags, actualTags.getCollection());
     }
@@ -157,21 +169,142 @@ public class TagsImplTest
     {
         NodeRef tagNodeA = new NodeRef("tag://A/");
         NodeRef tagNodeB = new NodeRef("tag://B/");
-        List<Pair<NodeRef, String>> tagPairs = List.of(new Pair<>(tagNodeA, "taga"), new Pair<>(tagNodeB, "tagb"));
 
+        given(parametersMock.getSorting()).willReturn(Collections.emptyList());
         given(parametersMock.getPaging()).willReturn(pagingMock);
-        given(taggingServiceMock.getTags(any(StoreRef.class), any(PagingRequest.class), any(), any())).willReturn(pagingResultsMock);
-        given(pagingResultsMock.getTotalResultCount()).willReturn(new Pair<>(Integer.MAX_VALUE, 0));
-        given(pagingResultsMock.getPage()).willReturn(tagPairs);
         given(parametersMock.getInclude()).willReturn(List.of("count"));
-        // Only taga is included in the returned list since tagb is not in use.
-        given(taggingServiceMock.findTaggedNodesAndCountByTagName(STORE_REF_WORKSPACE_SPACESSTORE)).willReturn(List.of(new Pair<>("taga", 5)));
+
+        final LinkedHashMap<NodeRef, Long> results = new LinkedHashMap<>();
+        results.put(tagNodeA, 5L);
+        results.put(tagNodeB, 0L);
+
+        given(taggingServiceMock.getTags(any(StoreRef.class), eq(List.of(PARAM_INCLUDE_COUNT)), isNull(), any(), any())).willReturn(results);
+        given(nodeServiceMock.getProperty(any(NodeRef.class), eq(ContentModel.PROP_NAME))).willReturn("taga", "tagb");
 
         final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
 
-        then(taggingServiceMock).should().findTaggedNodesAndCountByTagName(STORE_REF_WORKSPACE_SPACESSTORE);
-        final List<Tag> expectedTags = List.of(Tag.builder().tag("taga").nodeRef(tagNodeA).count(5).create(),
-                                               Tag.builder().tag("tagb").nodeRef(tagNodeB).count(0).create());
+        final List<Tag> expectedTags = List.of(Tag.builder().tag("tagA").nodeRef(tagNodeA).count(5L).create(),
+                                               Tag.builder().tag("tagB").nodeRef(tagNodeB).count(0L).create());
+        assertEquals(expectedTags, actualTags.getCollection());
+    }
+
+    @Test
+    public void testGetTags_orderByCountAscendingOrder()
+    {
+        NodeRef tagNodeA = new NodeRef("tag://A/");
+        NodeRef tagNodeB = new NodeRef("tag://B/");
+        NodeRef tagNodeC = new NodeRef("tag://C/");
+
+        given(parametersMock.getPaging()).willReturn(pagingMock);
+        given(parametersMock.getInclude()).willReturn(List.of("count"));
+        given(parametersMock.getSorting()).willReturn(List.of(new SortColumn("count", true)));
+
+        final LinkedHashMap<NodeRef, Long> results = new LinkedHashMap<>();
+        results.put(tagNodeB, 0L);
+        results.put(tagNodeC, 2L);
+        results.put(tagNodeA, 5L);
+
+        given(taggingServiceMock.getTags(any(StoreRef.class), eq(List.of(PARAM_INCLUDE_COUNT)), eq(new Pair<>("count", true)), any(), any())).willReturn(results);
+        given(nodeServiceMock.getProperty(tagNodeA, ContentModel.PROP_NAME)).willReturn("taga");
+        given(nodeServiceMock.getProperty(tagNodeB, ContentModel.PROP_NAME)).willReturn("tagb");
+        given(nodeServiceMock.getProperty(tagNodeC, ContentModel.PROP_NAME)).willReturn("tagc");
+
+        //when
+        final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
+
+        final List<Tag> expectedTags = List.of(Tag.builder().tag("tagb").nodeRef(tagNodeB).count(0L).create(),
+                                               Tag.builder().tag("tagc").nodeRef(tagNodeC).count(2L).create(),
+                                               Tag.builder().tag("taga").nodeRef(tagNodeA).count(5L).create());
+        assertEquals(expectedTags, actualTags.getCollection());
+    }
+
+    @Test
+    public void testGetTags_orderByCountDescendingOrder()
+    {
+        NodeRef tagNodeA = new NodeRef("tag://A/");
+        NodeRef tagNodeB = new NodeRef("tag://B/");
+        NodeRef tagNodeC = new NodeRef("tag://C/");
+
+        given(parametersMock.getPaging()).willReturn(pagingMock);
+        given(parametersMock.getInclude()).willReturn(List.of("count"));
+        given(parametersMock.getSorting()).willReturn(List.of(new SortColumn("count", false)));
+
+        final LinkedHashMap<NodeRef, Long> results = new LinkedHashMap<>();
+        results.put(tagNodeA, 5L);
+        results.put(tagNodeC, 2L);
+        results.put(tagNodeB, 0L);
+
+        given(taggingServiceMock.getTags(any(StoreRef.class), eq(List.of(PARAM_INCLUDE_COUNT)), eq(new Pair<>("count", false)), any(), any())).willReturn(results);
+        given(nodeServiceMock.getProperty(tagNodeA, ContentModel.PROP_NAME)).willReturn("taga");
+        given(nodeServiceMock.getProperty(tagNodeB, ContentModel.PROP_NAME)).willReturn("tagb");
+        given(nodeServiceMock.getProperty(tagNodeC, ContentModel.PROP_NAME)).willReturn("tagc");
+
+        //when
+        final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
+
+        final List<Tag> expectedTags = List.of(Tag.builder().tag("taga").nodeRef(tagNodeA).count(5L).create(),
+                                               Tag.builder().tag("tagc").nodeRef(tagNodeC).count(2L).create(),
+                                               Tag.builder().tag("tagb").nodeRef(tagNodeB).count(0L).create());
+        assertEquals(expectedTags, actualTags.getCollection());
+    }
+
+    @Test
+    public void testGetTags_orderByTagAscendingOrder()
+    {
+        NodeRef tagApple = new NodeRef("tag://apple/");
+        NodeRef tagBanana = new NodeRef("tag://banana/");
+        NodeRef tagCoconut = new NodeRef("tag://coconut/");
+
+        given(parametersMock.getPaging()).willReturn(pagingMock);
+        given(parametersMock.getInclude()).willReturn(Collections.emptyList());
+        given(parametersMock.getSorting()).willReturn(List.of(new SortColumn("tag", true)));
+
+        final LinkedHashMap<NodeRef, Long> results = new LinkedHashMap<>();
+        results.put(tagApple, 0L);
+        results.put(tagBanana, 0L);
+        results.put(tagCoconut, 0L);
+
+        given(taggingServiceMock.getTags(any(StoreRef.class), any(), eq(new Pair<>("tag", true)), any(), any())).willReturn(results);
+        given(nodeServiceMock.getProperty(tagApple, ContentModel.PROP_NAME)).willReturn("apple");
+        given(nodeServiceMock.getProperty(tagBanana, ContentModel.PROP_NAME)).willReturn("banana");
+        given(nodeServiceMock.getProperty(tagCoconut, ContentModel.PROP_NAME)).willReturn("coconut");
+
+        //when
+        final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
+
+        final List<Tag> expectedTags = List.of(Tag.builder().tag("apple").nodeRef(tagApple).create(),
+                                               Tag.builder().tag("banana").nodeRef(tagBanana).create(),
+                                               Tag.builder().tag("coconut").nodeRef(tagCoconut).create());
+        assertEquals(expectedTags, actualTags.getCollection());
+    }
+
+    @Test
+    public void testGetTags_orderByTagDescendingOrder()
+    {
+        NodeRef tagApple = new NodeRef("tag://apple/");
+        NodeRef tagBanana = new NodeRef("tag://banana/");
+        NodeRef tagCoconut = new NodeRef("tag://coconut/");
+
+        given(parametersMock.getPaging()).willReturn(pagingMock);
+        given(parametersMock.getInclude()).willReturn(Collections.emptyList());
+        given(parametersMock.getSorting()).willReturn(List.of(new SortColumn("tag", false)));
+
+        final LinkedHashMap<NodeRef, Long> results = new LinkedHashMap<>();
+        results.put(tagCoconut, 0L);
+        results.put(tagBanana, 0L);
+        results.put(tagApple, 0L);
+
+        given(taggingServiceMock.getTags(any(StoreRef.class), any(), eq(new Pair<>("tag", false)), any(), any())).willReturn(results);
+        given(nodeServiceMock.getProperty(tagApple, ContentModel.PROP_NAME)).willReturn("apple");
+        given(nodeServiceMock.getProperty(tagBanana, ContentModel.PROP_NAME)).willReturn("banana");
+        given(nodeServiceMock.getProperty(tagCoconut, ContentModel.PROP_NAME)).willReturn("coconut");
+
+        //when
+        final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
+
+        final List<Tag> expectedTags = List.of(Tag.builder().tag("coconut").nodeRef(tagCoconut).create(),
+                                               Tag.builder().tag("banana").nodeRef(tagBanana).create(),
+                                               Tag.builder().tag("apple").nodeRef(tagApple).create());
         assertEquals(expectedTags, actualTags.getCollection());
     }
 
@@ -180,13 +313,13 @@ public class TagsImplTest
     {
         given(parametersMock.getPaging()).willReturn(pagingMock);
         given(parametersMock.getQuery()).willReturn(queryExtractor.getWhereClause("(tag=expectedName)"));
-        given(taggingServiceMock.getTags(any(StoreRef.class), any(PagingRequest.class), any(), any())).willReturn(pagingResultsMock);
-        given(pagingResultsMock.getTotalResultCount()).willReturn(new Pair<>(Integer.MAX_VALUE, 0));
+        given(parametersMock.getSorting()).willReturn(new ArrayList<>());
+        given(parametersMock.getInclude()).willReturn(new ArrayList<>());
 
         //when
         final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
 
-        then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(PagingRequest.class), eq(Set.of("expectedname")), isNull());
+        then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), eq(new ArrayList<>()), any(), eq(Set.of("expectedname")), isNull());
         then(taggingServiceMock).shouldHaveNoMoreInteractions();
         assertThat(actualTags).isNotNull();
     }
@@ -196,13 +329,13 @@ public class TagsImplTest
     {
         given(parametersMock.getPaging()).willReturn(pagingMock);
         given(parametersMock.getQuery()).willReturn(queryExtractor.getWhereClause("(tag IN (expectedName1, expectedName2))"));
-        given(taggingServiceMock.getTags(any(StoreRef.class), any(PagingRequest.class), any(), any())).willReturn(pagingResultsMock);
-        given(pagingResultsMock.getTotalResultCount()).willReturn(new Pair<>(Integer.MAX_VALUE, 0));
+        given(parametersMock.getSorting()).willReturn(new ArrayList<>());
+        given(parametersMock.getInclude()).willReturn(new ArrayList<>());
 
         //when
         final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
 
-        then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(PagingRequest.class), eq(Set.of("expectedname1", "expectedname2")), isNull());
+        then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE),any(), any(), eq(Set.of("expectedname1", "expectedname2")), isNull());
         then(taggingServiceMock).shouldHaveNoMoreInteractions();
         assertThat(actualTags).isNotNull();
     }
@@ -212,13 +345,13 @@ public class TagsImplTest
     {
         given(parametersMock.getPaging()).willReturn(pagingMock);
         given(parametersMock.getQuery()).willReturn(queryExtractor.getWhereClause("(tag MATCHES ('expectedName*'))"));
-        given(taggingServiceMock.getTags(any(StoreRef.class), any(PagingRequest.class), any(), any())).willReturn(pagingResultsMock);
-        given(pagingResultsMock.getTotalResultCount()).willReturn(new Pair<>(Integer.MAX_VALUE, 0));
+        given(parametersMock.getSorting()).willReturn(new ArrayList<>());
+        given(parametersMock.getInclude()).willReturn(new ArrayList<>());
 
         //when
         final CollectionWithPagingInfo<Tag> actualTags = objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock);
 
-        then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(PagingRequest.class), isNull(), eq(Set.of("expectedname*")));
+        then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(), any(), isNull(), eq(Set.of("expectedname*")));
         then(taggingServiceMock).shouldHaveNoMoreInteractions();
         assertThat(actualTags).isNotNull();
     }
@@ -228,6 +361,7 @@ public class TagsImplTest
     {
         given(parametersMock.getPaging()).willReturn(pagingMock);
         given(parametersMock.getQuery()).willReturn(queryExtractor.getWhereClause("(tag=expectedName AND tag IN (expectedName1, expectedName2))"));
+        given(parametersMock.getSorting()).willReturn(new ArrayList<>());
 
         //when
         final Throwable actualException = catchThrowable(() -> objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock));
@@ -241,6 +375,7 @@ public class TagsImplTest
     {
         given(parametersMock.getPaging()).willReturn(pagingMock);
         given(parametersMock.getQuery()).willReturn(queryExtractor.getWhereClause("(tag BETWEEN ('expectedName', 'expectedName2'))"));
+        given(parametersMock.getSorting()).willReturn(new ArrayList<>());
 
         //when
         final Throwable actualException = catchThrowable(() -> objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock));
@@ -254,6 +389,7 @@ public class TagsImplTest
     {
         given(parametersMock.getPaging()).willReturn(pagingMock);
         given(parametersMock.getQuery()).willReturn(queryExtractor.getWhereClause("(NOT tag=expectedName)"));
+        given(parametersMock.getSorting()).willReturn(new ArrayList<>());
 
         //when
         final Throwable actualException = catchThrowable(() -> objectUnderTest.getTags(STORE_REF_WORKSPACE_SPACESSTORE, parametersMock));
@@ -266,7 +402,6 @@ public class TagsImplTest
     public void testDeleteTagById()
     {
         //when
-        given(primaryParentMock.getParentRef()).willReturn(TAG_PARENT_NODE_REF);
         objectUnderTest.deleteTagById(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID);
 
         then(authorityServiceMock).should().hasAdminAuthority();
@@ -425,7 +560,7 @@ public class TagsImplTest
         final List<Tag> actualCreatedTags = objectUnderTest.createTags(tagsToCreate, parametersMock);
 
         final List<Tag> expectedTags = createTagsWithNodeRefs(tagNames).stream()
-            .peek(tag -> tag.setCount(0))
+            .peek(tag -> tag.setCount(0L))
             .collect(toList());
         assertThat(actualCreatedTags)
             .isNotNull()
@@ -435,8 +570,8 @@ public class TagsImplTest
     @Test(expected = EntityNotFoundException.class)
     public void testGetTagByIdNotFoundValidation()
     {
-        given(primaryParentMock.getParentRef()).willReturn(TAG_NODE_REF);
-        objectUnderTest.getTag(STORE_REF_WORKSPACE_SPACESSTORE,TAG_ID);
+        given(nodesMock.validateNode(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID)).willThrow(EntityNotFoundException.class);
+        objectUnderTest.getTag(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID, null);
         then(nodeServiceMock).shouldHaveNoInteractions();
         then(nodesMock).should().validateNode(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID);
         then(nodesMock).shouldHaveNoMoreInteractions();
@@ -459,8 +594,8 @@ public class TagsImplTest
 
         List<Tag> actual = objectUnderTest.addTags(CONTENT_NODE_ID, tags, parametersMock);
 
-        final List<Tag> expected = List.of(Tag.builder().tag("taga").nodeRef(tagNodeA).count(5).create(),
-                Tag.builder().tag("tagb").nodeRef(tagNodeB).count(1).create());
+        final List<Tag> expected = List.of(Tag.builder().tag("taga").nodeRef(tagNodeA).count(5L).create(),
+                Tag.builder().tag("tagb").nodeRef(tagNodeB).count(1L).create());
         assertEquals("Unexpected tags returned.", expected, actual);
     }
 
@@ -508,6 +643,53 @@ public class TagsImplTest
         objectUnderTest.getTags(CONTENT_NODE_ID, parametersMock);
     }
 
+    @Test
+    public void testChangeTag()
+    {
+        Tag suppliedTag = Tag.builder().tag("new-name").create();
+        given(taggingServiceMock.changeTag(STORE_REF_WORKSPACE_SPACESSTORE, TAG_NAME, "new-name")).willReturn(TAG_NODE_REF);
+
+        Tag tag = objectUnderTest.changeTag(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID, suppliedTag, parametersMock);
+
+        Tag expected = Tag.builder().nodeRef(TAG_NODE_REF).tag("new-name").create();
+        assertEquals("Unexpected return value", expected, tag);
+    }
+
+    @Test
+    public void testChangeTagAndGetCount()
+    {
+        Tag suppliedTag = Tag.builder().tag("new-name").create();
+        given(taggingServiceMock.changeTag(STORE_REF_WORKSPACE_SPACESSTORE, TAG_NAME, "new-name")).willReturn(TAG_NODE_REF);
+        given(parametersMock.getInclude()).willReturn(List.of(PARAM_INCLUDE_COUNT));
+        given(taggingServiceMock.findCountByTagName(STORE_REF_WORKSPACE_SPACESSTORE, TAG_NAME)).willReturn(3L);
+
+        Tag tag = objectUnderTest.changeTag(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID, suppliedTag, parametersMock);
+
+        Tag expected = Tag.builder().nodeRef(TAG_NODE_REF).tag("new-name").count(3L).create();
+        assertEquals("Unexpected return value", expected, tag);
+    }
+
+    @Test
+    public void testGetTag()
+    {
+        Tag tag = objectUnderTest.getTag(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID, parametersMock);
+
+        Tag expected = Tag.builder().nodeRef(TAG_NODE_REF).tag(TAG_NAME).create();
+        assertEquals("Unexpected tag returned", expected, tag);
+    }
+
+    @Test
+    public void testGetTagWithCount()
+    {
+        given(parametersMock.getInclude()).willReturn(List.of(PARAM_INCLUDE_COUNT));
+        given(taggingServiceMock.findCountByTagName(STORE_REF_WORKSPACE_SPACESSTORE, TAG_NAME)).willReturn(0L);
+
+        Tag tag = objectUnderTest.getTag(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID, parametersMock);
+
+        Tag expected = Tag.builder().nodeRef(TAG_NODE_REF).tag(TAG_NAME).count(0L).create();
+        assertEquals("Unexpected tag returned", expected, tag);
+    }
+
     private static List<Pair<String, NodeRef>> createTagAndNodeRefPairs(final List<String> tagNames)
     {
         return tagNames.stream()

remote-api/src/test/java/org/alfresco/rest/api/search/SearchMapperTests.java

@@ -745,33 +745,56 @@ public class SearchMapperTests
     }
 
     @Test
-    public void fromLimits() throws Exception
+    public void fromLimits_setNull() throws Exception
     {
         SearchParameters searchParameters = new SearchParameters();
         searchMapper.setDefaults(searchParameters);
-
-        //Doesn't error
         searchMapper.fromLimits(searchParameters, null);
-        assertEquals(500, searchParameters.getLimit());
-        assertEquals(LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("LimitBy default value should be unlimited", LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("Limit default value should be 500", 500, searchParameters.getLimit());
+    }
 
-        searchMapper.fromLimits(searchParameters, new Limits(null, null));
-        assertEquals(LimitBy.UNLIMITED, searchParameters.getLimitBy());
-        assertEquals(500, searchParameters.getLimit());
-
-        searchMapper.fromLimits(searchParameters, new Limits(null, 34));
-        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
-        assertEquals(34, searchParameters.getMaxPermissionChecks());
-        assertEquals(-1, searchParameters.getLimit());
-        assertEquals(-1, searchParameters.getMaxPermissionCheckTimeMillis());
-
-        searchParameters = new SearchParameters();
+    @Test
+    public void fromLimits_setAllLimitsAsNull() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
         searchMapper.setDefaults(searchParameters);
-        searchMapper.fromLimits(searchParameters, new Limits(1000, null));
+        searchMapper.fromLimits(searchParameters, new Limits(null, null, null));
+        assertEquals("LimitBy default value should be unlimited", LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("Limit default value should be 500", 500, searchParameters.getLimit());
+    }
+
+    @Test
+    public void fromLimits_setPermissionEvaluationCount() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(null, 34, null));
         assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
-        assertEquals(1000, searchParameters.getMaxPermissionCheckTimeMillis());
-        assertEquals(-1, searchParameters.getLimit());
-        assertEquals(-1, searchParameters.getMaxPermissionChecks());
+        assertEquals("MaxPermissionChecks should be set", 34, searchParameters.getMaxPermissionChecks());
+        assertEquals("Limit should be -1", -1, searchParameters.getLimit());
+        assertEquals("MaxPermissionCheckTimeMillis should be -1", -1, searchParameters.getMaxPermissionCheckTimeMillis());
+    }
+
+    @Test
+    public void fromLimits_setPermissionEvaluationTime() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(1000, null, null));
+        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
+        assertEquals("MaxPermissionCheckTimeMillis should be set", 1000, searchParameters.getMaxPermissionCheckTimeMillis());
+        assertEquals("Limit should be -1", -1, searchParameters.getLimit());
+        assertEquals("MaxPermissionChecks should be -1", -1, searchParameters.getMaxPermissionChecks());
+    }
+
+    @Test
+    public void fromLimits_setTrackTotalHitsLimit() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(null, null, 10));
+        assertEquals("TrackTotalHits should be set", 10, searchParameters.getTrackTotalHits());
     }
 
     @Test

repository/pom.xml

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

repository/src/main/java/org/alfresco/repo/jscript/Classification.java

@@ -23,225 +23,225 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.jscript;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.alfresco.model.ContentModel;
-import org.alfresco.query.PagingRequest;
-import org.alfresco.service.ServiceRegistry;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.search.CategoryService;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.util.Pair;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Scriptable;
-
-/**
- * Support class for finding categories, finding root nodes for categories and creating root categories. 
- * 
- * @author Andy Hind
- */
-public final class Classification extends BaseScopableProcessorExtension
-{
-    private ServiceRegistry services;
-
-    private StoreRef storeRef;
-    
-    /**
-     * Set the default store reference
-     * 
-     * @param   storeRef the default store reference
-     */
-    public void setStoreUrl(String storeRef)
-    {
-        this.storeRef = new StoreRef(storeRef);
-    }
-    
-    /**
-     * Set the service registry
-     * 
-     * @param services  the service registry
-     */
-    public void setServiceRegistry(ServiceRegistry services)
-    {
-        this.services = services;
-    }
-
-    /**
-     * Find all the category nodes in a given classification.
-     * 
-     * @param aspect String
-     * @return Scriptable
-     */
-    public Scriptable getAllCategoryNodes(String aspect)
-    {
-        Object[] cats = buildCategoryNodes(services.getCategoryService().getCategories(
-                            storeRef, createQName(aspect), CategoryService.Depth.ANY));
-        return Context.getCurrentContext().newArray(getScope(), cats);
-    }
-
-    /**
-     * Get all the aspects that define a classification.
-     * 
-     * @return String[]
-     */
-    public String[] getAllClassificationAspects()
-    {
-        Collection<QName> aspects = services.getCategoryService().getClassificationAspects();
-        String[] answer = new String[aspects.size()];
-        int i = 0;
-        for (QName qname : aspects)
-        {
-            answer[i++] = qname.toPrefixString(this.services.getNamespaceService());
-        }
-        return answer;
-    }
-    
-    /**
-     * Create a root category in a classification.
-     * 
-     * @param aspect String
-     * @param name String
-     */
-    public CategoryNode createRootCategory(String aspect, String name)
-    {
-        NodeRef categoryNodeRef = services.getCategoryService().createRootCategory(storeRef, createQName(aspect), name);
-        CategoryNode categoryNode = new CategoryNode(categoryNodeRef, this.services, getScope());
-
-        return categoryNode;
-    }
-    
-    /**
-     * Get the category node from the category node reference.
-     * 
-     * @param categoryRef   category node reference
-     * @return {@link CategoryNode} category node 
-     */
-    public CategoryNode getCategory(String categoryRef)
-    {
-        CategoryNode result = null;
-        NodeRef categoryNodeRef = new NodeRef(categoryRef);
-        if (services.getNodeService().exists(categoryNodeRef) == true &&
-            services.getDictionaryService().isSubClass(ContentModel.TYPE_CATEGORY, services.getNodeService().getType(categoryNodeRef)) == true)
-        {
-            result = new CategoryNode(categoryNodeRef, this.services, getScope());
-        }
-        return result;
-    }
-
-    /**
-     * Get the root categories in a classification.
-     * 
-     * @param aspect String
-     * @return Scriptable
-     */
-    public Scriptable getRootCategories(String aspect)
-    {
-        Object[] cats = buildCategoryNodes(services.getCategoryService().getRootCategories(
-                            storeRef, createQName(aspect)));
-        return Context.getCurrentContext().newArray(getScope(), cats);
-    }
-
-    /**
-     * Get ordered, filtered and paged root categories in a classification.
-     * 
-     * @param aspect
-     * @param filter
-     * @param maxItems
-     * @param skipCount (offset)
-     * @return
-     */
-    public Scriptable getRootCategories(String aspect, String filter, int maxItems, int skipCount)
-    {
-        PagingRequest pagingRequest = new PagingRequest(skipCount, maxItems);
-        List<ChildAssociationRef> rootCategories = services.getCategoryService().getRootCategories(storeRef, createQName(aspect), pagingRequest, true, filter).getPage();
-        Object[] cats = buildCategoryNodes(rootCategories);
-        return Context.getCurrentContext().newArray(getScope(), cats);
-    }
-
-    /**
-     * Get the category usage count.
-     * 
-     * @param aspect String
-     * @param maxCount int
-     * @return Scriptable
-     */
-    public Scriptable getCategoryUsage(String aspect, int maxCount)
-    {
-        List<Pair<NodeRef, Integer>> topCats = services.getCategoryService().getTopCategories(storeRef, createQName(aspect), maxCount);
-        Object[] tags = new Object[topCats.size()];
-        int i = 0;
-        for (Pair<NodeRef, Integer> topCat : topCats)
-        {
-           tags[i++] = new Tag(new CategoryNode(topCat.getFirst(), this.services, getScope()), topCat.getSecond());
-        }
-        
-        return Context.getCurrentContext().newArray(getScope(), tags);
-    }
-
-    /**
-     * Build category nodes.
-     * 
-     * @param cars  list of associations to category nodes
-     * @return {@link Object}[] array of category nodes
-     */
-    private Object[] buildCategoryNodes(Collection<ChildAssociationRef> cars)
-    {
-        Object[] categoryNodes = new Object[cars.size()];
-        int i = 0;
-        for (ChildAssociationRef car : cars)
-        {
-            categoryNodes[i++] = new CategoryNode(car.getChildRef(), this.services, getScope());
-        }
-        return categoryNodes;
-    }
-
-    /**
-     * Create QName from string
-     * 
-     * @param s QName string value
-     * @return {@link QName} qualified name object    
-     */
-    private QName createQName(String s)
-    {
-        QName qname;
-        if (s.indexOf(QName.NAMESPACE_BEGIN) != -1)
-        {
-            qname = QName.createQName(s);
-        }
-        else
-        {
-            qname = QName.createQName(s, this.services.getNamespaceService());
-        }
-        return qname;
-    }
-    
-    /**
-     * Tag class returned from getCategoryUsage().
-     */
-    public final class Tag
-    {
-        private CategoryNode categoryNode;
-        private int frequency = 0;
-       
-        public Tag(CategoryNode categoryNode, int frequency)
-        {
-            this.categoryNode = categoryNode;
-            this.frequency = frequency;
-        }
-       
-        public CategoryNode getCategory()
-        {
-            return categoryNode;
-        }
-       
-        public int getFrequency()
-        {
-            return frequency;
-        }
-     }
-}
+package org.alfresco.repo.jscript;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.CategoryService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Scriptable;
+
+/**
+ * Support class for finding categories, finding root nodes for categories and creating root categories. 
+ * 
+ * @author Andy Hind
+ */
+public final class Classification extends BaseScopableProcessorExtension
+{
+    private ServiceRegistry services;
+
+    private StoreRef storeRef;
+    
+    /**
+     * Set the default store reference
+     * 
+     * @param   storeRef the default store reference
+     */
+    public void setStoreUrl(String storeRef)
+    {
+        this.storeRef = new StoreRef(storeRef);
+    }
+    
+    /**
+     * Set the service registry
+     * 
+     * @param services  the service registry
+     */
+    public void setServiceRegistry(ServiceRegistry services)
+    {
+        this.services = services;
+    }
+
+    /**
+     * Find all the category nodes in a given classification.
+     * 
+     * @param aspect String
+     * @return Scriptable
+     */
+    public Scriptable getAllCategoryNodes(String aspect)
+    {
+        Object[] cats = buildCategoryNodes(services.getCategoryService().getCategories(
+                            storeRef, createQName(aspect), CategoryService.Depth.ANY));
+        return Context.getCurrentContext().newArray(getScope(), cats);
+    }
+
+    /**
+     * Get all the aspects that define a classification.
+     * 
+     * @return String[]
+     */
+    public String[] getAllClassificationAspects()
+    {
+        Collection<QName> aspects = services.getCategoryService().getClassificationAspects();
+        String[] answer = new String[aspects.size()];
+        int i = 0;
+        for (QName qname : aspects)
+        {
+            answer[i++] = qname.toPrefixString(this.services.getNamespaceService());
+        }
+        return answer;
+    }
+    
+    /**
+     * Create a root category in a classification.
+     * 
+     * @param aspect String
+     * @param name String
+     */
+    public CategoryNode createRootCategory(String aspect, String name)
+    {
+        NodeRef categoryNodeRef = services.getCategoryService().createRootCategory(storeRef, createQName(aspect), name);
+        CategoryNode categoryNode = new CategoryNode(categoryNodeRef, this.services, getScope());
+
+        return categoryNode;
+    }
+    
+    /**
+     * Get the category node from the category node reference.
+     * 
+     * @param categoryRef   category node reference
+     * @return {@link CategoryNode} category node 
+     */
+    public CategoryNode getCategory(String categoryRef)
+    {
+        CategoryNode result = null;
+        NodeRef categoryNodeRef = new NodeRef(categoryRef);
+        if (services.getNodeService().exists(categoryNodeRef) == true &&
+            services.getDictionaryService().isSubClass(ContentModel.TYPE_CATEGORY, services.getNodeService().getType(categoryNodeRef)) == true)
+        {
+            result = new CategoryNode(categoryNodeRef, this.services, getScope());
+        }
+        return result;
+    }
+
+    /**
+     * Get the root categories in a classification.
+     * 
+     * @param aspect String
+     * @return Scriptable
+     */
+    public Scriptable getRootCategories(String aspect)
+    {
+        Object[] cats = buildCategoryNodes(services.getCategoryService().getRootCategories(
+                            storeRef, createQName(aspect)));
+        return Context.getCurrentContext().newArray(getScope(), cats);
+    }
+
+    /**
+     * Get ordered, filtered and paged root categories in a classification.
+     * 
+     * @param aspect
+     * @param filter
+     * @param maxItems
+     * @param skipCount (offset)
+     * @return
+     */
+    public Scriptable getRootCategories(String aspect, String filter, int maxItems, int skipCount)
+    {
+        PagingRequest pagingRequest = new PagingRequest(skipCount, maxItems);
+        List<ChildAssociationRef> rootCategories = services.getCategoryService().getRootCategories(storeRef, createQName(aspect), pagingRequest, true, filter).getPage();
+        Object[] cats = buildCategoryNodes(rootCategories);
+        return Context.getCurrentContext().newArray(getScope(), cats);
+    }
+
+    /**
+     * Get the category usage count.
+     * 
+     * @param aspect String
+     * @param maxCount int
+     * @return Scriptable
+     */
+    public Scriptable getCategoryUsage(String aspect, int maxCount)
+    {
+        List<Pair<NodeRef, Integer>> topCats = services.getCategoryService().getTopCategories(storeRef, createQName(aspect), maxCount);
+        Object[] tags = new Object[topCats.size()];
+        int i = 0;
+        for (Pair<NodeRef, Integer> topCat : topCats)
+        {
+           tags[i++] = new Tag(new CategoryNode(topCat.getFirst(), this.services, getScope()), topCat.getSecond());
+        }
+        
+        return Context.getCurrentContext().newArray(getScope(), tags);
+    }
+
+    /**
+     * Build category nodes.
+     * 
+     * @param cars  list of associations to category nodes
+     * @return {@link Object}[] array of category nodes
+     */
+    private Object[] buildCategoryNodes(Collection<ChildAssociationRef> cars)
+    {
+        Object[] categoryNodes = new Object[cars.size()];
+        int i = 0;
+        for (ChildAssociationRef car : cars)
+        {
+            categoryNodes[i++] = new CategoryNode(car.getChildRef(), this.services, getScope());
+        }
+        return categoryNodes;
+    }
+
+    /**
+     * Create QName from string
+     * 
+     * @param s QName string value
+     * @return {@link QName} qualified name object    
+     */
+    private QName createQName(String s)
+    {
+        QName qname;
+        if (s.indexOf(QName.NAMESPACE_BEGIN) != -1)
+        {
+            qname = QName.createQName(s);
+        }
+        else
+        {
+            qname = QName.createQName(s, this.services.getNamespaceService());
+        }
+        return qname;
+    }
+    
+    /**
+     * Tag class returned from getCategoryUsage().
+     */
+    public final class Tag
+    {
+        private CategoryNode categoryNode;
+        private int frequency = 0;
+       
+        public Tag(CategoryNode categoryNode, int frequency)
+        {
+            this.categoryNode = categoryNode;
+            this.frequency = frequency;
+        }
+       
+        public CategoryNode getCategory()
+        {
+            return categoryNode;
+        }
+       
+        public int getFrequency()
+        {
+            return frequency;
+        }
+     }
+}

repository/src/main/java/org/alfresco/repo/policy/TransactionBehaviourQueue.java

@@ -251,15 +251,16 @@ public class TransactionBehaviourQueue implements TransactionListener
         }
         catch (IllegalArgumentException e)
         {
-            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId(), e);
+            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId() + " : " + e.getMessage(), e);
         }
         catch (IllegalAccessException e)
         {
-            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId(), e);
+            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId() + " : " + e.getMessage(), e);
         }
         catch (InvocationTargetException e)
         {
-            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId(), e.getTargetException());
+            String msg = e.getMessage() + (e.getTargetException() != null ? "(" + e.getTargetException().getMessage() + ")" : "");
+            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId() + " : " + msg, e.getTargetException());
         }
     }
     

repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java

@@ -514,15 +514,11 @@ public class RenditionService2Impl implements RenditionService2, InitializingBea
                         NodeRef renditionNode = getRenditionNode(sourceNodeRef, renditionName);
                         boolean createRenditionNode = renditionNode == null;
                         boolean sourceHasAspectRenditioned = nodeService.hasAspect(sourceNodeRef, RenditionModel.ASPECT_RENDITIONED);
-                        boolean sourceChanges = !sourceHasAspectRenditioned || createRenditionNode || transformInputStream == null;
                         try
                         {
-                            if (sourceChanges)
-                            {
-                                ruleService.disableRuleType(RuleType.UPDATE);
-                                behaviourFilter.disableBehaviour(sourceNodeRef, ContentModel.ASPECT_AUDITABLE);
-                                behaviourFilter.disableBehaviour(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);
-                            }
+                            ruleService.disableRuleType(RuleType.UPDATE);
+                            behaviourFilter.disableBehaviour(sourceNodeRef, ContentModel.ASPECT_AUDITABLE);
+                            behaviourFilter.disableBehaviour(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);
 
                             // If they do not exist create the rendition association and the rendition node.
                             if (createRenditionNode)
@@ -592,12 +588,9 @@ public class RenditionService2Impl implements RenditionService2, InitializingBea
                         }
                         finally
                         {
-                            if (sourceChanges)
-                            {
-                                behaviourFilter.enableBehaviour(sourceNodeRef, ContentModel.ASPECT_AUDITABLE);
-                                behaviourFilter.enableBehaviour(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);
-                                ruleService.enableRuleType(RuleType.UPDATE);
-                            }
+                            behaviourFilter.enableBehaviour(sourceNodeRef, ContentModel.ASPECT_AUDITABLE);
+                            behaviourFilter.enableBehaviour(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);
+                            ruleService.enableRuleType(RuleType.UPDATE);
                         }
                         return null;
                     }, false, true));

repository/src/main/java/org/alfresco/repo/search/impl/AbstractCategoryServiceImpl.java

@@ -414,34 +414,7 @@ public abstract class AbstractCategoryServiceImpl implements CategoryService
         int count = 0;
         boolean moreItems = false;
 
-        final Function<NodeRef, Collection<ChildAssociationRef>> childNodesSupplier = (nodeRef) -> {
-            final Set<ChildAssociationRef> childNodes = new HashSet<>();
-            if (CollectionUtils.isEmpty(exactNamesFilter) && CollectionUtils.isEmpty(alikeNamesFilter))
-            {
-                // lookup in DB without filtering
-                childNodes.addAll(nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_SUBCATEGORIES, RegexQNamePattern.MATCH_ALL));
-            }
-            else
-            {
-                if (CollectionUtils.isNotEmpty(exactNamesFilter))
-                {
-                    // lookup in DB filtering by name
-                    childNodes.addAll(nodeService.getChildrenByName(nodeRef, ContentModel.ASSOC_SUBCATEGORIES, exactNamesFilter));
-                }
-                if (CollectionUtils.isNotEmpty(alikeNamesFilter))
-                {
-                    // lookup using search engin filtering by name
-                    childNodes.addAll(getChildren(nodeRef, Mode.SUB_CATEGORIES, Depth.IMMEDIATE, sortByName, alikeNamesFilter, skipCount + maxItems + 1));
-                }
-            }
-
-            Stream<ChildAssociationRef> childNodesStream = childNodes.stream();
-            if (sortByName)
-            {
-                childNodesStream = childNodesStream.sorted(Comparator.comparing(tag -> tag.getQName().getLocalName()));
-            }
-            return childNodesStream.collect(Collectors.toList());
-        };
+        final Function<NodeRef, Collection<ChildAssociationRef>> childNodesSupplier = getNodeRefCollectionFunction(sortByName, exactNamesFilter, alikeNamesFilter, skipCount, maxItems);
 
         OUTER_LOOP: for(NodeRef nodeRef : nodeRefs)
         {
@@ -468,6 +441,55 @@ public abstract class AbstractCategoryServiceImpl implements CategoryService
         return new ListBackedPagingResults<>(associations, moreItems);
     }
 
+    public Collection<ChildAssociationRef> getRootCategories(StoreRef storeRef, QName aspectName, Collection<String> exactNamesFilter, Collection<String> alikeNamesFilter)
+    {
+        final Set<NodeRef> nodeRefs = getClassificationNodes(storeRef, aspectName);
+        final List<ChildAssociationRef> associations = new LinkedList<>();
+
+        final Function<NodeRef, Collection<ChildAssociationRef>> childNodesSupplier = getNodeRefCollectionFunction(false, exactNamesFilter, alikeNamesFilter, 0, 10000);
+
+        for (NodeRef nodeRef : nodeRefs)
+        {
+            Collection<ChildAssociationRef> children = childNodesSupplier.apply(nodeRef);
+            associations.addAll(children);
+        }
+
+        return associations;
+    }
+
+    private Function<NodeRef, Collection<ChildAssociationRef>> getNodeRefCollectionFunction(boolean sortByName, Collection<String> exactNamesFilter, Collection<String> alikeNamesFilter, int skipCount, int maxItems)
+    {
+        final Function<NodeRef, Collection<ChildAssociationRef>> childNodesSupplier = (nodeRef) -> {
+            final Set<ChildAssociationRef> childNodes = new HashSet<>();
+            if (CollectionUtils.isEmpty(exactNamesFilter) && CollectionUtils.isEmpty(alikeNamesFilter))
+            {
+                // lookup in DB without filtering
+                childNodes.addAll(nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_SUBCATEGORIES, RegexQNamePattern.MATCH_ALL));
+            }
+            else
+            {
+                if (CollectionUtils.isNotEmpty(exactNamesFilter))
+                {
+                    // lookup in DB filtering by name
+                    childNodes.addAll(nodeService.getChildrenByName(nodeRef, ContentModel.ASSOC_SUBCATEGORIES, exactNamesFilter));
+                }
+                if (CollectionUtils.isNotEmpty(alikeNamesFilter))
+                {
+                    // lookup using search engine filtering by name
+                    childNodes.addAll(getChildren(nodeRef, Mode.SUB_CATEGORIES, Depth.IMMEDIATE, sortByName, alikeNamesFilter, skipCount + maxItems + 1));
+                }
+            }
+
+            Stream<ChildAssociationRef> childNodesStream = childNodes.stream();
+            if (sortByName)
+            {
+                childNodesStream = childNodesStream.sorted(Comparator.comparing(tag -> tag.getQName().getLocalName()));
+            }
+            return childNodesStream.collect(Collectors.toList());
+        };
+        return childNodesSupplier;
+    }
+
     public Collection<ChildAssociationRef> getRootCategories(StoreRef storeRef, QName aspectName)
     {
         return getRootCategories(storeRef, aspectName, null);

repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java

@@ -357,8 +357,13 @@ public class IdentityServiceFacadeFactoryBean implements FactoryBean<IdentitySer
 
         private ClientRegistration.Builder createBuilder(OIDCProviderMetadata metadata)
         {
+            final String authUri = Optional.of(metadata)
+                                           .map(OIDCProviderMetadata::getAuthorizationEndpointURI)
+                                           .map(URI::toASCIIString)
+                                           .orElse(null);
             return ClientRegistration
                     .withRegistrationId("ids")
+                    .authorizationUri(authUri)
                     .tokenUri(metadata.getTokenEndpointURI().toASCIIString())
                     .jwkSetUri(metadata.getJWKSetURI().toASCIIString())
                     .issuerUri(config.getIssuerUrl())

repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java

@@ -1605,8 +1605,6 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
                     this.userSearchCtls = new SearchControls();
                     this.userSearchCtls.setSearchScope(SearchControls.SUBTREE_SCOPE);
                     this.userSearchCtls.setReturningAttributes(LDAPUserRegistry.this.userKeys.getFirst());
-                    // MNT-14001 fix, set search limit to ensure that server will not return more search results then provided by paged result control
-                    this.userSearchCtls.setCountLimit(LDAPUserRegistry.this.queryBatchSize > 0 ? LDAPUserRegistry.this.queryBatchSize : 0);
 
                     this.next = fetchNext();
                 }

repository/src/main/java/org/alfresco/repo/tagging/TaggingServiceImpl.java

@@ -27,8 +27,10 @@ package org.alfresco.repo.tagging;
 
 import static java.util.Collections.emptyMap;
 
+import static org.alfresco.model.ContentModel.ASPECT_WORKING_COPY;
 import static org.alfresco.model.ContentModel.ASSOC_SUBCATEGORIES;
 import static org.alfresco.model.ContentModel.PROP_NAME;
+import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_LUCENE;
 import static org.alfresco.service.namespace.NamespaceService.CONTENT_MODEL_1_0_URI;
 
 import java.io.BufferedReader;
@@ -44,12 +46,16 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.query.EmptyPagingResults;
@@ -59,6 +65,7 @@ import org.alfresco.repo.audit.AuditComponent;
 import org.alfresco.repo.coci.CheckOutCheckInServicePolicies.OnCheckOut;
 import org.alfresco.repo.copy.CopyServicePolicies.BeforeCopyPolicy;
 import org.alfresco.repo.copy.CopyServicePolicies.OnCopyCompletePolicy;
+import org.alfresco.repo.domain.query.QueryException;
 import org.alfresco.repo.event2.EventGenerator;
 import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
 import org.alfresco.repo.node.NodeServicePolicies.OnCreateNodePolicy;
@@ -119,7 +126,7 @@ public class TaggingServiceImpl implements TaggingService,
 
     private static Log logger = LogFactory.getLog(TaggingServiceImpl.class);
     
-	private static Collator collator = Collator.getInstance();
+    private static Collator collator = Collator.getInstance();
 
     private NodeService nodeService;
     private NodeService nodeServiceInternal;
@@ -136,6 +143,9 @@ public class TaggingServiceImpl implements TaggingService,
     private static final String TAG_DETAILS_DELIMITER = "|";
     /** Next tag delimiter */
     private static final String NEXT_TAG_DELIMITER = "\n";
+    /** Parameters Include count */
+    private static final String PARAM_INCLUDE_COUNT = "count";
+
 
     private static Set<String> FORBIDDEN_TAGS_SEQUENCES = new HashSet<String>(Arrays.asList(new String[] {NEXT_TAG_DELIMITER, TAG_DETAILS_DELIMITER}));
 
@@ -333,7 +343,7 @@ public class TaggingServiceImpl implements TaggingService,
     public void beforeDeleteNode(NodeRef nodeRef)
     {
        if (this.nodeService.exists(nodeRef) == true &&          
-           this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TAGGABLE) == true && !this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY))
+           this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TAGGABLE) == true && !this.nodeService.hasAspect(nodeRef, ASPECT_WORKING_COPY))
        {
            updateAllScopeTags(nodeRef, Boolean.FALSE);
        }
@@ -492,8 +502,8 @@ public class TaggingServiceImpl implements TaggingService,
     {
         // Lower the case of the tag
         tag = tag.toLowerCase();
-		
-		return getTagNodeRef(storeRef, tag, true);
+
+        return getTagNodeRef(storeRef, tag, true);
     }  
 
     /**
@@ -522,33 +532,33 @@ public class TaggingServiceImpl implements TaggingService,
     
     public NodeRef changeTag(StoreRef storeRef, String existingTag, String newTag)
     {
-    	if (existingTag == null)
-    	{
-    		throw new TaggingException("Existing tag cannot be null");
-    	}
-    	
-    	if (newTag == null || StringUtils.isBlank(newTag))
-    	{
-    		throw new TaggingException("New tag cannot be blank");
-    	}
+        if (existingTag == null)
+        {
+            throw new TaggingException("Existing tag cannot be null");
+        }
 
-    	existingTag = existingTag.toLowerCase();
-    	newTag = newTag.toLowerCase();
+        if (newTag == null || StringUtils.isBlank(newTag))
+        {
+            throw new TaggingException("New tag cannot be blank");
+        }
 
-    	if (existingTag.equals(newTag))
-    	{
-    		throw new TaggingException("New and existing tags are the same");
-    	}
-    	
-    	if (getTagNodeRef(storeRef, existingTag) == null)
-    	{
-    		throw new NonExistentTagException("Tag " + existingTag + " not found");
-    	}
-    	
-    	if (getTagNodeRef(storeRef, newTag) != null)
-    	{
-    		throw new TagExistsException("Tag " + newTag + " already exists");
-    	}
+        existingTag = existingTag.toLowerCase();
+        newTag = newTag.toLowerCase();
+
+        if (existingTag.equals(newTag))
+        {
+            throw new TaggingException("New and existing tags are the same");
+        }
+
+        if (getTagNodeRef(storeRef, existingTag) == null)
+        {
+            throw new NonExistentTagException("Tag " + existingTag + " not found");
+        }
+
+        if (getTagNodeRef(storeRef, newTag) != null)
+        {
+            throw new TagExistsException("Tag " + newTag + " already exists");
+        }
 
         NodeRef tagNodeRef = getTagNodeRef(storeRef, existingTag);
         nodeService.setProperty(tagNodeRef, PROP_NAME, newTag);
@@ -678,6 +688,21 @@ public class TaggingServiceImpl implements TaggingService,
         }
     }
 
+    public Map<String, Long> calculateCount(StoreRef storeRef)
+    {
+        List<Pair<String, Integer>> tagsByCount = findTaggedNodesAndCountByTagName(storeRef);
+        Map<String, Long> tagsByCountMap = new HashMap<>();
+        if (tagsByCount != null)
+        {
+            for (Pair<String, Integer> tagByCountElem : tagsByCount)
+            {
+                tagsByCountMap.put(tagByCountElem.getFirst(), Long.valueOf(tagByCountElem.getSecond()));
+            }
+        }
+        return tagsByCountMap;
+    }
+
+
     /**
      * @see TaggingService#hasTag(NodeRef, String)
      */
@@ -693,12 +718,12 @@ public class TaggingServiceImpl implements TaggingService,
     @SuppressWarnings("unchecked")
     public NodeRef addTag(final NodeRef nodeRef, final String tagName)
     {
-    	NodeRef newTagNodeRef = null;
-    	
-    	if(tagName == null)
-    	{
-    		throw new IllegalArgumentException("Must provide a non-null tag");
-    	}
+        NodeRef newTagNodeRef = null;
+
+        if(tagName == null)
+        {
+            throw new IllegalArgumentException("Must provide a non-null tag");
+        }
 
         updateTagBehaviour.disable();
         createTagBehaviour.disable();
@@ -748,7 +773,7 @@ public class TaggingServiceImpl implements TaggingService,
      */
     public List<Pair<String, NodeRef>> addTags(NodeRef nodeRef, List<String> tags)
     {
-    	List<Pair<String, NodeRef>> ret = new ArrayList<Pair<String, NodeRef>>();
+        List<Pair<String, NodeRef>> ret = new ArrayList<Pair<String, NodeRef>>();
         for (String tag : tags)
         {
             NodeRef tagNodeRef = addTag(nodeRef, tag);
@@ -869,36 +894,36 @@ public class TaggingServiceImpl implements TaggingService,
                 int skipCount = pagingRequest.getSkipCount();
                 int maxItems = pagingRequest.getMaxItems();
                 int end = maxItems == Integer.MAX_VALUE ? totalItems : skipCount + maxItems;
-            	int size = (maxItems == Integer.MAX_VALUE ? totalItems : maxItems);
+                int size = (maxItems == Integer.MAX_VALUE ? totalItems : maxItems);
 
                 final List<Pair<NodeRef, String>> sortedTags = new ArrayList<Pair<NodeRef, String>>(size);
-            	// grab all tags and sort (assume fairly low number of tags)
-            	for(NodeRef tagNode : currentTagNodes)
-            	{
+                // grab all tags and sort (assume fairly low number of tags)
+                for(NodeRef tagNode : currentTagNodes)
+                {
                     String tag = (String)this.nodeService.getProperty(tagNode, PROP_NAME);
                     sortedTags.add(new Pair<NodeRef, String>(tagNode, tag));            		
-            	}
+                }
                 Collections.sort(sortedTags, new Comparator<Pair<NodeRef, String>>()
                 {
-					@Override
-					public int compare(Pair<NodeRef, String> o1, Pair<NodeRef, String> o2)
-					{
-						String tag1 = o1.getSecond();
-						String tag2 = o2.getSecond();
-						return collator.compare(tag1, tag2);
-					}
-				});
+                    @Override
+                    public int compare(Pair<NodeRef, String> o1, Pair<NodeRef, String> o2)
+                    {
+                        String tag1 = o1.getSecond();
+                        String tag2 = o2.getSecond();
+                        return collator.compare(tag1, tag2);
+                    }
+                });
 
                 final List<Pair<NodeRef, String>> result = new ArrayList<Pair<NodeRef, String>>(size);
-            	Iterator<Pair<NodeRef, String>> it = sortedTags.iterator();
+                Iterator<Pair<NodeRef, String>> it = sortedTags.iterator();
                 for(int count = 0; count < end && it.hasNext(); count++)
                 {
-                	Pair<NodeRef, String> tagPair = it.next();
+                    Pair<NodeRef, String> tagPair = it.next();
 
-                	if(count < skipCount)
-                	{
-                		continue;
-                	}
+                    if(count < skipCount)
+                    {
+                        continue;
+                    }
 
                     result.add(tagPair);
                 }
@@ -907,30 +932,30 @@ public class TaggingServiceImpl implements TaggingService,
 
                 return new PagingResults<Pair<NodeRef, String>>()
                 {
-        			@Override
-        			public List<Pair<NodeRef, String>> getPage()
-        			{
-        				return result;
-        			}
+                    @Override
+                    public List<Pair<NodeRef, String>> getPage()
+                    {
+                        return result;
+                    }
 
-        			@Override
-        			public boolean hasMoreItems()
-        			{
-        				return hasMoreItems;
-        			}
+                    @Override
+                    public boolean hasMoreItems()
+                    {
+                        return hasMoreItems;
+                    }
 
-        			@Override
-        			public Pair<Integer, Integer> getTotalResultCount()
-        			{
-        				Integer total = Integer.valueOf(totalItems);
-        				return new Pair<Integer, Integer>(total, total);
-        			}
+                    @Override
+                    public Pair<Integer, Integer> getTotalResultCount()
+                    {
+                        Integer total = Integer.valueOf(totalItems);
+                        return new Pair<Integer, Integer>(total, total);
+                    }
 
-        			@Override
-        			public String getQueryExecutionId()
-        			{
-        				return null;
-        			}
+                    @Override
+                    public String getQueryExecutionId()
+                    {
+                        return null;
+                    }
                 };
             }
         }
@@ -954,7 +979,83 @@ public class TaggingServiceImpl implements TaggingService,
             exactNamesFilter, alikeNamesFilter);
 
         return mapPagingResult(rootCategories,
-            (childAssociation) -> new Pair<>(childAssociation.getChildRef(), childAssociation.getQName().getLocalName()));
+                (childAssociation) -> new Pair<>(childAssociation.getChildRef(), childAssociation.getQName().getLocalName()));
+    }
+
+    public Map<NodeRef, Long> getTags(StoreRef storeRef, List<String> parameterIncludes, Pair<String, Boolean> sorting, Collection<String> exactNamesFilter, Collection<String> alikeNamesFilter)
+    {
+        ParameterCheck.mandatory("storeRef", storeRef);
+        Collection<ChildAssociationRef> rootCategories = categoryService.getRootCategories(storeRef, ContentModel.ASPECT_TAGGABLE, exactNamesFilter, alikeNamesFilter);
+
+        Map<String, Long> tagsMap = new TreeMap<>();
+        for (ChildAssociationRef childAssociation : rootCategories)
+        {
+            tagsMap.put(childAssociation.getQName().getLocalName(), 0L);
+        }
+
+        Map<String, Long> tagsByCountMap = new HashMap<>();
+
+        if(parameterIncludes.contains(PARAM_INCLUDE_COUNT))
+        {
+            tagsByCountMap = calculateCount(storeRef);
+
+            for (Map.Entry<String, Long> entry : tagsMap.entrySet()) {
+                entry.setValue(Optional.ofNullable(tagsByCountMap.get(entry.getKey())).orElse(0L));
+            }
+        }
+
+        //check if we should sort results. Can only sort by one parameter, default order is ascending
+        if (sorting != null)
+        {
+            if (sorting.getFirst().equals("tag"))
+            {
+                if (!sorting.getSecond())
+                {
+                    Stream<Map.Entry<String,Long>> sortedTags =
+                            tagsMap.entrySet().stream()
+                                    .sorted(Collections.reverseOrder(Map.Entry.comparingByKey()));
+                    tagsMap = sortedTags.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+                }
+                else
+                {
+                    Stream<Map.Entry<String,Long>> sortedTags =
+                            tagsMap.entrySet().stream()
+                                    .sorted(Map.Entry.comparingByKey());
+                    tagsMap = sortedTags.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+                }
+            }
+            else if (sorting.getFirst().equals(PARAM_INCLUDE_COUNT))
+            {
+                if (tagsByCountMap.isEmpty())
+                {
+                    throw new IllegalArgumentException("Tag count should be included when ordering by count");
+                }
+
+                if (!sorting.getSecond())
+                {
+                    Stream<Map.Entry<String, Long>> sortedTags =
+                            tagsMap.entrySet().stream()
+                                    .sorted(Collections.reverseOrder(Map.Entry.comparingByValue()));
+                    tagsMap = sortedTags.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+                }
+                else
+                {
+                    Stream<Map.Entry<String,Long>> sortedTags =
+                            tagsMap.entrySet().stream()
+                                    .sorted(Map.Entry.comparingByValue());
+                    tagsMap = sortedTags.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+                }
+            }
+        }
+
+        Map<NodeRef, Long> tagNodeRefMap = new LinkedHashMap<>();
+
+        for (Map.Entry<String, Long> entry : tagsMap.entrySet())
+        {
+            tagNodeRefMap.put(getTagNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, entry.getKey()), entry.getValue());
+        }
+
+        return tagNodeRefMap;
     }
     
     /**
@@ -1188,15 +1289,15 @@ public class TaggingServiceImpl implements TaggingService,
      */
     private void getTagScopes(final NodeRef nodeRef, List<NodeRef> tagScopes, boolean firstOnly)
     {
-    	Boolean hasAspect = AuthenticationUtil.runAs(new RunAsWork<Boolean>()
-    	{
-			@Override
-			public Boolean doWork() throws Exception 
-			{
-				return new Boolean(nodeService.hasAspect(nodeRef,  ContentModel.ASPECT_TAGSCOPE));
-			}
-		}, AuthenticationUtil.getSystemUserName());
-    	
+        Boolean hasAspect = AuthenticationUtil.runAs(new RunAsWork<Boolean>()
+        {
+            @Override
+            public Boolean doWork() throws Exception
+            {
+                return new Boolean(nodeService.hasAspect(nodeRef,  ContentModel.ASPECT_TAGSCOPE));
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
         if (Boolean.TRUE.equals(hasAspect) == true)
         {
             tagScopes.add(nodeRef);
@@ -1207,23 +1308,23 @@ public class TaggingServiceImpl implements TaggingService,
         }
         
         NodeRef parent = AuthenticationUtil.runAs(new RunAsWork<NodeRef>()
-    	{
-			@Override
-			public NodeRef doWork() throws Exception 
-			{
-				NodeRef result = null;
-				ChildAssociationRef assoc = nodeService.getPrimaryParent(nodeRef);
-		        if (assoc != null)
-		        {
-		            result = assoc.getParentRef();                          
-		        }
-		        return result;
-			}
-		}, AuthenticationUtil.getSystemUserName());
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                NodeRef result = null;
+                ChildAssociationRef assoc = nodeService.getPrimaryParent(nodeRef);
+                if (assoc != null)
+                {
+                    result = assoc.getParentRef();
+                }
+                return result;
+            }
+        }, AuthenticationUtil.getSystemUserName());
         
         if (parent != null)
         {
-        	getTagScopes(parent, tagScopes, firstOnly);            
+            getTagScopes(parent, tagScopes, firstOnly);
         }
     }
 
@@ -1241,7 +1342,7 @@ public class TaggingServiceImpl implements TaggingService,
             // Do the search for nodes
             resultSet = this.searchService.query(
                 storeRef, 
-                SearchService.LANGUAGE_LUCENE, 
+                LANGUAGE_LUCENE,
                 "+PATH:\"/cm:taggable/cm:" + ISO9075.encode(tag) + "/member\"");
             List<NodeRef> nodeRefs = resultSet.getNodeRefs();
             return nodeRefs;
@@ -1270,7 +1371,7 @@ public class TaggingServiceImpl implements TaggingService,
             // Do query
             resultSet = this.searchService.query(
                 storeRef, 
-                SearchService.LANGUAGE_LUCENE, 
+                LANGUAGE_LUCENE,
                 "+PATH:\"" + pathString + "//*\" +PATH:\"/cm:taggable/cm:" + ISO9075.encode(tag) + "/member\"");
             List<NodeRef> nodeRefs = resultSet.getNodeRefs();
             return nodeRefs;
@@ -1538,7 +1639,7 @@ public class TaggingServiceImpl implements TaggingService,
     public void afterCheckOut(NodeRef workingCopy)
     {
         if (this.nodeService.exists(workingCopy) == true && this.nodeService.hasAspect(workingCopy, ContentModel.ASPECT_TAGGABLE) == true
-                && this.nodeService.hasAspect(workingCopy, ContentModel.ASPECT_WORKING_COPY))
+                && this.nodeService.hasAspect(workingCopy, ASPECT_WORKING_COPY))
         {
             updateAllScopeTags(workingCopy, Boolean.FALSE);
         }
@@ -1550,10 +1651,10 @@ public class TaggingServiceImpl implements TaggingService,
     @Override
     public List<Pair<String, Integer>> findTaggedNodesAndCountByTagName(StoreRef storeRef)
     {
-        String queryTaggeble = "ASPECT:\"" + ContentModel.ASPECT_TAGGABLE + "\"" + "-ASPECT:\"" + ContentModel.ASPECT_WORKING_COPY + "\"";
+        String queryTaggeble = "ASPECT:\"" + ContentModel.ASPECT_TAGGABLE + "\"" + "-ASPECT:\"" + ASPECT_WORKING_COPY + "\"";
         SearchParameters sp = new SearchParameters();
         sp.setQuery(queryTaggeble);
-        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+        sp.setLanguage(LANGUAGE_LUCENE);
         sp.addStore(storeRef);
         sp.addFieldFacet(new FieldFacet("TAG"));
 
@@ -1573,6 +1674,32 @@ public class TaggingServiceImpl implements TaggingService,
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public long findCountByTagName(StoreRef storeRef, String name)
+    {
+        String query = "TAG:\"" + name + "\"" + "-ASPECT:\"" + ASPECT_WORKING_COPY + "\"";
+        SearchParameters sp = new SearchParameters();
+        sp.setQuery(query);
+        sp.setLanguage(LANGUAGE_LUCENE);
+        sp.addStore(storeRef);
+
+        ResultSet resultSet = null;
+        try
+        {
+            // Do the search for nodes
+            resultSet = this.searchService.query(sp);
+            return resultSet.getNumberFound();
+        }
+        finally
+        {
+            if (resultSet != null)
+            {
+                resultSet.close();
+            }
+        }
+    }
+
     @Experimental
     @Override
     public List<Pair<String, NodeRef>> createTags(final StoreRef storeRef, final List<String> tagNames)

repository/src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java

@@ -997,6 +997,20 @@ public class WorkflowServiceImpl implements WorkflowService
     public WorkflowTask updateTask(String taskId, Map<QName, Serializable> properties, Map<QName, List<NodeRef>> add,
                 Map<QName, List<NodeRef>> remove)
     {
+    	if(properties.containsKey(WorkflowModel.PROP_STATUS)) {
+
+            LinkedList<String> validTaskStatus = new LinkedList<>();
+            validTaskStatus.add("Not Yet Started");
+            validTaskStatus.add("In Progress");
+            validTaskStatus.add("On Hold");
+            validTaskStatus.add("Cancelled");
+            validTaskStatus.add("Completed");
+
+            if (!validTaskStatus.contains(properties.get(WorkflowModel.PROP_STATUS))) {
+                throw new WorkflowException("Invalid Value is Passed for Task Status.");
+            }
+        }
+	
         String engineId = BPMEngineRegistry.getEngineId(taskId);
         TaskComponent component = getTaskComponent(engineId);
         // get the current assignee before updating the task

repository/src/main/java/org/alfresco/service/cmr/search/CategoryService.java

@@ -26,6 +26,7 @@
 package org.alfresco.service.cmr.search;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -150,11 +151,21 @@ public interface CategoryService
      */
     @Auditable(parameters = {"storeRef", "aspectName", "pagingRequest", "sortByName", "exactNamesFilter", "alikeNamesFilter"})
     default PagingResults<ChildAssociationRef> getRootCategories(StoreRef storeRef, QName aspectName, PagingRequest pagingRequest, boolean sortByName,
-        Collection<String> exactNamesFilter, Collection<String> alikeNamesFilter)
+                                                              Collection<String> exactNamesFilter, Collection<String> alikeNamesFilter)
     {
         return new EmptyPagingResults<>();
     }
 
+    /**
+     * Get a collection of the root categories for an aspect/classification supporting multiple name filters.
+     */
+    @Auditable(parameters = {"storeRef", "aspectName", "exactNamesFilter", "alikeNamesFilter"})
+    default Collection<ChildAssociationRef> getRootCategories(StoreRef storeRef, QName aspectName, Collection<String> exactNamesFilter, Collection<String> alikeNamesFilter)
+    {
+        return Collections.emptyList();
+    }
+
+
     /**
      * Get the root categories for an aspect/classification with names that start with filter
      * 

repository/src/main/java/org/alfresco/service/cmr/tagging/TaggingService.java

@@ -28,6 +28,7 @@ package org.alfresco.service.cmr.tagging;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.query.EmptyPagingResults;
@@ -94,6 +95,18 @@ public interface TaggingService
     {
         return new EmptyPagingResults<>();
     }
+
+    /**
+     * Get a map of tag NodeRefs and their respective usage count filtered by name and sorted by tag name or count
+     *
+     * @param storeRef
+     * @param parameterIncludes
+     * @param sorting
+     * @param exactNamesFilter
+     * @param alikeNamesFilter
+     * @return
+     */
+    Map<NodeRef, Long> getTags(StoreRef storeRef, List<String>parameterIncludes, Pair<String, Boolean> sorting, Collection<String> exactNamesFilter, Collection<String> alikeNamesFilter);
     
     /** 
      * Get all the tags currently available that match the provided filter.
@@ -327,8 +340,7 @@ public interface TaggingService
      */
     @NotAuditable
     Pair<List<String>, Integer> getPagedTags(StoreRef storeRef, String filter, int fromTag, int pageSize);
-    
-    
+
     /**
      * Get tagged nodes and count of nodes group by tag name
      * 
@@ -338,6 +350,16 @@ public interface TaggingService
     @NotAuditable
     List<Pair<String, Integer>> findTaggedNodesAndCountByTagName(StoreRef storeRef);
 
+    /**
+     * Get the number of tagged nodes for a given tag.
+     *
+     * @param storeRef The store containing the nodes.
+     * @param name The name of the tag.
+     * @return The number of nodes tagged with the specified tag.
+     */
+    @NotAuditable
+    long findCountByTagName(StoreRef storeRef, String name);
+
     /**
      * Creates orphan tags. Tag names case will be lowered.
      *
@@ -352,6 +374,13 @@ public interface TaggingService
     {
         return Collections.emptyList();
     }
+
+    /**
+     *
+     * @param storeRef
+     * @return a map with each tag name and its usage count
+     */
+    Map<String, Long> calculateCount(StoreRef storeRef);
 }
 
 

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

@@ -3,7 +3,7 @@
 repository.name=Main Repository
 
 # Schema number
-version.schema=18000
+version.schema=18100
 
 # Directory configuration
 
@@ -752,12 +752,16 @@ encryption.ssl.truststore.keyMetaData.location=
 ## HttpClient config for Transform Service
 #enable mtls in HttpClientFactory for Transform Service.
 httpclient.config.transform.mTLSEnabled=false
-httpclient.config.transform.maxTotalConnections=40
-httpclient.config.transform.maxHostConnections=40
+httpclient.config.transform.maxTotalConnections=20
+httpclient.config.transform.maxHostConnections=20
 httpclient.config.transform.socketTimeout=5000
 httpclient.config.transform.connectionRequestTimeout=5000
 httpclient.config.transform.connectionTimeout=5000
 
+# Property is disabled by default for security reasons, never enable it on for production environments.
+# It will stop verification of hostnames placed in certificates returned with server responses to Repository requests towards transform services
+httpclient.config.transform.hostnameVerificationDisabled=false
+
 # Re-encryptor properties
 encryption.reencryptor.chunkSize=100
 encryption.reencryptor.numThreads=2
@@ -1345,7 +1349,7 @@ system.remove-alf_server-table-from-db.ignored=true
 allow.unsecure.callback.jsonp=false
 
 # pre-configured allow list of media/mime types to allow inline instead of attachment (via Content-Disposition response header)
-content.nonAttach.mimetypes=application/pdf,image/jpeg,image/gif,image/png,image/tiff,image/bmp
+content.nonAttach.mimetypes=application/pdf,image/jpeg,image/gif,image/png,image/tiff,image/bmp,application/octet-stream
 
 # Zip file compression ratio threshold as a percentage, above which the zip file will be considered a "zip bomb" and the
 # import extraction process cancelled.

repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java

@@ -30,6 +30,7 @@ import static org.junit.Assert.assertNotEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.alfresco.model.ContentModel;
@@ -419,6 +420,65 @@ public class RenditionService2IntegrationTest extends AbstractRenditionIntegrati
         assertTrue("New rendition content hash code was not generated", isValidRenditionContentHashCode(contentHashCode3));
     }
 
+    @Test
+    public void testModifierAfterMultipleRenditionRequests() throws InterruptedException
+    {
+        String user1 = createRandomUser();
+        String user2 = createRandomUser();
+        List<NodeRef> nodes = new ArrayList<NodeRef>();
+
+        final int TOTAL_NODES = 10;
+
+        // Create nodes
+        for (int i = 0; i < TOTAL_NODES; i++)
+        {
+            NodeRef n = createSource(user1, "quick.jpg");
+            render(user1, n, DOC_LIB);
+            nodes.add(n);
+        }
+
+        // Ask rendition multiple times with 'user2'
+        for (int j = 0; j < 10; j++)
+        {
+            for (int i = 0; i < TOTAL_NODES; i++)
+            {
+                render(user2, nodes.get(i), DOC_LIB);
+            }
+        }
+
+        for (int i = 0; i < TOTAL_NODES; i++)
+        {
+            waitForRendition(user1, nodes.get(i), DOC_LIB, true);
+        }
+
+        // Check the modifier is still user1
+        assertEquals(TOTAL_NODES, countModifier(nodes, user1));
+    }
+
+    private int countModifier(List<NodeRef> nodes, String user)
+    {
+        int count = 0;
+        for (int i = 0; i < nodes.size(); i++)
+        {
+            count += compareModifier(nodes.get(i), user);
+        }
+        return count;
+    }
+
+    private int compareModifier(NodeRef nodeRef, String user)
+    {
+        int res = 0;
+        if (nodeRef != null && user != null)
+        {
+            String modifier = nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIER).toString();
+            if (user.equals(modifier))
+            {
+                res = 1;
+            }
+        }
+        return res;
+    }
+
     /**
      * @deprecated can be removed when we remove the original RenditionService
      */
@@ -622,4 +682,4 @@ public class RenditionService2IntegrationTest extends AbstractRenditionIntegrati
             renditionService2.setEnabled(true);
         }
     }
-}
+}

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

@@ -31,8 +31,8 @@ services:
     ports:
       - 8090:8090
     volumes:
-      - ${GITHUB_WORKSPACE}/keystores/tengineAIO/tengineAIO.truststore:/tengineAIO.truststore
-      - ${GITHUB_WORKSPACE}/keystores/tengineAIO/tengineAIO.keystore:/tengineAIO.keystore
+      - ${CI_WORKSPACE}/keystores/tengineAIO/tengineAIO.truststore:/tengineAIO.truststore
+      - ${CI_WORKSPACE}/keystores/tengineAIO/tengineAIO.keystore:/tengineAIO.keystore
     environment:
       ACTIVEMQ_URL: "nio://activemq:61616"
       ACTIVEMQ_USER: "admin"

scripts/ci/generate_keystores.sh

@@ -1,27 +0,0 @@
-#! /bin/bash
-#! /bin/bash
-
-# SETTINGS
-# Alfresco Format: "classic" / "current" is supported only from 7.0
-ALFRESCO_FORMAT=current
-
-#Contains directory settings
-source ${GITHUB_WORKSPACE}/alfresco-ssl-generator/ssl-tool/utils.sh
-
-# Cleanup previous output of script
-rm -rd $CA_DIR
-rm -rd $KEYSTORES_DIR
-rm -rd $CERTIFICATES_DIR
-
-# SETTINGS
-# Alfresco Format: "classic" / "current" is supported only from 7.0
-ALFRESCO_FORMAT=current
-
-#CA
-${GITHUB_WORKSPACE}/alfresco-ssl-generator/ssl-tool/run_ca.sh -keysize 2048 -keystorepass password -certdname "/C=GB/ST=UK/L=Maidenhead/O=Alfresco Software Ltd./OU=Unknown/CN=Custom Alfresco CA" -servername localhost -validityduration 1
-#Alfresco
-${GITHUB_WORKSPACE}/alfresco-ssl-generator/ssl-tool/run_additional.sh -servicename alfresco -rootcapass password -keysize 2048 -keystoretype JCEKS -keystorepass password -truststoretype JCEKS -truststorepass password -certdname "/C=GB/ST=UK/L=Maidenhead/O=Alfresco Software Ltd./OU=Unknown/CN=Custom Alfresco Repository" -servername localhost -alfrescoformat $ALFRESCO_FORMAT
-#Alfresco Metadata encryption
-${GITHUB_WORKSPACE}/alfresco-ssl-generator/ssl-tool/run_encryption.sh -subfoldername alfresco -servicename encryption -encstorepass mp6yc0UD9e -encmetadatapass oKIWzVdEdA -alfrescoformat $ALFRESCO_FORMAT
-#T-Engine AIO
-${GITHUB_WORKSPACE}/alfresco-ssl-generator/ssl-tool/run_additional.sh -servicename tengineAIO -rootcapass password -keysize 2048 -keystoretype JCEKS -keystorepass password -truststoretype JCEKS -truststorepass password -certdname "/C=GB/ST=UK/L=Maidenhead/O=Alfresco Software Ltd./OU=Unknown/CN=T-Engine AIO" -servername localhost -alfrescoformat $ALFRESCO_FORMAT